From b273e04241b1fd79d979afcce953fdc7c0cad87e Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 25 May 2012 12:24:34 +0000 Subject: [PATCH] /// -> // git-svn-id: http://www.observium.org/svn/observer/trunk@3240 61d68cd4-352d-0410-923a-c4978735b2b8 --- attic/purgeports.inc.php | 2 +- attic/unix-graphing.php | 2 +- check-errors.php | 8 +- discovery.php | 2 +- html/data.php | 2 +- .../includes/authentication/http-auth.inc.php | 2 +- html/includes/authentication/ldap.inc.php | 2 +- html/includes/collectd/functions.php | 2 +- html/includes/functions.inc.php | 2 +- html/includes/geshi/geshi.php | 2 +- html/includes/graphs/bill/auth.inc.php | 2 +- html/includes/graphs/bill/bits.inc.php | 2 +- .../graphs/cefswitching/graph.inc.php | 2 +- html/includes/graphs/customer/auth.inc.php | 2 +- html/includes/graphs/customer/bits.inc.php | 2 +- html/includes/graphs/device/bits.inc.php | 4 +- html/includes/graphs/device/sensor.inc.php | 2 +- html/includes/graphs/device/sla.inc.php | 2 +- .../device/smokeping_all_common.inc.php | 8 +- .../device/smokeping_all_common_avg.inc.php | 10 +- html/includes/graphs/device/storage.inc.php | 2 +- html/includes/graphs/device/toner.inc.php | 2 +- html/includes/graphs/generic_data.inc.php | 4 +- html/includes/graphs/generic_duplex.inc.php | 4 +- .../graphs/generic_multi_bits.inc.php | 4 +- .../generic_multi_bits_separated.inc.php | 2 +- .../graphs/generic_multi_data.inc.php | 4 +- .../generic_multi_data_separated.inc.php | 2 +- .../graphs/generic_multi_seperated.inc.php | 2 +- .../generic_multi_simplex_seperated.inc.php | 10 +- html/includes/graphs/generic_simplex.inc.php | 4 +- html/includes/graphs/global/bits.inc.php | 2 +- html/includes/graphs/graph.inc.php | 8 +- html/includes/graphs/location/bits.inc.php | 2 +- .../graphs/old_generic_simplex.inc.php | 4 +- html/includes/graphs/port/etherlike.inc.php | 2 +- html/includes/graphs/port/nupkts.inc.php | 2 +- html/includes/graphs/port/pagp_bits.inc.php | 2 +- .../includes/graphs/screenos_sessions.inc.php | 2 +- html/includes/graphs/sensor/auth.inc.php | 2 +- html/includes/graphs/service/auth.inc.php | 2 +- html/includes/graphs/smokeping/in.inc.php | 8 +- html/includes/graphs/smokeping/out.inc.php | 8 +- html/includes/header.inc.php | 2 +- html/includes/print-device-graph.php | 2 +- html/includes/print-interface.inc.php | 2 +- html/includes/print-menubar.php | 10 +- html/includes/topnav.inc.php | 2 +- html/index.php | 6 +- html/map.php | 6 +- html/pages/adduser.inc.php | 2 +- html/pages/bill.inc.php | 2 +- html/pages/bill/actions.inc.php | 2 +- html/pages/bill/edit.inc.php | 4 +- html/pages/bill/history.inc.php | 2 +- html/pages/bills.inc.php | 2 +- html/pages/bills/pmonth.inc.php | 2 +- html/pages/deluser.inc.php | 2 +- html/pages/device.inc.php | 8 +- html/pages/device/alerts.inc.php | 4 +- html/pages/device/graphs.inc.php | 4 +- html/pages/device/hrdevice.inc.php | 4 +- html/pages/device/loadbalancer.inc.php | 4 +- html/pages/device/munin.inc.php | 4 +- html/pages/device/overview.inc.php | 4 +- .../device/overview/generic/sensor.inc.php | 6 +- html/pages/device/port.inc.php | 6 +- html/pages/device/port/macaccounting.inc.php | 2 +- html/pages/device/port/pagp.inc.php | 2 +- html/pages/device/port/realtime.inc.php | 2 +- html/pages/device/ports.inc.php | 6 +- html/pages/device/routing.inc.php | 4 +- html/pages/device/routing/bgp.inc.php | 6 +- html/pages/device/routing/ospf.inc.php | 8 +- html/pages/device/showconfig.inc.php | 2 +- html/pages/devices.inc.php | 6 +- html/pages/front/default.php | 10 +- html/pages/front/example2.php | 4 +- html/pages/front/globe.php | 10 +- html/pages/front/jt.php | 2 +- html/pages/front/traffic.php | 2 +- html/pages/graphs.inc.php | 6 +- html/pages/health.inc.php | 2 +- html/pages/health/processor.inc.php | 2 +- html/pages/health/sensors.inc.php | 8 +- html/pages/ports.inc.php | 8 +- html/pages/routing.inc.php | 2 +- html/pages/routing/bgp.inc.php | 4 +- html/pages/routing/ospf.inc.php | 4 +- html/pages/routing/vrf.inc.php | 2 +- includes/cisco-entities.php | 2 +- includes/common.php | 10 +- includes/defaults.inc.php | 176 +++++++++--------- includes/definitions.inc.php | 24 +-- includes/discovery/bgp-peers.inc.php | 14 +- includes/discovery/cisco-cef.inc.php | 2 +- .../discovery/cisco-entity-sensor.inc.php | 22 +-- includes/discovery/cisco-pw.inc.php | 6 +- includes/discovery/current.inc.php | 2 +- includes/discovery/current/apc.inc.php | 2 +- includes/discovery/current/ipoman.inc.php | 4 +- includes/discovery/current/mgeups.inc.php | 2 +- includes/discovery/current/rfc1628.inc.php | 2 +- includes/discovery/current/xups.inc.php | 2 +- includes/discovery/entity-physical.inc.php | 2 +- includes/discovery/entity-sensor.inc.php | 4 +- includes/discovery/fanspeeds.inc.php | 2 +- includes/discovery/fanspeeds/areca.inc.php | 2 +- .../discovery/fanspeeds/lmsensors.inc.php | 2 +- .../discovery/fanspeeds/supermicro.inc.php | 2 +- includes/discovery/frequencies.inc.php | 2 +- includes/discovery/frequencies/apc.inc.php | 2 +- includes/discovery/frequencies/ipoman.inc.php | 4 +- includes/discovery/frequencies/mgeups.inc.php | 2 +- .../discovery/frequencies/rfc1628.inc.php | 2 +- includes/discovery/frequencies/xups.inc.php | 2 +- includes/discovery/functions.inc.php | 8 +- includes/discovery/humidity.inc.php | 2 +- includes/discovery/humidity/apc.inc.php | 2 +- includes/discovery/humidity/ipoman.inc.php | 4 +- includes/discovery/humidity/mgeups.inc.php | 6 +- includes/discovery/ipmi.inc.php | 2 +- includes/discovery/junose-atm-vp.inc.php | 8 +- includes/discovery/libvirt-vminfo.inc.php | 4 +- includes/discovery/mempools.inc.php | 4 +- includes/discovery/mempools/cmp.inc.php | 2 +- includes/discovery/mempools/hrstorage.inc.php | 4 +- includes/discovery/mempools/junos.inc.php | 10 +- includes/discovery/mempools/vrp.inc.php | 10 +- includes/discovery/os/alcatel-lucent.inc.php | 2 +- includes/discovery/os/freebsd.inc.php | 6 +- includes/discovery/os/linux.inc.php | 8 +- includes/discovery/ports.inc.php | 28 +-- includes/discovery/power.inc.php | 2 +- includes/discovery/power/ipoman.inc.php | 6 +- includes/discovery/processors.inc.php | 6 +- .../discovery/processors/aos-device.inc.php | 2 +- .../discovery/processors/fortigate.inc.php | 4 +- .../discovery/processors/hrdevice.inc.php | 8 +- includes/discovery/processors/ios.inc.php | 2 +- includes/discovery/processors/junos.inc.php | 10 +- includes/discovery/processors/junose.inc.php | 4 +- .../discovery/processors/netscaler.inc.php | 2 +- .../discovery/processors/powerconnect.inc.php | 4 +- .../discovery/processors/procurve.inc.php | 4 +- includes/discovery/processors/radlan.inc.php | 2 +- includes/discovery/processors/vrp.inc.php | 10 +- .../discovery/processors/watchguard.inc.php | 4 +- includes/discovery/services.inc.php | 2 +- includes/discovery/storage.inc.php | 4 +- includes/discovery/temperatures.inc.php | 2 +- includes/discovery/temperatures/apc.inc.php | 2 +- .../temperatures/cisco-envmon.inc.php | 2 +- .../temperatures/ftos-c-series.inc.php | 2 +- .../temperatures/ftos-e-series.inc.php | 2 +- .../temperatures/ftos-s-series.inc.php | 2 +- .../discovery/temperatures/ipoman.inc.php | 4 +- .../discovery/temperatures/junose.inc.php | 4 +- .../discovery/temperatures/mgeups.inc.php | 4 +- .../temperatures/observernms-custom.inc.php | 4 +- .../discovery/temperatures/rfc1628.inc.php | 2 +- includes/discovery/toner.inc.php | 2 +- includes/discovery/ucd-diskio.inc.php | 10 +- includes/discovery/vlans.inc.php | 14 +- includes/discovery/vlans/cisco-vtp.inc.php | 4 +- includes/discovery/vmware-vminfo.inc.php | 8 +- includes/discovery/voltages.inc.php | 2 +- includes/discovery/voltages/apc.inc.php | 2 +- includes/discovery/voltages/areca.inc.php | 2 +- includes/discovery/voltages/ipoman.inc.php | 4 +- includes/discovery/voltages/linux.inc.php | 2 +- includes/discovery/voltages/mgeups.inc.php | 2 +- includes/discovery/voltages/rfc1628.inc.php | 2 +- .../discovery/voltages/supermicro.inc.php | 2 +- includes/discovery/voltages/xups.inc.php | 2 +- includes/functions.php | 22 +-- includes/include-dir.inc.php | 2 +- includes/polling/applications/apache.inc.php | 2 +- .../polling/applications/mailscanner.inc.php | 2 +- includes/polling/applications/mysql.inc.php | 6 +- includes/polling/applications/nginx.inc.php | 2 +- .../polling/applications/ntp-client.inc.php | 2 +- .../polling/applications/ntpd-server.inc.php | 2 +- .../polling/applications/powerdns.inc.php | 2 +- .../polling/applications/shoutcast.inc.php | 2 +- includes/polling/aruba-controller.inc.php | 2 +- includes/polling/bgp-peers.inc.php | 20 +- includes/polling/cipsec-tunnels.inc.php | 2 +- includes/polling/cisco-cef.inc.php | 6 +- .../polling/cisco-ipsec-flow-monitor.inc.php | 2 +- includes/polling/cisco-mac-accounting.inc.php | 8 +- includes/polling/functions.inc.php | 10 +- includes/polling/hr-mib.inc.php | 2 +- includes/polling/ipSystemStats.inc.php | 4 +- includes/polling/ipmi.inc.php | 2 +- includes/polling/mempools.inc.php | 2 +- includes/polling/mempools/cemp.inc.php | 2 +- includes/polling/mempools/cmp.inc.php | 2 +- includes/polling/mempools/fortigate.inc.php | 4 +- includes/polling/mempools/hrstorage.inc.php | 2 +- .../polling/mempools/ironware-dyn.inc.php | 4 +- includes/polling/mempools/netscaler.inc.php | 4 +- .../polling/mempools/powerconnect-cpu.inc.php | 6 +- includes/polling/mempools/screenos.inc.php | 4 +- includes/polling/netscaler-stats.inc.php | 2 +- includes/polling/netstats-icmp.inc.php | 2 +- includes/polling/netstats-ip.inc.php | 2 +- includes/polling/netstats-snmp.inc.php | 2 +- includes/polling/netstats-tcp.inc.php | 2 +- includes/polling/netstats-udp.inc.php | 4 +- includes/polling/os.inc.php | 4 +- includes/polling/os/allied.inc.php | 2 +- includes/polling/os/arubaos.inc.php | 2 +- includes/polling/os/catos.inc.php | 2 +- includes/polling/os/ftos.inc.php | 6 +- includes/polling/os/procurve.inc.php | 2 +- includes/polling/os/snom.inc.php | 2 +- includes/polling/os/speedtouch.inc.php | 2 +- includes/polling/os/vmware.inc.php | 2 +- includes/polling/os/windows.inc.php | 8 +- includes/polling/ospf.inc.php | 46 ++--- includes/polling/port-adsl.inc.php | 8 +- includes/polling/port-poe.inc.php | 2 +- includes/polling/ports.inc.php | 84 ++++----- includes/polling/processors/ucd-old.inc.php | 2 +- includes/polling/sensors.inc.php | 2 +- includes/polling/storage-hrstorage.inc.php | 2 +- includes/polling/storage.inc.php | 2 +- includes/polling/system.inc.php | 4 +- includes/polling/toner.inc.php | 2 +- includes/polling/ucd-mib.inc.php | 26 +-- includes/polling/unix-agent.inc.php | 12 +- .../polling/unix-agent/munin-plugins.inc.php | 2 +- includes/polling/unix-agent/packages.inc.php | 14 +- includes/polling/wifi.inc.php | 2 +- includes/port-descr-parser.inc.php | 4 +- includes/rrdtool.inc.php | 4 +- includes/snom-graphing.php | 2 +- includes/syslog.php | 4 +- includes/versioncheck.inc.php | 2 +- poller.php | 2 +- scripts/mailscanner.php | 24 +-- scripts/ntp-client.php | 20 +- scripts/ntpd-server.php | 20 +- scripts/powerdns.php | 20 +- scripts/shoutcast.php | 26 +-- scripts/update-sql.php | 2 +- 247 files changed, 716 insertions(+), 716 deletions(-) diff --git a/attic/purgeports.inc.php b/attic/purgeports.inc.php index 170a1c46e..8f2e7c668 100644 --- a/attic/purgeports.inc.php +++ b/attic/purgeports.inc.php @@ -1,6 +1,6 @@ = "5" || $auth) { diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php index 5e12b5e1d..fe438c899 100644 --- a/html/includes/graphs/customer/bits.inc.php +++ b/html/includes/graphs/customer/bits.inc.php @@ -1,6 +1,6 @@ Human translation:> +// Dear Tobias. You write in Perl, this makes me hate you forever. +// This is my translation of Smokeping's graphing. +// Thanks to Bill Fenner for Perl->Human translation:> $scale_min = 0; $scale_rigid = TRUE; @@ -45,7 +45,7 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena $rrd_options .= " CDEF:dm$i=median$i"; # $rrd_options .= " CDEF:dm$i=median$i,0,".$max->{$start}.",LIMIT"; - /// start emulate Smokeping::calc_stddev + // start emulate Smokeping::calc_stddev foreach (range(1, $pings) as $p) { $rrd_options .= " DEF:pin".$i."p".$p."=".$filename.":ping".$p.":AVERAGE"; diff --git a/html/includes/graphs/device/smokeping_all_common_avg.inc.php b/html/includes/graphs/device/smokeping_all_common_avg.inc.php index 857891f1d..12681140a 100644 --- a/html/includes/graphs/device/smokeping_all_common_avg.inc.php +++ b/html/includes/graphs/device/smokeping_all_common_avg.inc.php @@ -1,8 +1,8 @@ Human translation:> +// Dear Tobias. You write in Perl, this makes me hate you forever. +// This is my translation of Smokeping's graphing. +// Thanks to Bill Fenner for Perl->Human translation:> $scale_min = 0; $scale_rigid = TRUE; @@ -22,7 +22,7 @@ if($width > "500") $descr_len = 12 + round(($width - 275) / 8); } -/// FIXME str_pad really needs a "limit to length" so we can rid of all the substrs all over the code to limit the length as below... +// FIXME str_pad really needs a "limit to length" so we can rid of all the substrs all over the code to limit the length as below... if($width > "500") { $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT Loss SDev RTT\:SDev\l'"; @@ -47,7 +47,7 @@ foreach ($smokeping_files[$direction][$device['hostname']] as $source => $filena # $rrd_options .= " CDEF:dm$i=median$i"; # $rrd_options .= " CDEF:dm$i=median$i,0,".$max->{$start}.",LIMIT"; - /// start emulate Smokeping::calc_stddev + // start emulate Smokeping::calc_stddev foreach (range(1, $pings) as $p) { $rrd_options .= " DEF:pin".$i."p".$p."=".$filename.":ping".$p.":AVERAGE"; diff --git a/html/includes/graphs/device/storage.inc.php b/html/includes/graphs/device/storage.inc.php index 35c09085b..211c98cc0 100644 --- a/html/includes/graphs/device/storage.inc.php +++ b/html/includes/graphs/device/storage.inc.php @@ -10,7 +10,7 @@ $rrd_options .= " COMMENT:' Size Used %age\\l'"; foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($device['device_id'])) as $storage) { - /// FIXME generic colour function + // FIXME generic colour function if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; } elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; } elseif ($iter=="7") { $colour="FF0084"; $iter = "0"; } diff --git a/html/includes/graphs/device/toner.inc.php b/html/includes/graphs/device/toner.inc.php index 5913999e1..06029c8b3 100644 --- a/html/includes/graphs/device/toner.inc.php +++ b/html/includes/graphs/device/toner.inc.php @@ -12,7 +12,7 @@ foreach (dbFetchRows("SELECT * FROM toner where device_id = ?", array($device['d if ($colour['left'] == NULL) { - /// FIXME generic colour function + // FIXME generic colour function switch ($iter) { case "1": diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php index 6aa005e9a..861868ab1 100644 --- a/html/includes/graphs/generic_data.inc.php +++ b/html/includes/graphs/generic_data.inc.php @@ -1,7 +1,7 @@ "500") { - $descr_len = 24; /// FIXME may even be more imo? + $descr_len = 24; // FIXME may even be more imo? } else { $descr_len = 12; $descr_len += round(($width - 250) / 8); @@ -62,13 +62,13 @@ foreach ($rrd_list as $i => $rrd) $plusX = ",+"; } - /// Suppress totalling? + // Suppress totalling? if (!$nototal) { $rrd_options .= " VDEF:tot".$rrd['ds'].$i."=".$rrd['ds'].$i.",TOTAL"; } - /// This this not the first entry? + // This this not the first entry? if ($i) { $stack="STACK"; } # if we've been passed a multiplier we must make a CDEF based on it! $g_defname = $rrd['ds']; @@ -79,7 +79,7 @@ foreach ($rrd_list as $i => $rrd) $rrd_options .= " CDEF:" . $g_defname . $i . "min=" . $rrd['ds'] . $i . "min," . $multiplier . ",*"; $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['ds'] . $i . "max," . $multiplier . ",*"; - /// If we've been passed a divider (divisor!) we make a CDEF for it. + // If we've been passed a divider (divisor!) we make a CDEF for it. } elseif (is_numeric($divider)) { $g_defname = $rrd['ds'] . "_cdef"; @@ -88,7 +88,7 @@ foreach ($rrd_list as $i => $rrd) $rrd_options .= " CDEF:" . $g_defname . $i . "max=" . $rrd['ds'] . $i . "max," . $divider . ",/"; } - /// Are our text values related to te multiplier/divisor or not? + // Are our text values related to te multiplier/divisor or not? if (isset($text_orig) && $text_orig) { $t_defname = $rrd['ds']; diff --git a/html/includes/graphs/generic_simplex.inc.php b/html/includes/graphs/generic_simplex.inc.php index b9153ebe2..ed2562faa 100644 --- a/html/includes/graphs/generic_simplex.inc.php +++ b/html/includes/graphs/generic_simplex.inc.php @@ -5,8 +5,8 @@ if($config['old_graphs']) include("includes/graphs/old_generic_simplex.inc.php"); } else { -/// Draw generic bits graph -/// args: ds_in, ds_out, rrd_filename, bg, legend, from, to, width, height, inverse, percentile +// Draw generic bits graph +// args: ds_in, ds_out, rrd_filename, bg, legend, from, to, width, height, inverse, percentile include("includes/graphs/common.inc.php"); diff --git a/html/includes/graphs/global/bits.inc.php b/html/includes/graphs/global/bits.inc.php index 39409f617..862b39e50 100644 --- a/html/includes/graphs/global/bits.inc.php +++ b/html/includes/graphs/global/bits.inc.php @@ -1,6 +1,6 @@ 0) @@ -109,12 +109,12 @@ function graph_error($string) if ($error_msg) { - /// We have an error :( + // We have an error :( graph_error($graph_error); } elseif (!$auth) { - /// We are unauthenticated :( + // We are unauthenticated :( if ($width < 200) { diff --git a/html/includes/graphs/location/bits.inc.php b/html/includes/graphs/location/bits.inc.php index 9f75881f3..99e51c14c 100644 --- a/html/includes/graphs/location/bits.inc.php +++ b/html/includes/graphs/location/bits.inc.php @@ -1,6 +1,6 @@ Human translation:> +// Dear Tobias. You write in Perl, this makes me hate you forever. +// This is my translation of Smokeping's graphing. +// Thanks to Bill Fenner for Perl->Human translation:> $scale_min = 0; $scale_rigid = TRUE; @@ -60,7 +60,7 @@ if($src['hostname'] == $config['own_hostname']) $rrd_options .= " CDEF:dm$i=median$i"; # $rrd_options .= " CDEF:dm$i=median$i,0,".$max->{$start}.",LIMIT"; - /// start emulate Smokeping::calc_stddev + // start emulate Smokeping::calc_stddev foreach (range(1, $pings) as $p) { $rrd_options .= " DEF:pin".$i."p".$p."=".$filename.":ping".$p.":AVERAGE"; diff --git a/html/includes/graphs/smokeping/out.inc.php b/html/includes/graphs/smokeping/out.inc.php index eff92550c..6ebfdc9e0 100644 --- a/html/includes/graphs/smokeping/out.inc.php +++ b/html/includes/graphs/smokeping/out.inc.php @@ -2,9 +2,9 @@ $dest = device_by_id_cache($_GET['dest']); -/// Dear Tobias. You write in Perl, this makes me hate you forever. -/// This is my translation of Smokeping's graphing. -/// Thanks to Bill Fenner for Perl->Human translation:> +// Dear Tobias. You write in Perl, this makes me hate you forever. +// This is my translation of Smokeping's graphing. +// Thanks to Bill Fenner for Perl->Human translation:> $scale_min = 0; $scale_rigid = TRUE; @@ -60,7 +60,7 @@ if($device['hostname'] == $config['own_hostname']) $rrd_options .= " CDEF:dm$i=median$i"; # $rrd_options .= " CDEF:dm$i=median$i,0,".$max->{$start}.",LIMIT"; - /// start emulate Smokeping::calc_stddev + // start emulate Smokeping::calc_stddev foreach (range(1, $pings) as $p) { $rrd_options .= " DEF:pin".$i."p".$p."=".$filename.":ping".$p.":AVERAGE"; diff --git a/html/includes/header.inc.php b/html/includes/header.inc.php index 19561f2d0..0cc5ab024 100644 --- a/html/includes/header.inc.php +++ b/html/includes/header.inc.php @@ -54,5 +54,5 @@ if (isset($_SESSION['authenticated']) && $_SESSION['authenticated']) - + diff --git a/html/includes/print-device-graph.php b/html/includes/print-device-graph.php index c7c8b7b36..aeda550da 100644 --- a/html/includes/print-device-graph.php +++ b/html/includes/print-device-graph.php @@ -3,7 +3,7 @@ if(empty($graph_array['type'])) { $graph_array['type'] = $graph_type; } if(empty($graph_array['device'])) { $graph_array['device'] = $device['device_id']; } -/// FIXME not css alternating yet +// FIXME not css alternating yet if (!is_integer($g_i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } echo('
'); diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index eccdb6a1c..a9792d496 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -144,7 +144,7 @@ if (strpos($port['label'], "oopback") === false && !$graph_type) unset($br); if ($port_details) - { /// Show which other devices are on the same subnet as this interface + { // Show which other devices are on the same subnet as this interface foreach (dbFetchRows("SELECT `ipv4_network_id` FROM `ipv4_addresses` WHERE `port_id` = ? AND `ipv4_address` NOT LIKE '127.%'", array($port['port_id'])) as $net) { $ipv4_network_id = $net['ipv4_network_id']; diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index f6f78d680..5a7e84c6a 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -1,6 +1,6 @@ = '5' && ($routing_count['bgp']+$routing_count['ospf $separator++; } - /// BGP Sessions + // BGP Sessions if ($_SESSION['userlevel'] >= '5' && $routing_count['bgp']) { if ($separator) @@ -474,7 +474,7 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
  • BGP Internal
    • '); } - /// Do Alerts at the bottom + // Do Alerts at the bottom if ($bgp_alerts) { echo(' @@ -511,7 +511,7 @@ if ($packages)
    "); @@ -240,7 +240,7 @@ if ($devel || $vars['devel']) if ($_SESSION['authenticated']) { - /// Authenticated. Print a page. + // Authenticated. Print a page. if (isset($vars['page']) && !strstr("..", $vars['page']) && is_file("pages/" . $vars['page'] . ".inc.php")) { include("pages/" . $vars['page'] . ".inc.php"); @@ -254,7 +254,7 @@ if ($_SESSION['authenticated']) } } else { - /// Not Authenticated. Print login. + // Not Authenticated. Print login. include("pages/logon.inc.php"); exit; diff --git a/html/map.php b/html/map.php index 8ff6c78cc..20f025433 100755 --- a/html/map.php +++ b/html/map.php @@ -47,7 +47,7 @@ if (is_array($config['branding'])) if (isset($_GET['device'])) { $where = "WHERE device_id = ".mres($_GET['device']); } else { $where = ""; } -/// FIXME this shit probably needs tidied up. +// FIXME this shit probably needs tidied up. if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) { @@ -197,7 +197,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) $_GET['format'] = 'png:gd'; } - if ($links > 30) /// Unflatten if there are more than 10 links. beyond that it gets messy + if ($links > 30) // Unflatten if there are more than 10 links. beyond that it gets messy { # $maptool = $config['unflatten'] . ' -f -l 5 | ' . $config['sfdp'] . ' -Gpack -Gcharset=latin1 | '.$config['dot']; $maptool = $config['neato']; @@ -239,7 +239,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) } else { - if ($_SESSION['authenticated']) /// FIXME level 10 only? + if ($_SESSION['authenticated']) // FIXME level 10 only? { echo('
    diff --git a/html/pages/adduser.inc.php b/html/pages/adduser.inc.php index 31f292b8f..64af94aa9 100644 --- a/html/pages/adduser.inc.php +++ b/html/pages/adduser.inc.php @@ -27,7 +27,7 @@ else $_POST['can_modify_passwd'] = 0; } - /// FIXME: missing email field here on the form + // FIXME: missing email field here on the form if (adduser($_POST['new_username'], $_POST['new_password'], $_POST['new_level'], '', $_POST['realname'], $_POST['can_modify_passwd'])) { echo("User " . $_POST['username'] . " added!"); diff --git a/html/pages/bill.inc.php b/html/pages/bill.inc.php index f116755f0..8563518b2 100644 --- a/html/pages/bill.inc.php +++ b/html/pages/bill.inc.php @@ -140,7 +140,7 @@ if (bill_permitted($bill_id)) echo("

    Billed Ports

    "); - /// Collected Earlier + // Collected Earlier foreach ($ports as $port) { echo(generate_port_link($port) . " on " . generate_device_link($port) . "
    "); diff --git a/html/pages/bill/actions.inc.php b/html/pages/bill/actions.inc.php index 0ba4d8f6e..b63038cf3 100644 --- a/html/pages/bill/actions.inc.php +++ b/html/pages/bill/actions.inc.php @@ -31,7 +31,7 @@ if ($_POST['action'] == "reset_bill" && ($_POST['confirm'] == "rrd" || $_POST['c dbDelete('bill_data', '`bill_id` = ?', array($bill_id)); } if ($_POST['confirm'] == "rrd") { - /// Stil todo + // Stil todo } echo("
    Bill Reseting. Redirecting to Bills list.
    "); diff --git a/html/pages/bill/edit.inc.php b/html/pages/bill/edit.inc.php index 3a8f6d99e..1e60a8ac7 100644 --- a/html/pages/bill/edit.inc.php +++ b/html/pages/bill/edit.inc.php @@ -2,9 +2,9 @@ include("includes/javascript-interfacepicker.inc.php"); -/// This needs more verification. Is it already added? Does it exist? +// This needs more verification. Is it already added? Does it exist? -/// Calculation to extract MB/GB/TB of Kbps/Mbps/Gbps +// Calculation to extract MB/GB/TB of Kbps/Mbps/Gbps $base = $config["billing"]["base"]; diff --git a/html/pages/bill/history.inc.php b/html/pages/bill/history.inc.php index c3c82180a..4b3e151aa 100644 --- a/html/pages/bill/history.inc.php +++ b/html/pages/bill/history.inc.php @@ -125,7 +125,7 @@ } $i++; - } /// PERMITTED + } // PERMITTED } echo(""); diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php index bf5d9f686..ae54227d9 100644 --- a/html/pages/bills.inc.php +++ b/html/pages/bills.inc.php @@ -258,7 +258,7 @@ for ($x=1;$x<32;$x++) { "); $i++; - } /// PERMITTED + } // PERMITTED } echo(""); } diff --git a/html/pages/bills/pmonth.inc.php b/html/pages/bills/pmonth.inc.php index 573f392cc..7f056fc86 100644 --- a/html/pages/bills/pmonth.inc.php +++ b/html/pages/bills/pmonth.inc.php @@ -69,7 +69,7 @@ "); $i++; - } /// PERMITTED + } // PERMITTED } } echo(""); diff --git a/html/pages/deluser.inc.php b/html/pages/deluser.inc.php index 351691b19..c68f9539d 100644 --- a/html/pages/deluser.inc.php +++ b/html/pages/deluser.inc.php @@ -31,7 +31,7 @@ if ($_SESSION['userlevel'] < '10') { include("includes/error-no-perm.inc.php"); } } - /// FIXME v mysql query should be replaced by authmodule + // FIXME v mysql query should be replaced by authmodule $userlist = dbFetchRows("SELECT * FROM `users`"); foreach ($userlist as $userentry) { diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index d3947acf2..c2dd8df92 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -184,15 +184,15 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) '); } - /// $loadbalancer_tabs is used in device/loadbalancer/ to build the submenu. we do it here to save queries + // $loadbalancer_tabs is used in device/loadbalancer/ to build the submenu. we do it here to save queries - if ($device['os'] == "netscaler") /// Netscaler + if ($device['os'] == "netscaler") // Netscaler { $device_loadbalancer_count['netscaler_vsvr'] = dbFetchCell("SELECT COUNT(*) FROM `netscaler_vservers` WHERE `device_id` = ?", array($device['device_id'])); if ($device_loadbalancer_count['netscaler_vsvr']) { $loadbalancer_tabs[] = 'netscaler_vsvr'; } } - if ($device['os'] == "acsw") /// Cisco ACE + if ($device['os'] == "acsw") // Cisco ACE { $device_loadbalancer_count['loadbalancer_vservers'] = dbFetchCell("SELECT COUNT(*) FROM `loadbalancer_vservers` WHERE `device_id` = ?", array($device['device_id'])); if ($device_loadbalancer_count['loadbalancer_vservers']) { $loadbalancer_tabs[] = 'loadbalancer_vservers'; } @@ -207,7 +207,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) '); } - /// $routing_tabs is used in device/routing/ to build the tabs menu. we built it here to save some queries + // $routing_tabs is used in device/routing/ to build the tabs menu. we built it here to save some queries $device_routing_count['loadbalancer_rservers'] = dbFetchCell("SELECT COUNT(*) FROM `loadbalancer_rservers` WHERE `device_id` = ?", array($device['device_id'])); if ($device_routing_count['loadbalancer_rservers']) { $routing_tabs[] = 'loadbalancer_rservers'; } diff --git a/html/pages/device/alerts.inc.php b/html/pages/device/alerts.inc.php index 3885ae8ea..13c32ef1a 100644 --- a/html/pages/device/alerts.inc.php +++ b/html/pages/device/alerts.inc.php @@ -44,7 +44,7 @@ function get_entity_list($type, $subtype = "*", $device_id = "*", $entry) foreach ($entities_db as $entity_db) { - /// Is this entity marked as deleted? + // Is this entity marked as deleted? if ($entity_db['deleted'] != "1") { $entities[] = $entity_db['id']; @@ -68,7 +68,7 @@ foreach ($glo_conditions as $type => $subtypes) echo(''); echo(''); - /// Get which entities match this checker + // Get which entities match this checker $entities = get_entity_list($type, $subtype, $device['device_id'], $entry['entity']); if (!empty($entities)) diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php index e90409f97..9e4b785bc 100644 --- a/html/pages/device/graphs.inc.php +++ b/html/pages/device/graphs.inc.php @@ -1,7 +1,7 @@ 'device', 'device' => $device['device_id'], diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php index 37adc1213..cf6538965 100644 --- a/html/pages/device/hrdevice.inc.php +++ b/html/pages/device/hrdevice.inc.php @@ -2,7 +2,7 @@ echo(''); -/// FIXME missing heading +// FIXME missing heading foreach (dbFetchRows("SELECT * FROM `hrDevice` WHERE `device_id` = ? ORDER BY `hrDeviceIndex`", array($device['device_id'])) as $hrdevice) { @@ -45,7 +45,7 @@ foreach (dbFetchRows("SELECT * FROM `hrDevice` WHERE `device_id` = ? ORDER BY `h $graph_array['from'] = $config['time']['day']; $graph_array_zoom = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; - /// FIXME click on graph should also link to port, but can't use generate_port_link here... + // FIXME click on graph should also link to port, but can't use generate_port_link here... $mini_graph = overlib_link(generate_port_url($interface), generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); echo(""); diff --git a/html/pages/device/loadbalancer.inc.php b/html/pages/device/loadbalancer.inc.php index 97b339ff7..26e96923c 100644 --- a/html/pages/device/loadbalancer.inc.php +++ b/html/pages/device/loadbalancer.inc.php @@ -4,11 +4,11 @@ $link_array = array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'loadbalancer'); -/// Cisco ACE +// Cisco ACE $type_text['loadbalancer_rservers'] = "Rservers"; $type_text['loadbalancer_vservers'] = "Serverfarms"; -/// Citrix Netscaler +// Citrix Netscaler $type_text['netscaler_vsvr'] = "VServers"; print_optionbar_start(); diff --git a/html/pages/device/munin.inc.php b/html/pages/device/munin.inc.php index 59126dfbd..a061530da 100644 --- a/html/pages/device/munin.inc.php +++ b/html/pages/device/munin.inc.php @@ -1,7 +1,7 @@ 'device', 'device' => $device['device_id'], diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php index caf493beb..896511bc5 100644 --- a/html/pages/device/overview.inc.php +++ b/html/pages/device/overview.inc.php @@ -57,7 +57,7 @@ if ($services['total']) echo(""); } -/// FIXME - split this into overview/syslog.inc.php? +// FIXME - split this into overview/syslog.inc.php? if ($config['enable_syslog']) { $syslog = dbFetchRows("SELECT *, DATE_FORMAT(timestamp, '%Y-%m-%d %T') AS date from syslog WHERE device_id = ? ORDER BY timestamp DESC LIMIT 20", array($device['device_id'])); @@ -76,7 +76,7 @@ echo(""); echo("
    $mini_graph"); -/// Right Pane +// Right Pane include("overview/processors.inc.php"); include("overview/mempools.inc.php"); include("overview/storage.inc.php"); diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php index 4f989040e..7c5cbf15a 100644 --- a/html/pages/device/overview/generic/sensor.inc.php +++ b/html/pages/device/overview/generic/sensor.inc.php @@ -19,9 +19,9 @@ if (count($sensors)) $sensor['sensor_current'] = "NaN"; } - /// FIXME - make this "four graphs in popup" a function/include and "small graph" a function. - /// FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"? - /// FIXME - DUPLICATED IN health/sensors + // FIXME - make this "four graphs in popup" a function/include and "small graph" a function. + // FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"? + // FIXME - DUPLICATED IN health/sensors $graph_colour = str_replace("#", "", $row_colour); diff --git a/html/pages/device/port.inc.php b/html/pages/device/port.inc.php index 1e64312cc..3c0f2e072 100644 --- a/html/pages/device/port.inc.php +++ b/html/pages/device/port.inc.php @@ -67,7 +67,7 @@ $link_array = array('page' => 'device', 'port' => $port['port_id']); $menu_options['graphs'] = 'Graphs'; -$menu_options['realtime'] = 'Real time'; /// FIXME CONDITIONAL +$menu_options['realtime'] = 'Real time'; // FIXME CONDITIONAL $menu_options['arp'] = 'ARP Table'; $menu_options['events'] = 'Eventlog'; @@ -129,8 +129,8 @@ if (dbFetchCell("SELECT count(*) FROM mac_accounting WHERE port_id = '".$port['p if (dbFetchCell("SELECT COUNT(*) FROM juniAtmVp WHERE port_id = '".$port['port_id']."'") > "0" ) { - /// FIXME ATM VPs - /// FIXME URLs BROKEN + // FIXME ATM VPs + // FIXME URLs BROKEN echo(" | ATM VPs : "); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php index fd916e7e6..29b4ad148 100644 --- a/html/pages/device/port/macaccounting.inc.php +++ b/html/pages/device/port/macaccounting.inc.php @@ -1,6 +1,6 @@ "); unset ($seperator); - /// FIXME - 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("
    @@ -96,8 +96,8 @@ if ($vars['view'] == 'minigraphs') global $port_cache, $port_index_cache; $ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `ifIndex` ASC", array($device['device_id'])); - /// As we've dragged the whole database, lets pre-populate our caches :) - /// FIXME - we should probably split the fetching of link/stack/etc into functions and cache them here too to cut down on single row queries. + // As we've dragged the whole database, lets pre-populate our caches :) + // FIXME - we should probably split the fetching of link/stack/etc into functions and cache them here too to cut down on single row queries. foreach ($ports as $port) { $port_cache[$port['port_id']] = $port; diff --git a/html/pages/device/routing.inc.php b/html/pages/device/routing.inc.php index 82d1dbae0..ebd8c62a7 100644 --- a/html/pages/device/routing.inc.php +++ b/html/pages/device/routing.inc.php @@ -7,11 +7,11 @@ $link_array = array('page' => 'device', #$type_text['overview'] = "Overview"; $type_text['ipsec_tunnels'] = "IPSEC Tunnels"; -/// Cisco ACE +// Cisco ACE $type_text['loadbalancer_rservers'] = "Rservers"; $type_text['loadbalancer_vservers'] = "Serverfarms"; -/// Citrix Netscaler +// Citrix Netscaler $type_text['netscaler_vsvr'] = "VServers"; $type_text['bgp'] = "BGP"; diff --git a/html/pages/device/routing/bgp.inc.php b/html/pages/device/routing/bgp.inc.php index af1514149..96a195615 100644 --- a/html/pages/device/routing/bgp.inc.php +++ b/html/pages/device/routing/bgp.inc.php @@ -102,7 +102,7 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? ORDER BY `b } else { - #$peername = gethostbyaddr($peer['bgpPeerIdentifier']); /// FFffuuu DNS /// Cache this in discovery? + #$peername = gethostbyaddr($peer['bgpPeerIdentifier']); // FFffuuu DNS // Cache this in discovery? # if ($peername == $peer['bgpPeerIdentifier']) # { # unset($peername); @@ -121,7 +121,7 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? ORDER BY `b $this_afisafi = $afi.$safi; $peer['afi'] .= $sep . $afi .".".$safi; $sep = "
    "; - $peer['afisafi'][$this_afisafi] = 1; /// Build a list of valid AFI/SAFI for this peer + $peer['afisafi'][$this_afisafi] = 1; // Build a list of valid AFI/SAFI for this peer } unset($sep); @@ -157,7 +157,7 @@ foreach (dbFetchRows("SELECT * FROM `bgpPeers` WHERE `device_id` = ? ORDER BY `b case 'prefixes_ipv6multicast': list(,$afisafi) = explode("_", $vars['view']); if (isset($peer['afisafi'][$afisafi])) { $peer['graph'] = 1; } - /// FIXME no break?? + // FIXME no break?? case 'updates': $graph_array['type'] = "bgp_" . $vars['view']; $graph_array['id'] = $peer['bgpPeer_id']; diff --git a/html/pages/device/routing/ospf.inc.php b/html/pages/device/routing/ospf.inc.php index 042391cad..8b17078e3 100644 --- a/html/pages/device/routing/ospf.inc.php +++ b/html/pages/device/routing/ospf.inc.php @@ -4,7 +4,7 @@ $i_i = "0"; echo(''); -/// Loop Instances +// Loop Instances foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", array($device['device_id'])) as $instance) { @@ -96,11 +96,11 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr echo(''); $i_a++; - } /// End loop areas + } // End loop areas echo(''); - /// Loop Neigbours + // Loop Neigbours $i_n = 1; foreach (dbFetchRows("SELECT * FROM `ospf_nbrs` WHERE `device_id` = ?", array($device['device_id'])) as $nbr) { @@ -141,7 +141,7 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr echo(''); $i_i++; -} /// End loop instances +} // End loop instances echo('
    Router IdDeviceIP AddressStatus
    '); diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php index 1b9d48b7b..20cd8c999 100644 --- a/html/pages/device/showconfig.inc.php +++ b/html/pages/device/showconfig.inc.php @@ -2,7 +2,7 @@ include("includes/geshi/geshi.php"); -/// FIXME svn stuff still using optc etc, won't work, needs updating! +// FIXME svn stuff still using optc etc, won't work, needs updating! if ($_SESSION['userlevel'] >= "7") { diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php index 94e3e50b2..173525d93 100644 --- a/html/pages/devices.inc.php +++ b/html/pages/devices.inc.php @@ -1,6 +1,6 @@ +// These things need to become more generic, and more manageable across different frontpages... rewrite inc :> if ($config['warn']['ifdown']) { @@ -100,7 +100,7 @@ if (filter_var($config['uptime_warning'], FILTER_VALIDATE_FLOAT) !== FALSE && $c if ($config['enable_syslog']) { - /// Open Syslog Div + // Open Syslog Div echo("

    Recent Syslog Messages

    "); @@ -116,11 +116,11 @@ if ($config['enable_syslog']) } echo("
    "); - echo(""); /// Close Syslog Div + echo(""); // Close Syslog Div } else { - /// Open eventlog Div + // Open eventlog Div echo("

    Recent Eventlog Entries

    "); @@ -142,7 +142,7 @@ if ($config['enable_syslog']) } echo(""); - echo("
    "); /// Close Syslog Div + echo(""); // Close Syslog Div } echo(""); diff --git a/html/pages/front/example2.php b/html/pages/front/example2.php index 60fd45adc..df0c6792b 100644 --- a/html/pages/front/example2.php +++ b/html/pages/front/example2.php @@ -106,7 +106,7 @@ echo(" "); -/// this stuff can be customised to show whatever you want.... +// this stuff can be customised to show whatever you want.... if ($_SESSION['userlevel'] >= '5') { @@ -169,7 +169,7 @@ if ($_SESSION['userlevel'] >= '5') } -/// END VOSTRON +// END VOSTRON ?> diff --git a/html/pages/front/globe.php b/html/pages/front/globe.php index 91e94777c..0ecf44333 100644 --- a/html/pages/front/globe.php +++ b/html/pages/front/globe.php @@ -95,7 +95,7 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND I.device_id = D.device_id AND ifOperStatus = 'down' AND ifAdminStatus = 'up' AND D.ignore = '0' AND I.ignore = '0'"); } -/// These things need to become more generic, and more manageable across different frontpages... rewrite inc :> +// These things need to become more generic, and more manageable across different frontpages... rewrite inc :> if ($config['warn']['ifdown']) { @@ -164,7 +164,7 @@ if (filter_var($config['uptime_warning'], FILTER_VALIDATE_FLOAT) !== FALSE && $c if ($config['enable_syslog']) { - /// Open Syslog Div + // Open Syslog Div echo("

    Recent Syslog Messages

    "); @@ -180,11 +180,11 @@ if ($config['enable_syslog']) } echo(""); - echo("
    "); /// Close Syslog Div + echo(""); // Close Syslog Div } else { - /// Open eventlog Div + // Open eventlog Div echo("

    Recent Eventlog Entries

    "); @@ -206,7 +206,7 @@ if ($config['enable_syslog']) } echo(""); - echo("
    "); /// Close Syslog Div + echo(""); // Close Syslog Div } echo(""); diff --git a/html/pages/front/jt.php b/html/pages/front/jt.php index 0ea0cae0a..390235597 100644 --- a/html/pages/front/jt.php +++ b/html/pages/front/jt.php @@ -111,7 +111,7 @@ echo(" "); -/// this stuff can be customised to show whatever you want.... +// this stuff can be customised to show whatever you want.... if ($_SESSION['userlevel'] >= '5') { diff --git a/html/pages/front/traffic.php b/html/pages/front/traffic.php index f420b00e3..d94996ec3 100644 --- a/html/pages/front/traffic.php +++ b/html/pages/front/traffic.php @@ -110,7 +110,7 @@ echo(" "); -/// this stuff can be customised to show whatever you want.... +// this stuff can be customised to show whatever you want.... if ($_SESSION['userlevel'] >= '5') { diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php index a64eec6ef..a75247ead 100644 --- a/html/pages/graphs.inc.php +++ b/html/pages/graphs.inc.php @@ -2,7 +2,7 @@ unset($vars['page']); -/// Setup here +// Setup here if($_SESSION['widescreen']) { @@ -46,7 +46,7 @@ if (!$auth) } # Load our list of available graphtypes for this object - /// FIXME not all of these are going to be valid + // FIXME not all of these are going to be valid if ($handle = opendir($config['install_dir'] . "/html/includes/graphs/".$type."/")) { while (false !== ($file = readdir($handle))) @@ -238,7 +238,7 @@ if (!$auth) echo(generate_link("Hide Legend",$vars, array('page' => "graphs", 'legend' => "no"))); } - /// FIXME : do this properly + // FIXME : do this properly # if ($type == "port" && $subtype == "bits") # { echo(' | '); diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php index 3b38b8e5b..7d9ecca3d 100644 --- a/html/pages/health.inc.php +++ b/html/pages/health.inc.php @@ -10,7 +10,7 @@ if ($used_sensors['current']) $datas[] = 'current'; if ($used_sensors['power']) $datas[] = 'power'; if ($used_sensors['dBm']) $datas[] = 'dBm'; -/// FIXME generalize -> static-config ? +// FIXME generalize -> static-config ? $type_text['overview'] = "Overview"; $type_text['temperature'] = "Temperature"; $type_text['humidity'] = "Humidity"; diff --git a/html/pages/health/processor.inc.php b/html/pages/health/processor.inc.php index 2e76c202e..b3dc935f1 100644 --- a/html/pages/health/processor.inc.php +++ b/html/pages/health/processor.inc.php @@ -18,7 +18,7 @@ foreach (dbFetchRows("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.de { $device = $proc; - /// FIXME should that really be done here? :-) + // FIXME should that really be done here? :-) $text_descr = $proc['processor_descr']; $text_descr = str_replace("Routing Processor", "RP", $text_descr); $text_descr = str_replace("Switching Processor", "SP", $text_descr); diff --git a/html/pages/health/sensors.inc.php b/html/pages/health/sensors.inc.php index 17a04078c..90b7743ba 100644 --- a/html/pages/health/sensors.inc.php +++ b/html/pages/health/sensors.inc.php @@ -1,6 +1,6 @@ = '5') { @@ -39,9 +39,9 @@ foreach (dbFetchRows($sql, $param) as $sensor) if ($sensor['sensor_current'] >= $sensor['sensor_limit']) { $alert = 'alert'; } else { $alert = ""; } } - /// FIXME - make this "four graphs in popup" a function/include and "small graph" a function. - /// FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"? - /// FIXME - DUPLICATED IN device/overview/sensors + // FIXME - make this "four graphs in popup" a function/include and "small graph" a function. + // FIXME - So now we need to clean this up and move it into a function. Isn't it just "print-graphrow"? + // FIXME - DUPLICATED IN device/overview/sensors $graph_colour = str_replace("#", "", $row_colour); diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php index 485dae46d..b3a7f09b0 100644 --- a/html/pages/ports.inc.php +++ b/html/pages/ports.inc.php @@ -2,7 +2,7 @@ $pagetitle[] = "Ports"; -/// Set Defaults here +// Set Defaults here if(!isset($vars['format'])) { $vars['format'] = "list_basic"; } @@ -96,9 +96,9 @@ foreach ($ports as $data)