From ae8fa5cd6c0bbc3ec33c0a62a32600cb772c7109 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 2 Oct 2006 18:41:00 +0000 Subject: [PATCH] added vicidial dialing balance items to admin.php and TBT modified UPGRADE for 2.0.2 instructions git-svn-id: svn://192.168.202.10@318 3d104415-ff17-0410-8863-d5cf3c621b8a --- UPGRADE | 20 ++++++++++++++ extras/MySQL_AST_CREATE_tables.sql | 1 - extras/upgrade_2.0.2.sql | 3 +++ .../TO_BE_TRANSLATED_2.0.2.txt | 19 ++++++++++++++ www/vicidial/admin.php | 26 ++++++++++++++++--- 5 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 translations/raw_translation_files/TO_BE_TRANSLATED_2.0.2.txt diff --git a/UPGRADE b/UPGRADE index b4c34ea2..5c283cb0 100644 --- a/UPGRADE +++ b/UPGRADE @@ -1,5 +1,25 @@ ################ UPGRADE +NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom + +########## UPGRADING FROM 2.0.1 TO 2.0.2 ########## + +1. upgrade the MySQL Asterisk database: +mysql +use asterisk +\. /path/from/root/extras/upgrade_2.0.2.sql +quit + +2. The astguiclient web directory has been removed and the + astguiclient/admin.php functions have been merged into the + vicidial/admin.php page + + + + + +########## UPGRADING FROM 1.1.12-3 TO 2.0.1 ########## + If you are upgrading to the 2.0 code tree from the 1.1.12-3 release there have been several changes made to the code base and to where some files are stored in the release as well as on your machine. diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 1372e4f0..f8ddd85a 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -761,7 +761,6 @@ drops_onemin INT(9) UNSIGNED default '0', drops_onemin_pct VARCHAR(6) default '0', differential_onemin VARCHAR(20) default '0', agents_average_onemin VARCHAR(20) default '0', -trunk_shortage SMALLINT(5) UNSIGNED default '0', balance_trunk_fill SMALLINT(5) UNSIGNED default '0' ); diff --git a/extras/upgrade_2.0.2.sql b/extras/upgrade_2.0.2.sql index 2f963c54..22b5e931 100644 --- a/extras/upgrade_2.0.2.sql +++ b/extras/upgrade_2.0.2.sql @@ -14,5 +14,8 @@ dedicated_trunks SMALLINT(5) UNSIGNED default '0', trunk_restriction ENUM('MAXIMUM_LIMIT','OVERFLOW_ALLOWED') default 'OVERFLOW_ALLOWED' ); + + + ALTER TABLE servers ADD vicidial_balance_active ENUM('Y','N') default 'N'; ALTER TABLE servers ADD balance_trunks_offlimits SMALLINT(5) UNSIGNED default '0'; diff --git a/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.2.txt b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.2.txt new file mode 100644 index 00000000..dc69d42c --- /dev/null +++ b/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.2.txt @@ -0,0 +1,19 @@ +############################################################ ADMIN + +VICIDIAL Balance Dialing -<\/B> Setting this field to Y will allow the server to place balance calls for campaigns in VICIDIAL so that the defined dial level can be met even if there are no agents logged into that campaign on this server. Default is N +VICIDIAL Balance Offlimits -<\/B> This setting defines the number of trunks to not allow VICIDIAL balance dialing to use. For example if you have 40 max vicidial trunks and balance offlimits is set to 10 you will only be able to use 30 trunk lines for VICIDIAL balance dialing. Default is 0 +VICIDIAL Balance Dialing +VICIDIAL Balance Offlimits + +############################################################ CLIENT + + + + +############################################################ ADMIN Manual + +Add notes on balance dialing in Multi-server setups + + +############################################################ AGENT Manual + diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 269ec03d..0ba121ff 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -447,6 +447,11 @@ if (isset($_GET["xferconf_b_dtmf"])) {$xferconf_b_dtmf=$_GET["xferconf_b_dtmf"]; elseif (isset($_POST["xferconf_b_dtmf"])) {$xferconf_b_dtmf=$_POST["xferconf_b_dtmf"];} if (isset($_GET["xferconf_b_number"])) {$xferconf_b_number=$_GET["xferconf_b_number"];} elseif (isset($_POST["xferconf_b_number"])) {$xferconf_b_number=$_POST["xferconf_b_number"];} +if (isset($_GET["vicidial_balance_active"])) {$vicidial_balance_active=$_GET["vicidial_balance_active"];} + elseif (isset($_POST["vicidial_balance_active"])) {$vicidial_balance_active=$_POST["vicidial_balance_active"];} +if (isset($_GET["balance_trunks_offlimits"])) {$balance_trunks_offlimits=$_GET["balance_trunks_offlimits"];} + elseif (isset($_POST["balance_trunks_offlimits"])) {$balance_trunks_offlimits=$_POST["balance_trunks_offlimits"];} + if (isset($script_id)) {$script_id= strtoupper($script_id);} if (isset($lead_filter_id)) {$lead_filter_id = strtoupper($lead_filter_id);} @@ -473,6 +478,7 @@ $ast_delete_phones = ereg_replace("[^0-9]","",$ast_delete_phones); $attempt_delay = ereg_replace("[^0-9]","",$attempt_delay); $attempt_maximum = ereg_replace("[^0-9]","",$attempt_maximum); $auto_dial_next_number = ereg_replace("[^0-9]","",$auto_dial_next_number); +$balance_trunks_offlimits = ereg_replace("[^0-9]","",$balance_trunks_offlimits); $call_parking_enabled = ereg_replace("[^0-9]","",$call_parking_enabled); $CallerID_popup_enabled = ereg_replace("[^0-9]","",$CallerID_popup_enabled); $campaign_detail = ereg_replace("[^0-9]","",$campaign_detail); @@ -567,6 +573,7 @@ $use_internal_dnc = ereg_replace("[^NY]","",$use_internal_dnc); $omit_phone_code = ereg_replace("[^NY]","",$omit_phone_code); $available_only_ratio_tally = ereg_replace("[^NY]","",$available_only_ratio_tally); $sys_perf_log = ereg_replace("[^NY]","",$sys_perf_log); +$vicidial_balance_active = ereg_replace("[^NY]","",$vicidial_balance_active); $vd_server_logs = ereg_replace("[^NY]","",$vd_server_logs); ### ALPHA-NUMERIC ONLY ### @@ -769,12 +776,13 @@ $lead_filter_sql = ereg_replace(";","",$lead_filter_sql); # 60828-1019 - changed adaptive_latest_target_gmt to adaptive_latest_server_time # 60828-1115 - added adaptive_dl_diff_target and changed intensity dropdown # 60927-1246 - added astguiclient/admin.php functions under SERVERS tab +# 61002-1402 - added fields for vicidial balance trunk controls # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$version = '2.0.66'; -$build = '60927-1246'; +$version = '2.0.67'; +$build = '61002-1402'; $STARTtime = date("U"); @@ -2345,6 +2353,16 @@ The VICIDIAL basic web-based lead loader is designed simply to take a lead file
AGI Output - Setting this option to NONE will disable output from all VICIDIAL related AGI scripts. Setting this to STDERR will send the AGI output to the Asterisk CLI. Setting this to FILE will send the output to a file in the logs directory. Setting this to BOTH will send output to both the Asterisk CLI and a log file. Default is FILE. +
+ +
+VICIDIAL Balance Dialing - Setting this field to Y will allow the server to place balance calls for campaigns in VICIDIAL so that the defined dial level can be met even if there are no agents logged into that campaign on this server. Default is N. + +
+ +
+VICIDIAL Balance Offlimits - This setting defines the number of trunks to not allow VICIDIAL balance dialing to use. For example if you have 40 max vicidial trunks and balance offlimits is set to 10 you will only be able to use 30 trunk lines for VICIDIAL balance dialing. Default is 0. +



@@ -4478,7 +4496,7 @@ if ($ADD==411111111111) { echo "
SERVER MODIFIED: $server_ip\n"; - $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output' where server_id='$old_server_id';"; + $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active', balance_trunks_offlimits='$balance_trunks_offlimits' where server_id='$old_server_id';"; $rslt=mysql_query($stmt, $link); } } @@ -7318,6 +7336,8 @@ echo "Server IP Address: Active: $NWB#servers-active$NWE\n"; echo "Asterisk Version: $NWB#servers-asterisk_version$NWE\n"; echo "Max VICIDIAL Trunks: $NWB#servers-max_vicidial_trunks$NWE\n"; +echo "VICIDIAL Balance Dialing: $NWB#servers-vicidial_balance_active$NWE\n"; +echo "VICIDIAL Balance Offlimits: $NWB#servers-balance_trunks_offlimits$NWE\n"; echo "Telnet Host: $NWB#servers-telnet_host$NWE\n"; echo "Telnet Port: $NWB#servers-telnet_port$NWE\n"; echo "Manager User: $NWB#servers-ASTmgrUSERNAME$NWE\n";