diff --git a/www/vicidial/AST_timeonVDADall.php b/www/vicidial/AST_timeonVDADall.php
index 7f69fdcb..794cc2b4 100644
--- a/www/vicidial/AST_timeonVDADall.php
+++ b/www/vicidial/AST_timeonVDADall.php
@@ -110,10 +110,11 @@
# 180204-1538 - Added display of LIVE Inbound Callback Queue Calls
# 190206-1616 - Added mobile device display variable
# 190313-0607 - Fix for columns display issue #1141
+# 190420-1728 - Added RS_ListenBarge options.php setting
#
-$version = '2.14-97';
-$build = '190313-0607';
+$version = '2.14-98';
+$build = '190420-1728';
header ("Content-type: text/html; charset=utf-8");
@@ -235,6 +236,13 @@ if ( (strlen($slave_db_server)>5) and (preg_match("/$report_name/",$reports_use_
echo "\n";
}
+$RS_ListenBarge = 'MONITOR|BARGE|WHISPER';
+
+if (file_exists('options.php'))
+ {
+ require('options.php');
+ }
+
if (!isset($DB)) {$DB=0;}
if (!isset($RR)) {$RR=40;}
if (!isset($group)) {$group='ALL-ACTIVE';}
@@ -706,13 +714,19 @@ $select_list .= _QXZ("Monitor").":
";
-$select_list .= "";
-$select_list .= " ";
-if ($agent_whisper_enabled == '1')
+if (preg_match("/MONITOR/",$RS_ListenBarge) )
+ {
+ $select_list .= " ";
+ }
+if (preg_match("/BARGE/",$RS_ListenBarge) )
+ {
+ $select_list .= " ";
+ }
+if ( ($agent_whisper_enabled == '1') and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{
$select_list .= " 0)
$L='';
$R='';
-
if ($report_display_type=='TEXT')
{
if ($SIPmonitorLINK>0) {$L=" | "._QXZ("LISTEN",6)." "; $R='';}
if ($IAXmonitorLINK>0) {$L=" | "._QXZ("LISTEN",6)." "; $R='';}
if ($SIPmonitorLINK>1) {$R=" | "._QXZ("BARGE",5)." ";}
if ($IAXmonitorLINK>1) {$R=" | BARGE ";}
- if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) and (preg_match("/MONITOR/",$RS_ListenBarge) ) )
{$L=" | "._QXZ("LISTEN",6)." "; $R='';}
- if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) and (preg_match("/BARGE/",$RS_ListenBarge) ) )
{$R=" | "._QXZ("BARGE",5)." ";}
if ($SIPmonitorLINK>1) {$R=" | WHISPER ";}
if ($IAXmonitorLINK>1) {$R=" | WHISPER ";}
- if ( (strlen($monitor_phone)>1) and (preg_match("/WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/WHISPER/",$monitor_active) ) and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{$R=" | WHISPER ";}
if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG |";}
@@ -3426,13 +3439,13 @@ if ($talking_to_print > 0)
if ($IAXmonitorLINK>0) {$L=" "._QXZ("LISTEN")." "; $R='';}
if ($SIPmonitorLINK>1) {$R=" "._QXZ("BARGE")." ";}
if ($IAXmonitorLINK>1) {$R=" BARGE ";}
- if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) and (preg_match("/MONITOR/",$RS_ListenBarge) ) )
{$L=" "._QXZ("LISTEN")." "; $R='';}
- if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) and (preg_match("/BARGE/",$RS_ListenBarge) ) )
{$R=" "._QXZ("BARGE")." ";}
if ($SIPmonitorLINK>1) {$R=" WHISPER ";}
if ($IAXmonitorLINK>1) {$R=" WHISPER ";}
- if ( (strlen($monitor_phone)>1) and (preg_match("/WHISPER/",$monitor_active) ) )
+ if ( (strlen($monitor_phone)>1) and (preg_match("/WHISPER/",$monitor_active) ) and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{$R=" WHISPER ";}
if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG ";}
diff --git a/www/vicidial/options-example.php b/www/vicidial/options-example.php
index 97783d23..87d7a736 100644
--- a/www/vicidial/options-example.php
+++ b/www/vicidial/options-example.php
@@ -22,6 +22,7 @@
# 160106-1321 - Added disable_user_group_bulk_change option
# 160715-0752 - Added graph_canvas_size option for HTML reports
# 190414-1121 - Added RS_logoutLINK
+# 190420-1722 - Added RS_ListenBarge
#
# used by the realtime_report.php script
@@ -63,6 +64,7 @@ $RS_PRESETstats = 0; # 0=no, 1=yes
$RS_AGENTtimeSTATS = 0; # 0=no, 1=yes
$RS_droppedOFtotal = 0; # 0=no, 1=yes
$RS_logoutLINK = 0; # 0=no, 1=yes
+$RS_ListenBarge = 'MONITOR|BARGE|WHISPER'; # list of listen-related features separated by pipes: "MONITOR|BARGE|WHISPER"
# used by agent reports
$user_case = 0; # 1=upper-case, 2-lower-case, 0-no-case-change
diff --git a/www/vicidial/realtime_report.php b/www/vicidial/realtime_report.php
index 9ccdd50c..9e657782 100644
--- a/www/vicidial/realtime_report.php
+++ b/www/vicidial/realtime_report.php
@@ -43,12 +43,13 @@
# 181128-1040 - Added external_web_socket_url option
# 190302-1927 - Added variable-length header icon tables
# 190414-1106 - Made admin and summary report links conditional, RS_logoutLINK options.php option
+# 190420-1729 - Added RS_ListenBarge options.php setting
#
$startMS = microtime();
-$version = '2.14-30';
-$build = '190302-1927';
+$version = '2.14-31';
+$build = '190420-1729';
header ("Content-type: text/html; charset=utf-8");
@@ -158,6 +159,8 @@ $webphone_bufh = '1';
$webphone_pad = '10';
$webphone_clpos = " "._QXZ("webphone")." - ";
+$RS_ListenBarge = 'MONITOR|BARGE|WHISPER';
+
if (file_exists('options.php'))
{
require('options.php');
@@ -777,13 +780,19 @@ $select_list .= _QXZ("Monitor").": ";
-$select_list .= "";
-$select_list .= " ";
-if ($agent_whisper_enabled == '1')
+if (preg_match("/MONITOR/",$RS_ListenBarge) )
+ {
+ $select_list .= " ";
+ }
+if (preg_match("/BARGE/",$RS_ListenBarge) )
+ {
+ $select_list .= " ";
+ }
+if ( ($agent_whisper_enabled == '1') and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{
$select_list .= "