Added MIN LENGTH to the Dispo Call URL ALT admin screen, allowing for a minimum call time threshold before a Dispo Call URL will trigger.

git-svn-id: svn://192.168.202.10@3539 3d104415-ff17-0410-8863-d5cf3c621b8a

agc_2-X/trunk/UPGRADE

@@ -694,6 +694,9 @@ OTHER CHANGES:
 	and if there are no agents available, sending the customers to the
 	No-Agent-No-Queue Action. With configurable pause code exceptions.
 
+194. Added MIN LENGTH to the Dispo Call URL ALT admin screen, allowing for a
+	minimum call time threshold before a Dispo Call URL will trigger.
+
 
 
 

agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql

@@ -3671,6 +3671,7 @@ url_statuses VARCHAR(1000) default '',
 url_description VARCHAR(255) default '',
 url_address TEXT,
 url_lists VARCHAR(1000) default '',
+url_call_length SMALLINT(5) default '0',
 PRIMARY KEY (url_id),
 KEY vicidial_url_multi_campaign_id_key (campaign_id)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_unicode_ci;
@@ -5028,4 +5029,4 @@ INSERT INTO vicidial_settings_containers(container_id,container_notes,container_
 
 UPDATE system_settings set vdc_agent_api_active='1';
 
-UPDATE system_settings SET db_schema_version='1647',db_schema_update_date=NOW(),reload_timestamp=NOW();
+UPDATE system_settings SET db_schema_version='1648',db_schema_update_date=NOW(),reload_timestamp=NOW();

agc_2-X/trunk/extras/upgrade_2.14.sql

@@ -1831,3 +1831,7 @@ ALTER TABLE vicidial_inbound_groups ADD in_queue_nanque ENUM('N','Y','NO_PAUSED'
 ALTER TABLE vicidial_inbound_groups ADD in_queue_nanque_exceptions VARCHAR(40) default '';
 
 UPDATE system_settings SET db_schema_version='1647',db_schema_update_date=NOW() where db_schema_version < 1647;
+
+ALTER TABLE vicidial_url_multi ADD url_call_length SMALLINT(5) default '0';
+
+UPDATE system_settings SET db_schema_version='1648',db_schema_update_date=NOW() where db_schema_version < 1648;

agc_2-X/trunk/www/agc/vdc_db_query.php

@@ -519,10 +519,11 @@
 # 210822-2111 - Fix for manual dial lead search with phone_code, Issue #1322
 # 210825-0912 - Fix for XSS security issue
 # 210827-0749 - Added PJSIP compatibility
+# 211117-2033 - Added ALT Dispo Call URL url_call_length setting
 #
 
-$version = '2.14-412';
+$version = '2.14-413';
-$build = '210827-0749';
+$build = '211117-2033';
 $php_script = 'vdc_db_query.php';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=865;
@@ -14350,11 +14351,38 @@ if ($ACTION == 'updateDISPO')
 	$dispo_call_urlARY = array();
 	$dispo_call_urlARY[0]='';
 	$dispo_urls='';
+	$talk_time=0;
+	$talk_time_ms=0;
+	$talk_time_min=0;
+
+	$stmt = "SELECT talk_sec,dead_sec from vicidial_agent_log where lead_id='$lead_id' and agent_log_id='$CALL_agent_log_id';";
+	if ($DB) {echo "$stmt\n";}
+	$rslt=mysql_to_mysqli($stmt, $link);
+		if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00289',$user,$server_ip,$session_name,$one_mysql_log);}
+	$VAL_talk_ct = mysqli_num_rows($rslt);
+	if ($VAL_talk_ct > 0)
+		{
+		$row=mysqli_fetch_row($rslt);
+		$talk_sec	=		$row[0];
+		$dead_sec	=		$row[1];
+		$talk_time = ($talk_sec - $dead_sec);
+		if ($talk_time < 1)
+			{
+			$talk_time = 0;
+			$talk_time_ms = 0;
+			}
+		else
+			{
+			$talk_time_ms = ($talk_time * 1000);
+			$talk_time_min = ceil($talk_time / 60);
+			}
+		}
+
 	if ( (strlen($dispo_call_url) > 7) or ($dispo_call_url == 'ALT') )
 		{
 		if ($dispo_call_url == 'ALT')
 			{
-			$stmt="SELECT url_rank,url_statuses,url_address,url_lists from vicidial_url_multi where campaign_id='$DUcampaign_id' and entry_type='$DUentry_type' and url_type='dispo' and active='Y' order by url_rank limit 1000;";
+			$stmt="SELECT url_rank,url_statuses,url_address,url_lists,url_call_length from vicidial_url_multi where campaign_id='$DUcampaign_id' and entry_type='$DUentry_type' and url_type='dispo' and active='Y' order by url_rank limit 1000;";
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_to_mysqli($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00634',$user,$server_ip,$session_name,$one_mysql_log);}
@@ -14367,8 +14395,9 @@ if ($ACTION == 'updateDISPO')
 				$url_statuses =		" $row[1] ";
 				$url_address =		$row[2];
 				$url_lists =		" $row[3] ";
+				$url_call_length =	$row[4];
 
-				if ( ( (preg_match("/---ALL---/",$url_statuses)) or ( (strlen($url_statuses)>2) and (preg_match("/ $dispo_choice /",$url_statuses)) ) ) and ( (strlen($url_lists)<3) or ( (strlen($url_lists)>2) and (preg_match("/ $list_id /",$url_lists)) ) ) )
+				if ( ( (preg_match("/---ALL---/",$url_statuses)) or ( (strlen($url_statuses)>2) and (preg_match("/ $dispo_choice /",$url_statuses)) ) ) and ( (strlen($url_lists)<3) or ( (strlen($url_lists)>2) and (preg_match("/ $list_id /",$url_lists)) ) ) and ($talk_time >= $url_call_length) )
 					{
 					$dispo_call_urlARY[$dispo_call_url_count] = $url_address;
 					$dispo_call_url_count++;
@@ -14386,9 +14415,6 @@ if ($ACTION == 'updateDISPO')
 	$j=0;
 	while ($dispo_call_url_count > $j)
 		{
-		$talk_time=0;
-		$talk_time_ms=0;
-		$talk_time_min=0;
 		if ( (preg_match('/--A--user_custom_/i',$dispo_call_urlARY[$j])) or (preg_match('/--A--fullname/i',$dispo_call_urlARY[$j])) or (preg_match('/--A--user_group/i',$dispo_call_urlARY[$j])) )
 			{
 			$stmt = "SELECT custom_one,custom_two,custom_three,custom_four,custom_five,full_name,user_group from vicidial_users where user='$user';";
@@ -14409,32 +14435,6 @@ if ($ACTION == 'updateDISPO')
 				}
 			}
 
-		if (preg_match('/--A--talk_time/i',$dispo_call_urlARY[$j]))
-			{
-			$stmt = "SELECT talk_sec,dead_sec from vicidial_agent_log where lead_id='$lead_id' and agent_log_id='$CALL_agent_log_id';";
-			if ($DB) {echo "$stmt\n";}
-			$rslt=mysql_to_mysqli($stmt, $link);
-				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00289',$user,$server_ip,$session_name,$one_mysql_log);}
-			$VAL_talk_ct = mysqli_num_rows($rslt);
-			if ($VAL_talk_ct > 0)
-				{
-				$row=mysqli_fetch_row($rslt);
-				$talk_sec	=		$row[0];
-				$dead_sec	=		$row[1];
-				$talk_time = ($talk_sec - $dead_sec);
-				if ($talk_time < 1)
-					{
-					$talk_time = 0;
-					$talk_time_ms = 0;
-					}
-				else
-					{
-					$talk_time_ms = ($talk_time * 1000);
-					$talk_time_min = ceil($talk_time / 60);
-					}
-				}
-			}
-
 		if (preg_match('/--A--dispo_name--B--/i',$dispo_call_urlARY[$j]))
 			{
 			### find the full status name for this status

agc_2-X/trunk/www/vicidial/admin_url_multi.php

@@ -1,7 +1,7 @@
 <?php
 # admin_url_multi.php
 # 
-# Copyright (C) 2018  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2021  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # this screen will control the *url* settings needed when the Campaign or 
 # In-Group or List URL setting is set to "ALT". This screen allows for multiple 
@@ -16,10 +16,11 @@
 # 160801-0657 - Added lists qualifier fields
 # 170409-1545 - Added IP List validation code
 # 180503-2215 - Added new help display
+# 211117-2006 - Added minimum call length field
 #
 
-$admin_version = '2.14-6';
+$admin_version = '2.14-7';
-$build = '180503-2215';
+$build = '211117-2006';
 
 require("dbconnect_mysqli.php");
 require("functions.php");
@@ -52,6 +53,8 @@ if (isset($_GET["url_description"]))			{$url_description=$_GET["url_description"
 	elseif (isset($_POST["url_description"]))	{$url_description=$_POST["url_description"];}
 if (isset($_GET["url_address"]))				{$url_address=$_GET["url_address"];}
 	elseif (isset($_POST["url_address"]))		{$url_address=$_POST["url_address"];}
+if (isset($_GET["url_call_length"]))			{$url_call_length=$_GET["url_call_length"];}
+	elseif (isset($_POST["url_call_length"]))	{$url_call_length=$_POST["url_call_length"];}
 if (isset($_GET["SUBMIT"]))						{$SUBMIT=$_GET["SUBMIT"];}
 	elseif (isset($_POST["SUBMIT"]))			{$SUBMIT=$_POST["SUBMIT"];}
 
@@ -91,11 +94,22 @@ if ($non_latin < 1)
 	$url_statuses = preg_replace('/[^- _0-9a-zA-Z]/','',$url_statuses);
 	$url_lists = preg_replace('/[^- _0-9]/','',$url_lists);
 	$url_description = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$url_description);
+	$url_call_length = preg_replace('/[^0-9]/','',$url_call_length);
 	}	# end of non_latin
 else
 	{
 	$PHP_AUTH_USER = preg_replace("/'|\"|\\\\|;/","",$PHP_AUTH_USER);
 	$PHP_AUTH_PW = preg_replace("/'|\"|\\\\|;/","",$PHP_AUTH_PW);
+	$url_id = preg_replace('/[^0-9]/','',$url_id);
+	$campaign_id = preg_replace('/[^-_0-9\p{L}]/u','',$campaign_id);
+	$entry_type = preg_replace('/[^_0-9\p{L}]/u','',$entry_type);
+	$active = preg_replace('/[^A-Z]/','',$active);
+	$url_type = preg_replace('/[^_0-9\p{L}]/u','',$url_type);
+	$url_rank = preg_replace('/[^-0-9]/','',$url_rank);
+	$url_statuses = preg_replace('/[^- _0-9\p{L}]/u','',$url_statuses);
+	$url_lists = preg_replace('/[^- _0-9]/','',$url_lists);
+	$url_description = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$url_description);
+	$url_call_length = preg_replace('/[^0-9]/','',$url_call_length);
 	}
 
 $STARTtime = date("U");
@@ -356,7 +370,7 @@ if ($action == "URL_MULTI_MODIFY")
 		echo _QXZ("ERROR: URL entry does not exist").":  |$url_id|$campaign_id|$entry_type|$url_type|\n<BR>";
 		exit;
 		}
-	$stmt="UPDATE vicidial_url_multi SET active='$active',url_rank='$url_rank',url_statuses='$url_statuses',url_lists='$url_lists',url_description='$url_description',url_address='" . mysqli_real_escape_string($link, $url_address) . "' where campaign_id='$campaign_id' and entry_type='$entry_type' and url_type='$url_type' and url_id='$url_id';";
+	$stmt="UPDATE vicidial_url_multi SET active='$active',url_rank='$url_rank',url_statuses='$url_statuses',url_lists='$url_lists',url_call_length='$url_call_length',url_description='$url_description',url_address='" . mysqli_real_escape_string($link, $url_address) . "' where campaign_id='$campaign_id' and entry_type='$entry_type' and url_type='$url_type' and url_id='$url_id';";
 	$rslt=mysql_to_mysqli($stmt, $link);
 	$affected_rows = mysqli_affected_rows($link);
 	if ($DB > 0) {echo "$affected_rows|$stmt\n<BR>";}
@@ -431,14 +445,14 @@ if ($action == "BLANK")
 	echo "<TABLE><TR><TD>\n";
 	echo "<FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>";
 	echo "<br>"._QXZ("Alternate URL Form");
-	echo "<center><TABLE width=$section_width cellspacing=3>\n";
+	echo "<center><TABLE width=920 cellspacing=3>\n";
 	echo "<tr><td align=center colspan=2>\n";
 	echo "<br><b>"._QXZ("Alternate %1s URLs for %2s",0,'',$url_type,$entry_type).": <a href=\"./admin.php?$mod_link$campaign_id\">$campaign_id</a></b> &nbsp; $NWB#alt_multi_urls$NWE\n";
 
-	echo "<TABLE width=740 cellspacing=3>\n";
+	echo "<TABLE width=900 cellspacing=3>\n";
-	echo "<tr><td>#</td><td>"._QXZ("ACTIVE")."</td><td>"._QXZ("RANK")."</td><td>"._QXZ("STATUSES")."</td><td>"._QXZ("LISTS")."</td><td>"._QXZ("DESCRIPTION")."</td><td>"._QXZ("SUBMIT")."</td></tr>\n";
+	echo "<tr><td><font size=2><b>#</td><td><font size=2><b>"._QXZ("ACTIVE")."</td><td><font size=2><b>"._QXZ("RANK")."</td><td><font size=2><b>"._QXZ("STATUSES")."</td><td><font size=2><b>"._QXZ("LISTS")."</td><td><font size=2><b>"._QXZ("MIN LENGTH")."</td><td><font size=2><b>"._QXZ("DESCRIPTION")."</td><td><font size=2><b>"._QXZ("SUBMIT")."</td></tr>\n";
 
-	$stmt="SELECT url_id,active,url_rank,url_statuses,url_description,url_address,url_lists from vicidial_url_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and url_type='$url_type' order by url_rank limit 1000;";
+	$stmt="SELECT url_id,active,url_rank,url_statuses,url_description,url_address,url_lists,url_call_length from vicidial_url_multi where campaign_id='$campaign_id' and entry_type='$entry_type' and url_type='$url_type' order by url_rank limit 1000;";
 	if ($DB) {echo "$stmt\n";}
 	$rslt=mysql_to_mysqli($stmt, $link);
 	$types_to_print = mysqli_num_rows($rslt);
@@ -454,6 +468,7 @@ if ($action == "BLANK")
 		$Rurl_description =	$rowx[4];
 		$Rurl_address =		$rowx[5];
 		$Rurl_lists =		$rowx[6];
+		$Rurl_call_length =	$rowx[7];
 
 		if (preg_match('/1$|3$|5$|7$|9$/i', $o))
 			{$bgcolor='bgcolor="#'. $SSstd_row2_background .'"';} 
@@ -474,6 +489,7 @@ if ($action == "BLANK")
 		echo "<td><font size=1><input type=text size=4 maxlength=3 name=url_rank value=\"$Rurl_rank\"></td>";
 		echo "<td><font size=1><input type=text size=24 maxlength=1000 name=url_statuses value=\"$Rurl_statuses\"></td>";
 		echo "<td><font size=1><input type=text size=24 maxlength=1000 name=url_lists value=\"$Rurl_lists\"></td>";
+		echo "<td><font size=1><input type=text size=5 maxlength=5 name=url_call_length value=\"$Rurl_call_length\"></td>";
 		echo "<td><font size=1><input type=text size=24 maxlength=255 name=url_description value=\"$Rurl_description\"></td>";
 		echo "<td rowspan=2><font size=1><input type=submit name=SUBMIT value='"._QXZ("SUBMIT")."'>";
 		echo "<BR><BR>";
@@ -484,7 +500,7 @@ if ($action == "BLANK")
 		echo "</td>";
 		echo "</tr>";
 		echo "<tr $bgcolor>";
-		echo "<td colspan=6><font size=1>"._QXZ("URL").":<input type=text size=100 maxlength=5000 name=url_address value=\"$Rurl_address\"></td>";
+		echo "<td colspan=7 NOWRAP><font size=1>"._QXZ("URL").":<input type=text size=110 maxlength=5000 name=url_address value=\"$Rurl_address\"></td>";
 		echo "</form>\n";
 		echo "</tr>\n";
 		}
@@ -509,7 +525,7 @@ if ($action == "BLANK")
 	echo "<td rowspan=2><font size=1><input type=submit name=SUBMIT value='"._QXZ("SUBMIT")."'></td>";
 	echo "</tr>";
 	echo "<tr $bgcolor>";
-	echo "<td colspan=3><font size=1>"._QXZ("URL").":<input type=text size=80 maxlength=5000 name=url_address value=\"\"></td>";
+	echo "<td colspan=3><font size=1>"._QXZ("URL").":<input type=text size=100 maxlength=5000 name=url_address value=\"\"></td>";
 	echo "</form>\n";
 	echo "</tr>\n";
 	echo "</table></center><br>\n";

agc_2-X/trunk/www/vicidial/help_documentation.txt

@@ -1,4 +1,4 @@
-# version: 20211106150801
+# version: 20211117202701
 users-user	User ID	<QXZ>This field is where you put the users ID number, can be up to 8 digits in length, Must be at least 2 characters in length.</QXZ>
 users-pass	Password	<QXZ>This field is where you put the users password. Must be at least 2 characters in length. Only letters and numbers are allowed in user passwords. A medium strength user password will be at least 10 characters in length, and a strong user password will be at least 20 characters in length and have letters as well as at least one number. It is recommended that you use a longer password if possible, stringing together several unrelated words with no spaces, and a number somewhere in the string. The maximum size of a password is 100 characters.</QXZ>
 users-force_change_password	Force Change Password	<QXZ>If this option is set to Y then the user will be prompted to change their password the next time they log in to the administration webpage or the agent screen. Default is N.</QXZ>
@@ -1365,7 +1365,7 @@ cb-bulk-newlist	Transfer to List ID	<QXZ>The list ID to which all callbacks will
 cb-bulk-newstatus	New Status	<QXZ>The new vicidial_list status the selected callbacks will be updated to. This affects the vicidial_list table ONLY.</QXZ>
 cb-export	Callbacks export	<QXZ>This page is used to view and download a list of all scheduled callbacks based on the campaigns selected and the dates the callbacks are scheduled to be contacted.</QXZ>
 cb-export-cb-dates	Scheduled callback dates	<QXZ>The date the leads are scheduled to be called back.</QXZ>
-alt_multi_urls	Alternate Multi URLs	<QXZ>This page allows you to define Alternate URLs with conditions in place of the simple URL option for Dispo, Start, Add Lead or No Agent URLs. The RANK field will define the order in which the URLs are requested, this is important because if you have a URL that may take a few seconds to run ranked as 1, that will mean that any URLs ranked after it will have to wait to be run until that first URL request receives a response. The ACTIVE field will determine whether the specific URL is run. The STATUSES field only works for the Dispo URLs and will determine which disposition statuses will trigger the URL being run, if you want to run the entry for all statuses just fill in ---ALL--- in this field, if you want only a few statuses, separate them by spaces. If populated, the LISTS field will limit the calls that the URL is run from to only the list IDs listed in this field. To have it run for all lists, leave the field blank, if you want only a few lists, separate them by spaces. The URL field works the same as it would in the URL option in campaigns, in-groups and lists, and it is also limited to 2000 characters in length. If you want to delete a URL, it must first be set to not active, then you can click on the DELETE link below the SUBMIT button for that URL entry.</QXZ>
+alt_multi_urls	Alternate Multi URLs	<QXZ>This page allows you to define Alternate URLs with conditions in place of the simple URL option for Dispo, Start, Add Lead or No Agent URLs. The RANK field will define the order in which the URLs are requested, this is important because if you have a URL that may take a few seconds to run ranked as 1, that will mean that any URLs ranked after it will have to wait to be run until that first URL request receives a response. The ACTIVE field will determine whether the specific URL is run. The STATUSES field only works for the Dispo URLs and will determine which disposition statuses will trigger the URL being run, if you want to run the entry for all statuses just fill in ---ALL--- in this field, if you want only a few statuses, separate them by spaces. If populated, the LISTS field will limit the calls that the URL is run from to only the list IDs listed in this field. To have it run for all lists, leave the field blank, if you want only a few lists, separate them by spaces. The MIN LENGTH field will limit the calls that the URL is run for to only calls that are this minimum length in seconds and higher, default is 0. The URL field works the same as it would in the URL option in campaigns, in-groups and lists, and it is also limited to 2000 characters in length. If you want to delete a URL, it must first be set to not active, then you can click on the DELETE link below the SUBMIT button for that URL entry.</QXZ>
 amm_multi	AM Message Wildcards	<QXZ>This page allows you to define Am Message Wildcards that will check lead data from the defined lead fields for matches in the defined order specified on this page. For example, if you add a wildcard with the word -vacation- tied to the vendor_lead_code field, and the lead being played a message has -vacation- in that field, then it will hear the message defined in that AM Message Wildcard record. If you want to delete a wildcard, it must first be set to not active, then you can click on the DELETE link below the SUBMIT button for that wildcard entry</QXZ>
 user_list_new_limits	User List New Lead Limits	<QXZ>If the system setting for New Leads Per List Limit is enabled, then this page allows for the setting of per-user per-list new lead limit overrides to those List limits. This feature will only work properly if the campaign is set to either the MANUAL or INBOUND_MAN Dial Method and No Hopper dialing is enabled.</QXZ>
 custom_reports_admin-report_name	Report Name	<QXZ>The report name that the report will be referred to as in the system for purposes of user group access and slave server use in the system settings.  The report name may not be the same as any other custom report, nor may it be the same name as one of the standard system reports.</QXZ>