diff --git a/docs/QUEUEMETRICS.txt b/docs/QUEUEMETRICS.txt
index c76e6a34..f7c3de4c 100644
--- a/docs/QUEUEMETRICS.txt
+++ b/docs/QUEUEMETRICS.txt
@@ -1,4 +1,4 @@
-VICIDIAL and QueueMetrics UPDATED: 2016-11-02
+VICIDIAL and QueueMetrics UPDATED: 2017-10-06
queue_log logging was added to VICIDIAL outbound auto calling as an option in the 2.0.3 release, and for inbound in the 2.0.4 release.
@@ -37,7 +37,7 @@ Entries you should have in your crontab on one server:
Here is a short summary of the needed steps to install QueueMetrics on your system:
-NOTE: further down in this document are updated installation instructions and instructions for installing on OpenSuSE 11.1.
+NOTE: further down in this document are updated installation instructions and instructions for installing on OpenSuSE 11.1 and LEAP 42.3(VICIbox 8).
First, get Sun Java SDK/JRE and install on your system.
NOTE: the GCJ java JRE available on most RedHat/Feroda/CentOS systems WILL NOT WORK
@@ -420,6 +420,59 @@ How to install Queue Metrics on OpenSuSE v.11.1 to v 11.3 (32 or 64 bit) with a
+
+
+
+OpenSuSE LEAP 42.3 and VICIbox 8 installation instructions: (2017-10-06)
+
+How to install Queue Metrics on OpenSuSE LEAP 42.3 and VICIbox 8 with a system that was installed with the ViciDial Group install script. Run them in this order to avoid funky java script bugs :D
+
+1) Type: zypper in tomcat tomcat-webapps
+- Say yes to install, and say yes to license
+
+2) Type: zypper in java-1_8_0-openjdk-devel
+- Say yes to install, and say yes to license
+
+3) cd /usr/src
+4) wget http://downloads.loway.ch/qm/QueueMetrics-17.06.1.tar.gz
+5) mkdir tars (incase it doesn't exist)
+6) tar xvfz QueueMetrics-17.06.1.tar.gz
+7) mv QueueMetrics-17.06.1.tar.gz ./tars/
+8) mkdir /srv/tomcat/webapps/QM
+9) cp -r queuemetrics-17.06.1/* /srv/tomcat/webapps/QM/
+10) zypper in mysql-connector-java
+11) cp /usr/share/java/mysql-connector-java.jar /srv/tomcat/webapps/QM/WEB-INF/lib/
+12) chkconfig tomcat on
+13) mysql --execute="CREATE DATABASE queuemetrics;"
+14) mysql queuemetrics --execute="GRANT ALL PRIVILEGES ON queuemetrics.* TO 'queuemetrics'@'localhost' IDENTIFIED BY 'javadude';"
+15) mysql queuemetrics --execute="GRANT ALL PRIVILEGES ON queuemetrics.* TO queuemetrics@localhost IDENTIFIED BY 'javadude';"
+16) mysql queuemetrics --execute="GRANT ALL PRIVILEGES ON queuemetrics.* TO queuemetrics@'%' IDENTIFIED BY 'javadude';"
+17) mysql queuemetrics --user=queuemetrics --password=javadude < /srv/tomcat/webapps/QM/WEB-INF/README/queuemetrics_sample.sql
+18) mysql queuemetrics --execute="CREATE INDEX time_id on queue_log(time_id);"
+19) mysql queuemetrics --execute="CREATE INDEX call_id on queue_log(call_id);"
+20) rctomcat start
+
+21) Edit /srv/tomcat/webapps/QM/WEB-INF/web.xml and change the IP address of the following entry:
+- jdbc:mysql://10.0.0.4/queuemetrics?autoReconnect=true&zeroDateTimeBehavior=convertToNull&jdbcCompliantTruncation=false&user=queuemetrics&password=javadude
+
+22) Go to http://:8080/QM and it should tell you the schema is old, just click next or yes to everything and have fun
+
+23) If nothing shows up, you may need to go into 'yast' and change the firewall settings:
+ Security --> Firewall settings, go to allowed services, type "alt-d" and add 8080 as a new port, then save and exit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
If you want to use the ADMIN_archive_log_tables.pl script with the --queue-log option you will need to run the following query in the QM database:
CREATE TABLE queue_log_archive LIKE queue_log;
diff --git a/www/agc/vdc_script_display.php b/www/agc/vdc_script_display.php
index f27af6ce..d4518e85 100644
--- a/www/agc/vdc_script_display.php
+++ b/www/agc/vdc_script_display.php
@@ -35,10 +35,11 @@
# 160818-1226 - Added MANUALDIALLINK option
# 170317-2315 - Fixed in-group list script override issue, added debug
# 170526-2343 - Added additional variable filtering
+# 171006-2055 - Added inbound_list_script_override option
#
-$version = '2.14-29';
-$build = '170526-2343';
+$version = '2.14-30';
+$build = '171006-2055';
require_once("dbconnect_mysqli.php");
require_once("functions.php");
@@ -363,7 +364,9 @@ if ($inOUT == 'IN')
if ($ignore_list_script < 1)
{
- $stmt="SELECT agent_script_override from vicidial_lists where list_id='$list_id';";
+# $stmt="SELECT agent_script_override from vicidial_lists where list_id='$list_id';";
+ $stmt="SELECT if('$inOUT'= 'IN',if(inbound_list_script_override is null or inbound_list_script_override='',agent_script_override,inbound_list_script_override),agent_script_override) from vicidial_lists where list_id='$list_id';";
+ if ($DB) {echo "$stmt\n";}
$rslt=mysql_to_mysqli($stmt, $link);
$row=mysqli_fetch_row($rslt);
$agent_script_override = $row[0];
diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php
index 29d022fe..9d33c486 100644
--- a/www/vicidial/admin.php
+++ b/www/vicidial/admin.php
@@ -1141,6 +1141,8 @@ if (isset($_GET["vicidial_balance_rank"])) {$vicidial_balance_rank=$_GET["vici
elseif (isset($_POST["vicidial_balance_rank"])) {$vicidial_balance_rank=$_POST["vicidial_balance_rank"];}
if (isset($_GET["agent_script_override"])) {$agent_script_override=$_GET["agent_script_override"];}
elseif (isset($_POST["agent_script_override"])) {$agent_script_override=$_POST["agent_script_override"];}
+if (isset($_GET["inbound_list_script_override"])) {$inbound_list_script_override=$_GET["inbound_list_script_override"];}
+ elseif (isset($_POST["inbound_list_script_override"])) {$inbound_list_script_override=$_POST["inbound_list_script_override"];}
if (isset($_GET["moh_id"])) {$moh_id=$_GET["moh_id"];}
elseif (isset($_POST["moh_id"])) {$moh_id=$_POST["moh_id"];}
if (isset($_GET["moh_name"])) {$moh_name=$_GET["moh_name"];}
@@ -2907,6 +2909,7 @@ if ($non_latin < 1)
$dead_to_dispo = preg_replace('/[^0-9a-zA-Z]/','',$dead_to_dispo);
$routing_prefix = preg_replace('/[^0-9a-zA-Z]/','',$routing_prefix);
$inbound_survey = preg_replace('/[^0-9a-zA-Z]/','',$inbound_survey);
+ $inbound_list_script_override = preg_replace('/[^0-9a-zA-Z]/','',$inbound_list_script_override);
### DIGITS and Dots
$server_ip = preg_replace('/[^\.0-9]/','',$server_ip);
@@ -4185,12 +4188,13 @@ else
# 170930-0853 - Added extension_appended_cidname options and custom reports variable display
# 171001-1544 - Moved user IP Lists permissions to new security section in Modify User page
# 171005-1707 - Fix for remote agent modify overlap issue
+# 171006-2039 - Added inbound list script override, Issue #1038
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time
-$admin_version = '2.14-634a';
-$build = '171005-1707';
+$admin_version = '2.14-635a';
+$build = '171006-2039';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
@@ -14694,7 +14698,7 @@ if ($ADD==411)
echo " "._QXZ("LIST MODIFIED").": $list_id\n";
- $stmt="UPDATE vicidial_lists set list_name='$list_name',campaign_id='$campaign_id',active='$active',list_description='$list_description',list_changedate='$SQLdate',reset_time='$reset_time',agent_script_override='$agent_script_override',campaign_cid_override='$campaign_cid_override',am_message_exten_override='$am_message_exten_override',drop_inbound_group_override='$drop_inbound_group_override',xferconf_a_number='$xferconf_a_number',xferconf_b_number='$xferconf_b_number',xferconf_c_number='$xferconf_c_number',xferconf_d_number='$xferconf_d_number',xferconf_e_number='$xferconf_e_number',web_form_address='" . mysqli_real_escape_string($link, $web_form_address) . "',web_form_address_two='" . mysqli_real_escape_string($link, $web_form_address_two) . "',time_zone_setting='$time_zone_setting',inventory_report='$inventory_report',expiration_date='$expiration_date',na_call_url='" . mysqli_real_escape_string($link, $na_call_url) . "',local_call_time='$local_call_time',web_form_address_three='" . mysqli_real_escape_string($link, $web_form_address_three) . "',status_group_id='$status_group_id',user_new_lead_limit='$user_new_lead_limit' where list_id='$list_id';";
+ $stmt="UPDATE vicidial_lists set list_name='$list_name',campaign_id='$campaign_id',active='$active',list_description='$list_description',list_changedate='$SQLdate',reset_time='$reset_time',agent_script_override='$agent_script_override',inbound_list_script_override='$inbound_list_script_override',campaign_cid_override='$campaign_cid_override',am_message_exten_override='$am_message_exten_override',drop_inbound_group_override='$drop_inbound_group_override',xferconf_a_number='$xferconf_a_number',xferconf_b_number='$xferconf_b_number',xferconf_c_number='$xferconf_c_number',xferconf_d_number='$xferconf_d_number',xferconf_e_number='$xferconf_e_number',web_form_address='" . mysqli_real_escape_string($link, $web_form_address) . "',web_form_address_two='" . mysqli_real_escape_string($link, $web_form_address_two) . "',time_zone_setting='$time_zone_setting',inventory_report='$inventory_report',expiration_date='$expiration_date',na_call_url='" . mysqli_real_escape_string($link, $na_call_url) . "',local_call_time='$local_call_time',web_form_address_three='" . mysqli_real_escape_string($link, $web_form_address_three) . "',status_group_id='$status_group_id',user_new_lead_limit='$user_new_lead_limit' where list_id='$list_id';";
$rslt=mysql_to_mysqli($stmt, $link);
## QC Addition for Audited Comments
@@ -25241,7 +25245,7 @@ if ($ADD==311)
}
}
- $stmt="SELECT vicidial_lists.list_id,list_name,campaign_id,active,list_description,list_changedate,list_lastcalldate,reset_time,agent_script_override,campaign_cid_override,am_message_exten_override,drop_inbound_group_override,xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,time_zone_setting,inventory_report,IFNULL(audit_comments,0),expiration_date,DATE_FORMAT(expiration_date,'%Y%m%d'),na_call_url,local_call_time,web_form_address_three,status_group_id,user_new_lead_limit from vicidial_lists left outer join vicidial_lists_custom on vicidial_lists.list_id=vicidial_lists_custom.list_id where vicidial_lists.list_id='$list_id' $LOGallowed_campaignsSQL;";
+ $stmt="SELECT vicidial_lists.list_id,list_name,campaign_id,active,list_description,list_changedate,list_lastcalldate,reset_time,agent_script_override,campaign_cid_override,am_message_exten_override,drop_inbound_group_override,xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,time_zone_setting,inventory_report,IFNULL(audit_comments,0),expiration_date,DATE_FORMAT(expiration_date,'%Y%m%d'),na_call_url,local_call_time,web_form_address_three,status_group_id,user_new_lead_limit,inbound_list_script_override from vicidial_lists left outer join vicidial_lists_custom on vicidial_lists.list_id=vicidial_lists_custom.list_id where vicidial_lists.list_id='$list_id' $LOGallowed_campaignsSQL;";
$rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {echo "$stmt\n";}
@@ -25274,6 +25278,7 @@ if ($ADD==311)
$web_form_address_three = $row[26];
$status_group_id = $row[27];
$user_new_lead_limit = $row[28];
+ $inbound_list_script_override = $row[29];
# grab names of global statuses and statuses in the selected campaign
$stmt="SELECT status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed,min_sec,max_sec,answering_machine from vicidial_statuses order by status;";
@@ -25429,6 +25434,10 @@ if ($ADD==311)
echo "$Lscripts_list";
echo "\n";
echo "$NWB#lists-agent_script_override$NWE\n";
+ echo "