From eef591f137a4f9123794db242fd46e933d9fd904 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 7 Mar 2015 14:23:25 +0000 Subject: [PATCH] Fixes in the admin web interfaces for QXZ issues git-svn-id: svn://192.168.202.10@2295 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../agc_2.0.4/extras/phone_codes_GMT.txt | 11 +- .../www/vicidial/AST_timeonVDADall.php | 13 +- .../agc_2.11/www/vicidial/admin_header.php | 47 ++++--- .../agc_2.11/www/vicidial/realtime_report.php | 133 +++++++++--------- .../trunk/www/vicidial/AST_timeonVDADall.php | 13 +- agc_2-X/trunk/www/vicidial/admin_header.php | 47 ++++--- .../trunk/www/vicidial/realtime_report.php | 133 +++++++++--------- 7 files changed, 201 insertions(+), 196 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 25308080..05546151 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 @@ -94,7 +94,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 347 NY -5 Y SSM-FSN New York EST 1 USA 351 MA -5 Y SSM-FSN Massachusetts EST 1 USA 352 FL -5 Y SSM-FSN Florida EST -1 USA 353 WI -6 Y SSM-FSN Wisconsin CST 1 USA 358 PA -5 Y SSM-FSN Pennsylvania EST 1 USA 360 WA -8 Y SSM-FSN Washington PST 1 USA 361 TX -6 Y SSM-FSN Texas CST @@ -102,8 +101,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 CAN 365 ON -5 Y SSM-FSN Ontario EST 1 USA 369 CA -8 Y SSM-FSN California PST 1 USA 380 OH -5 Y SSM-FSN Ohio EST -1 USA 381 VA -5 Y SSM-FSN Virginia EST -1 USA 383 ME -5 Y SSM-FSN Maine EST 1 USA 385 UT -7 Y SSM-FSN Utah MST 1 USA 386 FL -5 Y SSM-FSN Florida EST 1 USA 401 RI -5 Y SSM-FSN Rhode Island EST @@ -124,7 +121,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 417 MO -6 Y SSM-FSN Missouri CST 1 CAN 418 QC -5 Y SSM-FSN Quebec EST 1 USA 419 OH -5 Y SSM-FSN Ohio EST -1 USA 420 WI -6 Y SSM-FSN Wisconsin CST 1 USA 423 TN -5 Y SSM-FSN Tennessee EST 1 USA 424 CA -8 Y SSM-FSN California PST 1 USA 425 WA -8 Y SSM-FSN Washington PST @@ -246,6 +242,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 669 CA -8 Y SSM-FSN California PST 1 MNP 670 MP +10 N Mariana Islands ChST 1 GUM 671 GU +10 N Guam GST +1 CAN 672 BC -8 Y SSM-FSN British Columbia PST 1 USA 678 GA -5 Y SSM-FSN Georgia EST 1 USA 679 MI -5 Y SSM-FSN Michigan EST 1 USA 681 WV -5 Y SSM-FSN West Virginia EST @@ -280,6 +277,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 734 MI -5 Y SSM-FSN Michigan EST 1 USA 737 TX -6 Y SSM-FSN Texas CST 1 USA 740 OH -5 Y SSM-FSN Ohio EST +1 CAN 742 ON -5 Y SSM-FSN Ontario EST 1 USA 743 NC -5 Y SSM-FSN North Carolina EST 1 USA 747 CA -8 Y SSM-FSN California PST 1 USA 752 CA -8 Y SSM-FSN California PST @@ -332,7 +330,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 831 CA -8 Y SSM-FSN California PST 1 USA 832 TX -6 Y SSM-FSN Texas CST 1 USA 835 PA -5 Y SSM-FSN Pennsylvania EST -1 USA 836 FL -5 Y SSM-FSN Florida EST 1 USA 843 SC -5 Y SSM-FSN South Carolina EST 1 USA 845 NY -5 Y SSM-FSN New York EST 1 USA 847 IL -6 Y SSM-FSN Illinois CST @@ -345,7 +342,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 858 CA -8 Y SSM-FSN California PST 1 USA 859 KY -5 Y SSM-FSN Kentucky EST 1 USA 860 CT -5 Y SSM-FSN Connecticut EST -1 USA 861 FL -5 Y SSM-FSN Florida EST 1 USA 862 NJ -5 Y SSM-FSN New Jersey EST 1 USA 863 FL -5 Y SSM-FSN Florida EST 1 USA 864 SC -5 Y SSM-FSN South Carolina EST @@ -354,7 +350,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 TTO 868 -4 N Trinidad and Tobago AST 1 KNA 869 -4 N St. Kitts and Nevis AST 1 USA 870 AR -6 Y SSM-FSN Arkansas CST -1 USA 871 CA -8 Y SSM-FSN California PST 1 USA 872 IL -6 Y SSM-FSN Illinois CST 1 CAN 873 QC -5 Y SSM-FSN Quebec EST 1 JAM 876 -5 N Jamaica EST @@ -379,6 +374,7 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 919 NC -5 Y SSM-FSN North Carolina EST 1 USA 920 WI -6 Y SSM-FSN Wisconsin CST 1 USA 925 CA -8 Y SSM-FSN California PST +1 USA 927 FL -5 Y SSM-FSN Florida EST 1 USA 928 AZ -7 N Arizona MST 1 USA 929 NY -5 Y SSM-FSN New York EST 1 USA 930 IN -5 Y SSM-FSN Indiana EST @@ -399,7 +395,6 @@ code country areacode state GMT DST DST_RANGE GEOGRAPHIC DESCRIPTION TZ_CODE 1 USA 956 TX -6 Y SSM-FSN Texas CST 1 USA 957 NM -7 Y SSM-FSN New Mexico MST 1 USA 959 CT -5 Y SSM-FSN Connecticut EST -1 USA 969 MD -5 Y SSM-FSN Maryland EST 1 USA 970 CO -7 Y SSM-FSN Colorado MST 1 USA 971 OR -8 Y SSM-FSN Oregon PST 1 USA 972 TX -6 Y SSM-FSN Texas CST diff --git a/agc_2-X/branches/agc_2.11/www/vicidial/AST_timeonVDADall.php b/agc_2-X/branches/agc_2.11/www/vicidial/AST_timeonVDADall.php index c66e3153..51c5a00e 100644 --- a/agc_2-X/branches/agc_2.11/www/vicidial/AST_timeonVDADall.php +++ b/agc_2-X/branches/agc_2.11/www/vicidial/AST_timeonVDADall.php @@ -91,10 +91,11 @@ # 141128-0857 - Code cleanup for QXZ functions # 141230-0030 - Added code for on-the-fly language translations display # 150211-2342 - Added hopper link, issue #825 +# 150307-0825 - small cosmetic fix # -$version = '2.10-80'; -$build = '150211-2342'; +$version = '2.10-81'; +$build = '150307-0825'; header ("Content-type: text/html; charset=utf-8"); @@ -774,7 +775,7 @@ $select_list .= ""; $select_list .= ""._QXZ("VERSION").": $version   "._QXZ("BUILD").": $build"; $select_list .= ""; -$open_list = "
"._QXZ("Choose Report Display Options")."
"; +$open_list = '
'._QXZ("Choose Report Display Options").'
'; ?> @@ -811,8 +812,8 @@ else document.getElementById('cursorY').value = (window.Event) ? e.pageY : event.clientY + (document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop); } - var select_list = ''; - var open_list = ''; + var select_list = ""; + var open_list = ""; var monitor_phone = ''; var user = ''; var pass = ''; @@ -1887,7 +1888,7 @@ if ($RTajax < 1) } else { - echo "+ "._QXZ("VIEW LESS").""; + echo "- "._QXZ("VIEW LESS").""; } if ($UGdisplay>0) { diff --git a/agc_2-X/branches/agc_2.11/www/vicidial/admin_header.php b/agc_2-X/branches/agc_2.11/www/vicidial/admin_header.php index 79befb7c..f712d52c 100644 --- a/agc_2-X/branches/agc_2.11/www/vicidial/admin_header.php +++ b/agc_2-X/branches/agc_2.11/www/vicidial/admin_header.php @@ -50,6 +50,7 @@ # 141128-1009 - Added code for languages section # 141230-0927 - Changed single-quote QXZ arguments to double-quotes # 150227-1614 - Formatting issue #831 +# 150307-0915 - Fixes for QXZ # @@ -726,7 +727,7 @@ if ( ($ADD==3511) or ($ADD==2511) or ($ADD==2611) or ($ADD==4511) or ($ADD==5511 $IGhandle_method_list = ''; - $IGsearch_method_list = ''; + $IGsearch_method_list = ''; $stmt="SELECT login,server_ip,extension,dialplan_number from phones where active='Y' $LOGadmin_viewable_groupsSQL order by login,server_ip;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -752,7 +753,7 @@ if ( ($ADD==3511) or ($ADD==2511) or ($ADD==2611) or ($ADD==4511) or ($ADD==5511 var ingroup_list = ''; var IGcampaign_id_list = ''; var IGhandle_method_list = ''; - var IGsearch_method_list = ''; + var IGsearch_method_list = ""; var did_list = ''; var phone_list = ''; var selected_value = ''; @@ -795,22 +796,22 @@ if ( ($ADD==3511) or ($ADD==2511) or ($ADD==2611) or ($ADD==4511) or ($ADD==5511 new_content = ''; new_content = new_content + ''; - new_content = new_content + ': '; + new_content = new_content + ": "; new_content = new_content + ''; - new_content = new_content + '   : '; new_content = new_content + '' + IGhandle_method_list + "\n" + ''; } - new_content = new_content + ': '; + new_content = new_content + ': "; new_content = new_content + ''; - new_content = new_content + '   : '; new_content = new_content + '' + IGhandle_method_list + "\n" + '