From 388a8450dbf4066f28d3e69b2986890f3c0aa240 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 28 Apr 2010 10:57:02 +0000 Subject: [PATCH] Small change to how in-group uniqueid display works, addition of PRESERVE option git-svn-id: svn://192.168.202.10@1420 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../trunk/LANG_www/agc_it/vdc_db_query.php | 7 ++- agc_2-X/trunk/LANG_www/agc_it/vicidial.php | 58 +++++++++++++++++-- .../bin/VICIDIAL_UPDATE_leads_status_file.pl | 18 +++++- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 4 +- agc_2-X/trunk/extras/upgrade_2.4.sql | 4 ++ .../TO_BE_TRANSLATED_2.4.txt | 1 + agc_2-X/trunk/www/agc/vdc_db_query.php | 7 ++- agc_2-X/trunk/www/agc/vicidial.php | 18 ++++-- agc_2-X/trunk/www/vicidial/admin.php | 4 +- 9 files changed, 99 insertions(+), 22 deletions(-) diff --git a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php index 63abb219..6758c6fa 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php @@ -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";} diff --git a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php index 3a3cb883..f5e3774b 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php @@ -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 = "\"\"Riprendi\""; var DiaLControl_auto_HTML_ready = "\"\"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 = "\"Web\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 = "\"Web\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) diff --git a/agc_2-X/trunk/bin/VICIDIAL_UPDATE_leads_status_file.pl b/agc_2-X/trunk/bin/VICIDIAL_UPDATE_leads_status_file.pl index 70ea379e..c0210678 100644 --- a/agc_2-X/trunk/bin/VICIDIAL_UPDATE_leads_status_file.pl +++ b/agc_2-X/trunk/bin/VICIDIAL_UPDATE_leads_status_file.pl @@ -16,6 +16,7 @@ # CHANGES # 90627-1402 - First Build # 90907-0635 - Added list_id to table and allowed for multiple matches in results +# 100427-0604 - Added purge callbacks option # $secX = time(); @@ -107,6 +108,7 @@ if (length($ARGV[0])>1) print " [--test] = test\n"; print " [--debug] = debug output\n"; print " [--delete-from-hopper] = delete lead from hopper if present\n"; + print " [--delete-from-callbacks] = delete lead from scheduled callbacks if present\n"; print " [--format=standard] = ability to define a format, standard is default, formats allowed shown in examples\n"; print " [--ftp-pull] = grabs lead files from a remote FTP server, uses REPORTS FTP login information\n"; print " [--ftp-dir=leads_in] = remote FTP server directory to grab files from, should have a DONE sub-directory\n"; @@ -147,7 +149,13 @@ if (length($ARGV[0])>1) $delete_from_hopper=1; if ($q < 1) {print "\n----- DELETE FROM HOPPER -----\n\n";} } - else {$DBX=0;} + else {$delete_from_hopper=0;} + if ($args =~ /--delete-from-callbacks/) + { + $delete_from_callbacks=1; + if ($q < 1) {print "\n----- DELETE FROM CALLBACKS -----\n\n";} + } + else {$delete_from_callbacks=0;} if ($args =~ /-format=/i) { @@ -456,7 +464,13 @@ foreach(@FILES) { $stmtZ = "DELETE from vicidial_hopper where lead_id IN($lead_id);"; if (!$T) {$Uaffected_rows = $dbhA->do($stmtZ); } # or die "Couldn't execute query: |$stmtZ|\n"; - if($DB){print STDERR "\n|$Uaffected_rows|$stmtZ|\n";} + if($DB){print STDERR "\nhopper purge: |$Uaffected_rows|$stmtZ|\n";} + } + if ($delete_from_callbacks > 0) + { + $stmtZ = "DELETE from vicidial_callbacks where lead_id IN($lead_id);"; + if (!$T) {$Uaffected_rows = $dbhA->do($stmtZ); } # or die "Couldn't execute query: |$stmtZ|\n"; + if($DB){print STDERR "\ncallbacks purge: |$Uaffected_rows|$stmtZ|\n";} } } else diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 1dcf60bb..c9a46266 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -897,7 +897,7 @@ xferconf_d_number VARCHAR(50) default '', xferconf_e_number VARCHAR(50) default '', ignore_list_script_override ENUM('Y','N') default 'N', extension_appended_cidname ENUM('Y','N') default 'N', -uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX') default 'DISABLED', +uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX','ENABLED_PRESERVE') default 'DISABLED', uniqueid_status_prefix VARCHAR(50) default '' ); @@ -2205,7 +2205,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; -UPDATE system_settings SET db_schema_version='1215',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1216',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.4.sql b/agc_2-X/trunk/extras/upgrade_2.4.sql index 6c7d69bc..efcaab85 100644 --- a/agc_2-X/trunk/extras/upgrade_2.4.sql +++ b/agc_2-X/trunk/extras/upgrade_2.4.sql @@ -268,3 +268,7 @@ ALTER TABLE phones ADD codecs_list VARCHAR(100) default ''; ALTER TABLE phones ADD codecs_with_template ENUM('0','1') default '0'; UPDATE system_settings SET db_schema_version='1215',db_schema_update_date=NOW(); + +ALTER TABLE vicidial_inbound_groups MODIFY uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX','ENABLED_PRESERVE') default 'DISABLED'; + +UPDATE system_settings SET db_schema_version='1216',db_schema_update_date=NOW(); diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt index 6055de2b..28f8cf94 100644 --- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -117,6 +117,7 @@ Allowed Codecs|| You can define a comma delimited list of codecs to be set as the default codecs for this phone. Options for codecs include ulaw, alaw, gsm, g729, speex, g722, g723, g726, ilbc, ... Some of these codecs might not be available on your system, like g729 or g726. If the field is empty, then the system default codecs or the phone entry above this one will be used for the allowable codecs. Default is empty|| Allowed Codecs With Template|| Setting this option to 1 will include the codecs defined above even if a conf file template is used. Default is 0|| +If the PRESERVE option is used and the call is sent to a second agent, the uniqueid and prefix displayed to the first agent will also be displayed to the second agent|| AST_VICIDIAL_ingrouplist.php 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 1ef921f5..e63e6b66 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -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 on 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";} diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 18fe82fc..c6e48a0c 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -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 = "\"\"Resume\""; var DiaLControl_auto_HTML_ready = "\"\"Resume\""; @@ -6671,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 = " Call ID " + 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];} @@ -6690,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 = " Call ID " + VDIC_data_VDAC[1];} + if (uniqueid_status_display=='ENABLED_PREFIX') + {custom_call_id = " Call ID " + uniqueid_status_prefix + "" + VDIC_data_VDAC[1];} + if (uniqueid_status_display=='ENABLED_PRESERVE') + {custom_call_id = " Call ID " + VDIC_data_VDIG[25];} + VD_live_customer_call = 1; VD_live_call_secondS = 0; @@ -8310,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) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 2210f930..65a67278 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4674,7 +4674,7 @@ if ($ADD==99999)

- Uniqueid Status Display - If enabled, when an agent receives a call through this in-group they will see the uniqueid of the call added to the status line in their agent interface. The PREFIX option will add the prefix defined blow to the beginning of the uniqueid in the display. Default is DISABLED. If there was already a Uniqueid defined on a call entering this in-group, then the original uniqueid will be displayed. + Uniqueid Status Display - If enabled, when an agent receives a call through this in-group they will see the uniqueid of the call added to the status line in their agent interface. The PREFIX option will add the prefix defined blow to the beginning of the uniqueid in the display. Default is DISABLED. If there was already a Uniqueid defined on a call entering this in-group, then the original uniqueid will be displayed. If the PRESERVE option is used and the call is sent to a second agent, the uniqueid and prefix displayed to the first agent will also be displayed to the second agent.
@@ -20325,7 +20325,7 @@ if ($ADD==3111) echo "Extension Append CID: $NWB#vicidial_inbound_groups-extension_appended_cidname$NWE\n"; - echo "Uniqueid Status Display: $NWB#vicidial_inbound_groups-uniqueid_status_display$NWE\n"; + echo "Uniqueid Status Display: $NWB#vicidial_inbound_groups-uniqueid_status_display$NWE\n"; echo "Uniqueid Status Prefix: $NWB#vicidial_inbound_groups-uniqueid_status_prefix$NWE\n";