From 6d5c78e347b42e14fe5dff7fc96b8d915a0b17c8 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 4 Feb 2015 17:49:20 +0000 Subject: [PATCH] Small fixes and updates, Issue #826 git-svn-id: svn://192.168.202.10@2268 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../branches/agc_2.0.4/extras/GMT_USA_zip.txt | 29 +++++++++++++++++++ .../agc_2.0.4/extras/phone_codes_GMT.txt | 1 + agc_2-X/trunk/bin/ADMIN_area_code_populate.pl | 11 ++++--- agc_2-X/trunk/www/vicidial/help.php | 15 +++++----- 4 files changed, 43 insertions(+), 13 deletions(-) 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 aa3c4f66..8cb0f794 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 @@ -3126,6 +3126,7 @@ 08638 NJ -5.0 Y 08640 NJ -5.0 Y 08641 NJ -5.0 Y +08644 NJ -5.0 Y 08645 NJ -5.0 Y 08646 NJ -5.0 Y 08647 NJ -5.0 Y @@ -3255,6 +3256,7 @@ 09012 AE 1.0 Y 09013 AE 1.0 Y 09014 AE 1.0 Y +09016 AE 1.0 Y 09020 AE 1.0 Y 09021 AE 1.0 Y 09028 AE 1.0 Y @@ -3341,6 +3343,7 @@ 09315 AE 1.0 Y 09316 AE 1.0 Y 09317 AE 1.0 Y +09319 AE 1.0 Y 09320 AE 1.0 Y 09321 AE 1.0 Y 09327 AE 1.0 Y @@ -3429,6 +3432,7 @@ 09517 AE 1.0 Y 09520 AE 1.0 Y 09522 AE 1.0 Y +09523 AE 1.0 Y 09524 AE 1.0 Y 09532 AE 1.0 Y 09534 AE 1.0 Y @@ -3455,12 +3459,14 @@ 09579 AE 1.0 Y 09581 AE 1.0 Y 09582 AE 1.0 Y +09583 AE 1.0 Y 09586 AE 1.0 Y 09587 AE 1.0 Y 09588 AE 1.0 Y 09589 AE 1.0 Y 09590 AE 1.0 Y 09591 AE 1.0 Y +09592 AE 1.0 Y 09593 AE 1.0 Y 09594 AE 1.0 Y 09595 AE 1.0 Y @@ -3507,6 +3513,7 @@ 09709 AE 1.0 Y 09710 AE 1.0 Y 09711 AE 1.0 Y +09712 AE 1.0 Y 09713 AE 1.0 Y 09714 AE 1.0 Y 09715 AE 1.0 Y @@ -3552,6 +3559,7 @@ 09757 AE 1.0 Y 09758 AE 1.0 Y 09759 AE 1.0 Y +09760 AE 1.0 Y 09762 AE 1.0 Y 09769 AE 1.0 Y 09777 AE 1.0 Y @@ -3599,15 +3607,18 @@ 09840 AE 1.0 Y 09841 AE 1.0 Y 09842 AE 1.0 Y +09843 AE 1.0 Y 09844 AE 1.0 Y 09845 AE 1.0 Y 09846 AE 1.0 Y +09847 AE 1.0 Y 09848 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 09865 AE 1.0 Y 09866 AE 1.0 Y 09868 AE 1.0 Y @@ -8331,6 +8342,7 @@ 20245 DC -5.0 Y 20250 DC -5.0 Y 20251 DC -5.0 Y +20252 DC -5.0 Y 20254 DC -5.0 Y 20260 DC -5.0 Y 20261 DC -5.0 Y @@ -11243,6 +11255,7 @@ 27263 NC -5.0 Y 27264 NC -5.0 Y 27265 NC -5.0 Y +27268 NC -5.0 Y 27278 NC -5.0 Y 27281 NC -5.0 Y 27282 NC -5.0 Y @@ -14965,6 +14978,7 @@ 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 34098 AA -4.0 Y 34099 AA -4.0 Y @@ -25019,6 +25033,7 @@ 56965 DC -5.0 Y 56967 DC -5.0 Y 56972 DC -5.0 Y +56998 DC -5.0 Y 56999 DC -5.0 Y 57001 SD -6.0 Y 57002 SD -6.0 Y @@ -25807,6 +25822,7 @@ 58795 ND -6.0 Y 58801 ND -6.0 Y 58802 ND -6.0 Y +58803 ND -6.0 Y 58830 ND -6.0 Y 58831 ND -6.0 Y 58833 ND -6.0 Y @@ -26558,6 +26574,7 @@ 60566 IL -6.0 Y 60567 IL -6.0 Y 60568 IL -6.0 Y +60569 IL -6.0 Y 60570 IL -6.0 Y 60572 IL -6.0 Y 60585 IL -6.0 Y @@ -27995,6 +28012,7 @@ 63377 MO -6.0 Y 63378 MO -6.0 Y 63379 MO -6.0 Y +63380 MO -6.0 Y 63381 MO -6.0 Y 63382 MO -6.0 Y 63383 MO -6.0 Y @@ -37134,6 +37152,7 @@ 86002 AZ -7.0 N 86003 AZ -7.0 N 86004 AZ -7.0 N +86005 AZ -7.0 N 86011 AZ -7.0 N 86015 AZ -7.0 N 86016 AZ -7.0 N @@ -40710,6 +40729,7 @@ 96326 AP 9.0 N 96328 AP 9.0 N 96330 AP 9.0 N +96331 AP 9.0 N 96336 AP 9.0 N 96337 AP 9.0 N 96338 AP 9.0 N @@ -40812,6 +40832,7 @@ 96624 AP 9.0 N 96628 AP 9.0 N 96629 AP 9.0 N +96631 AP 9.0 N 96643 AP 9.0 N 96650 AP 9.0 N 96657 AP 9.0 N @@ -40839,6 +40860,12 @@ 96683 AP 9.0 N 96686 AP 9.0 N 96687 AP 9.0 N +96691 AP 9.0 N +96692 AP 9.0 N +96693 AP 9.0 N +96694 AP 9.0 N +96695 AP 9.0 N +96696 AP 9.0 N 96698 AP 9.0 N 96701 HI -10.0 N 96703 HI -10.0 N @@ -40928,6 +40955,7 @@ 96796 HI -10.0 N 96797 HI -10.0 N 96799 AS -11.0 N +96799 AS 10.0 N 96801 HI -10.0 N 96802 HI -10.0 N 96803 HI -10.0 N @@ -41006,6 +41034,7 @@ 96970 MH -12.0 N 97001 OR -8.0 Y 97002 OR -8.0 Y +97003 OR -8.0 Y 97004 OR -8.0 Y 97005 OR -8.0 Y 97006 OR -8.0 Y 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 ca038017..25308080 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 @@ -383,6 +383,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 929 NY -5 Y SSM-FSN New York EST 1 USA 930 IN -5 Y SSM-FSN Indiana EST 1 USA 931 TN -6 Y SSM-FSN Tennessee CST +1 USA 934 NY -5 Y SSM-FSN New York EST 1 USA 935 CA -8 Y SSM-FSN California PST 1 USA 936 TX -6 Y SSM-FSN Texas CST 1 USA 937 OH -5 Y SSM-FSN Ohio EST 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 8f19c7a7..c387d5f7 100644 --- a/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl +++ b/agc_2-X/trunk/bin/ADMIN_area_code_populate.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl # -# ADMIN_area_code_populate.pl version 2.6 +# ADMIN_area_code_populate.pl version 2.10 # -# Copyright (C) 2013 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # Description: # server application that allows load areacodes into to asterisk list database @@ -20,6 +20,7 @@ # 100902-1536 - Move old data files if wgetting new ones # 110424-0735 - Added timezone abbreviation column # 130419-1237 - Added lata_type field to NANPA file format +# 150203-1751 - code cleanup # @@ -159,11 +160,10 @@ $dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VA or die "Couldn't connect to database: " . DBI->errstr; - if ($nanpa_load > 0) { #### load special North American phone code prefix table #### - # LONG # NPA,NXX,,,,LTYPE,,STATE,COUNTRY,,,,,RC,TZ,DST,ZIP,,,,,,,,,,,LATITUDE,LONGITUDE,,,,, + # LONG # NPA,NXX,,,,LTYPE,,STATE,COUNTRY,,,,,RC,TZ,DST,ZIP,,,,,,,,,,,LATITUDE,LONGITUDE,,,,,,, # SHORT # NPA,NXX,TZ,DST,LATITUDE,LONGITUDE,CITY,STATE,POSTAL_CODE,COUNTRY,LTYPE #### BEGIN vicidial_nanpa_prefix_codes population from NANPA_prefix-latest.txt file #### @@ -229,7 +229,7 @@ if ($nanpa_load > 0) if ($sthArows > 0) { @aryA = $sthA->fetchrow_array; - $dup_check = "$aryA[0]"; + $dup_check = $aryA[0]; } $sthA->finish(); @@ -267,7 +267,6 @@ if ($nanpa_load > 0) $ins_stmt="insert into vicidial_nanpa_prefix_codes VALUES "; print STDERR "$pc Lines $ins_count Inserted $dup_count Duplicates\n"; #### END vicidial_nanpa_prefix_codes population #### - } else { diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index 0b0a58cd..031e99ba 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -36,6 +36,7 @@ # 150111-1542 - Added lists-local_call_time and manual_dial_search_filter # 150117-1439 - Added NAME option to campaigns-status_display_fields # 150120-0636 - Hide non-functional agent_extended_alt_dial campaign feature +# 150204-1246 - Small fixes, issue #826 # require("dbconnect_mysqli.php"); @@ -454,7 +455,7 @@ if ($SScustom_fields_enabled > 0) - "); ?> +?>
@@ -504,7 +505,7 @@ if ($SSoutbound_autodial_active > 0)

- Delete Filters"); ?> - - @@ -552,17 +553,17 @@ if ($SSqc_features_active > 0)

- QC Record Pass"); ?> - + -

- QC Record Finish"); ?> - + -

- QC Record Commit"); ?> - - @@ -913,7 +914,7 @@ if ($SSoutbound_autodial_active > 0)

- - + -
@@ -2875,7 +2876,7 @@ if ($SSqc_features_active > 0) -



"); ?> +