Fix for transfer issue in vicidial.php
git-svn-id: svn://192.168.202.10@4003 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
@@ -759,10 +759,11 @@
|
|||||||
# 260324-0857 - Added hangup_again_link campaign option
|
# 260324-0857 - Added hangup_again_link campaign option
|
||||||
# 260408-1850 - Added max_inbound_auto_reenable option
|
# 260408-1850 - Added max_inbound_auto_reenable option
|
||||||
# 260529-0914 - Added AMDnotesBox
|
# 260529-0914 - Added AMDnotesBox
|
||||||
|
# 260615-0039 - Fix for transfer issue
|
||||||
#
|
#
|
||||||
|
|
||||||
$version = '2.14-725c';
|
$version = '2.14-726c';
|
||||||
$build = '260529-0914';
|
$build = '260615-0039';
|
||||||
$php_script = 'vicidial.php';
|
$php_script = 'vicidial.php';
|
||||||
$mel=1; # Mysql Error Log enabled = 1
|
$mel=1; # Mysql Error Log enabled = 1
|
||||||
$mysql_log_count=110;
|
$mysql_log_count=110;
|
||||||
@@ -8673,13 +8674,25 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
|
|||||||
{
|
{
|
||||||
api_transferconf_ID = api_transferconf_values_array[7];
|
api_transferconf_ID = api_transferconf_values_array[7];
|
||||||
if (api_transferconf_function == 'HANGUP_XFER')
|
if (api_transferconf_function == 'HANGUP_XFER')
|
||||||
{xfercall_send_hangup();}
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
|
xfercall_send_hangup();
|
||||||
|
}
|
||||||
if (api_transferconf_function == 'HANGUP_BOTH')
|
if (api_transferconf_function == 'HANGUP_BOTH')
|
||||||
{bothcall_send_hangup();}
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
|
bothcall_send_hangup();
|
||||||
|
}
|
||||||
if (api_transferconf_function == 'LEAVE_VM')
|
if (api_transferconf_function == 'LEAVE_VM')
|
||||||
{mainxfer_send_redirect('XfeRVMAIL',lastcustchannel,lastcustserverip);}
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
|
mainxfer_send_redirect('XfeRVMAIL',lastcustchannel,lastcustserverip);
|
||||||
|
}
|
||||||
if (api_transferconf_function == 'LEAVE_3WAY_CALL')
|
if (api_transferconf_function == 'LEAVE_3WAY_CALL')
|
||||||
{leave_3way_call('FIRST');}
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
|
leave_3way_call('FIRST');
|
||||||
|
}
|
||||||
if (api_transferconf_function == 'BLIND_TRANSFER')
|
if (api_transferconf_function == 'BLIND_TRANSFER')
|
||||||
{
|
{
|
||||||
if (api_transferconf_override=='YES')
|
if (api_transferconf_override=='YES')
|
||||||
@@ -8758,6 +8771,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
|
|||||||
}
|
}
|
||||||
if (api_parkcustomer == 'HANGUP_XFER_GRAB_CUSTOMER')
|
if (api_parkcustomer == 'HANGUP_XFER_GRAB_CUSTOMER')
|
||||||
{
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
xfercall_send_hangup();
|
xfercall_send_hangup();
|
||||||
mainxfer_send_redirect('FROMParK',lastcustchannel,lastcustserverip);
|
mainxfer_send_redirect('FROMParK',lastcustchannel,lastcustserverip);
|
||||||
}
|
}
|
||||||
@@ -16410,6 +16424,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
|
|||||||
// Hangup Customer Button Press
|
// Hangup Customer Button Press
|
||||||
function hangup_customer_button_click(dispowindow,hotkeysused,altdispo,nodeletevdac,DSHclick)
|
function hangup_customer_button_click(dispowindow,hotkeysused,altdispo,nodeletevdac,DSHclick)
|
||||||
{
|
{
|
||||||
|
API_selected_xfergroup='';
|
||||||
if ( (agent_hangup_value.length > 0) && ( (agent_hangup_route=='MESSAGE') || (agent_hangup_route=='EXTENSION') || (agent_hangup_route=='IN_GROUP') || (agent_hangup_route=='CALLMENU') ) )
|
if ( (agent_hangup_value.length > 0) && ( (agent_hangup_route=='MESSAGE') || (agent_hangup_route=='EXTENSION') || (agent_hangup_route=='IN_GROUP') || (agent_hangup_route=='CALLMENU') ) )
|
||||||
{
|
{
|
||||||
button_click_log = button_click_log + "" + SQLdate + "-----AgentHangupCallRoute---" + VD_live_customer_call + " " + agent_hangup_route + " " + agent_hangup_value + " " + document.vicidial_form.xfernumber.value + "|";
|
button_click_log = button_click_log + "" + SQLdate + "-----AgentHangupCallRoute---" + VD_live_customer_call + " " + agent_hangup_route + " " + agent_hangup_value + " " + document.vicidial_form.xfernumber.value + "|";
|
||||||
@@ -17005,6 +17020,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
|
|||||||
var xfer_channel = lastxferchannel;
|
var xfer_channel = lastxferchannel;
|
||||||
var process_post_hangup=0;
|
var process_post_hangup=0;
|
||||||
xfer_in_call=0;
|
xfer_in_call=0;
|
||||||
|
API_selected_xfergroup='';
|
||||||
if (HANclick=='YES')
|
if (HANclick=='YES')
|
||||||
{button_click_log = button_click_log + "" + SQLdate + "-----xfercall_send_hangup---" + xferchannel + "|";}
|
{button_click_log = button_click_log + "" + SQLdate + "-----xfercall_send_hangup---" + xferchannel + "|";}
|
||||||
if ( (hangup_xfer_record_start == 'Y') && (hangup_both < 1) && (leaving_threeway < 1) && (recording_active < 1) )
|
if ( (hangup_xfer_record_start == 'Y') && (hangup_both < 1) && (leaving_threeway < 1) && (recording_active < 1) )
|
||||||
|
|||||||
@@ -4204,7 +4204,6 @@ if ($non_latin < 1)
|
|||||||
$agent_hangup_value = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$agent_hangup_value);
|
$agent_hangup_value = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$agent_hangup_value);
|
||||||
$second_alert_filename = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$second_alert_filename);
|
$second_alert_filename = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$second_alert_filename);
|
||||||
$third_alert_filename = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$third_alert_filename);
|
$third_alert_filename = preg_replace('/[^-\/\|\._0-9a-zA-Z]/','',$third_alert_filename);
|
||||||
$stage = preg_replace('/[^-\._0-9a-zA-Z]/','',$stage);
|
|
||||||
|
|
||||||
### ALPHA-NUMERIC and underscore and dash and slash and dot and comma
|
### ALPHA-NUMERIC and underscore and dash and slash and dot and comma
|
||||||
$menu_prompt = preg_replace('/[^-\/\|\,\._0-9a-zA-Z]/','',$menu_prompt);
|
$menu_prompt = preg_replace('/[^-\/\|\,\._0-9a-zA-Z]/','',$menu_prompt);
|
||||||
@@ -4371,6 +4370,7 @@ if ($non_latin < 1)
|
|||||||
$city_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$city_rule);
|
$city_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$city_rule);
|
||||||
$county_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$county_rule);
|
$county_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$county_rule);
|
||||||
$ac_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$ac_rule);
|
$ac_rule = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$ac_rule);
|
||||||
|
$stage = preg_replace('/[^- \.\,\_0-9a-zA-Z]/','',$stage);
|
||||||
$stereo_rec_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$stereo_rec_filename);
|
$stereo_rec_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$stereo_rec_filename);
|
||||||
$parallel_rec_co_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$parallel_rec_co_filename);
|
$parallel_rec_co_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$parallel_rec_co_filename);
|
||||||
$parallel_rec_cm_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$parallel_rec_cm_filename);
|
$parallel_rec_cm_filename = preg_replace('/[^-\.\_0-9a-zA-Z]/','',$parallel_rec_cm_filename);
|
||||||
@@ -4954,7 +4954,6 @@ else
|
|||||||
$agent_hangup_value = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$agent_hangup_value);
|
$agent_hangup_value = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$agent_hangup_value);
|
||||||
$second_alert_filename = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$second_alert_filename);
|
$second_alert_filename = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$second_alert_filename);
|
||||||
$third_alert_filename = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$third_alert_filename);
|
$third_alert_filename = preg_replace('/[^-\/\|\._0-9\p{L}]/u','',$third_alert_filename);
|
||||||
$stage = preg_replace('/[^-\._0-9\p{L}]/u','',$stage);
|
|
||||||
|
|
||||||
### ALPHA-NUMERIC and underscore and dash and slash and dot and comma
|
### ALPHA-NUMERIC and underscore and dash and slash and dot and comma
|
||||||
$menu_prompt = preg_replace('/[^-\/\|\,\._0-9\p{L}]/u','',$menu_prompt);
|
$menu_prompt = preg_replace('/[^-\/\|\,\._0-9\p{L}]/u','',$menu_prompt);
|
||||||
@@ -5121,6 +5120,7 @@ else
|
|||||||
$city_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$city_rule);
|
$city_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$city_rule);
|
||||||
$county_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$county_rule);
|
$county_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$county_rule);
|
||||||
$ac_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$ac_rule);
|
$ac_rule = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$ac_rule);
|
||||||
|
$stage = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$stage);
|
||||||
$stereo_rec_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$stereo_rec_filename);
|
$stereo_rec_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$stereo_rec_filename);
|
||||||
$parallel_rec_co_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$parallel_rec_co_filename);
|
$parallel_rec_co_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$parallel_rec_co_filename);
|
||||||
$parallel_rec_cm_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$parallel_rec_cm_filename);
|
$parallel_rec_cm_filename = preg_replace('/[^- \.\,\_0-9\p{L}]/u','',$parallel_rec_cm_filename);
|
||||||
|
|||||||
Reference in New Issue
Block a user