From 042e1be53cdc6700be8264b2813c4a5d1c8c1ff4 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 22 Jan 2019 01:21:49 +0000 Subject: [PATCH] Added RA_USER_PHONE On-Hook CID to solve last RINGAGENT issues git-svn-id: svn://192.168.202.10@3061 3d104415-ff17-0410-8863-d5cf3c621b8a --- agi/agi-VDAD_ALL_inbound.agi | 6 ++++++ bin/AST_manager_listen_AMI2.pl | 4 +++- bin/AST_update_AMI2.pl | 5 +++-- www/vicidial/admin.php | 7 ++++--- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/agi/agi-VDAD_ALL_inbound.agi b/agi/agi-VDAD_ALL_inbound.agi index 82bb3a87..3049cf66 100644 --- a/agi/agi-VDAD_ALL_inbound.agi +++ b/agi/agi-VDAD_ALL_inbound.agi @@ -230,6 +230,7 @@ # 180601-0932 - Added user variable sending option on enter_ingroup_url feature # 180806-0809 - Added CID callback number validation and change features # 180926-2351 - Added _wait_time options for next_agent_call +# 190121-1505 - Added RA_USER_PHONE On-Hook CID to solve last RINGAGENT issues # $script = 'agi-VDAD_ALL_inbound.agi'; @@ -3443,6 +3444,11 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) && ($MCdrop_override $PADauto_call_id = sprintf("%011s", $auto_call_id); while (length($PADauto_call_id) > 11) {chop($PADauto_call_id);} $RINGALLqueryCID = "RINGAGENT$PADauto_call_id"; + if ($on_hook_cid =~ /RA_AGENT_PHONE/) + { + $RINGALLqueryCID = "RA_$ARuser[$ragp]_$phone_number"; + $RINGALLqueryCID = substr( $RINGALLqueryCID, 0, 20); + } if ($on_hook_cid =~ /INGROUP/) {$RINGALLqueryCID = "$channel_group";} if ($on_hook_cid =~ /CUSTOMER_PHONE/) diff --git a/bin/AST_manager_listen_AMI2.pl b/bin/AST_manager_listen_AMI2.pl index 4a3bde3f..816d71bc 100644 --- a/bin/AST_manager_listen_AMI2.pl +++ b/bin/AST_manager_listen_AMI2.pl @@ -23,6 +23,7 @@ # 170915-2106 - Initial version based off the orginal AST_manager_listen.pl script # 170920-1418 - Fix for issue with recordings beginning with CALLID variable # 170930-0923 - Commented out handle_sip_event and handle_cpd_event functions, not needed anymore, to be deleted later +# 190121-1505 - Added RA_USER_PHONE On-Hook CID to solve last RINGAGENT issues # # constants @@ -493,7 +494,8 @@ sub validate_cid_name ( $cid_name =~ /DC\d\d\d\d\d\dW\d\d\d\d\d\d\d\d\d\dW/ ) || # 3way transfers ( $cid_name =~ /M\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Manual Dials ( $cid_name =~ /V\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Auto Dials - ( $cid_name =~ /Y\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) # Inbound Calls + ( $cid_name =~ /Y\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Inbound Calls + ( $cid_name =~ /^RINGAGENT|^RA_/ ) ) { return 1; # if so return 1 for true diff --git a/bin/AST_update_AMI2.pl b/bin/AST_update_AMI2.pl index 48417478..3eeb801e 100644 --- a/bin/AST_update_AMI2.pl +++ b/bin/AST_update_AMI2.pl @@ -14,6 +14,7 @@ # 180511-1146 - Changed to use server-specific cid_channels_recent table # 181003-1728 - Fix for RINGAGENT calls # 190102-1509 - More fixes for RINGAGENT Calls +# 190121-1505 - Added RA_USER_PHONE On-Hook CID to solve last RINGAGENT issues # # constants @@ -744,7 +745,7 @@ sub process_channels $call_id = get_valid_callid($channel_ref->{'CallerIDName'},$channel_ref->{'ConnectedLineName'}); # only need to match local channels to real channels on VDAD and RINGAGENT calls - if ( (( $call_id =~ /^V\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/ ) && ( $channel_ref->{'ConnectedLineName'} ne "" )) || ( $call_id =~ /^RINGAGENT/ ) ) + if ( (( $call_id =~ /^V\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d$/ ) && ( $channel_ref->{'ConnectedLineName'} ne "" )) || ( $call_id =~ /^RINGAGENT|^RA_/ ) ) { if ( $channel_ref->{'Channel'} =~ /^Local/ ) { @@ -1344,7 +1345,7 @@ sub validate_cid_name ( $cid_name =~ /M\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Manual Dials ( $cid_name =~ /V\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Auto Dials ( $cid_name =~ /Y\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d\d/) || # Inbound Calls - ( $cid_name =~ /^RINGAGENT/ ) + ( $cid_name =~ /^RINGAGENT|^RA_/ ) ) { return 1; # if so return 1 for true diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 7312a8cc..61a126b3 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -4466,12 +4466,13 @@ else # 181005-1738 - Added SYSTEM to Manual Dial Filter campaign options # 181116-1133 - Fix for DID server IP de-assignment # 190108-0806 - Added manual_dial_validation system and campaign options, update date for 2019 +# 190121-2019 - Added RA_AGENT_PHONE on-hook agent option # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.14-696a'; -$build = '190108-0806'; +$admin_version = '2.14-697a'; +$build = '190121-2019'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -28207,7 +28208,7 @@ if ($ADD==3111) echo ""._QXZ("On-Hook Ring Time").": $NWB#inbound_groups-on_hook_ring_time$NWE\n"; - echo ""._QXZ("On-Hook CID").": $NWB#inbound_groups-on_hook_cid$NWE\n"; + echo ""._QXZ("On-Hook CID").": $NWB#inbound_groups-on_hook_cid$NWE\n"; echo ""._QXZ("On-Hook CID Number").": $NWB#inbound_groups-on_hook_cid_number$NWE\n";