From a4341f450018e98a3bf944225b6b15ab08f97852 Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 12 Nov 2020 16:17:51 +0000 Subject: [PATCH] Added better QueueMetrics misconfiguration error handling to agent screen git-svn-id: svn://192.168.202.10@3322 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/agc/vicidial.php | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index a553b2f9..4ec8a1fa 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -649,10 +649,11 @@ # 201010-2223 - Added force change password feature # 201026-0143 - Fix for pause_max_exceptions issue # 201107-2236 - Change for parked call logging +# 201112-1110 - Added better QueueMetrics misconfiguration error handling # -$version = '2.14-617c'; -$build = '201107-2236'; +$version = '2.14-618c'; +$build = '201112-1110'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=92; $one_mysql_log=0; @@ -3898,8 +3899,15 @@ else $QM_LOGIN = 'AGENTCALLBACKLOGIN'; $QM_PHONE = "$SIP_user_DiaL"; } - $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); - if (!$linkB) {die(_QXZ("Could not connect: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + if ( (strlen($queuemetrics_server_ip)>0) and (strlen($queuemetrics_login)>0) and (strlen($queuemetrics_pass)>0) and (strlen($queuemetrics_dbname)>0) ) + { + $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); + if (!$linkB) {die(_QXZ("Could not connect to Queuemetrics: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + } + else + { + die(_QXZ("Invalid Queuemetrics DB Credentials").": $queuemetrics_server_ip|$queuemetrics_login|PASS|$queuemetrics_dbname"); + } mysqli_select_db($linkB, "$queuemetrics_dbname"); if ( ($queuemetrics_pe_phone_append > 0) and (strlen($qm_phone_environment)>0) ) @@ -3965,8 +3973,15 @@ else $QM_LOGIN = 'AGENTCALLBACKLOGIN'; $QM_PHONE = "$SIP_user_DiaL"; } - $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); - if (!$linkB) {die(_QXZ("Could not connect: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + if ( (strlen($queuemetrics_server_ip)>0) and (strlen($queuemetrics_login)>0) and (strlen($queuemetrics_pass)>0) and (strlen($queuemetrics_dbname)>0) ) + { + $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); + if (!$linkB) {die(_QXZ("Could not connect to Queuemetrics: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + } + else + { + die(_QXZ("Invalid Queuemetrics DB Credentials").": $queuemetrics_server_ip|$queuemetrics_login|PASS|$queuemetrics_dbname"); + } mysqli_select_db($linkB, "$queuemetrics_dbname"); if ($queuemetrics_loginout!='NONE') @@ -4104,8 +4119,15 @@ else if ($enable_queuemetrics_logging > 0) { $StarTtimEpause = ($StarTtimE + 1); - $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); - if (!$linkB) {die(_QXZ("Could not connect: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + if ( (strlen($queuemetrics_server_ip)>0) and (strlen($queuemetrics_login)>0) and (strlen($queuemetrics_pass)>0) and (strlen($queuemetrics_dbname)>0) ) + { + $linkB=mysqli_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass"); + if (!$linkB) {die(_QXZ("Could not connect to Queuemetrics: ")."$queuemetrics_server_ip|$queuemetrics_login" . mysqli_connect_error());} + } + else + { + die(_QXZ("Invalid Queuemetrics DB Credentials").": $queuemetrics_server_ip|$queuemetrics_login|PASS|$queuemetrics_dbname"); + } mysqli_select_db($linkB, "$queuemetrics_dbname"); $pause_typeSQL='';