diff --git a/agc_2-X/trunk/docs/LOAD_BALANCING.txt b/agc_2-X/trunk/docs/LOAD_BALANCING.txt index 7ee98526..b5ca9561 100644 --- a/agc_2-X/trunk/docs/LOAD_BALANCING.txt +++ b/agc_2-X/trunk/docs/LOAD_BALANCING.txt @@ -70,7 +70,7 @@ NOTE: In a multi-server setup you may want to have your database and web server exten => _010*010*010*015*8600XXX,1,Goto(default,${EXTEN:16},1) exten => _010*010*010*016*8600XXX*.,1,Dial(${TRUNKIAX2}/${EXTEN:16},55,o) - exten => _010*010*010*015*8600XXX*.,1,Goto(default,${EXTEN:16},1) + exten => _010*010*010*015*8600XXX*.,1,AGI(agi-VDADfixCXFER.agi) exten => _8600XXX*.,1,AGI(agi-VDADfixCXFER.agi) SERVER TWO(ASTtest2-10.10.10.16) 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 7f512c05..9abf9151 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -862,6 +862,21 @@ campaign_id VARCHAR(8), index (campaign_id) ); + CREATE TABLE system_settings ( +version VARCHAR(50), +install_date VARCHAR(50), +use_non_latin ENUM('0','1') default '0', +webroot_writable ENUM('0','1') default '1', +enable_queuemetrics_logging ENUM('0','1') default '0', +queuemetrics_server_ip VARCHAR(15), +queuemetrics_dbname VARCHAR(50), +queuemetrics_login VARCHAR(50), +queuemetrics_pass VARCHAR(50), +queuemetrics_url VARCHAR(255) +); + +INSERT INTO system_settings (version,install_date) values('2.0.X', CURDATE()); + INSERT INTO vicidial_user_groups SET user_group='ADMIN',group_name='VICIDIAL ADMINISTRATORS',allowed_campaigns=' -ALL-CAMPAIGNS- - -'; diff --git a/agc_2-X/trunk/extras/upgrade_2.0.3.sql b/agc_2-X/trunk/extras/upgrade_2.0.3.sql index 24fcae3e..623f0a3a 100644 --- a/agc_2-X/trunk/extras/upgrade_2.0.3.sql +++ b/agc_2-X/trunk/extras/upgrade_2.0.3.sql @@ -83,3 +83,18 @@ ALTER TABLE vicidial_campaigns ADD campaign_stats_refresh ENUM('Y','N') default ALTER TABLE vicidial_campaigns ADD campaign_logindate DATETIME; ALTER TABLE vicidial_users ADD vicidial_recording_override ENUM('DISABLED','NEVER','ONDEMAND','ALLCALLS','ALLFORCE') default 'DISABLED'; + + CREATE TABLE system_settings ( +version VARCHAR(50) default '2.0.3b2.5', +install_date VARCHAR(50), +use_non_latin ENUM('0','1') default '0', +webroot_writable ENUM('0','1') default '1', +enable_queuemetrics_logging ENUM('0','1') default '0', +queuemetrics_server_ip VARCHAR(15), +queuemetrics_dbname VARCHAR(50), +queuemetrics_login VARCHAR(50), +queuemetrics_pass VARCHAR(50), +queuemetrics_url VARCHAR(255) +); + +INSERT INTO system_settings (version,install_date) values('2.0.X', CURDATE()); diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.3.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.3.txt index a52da5cd..5e0e4fd6 100644 --- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.3.txt +++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.3.txt @@ -112,8 +112,27 @@ List Last Call Date -<\/B> This is the last time that lead was dialed from this List Description: || List Change Date: || Campaign Description: || -VICIDIAL Recording Override - This option will override whatever the option is in the campaign for recording. DISABLED will not override the campaign recording setting. NEVER will disable recording on the client. ONDEMAND is the default and allows the agent to start and stop recording as needed. ALLCALLS will start recording on the client whenever a call is sent to an agent. ALLFORCE will start recording on the client whenever a call is sent to an agent giving the agent no option to stop recording. For ALLCALLS and ALLFORCE there is an option to use the Recording Delay to cut down on very short recordings and recude system load|| +VICIDIAL Recording Override -<\/B> This option will override whatever the option is in the campaign for recording. DISABLED will not override the campaign recording setting. NEVER will disable recording on the client. ONDEMAND is the default and allows the agent to start and stop recording as needed. ALLCALLS will start recording on the client whenever a call is sent to an agent. ALLFORCE will start recording on the client whenever a call is sent to an agent giving the agent no option to stop recording. For ALLCALLS and ALLFORCE there is an option to use the Recording Delay to cut down on very short recordings and recude system load|| VICIDIAL Recording Override: || +MODIFY VICIDIAL SYSTEM SETTINGS|| + System Settings || +VICIDIAL SYSTEM SETTINGS MODIFIED|| +Version: || +Use Non-Latin: || +Webroot Writable: || +Enable QueueMetrics Logging: || +QueueMetrics Server IP: || +QueueMetrics DB Name: || +QueueMetrics DB Login: || +QueueMetrics DB Password: || +Use Non-Latin -<\/B> This option allows you to default the web display script to use UTF8 characters and not do any latin-character-family regular expression filtering or display formatting. Default is 0|| +Webroot Writable -<\/B> This setting allows you to define whether temp files and authentication files should be placed in the webroot on your web server. Default is 1|| +Enable QueueMetrics Logging -<\/B> This setting allows you to define whether VICIDIAL will insert log entries into the queue_log database table as Asterisk Queues activity does. QueueMetrics is a standalone, closed-source statistical analysis program. You must have QueueMetrics already installed and configured before enabling this feature. Default is 0|| +QueueMetrics Server IP -<\/B> This is the IP address of the database for your QueueMetrics installation|| +QueueMetrics Database Name -<\/B> This is the database name for your QueueMetrics database|| +QueueMetrics Database Login -<\/B> This is the user name used to log in to your QueueMetrics database|| +QueueMetrics Database Password -<\/B> This is the password used to log in to your QueueMetrics database|| +QueueMetrics URL -<\/B> This is the URL or web site address used to get to your QueueMetrics installation|| ############################################################ CLIENT diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 375a308d..03cc8061 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -38,6 +38,7 @@ $reports_color = '#99FF33'; $phones_color = '#CCCC00'; $conference_color = '#CCCC00'; $server_color = '#CCCC00'; + $settings_color = '#CCCC00'; $users_font = 'BLACK'; $campaigns_font = 'BLACK'; $lists_font = 'BLACK'; @@ -52,6 +53,7 @@ $reports_font = 'BLACK'; $phones_font = 'BLACK'; $conference_font = 'BLACK'; $server_font = 'BLACK'; + $settings_font = 'BLACK'; $PHP_AUTH_USER=$_SERVER['PHP_AUTH_USER']; $PHP_AUTH_PW=$_SERVER['PHP_AUTH_PW']; @@ -544,6 +546,23 @@ if (isset($_GET["campaign_stats_refresh"])) {$campaign_stats_refresh=$_GET["ca if (isset($_GET["list_description"])) {$list_description=$_GET["list_description"];} elseif (isset($_POST["list_description"])) {$list_description=$_POST["list_description"];} if (isset($_GET["vicidial_recording_override"])) {$vicidial_recording_override=$_GET["vicidial_recording_override"];} elseif (isset($_POST["vicidial_recording_override"])) {$vicidial_recording_override=$_POST["vicidial_recording_override"];} +if (isset($_GET["use_non_latin"])) {$use_non_latin=$_GET["use_non_latin"];} + elseif (isset($_POST["use_non_latin"])) {$use_non_latin=$_POST["use_non_latin"];} +if (isset($_GET["webroot_writable"])) {$webroot_writable=$_GET["webroot_writable"];} + elseif (isset($_POST["webroot_writable"])) {$webroot_writable=$_POST["webroot_writable"];} +if (isset($_GET["enable_queuemetrics_logging"])) {$enable_queuemetrics_logging=$_GET["enable_queuemetrics_logging"];} + elseif (isset($_POST["enable_queuemetrics_logging"])) {$enable_queuemetrics_logging=$_POST["enable_queuemetrics_logging"];} +if (isset($_GET["queuemetrics_server_ip"])) {$queuemetrics_server_ip=$_GET["queuemetrics_server_ip"];} + elseif (isset($_POST["queuemetrics_server_ip"])) {$queuemetrics_server_ip=$_POST["queuemetrics_server_ip"];} +if (isset($_GET["queuemetrics_dbname"])) {$queuemetrics_dbname=$_GET["queuemetrics_dbname"];} + elseif (isset($_POST["queuemetrics_dbname"])) {$queuemetrics_dbname=$_POST["queuemetrics_dbname"];} +if (isset($_GET["queuemetrics_login"])) {$queuemetrics_login=$_GET["queuemetrics_login"];} + elseif (isset($_POST["queuemetrics_login"])) {$queuemetrics_login=$_POST["queuemetrics_login"];} +if (isset($_GET["queuemetrics_pass"])) {$queuemetrics_pass=$_GET["queuemetrics_pass"];} + elseif (isset($_POST["queuemetrics_pass"])) {$queuemetrics_pass=$_POST["queuemetrics_pass"];} +if (isset($_GET["queuemetrics_url"])) {$queuemetrics_url=$_GET["queuemetrics_url"];} + elseif (isset($_POST["queuemetrics_url"])) {$queuemetrics_url=$_POST["queuemetrics_url"];} + if (isset($script_id)) {$script_id= strtoupper($script_id);} if (isset($lead_filter_id)) {$lead_filter_id = strtoupper($lead_filter_id);} @@ -662,6 +681,9 @@ $voicemail_ext = ereg_replace("[^0-9]","",$voicemail_ext); $voicemail_exten = ereg_replace("[^0-9]","",$voicemail_exten); $voicemail_id = ereg_replace("[^0-9]","",$voicemail_id); $wrapup_seconds = ereg_replace("[^0-9]","",$wrapup_seconds); +$use_non_latin = ereg_replace("[^0-9]","",$use_non_latin); +$webroot_writable = ereg_replace("[^0-9]","",$webroot_writable); +$enable_queuemetrics_logging = ereg_replace("[^0-9]","",$enable_queuemetrics_logging); ### Y or N ONLY ### $active = ereg_replace("[^NY]","",$active); @@ -707,6 +729,7 @@ $adaptive_maximum_level = ereg_replace("[^\.0-9]","",$adaptive_maximum_level); $phone_ip = ereg_replace("[^\.0-9]","",$phone_ip); $old_server_ip = ereg_replace("[^\.0-9]","",$old_server_ip); $computer_ip = ereg_replace("[^\.0-9]","",$computer_ip); +$queuemetrics_server_ip = ereg_replace("[^\.0-9]","",$queuemetrics_server_ip); ### ALPHA-NUMERIC and spaces and hash and star and comma $xferconf_a_dtmf = ereg_replace("[^ \,\*\#0-9a-zA-Z]","",$xferconf_a_dtmf); @@ -811,12 +834,16 @@ $extension = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$extension); $install_directory = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$install_directory); $old_extension = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$old_extension); $telnet_host = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$telnet_host); +$queuemetrics_dbname = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$queuemetrics_dbname); +$queuemetrics_login = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$queuemetrics_login); +$queuemetrics_pass = ereg_replace("[^-\.\:\/\@\_0-9a-zA-Z]","",$queuemetrics_pass); ### remove semi-colons ### $lead_filter_sql = ereg_replace(";","",$lead_filter_sql); ### VARIABLES TO BE mysql_real_escape_string ### # $web_form_address +# $queuemetrics_url ### VARIABLES not filtered at all ### # $script_text @@ -919,12 +946,13 @@ $lead_filter_sql = ereg_replace(";","",$lead_filter_sql); # 70202-1120 - Added agent_pause_codes section to campaigns # 70205-1204 - Added memo, last dialed, timestamp and stats-refresh fields to vicidial_campaigns/lists # 70206-1323 - Added user setting for vicidial_recording_override +# 70212-1412 - Added system settings section # # 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.85'; -$build = '70206-1323'; +$admin_version = '2.0.86'; +$build = '70212-1412'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -1024,7 +1052,7 @@ $browser = getenv("HTTP_USER_AGENT"); header ("Content-type: text/html; charset=utf-8"); echo "\n"; echo "
\n"; -echo "\n"; +echo "\n"; echo "| \n";
+ echo "";
+
+ $stmt="SELECT version,install_date,use_non_latin,webroot_writable,enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_url from system_settings;";
+ $rslt=mysql_query($stmt, $link);
+ $row=mysql_fetch_row($rslt);
+ $version = $row[0];
+ $install_date = $row[1];
+ $use_non_latin = $row[2];
+ $webroot_writable = $row[3];
+ $enable_queuemetrics_logging = $row[4];
+ $queuemetrics_server_ip = $row[5];
+ $queuemetrics_dbname = $row[6];
+ $queuemetrics_login = $row[7];
+ $queuemetrics_pass = $row[8];
+ $queuemetrics_url = $row[9];
+
+ echo " MODIFY VICIDIAL SYSTEM SETTINGS |