ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MontageReview should only be visisble to people who can view events. Fix running state

pull/1185/head
Isaac Connor 2016-10-20 13:38:12 -04:00
parent ea27e07276
commit f153e9b8fb
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/index.php
View File

@ -137,7 +137,10 @@ if ( ZM_OPT_USE_AUTH ) {
require_once( 'includes/lang.php' ); require_once( 'includes/lang.php' );
require_once( 'includes/functions.php' ); require_once( 'includes/functions.php' );
#$running = daemonCheck();
# Running is global but only do the daemonCheck if it is actually needed
$running = null;
#= daemonCheck();
#$states = dbFetchAll( 'SELECT * FROM States' ); #$states = dbFetchAll( 'SELECT * FROM States' );
#foreach ( $states as $state ) { #foreach ( $states as $state ) {
#if ( $state['IsActive'] == 1 ) { #if ( $state['IsActive'] == 1 ) {

8
web/skins/classic/includes/functions.php
View File

@ -185,8 +185,10 @@ function getNavBarHTML() {
global $VLANG; global $VLANG;
global $CLANG; global $CLANG;
global $VLANG; global $VLANG;
global $status; global $running;
if ( $running == null )
$running = daemonCheck(); $running = daemonCheck();
$status = $running?translate('Running'):translate('Stopped');
global $user; global $user;
global $bwArray; global $bwArray;
?> ?>
@ -220,7 +222,9 @@ function getNavBarHTML() {
?> ?>
<li><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?></li> <li><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?></li>
<li><?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></li> <li><?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></li>
<li><?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontageReview'.$cycleGroup, 'montagereview', translate('MontageReview'), $running ) ?></li> <?php } ?>
<?php if ( canView('Events') ) { ?>
<li><?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontageReview'.$cycleGroup, 'montagereview', translate('MontageReview') ) ?></li>
<?php } ?> <?php } ?>
</ul> </ul>

2
web/skins/classic/views/console.php
View File

@ -22,6 +22,8 @@ $servers = Server::find_all();
require_once('includes/Storage.php'); require_once('includes/Storage.php');
$storage_areas = Storage::find_all(); $storage_areas = Storage::find_all();
$show_storage_areas = count($storage_areas) > 1 and canEdit( 'System' ) ? 1 : 0; $show_storage_areas = count($storage_areas) > 1 and canEdit( 'System' ) ? 1 : 0;
if ( $running == null )
$running = daemonCheck();
$eventCounts = array( $eventCounts = array(
array( array(