syntaxer run

git-svn-id: http://www.observium.org/svn/observer/trunk@3117 61d68cd4-352d-0410-923a-c4978735b2b8

html/pages/device/apps.inc.php

@@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `applications` WHERE `device_id` = ?", array
   }
   $link_add = array('app'=>$app['app_type']);
   $text = ucfirst($app['app_type']);
-  if(!empty($app['app_instance']))
+  if (!empty($app['app_instance']))
   {
     $text .= "(".$app['app_instance'].")";
     $link_add['instance'] = $app['app_id'];

html/pages/device/apps/memcached.inc.php

@@ -6,7 +6,7 @@ $graphs = array('memcached_bits' => 'Traffic',
                 'memcached_commands' => 'Commands',
                 'memcached_data' => 'Data Size',
                 'memcached_items' => 'Items',
-	        'memcached_uptime' => 'Uptime',
+                'memcached_uptime' => 'Uptime',
                 'memcached_threads' => 'Threads',
 
 );

html/pages/device/graphs.inc.php

@@ -19,7 +19,7 @@ $sep = "";
 
 foreach (dbFetchRows("SELECT * FROM munin_plugins WHERE device_id = ? ORDER BY mplug_category, mplug_type", array($device['device_id'])) as $mplug)
 {
-#  if(strlen($mplug['mplug_category']) == 0) { $mplug['mplug_category'] = "general"; } else {  }
+#  if (strlen($mplug['mplug_category']) == 0) { $mplug['mplug_category'] = "general"; } else {  }
   $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['id'] = $mplug['mplug_id'];
   $graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['title'] = $mplug['mplug_title'];
 }
@@ -31,7 +31,7 @@ foreach (dbFetchRows("SELECT * FROM device_graphs WHERE device_id = ? ORDER BY g
 }
 
 #foreach ($config['graph_sections'] as $section)
-foreach($graph_enable as $section => $nothing)
+foreach ($graph_enable as $section => $nothing)
 {
   if (isset($graph_enable) && is_array($graph_enable[$section]))
   {
@@ -57,11 +57,11 @@ print_optionbar_end();
 $graph_enable = $graph_enable[$vars['group']];
 
 #foreach ($config['graph_types']['device'] as $graph => $entry)
-foreach($graph_enable as $graph => $entry)
+foreach ($graph_enable as $graph => $entry)
 {
   if ($graph_enable[$graph])
   {
-    if(is_numeric($entry['id']))
+    if (is_numeric($entry['id']))
     {
       $graph_title = $entry['title'];
       $graph_array['type'] = "munin_graph";
@@ -70,6 +70,7 @@ foreach($graph_enable as $graph => $entry)
       $graph_title = $config['graph_types']['device'][$graph]['descr'];
       $graph_array['type'] = "device_" . $graph;
     }
+
     include("includes/print-device-graph.php");
   }
 }

html/pages/device/overview.inc.php

@@ -18,7 +18,9 @@ if ($ports['down']) { $ports_colour = $warn_colour_a; } else { $ports_colour = $
 echo("<table width=100% cellspacing=0 cellpadding=0><tr><td style='width: 50%; vertical-align: top;>");
 
 echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
+
 include("includes/dev-overview-data.inc.php");
+
 echo("</div>");
 
 include("overview/ports.inc.php");

html/pages/device/overview/generic/sensor.inc.php

@@ -14,7 +14,7 @@ if (count($sensors))
       $sensor['sensor_current'] = $memcache->get('sensor-'.$sensor['sensor_id'].'-value');
     }
 
-    if(empty($sensor['sensor_current']))
+    if (empty($sensor['sensor_current']))
     {
       $sensor['sensor_current'] = "NaN";
     }

html/pages/device/port.inc.php

@@ -7,14 +7,13 @@ $port = dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($vars
 if ($config['memcached']['enable'])
 {
   $oids = array('ifInOctets', 'ifOutOctets', 'ifInUcastPkts', 'ifOutUcastPkts', 'ifInErrors', 'ifOutErrors');
-  foreach($oids as $oid)
+  foreach ($oids as $oid)
   {
     $port[$oid.'_rate'] = $memcache->get('port-'.$port['interface_id'].'-'.$oid.'_rate');
-    if($debug) { echo("MC[".$oid."->".$port[$oid.'_rate']."]"); }
+    if ($debug) { echo("MC[".$oid."->".$port[$oid.'_rate']."]"); }
   }
 }
 
-
 $port_details = 1;
 
 $hostname = $device['hostname'];

html/pages/device/ports.inc.php

@@ -70,8 +70,7 @@ if ($vars['view'] == 'minigraphs')
   echo("<div style='display: block; clear: both; margin: auto; min-height: 500px;'>");
   unset ($seperator);
 
-  ## FIX THIS. UGLY.
-
+  ## FIXME - FIX THIS. UGLY.
   foreach (dbFetchRows("select * from ports WHERE device_id = ? ORDER BY ifIndex", array($device['device_id'])) as $port)
   {
     echo("<div style='display: block; padding: 3px; margin: 3px; min-width: 183px; max-width:183px; min-height:90px; max-height:90px; text-align: center; float: left; background-color: #e9e9e9;'>
@@ -107,19 +106,18 @@ if ($vars['view'] == 'minigraphs')
 
   foreach ($ports as $port)
   {
-
     if ($config['memcached']['enable'])
-{
-  $oids = array('ifInOctets', 'ifOutOctets', 'ifInUcastPkts', 'ifOutUcastPkts', 'ifInErrors', 'ifOutErrors');
-  foreach($oids as $oid)
-  {
-    $port[$oid.'_rate'] = $memcache->get('port-'.$port['interface_id'].'-'.$oid.'_rate');
-    if($debug) { echo("MC[".$oid."->".$port[$oid.'_rate']."]"); }
-  }
-}
-
+    {
+      $oids = array('ifInOctets', 'ifOutOctets', 'ifInUcastPkts', 'ifOutUcastPkts', 'ifInErrors', 'ifOutErrors');
+      foreach ($oids as $oid)
+      {
+        $port[$oid.'_rate'] = $memcache->get('port-'.$port['interface_id'].'-'.$oid.'_rate');
+        if ($debug) { echo("MC[".$oid."->".$port[$oid.'_rate']."]"); }
+      }
+    }
 
     include("includes/print-interface.inc.php");
+
     $i++;
   }
   echo("</table></div>");

html/pages/device/services.inc.php

@@ -10,7 +10,7 @@ if (!$vars['view']) { $vars['view'] = "basic"; }
 $sep = "";
 foreach ($menu_options as $option => $text)
 {
-  if(empty($vars['view'])) { $vars['view'] = $option; }
+  if (empty($vars['view'])) { $vars['view'] = $option; }
   echo($sep);
   if ($vars['view'] == $option) { echo("<span class='pagemenu-selected'>"); }
   echo(generate_link($text, $vars, array('view'=>$option)));