we now keep port_descr_type as lowercase, to stop mistakes. fixed multiport graphs (old multi_* are now multiport_*). fix customer page and iftype page

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

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

@@ -2,7 +2,7 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE `ifAlias` LIKE 'Cust: ".mres($_GET['cust'])."%' AND D.device_id = I.device_id");
+$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE `port_descr_type` = 'cust' AND `port_descr_descr` = '".mres($_GET['id'])."' AND D.device_id = I.device_id");
 while($int = mysql_fetch_array($query)) {
   if(is_file($config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd"))) {
     $rrd_filenames[] = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd");

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

@@ -0,0 +1,16 @@
+<?
+
+### FIXME
+
+#if(is_numeric($id)) {
+#  $port = get_port_by_id($id);
+#  $device = device_by_id_cache($port['device_id']);
+#}
+
+#$title  = generatedevicelink($device);
+#$title .= " :: Port  ".generateiflink($port);
+
+$title = "Multi Port :: ";
+
+
+?>

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

@@ -1,11 +1,8 @@
 <?php
 
-if($_GET['port']) { $ports = $_GET['port']; }
-if($_GET['ports']) { $ports = $_GET['ports']; }
-
 
 $i = 1;
-foreach(explode(",", $ports) as $ifid) {
+foreach(explode(",", $id) as $ifid) {
   $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
   $int = mysql_fetch_row($query);
   if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . safename($int[0] . ".rrd"))) {
@@ -22,7 +19,7 @@ $colour_line_out = "000099";
 $colour_area_in = "CDEB8B";
 $colour_area_out = "C3D9FF";
 
-include ("generic_multi_bits.inc.php");
+include ("includes/graphs/generic_multi_bits.inc.php");
 
 
 ?>

html/includes/print-interface.inc.php

@@ -11,6 +11,8 @@
 
   $if_id = $interface['interface_id'];
 
+print_r($interface);
+
   $interface = ifLabel($interface);
 
   if(!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }