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 9abf9151..67ef2ac3 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -240,15 +240,15 @@ index serverstat(server_ip,status) lead_id INT(9) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, entry_date DATETIME, modify_date TIMESTAMP, -status VARCHAR(6), -user VARCHAR(20), -vendor_lead_code VARCHAR(20), -source_id VARCHAR(6), -list_id BIGINT(14) UNSIGNED, -gmt_offset_now DECIMAL(4,2) DEFAULT '0.00', -called_since_last_reset ENUM('Y','N','Y1','Y2','Y3','Y4','Y5','Y6','Y7','Y8','Y9','Y10') default 'N', -phone_code VARCHAR(10), -phone_number VARCHAR(12), +status VARCHAR(6), +user VARCHAR(20), +vendor_lead_code VARCHAR(20), +source_id VARCHAR(6), +list_id BIGINT(14) UNSIGNED, +gmt_offset_now DECIMAL(4,2) DEFAULT '0.00', +called_since_last_reset ENUM('Y','N','Y1','Y2','Y3','Y4','Y5','Y6','Y7','Y8','Y9','Y10') default 'N', +phone_code VARCHAR(10), +phone_number VARCHAR(12), title VARCHAR(4), first_name VARCHAR(30), middle_initial VARCHAR(1), @@ -872,7 +872,8 @@ queuemetrics_server_ip VARCHAR(15), queuemetrics_dbname VARCHAR(50), queuemetrics_login VARCHAR(50), queuemetrics_pass VARCHAR(50), -queuemetrics_url VARCHAR(255) +queuemetrics_url VARCHAR(255), +queuemetrics_log_id VARCHAR(10) default 'VIC' ); INSERT INTO system_settings (version,install_date) values('2.0.X', CURDATE()); 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 623f0a3a..bf1163e2 100644 --- a/agc_2-X/trunk/extras/upgrade_2.0.3.sql +++ b/agc_2-X/trunk/extras/upgrade_2.0.3.sql @@ -94,7 +94,8 @@ queuemetrics_server_ip VARCHAR(15), queuemetrics_dbname VARCHAR(50), queuemetrics_login VARCHAR(50), queuemetrics_pass VARCHAR(50), -queuemetrics_url VARCHAR(255) +queuemetrics_url VARCHAR(255), +queuemetrics_log_id VARCHAR(10) default 'VIC' ); 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 00534d5f..15eca044 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 @@ -133,6 +133,8 @@ QueueMetrics Database Name -<\/B> This is the database name for your QueueMetric 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|| +QueueMetrics Log ID -<\/B> This is the server ID that all VICIDIAL logs going into the QueueMetrics database will use as an identifier for each record|| +QueueMetrics Log ID: || ############################################################ CLIENT diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 03cc8061..da2cef87 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -562,6 +562,8 @@ if (isset($_GET["queuemetrics_pass"])) {$queuemetrics_pass=$_GET["queuemetrics 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($_GET["queuemetrics_log_id"])) {$queuemetrics_log_id=$_GET["queuemetrics_log_id"];} + elseif (isset($_POST["queuemetrics_log_id"])) {$queuemetrics_log_id=$_POST["queuemetrics_log_id"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -721,6 +723,7 @@ $concurrent_transfers = ereg_replace("[^0-9a-zA-Z]","",$concurrent_transfers); $billable = ereg_replace("[^0-9a-zA-Z]","",$billable); $pause_code = ereg_replace("[^0-9a-zA-Z]","",$pause_code); $vicidial_recording_override = ereg_replace("[^0-9a-zA-Z]","",$vicidial_recording_override); +$queuemetrics_log_id = ereg_replace("[^0-9a-zA-Z]","",$queuemetrics_log_id); ### DIGITS and Dots $server_ip = ereg_replace("[^\.0-9]","",$server_ip); @@ -947,12 +950,13 @@ $lead_filter_sql = ereg_replace(";","",$lead_filter_sql); # 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 +# 70214-1226 - Added QueueMetrics Log ID field to 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 -$admin_version = '2.0.86'; -$build = '70212-1412'; +$admin_version = '2.0.87'; +$build = '70214-1226'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -2789,6 +2793,11 @@ The VICIDIAL basic web-based lead loader is designed simply to take a lead file
QueueMetrics URL - This is the URL or web site address used to get to your QueueMetrics installation. +
+ +
+QueueMetrics Log ID - This is the server ID that all VICIDIAL logs going into the QueueMetrics database will use as an identifier for each record. +







@@ -5582,13 +5591,6 @@ if ($ADD==41111111111111) $stmt="UPDATE vicidial_conferences set conf_exten='$conf_exten',server_ip='$server_ip',extension='$extension' where conf_exten='$old_conf_exten';"; $rslt=mysql_query($stmt, $link); - ### LOG CHANGES TO LOG FILE ### - if ($WeBRooTWritablE > 0) - { - $fp = fopen ("./admin_changes_log.txt", "a"); - fwrite ($fp, "$date|MODIFY SYSTEM SETTINGS|$PHP_AUTH_USER|$ip|$stmt|\n"); - fclose($fp); - } } } } @@ -5614,8 +5616,16 @@ if ($ADD==411111111111111) echo "
VICIDIAL SYSTEM SETTINGS MODIFIED\n"; - $stmt="UPDATE system_settings set use_non_latin='$use_non_latin',webroot_writable='$webroot_writable',enable_queuemetrics_logging='$enable_queuemetrics_logging',queuemetrics_server_ip='$queuemetrics_server_ip',queuemetrics_dbname='$queuemetrics_dbname',queuemetrics_login='$queuemetrics_login',queuemetrics_pass='$queuemetrics_pass',queuemetrics_url='$queuemetrics_url';"; + $stmt="UPDATE system_settings set use_non_latin='$use_non_latin',webroot_writable='$webroot_writable',enable_queuemetrics_logging='$enable_queuemetrics_logging',queuemetrics_server_ip='$queuemetrics_server_ip',queuemetrics_dbname='$queuemetrics_dbname',queuemetrics_login='$queuemetrics_login',queuemetrics_pass='$queuemetrics_pass',queuemetrics_url='$queuemetrics_url',queuemetrics_log_id='$queuemetrics_log_id';"; $rslt=mysql_query($stmt, $link); + + ### LOG CHANGES TO LOG FILE ### + if ($WeBRooTWritablE > 0) + { + $fp = fopen ("./admin_changes_log.txt", "a"); + fwrite ($fp, "$date|MODIFY SYSTEM SETTINGS|$PHP_AUTH_USER|$ip|$stmt|\n"); + fclose($fp); + } } else { @@ -9178,7 +9188,7 @@ if ($ADD==311111111111111) echo "\n"; 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;"; + $stmt="SELECT version,install_date,use_non_latin,webroot_writable,enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_url,queuemetrics_log_id from system_settings;"; $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); $version = $row[0]; @@ -9191,6 +9201,7 @@ if ($ADD==311111111111111) $queuemetrics_login = $row[7]; $queuemetrics_pass = $row[8]; $queuemetrics_url = $row[9]; + $queuemetrics_log_id = $row[10]; echo "
MODIFY VICIDIAL SYSTEM SETTINGS
\n"; echo "\n"; @@ -9206,6 +9217,7 @@ if ($ADD==311111111111111) echo "
QueueMetrics DB Login: $NWB#settings-queuemetrics_login$NWE
QueueMetrics DB Password: $NWB#settings-queuemetrics_pass$NWE
QueueMetrics URL: $NWB#settings-queuemetrics_url$NWE
QueueMetrics Log ID: $NWB#settings-queuemetrics_log_id$NWE
\n";