diff --git a/addhost.php b/addhost.php index e88dcca6a..c0e929d1d 100755 --- a/addhost.php +++ b/addhost.php @@ -18,10 +18,8 @@ if($argv[1] && $argv[2] && $argv[3]) { if ( isPingable($argv[1])) { if ( mysql_result(mysql_query("SELECT COUNT(*) FROM `devices` WHERE `hostname` = '".mres($host)."'"), 0) == '0' ) { $snmphost = trim(str_replace("\"", "", shell_exec($config['snmpget'] ." -m SNMPv2-MIB -Oqv -$snmpver -c $community $host:$port sysName.0"))); -# var_dump($snmphost); if ($snmphost == $host || $hostshort = $host) { $return = createHost ($host, $community, $snmpver, $port); -# var_dump($return); if($return) { echo($return . "\n"); } else { echo("Adding $host failed\n"); } } else { echo("Given hostname does not match SNMP-read hostname!\n"); } } else { echo("Already got host $host\n"); } diff --git a/html/.htaccess b/html/.htaccess index 3a854028f..6e27e098e 100644 --- a/html/.htaccess +++ b/html/.htaccess @@ -17,6 +17,11 @@ RewriteRule ^devices/(.+)/ ?page=devices&type=$1 RewriteRule ^interfaces/(.+)/ ?page=interfaces&type=$1 +RewriteRule ^vrf/(.+)/(.+)/(.+)/ ?page=vrf&id=$1&opta=$2&optb=$3 +RewriteRule ^vrf/(.+)/(.+)/ ?page=vrf&id=$1&opta=$2 +RewriteRule ^vrf/(.+)/ ?page=vrf&id=$1 + + RewriteRule ^bill/([0-9]+) ?page=bills&bill=$1 RewriteRule ^device/([0-9]+)/([a-z]+)/(.+)/(.+)/ ?page=device&id=$1§ion=$2&opta=$3&optb=$4 @@ -26,5 +31,5 @@ RewriteRule ^device/([0-9]+) ?page=device&id=$1 RewriteRule ^([a-z]+)/$ ?page=$1 -RewriteRule ^([a-z]+)/([a-z]+)/$ ?page=$1&view=$2 +RewriteRule ^([a-z]+)/(.+)/$ ?page=$1&opta=$2 diff --git a/html/includes/device-header.inc b/html/includes/device-header.inc index 8f161c714..d08dc376f 100644 --- a/html/includes/device-header.inc +++ b/html/includes/device-header.inc @@ -11,10 +11,10 @@ $image = getImage($device['device_id']); echo(" -
",errors);
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index fadfc1e9a..e1d059ca4 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -134,10 +134,11 @@ if($config['enable_pseudowires']) { echo("
Customers
L2TP
Transit
Peering
Core
L2TP
Transit
Peering
Peer + Transit
Core| Total Graph for interfaces of type : ".$type." | Total Graph for interfaces of type : ".$_GET['opta']." | "); echo("
| "); $graph_type = "multi_bits"; @@ -23,7 +29,7 @@ if($_GET['type']) { echo(" |