moar graph cleanups

git-svn-id: http://www.observium.org/svn/observer/trunk@1906 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-17 13:35:25 +00:00
parent e1db733590
commit eb009ce178
50 changed files with 833 additions and 825 deletions

View File

@@ -2,7 +2,7 @@
### Authorises bill viewing and sets $ports as reference to mysql query containing ports for this bill
if(is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted($_GET['id'])))
if (is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted($_GET['id'])))
{
$ports = mysql_query("SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
@@ -10,7 +10,6 @@ if(is_numeric($_GET['id']) && ($config['allow_unauth_graphs'] || bill_permitted(
AND D.device_id = P.device_id");
$auth = TRUE;
}
?>
?>

View File

@@ -2,25 +2,28 @@
## Generate a list of ports and then call the multi_bits grapher to generate from the list
$i=0;
while($port = mysql_fetch_array($ports)) {
if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"))) {
$i = 0;
while ($port = mysql_fetch_array($ports))
{
if (is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd")))
{
$rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
$rrd_list[$i]['descr'] = $port['ifDescr'];
$i++;
}
}
$units='bps';
$total_units='B';
$colours_in='greens';
$multiplier = "8";
$units='bps';
$total_units='B';
$colours_in='greens';
$multiplier = "8";
$colours_out = 'blues';
$nototal = 1;
$rra_in = "INOCTETS";
$rra_out = "OUTOCTETS";
include ("includes/graphs/generic_multi_bits_separated.inc.php");
include("includes/graphs/generic_multi_bits_separated.inc.php");
?>
?>