diff --git a/html/css/styles.css b/html/css/styles.css
index 86cee87992..eb049d79fa 100644
--- a/html/css/styles.css
+++ b/html/css/styles.css
@@ -483,9 +483,8 @@ p.vspace { padding-top: 3px; padding-bottom: 3px; }
#content { margin: 0px; text-align: left; padding: 0px; }
#footer {
+ text-align: center;
width: 100%; height: 40px;
- border: 1px none #ccc;
- margin: 0px 0px 0px 0px; padding: 0px 0px 8px 0px;
}
#copyright { margin: 0px 12px 0px 11px; padding: 2px 0px; border-top: 1px solid #ddd; font-size: 8pt; }
diff --git a/html/includes/topnav.inc b/html/includes/topnav.inc
index 4d2a7aacc6..a7e9607378 100644
--- a/html/includes/topnav.inc
+++ b/html/includes/topnav.inc
@@ -42,46 +42,48 @@ $services['disabled'] = mysql_result(mysql_query("SELECT count(service_id) FROM
}
-if($devices['down']) { $devices['bgcolour'] = "#ffcccc"; } else { $devices['bgcolour'] = ""; }
+if($devices['down']) { $devices['bgcolour'] = "#ffcccc"; } else { $devices['bgcolour'] = "transparent"; }
if($interfaces['down']) { $interfaces['bgcolour'] = "#ffcccc"; } else { $interfaces['bgcolour'] = "#e5e5e5"; }
-if($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['bgcolour'] = ""; }
+if($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['bgcolour'] = "transparent"; }
?>
- |
- Devices :
- |
- | (
- | up
- | down
- | ignored
- | disabled
- | )
- | |
-
- | Interfaces :
- |
- | (
- | up
- | down
- | ignored
- | shutdown
- | )
- | |
-
- | Services :
- |
- | (
- | up
- | down
- | ignored
- | disabled
- | )
- | |
-
-
+
+ |
+ Devices : |
+ |
+ ( |
+ up |
+ down |
+ ignored |
+ disabled |
+ ) |
+ |
+
+
+ | Interfaces : |
+ |
+ ( |
+ up |
+ down |
+ ignored |
+ shutdown |
+ ) |
+ |
+
+
+ |
+ Services : |
+ |
+ ( |
+ up |
+ down |
+ ignored |
+ disabled |
+ ) |
+ |
diff --git a/html/index.php b/html/index.php
index 7f823d674c..e715558638 100755
--- a/html/index.php
+++ b/html/index.php
@@ -141,9 +141,9 @@ function popUp(URL) {
Generated in ' . $gentime . ' seconds
+ echo('
');
?>
diff --git a/html/pages/front/default.php b/html/pages/front/default.php
index eb64957291..98f39304a5 100644
--- a/html/pages/front/default.php
+++ b/html/pages/front/default.php
@@ -48,7 +48,7 @@ while($interface = mysql_fetch_array($sql)){
Port Down
".generateiflink($interface, truncate(makeshortif($interface['label']),13,''))."
- ".truncate($interface['ifAlias'], 20, '')."
+ " . ($interface['ifAlias'] ? ''.truncate($interface['ifAlias'], 20, '').'' : '') . "
");
}
diff --git a/includes/functions.php b/includes/functions.php
index 78a3b5a4d0..0d9c2f97db 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -289,13 +289,13 @@ function generateiflink($interface, $text=0,$type)
if($type) { $interface['graph_type'] = $type; }
if(!$interface['graph_type']) { $interface['graph_type'] = 'port_bits'; }
$class = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']);
- $graph_url = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&from=$day&to=$now&width=400&height=100&type=" . $interface['graph_type'];
- $graph_url_month = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&from=$month&to=$now&width=400&height=100&type=" . $interface['graph_type'];
+ $graph_url = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&from=$day&to=$now&width=400&height=100&type=" . $interface['graph_type'];
+ $graph_url_month = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&from=$month&to=$now&width=400&height=100&type=" . $interface['graph_type'];
$device_id = getifhost($interface['interface_id']);
$link = "";
- if($interface['ifAlias']) { $link .= "
" . $interface['ifAlias']; }
+ if($interface['ifAlias']) { $link .= "
" . htmlentities($interface['ifAlias']); }
$link .= "' ";
$link .= $config['overlib_defaults'].");\" onmouseout=\"return nd();\" >$text";
@@ -309,18 +309,18 @@ function generatedevicelink($device, $text=0, $start=0, $end=0)
if(!$end) { $end = $now; }
$class = devclass($device);
if(!$text) { $text = $device['hostname']; }
- $graph_url = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&from=$start&to=$end&width=400&height=120&type=device_cpu";
- $graph_url_b = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&from=$start&to=$end&width=400&height=120&type=device_memory";
+ $graph_url = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&from=$start&to=$end&width=400&height=120&type=device_cpu";
+ $graph_url_b = $config['base_url'] . "/graph.php?device=" . $device['device_id'] . "&from=$start&to=$end&width=400&height=120&type=device_memory";
$link = "".$device['hostname']." - CPU & Memory Usage";
- $link .= "
'".$config['overlib_defaults'].", LEFT);\" onmouseout=\"return nd();\">$text";
+ $link .= "onmouseover=\"return overlib('".$device['hostname']." - CPU & Memory Usage
";
+ $link .= "
'".$config['overlib_defaults'].", LEFT);\" onmouseout=\"return nd();\">" . htmlentities($text) . "";
return $link;
}
function device_traffic_image($device, $width, $height, $from, $to)
{
- return "![](graph.php?device=" . $device . "&type=device_bits&from=" . $from . "&to=" . $to . "&width=" . $width . "&height=" . $height . "&legend=no)
";
+ return "";
}
function devclass($device)