ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small change to how in-group uniqueid display works, addition of PRESERVE option

Browse Source 
git-svn-id: svn://192.168.202.10@1420 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2010-04-28 10:57:02 +00:00
parent 0f76f1669b
commit af0f6d198f
9 changed files with 99 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LANG_www/agc_it/vdc_db_query.php
+4 -3
View File
@@ -4268,7 +4268,7 @@ if ($ACTION == 'VDADcheckINCOMING')
$script_recording_delay = $row[0];
}
$stmt = "select group_name,group_color,web_form_address,fronter_display,ingroup_script,get_call_launch,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_xfer_group,ingroup_recording_override,ingroup_rec_filename,default_group_alias,web_form_address_two,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,uniqueid_status_display from vicidial_inbound_groups where group_id='$VDADchannel_group';";
$stmt = "select group_name,group_color,web_form_address,fronter_display,ingroup_script,get_call_launch,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_xfer_group,ingroup_recording_override,ingroup_rec_filename,default_group_alias,web_form_address_two,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,uniqueid_status_display,uniqueid_status_prefix from vicidial_inbound_groups where group_id='$VDADchannel_group';";
if ($DB) {echo "$stmt\n";}
$rslt=mysql_query($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00119',$user,$server_ip,$session_name,$one_mysql_log);}
@@ -4300,6 +4300,7 @@ if ($ACTION == 'VDADcheckINCOMING')
$VDCL_xferconf_d_number = $row[21];
$VDCL_xferconf_e_number = $row[22];
$VDCL_uniqueid_status_display = $row[23];
$VDCL_uniqueid_status_prefix = $row[24];
$stmt = "select campaign_script,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_group_alias,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number from vicidial_campaigns where campaign_id='$campaign';";
if ($DB) {echo "$stmt\n";}
@@ -4479,8 +4480,8 @@ if ($ACTION == 'VDADcheckINCOMING')
}
### if web form is set then send su to vicidial.php for override of WEB_FORM address
if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|\n";}
else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|\n";}
if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|\n";}
else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|\n";}
$stmt = "SELECT full_name from vicidial_users where user='$tsr';";
if ($DB) {echo "$stmt\n";}
LANG_www/agc_it/vicidial.php
+53 -5
View File
@@ -291,10 +291,11 @@
# 100413-1349 - Various small logging fixes and extended alt-dial fixes
# 100420-1009 - Added scheduled_callbacks_count option
# 100423-1156 - Added more user logging data and manual_dial_override, blind monitor warnings, uniqueid display and codec features
# 100428-0544 - Added uniqueid display option for PRESERVE
#
$version = '2.4-269';
$build = '100423-1156';
$version = '2.4-270';
$build = '100428-0544';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=66;
$one_mysql_log=0;
@@ -2903,6 +2904,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
var blind_monitoring_now_trigger=0;
var no_blind_monitors=0;
var uniqueid_status_display='';
var uniqueid_status_prefix='';
var custom_call_id='';
var DiaLControl_auto_HTML = "<IMG SRC=\"../agc/images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pausa \"><a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADready');\"><IMG SRC=\"../agc/images/vdc_LB_resume.gif\" border=0 alt=\"Riprendi\"></a>";
var DiaLControl_auto_HTML_ready = "<a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADpause');\"><IMG SRC=\"../agc/images/vdc_LB_pause.gif\" border=0 alt=\" Pausa \"></a><IMG SRC=\"../agc/images/vdc_LB_resume_OFF.gif\" border=0 alt=\"Riprendi\">";
@@ -5232,6 +5234,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars = '?' + web_form_vars}
TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
}
if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5327,6 +5334,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars_two = '?' + web_form_vars_two}
TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
}
document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"../agc/images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -5648,6 +5660,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars = '?' + web_form_vars}
TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
}
if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -5743,6 +5760,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars_two = '?' + web_form_vars_two}
TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
}
document.getElementById("WebFormSpan").innerHTML = "<a href=\"" + TEMP_VDIC_web_form_address + "\" target=\"" + web_form_target + "\" onMouseOver=\"WebFormRefresH();\"><IMG SRC=\"../agc/images/vdc_LB_webform.gif\" border=0 alt=\"Web Form\"></a>\n";
@@ -6651,9 +6673,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
CalL_XC_e_NuMber = VDIC_data_VDIG[23];
CalL_XC_e_NuMber = VDIC_data_VDIG[23];
uniqueid_status_display = VDIC_data_VDIG[24];
if ( (uniqueid_status_display=='ENABLED') || (uniqueid_status_display=='ENABLED_PREFIX') )
{custom_call_id = " ID chiamata " + VDIC_data_VDIG[25];}
uniqueid_status_prefix = VDIC_data_VDIG[26];
var VDIC_data_VDFR=check_VDIC_array[3].split("|");
if ( (VDIC_data_VDFR[1].length > 1) && (VDCL_fronter_display == 'Y') )
{VDIC_fronter = " Fronter: " + VDIC_data_VDFR[0] + " - " + VDIC_data_VDFR[1];}
@@ -6670,6 +6690,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
document.vicidial_form.SecondS.value = 0;
document.getElementById("SecondSDISP").innerHTML = '0';
if (uniqueid_status_display=='ENABLED')
{custom_call_id = " ID chiamata " + VDIC_data_VDAC[1];}
if (uniqueid_status_display=='ENABLED_PREFIX')
{custom_call_id = " ID chiamata " + uniqueid_status_prefix + "" + VDIC_data_VDAC[1];}
if (uniqueid_status_display=='ENABLED_PRESERVE')
{custom_call_id = " ID chiamata " + VDIC_data_VDIG[25];}
VD_live_customer_call = 1;
VD_live_call_secondS = 0;
@@ -6984,6 +7011,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars = '?' + web_form_vars}
TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
}
if (VDIC_web_form_address_two.match(regWFAcustom))
@@ -7079,6 +7111,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars_two = '?' + web_form_vars_two}
TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
}
@@ -7360,6 +7397,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars = '?' + web_form_vars}
TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&');
}
@@ -7485,6 +7527,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{web_form_vars_two = '?' + web_form_vars_two}
TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two;
var regWFAqavars = new RegExp("\\?&","ig");
var regWFAaavars = new RegExp("&&","ig");
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?');
TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&');
}
@@ -8270,6 +8317,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
MD_channel_look=0;
MD_ring_secondS=0;
uniqueid_status_display='';
uniqueid_status_prefix='';
custom_call_id='';
if (manual_dial_in_progress==1)