ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for web_loader_phone_strip duplicate check, issue #1498

Browse Source 
Changed lead loader 5th gen to set Custom layout as default

git-svn-id: svn://192.168.202.10@3790 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2023-12-07 20:03:32 +00:00
parent bac8a15ad7
commit 6c8834250c
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt
+2
View File
@@ -242,6 +242,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP
1 USA 618 IL -6 Y SSM-FSN Illinois CST America/Chicago
1 USA 619 CA -8 Y SSM-FSN California PST America/Los_Angeles
1 USA 620 KS -6 Y SSM-FSN Kansas CST America/Chicago
1 USA 621 TX -6 Y SSM-FSN Texas CST America/Chicago
1 USA 623 AZ -7 N Arizona MST America/Phoenix
1 USA 624 NY -5 Y SSM-FSN New York EST America/New_York
1 USA 626 CA -8 Y SSM-FSN California PST America/Los_Angeles
@@ -372,6 +373,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP
1 USA 831 CA -8 Y SSM-FSN California PST America/Los_Angeles
1 USA 832 TX -6 Y SSM-FSN Texas CST America/Chicago
1 USA 835 PA -5 Y SSM-FSN Pennsylvania EST America/New_York
1 USA 837 CA -8 Y SSM-FSN California PST America/Los_Angeles
1 USA 838 NY -5 Y SSM-FSN New York EST America/New_York
1 USA 839 SC -5 Y SSM-FSN South Carolina EST America/New_York
1 USA 840 CA -8 Y SSM-FSN California PST America/Los_Angeles
agc_2-X/trunk/www/vicidial/admin_listloader_fifth_gen.php
+10 -8
View File
@@ -81,10 +81,11 @@
# 210210-1602 - Added duplicate check with more X-day options
# 220222-1002 - Added allow_web_debug system setting
# 230210-1844 - Added invalid_phone_override option <admin_listloader_fifth_gen.php started>
# 231207-1446 - Fix for web_loader_phone_strip duplicate check, issue #1498, also changed format to "Custom layout" default
#
$version = '2.14-79';
$build = '230210-1844';
$version = '2.14-80';
$build = '231207-1446';
require("dbconnect_mysqli.php");
require("functions.php");
@@ -765,7 +766,7 @@ if ( (!$OK_to_process) or ( ($leadfile) and ($file_layout!="standard" && $file_l
</tr>
<tr>
<td align=right><B><font face="arial, helvetica" size=2><?php echo _QXZ("File layout to use"); ?>:</font></B></td>
<td align=left><font face="arial, helvetica" size=2><input type=radio name="file_layout" value="standard" checked><?php echo _QXZ("Standard Format"); ?>&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name="file_layout" value="custom"><?php echo _QXZ("Custom layout"); ?>&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name="file_layout" value="template"><?php echo _QXZ("Custom Template"); ?> <?php echo "$NWB#list_loader-file_layout$NWE"; ?></td>
<td align=left><font face="arial, helvetica" size=2><input type=radio name="file_layout" value="custom" checked><?php echo _QXZ("Custom layout"); ?>&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name="file_layout" value="standard"><?php echo _QXZ("Standard Format"); ?>&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name="file_layout" value="template"><?php echo _QXZ("Custom Template"); ?> <?php echo "$NWB#list_loader-file_layout$NWE"; ?></td>
</tr>
<tr>
<td align=right width="20%"><font face="arial, helvetica" size=2><?php echo _QXZ("Custom Layout to Use"); ?>: </font></td>
@@ -957,7 +958,7 @@ if ($SSenable_international_dncs)
<tr>
<td align=center colspan=2><input style='background-color:#<?php echo "$SSbutton_color"; ?>' type=submit value="<?php echo _QXZ("SUBMIT"); ?>" name='submit_file'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input style='background-color:#<?php echo "$SSbutton_color"; ?>' type=button onClick="javascript:document.location='admin_listloader_fifth_gen.php'" value="<?php echo _QXZ("START OVER"); ?>" name='reload_page'></td>
</tr>
<tr><td align=left><font size=1> &nbsp; &nbsp; &nbsp; &nbsp; <a href="admin.php?ADD=100" target="_parent"><?php echo _QXZ("BACK TO ADMIN"); ?></a> &nbsp; &nbsp; </font></td><td align=right><font size=1><?php echo _QXZ("LIST LOADER 5th Gen"); ?>- &nbsp; &nbsp; <?php echo _QXZ("VERSION"); ?>: <?php echo $version ?> &nbsp; &nbsp; <?php echo _QXZ("BUILD"); ?>: <?php echo $build ?> &nbsp; &nbsp; </td></tr>
<tr><td align=left><font size=1> &nbsp; &nbsp; &nbsp; &nbsp; <a href="admin.php?ADD=100" target="_parent"><?php echo _QXZ("BACK TO ADMIN"); ?></a> &nbsp; &nbsp; </font></td><td align=right><font size=1><?php echo _QXZ("LIST LOADER 5th Gen"); ?> | <a href="admin_listloader_fourth_gen.php"><?php echo _QXZ("4th Gen"); ?></a> &nbsp; &nbsp; <?php echo _QXZ("VERSION"); ?>: <?php echo $version ?> &nbsp; &nbsp; <?php echo _QXZ("BUILD"); ?>: <?php echo $build ?> &nbsp; &nbsp; </td></tr>
</table>
<?php
@@ -2762,6 +2763,11 @@ function check_lead($DB,$link,$list_id,$phone_number,$alt_phone,$address3,$title
{
global $US, $statuses_clause, $status_mismatch_action, $mismatch_limit, $mismatch_clause, $multidaySQL, $SSweb_loader_phone_strip, $web_loader_phone_length, $usacan_check, $dupcheck, $international_dnc_scrub, $valid_number, $dnc_matches, $dup_lead, $moved_lead, $invalid_reason, $total, $good, $bad, $dup, $post, $moved, $phone_list, $dup_lead_list;
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
##### Check for duplicate phone numbers in vicidial_list table for all lists in a campaign #####
if (preg_match("/DUPCAMP/i",$dupcheck))
{
@@ -3048,10 +3054,6 @@ function check_lead($DB,$link,$list_id,$phone_number,$alt_phone,$address3,$title
}
}
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
if ( (strlen($phone_number)<5) || (strlen($phone_number)>18) )
{
$valid_number=0;
agc_2-X/trunk/www/vicidial/admin_listloader_fourth_gen.php
+18 -16
View File
@@ -2,7 +2,7 @@
# admin_listloader_fourth_gen.php - version 2.14
# (based upon - new_listloader_superL.php script)
#
# Copyright (C) 2022 Matt Florell,Joe Johnson <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2023 Matt Florell,Joe Johnson <vicidial@gmail.com> LICENSE: AGPLv2
#
# ViciDial web-based lead loader from formatted file
#
@@ -80,10 +80,11 @@
# 200922-1013 - Added web_loader_phone_strip system setting feature
# 210210-1602 - Added duplicate check with more X-day options
# 220222-1002 - Added allow_web_debug system setting
# 231207-1445 - Fix for web_loader_phone_strip duplicate check, issue #1498
#
$version = '2.14-78';
$build = '220222-1002';
$version = '2.14-79';
$build = '231207-1445';
require("dbconnect_mysqli.php");
require("functions.php");
@@ -911,7 +912,7 @@ if ($SSenable_international_dncs)
<tr>
<td align=center colspan=2><input style='background-color:#<?php echo "$SSbutton_color"; ?>' type=submit value="<?php echo _QXZ("SUBMIT"); ?>" name='submit_file'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input style='background-color:#<?php echo "$SSbutton_color"; ?>' type=button onClick="javascript:document.location='admin_listloader_fourth_gen.php'" value="<?php echo _QXZ("START OVER"); ?>" name='reload_page'></td>
</tr>
<tr><td align=left><font size=1> &nbsp; &nbsp; &nbsp; &nbsp; <a href="admin.php?ADD=100" target="_parent"><?php echo _QXZ("BACK TO ADMIN"); ?></a> &nbsp; &nbsp; </font></td><td align=right><font size=1><?php echo _QXZ("LIST LOADER 4th Gen"); ?>- &nbsp; &nbsp; <?php echo _QXZ("VERSION"); ?>: <?php echo $version ?> &nbsp; &nbsp; <?php echo _QXZ("BUILD"); ?>: <?php echo $build ?> &nbsp; &nbsp; </td></tr>
<tr><td align=left><font size=1> &nbsp; &nbsp; &nbsp; &nbsp; <a href="admin.php?ADD=100" target="_parent"><?php echo _QXZ("BACK TO ADMIN"); ?></a> &nbsp; &nbsp; </font></td><td align=right><font size=1><?php echo _QXZ("LIST LOADER 4th Gen"); ?> | <a href="admin_listloader_fifth_gen.php"><?php echo _QXZ("5th Gen"); ?></a> &nbsp; &nbsp; <?php echo _QXZ("VERSION"); ?>: <?php echo $version ?> &nbsp; &nbsp; <?php echo _QXZ("BUILD"); ?>: <?php echo $build ?> &nbsp; &nbsp; </td></tr>
</table>
<?php
@@ -1298,6 +1299,10 @@ if ($OK_to_process)
$custom_SQL = preg_replace("/,$/","",$custom_SQL);
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
##### Check for duplicate phone numbers in vicidial_list table for all lists in a campaign #####
if (preg_match("/DUPCAMP/i",$dupcheck))
@@ -1572,10 +1577,6 @@ if ($OK_to_process)
$valid_number=1;
$invalid_reason='';
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
if ( (strlen($phone_number)<5) || (strlen($phone_number)>18) )
{
$valid_number=0;
@@ -2044,6 +2045,10 @@ if (($leadfile) && ($LF_path))
}
}
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
##### Check for duplicate phone numbers in vicidial_list table for all lists in a campaign #####
if (preg_match("/DUPCAMP/i",$dupcheck))
@@ -2315,10 +2320,6 @@ if (($leadfile) && ($LF_path))
$valid_number=1;
$invalid_reason='';
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
if ( (strlen($phone_number)<5) || (strlen($phone_number)>18) )
{
$valid_number=0;
@@ -2807,6 +2808,11 @@ if (($leadfile) && ($LF_path))
}
}
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
##### Check for duplicate phone numbers in vicidial_list table for all lists in a campaign #####
if (preg_match("/DUPCAMP/i",$dupcheck))
{
@@ -3078,10 +3084,6 @@ if (($leadfile) && ($LF_path))
$valid_number=1;
$dnc_matches=0;
$invalid_reason='';
if ( (strlen($SSweb_loader_phone_strip)>0) and ($SSweb_loader_phone_strip != 'DISABLED') )
{
$phone_number = preg_replace("/^$SSweb_loader_phone_strip/",'',$phone_number);
}
if ( (strlen($phone_number)<5) || (strlen($phone_number)>18) )
{
$valid_number=0;