diff --git a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php index a2d22e49..dc7487b5 100644 --- a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php +++ b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php @@ -103,10 +103,11 @@ # 160413-2004 - Added WALL_4 option # 160418-2141 - Fixed issue with WALL displays # 160515-1300 - Added UK OFCOM feature +# 160803-1901 - Fixed issue with ERROR in campaign/ingroup name # -$version = '2.12-91'; -$build = '160515-1300'; +$version = '2.12-92'; +$build = '160803-1901'; header ("Content-type: text/html; charset=utf-8"); @@ -919,8 +920,8 @@ else // alert(xmlhttp.responseText); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); - var regXFscs = new RegExp("SUCCESS","g"); + var regXFerr = new RegExp("ERROR:","g"); + var regXFscs = new RegExp("SUCCESS:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} if (Xoutput.match(regXFscs)) @@ -994,7 +995,7 @@ else // alert(changeQuery); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); + var regXFerr = new RegExp("ERROR:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} else @@ -1047,7 +1048,7 @@ else // alert(xmlhttp.responseText); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); + var regXFerr = new RegExp("ERROR:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} else diff --git a/agc_2-X/trunk/www/vicidial/realtime_report.php b/agc_2-X/trunk/www/vicidial/realtime_report.php index 5eb80fec..0e7afc96 100644 --- a/agc_2-X/trunk/www/vicidial/realtime_report.php +++ b/agc_2-X/trunk/www/vicidial/realtime_report.php @@ -35,12 +35,13 @@ # 160327-1258 - Added report_display_type option and several design changes # 160406-1852 - Added WALL options for report_display_type # 160413-2003 - Added WALL_4 option +# 160803-1902 - Fixed issue with ERROR in campaign/ingroup name # $startMS = microtime(); -$version = '2.12-23'; -$build = '160413-2003'; +$version = '2.12-24'; +$build = '160803-1902'; header ("Content-type: text/html; charset=utf-8"); @@ -1160,8 +1161,8 @@ function send_monitor(session_id,server_ip,stage) // alert(xmlhttp.responseText); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); - var regXFscs = new RegExp("SUCCESS","g"); + var regXFerr = new RegExp("ERROR:","g"); + var regXFscs = new RegExp("SUCCESS:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} if (Xoutput.match(regXFscs)) @@ -1236,7 +1237,7 @@ function submit_ingroup_changes(temp_agent_user) // alert(changeQuery); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); + var regXFerr = new RegExp("ERROR:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} else @@ -1290,7 +1291,7 @@ function ingroup_info(agent_user,count) // alert(xmlhttp.responseText); var Xoutput = null; Xoutput = xmlhttp.responseText; - var regXFerr = new RegExp("ERROR","g"); + var regXFerr = new RegExp("ERROR:","g"); if (Xoutput.match(regXFerr)) {alert(xmlhttp.responseText);} else