ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added RS_ListenBarge options.php setting for the Real-Time Report

Browse Source 
git-svn-id: svn://192.168.202.10@3093 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2019-04-20 21:55:09 +00:00
parent e56bb0b206
commit e2da0ea5dc
3 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php
+32 -19
View File
@@ -110,10 +110,11 @@
# 180204-1538 - Added display of LIVE Inbound Callback Queue Calls # 180204-1538 - Added display of LIVE Inbound Callback Queue Calls
# 190206-1616 - Added mobile device display variable # 190206-1616 - Added mobile device display variable
# 190313-0607 - Fix for columns display issue #1141 # 190313-0607 - Fix for columns display issue #1141
# 190420-1728 - Added RS_ListenBarge options.php setting
# #
$version = '2.14-97'; $version = '2.14-98';
$build = '190313-0607'; $build = '190420-1728';
header ("Content-type: text/html; charset=utf-8"); 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 "<!-- Using slave server $slave_db_server $db_source -->\n"; echo "<!-- Using slave server $slave_db_server $db_source -->\n";
} }
$RS_ListenBarge = 'MONITOR|BARGE|WHISPER';
if (file_exists('options.php'))
{
require('options.php');
}
if (!isset($DB)) {$DB=0;} if (!isset($DB)) {$DB=0;}
if (!isset($RR)) {$RR=40;} if (!isset($RR)) {$RR=40;}
if (!isset($group)) {$group='ALL-ACTIVE';} if (!isset($group)) {$group='ALL-ACTIVE';}
@@ -706,13 +714,19 @@ $select_list .= _QXZ("Monitor").": </TD><TD align=left><SELECT SIZE=1 NAME=moni
$select_list .= "<option value=\"\""; $select_list .= "<option value=\"\"";
if (strlen($monitor_active) < 2) {$select_list .= " selected";} if (strlen($monitor_active) < 2) {$select_list .= " selected";}
$select_list .= ">"._QXZ("NONE")."</option>"; $select_list .= ">"._QXZ("NONE")."</option>";
$select_list .= "<option value=\"MONITOR\""; if (preg_match("/MONITOR/",$RS_ListenBarge) )
if ($monitor_active=='MONITOR') {$select_list .= " selected";} {
$select_list .= ">"._QXZ("MONITOR")."</option>"; $select_list .= "<option value=\"MONITOR\"";
$select_list .= "<option value=\"BARGE\""; if ($monitor_active=='MONITOR') {$select_list .= " selected";}
if ($monitor_active=='BARGE') {$select_list .= " selected";} $select_list .= ">"._QXZ("MONITOR")."</option>";
$select_list .= ">"._QXZ("BARGE")."</option>"; }
if ($agent_whisper_enabled == '1') if (preg_match("/BARGE/",$RS_ListenBarge) )
{
$select_list .= "<option value=\"BARGE\"";
if ($monitor_active=='BARGE') {$select_list .= " selected";}
$select_list .= ">"._QXZ("BARGE")."</option>";
}
if ( ($agent_whisper_enabled == '1') and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{ {
$select_list .= "<option value='WHISPER'"; $select_list .= "<option value='WHISPER'";
if ($monitor_active=='WHISPER') {$select_list .= " selected";} if ($monitor_active=='WHISPER') {$select_list .= " selected";}
@@ -2813,17 +2827,17 @@ if ($UGdisplay < 1)
$HDusergroup = ''; $HDusergroup = '';
$HTusergroup = ''; $HTusergroup = '';
} }
if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and (!preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) ) if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and ( (!preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) or (!preg_match("/MONITOR/",$RS_ListenBarge) ) ) )
{ {
$HDlisten = ''; $HDlisten = '';
$HTlisten = ''; $HTlisten = '';
} }
if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and (!preg_match("/BARGE/",$monitor_active) ) ) if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and ( (!preg_match("/BARGE/",$monitor_active) ) or (!preg_match("/BARGE/",$RS_ListenBarge) ) ) )
{ {
$HDbarge = ''; $HDbarge = '';
$HTbarge = ''; $HTbarge = '';
} }
if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and (!preg_match("/WHISPER/",$monitor_active) ) ) if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and ( (!preg_match("/WHISPER/",$monitor_active) ) or (!preg_match("/WHISPER/",$RS_ListenBarge) ) ) )
{ {
$HDwhisper = ''; $HDwhisper = '';
$HTwhisper = ''; $HTwhisper = '';
@@ -3355,20 +3369,19 @@ if ($talking_to_print > 0)
$L=''; $L='';
$R=''; $R='';
if ($report_display_type=='TEXT') if ($report_display_type=='TEXT')
{ {
if ($SIPmonitorLINK>0) {$L=" | <a href=\"sip:0$Lsessionid@$server_ip\">"._QXZ("LISTEN",6)."</a>"; $R='';} if ($SIPmonitorLINK>0) {$L=" | <a href=\"sip:0$Lsessionid@$server_ip\">"._QXZ("LISTEN",6)."</a>"; $R='';}
if ($IAXmonitorLINK>0) {$L=" | <a href=\"iax:0$Lsessionid@$server_ip\">"._QXZ("LISTEN",6)."</a>"; $R='';} if ($IAXmonitorLINK>0) {$L=" | <a href=\"iax:0$Lsessionid@$server_ip\">"._QXZ("LISTEN",6)."</a>"; $R='';}
if ($SIPmonitorLINK>1) {$R=" | <a href=\"sip:$Lsessionid@$server_ip\">"._QXZ("BARGE",5)."</a>";} if ($SIPmonitorLINK>1) {$R=" | <a href=\"sip:$Lsessionid@$server_ip\">"._QXZ("BARGE",5)."</a>";}
if ($IAXmonitorLINK>1) {$R=" | <a href=\"iax:$Lsessionid@$server_ip\">BARGE</a>";} if ($IAXmonitorLINK>1) {$R=" | <a href=\"iax:$Lsessionid@$server_ip\">BARGE</a>";}
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=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','MONITOR');\">"._QXZ("LISTEN",6)."</a>"; $R='';} {$L=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','MONITOR');\">"._QXZ("LISTEN",6)."</a>"; $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=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','BARGE');\">"._QXZ("BARGE",5)."</a>";} {$R=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','BARGE');\">"._QXZ("BARGE",5)."</a>";}
if ($SIPmonitorLINK>1) {$R=" | <a href=\"sip:47378218$Lsessionid@$server_ip\">WHISPER</a>";} if ($SIPmonitorLINK>1) {$R=" | <a href=\"sip:47378218$Lsessionid@$server_ip\">WHISPER</a>";}
if ($IAXmonitorLINK>1) {$R=" | <a href=\"iax:47378218$Lsessionid@$server_ip\">WHISPER</a>";} if ($IAXmonitorLINK>1) {$R=" | <a href=\"iax:47378218$Lsessionid@$server_ip\">WHISPER</a>";}
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=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','WHISPER');\">WHISPER</a>";} {$R=" | <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','WHISPER');\">WHISPER</a>";}
if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG |";} if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG |";}
@@ -3426,13 +3439,13 @@ if ($talking_to_print > 0)
if ($IAXmonitorLINK>0) {$L="<td NOWRAP align=center> <a href=\"iax:0$Lsessionid@$server_ip\">"._QXZ("LISTEN")."</a></td>"; $R='';} if ($IAXmonitorLINK>0) {$L="<td NOWRAP align=center> <a href=\"iax:0$Lsessionid@$server_ip\">"._QXZ("LISTEN")."</a></td>"; $R='';}
if ($SIPmonitorLINK>1) {$R=" <td NOWRAP align=center> <a href=\"sip:$Lsessionid@$server_ip\">"._QXZ("BARGE")."</a></td>";} if ($SIPmonitorLINK>1) {$R=" <td NOWRAP align=center> <a href=\"sip:$Lsessionid@$server_ip\">"._QXZ("BARGE")."</a></td>";}
if ($IAXmonitorLINK>1) {$R=" <td NOWRAP align=center> <a href=\"iax:$Lsessionid@$server_ip\">BARGE</a></td>";} if ($IAXmonitorLINK>1) {$R=" <td NOWRAP align=center> <a href=\"iax:$Lsessionid@$server_ip\">BARGE</a></td>";}
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="<td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','MONITOR');\">"._QXZ("LISTEN")."</a></td>"; $R='';} {$L="<td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','MONITOR');\">"._QXZ("LISTEN")."</a></td>"; $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=" <td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','BARGE');\">"._QXZ("BARGE")."</a></td>";} {$R=" <td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','BARGE');\">"._QXZ("BARGE")."</a></td>";}
if ($SIPmonitorLINK>1) {$R=" </td><td NOWRAP align=center> <a href=\"sip:47378218$Lsessionid@$server_ip\">WHISPER</a></td>";} if ($SIPmonitorLINK>1) {$R=" </td><td NOWRAP align=center> <a href=\"sip:47378218$Lsessionid@$server_ip\">WHISPER</a></td>";}
if ($IAXmonitorLINK>1) {$R=" </td><td NOWRAP align=center> <a href=\"iax:47378218$Lsessionid@$server_ip\">WHISPER</a></td>";} if ($IAXmonitorLINK>1) {$R=" </td><td NOWRAP align=center> <a href=\"iax:47378218$Lsessionid@$server_ip\">WHISPER</a></td>";}
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=" <td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','WHISPER');\">WHISPER</a></td>";} {$R=" <td NOWRAP align=center> <a href=\"javascript:send_monitor('$Lsessionid','$Lserver_ip','WHISPER');\">WHISPER</a></td>";}
if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG </td><td NOWRAP align=right>";} if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG </td><td NOWRAP align=right>";}
agc_2-X/trunk/www/vicidial/options-example.php
+2
View File
@@ -22,6 +22,7 @@
# 160106-1321 - Added disable_user_group_bulk_change option # 160106-1321 - Added disable_user_group_bulk_change option
# 160715-0752 - Added graph_canvas_size option for HTML reports # 160715-0752 - Added graph_canvas_size option for HTML reports
# 190414-1121 - Added RS_logoutLINK # 190414-1121 - Added RS_logoutLINK
# 190420-1722 - Added RS_ListenBarge
# #
# used by the realtime_report.php script # 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_AGENTtimeSTATS = 0; # 0=no, 1=yes
$RS_droppedOFtotal = 0; # 0=no, 1=yes $RS_droppedOFtotal = 0; # 0=no, 1=yes
$RS_logoutLINK = 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 # used by agent reports
$user_case = 0; # 1=upper-case, 2-lower-case, 0-no-case-change $user_case = 0; # 1=upper-case, 2-lower-case, 0-no-case-change
agc_2-X/trunk/www/vicidial/realtime_report.php
+18 -9
View File
@@ -43,12 +43,13 @@
# 181128-1040 - Added external_web_socket_url option # 181128-1040 - Added external_web_socket_url option
# 190302-1927 - Added variable-length header icon tables # 190302-1927 - Added variable-length header icon tables
# 190414-1106 - Made admin and summary report links conditional, RS_logoutLINK options.php option # 190414-1106 - Made admin and summary report links conditional, RS_logoutLINK options.php option
# 190420-1729 - Added RS_ListenBarge options.php setting
# #
$startMS = microtime(); $startMS = microtime();
$version = '2.14-30'; $version = '2.14-31';
$build = '190302-1927'; $build = '190420-1729';
header ("Content-type: text/html; charset=utf-8"); header ("Content-type: text/html; charset=utf-8");
@@ -158,6 +159,8 @@ $webphone_bufh = '1';
$webphone_pad = '10'; $webphone_pad = '10';
$webphone_clpos = "<BR> &nbsp; <a href=\"#\" onclick=\"hideDiv('webphone_content');\">"._QXZ("webphone")." -</a>"; $webphone_clpos = "<BR> &nbsp; <a href=\"#\" onclick=\"hideDiv('webphone_content');\">"._QXZ("webphone")." -</a>";
$RS_ListenBarge = 'MONITOR|BARGE|WHISPER';
if (file_exists('options.php')) if (file_exists('options.php'))
{ {
require('options.php'); require('options.php');
@@ -777,13 +780,19 @@ $select_list .= _QXZ("Monitor").": </TD><TD align=left><SELECT SIZE=1 NAME=moni
$select_list .= "<option value=''"; $select_list .= "<option value=''";
if (strlen($monitor_active) < 2) {$select_list .= " selected";} if (strlen($monitor_active) < 2) {$select_list .= " selected";}
$select_list .= ">"._QXZ("NONE")."</option>"; $select_list .= ">"._QXZ("NONE")."</option>";
$select_list .= "<option value='MONITOR'"; if (preg_match("/MONITOR/",$RS_ListenBarge) )
if ($monitor_active=='MONITOR') {$select_list .= " selected";} {
$select_list .= ">"._QXZ("MONITOR")."</option>"; $select_list .= "<option value='MONITOR'";
$select_list .= "<option value='BARGE'"; if ($monitor_active=='MONITOR') {$select_list .= " selected";}
if ($monitor_active=='BARGE') {$select_list .= " selected";} $select_list .= ">"._QXZ("MONITOR")."</option>";
$select_list .= ">"._QXZ("BARGE")."</option>"; }
if ($agent_whisper_enabled == '1') if (preg_match("/BARGE/",$RS_ListenBarge) )
{
$select_list .= "<option value='BARGE'";
if ($monitor_active=='BARGE') {$select_list .= " selected";}
$select_list .= ">"._QXZ("BARGE")."</option>";
}
if ( ($agent_whisper_enabled == '1') and (preg_match("/WHISPER/",$RS_ListenBarge) ) )
{ {
$select_list .= "<option value='WHISPER'"; $select_list .= "<option value='WHISPER'";
if ($monitor_active=='WHISPER') {$select_list .= " selected";} if ($monitor_active=='WHISPER') {$select_list .= " selected";}