From ee86200dec76cec57c58df6639e05de7df547641 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 26 Sep 2017 20:50:37 +0000 Subject: [PATCH] Fix for Test Call function for Asterisk 13 git-svn-id: svn://192.168.202.10@2822 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index eb80ffa1..2794c6fd 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4181,12 +4181,13 @@ else # 170913-0908 - Added Agent Inbound Status Summary Report # 170920-2153 - Added expired_lists_inactive system setting and functions # 170923-1425 - Added did_system_filter system setting and functions +# 170926-1618 - Fix for Test Call function for Asterisk 13 # # 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-630a'; -$build = '170923-1425'; +$admin_version = '2.14-631a'; +$build = '170926-1618'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -13646,6 +13647,20 @@ if ($ADD==41) $campaign_cid_override = $row[0]; } + ### gather server information + $stmt="SELECT asterisk_version,routing_prefix FROM servers where server_ip='$old_server_ip';"; + $rslt=mysql_to_mysqli($stmt, $link); + if ($DB) {echo "$stmt\n";} + $srv_ct = mysqli_num_rows($rslt); + $asterisk_version=''; + $routing_prefix=''; + if ($srv_ct > 0) + { + $row=mysqli_fetch_row($rslt); + $asterisk_version = $row[0]; + $routing_prefix = $row[1]; + } + $CCID_on=0; $CCID=''; $local_DEF = 'Local/'; $local_AMP = '@'; @@ -13656,6 +13671,11 @@ if ($ADD==41) if (strlen($dial_prefix) > 0) {$Local_out_prefix = "$dial_prefix";} if (strlen($campaign_vdad_exten) > 0) {$VDAD_dial_exten = "$campaign_vdad_exten";} else {$VDAD_dial_exten = "$SSanswer_transfer_agent";} + $major_version = explode('.',$asterisk_version); + if ($major_version[0] >= 12) + { + $VDAD_dial_exten = "$routing_prefix$VDAD_dial_exten"; + } if (strlen($campaign_cid) > 6) {$CCID = "$campaign_cid"; $CCID_on++;} if (strlen($campaign_cid_override) > 6) {$CCID = "$campaign_cid_override"; $CCID_on++;} if (preg_match("/x/",$dial_prefix)) {$Local_out_prefix = '';} @@ -33003,8 +33023,8 @@ if ($ADD==311111111111) echo ""._QXZ("VMail Dump Exten NI").": $NWB#servers-voicemail_dump_exten_no_inst$NWE\n"; echo ""._QXZ("auto dial extension").": $NWB#servers-answer_transfer_agent$NWE"; - $major_verison = explode('.',$asterisk_version); - if ($major_verison[0] >= 13) + $major_version = explode('.',$asterisk_version); + if ($major_version[0] >= 12) { echo "     "._QXZ("prefix").": $NWB#servers-routing_prefix$NWE"; }