From 81850156ee16aa51cdf0cdd18665851cfe498d9a Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 13 Dec 2021 21:30:44 +0000 Subject: [PATCH] Fix for new phone inserts template_id issue on some MySQL setups git-svn-id: svn://192.168.202.10@3544 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt | 11 ++++++++--- agc_2-X/trunk/www/vicidial/admin.php | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt index d423d457..95fcb497 100644 --- a/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt +++ b/agc_2-X/branches/agc_2.0.4/extras/phone_codes_GMT.txt @@ -42,6 +42,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 256 AL -6 Y SSM-FSN Alabama CST America/Chicago 1 USA 260 IN -5 Y SSM-FSN Indiana EST America/New_York 1 USA 262 WI -6 Y SSM-FSN Wisconsin CST America/Chicago +1 CAN 263 QC -5 Y SSM-FSN Quebec EST America/Toronto 1 AIA 264 -4 N Anguilla AST America/Anguilla 1 USA 267 PA -5 Y SSM-FSN Pennsylvania EST America/New_York 1 ATG 268 -4 N Antigua and Barbuda AST America/Antigua @@ -150,6 +151,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 458 OR -8 Y SSM-FSN Oregon PST America/Los_Angeles 1 USA 463 IN -5 Y SSM-FSN Indiana EST America/New_York 1 USA 464 IL -6 Y SSM-FSN Illinois CST America/Chicago +1 CAN 468 QC -5 Y SSM-FSN Quebec EST America/Toronto 1 USA 469 TX -6 Y SSM-FSN Texas CST America/Chicago 1 USA 470 GA -5 Y SSM-FSN Georgia EST America/New_York 1 USA 472 NC -5 Y SSM-FSN North Carolina EST America/New_York @@ -264,6 +266,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 680 NY -5 Y SSM-FSN New York EST America/New_York 1 USA 681 WV -5 Y SSM-FSN West Virginia EST America/New_York 1 USA 682 TX -6 Y SSM-FSN Texas CST America/Chicago +1 CAN 683 ON -5 Y SSM-FSN Ontario EST America/Toronto 1 ASM 684 -11 N American Samoa SST Pacific/Pago_Pago 1 USA 689 FL -5 Y SSM-FSN Florida EST America/New_York 1 USA 701 ND -6 Y SSM-FSN North Dakota CST America/Chicago @@ -299,6 +302,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 743 NC -5 Y SSM-FSN North Carolina EST America/New_York 1 USA 747 CA -8 Y SSM-FSN California PST America/Los_Angeles 1 USA 752 CA -8 Y SSM-FSN California PST America/Los_Angeles +1 CAN 753 ON -5 Y SSM-FSN Ontario EST America/Toronto 1 USA 754 FL -5 Y SSM-FSN Florida EST America/New_York 1 USA 757 VA -5 Y SSM-FSN Virginia EST America/New_York 1 LCA 758 -4 N St. Lucia AST America/St_Lucia @@ -366,6 +370,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 1 USA 858 CA -8 Y SSM-FSN California PST America/Los_Angeles 1 USA 859 KY -5 Y SSM-FSN Kentucky EST America/New_York 1 USA 860 CT -5 Y SSM-FSN Connecticut EST America/New_York +1 USA 861 IL -6 Y SSM-FSN Illinois CST America/Chicago 1 USA 862 NJ -5 Y SSM-FSN New Jersey EST America/New_York 1 USA 863 FL -5 Y SSM-FSN Florida EST America/New_York 1 USA 864 SC -5 Y SSM-FSN South Carolina EST America/New_York @@ -948,7 +953,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 82 KOR * +9 N Korea South KST Asia/Seoul 84 VNM * +7 N Vietnam ICT Asia/Ho_Chi_Minh 86 CHN * +8 N China CST Asia/Shanghai -90 TUR * +2 Y LSM-LSO Turkey EET Europe/Istanbul +90 TUR * +3 N Turkey TRT Europe/Istanbul 91 IND * +5.5 N India IST Asia/Kolkata 92 PAK * +5 N Pakistan PKT Asia/Karachi 93 AFG * +4.5 N Afghanistan AFT Asia/Kabul @@ -1003,7 +1008,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 261 MDG * +3 N Madagascar EAT Indian/Antananarivo 262 MYT * +3 N Reunion and Mayotte EAT Indian/Mayotte 263 ZWE * +2 N Zimbabwe CAT Africa/Harare -264 NAM * +2 Y FSS-FSA Namibia CAT Africa/Windhoek +264 NAM * +2 N Namibia CAT Africa/Windhoek 265 MWI * +2 N Malawi CAT Africa/Blantyre 266 LSO * +2 N Lesotho CAT Africa/Maseru 267 BWA * +2 N Botswana CAT Africa/Gaborone @@ -1055,7 +1060,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE PHP 506 CRI * -6 N Costa Rica CST America/Costa_Rica 507 PAN * -5 N Panama EST America/Panama 508 SPM * -3 Y SSM-FSN Saint Pierre and Miquelon PMST America/Miquelon -509 HTI * -5 N Haiti EST America/Port-au-Prince +509 HTI * -5 Y SSM-FSN Haiti EST America/Port-au-Prince 590 GLP * -4 N Guadeloupe AST America/Guadeloupe 591 BOL * -4 N Bolivia BOT America/La_Paz 592 GUY * -4 N Guyana AST America/Guyana diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 8c674fe6..22b5c49a 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -5745,12 +5745,13 @@ if ($SSscript_remove_js > 0) # 211027-1031 - Added lead_search Non-Agent API function # 211106-1500 - Added In-Group in_queue_nanque settings # 211208-1646 - Added user_location to User Modify page, Added Queue Groups to Admin pages +# 211213-1619 - Fix for new phone inserts template_id issue on some MySQL setups # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.14-834a'; -$build = '211208-1646'; +$admin_version = '2.14-835a'; +$build = '211213-1619'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -14328,7 +14329,7 @@ if ($ADD==21111111111) } } - $stmt="INSERT INTO phones (extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,protocol,local_gmt,outbound_cid,conf_secret,user_group$SQLfields) values('$extension','$dialplan_number','$voicemail_id','$phone_ip','$computer_ip','$server_ip','$login','$pass','$status','$active','$phone_type','$fullname','$company','$picture','$protocol','$local_gmt','$outbound_cid','$conf_secret','$user_group'$SQLvalues);"; + $stmt="INSERT INTO phones (extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,protocol,local_gmt,outbound_cid,conf_secret,user_group,template_id$SQLfields) values('$extension','$dialplan_number','$voicemail_id','$phone_ip','$computer_ip','$server_ip','$login','$pass','$status','$active','$phone_type','$fullname','$company','$picture','$protocol','$local_gmt','$outbound_cid','$conf_secret','$user_group',''$SQLvalues);"; #print_r($dps); #echo "$stmt
"; die; $rslt=mysql_to_mysqli($stmt, $link);