From af2d095d43ae0a5c8f33d85eb5410bab8f306acb Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 16 May 2015 15:42:40 +0000 Subject: [PATCH] Fixed conflicts with functions.php over lookup_gmt git-svn-id: svn://192.168.202.10@2322 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/admin_listloader_fourth_gen.php | 821 +------------------ www/vicidial/admin_listloader_third_gen.php | 798 ------------------ www/vicidial/non_agent_api.php | 19 +- 3 files changed, 13 insertions(+), 1625 deletions(-) diff --git a/www/vicidial/admin_listloader_fourth_gen.php b/www/vicidial/admin_listloader_fourth_gen.php index dc2e5f1e..525ad4db 100644 --- a/www/vicidial/admin_listloader_fourth_gen.php +++ b/www/vicidial/admin_listloader_fourth_gen.php @@ -60,10 +60,11 @@ # 141229-1814 - Added code for on-the-fly language translations display # 150209-2113 - Added master_list_override option to override template setting # 150312-1505 - Allow for single quotes in vicidial_list data fields +# 150516-1136 - Fixed conflict with functions.php # -$version = '2.12-58'; -$build = '150312-1505'; +$version = '2.12-59'; +$build = '150516-1136'; require("dbconnect_mysqli.php"); require("functions.php"); @@ -2318,819 +2319,3 @@ if (($leadfile) && ($LF_path)) - - - - - -4) ) - { - if (preg_match('/^1$/', $phone_code)) - { - $stmt="select postal_code,state,GMT_offset,DST,DST_range,country,country_code from vicidial_postal_codes where country_code='$phone_code' and postal_code LIKE \"$postal_code%\";"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[2]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[3]; - $dst_range = $row[4]; - $PC_processed++; - $postalgmt_found++; - $post++; - } - } - } - if ( ($postalgmt=="TZCODE") && (strlen($owner)>1) ) - { - $dst_range=''; - $dst='N'; - $gmt_offset=0; - - $stmt="select GMT_offset from vicidial_phone_codes where tz_code='$owner' and country_code='$phone_code' limit 1;"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[0]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $PC_processed++; - $postalgmt_found++; - $post++; - } - - $stmt = "select distinct DST_range from vicidial_phone_codes where tz_code='$owner' and country_code='$phone_code' order by DST_range desc limit 1;"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $dst_range = $row[0]; - if (strlen($dst_range)>2) {$dst = 'Y';} - } - } - if ( (preg_match("/NANPA/i",$tz_method)) && (strlen($USarea)>2) && (strlen($USprefix)>2) ) - { - $stmt="select GMT_offset,DST from vicidial_nanpa_prefix_codes where areacode='$USarea' and prefix='$USprefix';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[0]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[1]; - $dst_range = ''; - if ($dst == 'Y') - {$dst_range = 'SSM-FSN';} - $PC_processed++; - $postalgmt_found++; - $post++; - } - } - - if ($postalgmt_found < 1) - { - $PC_processed=0; - ### UNITED STATES ### - if ($phone_code =='1') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and areacode='$USarea';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### MEXICO ### - if ($phone_code =='52') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and areacode='$USarea';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### AUSTRALIA ### - if ($phone_code =='61') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and state='$state';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### ALL OTHER COUNTRY CODES ### - if (!$PC_processed) - { - $PC_processed++; - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - } - - ### Find out if DST to raise the gmt offset ### - $AC_GMT_diff = ($gmt_offset - $LOCAL_GMT_OFF_STD); - $AC_localtime = mktime(($Shour + $AC_GMT_diff), $Smin, $Ssec, $Smon, $Smday, $Syear); - $hour = date("H",$AC_localtime); - $min = date("i",$AC_localtime); - $sec = date("s",$AC_localtime); - $mon = date("m",$AC_localtime); - $mday = date("d",$AC_localtime); - $wday = date("w",$AC_localtime); - $year = date("Y",$AC_localtime); - $dsec = ( ( ($hour * 3600) + ($min * 60) ) + $sec ); - - $AC_processed=0; - if ( (!$AC_processed) and ($dst_range == 'SSM-FSN') ) - { - if ($DBX) {print " Second Sunday March to First Sunday November\n";} - #********************************************************************** - # SSM-FSN - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on Second Sunday March to First Sunday November at 2 am. - # INPUTS: - # mm INTEGER Month. - # dd INTEGER Day of the month. - # ns INTEGER Seconds into the day. - # dow INTEGER Day of week (0=Sunday, to 6=Saturday) - # OPTIONAL INPUT: - # timezone INTEGER hour difference UTC - local standard time - # (DEFAULT is blank) - # make calculations based on UTC time, - # which means shift at 10:00 UTC in April - # and 9:00 UTC in October - # OUTPUT: - # INTEGER 1 = DST, 0 = not DST - # - # S M T W T F S - # 1 2 3 4 5 6 7 - # 8 9 10 11 12 13 14 - #15 16 17 18 19 20 21 - #22 23 24 25 26 27 28 - #29 30 31 - # - # S M T W T F S - # 1 2 3 4 5 6 - # 7 8 9 10 11 12 13 - #14 15 16 17 18 19 20 - #21 22 23 24 25 26 27 - #28 29 30 31 - # - #********************************************************************** - - $USACAN_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 11) { - $USACAN_DST=0; - } elseif ($mm >= 4 and $mm <= 10) { - $USACAN_DST=1; - } elseif ($mm == 3) { - if ($dd > 13) { - $USACAN_DST=1; - } elseif ($dd >= ($dow+8)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $USACAN_DST=0; - } else { - $USACAN_DST=1; - } - } else { - if ($dow == 0 and $ns < 7200) { - $USACAN_DST=0; - } else { - $USACAN_DST=1; - } - } - } else { - $USACAN_DST=0; - } - } elseif ($mm == 11) { - if ($dd > 7) { - $USACAN_DST=0; - } elseif ($dd < ($dow+1)) { - $USACAN_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (7200+($timezone-1)*3600)) { - $USACAN_DST=1; - } else { - $USACAN_DST=0; - } - } else { # local time calculations - if ($ns < 7200) { - $USACAN_DST=1; - } else { - $USACAN_DST=0; - } - } - } else { - $USACAN_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $USACAN_DST\n";} - if ($USACAN_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSA-LSO') ) - { - if ($DBX) {print " First Sunday April to Last Sunday October\n";} - #********************************************************************** - # FSA-LSO - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in April and last Sunday in October at 2 am. - #********************************************************************** - - $USA_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 || $mm > 10) { - $USA_DST=0; - } elseif ($mm >= 5 and $mm <= 9) { - $USA_DST=1; - } elseif ($mm == 4) { - if ($dd > 7) { - $USA_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $USA_DST=0; - } else { - $USA_DST=1; - } - } else { - if ($dow == 0 and $ns < 7200) { - $USA_DST=0; - } else { - $USA_DST=1; - } - } - } else { - $USA_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $USA_DST=1; - } elseif ($dd < ($dow+25)) { - $USA_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (7200+($timezone-1)*3600)) { - $USA_DST=1; - } else { - $USA_DST=0; - } - } else { # local time calculations - if ($ns < 7200) { - $USA_DST=1; - } else { - $USA_DST=0; - } - } - } else { - $USA_DST=0; - } - } # end of month checks - - if ($DBX) {print " DST: $USA_DST\n";} - if ($USA_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'LSM-LSO') ) - { - if ($DBX) {print " Last Sunday March to Last Sunday October\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in March and last Sunday in October at 1 am. - #********************************************************************** - - $GBR_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $GBR_DST=0; - } elseif ($mm >= 4 and $mm <= 9) { - $GBR_DST=1; - } elseif ($mm == 3) { - if ($dd < 25) { - $GBR_DST=0; - } elseif ($dd < ($dow+25)) { - $GBR_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $GBR_DST=0; - } else { - $GBR_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $GBR_DST=0; - } else { - $GBR_DST=1; - } - } - } else { - $GBR_DST=1; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $GBR_DST=1; - } elseif ($dd < ($dow+25)) { - $GBR_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $GBR_DST=1; - } else { - $GBR_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $GBR_DST=1; - } else { - $GBR_DST=0; - } - } - } else { - $GBR_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $GBR_DST\n";} - if ($GBR_DST) {$gmt_offset++;} - $AC_processed++; - } - if ( (!$AC_processed) and ($dst_range == 'LSO-LSM') ) - { - if ($DBX) {print " Last Sunday October to Last Sunday March\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in October and last Sunday in March at 1 am. - #********************************************************************** - - $AUS_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $AUS_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $AUS_DST=0; - } elseif ($mm == 3) { - if ($dd < 25) { - $AUS_DST=1; - } elseif ($dd < ($dow+25)) { - $AUS_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUS_DST=1; - } else { - $AUS_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $AUS_DST=1; - } else { - $AUS_DST=0; - } - } - } else { - $AUS_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $AUS_DST=0; - } elseif ($dd < ($dow+25)) { - $AUS_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUS_DST=0; - } else { - $AUS_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $AUS_DST=0; - } else { - $AUS_DST=1; - } - } - } else { - $AUS_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $AUS_DST\n";} - if ($AUS_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-LSM') ) - { - if ($DBX) {print " First Sunday October to Last Sunday March\n";} - #********************************************************************** - # TASMANIA ONLY - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and last Sunday in March at 1 am. - #********************************************************************** - - $AUST_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $AUST_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $AUST_DST=0; - } elseif ($mm == 3) { - if ($dd < 25) { - $AUST_DST=1; - } elseif ($dd < ($dow+25)) { - $AUST_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUST_DST=1; - } else { - $AUST_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $AUST_DST=1; - } else { - $AUST_DST=0; - } - } - } else { - $AUST_DST=0; - } - } elseif ($mm == 10) { - if ($dd > 7) { - $AUST_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $AUST_DST=0; - } else { - $AUST_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $AUST_DST=0; - } else { - $AUST_DST=1; - } - } - } else { - $AUST_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $AUST_DST\n";} - if ($AUST_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-FSA') ) - { - if ($DBX) {print " Sunday in October to First Sunday in April\n";} - #********************************************************************** - # FSO-FSA - # 2008+ AUSTRALIA ONLY (country code 61) - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and first Sunday in April at 1 am. - #********************************************************************** - - $AUSE_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 or $mm > 10) { - $AUSE_DST=1; - } elseif ($mm >= 5 and $mm <= 9) { - $AUSE_DST=0; - } elseif ($mm == 4) { - if ($dd > 7) { - $AUSE_DST=0; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (3600+$timezone*3600)) { - $AUSE_DST=1; - } else { - $AUSE_DST=0; - } - } else { - if ($dow == 0 and $ns < 7200) { - $AUSE_DST=1; - } else { - $AUSE_DST=0; - } - } - } else { - $AUSE_DST=1; - } - } elseif ($mm == 10) { - if ($dd >= 8) { - $AUSE_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $AUSE_DST=0; - } else { - $AUSE_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $AUSE_DST=0; - } else { - $AUSE_DST=1; - } - } - } else { - $AUSE_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $AUSE_DST\n";} - if ($AUSE_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-TSM') ) - { - if ($DBX) {print " First Sunday October to Third Sunday March\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and third Sunday in March at 1 am. - #********************************************************************** - - $NZL_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $NZL_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $NZL_DST=0; - } elseif ($mm == 3) { - if ($dd < 14) { - $NZL_DST=1; - } elseif ($dd < ($dow+14)) { - $NZL_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $NZL_DST=1; - } else { - $NZL_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $NZL_DST=1; - } else { - $NZL_DST=0; - } - } - } else { - $NZL_DST=0; - } - } elseif ($mm == 10) { - if ($dd > 7) { - $NZL_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $NZL_DST=0; - } else { - $NZL_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $NZL_DST=0; - } else { - $NZL_DST=1; - } - } - } else { - $NZL_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $NZL_DST\n";} - if ($NZL_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'LSS-FSA') ) - { - if ($DBX) {print " Last Sunday in September to First Sunday in April\n";} - #********************************************************************** - # LSS-FSA - # 2007+ NEW ZEALAND (country code 64) - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in September and first Sunday in April at 1 am. - #********************************************************************** - - $NZLN_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 || $mm > 9) { - $NZLN_DST=1; - } elseif ($mm >= 5 && $mm <= 9) { - $NZLN_DST=0; - } elseif ($mm == 4) { - if ($dd > 7) { - $NZLN_DST=0; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 && $ns < (3600+$timezone*3600)) { - $NZLN_DST=1; - } else { - $NZLN_DST=0; - } - } else { - if ($dow == 0 && $ns < 7200) { - $NZLN_DST=1; - } else { - $NZLN_DST=0; - } - } - } else { - $NZLN_DST=1; - } - } elseif ($mm == 9) { - if ($dd < 25) { - $NZLN_DST=0; - } elseif ($dd < ($dow+25)) { - $NZLN_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $NZLN_DST=0; - } else { - $NZLN_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $NZLN_DST=0; - } else { - $NZLN_DST=1; - } - } - } else { - $NZLN_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $NZLN_DST\n";} - if ($NZLN_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'TSO-LSF') ) - { - if ($DBX) {print " Third Sunday October to Last Sunday February\n";} - #********************************************************************** - # TSO-LSF - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. Brazil - # Based on Third Sunday October to Last Sunday February at 1 am. - #********************************************************************** - - $BZL_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 2 || $mm > 10) { - $BZL_DST=1; - } elseif ($mm >= 3 and $mm <= 9) { - $BZL_DST=0; - } elseif ($mm == 2) { - if ($dd < 22) { - $BZL_DST=1; - } elseif ($dd < ($dow+22)) { - $BZL_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $BZL_DST=1; - } else { - $BZL_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $BZL_DST=1; - } else { - $BZL_DST=0; - } - } - } else { - $BZL_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 22) { - $BZL_DST=0; - } elseif ($dd < ($dow+22)) { - $BZL_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $BZL_DST=0; - } else { - $BZL_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $BZL_DST=0; - } else { - $BZL_DST=1; - } - } - } else { - $BZL_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $BZL_DST\n";} - if ($BZL_DST) {$gmt_offset++;} - $AC_processed++; - } - - if (!$AC_processed) - { - if ($DBX) {print " No DST Method Found\n";} - if ($DBX) {print " DST: 0\n";} - $AC_processed++; - } - - return $gmt_offset; - } - -?> - diff --git a/www/vicidial/admin_listloader_third_gen.php b/www/vicidial/admin_listloader_third_gen.php index e6aecb6d..7fd7a8d8 100644 --- a/www/vicidial/admin_listloader_third_gen.php +++ b/www/vicidial/admin_listloader_third_gen.php @@ -1547,801 +1547,3 @@ if (($leadfile) && ($LF_path)) - - - - - -4) ) - { - if (preg_match('/^1$/', $phone_code)) - { - $stmt="select postal_code,state,GMT_offset,DST,DST_range,country,country_code from vicidial_postal_codes where country_code='$phone_code' and postal_code LIKE \"$postal_code%\";"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[2]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[3]; - $dst_range = $row[4]; - $PC_processed++; - $postalgmt_found++; - $post++; - } - } - } - if ( ($postalgmt=="TZCODE") && (strlen($owner)>1) ) - { - $dst_range=''; - $dst='N'; - $gmt_offset=0; - - $stmt="select GMT_offset from vicidial_phone_codes where tz_code='$owner' and country_code='$phone_code' limit 1;"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[0]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $PC_processed++; - $postalgmt_found++; - $post++; - } - - $stmt = "select distinct DST_range from vicidial_phone_codes where tz_code='$owner' and country_code='$phone_code' order by DST_range desc limit 1;"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $dst_range = $row[0]; - if (strlen($dst_range)>2) {$dst = 'Y';} - } - } - - if ($postalgmt_found < 1) - { - $PC_processed=0; - ### UNITED STATES ### - if ($phone_code =='1') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and areacode='$USarea';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### MEXICO ### - if ($phone_code =='52') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and areacode='$USarea';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### AUSTRALIA ### - if ($phone_code =='61') - { - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code' and state='$state';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - ### ALL OTHER COUNTRY CODES ### - if (!$PC_processed) - { - $PC_processed++; - $stmt="select country_code,country,areacode,state,GMT_offset,DST,DST_range,geographic_description from vicidial_phone_codes where country_code='$phone_code';"; - $rslt=mysql_to_mysqli($stmt, $link); - $pc_recs = mysqli_num_rows($rslt); - if ($pc_recs > 0) - { - $row=mysqli_fetch_row($rslt); - $gmt_offset = $row[4]; $gmt_offset = preg_replace('/\+/i', '',$gmt_offset); - $dst = $row[5]; - $dst_range = $row[6]; - $PC_processed++; - } - } - } - - ### Find out if DST to raise the gmt offset ### - $AC_GMT_diff = ($gmt_offset - $LOCAL_GMT_OFF_STD); - $AC_localtime = mktime(($Shour + $AC_GMT_diff), $Smin, $Ssec, $Smon, $Smday, $Syear); - $hour = date("H",$AC_localtime); - $min = date("i",$AC_localtime); - $sec = date("s",$AC_localtime); - $mon = date("m",$AC_localtime); - $mday = date("d",$AC_localtime); - $wday = date("w",$AC_localtime); - $year = date("Y",$AC_localtime); - $dsec = ( ( ($hour * 3600) + ($min * 60) ) + $sec ); - - $AC_processed=0; - if ( (!$AC_processed) and ($dst_range == 'SSM-FSN') ) - { - if ($DBX) {print " Second Sunday March to First Sunday November\n";} - #********************************************************************** - # SSM-FSN - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on Second Sunday March to First Sunday November at 2 am. - # INPUTS: - # mm INTEGER Month. - # dd INTEGER Day of the month. - # ns INTEGER Seconds into the day. - # dow INTEGER Day of week (0=Sunday, to 6=Saturday) - # OPTIONAL INPUT: - # timezone INTEGER hour difference UTC - local standard time - # (DEFAULT is blank) - # make calculations based on UTC time, - # which means shift at 10:00 UTC in April - # and 9:00 UTC in October - # OUTPUT: - # INTEGER 1 = DST, 0 = not DST - # - # S M T W T F S - # 1 2 3 4 5 6 7 - # 8 9 10 11 12 13 14 - #15 16 17 18 19 20 21 - #22 23 24 25 26 27 28 - #29 30 31 - # - # S M T W T F S - # 1 2 3 4 5 6 - # 7 8 9 10 11 12 13 - #14 15 16 17 18 19 20 - #21 22 23 24 25 26 27 - #28 29 30 31 - # - #********************************************************************** - - $USACAN_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 11) { - $USACAN_DST=0; - } elseif ($mm >= 4 and $mm <= 10) { - $USACAN_DST=1; - } elseif ($mm == 3) { - if ($dd > 13) { - $USACAN_DST=1; - } elseif ($dd >= ($dow+8)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $USACAN_DST=0; - } else { - $USACAN_DST=1; - } - } else { - if ($dow == 0 and $ns < 7200) { - $USACAN_DST=0; - } else { - $USACAN_DST=1; - } - } - } else { - $USACAN_DST=0; - } - } elseif ($mm == 11) { - if ($dd > 7) { - $USACAN_DST=0; - } elseif ($dd < ($dow+1)) { - $USACAN_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (7200+($timezone-1)*3600)) { - $USACAN_DST=1; - } else { - $USACAN_DST=0; - } - } else { # local time calculations - if ($ns < 7200) { - $USACAN_DST=1; - } else { - $USACAN_DST=0; - } - } - } else { - $USACAN_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $USACAN_DST\n";} - if ($USACAN_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSA-LSO') ) - { - if ($DBX) {print " First Sunday April to Last Sunday October\n";} - #********************************************************************** - # FSA-LSO - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in April and last Sunday in October at 2 am. - #********************************************************************** - - $USA_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 || $mm > 10) { - $USA_DST=0; - } elseif ($mm >= 5 and $mm <= 9) { - $USA_DST=1; - } elseif ($mm == 4) { - if ($dd > 7) { - $USA_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $USA_DST=0; - } else { - $USA_DST=1; - } - } else { - if ($dow == 0 and $ns < 7200) { - $USA_DST=0; - } else { - $USA_DST=1; - } - } - } else { - $USA_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $USA_DST=1; - } elseif ($dd < ($dow+25)) { - $USA_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (7200+($timezone-1)*3600)) { - $USA_DST=1; - } else { - $USA_DST=0; - } - } else { # local time calculations - if ($ns < 7200) { - $USA_DST=1; - } else { - $USA_DST=0; - } - } - } else { - $USA_DST=0; - } - } # end of month checks - - if ($DBX) {print " DST: $USA_DST\n";} - if ($USA_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'LSM-LSO') ) - { - if ($DBX) {print " Last Sunday March to Last Sunday October\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in March and last Sunday in October at 1 am. - #********************************************************************** - - $GBR_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $GBR_DST=0; - } elseif ($mm >= 4 and $mm <= 9) { - $GBR_DST=1; - } elseif ($mm == 3) { - if ($dd < 25) { - $GBR_DST=0; - } elseif ($dd < ($dow+25)) { - $GBR_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $GBR_DST=0; - } else { - $GBR_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $GBR_DST=0; - } else { - $GBR_DST=1; - } - } - } else { - $GBR_DST=1; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $GBR_DST=1; - } elseif ($dd < ($dow+25)) { - $GBR_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $GBR_DST=1; - } else { - $GBR_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $GBR_DST=1; - } else { - $GBR_DST=0; - } - } - } else { - $GBR_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $GBR_DST\n";} - if ($GBR_DST) {$gmt_offset++;} - $AC_processed++; - } - if ( (!$AC_processed) and ($dst_range == 'LSO-LSM') ) - { - if ($DBX) {print " Last Sunday October to Last Sunday March\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in October and last Sunday in March at 1 am. - #********************************************************************** - - $AUS_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $AUS_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $AUS_DST=0; - } elseif ($mm == 3) { - if ($dd < 25) { - $AUS_DST=1; - } elseif ($dd < ($dow+25)) { - $AUS_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUS_DST=1; - } else { - $AUS_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $AUS_DST=1; - } else { - $AUS_DST=0; - } - } - } else { - $AUS_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 25) { - $AUS_DST=0; - } elseif ($dd < ($dow+25)) { - $AUS_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUS_DST=0; - } else { - $AUS_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $AUS_DST=0; - } else { - $AUS_DST=1; - } - } - } else { - $AUS_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $AUS_DST\n";} - if ($AUS_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-LSM') ) - { - if ($DBX) {print " First Sunday October to Last Sunday March\n";} - #********************************************************************** - # TASMANIA ONLY - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and last Sunday in March at 1 am. - #********************************************************************** - - $AUST_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $AUST_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $AUST_DST=0; - } elseif ($mm == 3) { - if ($dd < 25) { - $AUST_DST=1; - } elseif ($dd < ($dow+25)) { - $AUST_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $AUST_DST=1; - } else { - $AUST_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $AUST_DST=1; - } else { - $AUST_DST=0; - } - } - } else { - $AUST_DST=0; - } - } elseif ($mm == 10) { - if ($dd > 7) { - $AUST_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $AUST_DST=0; - } else { - $AUST_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $AUST_DST=0; - } else { - $AUST_DST=1; - } - } - } else { - $AUST_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $AUST_DST\n";} - if ($AUST_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-FSA') ) - { - if ($DBX) {print " Sunday in October to First Sunday in April\n";} - #********************************************************************** - # FSO-FSA - # 2008+ AUSTRALIA ONLY (country code 61) - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and first Sunday in April at 1 am. - #********************************************************************** - - $AUSE_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 or $mm > 10) { - $AUSE_DST=1; - } elseif ($mm >= 5 and $mm <= 9) { - $AUSE_DST=0; - } elseif ($mm == 4) { - if ($dd > 7) { - $AUSE_DST=0; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (3600+$timezone*3600)) { - $AUSE_DST=1; - } else { - $AUSE_DST=0; - } - } else { - if ($dow == 0 and $ns < 7200) { - $AUSE_DST=1; - } else { - $AUSE_DST=0; - } - } - } else { - $AUSE_DST=1; - } - } elseif ($mm == 10) { - if ($dd >= 8) { - $AUSE_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $AUSE_DST=0; - } else { - $AUSE_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $AUSE_DST=0; - } else { - $AUSE_DST=1; - } - } - } else { - $AUSE_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $AUSE_DST\n";} - if ($AUSE_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'FSO-TSM') ) - { - if ($DBX) {print " First Sunday October to Third Sunday March\n";} - #********************************************************************** - # This is s 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on first Sunday in October and third Sunday in March at 1 am. - #********************************************************************** - - $NZL_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 3 || $mm > 10) { - $NZL_DST=1; - } elseif ($mm >= 4 and $mm <= 9) { - $NZL_DST=0; - } elseif ($mm == 3) { - if ($dd < 14) { - $NZL_DST=1; - } elseif ($dd < ($dow+14)) { - $NZL_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $NZL_DST=1; - } else { - $NZL_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $NZL_DST=1; - } else { - $NZL_DST=0; - } - } - } else { - $NZL_DST=0; - } - } elseif ($mm == 10) { - if ($dd > 7) { - $NZL_DST=1; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 and $ns < (7200+$timezone*3600)) { - $NZL_DST=0; - } else { - $NZL_DST=1; - } - } else { - if ($dow == 0 and $ns < 3600) { - $NZL_DST=0; - } else { - $NZL_DST=1; - } - } - } else { - $NZL_DST=0; - } - } # end of month checks - if ($DBX) {print " DST: $NZL_DST\n";} - if ($NZL_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'LSS-FSA') ) - { - if ($DBX) {print " Last Sunday in September to First Sunday in April\n";} - #********************************************************************** - # LSS-FSA - # 2007+ NEW ZEALAND (country code 64) - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. - # Based on last Sunday in September and first Sunday in April at 1 am. - #********************************************************************** - - $NZLN_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 4 || $mm > 9) { - $NZLN_DST=1; - } elseif ($mm >= 5 && $mm <= 9) { - $NZLN_DST=0; - } elseif ($mm == 4) { - if ($dd > 7) { - $NZLN_DST=0; - } elseif ($dd >= ($dow+1)) { - if ($timezone) { - if ($dow == 0 && $ns < (3600+$timezone*3600)) { - $NZLN_DST=1; - } else { - $NZLN_DST=0; - } - } else { - if ($dow == 0 && $ns < 7200) { - $NZLN_DST=1; - } else { - $NZLN_DST=0; - } - } - } else { - $NZLN_DST=1; - } - } elseif ($mm == 9) { - if ($dd < 25) { - $NZLN_DST=0; - } elseif ($dd < ($dow+25)) { - $NZLN_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $NZLN_DST=0; - } else { - $NZLN_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $NZLN_DST=0; - } else { - $NZLN_DST=1; - } - } - } else { - $NZLN_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $NZLN_DST\n";} - if ($NZLN_DST) {$gmt_offset++;} - $AC_processed++; - } - - if ( (!$AC_processed) and ($dst_range == 'TSO-LSF') ) - { - if ($DBX) {print " Third Sunday October to Last Sunday February\n";} - #********************************************************************** - # TSO-LSF - # This is returns 1 if Daylight Savings Time is in effect and 0 if - # Standard time is in effect. Brazil - # Based on Third Sunday October to Last Sunday February at 1 am. - #********************************************************************** - - $BZL_DST=0; - $mm = $mon; - $dd = $mday; - $ns = $dsec; - $dow= $wday; - - if ($mm < 2 || $mm > 10) { - $BZL_DST=1; - } elseif ($mm >= 3 and $mm <= 9) { - $BZL_DST=0; - } elseif ($mm == 2) { - if ($dd < 22) { - $BZL_DST=1; - } elseif ($dd < ($dow+22)) { - $BZL_DST=1; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $BZL_DST=1; - } else { - $BZL_DST=0; - } - } else { # local time calculations - if ($ns < 3600) { - $BZL_DST=1; - } else { - $BZL_DST=0; - } - } - } else { - $BZL_DST=0; - } - } elseif ($mm == 10) { - if ($dd < 22) { - $BZL_DST=0; - } elseif ($dd < ($dow+22)) { - $BZL_DST=0; - } elseif ($dow == 0) { - if ($timezone) { # UTC calculations - if ($ns < (3600+($timezone-1)*3600)) { - $BZL_DST=0; - } else { - $BZL_DST=1; - } - } else { # local time calculations - if ($ns < 3600) { - $BZL_DST=0; - } else { - $BZL_DST=1; - } - } - } else { - $BZL_DST=1; - } - } # end of month checks - if ($DBX) {print " DST: $BZL_DST\n";} - if ($BZL_DST) {$gmt_offset++;} - $AC_processed++; - } - - if (!$AC_processed) - { - if ($DBX) {print " No DST Method Found\n";} - if ($DBX) {print " DST: 0\n";} - $AC_processed++; - } - - return $gmt_offset; - } - -?> - diff --git a/www/vicidial/non_agent_api.php b/www/vicidial/non_agent_api.php index d9a22d0e..bbba054d 100644 --- a/www/vicidial/non_agent_api.php +++ b/www/vicidial/non_agent_api.php @@ -98,10 +98,11 @@ # 150428-1720 - Added web_form_address_three to add_list/update_list functions # 150430-0644 - Added API allowed function restrictions and allowed list restrictions # 150512-2028 - Added filtering of hash sign on some input variables, Issue #851 +# 150516-1138 - Fixed conflict with functions.php # -$version = '2.12-74'; -$build = '150512-2028'; +$version = '2.12-75'; +$build = '150516-1138'; $api_url_log = 0; $startMS = microtime(); @@ -6269,7 +6270,7 @@ if ($function == 'add_lead') ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix); $new_status='NEW'; if ($callback == 'Y') @@ -7195,7 +7196,7 @@ if ($function == 'update_lead') } } ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix); if (strlen($status)<1) {$status='NEW';} @@ -7586,7 +7587,7 @@ if ($function == 'check_phone_number') { $tz_run++; ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'',$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'',$postal_code,$owner,$USprefix); ### call function to determine if lead is dialable $dialable = dialable_gmt($DB,$link,$local_call_time,$gmt_offset,$state); @@ -7601,7 +7602,7 @@ if ($function == 'check_phone_number') if ( (strlen($postal_code)>4) and (strlen($postal_code)< 6) ) { ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'POSTAL',$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'POSTAL',$postal_code,$owner,$USprefix); ### call function to determine if lead is dialable $dialable = dialable_gmt($DB,$link,$local_call_time,$gmt_offset,$state); @@ -7617,7 +7618,7 @@ if ($function == 'check_phone_number') if ( (strlen($owner)>0) and (strlen($owner)< 7) ) { ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'TZCODE',$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'TZCODE',$postal_code,$owner,$USprefix); ### call function to determine if lead is dialable $dialable = dialable_gmt($DB,$link,$local_call_time,$gmt_offset,$state); @@ -7630,7 +7631,7 @@ if ($function == 'check_phone_number') { $tz_run++; ### get current gmt_offset of the phone_number - $gmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'NANPA',$postal_code,$owner,$USprefix); + $gmt_offset = lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,'NANPA',$postal_code,$owner,$USprefix); ### call function to determine if lead is dialable $dialable = dialable_gmt($DB,$link,$local_call_time,$gmt_offset,$state); @@ -7685,7 +7686,7 @@ exit; ##### LOOKUP GMT, FINDS THE CURRENT GMT OFFSET FOR A PHONE NUMBER ##### -function lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix) +function lookup_gmt_api($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$tz_method,$postal_code,$owner,$USprefix) { require("dbconnect_mysqli.php");