From 861becde278b7bc64635ec2e50923d6399c350b1 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 24 Sep 2018 20:46:44 +0000 Subject: [PATCH] Added called_count as field as AMM wildcard field Fixed issues with AMM wildcard web admin git-svn-id: svn://192.168.202.10@3037 3d104415-ff17-0410-8863-d5cf3c621b8a --- agi/VD_amd.agi | 12 ++++++++++-- www/vicidial/admin_amm_multi.php | 15 ++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/agi/VD_amd.agi b/agi/VD_amd.agi index f5479ec5..40faa47f 100644 --- a/agi/VD_amd.agi +++ b/agi/VD_amd.agi @@ -21,7 +21,7 @@ # exten => _8320*.,1,AGI(VD_amd.agi,${EXTEN}-----YES) # exten => _8320*.,2,Hangup # -# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2018 Matt Florell LICENSE: AGPLv2 # # changes: # 60206-1434 - first build @@ -52,6 +52,7 @@ # 170426-1711 - Fixed double-logging issue # 180529-1707 - Fix for missing called_count value in vicidial_log insertions # 180919-1831 - Fix for logging issue +# 180924-1557 - Added called_count as AMM wildcard # $script = 'VD_amd.agi'; @@ -1059,7 +1060,14 @@ else if ($AGILOG) {$agi_string = "AMM owner Match Found: |$amm_field|$amm_rank|$amm_wildcard($AMM_owner)|$amm_filename|"; &agi_output;} } } - + if ($amm_field =~ /called_count/) + { + if ($AMM_called_count =~ /^$amm_wildcard$/i) + { + $amm_filename_match = $amm_filename; + if ($AGILOG) {$agi_string = "AMM called_count Match Found: |$amm_field|$amm_rank|$amm_wildcard($AMM_owner)|$amm_filename|"; &agi_output;} + } + } if (length($amm_filename_match) > 0) {$DB_am_message_exten = $amm_filename_match;} diff --git a/www/vicidial/admin_amm_multi.php b/www/vicidial/admin_amm_multi.php index 59588932..66afeb75 100644 --- a/www/vicidial/admin_amm_multi.php +++ b/www/vicidial/admin_amm_multi.php @@ -14,10 +14,11 @@ # 170409-1544 - Added IP List validation code # 180502-2115 - Added new help display # 180618-2300 - Modified calls to audio file chooser function +# 180924-1606 - Added called_count as field # -$admin_version = '2.14-5'; -$build = '180618-2300'; +$admin_version = '2.14-6'; +$build = '180924-1606'; require("dbconnect_mysqli.php"); require("functions.php"); @@ -297,7 +298,7 @@ if ($action == "AMM_MULTI_MODIFY") echo _QXZ("ERROR: You must fill in all fields").": |$amm_id|$active|$amm_rank|$amm_wildcard|$amm_description|$amm_filename|\n
"; exit; } - $stmt="SELECT count(*) from vicidial_amm_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_field='$amm_field' and amm_id='$amm_id';"; + $stmt="SELECT count(*) from vicidial_amm_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_id='$amm_id';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); @@ -307,7 +308,7 @@ if ($action == "AMM_MULTI_MODIFY") echo _QXZ("ERROR: AM MESSAGE entry does not exist").": |$amm_id|$campaign_id|$entry_type|$amm_field|\n
"; exit; } - $stmt="UPDATE vicidial_amm_multi SET active='$active',amm_rank='$amm_rank',amm_wildcard='$amm_wildcard',amm_description='$amm_description',amm_filename='" . mysqli_real_escape_string($link, $amm_filename) . "' where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_field='$amm_field' and amm_id='$amm_id';"; + $stmt="UPDATE vicidial_amm_multi SET active='$active',amm_field='$amm_field',amm_rank='$amm_rank',amm_wildcard='$amm_wildcard',amm_description='$amm_description',amm_filename='" . mysqli_real_escape_string($link, $amm_filename) . "' where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_id='$amm_id';"; $rslt=mysql_to_mysqli($stmt, $link); $affected_rows = mysqli_affected_rows($link); if ($DB > 0) {echo "$affected_rows|$stmt\n
";} @@ -350,7 +351,7 @@ if ($action == "AMM_MULTI_DELETE") } else { - $stmt="DELETE FROM vicidial_amm_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_field='$amm_field' and amm_id='$amm_id' and active='N';"; + $stmt="DELETE FROM vicidial_amm_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and amm_id='$amm_id' and active='N';"; $rslt=mysql_to_mysqli($stmt, $link); $affected_rows = mysqli_affected_rows($link); if ($DB > 0) {echo "$affected_rows|$stmt\n
";} @@ -433,7 +434,7 @@ if ($action == "BLANK") echo ""; echo ""; echo ""; - echo ""; + echo ""; echo ""._QXZ("AM MESSAGE").":"; echo "\n"; echo "\n"; @@ -458,7 +459,7 @@ if ($action == "BLANK") echo ""; echo ""; echo ""; - echo ""._QXZ("FIELD").": "; + echo ""._QXZ("FIELD").": "; echo ""._QXZ("AM MESSAGE").": "._QXZ("audio chooser").""; echo "\n"; echo "\n";