From 38c82b0bb51fcdbc9781b7960f4d4b56985a8da6 Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 28 Apr 2016 22:50:22 +0000 Subject: [PATCH] Fixed user_authorization bug in agent code git-svn-id: svn://192.168.202.10@2524 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/agc/active_list_refresh.php | 2 +- www/agc/agc_agent_manager_chat_interface.php | 2 +- www/agc/astguiclient.php | 2 +- www/agc/call_log_display.php | 2 +- www/agc/chat_db_query.php | 2 +- www/agc/conf_exten_check.php | 2 +- www/agc/deactivate_lead.php | 2 +- www/agc/dispo_add_FPG.php | 2 +- www/agc/dispo_move_list.php | 2 +- www/agc/dispo_send_email.php | 2 +- www/agc/inbound_popup.php | 2 +- www/agc/live_exten_check.php | 2 +- www/agc/manager_send.php | 2 +- www/agc/park_calls_display.php | 2 +- www/agc/phone_only.php | 2 +- www/agc/timeclock.php | 2 +- www/agc/vdc_chat_display.php | 2 +- www/agc/vdc_db_query.php | 2 +- www/agc/vdc_email_display.php | 2 +- www/agc/vdc_form_display.php | 2 +- www/agc/vdc_script_display.php | 2 +- www/agc/vdc_script_dispo_example.php | 2 +- www/agc/vdc_script_notes.php | 2 +- www/agc/vicidial.php | 9 +++++---- www/agc/voicemail_check.php | 2 +- www/vicidial/horizontalbargraph.css | 3 +++ 26 files changed, 32 insertions(+), 28 deletions(-) diff --git a/www/agc/active_list_refresh.php b/www/agc/active_list_refresh.php index 0ea8e414..8c71c8fd 100644 --- a/www/agc/active_list_refresh.php +++ b/www/agc/active_list_refresh.php @@ -175,7 +175,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/agc_agent_manager_chat_interface.php b/www/agc/agc_agent_manager_chat_interface.php index e2c2b126..e13e5924 100644 --- a/www/agc/agc_agent_manager_chat_interface.php +++ b/www/agc/agc_agent_manager_chat_interface.php @@ -70,7 +70,7 @@ $VUselected_language = $SSdefault_language; ########################################### $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/astguiclient.php b/www/agc/astguiclient.php index d104ef6f..7b7e5a8e 100644 --- a/www/agc/astguiclient.php +++ b/www/agc/astguiclient.php @@ -168,7 +168,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); +$auth_message = user_authorization($user,$pass,'',1,0,1,0); 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 c104d7a5..e0aae76b 100644 --- a/www/agc/call_log_display.php +++ b/www/agc/call_log_display.php @@ -127,7 +127,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/chat_db_query.php b/www/agc/chat_db_query.php index ce86db0d..0a12ea7e 100644 --- a/www/agc/chat_db_query.php +++ b/www/agc/chat_db_query.php @@ -110,7 +110,7 @@ $VUselected_language = $SSdefault_language; ########################################### $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/conf_exten_check.php b/www/agc/conf_exten_check.php index 5ca75d0d..81632908 100644 --- a/www/agc/conf_exten_check.php +++ b/www/agc/conf_exten_check.php @@ -200,7 +200,7 @@ $random = (rand(1000000, 9999999) + 10000000); $auth=0; -$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0); +$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/deactivate_lead.php b/www/agc/deactivate_lead.php index 72f2efc2..a664047f 100644 --- a/www/agc/deactivate_lead.php +++ b/www/agc/deactivate_lead.php @@ -119,7 +119,7 @@ if (preg_match("/$TD$dispo$TD/",$sale_status)) } $auth=0; - $auth_message = user_authorization($user,$pass,'',0,0,0); + $auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/dispo_add_FPG.php b/www/agc/dispo_add_FPG.php index dc24531b..a089f66f 100644 --- a/www/agc/dispo_add_FPG.php +++ b/www/agc/dispo_add_FPG.php @@ -148,7 +148,7 @@ if ($match_found > 0) else { $auth=0; - $auth_message = user_authorization($user,$pass,'',0,0,0); + $auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/dispo_move_list.php b/www/agc/dispo_move_list.php index 87c0e4d9..38ae9103 100644 --- a/www/agc/dispo_move_list.php +++ b/www/agc/dispo_move_list.php @@ -233,7 +233,7 @@ if ($match_found > 0) else { $auth=0; - $auth_message = user_authorization($user,$pass,'',0,0,0); + $auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/dispo_send_email.php b/www/agc/dispo_send_email.php index e8f55253..ef6a1cef 100644 --- a/www/agc/dispo_send_email.php +++ b/www/agc/dispo_send_email.php @@ -148,7 +148,7 @@ if ($match_found > 0) else { $auth=0; - $auth_message = user_authorization($user,$pass,'',0,0,0); + $auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/inbound_popup.php b/www/agc/inbound_popup.php index 92e32d5e..75219842 100644 --- a/www/agc/inbound_popup.php +++ b/www/agc/inbound_popup.php @@ -122,7 +122,7 @@ if ($non_latin < 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/live_exten_check.php b/www/agc/live_exten_check.php index 1de05535..f4c7bc61 100644 --- a/www/agc/live_exten_check.php +++ b/www/agc/live_exten_check.php @@ -127,7 +127,7 @@ if (strlen($SSagent_debug_logging) > 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/manager_send.php b/www/agc/manager_send.php index dcd3a9da..789ffb54 100644 --- a/www/agc/manager_send.php +++ b/www/agc/manager_send.php @@ -310,7 +310,7 @@ if (strlen($meetme_enter_leave3way_filename) > 0) {$threeway_context = 'meetme-enter-leave3way';} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/park_calls_display.php b/www/agc/park_calls_display.php index e0a41210..79b4f339 100644 --- a/www/agc/park_calls_display.php +++ b/www/agc/park_calls_display.php @@ -116,7 +116,7 @@ if (strlen($SSagent_debug_logging) > 1) $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/phone_only.php b/www/agc/phone_only.php index b1d12459..fc510386 100644 --- a/www/agc/phone_only.php +++ b/www/agc/phone_only.php @@ -360,7 +360,7 @@ else else { $auth=0; - $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,0); + $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/timeclock.php b/www/agc/timeclock.php index 5db0fd4f..3318327b 100644 --- a/www/agc/timeclock.php +++ b/www/agc/timeclock.php @@ -151,7 +151,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); + $auth_message = user_authorization($user,$pass,'',1,0,0,0); if ($auth_message == 'GOOD') {$valid_user=1;} diff --git a/www/agc/vdc_chat_display.php b/www/agc/vdc_chat_display.php index 6617c79d..0ec006b5 100644 --- a/www/agc/vdc_chat_display.php +++ b/www/agc/vdc_chat_display.php @@ -122,7 +122,7 @@ if ($SSallow_chats < 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,0,0); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_db_query.php b/www/agc/vdc_db_query.php index 47cc4549..6dd01f69 100644 --- a/www/agc/vdc_db_query.php +++ b/www/agc/vdc_db_query.php @@ -939,7 +939,7 @@ if ($ACTION == 'LogiNCamPaigns') else { $auth=0; - $auth_message = user_authorization($user,$pass,'',0,1,0); + $auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_email_display.php b/www/agc/vdc_email_display.php index a2c0b351..fe3c1705 100644 --- a/www/agc/vdc_email_display.php +++ b/www/agc/vdc_email_display.php @@ -157,7 +157,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); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_form_display.php b/www/agc/vdc_form_display.php index 962df802..174f599e 100644 --- a/www/agc/vdc_form_display.php +++ b/www/agc/vdc_form_display.php @@ -264,7 +264,7 @@ if (!isset($ACTION)) {$ACTION="refresh";} if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0); +$auth_message = user_authorization($user,$pass,'',0,$bcrypt,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_script_display.php b/www/agc/vdc_script_display.php index 6cf8b6f6..b99523b3 100644 --- a/www/agc/vdc_script_display.php +++ b/www/agc/vdc_script_display.php @@ -304,7 +304,7 @@ if (!isset($ACTION)) {$ACTION="refresh";} if (!isset($query_date)) {$query_date = $NOW_DATE;} $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_script_dispo_example.php b/www/agc/vdc_script_dispo_example.php index 5a246d2b..91d6a9c3 100644 --- a/www/agc/vdc_script_dispo_example.php +++ b/www/agc/vdc_script_dispo_example.php @@ -349,7 +349,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); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vdc_script_notes.php b/www/agc/vdc_script_notes.php index 61c82306..02d2e15f 100644 --- a/www/agc/vdc_script_notes.php +++ b/www/agc/vdc_script_notes.php @@ -318,7 +318,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); +$auth_message = user_authorization($user,$pass,'',0,0,0,0); if ($auth_message == 'GOOD') {$auth=1;} diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 48af435a..f824cbba 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -522,10 +522,11 @@ # 160331-2129 - Fixed missing start and dispo call url variables, issue #938 # 160414-0922 - Added default_phone_code system settings option # 160420-1342 - Fixed text link overlaps with other languages +# 160428-1826 - Fixed user_authorization bug # -$version = '2.12-491c'; -$build = '160420-1342'; +$version = '2.12-492c'; +$build = '160428-1826'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=87; $one_mysql_log=0; @@ -829,7 +830,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); + $auth_message = user_authorization($MGR_login,$MGR_pass,'MGR',0,0,0,0); if (preg_match("/^GOOD/",$auth_message)) {$MGR_auth=1;} @@ -1175,7 +1176,7 @@ else else { $auth=0; - $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1); + $auth_message = user_authorization($VD_login,$VD_pass,'',1,0,1,0); if (preg_match("/^GOOD/",$auth_message)) { $auth=1; diff --git a/www/agc/voicemail_check.php b/www/agc/voicemail_check.php index d77c1934..2e759804 100644 --- a/www/agc/voicemail_check.php +++ b/www/agc/voicemail_check.php @@ -105,7 +105,7 @@ if ($non_latin < 1) } $auth=0; -$auth_message = user_authorization($user,$pass,'',0,1,0); +$auth_message = user_authorization($user,$pass,'',0,1,0,0); if ($auth_message == 'GOOD') {$auth=1;} if (strlen($SSagent_debug_logging) > 1) diff --git a/www/vicidial/horizontalbargraph.css b/www/vicidial/horizontalbargraph.css index 3a15f0a8..2bc8c4b1 100644 --- a/www/vicidial/horizontalbargraph.css +++ b/www/vicidial/horizontalbargraph.css @@ -28,6 +28,9 @@ th.thgraph { .grey_graph_cell { background-color:#ddd; } +.selected_grey_graph_cell { + background-color:#999; +} .white_graph_cell { background-color:#FFF; }