diff --git a/agc_2-X/trunk/agi/agi-VDADcloser.agi b/agc_2-X/trunk/agi/agi-VDADcloser.agi index 71923272..ac006b3f 100644 --- a/agc_2-X/trunk/agi/agi-VDADcloser.agi +++ b/agc_2-X/trunk/agi/agi-VDADcloser.agi @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# agi-VDADcloser.agi version 0.5 *DBI-version* +# agi-VDADcloser.agi version 0.6 *DBI-version* # # runs when a call comes in from a VICIDIAL fronter. This script will # send the calls out to the closers that are logged in. @@ -15,9 +15,9 @@ #exten => _90009.,1,Answer ; Answer the line #exten => _90009.,2,AGI(agi-VDADcloser.agi,${EXTEN}-----START) # -# Copyright (C) 2006 Matt Florell LICENSE: GPLv2 +# Copyright (C) 2007 Matt Florell LICENSE: GPLv2 # -# changes: +# CHANGELOG: # 60503-1242 - Added drop second/message/exten options from inbound_group # 60811-1127 - Changed to DBI # 60811-1145 - changed to use /etc/astguiclient.conf for configs @@ -25,6 +25,7 @@ # - changed look for agent every 0.5 second for first 4 sec on hold # 60905-1047 - changed look for agent every 0.25 second for first 4 sec on hold # 70111-1600 - added ability to use BLEND/INBND/*_C/*_B/*_I as closer campaigns +# 70212-1252 - Fixed issue with Local/ channel transfers on same server # $script = 'agi-VDADcloser.agi'; @@ -235,8 +236,15 @@ if ($AGILOG) {$agi_string = "+++++ VDAD START : |$CIDlead_id|$now_date|"; &agi if ($channel =~ /Local/i) { -if ($AGILOG) {$agi_string = "+++++ VDAD START LOCAL CHANNEL: EXITING- $priority"; &agi_output;} -exit; + if ($inbound_number =~ /CXFER/) + { + if ($AGILOG) {$agi_string = "+++++ VDAD START LOCAL CHANNEL: CXFER OVERRIDE- $priority"; &agi_output;} + } + else + { + if ($AGILOG) {$agi_string = "+++++ VDAD START LOCAL CHANNEL: EXITING- $priority"; &agi_output;} + exit; + } } ### Grab Server values from the database diff --git a/agc_2-X/trunk/agi/agi-VDADfixCXFER.agi b/agc_2-X/trunk/agi/agi-VDADfixCXFER.agi index ff2181ea..35d18dcd 100644 --- a/agc_2-X/trunk/agi/agi-VDADfixCXFER.agi +++ b/agc_2-X/trunk/agi/agi-VDADfixCXFER.agi @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# agi-VDADfixCXFER.agi version 0.3 *DBI-version* +# agi-VDADfixCXFER.agi version 0.4 *DBI-version* # # runs when a Consultative transfer is released by the vicidial fronter as the # call arrives on another channel so that the vicidial_live_agents record is @@ -10,12 +10,14 @@ # # ;VICIDIAL Consultative Xfer fix script: # exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi) +# exten => _010*010*010*015*8600XXX*.,1,AGI(agi-VDADfixCXFER.agi) +# +# Copyright (C) 2007 Matt Florell LICENSE: GPLv2 # -# Copyright (C) 2006 Matt Florell LICENSE: GPLv2 -# -# changes: -# 60809-1749 - first build -# 60817-1122 - added output options check from database +# CHANGELOG: +# 60809-1749 - First build +# 60817-1122 - Added output options check from database +# 70212-1252 - Fixed issue with Local/ channel transfers on same server # $script = 'agi-VDADfixCXFER.agi'; @@ -161,6 +163,10 @@ while() if (/^agi_extension\:\s+(.*)$/) {$extension = $1;} } +# 010*010*011*011* + +$extension =~ s/^\d\d\d\*\d\d\d\*\d\d\d\*\d\d\d\*//gi; + @EXTEN = split(/\*/, $extension); $conf_exten = $EXTEN[0]; $lead_id = $EXTEN[1]; diff --git a/agc_2-X/trunk/docs/QUEUEMETRICS.txt b/agc_2-X/trunk/docs/QUEUEMETRICS.txt index c2bc7dcc..b492a768 100644 --- a/agc_2-X/trunk/docs/QUEUEMETRICS.txt +++ b/agc_2-X/trunk/docs/QUEUEMETRICS.txt @@ -101,6 +101,8 @@ agent: we will use the user ID prepended by "agent/" [agent/6666] verbs: PAUSEALL PAUSE +CALLSTATUS +PAUSEREASON COMPLETECALLER AGENTCALLBACKLOGOFF ABANDON 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 52616ff5..3969a850 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -1,7 +1,7 @@ LICENSE: GPLv2 +# Copyright (C) 2007 Matt Florell LICENSE: GPLv2 # # 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 @@ -70,7 +70,7 @@ # - $omit_phone_code - ('Y','N') # - $no_delete_sessions - ('0','1') -# changes +# CHANGELOG: # 50629-1044 - First build of script # 50630-1422 - Added manual dial action and MD channel lookup # 50701-1451 - Added dial log for start and end of vicidial calls @@ -101,7 +101,7 @@ # - Added USERONLY Callback count output - CalLBacKCounT # 60414-1140 - Added Callback lead lookup for manual dialing # 60419-1517 - After CALLBK is sent to agent, update callback record to INACTIVE -# 60421-1419 - check GET/POST vars lines with isset to not trigger PHP NOTICES +# 60421-1419 - Check GET/POST vars lines with isset to not trigger PHP NOTICES # 60427-1236 - Fixed closer_choice error for CLOSER campaigns # 60609-1148 - Added ability to check for manual dial numbers in DNC # 60619-1117 - Added variable filters to close security holes for login form @@ -118,10 +118,11 @@ # 70203-0930 - Added dialed_number to lead info output # 70203-1030 - Added dialed_label to lead info output # 70206-1126 - Added INBOUND status for inbound/closer calls in vicidial_live_agents +# 70212-1253 - Fixed small issue with CXFER # -$version = '2.0.45'; -$build = '70206-1126'; +$version = '2.0.46'; +$build = '70212-1253'; require("dbconnect.php"); @@ -1524,7 +1525,7 @@ else $row=mysql_fetch_row($rslt); $agent_channel = "$row[0]"; if ($format=='debug') {echo "\n";} - $stmt="INSERT INTO vicidial_manager values('','','$NOW_TIME','NEW','N','$server_ip','','Hangup','RH123459$StarTtime','Channel: $agent_channel','','','','','','','','','');"; + $stmt="INSERT INTO vicidial_manager values('','','$NOW_TIME','NEW','N','$server_ip','','Hangup','ULGH3459$StarTtime','Channel: $agent_channel','','','','','','','','','');"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); } diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 11d6dc54..1e2be841 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -1,7 +1,7 @@ LICENSE: GPLv2 +# Copyright (C) 2007 Matt Florell LICENSE: GPLv2 # # make sure you have added a user to the vicidial_users MySQL table with at least # user_level 1 or greater to access this page. Also, you need to have the login @@ -15,7 +15,7 @@ # - vdc_db_query.php: Updates information in the database # - manager_send.php: Sends manager actions to the DB for execution # -# CHANGES +# CHANGELOG # 50607-1426 - First Build of VICIDIAL web client basic login process finished # 50628-1620 - Added some basic formatting and worked on process flow # 50628-1715 - Startup variables mapped to javascript variables @@ -145,10 +145,11 @@ # 70203-1010 - Added dialed_label to webform output # 70206-1201 - Fixed allow_closers bug # 70206-1332 - Added vicidial_recording_override users setting function +# 70212-1252 - Fixed small issue with CXFER # -$version = '2.0.116'; -$build = '70206-1332'; +$version = '2.0.117'; +$build = '70212-1252'; require("dbconnect.php"); @@ -1764,7 +1765,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (Ctasknum.length < 2) {Ctasknum = '990009';} var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value; - tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '**' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*'; + tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '*CXFER*' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*'; } var regAXFvars = new RegExp("AXFER","g"); if (tasknum_string.match(regAXFvars))