syntaxer run

git-svn-id: http://www.observium.org/svn/observer/trunk@2968 61d68cd4-352d-0410-923a-c4978735b2b8
2024-10-07 16:52:45 +00:00 · 2012-04-05 16:47:39 +00:00
parent 4fad2ccc68
commit 2b6581f25d
57 changed files with 50 additions and 50 deletions
--- a/html/includes/graphs/XXX_device_memory_windows.inc.php
+++ b/html/includes/graphs/XXX_device_memory_windows.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/mem.rrd";
--- a/html/includes/graphs/altiga_ssl_sessions.inc.php
+++ b/html/includes/graphs/altiga_ssl_sessions.inc.php
@@ -3,6 +3,7 @@
 $scale_min = "0";

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/altiga-ssl.rrd.rrd";
--- a/html/includes/graphs/application/apache_bits.inc.php
+++ b/html/includes/graphs/application/apache_bits.inc.php
@@ -21,7 +21,6 @@ $colour_area_max = "FFEE99";
 $graph_max = 1;
 $multiplier = 8;

-
 $unit_text = "Kbps";

 include("includes/graphs/generic_simplex.inc.php");
--- a/html/includes/graphs/application/mysql_innodb_row_operations.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_row_operations.inc.php
@@ -33,6 +33,4 @@ $unit_text = "Rows";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
 ?>
--- a/html/includes/graphs/application/mysql_innodb_semaphores.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_semaphores.inc.php
@@ -32,7 +32,4 @@ $unit_text = "Semaphores";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
-
 ?>
--- a/html/includes/graphs/application/mysql_innodb_transactions.inc.php
+++ b/html/includes/graphs/application/mysql_innodb_transactions.inc.php
@@ -30,5 +30,4 @@ $unit_text = "transactions";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
 ?>
--- a/html/includes/graphs/application/mysql_myisam_indexes.inc.php
+++ b/html/includes/graphs/application/mysql_myisam_indexes.inc.php
@@ -33,5 +33,4 @@ $unit_text = "Keys";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
 ?>
--- a/html/includes/graphs/application/mysql_query_cache.inc.php
+++ b/html/includes/graphs/application/mysql_query_cache.inc.php
@@ -9,7 +9,6 @@ if (is_file($mysql_rrd))
  $rrd_filename = $mysql_rrd;
 }

-
 $array = array('QCQICe'  => array('descr' => 'Queries in cache', 'colour' => '22FF22'),
               'QCHs'  => array('descr' => 'Cache hits', 'colour' => '0022FF'),
               'QCIs' => array('descr' => 'Inserts', 'colour' => 'FF0000'),
@@ -36,6 +35,4 @@ $unit_text = "Commands";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
 ?>
--- a/html/includes/graphs/application/mysql_query_cache_memory.inc.php
+++ b/html/includes/graphs/application/mysql_query_cache_memory.inc.php
@@ -31,5 +31,4 @@ $unit_text = "Bytes";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
 ?>
--- a/html/includes/graphs/application/mysql_select_types.inc.php
+++ b/html/includes/graphs/application/mysql_select_types.inc.php
@@ -2,7 +2,6 @@

 include("includes/graphs/common.inc.php");

-
 $rrd_filename = $config["rrd_dir"] . '/' . $device["hostname"] . '/app-mysql-'.$app["app_id"].'.rrd';

 $array = array( 'SFJn' => 'Full Join',
--- a/html/includes/graphs/application/mysql_slow_queries.inc.php
+++ b/html/includes/graphs/application/mysql_slow_queries.inc.php
@@ -31,5 +31,4 @@ $unit_text = "Queries";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
 ?>
--- a/html/includes/graphs/application/mysql_sorts.inc.php
+++ b/html/includes/graphs/application/mysql_sorts.inc.php
@@ -34,6 +34,4 @@ $unit_text = "";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
 ?>
--- a/html/includes/graphs/application/mysql_table_locks.inc.php
+++ b/html/includes/graphs/application/mysql_table_locks.inc.php
@@ -32,6 +32,4 @@ $unit_text = "Table locks";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
 ?>
--- a/html/includes/graphs/application/mysql_temporary_objects.inc.php
+++ b/html/includes/graphs/application/mysql_temporary_objects.inc.php
@@ -33,6 +33,4 @@ $unit_text = "Temp";

 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

-
-
 ?>
--- a/html/includes/graphs/application/ntpdserver_bits.inc.php
+++ b/html/includes/graphs/application/ntpdserver_bits.inc.php
@@ -29,6 +29,7 @@ if (is_file($ntpdserver_rrd))
 }

 //    include("includes/graphs/generic_bits.inc.php");
+
 include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/application/ntpdserver_packets.inc.php
+++ b/html/includes/graphs/application/ntpdserver_packets.inc.php
@@ -28,6 +28,7 @@ if (is_file($rrd_filename))
 }

 //    include("includes/graphs/generic_multi_line.inc.php");
+
 include("includes/graphs/generic_multi_simplex_seperated.inc.php");

 ?>
--- a/html/includes/graphs/c6kxbar/auth.inc.php
+++ b/html/includes/graphs/c6kxbar/auth.inc.php
@@ -15,7 +15,4 @@ if ($auth && is_numeric($_GET['mod']) && is_numeric($_GET['chan']))
  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/c6kxbar-" . safename($_GET['mod']. "-".$_GET['chan']. ".rrd");
 }

-
-
-
 ?>
--- a/html/includes/graphs/device/cras_sessions.inc.php
+++ b/html/includes/graphs/device/cras_sessions.inc.php
@@ -3,6 +3,7 @@
 $scale_min = "0";

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cras_sessions.rrd";
--- a/html/includes/graphs/device/ipSystemStats.inc.php
+++ b/html/includes/graphs/device/ipSystemStats.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename_4 = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
--- a/html/includes/graphs/device/ipsystemstats_ipv4.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv4.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
--- a/html/includes/graphs/device/ipsystemstats_ipv4_frag.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv4_frag.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
--- a/html/includes/graphs/device/ipsystemstats_ipv6.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv6.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
--- a/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php
+++ b/html/includes/graphs/device/ipsystemstats_ipv6_frag.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
--- a/html/includes/graphs/device/netscaler_tcp_bits.inc.php
+++ b/html/includes/graphs/device/netscaler_tcp_bits.inc.php
@@ -9,5 +9,4 @@ $multiplier = 8;

 include("includes/graphs/generic_bits.inc.php");

-
 ?>
--- a/html/includes/graphs/device/netstat_ip.inc.php
+++ b/html/includes/graphs/device/netstat_ip.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
--- a/html/includes/graphs/device/netstat_ip_frag.inc.php
+++ b/html/includes/graphs/device/netstat_ip_frag.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-ip.rrd";
--- a/html/includes/graphs/device/netstat_snmp_pkt.inc.php
+++ b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-snmp.rrd";
--- a/html/includes/graphs/device/netstat_tcp.inc.php
+++ b/html/includes/graphs/device/netstat_tcp.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-tcp.rrd";
--- a/html/includes/graphs/device/netstat_udp.inc.php
+++ b/html/includes/graphs/device/netstat_udp.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-udp.rrd";
--- a/html/includes/graphs/device/nfsen_flows.inc.php
+++ b/html/includes/graphs/device/nfsen_flows.inc.php
@@ -1,5 +1,7 @@
 <?php
 $dsdescr = "Flows/s ";
 $dsprefix = "flows_";
+
 include("nfsen_common.inc.php");
+
 ?>
--- a/html/includes/graphs/device/nfsen_packets.inc.php
+++ b/html/includes/graphs/device/nfsen_packets.inc.php
@@ -1,5 +1,7 @@
 <?php
 $dsdescr = "Packets/s ";
 $dsprefix = "packets_";
+
 include("nfsen_common.inc.php");
+
 ?>
--- a/html/includes/graphs/device/nfsen_traffic.inc.php
+++ b/html/includes/graphs/device/nfsen_traffic.inc.php
@@ -1,5 +1,7 @@
 <?php
 $dsdescr = "Byts/s ";
 $dsprefix = "traffic_";
+
 include("nfsen_common.inc.php");
+
 ?>
--- a/html/includes/graphs/device/sensor.inc.php
+++ b/html/includes/graphs/device/sensor.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 if ($_GET['width'] > "300") { $descr_len = "40"; } else { $descr_len = "22"; }
--- a/html/includes/graphs/device/smokeping_all_common_avg.inc.php
+++ b/html/includes/graphs/device/smokeping_all_common_avg.inc.php
@@ -100,8 +100,6 @@ $descr = str_replace(":", "\:", substr(str_pad("Average", $descr_len),0,$descr_l
  $rrd_options .= " GPRINT:avsd:'%5.1lf%Ss'";
  $rrd_options .= " GPRINT:avmsr:'%5.1lf%s\\l'";

-
-
 #  $rrd_options .= " AREA:dmlow$i";
 #  $rrd_options .= " AREA:s2d$i#".$colour."30::STACK";
 #  $rrd_options .= " LINE1:dm$i#".$colour.":'$descr'";
--- a/html/includes/graphs/device/toner.inc.php
+++ b/html/includes/graphs/device/toner.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/device/ucd_cpu.inc.php
+++ b/html/includes/graphs/device/ucd_cpu.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . "ucd_cpu.rrd";
 $rrd_options .= " DEF:user=$rrd_filename:user:AVERAGE";
 $rrd_options .= " DEF:nice=$rrd_filename:nice:AVERAGE";
--- a/html/includes/graphs/device/ucd_load.inc.php
+++ b/html/includes/graphs/device/ucd_load.inc.php
@@ -3,6 +3,7 @@
 $scale_min = "0";

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_load.rrd";
--- a/html/includes/graphs/device/ucd_memory.inc.php
+++ b/html/includes/graphs/device/ucd_memory.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_mem.rrd";
--- a/html/includes/graphs/device/uptime.inc.php
+++ b/html/includes/graphs/device/uptime.inc.php
@@ -3,6 +3,7 @@
 $scale_min = "0";

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/uptime.rrd";
--- a/html/includes/graphs/device/vpdn_sessions_l2tp.inc.php
+++ b/html/includes/graphs/device/vpdn_sessions_l2tp.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/vpdn-l2tp.rrd";
--- a/html/includes/graphs/device/vpdn_tunnels_l2tp.inc.php
+++ b/html/includes/graphs/device/vpdn_tunnels_l2tp.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/vpdn-l2tp.rrd";
--- a/html/includes/graphs/device/wifi_clients.inc.php
+++ b/html/includes/graphs/device/wifi_clients.inc.php
@@ -1,6 +1,7 @@
 <?php

 include("includes/graphs/common.inc.php");
+
 $device = device_by_id_cache($id);

 $rrd_options .= " -l 0 -E ";
--- a/html/includes/graphs/generic_simplex.inc.php
+++ b/html/includes/graphs/generic_simplex.inc.php
@@ -8,7 +8,7 @@ include("includes/graphs/common.inc.php");
 $unit_text = str_pad(truncate($unit_text,18,''),18);
 $line_text = str_pad(truncate($line_text,12,''),12);

-if($multiplier) 
+if ($multiplier)
 {
  $rrd_options .= " DEF:".$ds."_o=".$rrd_filename.":".$ds.":AVERAGE";
  $rrd_options .= " DEF:".$ds."_max_o=".$rrd_filename.":".$ds.":MAX";
@@ -19,7 +19,6 @@ if($multiplier)
  $rrd_options .= " DEF:".$ds."_max=".$rrd_filename.":".$ds.":MAX";
 }

-
 if ($print_total)
 {
  $rrd_options .= " VDEF:".$ds."_total=ds,TOTAL";
--- a/html/includes/graphs/graph.inc.php
+++ b/html/includes/graphs/graph.inc.php
@@ -59,6 +59,7 @@ function graph_error($string)
  $_GET['bg'] = "FFBBBB";

  include("includes/graphs/common.inc.php");
+
  $rrd_options .= " HRULE:0#555555";
  $rrd_options .= " --title='".$string."'";

--- a/html/includes/graphs/location/bits.inc.php
+++ b/html/includes/graphs/location/bits.inc.php
@@ -6,7 +6,7 @@ $ds_in  = "INOCTETS";
 $ds_out = "OUTOCTETS";

 $i=1;
-foreach($devices as $device)
+foreach ($devices as $device)
 {
 foreach (dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ?", array($device['device_id'])) as $int)
 {
@@ -64,5 +64,4 @@ $colour_area_out = "C3D9FF";

 include("includes/graphs/generic_multi_bits_separated.inc.php");

-
 ?>
--- a/html/includes/graphs/mempool/usage.inc.php
+++ b/html/includes/graphs/mempool/usage.inc.php
@@ -28,7 +28,6 @@ if($width > "500")
 $descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), $descr_len),0,$descr_len);
 $descr = str_replace(":", "\:", $descr);

-
 $perc  = round($mempool['mempool_perc'], 0);
 $background = get_percentage_colours($perc);

--- a/html/includes/graphs/rserver/curr.inc.php
+++ b/html/includes/graphs/rserver/curr.inc.php
@@ -18,10 +18,10 @@

 #include("includes/graphs/generic_simplex.inc.php");

-
 $scale_min = 0;

 include("includes/graphs/common.inc.php");
+
 $graph_max = 1;

 $ds = "RserverCurrentConns";
@@ -31,7 +31,6 @@ $colour_line = "191970";

 $colour_area_max = "FFEE99";

-
 $nototal   = 1;
 $unit_text = "Conns";

--- a/html/includes/graphs/rserver/failed.inc.php
+++ b/html/includes/graphs/rserver/failed.inc.php
@@ -3,6 +3,7 @@
 $scale_min = 0;

 include("includes/graphs/common.inc.php");
+
 $graph_max = 1;

 $ds = "RserverCurrentConns";
@@ -12,7 +13,6 @@ $colour_line = "191970";

 $colour_area_max = "FFEE99";

-
 $nototal   = 1;
 $unit_text = "Conns";

--- a/html/includes/graphs/rserver/total.inc.php
+++ b/html/includes/graphs/rserver/total.inc.php
@@ -3,6 +3,7 @@
 $scale_min = 0;

 include("includes/graphs/common.inc.php");
+
 $graph_max = 1;

 $ds = "RserverTotalConns";
@@ -12,7 +13,6 @@ $colour_line = "191970";

 $colour_area_max = "FFEE99";

-
 $nototal   = 1;
 $unit_text = "Conns";

--- a/html/includes/graphs/smokeping/in.inc.php
+++ b/html/includes/graphs/smokeping/in.inc.php
@@ -31,7 +31,6 @@ if($width > "500")
  $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT      Loss    SDev   RTT\:SDev                              \l'";
 }

-
 if($src['hostname'] == $config['own_hostname'])
 {
  $filename = $config['smokeping']['dir'] . $device['hostname'].'.rrd';
--- a/html/includes/graphs/smokeping/out.inc.php
+++ b/html/includes/graphs/smokeping/out.inc.php
@@ -31,7 +31,6 @@ if($width > "500")
  $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT      Loss    SDev   RTT\:SDev                              \l'";
 }

-
 if($device['hostname'] == $config['own_hostname'])
 {
  $filename = $config['smokeping']['dir'] . $dest['hostname'].'.rrd';
--- a/html/includes/graphs/vserver/bits.inc.php
+++ b/html/includes/graphs/vserver/bits.inc.php
@@ -2,11 +2,11 @@

 #include("includes/graphs/common.inc.php");

-
 $ds_in = "ByteCounts";
 $ds_out = "ClientByteCounts";

 include("includes/graphs/generic_bytes.inc.php");
+
 #include("includes/graphs/generic_duplex.inc.php");

 ?>
--- a/html/includes/graphs/vserver/conns.inc.php
+++ b/html/includes/graphs/vserver/conns.inc.php
@@ -3,6 +3,7 @@
 $scale_min = 0;

 include("includes/graphs/common.inc.php");
+
 $graph_max = 1;

 $ds = "NumberOfConnections";
@@ -12,7 +13,6 @@ $colour_line = "191970";

 $colour_area_max = "FFEE99";

-
 $nototal   = 1;
 $unit_text = "Conns";

--- a/html/includes/graphs/vserver/pkts.inc.php
+++ b/html/includes/graphs/vserver/pkts.inc.php
@@ -15,4 +15,5 @@ $graph_max = 1;
 $unit_text = "Packets";

 include("includes/graphs/generic_duplex.inc.php");
+
 ?>