cleanups

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

html/graph.php

@@ -122,7 +122,13 @@
       $graph = cpugraphHP ($hostname . "/cpu.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
     } elseif($os == "Snom") {
       $graph = callsgraphSNOM ($hostname . "/data.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    } elseif($os == "ScreenOS") {
+      $graph = graph_netscreen_cpu ($hostname . "/data.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    } elseif($os == "Fortigate") {
+      $graph = graph_fortinet_cpu ($hostname . "/data.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
     }
+
+
     break;
   case 'temp':
       $graph = temp_graph ($_GET['id'], $graphfile, $from, $to, $width, $height, $title, $vertical);

html/includes/print-interface.inc

@@ -123,7 +123,7 @@ echo("</td>");
           }
         }
         unset($br);
-      }
+     # }
  
         $sql = "SELECT network_id FROM ip6addr AS A, ip6networks AS N, interfaces AS I
         WHERE A.interface_id = I.interface_id
@@ -137,8 +137,8 @@ echo("</td>");
 
         $sql = "SELECT I.interface_id FROM ip6addr AS A, ip6networks AS N, interfaces AS I, devices AS D
         WHERE A.interface_id = I.interface_id
-        AND A.network = N.cidr
-        AND N.network_id = '".$net['network_id']."' AND D.device_id = I.device_id and D.device_id != '".$device['device_id']."'";
+        AND A.network = N.cidr AND N.network_id = '".$net['network_id']."' AND D.device_id = I.device_id 
+        AND D.device_id != '".$device['device_id']."' AND A.origin != 'linklayer' AND A.origin != 'wellknown'";
 
           $new_query = mysql_query($sql);
           while($new = mysql_fetch_array($new_query)) {
@@ -174,6 +174,8 @@ echo("</td>");
   
      unset($int_links, $int_links_v6, $int_links_v4, $int_links_phys, $br);
 
+     }
+
      echo("</td></tr>");
 
      // If we're showing graphs, generate the graph and print the img tags