From 3133a5b2fd9b41b494f9d76fd8aafcc84e656b43 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 2 Dec 2010 18:12:50 +0000 Subject: [PATCH] fix graphs after r1750, sigh git-svn-id: http://www.observium.org/svn/observer/trunk@1754 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/graphs/graph.inc.php | 10 +++++----- html/includes/graphs/sensor/auth.inc.php | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php index a5dfc51e7..511691fb5 100644 --- a/html/includes/graphs/graph.inc.php +++ b/html/includes/graphs/graph.inc.php @@ -64,10 +64,9 @@ if (is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.p } } } - if (!$auth) - { - include($config['install_dir'] . "/html/includes/graphs/$type/auth.inc.php"); - } + + include($config['install_dir'] . "/html/includes/graphs/$type/auth.inc.php"); + if ($auth) { include($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.php"); @@ -117,7 +116,8 @@ if (!$auth) $rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches; $woo = shell_exec($rrd_cmd); if ($_GET['debug']) { echo("
".$rrd_cmd."
"); } - if (is_file($graphfile)) { + if (is_file($graphfile)) + { header('Content-type: image/png'); $fd = fopen($graphfile,'r');fpassthru($fd);fclose($fd); unlink($graphfile); diff --git a/html/includes/graphs/sensor/auth.inc.php b/html/includes/graphs/sensor/auth.inc.php index dd00f4e7b..5d4de6631 100644 --- a/html/includes/graphs/sensor/auth.inc.php +++ b/html/includes/graphs/sensor/auth.inc.php @@ -17,7 +17,4 @@ if(is_numeric($id)) } } - - - ?>