From bb051fd5099ba1ff6a076009c4a65888ba1d0ed5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 25 May 2017 15:29:31 -0400 Subject: [PATCH] fix merge conflicts --- web/skins/classic/views/console.php | 152 +--------------------------- 1 file changed, 3 insertions(+), 149 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b0763ada4..cd0dd37fe 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -83,7 +83,6 @@ $eventCounts = array( $displayMonitors = NULL; -<<<<<<< HEAD # Also populates displayMonitors $navbar = getNavBarHTML(); $zoneCount = 0; @@ -108,76 +107,12 @@ for( $i = 0; $i < count($displayMonitors); $i += 1 ) { $eventCounts[$j]['total'] += $monitor['EventCount'.$j]; } $zoneCount += $monitor['ZoneCount']; -======= -$group = NULL; -if ( ! empty($_COOKIE['zmGroup']) ) { - if ( $group = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_COOKIE['zmGroup'])) ) - $groupIds = array_flip(explode( ',', $group['MonitorIds'] )); -} - -noCacheHeaders(); - -$maxWidth = 0; -$maxHeight = 0; -$cycleCount = 0; -$minSequence = 0; -$maxSequence = 1; -$monitors = dbFetchAll( "select * from Monitors order by Sequence asc" ); -$displayMonitors = array(); -for ( $i = 0; $i < count($monitors); $i++ ) { - if ( !visibleMonitor( $monitors[$i]['Id'] ) ) { - continue; - } - if ( $group && !empty($groupIds) && !array_key_exists( $monitors[$i]['Id'], $groupIds ) ) { - continue; - } - $monitors[$i]['Show'] = true; - $monitors[$i]['zmc'] = zmcStatus( $monitors[$i] ); - $monitors[$i]['zma'] = zmaStatus( $monitors[$i] ); - $monitors[$i]['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitors[$i]['Id']) ); - $counts = array(); - for ( $j = 0; $j < count($eventCounts); $j++ ) { - $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) ); - parseFilter( $filter ); - $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j"; - $monitors[$i]['eventCounts'][$j]['filter'] = $filter; - } - $sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?"; - $counts = dbFetchOne( $sql, NULL, array($monitors[$i]['Id']) ); - if ( $monitors[$i]['Function'] != 'None' ) { - $cycleCount++; - $scaleWidth = reScale( $monitors[$i]['Width'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); - $scaleHeight = reScale( $monitors[$i]['Height'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); - if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth; - if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight; - } - if ( $counts ) $monitors[$i] = array_merge( $monitors[$i], $counts ); - $displayMonitors[] = $monitors[$i]; ->>>>>>> dragndrop_monitor_sorting } noCacheHeaders(); $eventsView = ZM_WEB_EVENTS_VIEW; $eventsWindow = 'zm'.ucfirst(ZM_WEB_EVENTS_VIEW); -<<<<<<< HEAD -======= - -$eventCount = 0; -for ( $i = 0; $i < count($eventCounts); $i++ ) { - $eventCounts[$i]['total'] = 0; -} -$zoneCount = 0; -foreach( $displayMonitors as $monitor ) { - for ( $i = 0; $i < count($eventCounts); $i++ ) { - $eventCounts[$i]['total'] += $monitor['EventCount'.$i]; - } - $zoneCount += $monitor['ZoneCount']; -} - -$versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':''; - ->>>>>>> dragndrop_monitor_sorting $left_columns = 3; if ( count($servers) ) $left_columns += 1; if ( ZM_WEB_ID_ON_CONSOLE ) $left_columns += 1; @@ -186,59 +121,14 @@ if ( $show_storage_areas ) $left_columns += 1; xhtmlHeaders( __FILE__, translate('Console') ); ?> -
+ -<<<<<<< HEAD
- -======= - -
-
->>>>>>> dragndrop_monitor_sorting +
@@ -250,7 +140,6 @@ if ( ZM_OPT_USE_AUTH ) { -<<<<<<< HEAD @@ -259,16 +148,6 @@ if ( ZM_OPT_USE_AUTH ) { -======= - - - - ->>>>>>> dragndrop_monitor_sorting @@ -276,7 +155,6 @@ for ( $i = 0; $i < count($eventCounts); $i++ ) { " onclick="location.reload(true);"/> - - - - - - ->>>>>> dragndrop_monitor_sorting ?> -<<<<<<< HEAD -======= - ->>>>>>> dragndrop_monitor_sorting -======= -foreach( $displayMonitors as $monitor ) { -?> - ->>>>>>> dragndrop_monitor_sorting
-<<<<<<< HEAD @@ -286,45 +164,23 @@ for ( $i = 0; $i < count($eventCounts); $i++ ) {
- -