From a59e4cab8f66a0a529b2f10f944d38a92b4268ef Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 11 Oct 2019 13:27:26 +0000 Subject: [PATCH] agent screen related fixes for PHP7 git-svn-id: svn://192.168.202.10@3141 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/agc/active_list_refresh.php | 9 +++++---- www/agc/astguiclient.php | 9 +++++---- www/agc/call_log_display.php | 9 +++++---- www/agc/inbound_popup.php | 9 +++++---- www/agc/live_exten_check.php | 9 +++++---- www/agc/park_calls_display.php | 9 +++++---- www/agc/timeclock.php | 9 +++++---- www/agc/vdc_script_dispo_example.php | 9 +++++---- www/agc/vicidial-grey.php | 11 ++++++----- 9 files changed, 46 insertions(+), 37 deletions(-) diff --git a/www/agc/active_list_refresh.php b/www/agc/active_list_refresh.php index 8c71c8fd..b7a38faa 100644 --- a/www/agc/active_list_refresh.php +++ b/www/agc/active_list_refresh.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed purely to serve updates of the live data to the display scripts # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table @@ -46,10 +46,11 @@ # 141128-0901 - Code cleanup for QXZ functions # 141216-2119 - Added language settings lookups and user/pass variable standardization # 150723-1715 - Added ajax logging +# 190111-0903 - Fix for PHP7 # -$version = '0.0.17'; -$build = '150723-1715'; +$version = '0.0.18'; +$build = '190111-0903'; $php_script = 'active_list_refresh.php'; $SSagent_debug_logging=0; $startMS = microtime(); @@ -175,7 +176,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0,'active_list_refresh'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/astguiclient.php b/www/agc/astguiclient.php index 7b7e5a8e..205b6238 100644 --- a/www/agc/astguiclient.php +++ b/www/agc/astguiclient.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # make sure you have added a user to the vicidial_users MySQL table with at least # user_level 1 or greater to access this page. Also you need to have the login @@ -68,10 +68,11 @@ # 141216-2115 - Added language settings lookups and user/pass variable standardization # 150218-1110 - Fixes for QXZ enclosed in single-quotes # 150727-0915 - Added default_language +# 190111-0902 - Fix for PHP7 # -$version = '2.2.6-1'; -$build = '150727-0915'; +$version = '2.2.6-2'; +$build = '190111-0902'; require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -168,7 +169,7 @@ $month_old = mktime(0, 0, 0, date("m"), date("d")-7, date("Y")); $past_month_date = date("Y-m-d H:i:s",$month_old); $auth=0; -$auth_message = user_authorization($user,$pass,'',1,0,1,0); +$auth_message = user_authorization($user,$pass,'',1,0,1,0,'astguiclient'); if (preg_match("/^GOOD/",$auth_message)) { $auth=1; diff --git a/www/agc/call_log_display.php b/www/agc/call_log_display.php index 58c9bf5b..46d32824 100644 --- a/www/agc/call_log_display.php +++ b/www/agc/call_log_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed purely to send the inbound and outbound calls for a specific phone # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table @@ -39,10 +39,11 @@ # 141216-2113 - Added language settings lookups and user/pass variable standardization # 150723-1714 - Added ajax logging # 170526-2215 - Added additional variable filtering +# 190111-0904 - Fix for PHP7 # -$version = '2.14-19'; -$build = '170526-2215'; +$version = '2.14-20'; +$build = '190111-0904'; $php_script = 'call_log_display.php'; $SSagent_debug_logging=0; $startMS = microtime(); @@ -130,7 +131,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0,'call_log_display'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/inbound_popup.php b/www/agc/inbound_popup.php index 901d7a84..0aeeb74e 100644 --- a/www/agc/inbound_popup.php +++ b/www/agc/inbound_popup.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed to open up when a live_inbound call comes in giving the user # options of what to do with the call or options to lookup the callerID on various web sites @@ -37,10 +37,11 @@ # 140811-0843 - Changed to use QXZ function for echoing text # 141216-2120 - Added language settings lookups and user/pass variable standardization # 170526-2231 - Added additional variable filtering +# 190111-0905 - Fix for PHP7 # -$version = '2.14-13'; -$build = '170526-2231'; +$version = '2.14-14'; +$build = '190111-0905'; require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -127,7 +128,7 @@ if ($non_latin < 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0,'inbound_popup'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/live_exten_check.php b/www/agc/live_exten_check.php index 0ad4bc33..871cfedd 100644 --- a/www/agc/live_exten_check.php +++ b/www/agc/live_exten_check.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed purely to send whether the client channel is live and to what channel it is connected # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table @@ -40,10 +40,11 @@ # 141216-2109 - Added language settings lookups and user/pass variable standardization # 150723-1713 - Added ajax logging # 170526-2234 - Added additional variable filtering +# 190111-0906 - Fix for PHP7 # -$version = '2.14-17'; -$build = '170526-2234'; +$version = '2.14-18'; +$build = '190111-0906'; $php_script = 'live_exten_check.php'; $SSagent_debug_logging=0; $startMS = microtime(); @@ -132,7 +133,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0,'live_exten_check'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/park_calls_display.php b/www/agc/park_calls_display.php index 3412f117..f1abba7b 100644 --- a/www/agc/park_calls_display.php +++ b/www/agc/park_calls_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed purely to send the details on the parked calls on the server # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table @@ -31,10 +31,11 @@ # 141216-2105 - Added language settings lookups and user/pass variable standardization # 150723-1712 - Added ajax logging # 170526-2244 - Added additional variable filtering +# 190111-0907 - Fix for PHP7 # -$version = '2.14-13'; -$build = '170526-2244'; +$version = '2.14-14'; +$build = '190111-0907'; $php_script = 'park_calls_display.php'; $SSagent_debug_logging=0; $startMS = microtime(); @@ -120,7 +121,7 @@ if (strlen($SSagent_debug_logging) > 1) $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0,'park_calls_display'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/timeclock.php b/www/agc/timeclock.php index 697122ca..2234a40d 100644 --- a/www/agc/timeclock.php +++ b/www/agc/timeclock.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # CHANGELOG # 80523-0134 - First Build @@ -22,10 +22,11 @@ # 150212-0033 - Added case-sensitive user validation(issue #682) # 150727-0912 - Added default_language # 161106-2112 - Added screen colors, fixed formatting +# 190111-0901 - Fix for PHP7 # -$version = '2.12-17'; -$build = '161106-2112'; +$version = '2.12-18'; +$build = '190111-0901'; $StarTtimE = date("U"); $NOW_TIME = date("Y-m-d H:i:s"); @@ -220,7 +221,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { ### see if user/pass exist for this user in vicidial_users table $valid_user=0; - $auth_message = user_authorization($user,$pass,'',1,0,0,0); + $auth_message = user_authorization($user,$pass,'',1,0,0,0,'timeclock'); if ($auth_message == 'GOOD') {$valid_user=1;} diff --git a/www/agc/vdc_script_dispo_example.php b/www/agc/vdc_script_dispo_example.php index 8da43324..6f963ba6 100644 --- a/www/agc/vdc_script_dispo_example.php +++ b/www/agc/vdc_script_dispo_example.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # This script is designed to be used in the SCRIPT tab in an IFRAME and will not submit unless a specific field is filled in # @@ -21,10 +21,11 @@ # 141216-2133 - Added language settings lookups and user/pass variable standardization # 170526-2345 - Added additional variable filtering # 170528-0902 - Added more variable filtering +# 190111-0910 - Fix for PHP7 # -$version = '2.14-9'; -$build = '170528-0902'; +$version = '2.14-10'; +$build = '190111-0910'; require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -364,7 +365,7 @@ if (!isset($ACTION)) {$ACTION="refresh";} if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0,0); +$auth_message = user_authorization($user,$pass,'',0,0,0,0,'vdc_script_dispo'); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vicidial-grey.php b/www/agc/vicidial-grey.php index 2b152398..4310e7e6 100644 --- a/www/agc/vicidial-grey.php +++ b/www/agc/vicidial-grey.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 # # Other scripts that this application depends on: # - vdc_db_query.php: Updates information in the database @@ -526,10 +526,11 @@ # 160618-1006 - Branched old agent screen design, added logging of browser width/height # NOTE: THIS VERSION WILL EVENTUALLY BECOME UNSUPPORTED!!!!!!!!!! # 161102-1120 - Fixed QM partition problem +# 190111-0908 - Fix for PHP7 # -$version = '2.12-493c-grey'; -$build = '161102-1120'; +$version = '2.12-494c-grey'; +$build = '190111-0908'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=87; $one_mysql_log=0; @@ -834,7 +835,7 @@ if ($campaign_login_list > 0) $MGR_pass = preg_replace("/\'|\"|\\\\|;/","",$MGR_pass); $MGR_auth=0; - $auth_message = user_authorization($MGR_login,$MGR_pass,'MGR',0,0,0,0); + $auth_message = user_authorization($MGR_login,$MGR_pass,'MGR',0,0,0,0,'vicidial-grey'); if (preg_match("/^GOOD/",$auth_message)) {$MGR_auth=1;} @@ -1180,7 +1181,7 @@ else else { $auth=0; - $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1,0); + $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1,0,'vicidial-grey'); if (preg_match("/^GOOD/",$auth_message)) { $auth=1;