diff --git a/attic/purgeports.inc.php b/attic/purgeports.inc.php index a7c5b414a..170a1c46e 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 7d958510a..5e12b5e1d 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; 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 501b1c396..857891f1d 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'"; diff --git a/html/includes/graphs/device/storage.inc.php b/html/includes/graphs/device/storage.inc.php index f3c1d1ac5..35c09085b 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 be6736e8e..5913999e1 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_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php index 6d6145f1f..9fd35ac5c 100644 --- a/html/includes/graphs/generic_multi_bits_separated.inc.php +++ b/html/includes/graphs/generic_multi_bits_separated.inc.php @@ -39,7 +39,7 @@ foreach ($rrd_list as $rrd) $descr = rrdtool_escape($rrd['descr'], $descr_len) . " In"; } $descr_out = rrdtool_escape($rrd['descr_out'], $descr_len) . " Out"; - $descr = str_replace("'", "", $descr); # FIXME does this mean ' should be filtered in rrdtool_escape? probably... + $descr = str_replace("'", "", $descr); /// FIXME does this mean ' should be filtered in rrdtool_escape? probably... $descr_out = str_replace("'", "", $descr_out); $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$ds_in.":AVERAGE "; diff --git a/html/includes/graphs/generic_multi_data_separated.inc.php b/html/includes/graphs/generic_multi_data_separated.inc.php index cbc1bbd33..4ed079289 100644 --- a/html/includes/graphs/generic_multi_data_separated.inc.php +++ b/html/includes/graphs/generic_multi_data_separated.inc.php @@ -39,7 +39,7 @@ foreach ($rrd_list as $rrd) $descr = rrdtool_escape($rrd['descr'], $descr_len) . " In"; } $descr_out = rrdtool_escape($rrd['descr_out'], $descr_len) . " Out"; - $descr = str_replace("'", "", $descr); # FIXME does this mean ' should be filtered in rrdtool_escape? probably... + $descr = str_replace("'", "", $descr); /// FIXME does this mean ' should be filtered in rrdtool_escape? probably... $descr_out = str_replace("'", "", $descr_out); $rrd_options .= " DEF:".$in.$i."=".$rrd['filename'].":".$ds_in.":AVERAGE "; diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php index 670a736e9..72ecfeedb 100644 --- a/html/includes/graphs/generic_multi_seperated.inc.php +++ b/html/includes/graphs/generic_multi_seperated.inc.php @@ -7,7 +7,7 @@ $units_descr = substr(str_pad($units_descr, 18),0,18); if($format == "octets" || $format == "bytes") { $units = "Bps"; - $format = "bits"; # FIXME bits? or bytes? + $format = "bits"; /// FIXME bits? or bytes? } else { $units = "bps"; $format = "bits"; diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php index da5fd92da..451ed6895 100644 --- a/html/includes/graphs/generic_multi_simplex_seperated.inc.php +++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php @@ -4,7 +4,7 @@ include("includes/graphs/common.inc.php"); if($width > "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/global/bits.inc.php b/html/includes/graphs/global/bits.inc.php index 29af53f8d..39409f617 100644 --- a/html/includes/graphs/global/bits.inc.php +++ b/html/includes/graphs/global/bits.inc.php @@ -1,6 +1,6 @@ 0) diff --git a/html/includes/graphs/location/bits.inc.php b/html/includes/graphs/location/bits.inc.php index 07f1f2b85..9f75881f3 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; diff --git a/html/includes/graphs/smokeping/out.inc.php b/html/includes/graphs/smokeping/out.inc.php index 2e0bc51bc..eff92550c 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; diff --git a/html/includes/print-device-graph.php b/html/includes/print-device-graph.php index 7d069ee4f..c7c8b7b36 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 b3ff988f2..eccdb6a1c 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 45bf50557..f6f78d680 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 ab0efab15..8ff6c78cc 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 83e46f2af..31f292b8f 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 de39d3422..f116755f0 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 00bd547e2..0ba4d8f6e 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 bd3ded416..3a8f6d99e 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 5880d3a70..c3c82180a 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 d7029c7f5..bf5d9f686 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 c919aadd0..573f392cc 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 d2bf1f8db..351691b19 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 f293c2d85..d3947acf2 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -184,7 +184,7 @@ 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 { @@ -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/graphs.inc.php b/html/pages/device/graphs.inc.php index 17cc8c58c..e90409f97 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 661f76714..37adc1213 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 84ce3010d..97b339ff7 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 1d0498c34..59126dfbd 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 b16739191..caf493beb 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 01456d55b..4f989040e 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 5420ff482..1e64312cc 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 de7f5b746..fd916e7e6 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 8953dab3a..82d1dbae0 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 25227df2b..af1514149 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 05168fd29..042391cad 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) { @@ -40,7 +40,7 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr echo('
    '); echo(''); - ##### Loop Areas + ///# Loop Areas $i_a = 0; foreach (dbFetchRows("SELECT * FROM `ospf_areas` WHERE `device_id` = ?", array($device['device_id'])) as $area) { @@ -61,7 +61,7 @@ foreach (dbFetchRows("SELECT * FROM `ospf_instances` WHERE `device_id` = ?", arr echo('
    Area IdStatusPorts
    '); echo(''); - ##### Loop Ports + ///# Loop Ports $i_p = $i_a + 1; $p_sql = "SELECT * FROM `ospf_ports` AS O, `ports` AS P WHERE O.`ospfIfAdminStat` = 'enabled' AND O.`device_id` = ? AND O.`ospfIfAreaId` = ? AND P.port_id = O.port_id"; foreach (dbFetchRows($p_sql, array($device['device_id'], $area['ospfAreaId'])) as $ospfport) @@ -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('
    PortStatusPort TypePort State
    Router IdDeviceIP AddressStatus
    '); diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php index 3e1310dbd..1b9d48b7b 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 5c2a9c80d..94e3e50b2 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/globe.php b/html/pages/front/globe.php index abf16d810..91e94777c 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/graphs.inc.php b/html/pages/graphs.inc.php index 82e64755f..a64eec6ef 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 2945f88ee..3b38b8e5b 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 4d0a7fcc8..2e76c202e 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 9f004921f..17a04078c 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 04a4d0fe7..485dae46d 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)