From 8edc23c8a2629a640b528e2e60ae46a323c27b83 Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 16 Nov 2014 23:11:42 +0000 Subject: [PATCH] Fixed issue #801 in vicidial.php small fixes in admin.php and real-time report git-svn-id: svn://192.168.202.10@2190 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/agc/vicidial.php | 6 ++++-- www/vicidial/AST_timeonVDADall.php | 4 +++- www/vicidial/admin.php | 6 ++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 790e2591..8baf4428 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -446,10 +446,11 @@ # 140918-1606 - Fixed manual dial pause warning issue # 141105-1153 - Fixed issue with AGENTDIRECT transfers to agents with IDs over 7 characters long # 141113-1431 - Added admin_test option to allow login on active_agent=N servers +# 141116-1805 - Fixed issue #801 # -$version = '2.10-417c'; -$build = '141113-1431'; +$version = '2.10-418c'; +$build = '141116-1805'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=80; $one_mysql_log=0; @@ -14568,6 +14569,7 @@ function phone_number_format(formatphone) { if ( (Csec < 10) && (Csec.length < 2) ) {Csec = "0" + Csec;} if (Cmin < 10) {Cmin = "0" + Cmin;} if (Csec < 10) {Csec = "0" + Csec;} + VDRP_stage_seconds=0; var customer_date = ''; var customer_time = Chours + ":" + Cmin + ":" + Csec; diff --git a/www/vicidial/AST_timeonVDADall.php b/www/vicidial/AST_timeonVDADall.php index 9408a08a..ad501c02 100644 --- a/www/vicidial/AST_timeonVDADall.php +++ b/www/vicidial/AST_timeonVDADall.php @@ -1131,6 +1131,7 @@ $multi_drop=0; $stmt = "select group_id from vicidial_inbound_groups;"; $rslt=mysql_to_mysqli($stmt, $link); $ingroups_to_print = mysqli_num_rows($rslt); +$c=0; while ($ingroups_to_print > $c) { $row=mysqli_fetch_row($rslt); @@ -1146,6 +1147,7 @@ if ($DB > 0) {echo "\n|$ALLcloser_campaignsSQL|$stmt|\n";} ##### INBOUND ##### if ( ( preg_match('/Y/',$with_inbound) or preg_match('/O/',$with_inbound) ) and ($campaign_allow_inbound > 0) ) { + $closer_campaignsSQL = ""; ### Gather list of Closer group ids $stmt = "select closer_campaigns from vicidial_campaigns where active='Y' $group_SQLand;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -2211,7 +2213,7 @@ if ($UidORname>0) } else { - if ($RTajax > 0) + if (isset($RTajax) and $RTajax > 0) {$HTuser .= ""._QXZ("SHOW NAME",9)."";} else { diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index c6da6da9..f6875da2 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -4963,6 +4963,7 @@ if ($ADD==7111111) $email = preg_replace('/\s/i', '+',$email); $security_phrase = preg_replace('/\s/i', '+',$security_phrase); $comments = preg_replace('/\s/i', '+',$comments); + $source_id = preg_replace('/\s/i', '+',$source_id); $RGfullname = preg_replace('/\s/i', '+',$RGfullname); $RGuser = preg_replace('/\s/i', '+',$RGuser); $RGlead_id = preg_replace('/\s/i', '+',$RGlead_id); @@ -5028,6 +5029,7 @@ if ($ADD==7111111) $script_text = preg_replace('/\-\-A\-\-email\-\-B\-\-/i', "$email",$script_text); $script_text = preg_replace('/\-\-A\-\-security_phrase\-\-B\-\-/i', "$security_phrase",$script_text); $script_text = preg_replace('/\-\-A\-\-comments\-\-B\-\-/i', "$comments",$script_text); + $script_text = preg_replace('/\-\-A\-\-source_id\-\-B\-\-/i', "$source_id",$script_text); $script_text = preg_replace('/\-\-A\-\-fullname\-\-B\-\-/i', "$RGfullname",$script_text); $script_text = preg_replace('/\-\-A\-\-fronter\-\-B\-\-/i', "$RGuser",$script_text); $script_text = preg_replace('/\-\-A\-\-user\-\-B\-\-/i', "$RGuser",$script_text); @@ -6919,7 +6921,7 @@ if ($ADD==11111111111) echo ""._QXZ("Full Name").": $NWB#phones-fullname$NWE\n"; # echo "Company: $NWB#phones-company$NWE\n"; # echo "Picture: $NWB#phones-picture$NWE\n"; - echo ""._QXZ("Client Protocol").": $NWB#phones-protocol$NWE\n"; + echo ""._QXZ("Client Protocol").": $NWB#phones-protocol$NWE\n"; echo ""._QXZ("Local GMT").": ("._QXZ("Do NOT Adjust for DST").")$NWB#phones-local_gmt$NWE\n"; echo "\n"; echo "\n"; @@ -28097,7 +28099,7 @@ if ($ADD==31111111111) echo ""._QXZ("Picture").": $NWB#phones-picture$NWE\n"; echo ""._QXZ("New Messages").": $row[14]$NWB#phones-messages$NWE\n"; echo ""._QXZ("Old Messages").": $row[15]$NWB#phones-old_messages$NWE\n"; - echo ""._QXZ("Client Protocol").": $NWB#phones-protocol$NWE\n"; + echo ""._QXZ("Client Protocol").": $NWB#phones-protocol$NWE\n"; echo ""._QXZ("Local GMT").": ("._QXZ("Do NOT Adjust for DST").")$NWB#phones-local_gmt$NWE\n"; echo ""._QXZ("Phone Ring Timeout").": $NWB#phones-phone_ring_timeout$NWE\n"; echo ""._QXZ("On-Hook Agent").": $NWB#phones-on_hook_agent$NWE\n";