From 52b4e98e5a7abeaf8540305c8e9da536c53072fc Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 6 May 2016 15:53:19 -0400 Subject: [PATCH] fixes --- web/skins/classic/includes/functions.php | 2 -- web/skins/classic/views/console.php | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 242f9a6dd..5374dd8b9 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -174,8 +174,6 @@ function getNavBarHTML() { $cycleWidth = $maxWidth; $cycleHeight = $maxHeight; - $eventsView = ZM_WEB_EVENTS_VIEW; - $eventsWindow = 'zm'.ucfirst(ZM_WEB_EVENTS_VIEW); $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':''; diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index e81339cef..dfce5bf91 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -82,7 +82,7 @@ $displayMonitors = NULL; $navbar = getNavBarHTML(); $zoneCount = 0; -for( $i = 0; $i < count($displayMonitors); $i += 1 ) { { +for( $i = 0; $i < count($displayMonitors); $i += 1 ) { $monitor = $displayMonitors[$i]; $monitor['zmc'] = zmcStatus( $monitor ); $monitor['zma'] = zmaStatus( $monitor ); @@ -97,7 +97,7 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) { { $sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?"; $counts = dbFetchOne( $sql, NULL, array($monitor['Id']) ); if ( $counts ) $displayMonitors[$i] = array_merge( $monitor, $counts ); - for ( $i = 0; $j < count($eventCounts); $j++ ) { + for ( $j = 0; $j < count($eventCounts); $j++ ) { $eventCounts[$j]['total'] += $monitor['EventCount'.$j]; } $zoneCount += $monitor['ZoneCount']; @@ -107,6 +107,8 @@ noCacheHeaders(); $seqUpFile = getSkinFile( 'graphics/seq-u.gif' ); $seqDownFile = getSkinFile( 'graphics/seq-d.gif' ); +$eventsView = ZM_WEB_EVENTS_VIEW; +$eventsWindow = 'zm'.ucfirst(ZM_WEB_EVENTS_VIEW); xhtmlHeaders( __FILE__, translate('Console') ); ?>