diff --git a/agc_2-X/branches/agc_2.0.4/extras/GMT_USA_zip.txt b/agc_2-X/branches/agc_2.0.4/extras/GMT_USA_zip.txt index 8cb0f794..cbee47df 100644 --- a/agc_2-X/branches/agc_2.0.4/extras/GMT_USA_zip.txt +++ b/agc_2-X/branches/agc_2.0.4/extras/GMT_USA_zip.txt @@ -3264,6 +3264,7 @@ 09034 AE 1.0 Y 09038 AE 1.0 Y 09042 AE 1.0 Y +09044 AE 1.0 Y 09046 AE 1.0 Y 09049 AE 1.0 Y 09051 AE 1.0 Y @@ -3296,6 +3297,7 @@ 09112 AE 1.0 Y 09114 AE 1.0 Y 09123 AE 1.0 Y +09125 AE 1.0 Y 09126 AE 1.0 Y 09128 AE 1.0 Y 09131 AE 1.0 Y @@ -3307,6 +3309,8 @@ 09142 AE 1.0 Y 09143 AE 1.0 Y 09154 AE 1.0 Y +09160 AE 1.0 Y +09161 AE 1.0 Y 09172 AE 1.0 Y 09173 AE 1.0 Y 09177 AE 1.0 Y @@ -3391,6 +3395,7 @@ 09377 AE 1.0 Y 09378 AE 1.0 Y 09380 AE 1.0 Y +09381 AE 1.0 Y 09382 AE 1.0 Y 09383 AE 1.0 Y 09384 AE 1.0 Y @@ -3472,6 +3477,7 @@ 09595 AE 1.0 Y 09596 AE 1.0 Y 09599 AE 1.0 Y +09600 AE 1.0 Y 09602 AE 1.0 Y 09603 AE 1.0 Y 09604 AE 1.0 Y @@ -3553,6 +3559,7 @@ 09750 AE 1.0 Y 09751 AE 1.0 Y 09752 AE 1.0 Y +09753 AE 1.0 Y 09754 AE 1.0 Y 09755 AE 1.0 Y 09756 AE 1.0 Y @@ -3564,6 +3571,7 @@ 09769 AE 1.0 Y 09777 AE 1.0 Y 09780 AE 1.0 Y +09789 AE 1.0 Y 09798 AE 1.0 Y 09801 AE 1.0 Y 09802 AE 1.0 Y @@ -3613,12 +3621,14 @@ 09846 AE 1.0 Y 09847 AE 1.0 Y 09848 AE 1.0 Y +09851 AE 1.0 Y 09852 AE 1.0 Y 09853 AE 1.0 Y 09855 AE 1.0 Y 09858 AE 1.0 Y 09859 AE 1.0 Y 09861 AE 1.0 Y +09863 AE 1.0 Y 09865 AE 1.0 Y 09866 AE 1.0 Y 09868 AE 1.0 Y @@ -3629,6 +3639,7 @@ 09880 AE 1.0 Y 09890 AE 1.0 Y 09892 AE 1.0 Y +09895 AE 1.0 Y 09898 AE 1.0 Y 10001 NY -5.0 Y 10002 NY -5.0 Y @@ -12503,6 +12514,7 @@ 29483 SC -5.0 Y 29484 SC -5.0 Y 29485 SC -5.0 Y +29486 SC -5.0 Y 29487 SC -5.0 Y 29488 SC -5.0 Y 29492 SC -5.0 Y @@ -14469,11 +14481,14 @@ 33188 FL -5.0 Y 33189 FL -5.0 Y 33190 FL -5.0 Y +33191 FL -5.0 Y +33192 FL -5.0 Y 33193 FL -5.0 Y 33194 FL -5.0 Y 33195 FL -5.0 Y 33196 FL -5.0 Y 33197 FL -5.0 Y +33198 FL -5.0 Y 33199 FL -5.0 Y 33206 FL -5.0 Y 33222 FL -5.0 Y @@ -14974,12 +14989,18 @@ 34058 AA -4.0 Y 34060 AA -4.0 Y 34078 AA -4.0 Y +34080 AA -4.0 Y +34081 AA -4.0 Y +34082 AA -4.0 Y +34083 AA -4.0 Y +34084 AA -4.0 Y 34090 AA -4.0 Y 34091 AA -4.0 Y 34092 AA -4.0 Y 34093 AA -4.0 Y 34094 AA -4.0 Y 34095 AA -4.0 Y +34096 AA -4.0 Y 34098 AA -4.0 Y 34099 AA -4.0 Y 34101 FL -5.0 Y @@ -25023,6 +25044,7 @@ 56901 DC -5.0 Y 56902 DC -5.0 Y 56904 DC -5.0 Y +56908 DC -5.0 Y 56915 DC -5.0 Y 56920 DC -5.0 Y 56933 DC -5.0 Y @@ -36363,6 +36385,7 @@ 84006 UT -7.0 Y 84007 UT -7.0 Y 84008 UT -7.0 Y +84009 UT -7.0 Y 84010 UT -7.0 Y 84011 UT -7.0 Y 84013 UT -7.0 Y @@ -37452,6 +37475,7 @@ 87543 NM -7.0 Y 87544 NM -7.0 Y 87545 NM -7.0 Y +87547 NM -7.0 Y 87548 NM -7.0 Y 87549 NM -7.0 Y 87551 NM -7.0 Y @@ -40065,6 +40089,7 @@ 95211 CA -8.0 Y 95212 CA -8.0 Y 95213 CA -8.0 Y +95214 CA -8.0 Y 95215 CA -8.0 Y 95219 CA -8.0 Y 95220 CA -8.0 Y @@ -40696,12 +40721,14 @@ 96205 AP 9.0 N 96206 AP 9.0 N 96207 AP 9.0 N +96208 AP 9.0 N 96209 AP 9.0 N 96213 AP 9.0 N 96214 AP 9.0 N 96218 AP 9.0 N 96220 AP 9.0 N 96224 AP 9.0 N +96251 AP 9.0 N 96257 AP 9.0 N 96258 AP 9.0 N 96259 AP 9.0 N @@ -40770,6 +40797,8 @@ 96501 AP 9.0 N 96502 AP 9.0 N 96503 AP 9.0 N +96504 AP 9.0 N +96505 AP 9.0 N 96507 AP 9.0 N 96510 AP 9.0 N 96511 AP 9.0 N @@ -40833,7 +40862,9 @@ 96628 AP 9.0 N 96629 AP 9.0 N 96631 AP 9.0 N +96632 AP 9.0 N 96643 AP 9.0 N +96649 AP 9.0 N 96650 AP 9.0 N 96657 AP 9.0 N 96660 AP 9.0 N @@ -41179,7 +41210,9 @@ 97239 OR -8.0 Y 97240 OR -8.0 Y 97242 OR -8.0 Y +97250 OR -8.0 Y 97251 OR -8.0 Y +97252 OR -8.0 Y 97253 OR -8.0 Y 97254 OR -8.0 Y 97255 OR -8.0 Y diff --git a/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl b/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl index d3261afb..8f5b551f 100644 --- a/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl +++ b/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl @@ -2,7 +2,7 @@ # # ADMIN_area_code_populate.pl version 2.12 # -# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # Description: # server application that allows load areacodes into to asterisk list database @@ -13,7 +13,7 @@ # - changed to use /etc/astguiclient.conf for configs # 61122-1902 - Added GMT_USA_zip.txt data import for USA postal GMT data # 80416-1017 - Added download of phone codes from remote host -# 90129-0932 - Added optional NANP prefix/time date import "--load-NANPA-prefix" flag +# 90129-0932 - Added optional NANPA prefix/time date import "--load-NANPA-prefix" flag # 90131-0933 - Added purge-table option to clear out old records before adding new ones # 90204-0806 - Added duplicate check to nanpa list loading # 90317-2353 - Added city, state, postal_code, country to nanpa format @@ -22,13 +22,14 @@ # 130419-1237 - Added lata_type field to NANPA file format # 150203-1751 - code cleanup # 151228-1043 - Added ISO-TLD table and import +# 160611-0933 - Added more documentation # # default path to astguiclient configuration file: $PATHconf = "/etc/astguiclient.conf"; $domain = "http://phonecodes.vicidial.com"; -#$URL1 = "$domain/phone_codes_GMT-latest.txt"; +#$URL1 = "$domain/phone_codes_GMT-latest.txt"; $URL1 = "$domain/phone_codes_GMT-latest-24.txt"; $URL2 = "$domain/GMT_USA_zip-latest.txt"; $URL3 = "$domain/country_ISO_TLD-latest.txt"; @@ -52,12 +53,21 @@ if (length($ARGV[0])>1) print " [--debug] = debug output\n"; print " [--use-local-files] = Do not download files, use local copies\n"; print " [--load-NANPA-prefix] = Only loads the special NANPA list into the database\n"; + print " NOTE: NANPA data must be purchased from 'http://vicidial.org/store.php'\n"; print " [--purge-table] = Purges the table to be inserted before inserting\n"; - print "\n files used by this script are:\n"; + print "\n"; + print " Files used by this script are:\n"; print " phone_codes_GMT-latest-24.txt - Phone codes and country codes with time zone data\n"; print " GMT_USA_zip-latest.txt - USA zip code and time zone data\n"; print " country_ISO_TLD-latest.txt - Country code ISO and TLD data\n"; print " NANPA_prefix-latest.txt - North American areacode, prefix and time zone data\n"; + print "\n"; + print " Update schedules for data files:\n"; + print " phone_codes - Usually a few times a year, as areacodes in North America are added\n"; + print " GMT_USA_zip - About once per year\n"; + print " country_ISO_TLD - Only when country code data changes, not frequently\n"; + print " NANPA_prefix - About once per year\n"; + print "\n"; exit; } diff --git a/agc_2-X/trunk/www/vicidial/qc_modify_lead.php b/agc_2-X/trunk/www/vicidial/qc_modify_lead.php index d3737ada..a5273ca4 100644 --- a/agc_2-X/trunk/www/vicidial/qc_modify_lead.php +++ b/agc_2-X/trunk/www/vicidial/qc_modify_lead.php @@ -6,7 +6,7 @@ # qc_modify_lead.php # # Copyright (C) 2012 poundteam.com LICENSE: AGPLv2 -# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # This script is designed to allow QC review and modification of leads, contributed by poundteam.com # @@ -23,6 +23,7 @@ # 150808-1437 - Added compatibility for custom fields data options # 150908-1531 - Fixed input lengths for several standard fields to match DB # 150917-1311 - Added dynamic default field maxlengths based on DB schema +# 160611-1217 - Fixed for external server IP recording link issue # require("dbconnect_mysqli.php"); @@ -1326,7 +1327,7 @@ else if ($rowx[0] > 0) { - $stmt="select recording_web_link,alt_server_ip from servers where server_ip='$URLserver_ip';"; + $stmt="select recording_web_link,alt_server_ip,external_server_ip from servers where server_ip='$URLserver_ip';"; $rsltx=mysql_to_mysqli($stmt, $link); $rowx=mysqli_fetch_row($rsltx);