From 6799108af8795da7940cb04c4113097032d18d70 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 19 Sep 2011 13:48:46 +0000 Subject: [PATCH] fix iftype and customer bits git-svn-id: http://www.observium.org/svn/observer/trunk@2512 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/customer/bits.inc.php | 28 +++++++++++------ .../generic_multi_bits_separated.inc.php | 3 ++ html/includes/print-menubar.php | 10 +++--- html/pages/iftype.inc.php | 31 +++++++++---------- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/html/includes/graphs/customer/bits.inc.php b/html/includes/graphs/customer/bits.inc.php index 0869dcba2c..4f51bc21c4 100644 --- a/html/includes/graphs/customer/bits.inc.php +++ b/html/includes/graphs/customer/bits.inc.php @@ -1,23 +1,31 @@ diff --git a/html/includes/graphs/generic_multi_bits_separated.inc.php b/html/includes/graphs/generic_multi_bits_separated.inc.php index d6efbd7556..1cabbc4624 100644 --- a/html/includes/graphs/generic_multi_bits_separated.inc.php +++ b/html/includes/graphs/generic_multi_bits_separated.inc.php @@ -55,6 +55,9 @@ foreach ($rrd_list as $rrd) $i++; $iter++; } + + + if ($custom_graph) { $rrd_options .= $custom_graph; } $rrd_options .= $rrd_optionsb; diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 51b392a854..67c427c666 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -262,11 +262,11 @@ if ($_SESSION['userlevel'] >= '5') { echo('
    • '); if ($config['int_customers']) { echo('
  • Customers
    • '); $ifbreak = 1; } - if ($config['int_l2tp']) { echo('
  • L2TP
    • '); $ifbreak = 1; } - if ($config['int_transit']) { echo('
  • Transit
    • '); $ifbreak = 1; } - if ($config['int_peering']) { echo('
  • Peering
    • '); $ifbreak = 1; } - if ($config['int_peering'] && $config['int_transit']) { echo('
  • Peering + Transit
    • '); $ifbreak = 1; } - if ($config['int_core']) { echo('
  • Core
    • '); $ifbreak = 1; } + if ($config['int_l2tp']) { echo('
  • L2TP
    • '); $ifbreak = 1; } + if ($config['int_transit']) { echo('
  • Transit
    • '); $ifbreak = 1; } + if ($config['int_peering']) { echo('
  • Peering
    • '); $ifbreak = 1; } + if ($config['int_peering'] && $config['int_transit']) { echo('
  • Peering + Transit
    • '); $ifbreak = 1; } + if ($config['int_core']) { echo('
  • Core
    • '); $ifbreak = 1; } } if ($ifbreak) { echo('
    • '); } diff --git a/html/pages/iftype.inc.php b/html/pages/iftype.inc.php index 62c3b0ecce..6f8e43c282 100644 --- a/html/pages/iftype.inc.php +++ b/html/pages/iftype.inc.php @@ -5,7 +5,7 @@ if ($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg = "#ffffff"; } $type_where = " ("; -foreach (explode(",", $_GET['opta']) as $type) +foreach (explode(",", $vars['type']) as $type) { $type_where .= " $or `port_descr_type` = ?"; $or = "OR"; @@ -15,15 +15,14 @@ foreach (explode(",", $_GET['opta']) as $type) $type_where .= ") "; $ports = dbFetchRows("SELECT * FROM `ports` as I, `devices` AS D WHERE $type_where AND I.device_id = D.device_id ORDER BY I.ifAlias", $type_param); - -foreach ($ports as $interface) +foreach ($ports as $port) { - $if_list .= $seperator . $interface['interface_id']; + $if_list .= $seperator . $port['interface_id']; $seperator = ","; } unset($seperator); -$types_array = explode(',',$_GET['opta']); +$types_array = explode(',',$vars['type']); for ($i = 0; $i < count($types_array);$i++) $types_array[$i] = ucfirst($types_array[$i]); $types = implode(' + ',$types_array); @@ -33,31 +32,31 @@ echo(" if ($if_list) { echo(""); - $graph_type = "multiport_bits"; - $interface['interface_id'] = $if_list; + $graph_type = "multiport_bits_separate"; + $port['interface_id'] = $if_list; include("includes/print-interface-graphs.inc.php"); echo(""); - foreach ($ports as $interface) + foreach ($ports as $port) { $done = "yes"; unset($class); - $interface['ifAlias'] = str_ireplace($type . ": ", "", $interface['ifAlias']); - $interface['ifAlias'] = str_ireplace("[PNI]", "Private", $interface['ifAlias']); - $ifclass = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']); + $port['ifAlias'] = str_ireplace($type . ": ", "", $port['ifAlias']); + $port['ifAlias'] = str_ireplace("[PNI]", "Private", $port['ifAlias']); + $ifclass = ifclass($port['ifOperStatus'], $port['ifAdminStatus']); if ($bg == "#ffffff") { $bg = "#e5e5e5"; } else { $bg = "#ffffff"; } echo(" - " . generate_port_link($interface,$interface['port_descr_descr']) . "
    - ".generate_device_link($interface)." ".generate_port_link($interface)." "); + " . generate_port_link($port,$port['port_descr_descr']) . "
    + ".generate_device_link($port)." ".generate_port_link($port)." "); - if (dbFetchCell("SELECT count(*) FROM mac_accounting WHERE interface_id = ?", array($interface['interface_id']))) + if (dbFetchCell("SELECT count(*) FROM mac_accounting WHERE interface_id = ?", array($port['interface_id']))) { - echo(" MAC Accounting"); + echo(" MAC Accounting"); } echo(""); - if (file_exists($config['rrd_dir'] . "/" . $interface['hostname'] . "/port-" . $interface['ifIndex'] . ".rrd")) + if (file_exists($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . $port['ifIndex'] . ".rrd")) { $graph_type = "port_bits"; include("includes/print-interface-graphs.inc.php");