syntaxer run

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

html/includes/graphs/application/memcached_uptime.inc.php

@@ -7,7 +7,6 @@ include("includes/graphs/common.inc.php");
 
 $device = device_by_id_cache($id);
 
-
 $rrd_options .= " DEF:uptime=".$rrd_filename.":uptime:AVERAGE";
 $rrd_options .= " CDEF:cuptime=uptime,86400,/";
 $rrd_options .= " 'COMMENT:Days      Current  Minimum  Maximum  Average\\n'";

html/includes/graphs/device/bits.inc.php

@@ -68,6 +68,7 @@ $colour_area_in = "91B13C";
 $colour_area_out = "8080BD";
 
 include("includes/graphs/generic_multi_seperated.inc.php");
+
 #include("includes/graphs/generic_multi_bits_separated.inc.php");
 #include("includes/graphs/generic_multi_data_separated.inc.php");
 

html/includes/graphs/generic_multi_line.inc.php

@@ -53,10 +53,10 @@ foreach ($rrd_list as $rrd)
   {
     $rrd_options .= " CDEF:".$id."i=".$id.",-1,*";
     $rrd_optionsb .= " LINE1.25:".$id."i#".$colour.":'$descr'";
-    if(!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."i#" . $rrd['areacolour']; }
+    if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."i#" . $rrd['areacolour']; }
   } else {
     $rrd_optionsb .= " LINE1.25:".$id."#".$colour.":'$descr'";
-    if(!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."#" . $rrd['areacolour']; }
+    if (!empty($rrd['areacolour'])) { $rrd_optionsb .= " AREA:".$id."#" . $rrd['areacolour']; }
   }
 
   $rrd_optionsb .= " GPRINT:".$id.":LAST:%5.2lf%s GPRINT:".$id."min:MIN:%5.2lf%s";

html/includes/graphs/munin/auth.inc.php

@@ -8,7 +8,7 @@ if (is_numeric($id))
   {
     $device = device_by_id_cache($mplug['device_id']);
     $title  = generate_device_link($device);
-#    if(!empty($mplug['mplug_instance']))
+#    if (!empty($mplug['mplug_instance']))
 #    {
 #      $plugfile = $config['rrd_dir']."/".$device['hostname']."/munin/".$mplug['mplug_type']."_".$mplug['mplug_instance'];
 #      $title .= " :: Plugin :: " . $mplug['mplug_type'] . " :: " . $mplug['mplug_title'];

html/includes/graphs/munin/graph.inc.php

@@ -23,7 +23,6 @@ if($width > "500")
   $rrd_options .= " COMMENT:'".substr(str_pad($mplug['mplug_vlabel'], $descr_len),0,$descr_len)."   Current   Average  Maximum\l'";
 }
 
-
 $c_i = 0;
 $dbq = dbFetchRows("SELECT * FROM `munin_plugins_ds` WHERE `mplug_id` = ?", array($mplug['mplug_id']));
 foreach ($dbq as $ds)
@@ -33,15 +32,15 @@ foreach ($dbq as $ds)
 
   $cmd_def .= " DEF:".$ds['ds_name']."=".$ds_filename.":val:AVERAGE";
 
-  if(!empty($ds['ds_cdef']))
+  if (!empty($ds['ds_cdef']))
   {
     $cmd_cdef .= "";
     $ds_name = $ds['ds_name']."_cdef";
   }
 
-  if($ds['ds_graph'] == "yes")
+  if ($ds['ds_graph'] == "yes")
   {
-    if(empty($ds['colour']))
+    if (empty($ds['colour']))
     {
       if (!$config['graph_colours']['mixed'][$c_i]) { $c_i = 0; }
       $colour=$config['graph_colours']['mixed'][$c_i]; $c_i++;

html/pages/device.inc.php

@@ -227,7 +227,6 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
   </li>');
     }
 
-
     if ($_SESSION['userlevel'] >= "5" && dbFetchCell("SELECT COUNT(*) FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
     {
       $discovery_links = TRUE;

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)));

html/pages/health/sensors.inc.php

@@ -31,9 +31,9 @@ foreach (dbFetchRows($sql, $param) as $sensor)
     $sensor['sensor_current'] = $memcache->get('sensor-'.$sensor['sensor_id'].'-value');
   }
 
-  if(empty($sensor['sensor_current'])) 
-  { 
-    $sensor['sensor_current'] = "NaN"; 
+  if (empty($sensor['sensor_current']))
+  {
+    $sensor['sensor_current'] = "NaN";
   } else {
     if ($sensor['sensor_current'] >= $sensor['sensor_limit']) { $alert = '<img src="images/16/flag_red.png" alt="alert" />'; } else { $alert = ""; }
   }

html/pages/search/arp.inc.php

@@ -18,7 +18,7 @@ foreach (dbFetchRows("SELECT D.device_id AS device_id, `hostname` FROM `ipv4_mac
 ?>
       </select>
     </td>
-    <td width="200" style="padding: 1px;">Search by 
+    <td width="200" style="padding: 1px;">Search by
       <select name="searchby" id="searchby">
       <option value="mac" <?php if ($_POST['searchby'] != "ip") { echo("selected"); } ?> >MAC Address</option>
       <option value="ip" <?php if ($_POST['searchby'] == "ip") { echo("selected"); } ?> >IP Address</option>
@@ -70,22 +70,21 @@ foreach (dbFetchRows($query, $param) as $entry)
     {
       $error_img = generate_port_link($entry,"<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>",errors);
     } else { $error_img = ""; }
-	
-	$arp_host = dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = ? AND I.interface_id = A.interface_id AND D.device_id = I.device_id", array($entry['ipv4_address']));
+
+    $arp_host = dbFetchRow("SELECT * FROM ipv4_addresses AS A, ports AS I, devices AS D WHERE A.ipv4_address = ? AND I.interface_id = A.interface_id AND D.device_id = I.device_id", array($entry['ipv4_address']));
     if ($arp_host) { $arp_name = generate_device_link($arp_host); } else { unset($arp_name); }
     if ($arp_host) { $arp_if = generate_port_link($arp_host); } else { unset($arp_if); }
     if ($arp_host['device_id'] == $entry['device_id']) { $arp_name = "Localhost"; }
     if ($arp_host['interface_id'] == $entry['interface_id']) { $arp_if = "Local port"; }
 
-
     echo('<tr class="search">
         <td width="160">' . formatMac($entry['mac_address']) . '</td>
         <td width="140">' . $entry['ipv4_address'] . '</td>
-	    <td width="200" class="list-bold">' . generate_device_link($entry) . '</td>
+            <td width="200" class="list-bold">' . generate_device_link($entry) . '</td>
         <td class="list-bold">' . generate_port_link($entry, makeshortif(fixifname($entry['ifDescr']))) . ' ' . $error_img . '</td>
-	    <td width="200">'.$arp_name.'</td>
+            <td width="200">'.$arp_name.'</td>
         <td class="list-bold">'.$arp_if.'</td>
-	    </tr>');
+            </tr>');
   }
 
   unset($ignore);

html/pages/services.inc.php

@@ -14,7 +14,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)));