From 9a04537db3fcdb5b84b47bcb9b7f3ca81329cb7b Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 12 Nov 2020 02:44:56 +0000 Subject: [PATCH] Fix for AGENTDIRECT selected in-groups in agent screen issue #1241 git-svn-id: svn://192.168.202.10@3319 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/agc/conf_exten_check.php | 9 +++++---- agc_2-X/trunk/www/agc/vdc_db_query.php | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/agc_2-X/trunk/www/agc/conf_exten_check.php b/agc_2-X/trunk/www/agc/conf_exten_check.php index 62002539..4f5ffda1 100644 --- a/agc_2-X/trunk/www/agc/conf_exten_check.php +++ b/agc_2-X/trunk/www/agc/conf_exten_check.php @@ -84,10 +84,11 @@ # 190925-1348 - Added logtable SIP Action # 191013-2105 - Fixes for PHP7 # 200825-2343 - Added option for manual-only sip actions +# 201111-2140 - Fix for AGENTDIRECT selected in-groups issue #1241 # -$version = '2.14-58'; -$build = '200825-2343'; +$version = '2.14-59'; +$build = '201111-2140'; $php_script = 'conf_exten_check.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=51; @@ -365,8 +366,8 @@ if ($ACTION == 'refresh') $AccampSQL = preg_replace('/\s/',"','", $AccampSQL); if (preg_match('/AGENTDIRECT/i', $AccampSQL)) { + $ADsql = "or ( (campaign_id IN('$AccampSQL')) and (agent_only='$user') )"; $AccampSQL = preg_replace('/AGENTDIRECT/i','', $AccampSQL); - $ADsql = "or ( (campaign_id LIKE \"%AGENTDIRECT%\") and (agent_only='$user') )"; } ### grab the number of calls being placed from this server and campaign @@ -418,8 +419,8 @@ if ($ACTION == 'refresh') $AccampSQL = preg_replace('/\s/',"','", $AccampSQL); if (preg_match('/AGENTDIRECT/i', $AccampSQL)) { + $ADsql = "or ( (campaign_id IN('$AccampSQL')) and (agent_only='$user') )"; $AccampSQL = preg_replace('/AGENTDIRECT/i','', $AccampSQL); - $ADsql = "or ( (campaign_id LIKE \"%AGENTDIRECT%\") and (agent_only='$user') )"; } } diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index 3cebdf08..6219558e 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -496,10 +496,11 @@ # 200719-1645 - Added EVERY_NEW_ALLCALL queuemetrics_pausereason option # 200825-2342 - Added option for manual-only sip actions # 200828-1535 - Fixed issue with dispo URL statuse being sent for CBHOLD statuses +# 201111-2139 - Fix for AGENTDIRECT selected in-groups issue #1241 # -$version = '2.14-389'; -$build = '200828-1535'; +$version = '2.14-390'; +$build = '201111-2139'; $php_script = 'vdc_db_query.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=839; @@ -16565,8 +16566,8 @@ if ($ACTION == 'CALLSINQUEUEview') $AccampSQL = preg_replace('/\s/',"','", $AccampSQL); if (preg_match('/AGENTDIRECT/i', $AccampSQL)) { - $AccampSQL = preg_replace('/AGENTDIRECT/','', $AccampSQL); - $ADsql = "or ( (campaign_id LIKE \"%AGENTDIRECT%\") and (agent_only='$user') )"; + $ADsql = "or ( (campaign_id IN('$AccampSQL')) and (agent_only='$user') )"; + $AccampSQL = preg_replace('/AGENTDIRECT/i','', $AccampSQL); } ### grab the basic data on calls in the queue for this agent