fixed blind transfer bug in agent app

fexed counting bug in admin.php

git-svn-id: svn://192.168.202.10@1016 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2008-11-25 14:53:01 +00:00
parent 9129865c44
commit 6c26adc2e7
4 changed files with 22 additions and 11 deletions
+2 -1
View File
@@ -514,7 +514,8 @@ if ( ($ct_day_start > 0) || ($ct_day_stop > 0) )
$ct_default_stop = $ct_day_stop;
}
$AGI->stream_file('beep');
$AGI->stream_file('sip-silence');
$AGI->stream_file('sip-silence');
if ($call_handle_method =~ /DIGITID$/)
{
+8 -4
View File
@@ -77,7 +77,8 @@
# - $agentchannel = ('Zap/1-1','SIP/testing-6ry4i3',...)
# - $conf_dialed = ('0','1')
# - $leaving_threeway = ('0','1')
# - $blind_transfer = ('0','1')
#
# CHANGELOG:
# 50629-1044 - First build of script
# 50630-1422 - Added manual dial action and MD channel lookup
@@ -176,10 +177,11 @@
# 81111-1630 - Added another hangup fix for non-hangup
# 81114-0126 - More vicidial_agent_log bug fixes
# 81119-1809 - webform backslash fix
# 81124-2212 - Fixes blind transfer bug
#
$version = '2.0.5-94';
$build = '81119-1809';
$version = '2.0.5-95';
$build = '81124-2212';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=184;
$one_mysql_log=0;
@@ -335,6 +337,8 @@ if (isset($_GET["leaving_threeway"])) {$leaving_threeway=$_GET["leaving_threew
elseif (isset($_POST["leaving_threeway"])) {$leaving_threeway=$_POST["leaving_threeway"];}
if (isset($_GET["hangup_all_non_reserved"])) {$hangup_all_non_reserved=$_GET["hangup_all_non_reserved"];}
elseif (isset($_POST["hangup_all_non_reserved"])) {$hangup_all_non_reserved=$_POST["hangup_all_non_reserved"];}
if (isset($_GET["blind_transfer"])) {$blind_transfer=$_GET["blind_transfer"];}
elseif (isset($_POST["blind_transfer"])) {$blind_transfer=$_POST["blind_transfer"];}
header ("Content-type: text/html; charset=utf-8");
header ("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
@@ -2144,7 +2148,7 @@ if ($stage == "end")
### if a conference call or 3way call was attempted, then hangup all channels except for the agentchannel
if ( ( ($conf_dialed > 0) or ($hangup_all_non_reserved > 0) ) and ($leaving_threeway < 1) )
if ( ( ($conf_dialed > 0) or ($hangup_all_non_reserved > 0) ) and ($leaving_threeway < 1) and ($blind_transfer < 1) )
{
$loop_count=0;
while($loop_count < $total_hangup)
+10 -3
View File
@@ -208,10 +208,11 @@
# 81110-0057 - Changed Pause time to start new vicidial_agent_log on every pause
# 81110-1514 - Added hangup_all_non_reserved to fix non-Hangup bug
# 81119-1811 - webform backslash fix
# 81124-2213 - Fixes blind transfer bug
#
$version = '2.0.5-187';
$build = '81119-1811';
$version = '2.0.5-188';
$build = '81124-2213';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=53;
$one_mysql_log=0;
@@ -2140,6 +2141,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
var agentphonelive = 0;
var conf_dialed = 0;
var leaving_threeway = 0;
var blind_transfer = 0;
var hangup_all_non_reserved = '<? echo $hangup_all_non_reserved ?>';
var dial_method = '<? echo $dial_method ?>';
var DiaLControl_auto_HTML = "<IMG SRC=\"./images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pause \"><a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADready');\"><IMG SRC=\"./images/vdc_LB_resume.gif\" border=0 alt=\"Resume\"></a>";
@@ -2945,6 +2947,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
// Covers the following types: XFER, VMAIL, ENTRY, CONF, PARK, FROMPARK, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
function mainxfer_send_redirect(taskvar,taskxferconf,taskserverip,taskdebugnote)
{
blind_transfer=1;
// conf_dialed=1;
if (auto_dial_level == 0) {RedirecTxFEr = 1;}
var xmlhttpXF=false;
@@ -3084,6 +3087,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
}
if (taskvar == 'ParK')
{
blind_transfer=0;
var queryCID = "LPvdcW" + epoch_sec + user_abb;
var redirectdestination = taskxferconf;
var redirectdestserverip = taskserverip;
@@ -3095,6 +3099,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
}
if (taskvar == 'FROMParK')
{
blind_transfer=0;
var queryCID = "FPvdcW" + epoch_sec + user_abb;
var redirectdestination = taskxferconf;
var redirectdestserverip = taskserverip;
@@ -3267,7 +3272,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&list_id=" + document.vicidial_form.list_id.value +
"&length_in_sec=0&phone_code=" + document.vicidial_form.phone_code.value +
"&phone_number=" + lead_dial_number +
"&exten=" + extension + "&channel=" + lastcustchannel + "&start_epoch=" + MDlogEPOCH + "&auto_dial_level=" + auto_dial_level + "&VDstop_rec_after_each_call=" + VDstop_rec_after_each_call + "&conf_silent_prefix=" + conf_silent_prefix + "&protocol=" + protocol + "&extension=" + extension + "&ext_context=" + ext_context + "&conf_exten=" + session_id + "&user_abb=" + user_abb + "&agent_log_id=" + agent_log_id + "&MDnextCID=" + LasTCID + "&inOUT=" + inOUT + "&alt_dial=" + dialed_label + "&DB=0" + "&agentchannel=" + agentchannel + "&conf_dialed=" + conf_dialed + "&leaving_threeway=" + leaving_threeway + "&hangup_all_non_reserved=" + hangup_all_non_reserved;
"&exten=" + extension + "&channel=" + lastcustchannel + "&start_epoch=" + MDlogEPOCH + "&auto_dial_level=" + auto_dial_level + "&VDstop_rec_after_each_call=" + VDstop_rec_after_each_call + "&conf_silent_prefix=" + conf_silent_prefix + "&protocol=" + protocol + "&extension=" + extension + "&ext_context=" + ext_context + "&conf_exten=" + session_id + "&user_abb=" + user_abb + "&agent_log_id=" + agent_log_id + "&MDnextCID=" + LasTCID + "&inOUT=" + inOUT + "&alt_dial=" + dialed_label + "&DB=0" + "&agentchannel=" + agentchannel + "&conf_dialed=" + conf_dialed + "&leaving_threeway=" + leaving_threeway + "&hangup_all_non_reserved=" + hangup_all_non_reserved + "&blind_transfer=" + blind_transfer;
xmlhttp.open('POST', 'vdc_db_query.php');
xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8');
// document.getElementById("busycallsdebug").innerHTML = "vdc_db_query.php?" + manDiaLlog_query;
@@ -5503,6 +5508,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
function WeBForMDispoSelect_submit()
{
leaving_threeway=0;
blind_transfer=0;
document.vicidial_form.callchannel.value = '';
document.vicidial_form.callserverip.value = '';
document.vicidial_form.xferchannel.value = '';
@@ -5538,6 +5544,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
else
{var group = campaign;}
leaving_threeway=0;
blind_transfer=0;
document.vicidial_form.callchannel.value = '';
document.vicidial_form.callserverip.value = '';
document.vicidial_form.xferchannel.value = '';
+2 -3
View File
@@ -1489,6 +1489,8 @@ $STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
$MT[0]='';
$US='_';
$active_lists=0;
$inactive_lists=0;
$month_old = mktime(0, 0, 0, date("m")-1, date("d"), date("Y"));
$past_month_date = date("Y-m-d H:i:s",$month_old);
@@ -12487,9 +12489,6 @@ if ($ADD==34)
echo "<td><font size=1> $row[5]</td>";
echo "<td><font size=1><a href=\"$PHP_SELF?ADD=311&list_id=$row[0]\">MODIFY</a></td></tr>\n";
if (ereg("Y", $row[4])) {$active_lists++; $camp_lists .= "'$row[0]',";}
if (ereg("N", $row[4])) {$inactive_lists++;}
$o++;
}