diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_outbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_outbound.agi index b25ae44b..84bf8ce0 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_outbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_outbound.agi @@ -45,7 +45,7 @@ #exten => 8366,4,AGI(agi-VDAD_ALL_outbound.agi,SURVEY-----LB-----US_pol_survey_hello-----1238-----8-----US_pol_survey_transfer-----US_thanks_no_contact-----OPTOUT-----DNC) #exten => 8366,5,Hangup # -# Copyright (C) 2019 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2020 Matt Florell LICENSE: AGPLv2 # # changes: # 80218-2027 - First Build @@ -123,6 +123,7 @@ # 190925-1348 - Added campaign SIP Actions processing # 191104-2026 - Added code for Khomp version compatibility # 191120-2235 - Added DYN multi-prompt survey prompts functionality +# 200825-2342 - Added option for auto-only sip actions # $script = 'agi-VDAD_ALL_outbound.agi'; @@ -860,9 +861,9 @@ if ($VDACaffected_rows > 0) $sea=0; foreach (@sip_action_settings) { - if ($sip_action_settings[$sea] =~ /^invite_to_final => /) + if ( ($sip_action_settings[$sea] =~ /^invite_to_final => /) && ($sip_action_settings[$sea] !~ /manual-only/i) ) { - # invite_to_final => 0.0,1.0,hangup-dispo-message,FAS,Auto Hangup and Dispo of False Answer Call + # invite_to_final => 0.0,1.0,hangup-dispo-message,FAS,Auto Hangup and Dispo of False Answer Call,auto-only $sip_action_settings[$sea] =~ s/invite_to_final => //gi; @invite_to_finalARY = split(/,/,$sip_action_settings[$sea]); $T_dial_time = ($invite_to_final + 0); diff --git a/agc_2-X/trunk/docs/SIP_EVENT_LOGGING.txt b/agc_2-X/trunk/docs/SIP_EVENT_LOGGING.txt index 997a5b72..865eb85e 100644 --- a/agc_2-X/trunk/docs/SIP_EVENT_LOGGING.txt +++ b/agc_2-X/trunk/docs/SIP_EVENT_LOGGING.txt @@ -1,4 +1,4 @@ -SIP EVENT LOGGING DOC Started: 2019-05-30 Updated: 2020-01-30 +SIP EVENT LOGGING DOC Started: 2019-05-30 Updated: 2020-08-25 !!!! THIS IS AN EXPERIMENTAL FEATURE, PLEASE READ ALL IMPORTANT NOTES !!!! @@ -79,6 +79,7 @@ You will also need to enable this feature in Admin -> System Settings Scripts modified/added: +- agi/agi-VDAD_ALL_outbound.agi - bin/AST_manager_listen_AMI2.pl - bin/ADMIN_keepalive_ALL.pl - bin/ADMIN_update_server_ip.pl @@ -118,12 +119,23 @@ AGENT_SCREEN_ACTIONS_FINISH +Example SIP_EVENT_ACTIONS Settings Container(with separate lines for auto-dial and manual-dial calls): + +; agent screen actions +AGENT_SCREEN_ACTIONS_START +invite_to_final => 0.0,1.2,hangup-dispo-message-logtable,FAS,Auto Hangup and Dispo of False Answer Call,auto-only +invite_to_final => 0.0,0.1,hangup-dispo-message-logtable,FAS,Auto Hangup and Dispo of False Answer Call,manual-only +AGENT_SCREEN_ACTIONS_FINISH + + + Settings within agent screen actions: 1. time range start - a number with 1-6 decimal places 2. time range finish - a number with 1-6 decimal places 3. agent screen action taken - any combination of the following: 'hangup', 'dispo', 'message', 'logtable' separated by dashes 4. If 'dispo' is included in #3, then this is the dispo set. If 'logtable' is used, then this is the result logged 5. If 'message' is included in #3, then this is the message sent to the agent +6. Define if the action is for 'both', 'auto-only' or 'manual-only'. Default or blank is 'both' If you include a message, it will be displayed on the agent's screen for 4 seconds then it will automatically disappear. diff --git a/agc_2-X/trunk/www/agc/conf_exten_check.php b/agc_2-X/trunk/www/agc/conf_exten_check.php index 955940fb..62002539 100644 --- a/agc_2-X/trunk/www/agc/conf_exten_check.php +++ b/agc_2-X/trunk/www/agc/conf_exten_check.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2020 Matt Florell LICENSE: AGPLv2 # # This script is designed purely to send whether the meetme conference has live channels connected and which they are # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table @@ -83,10 +83,11 @@ # 190730-0927 - Added campaign SIP Actions processing # 190925-1348 - Added logtable SIP Action # 191013-2105 - Fixes for PHP7 +# 200825-2343 - Added option for manual-only sip actions # -$version = '2.14-57'; -$build = '191013-2105'; +$version = '2.14-58'; +$build = '200825-2343'; $php_script = 'conf_exten_check.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=51; @@ -981,7 +982,7 @@ if ($ACTION == 'refresh') $sea=0; while ($sip_action_settings_ct >= $sea) { - if (preg_match("/^invite_to_final => /",$sip_action_settings[$sea])) + if ( (preg_match("/^invite_to_final => /",$sip_action_settings[$sea])) and (!preg_match("/auto-only/i",$sip_action_settings[$sea])) ) { # invite_to_final => 0.0,1.0,hangup-dispo-message,FAS,Auto Hangup and Dispo of False Answer Call $sip_action_settings[$sea] = preg_replace("/invite_to_final => /",'',$sip_action_settings[$sea]); diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index a45bee0b..d48d36dc 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -494,10 +494,11 @@ # 200621-1027 - Added queuemetrics_pausereason options # 200712-2034 - Fix for use_custom_cid variable issue # 200719-1645 - Added EVERY_NEW_ALLCALL queuemetrics_pausereason option +# 200825-2342 - Added option for manual-only sip actions # -$version = '2.14-387'; -$build = '200719-1645'; +$version = '2.14-388'; +$build = '200825-2342'; $php_script = 'vdc_db_query.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=839; @@ -7176,9 +7177,9 @@ if ($ACTION == 'manDiaLlookCaLL') $sea=0; while ($sip_action_settings_ct >= $sea) { - if (preg_match("/^invite_to_final => /",$sip_action_settings[$sea])) + if ( (preg_match("/^invite_to_final => /",$sip_action_settings[$sea])) and (!preg_match("/auto-only/i",$sip_action_settings[$sea])) ) { - # invite_to_final => 0.0,1.0,hangup-dispo-message,FAS,Auto Hangup and Dispo of False Answer Call + # invite_to_final => 0.0,1.0,hangup-dispo-message,FAS,Auto Hangup and Dispo of False Answer Call,manual-only $sip_action_settings[$sea] = preg_replace("/invite_to_final => /",'',$sip_action_settings[$sea]); $invite_to_finalARY = explode(",",$sip_action_settings[$sea]); $T_dial_time = floatval($dial_time);