From fb3befd29da265fc510bf6d3f7a8554bdc12e83c Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 2 Aug 2010 16:38:03 +0000
Subject: [PATCH] fix broken graphs with disabled short tags

git-svn-id: http://www.observium.org/svn/observer/trunk@1613 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/application/auth.inc.php |  2 +-
 html/includes/graphs/customer/auth.inc.php    |  2 +-
 html/includes/graphs/device/auth.inc.php      |  2 +-
 html/includes/graphs/graph.inc.php            | 47 +++++++++----------
 html/includes/graphs/mempool/auth.inc.php     |  6 +--
 html/includes/graphs/multiport/auth.inc.php   |  2 +-
 html/includes/graphs/port/auth.inc.php        |  2 +-
 html/includes/graphs/processor/auth.inc.php   |  2 +-
 html/includes/graphs/storage/auth.inc.php     |  2 +-
 9 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/html/includes/graphs/application/auth.inc.php b/html/includes/graphs/application/auth.inc.php
index d73038bb6e..c8a5701dfb 100644
--- a/html/includes/graphs/application/auth.inc.php
+++ b/html/includes/graphs/application/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(is_numeric($id) && application_permitted($id))
 {
diff --git a/html/includes/graphs/customer/auth.inc.php b/html/includes/graphs/customer/auth.inc.php
index 921d689bb5..54c76e8367 100755
--- a/html/includes/graphs/customer/auth.inc.php
+++ b/html/includes/graphs/customer/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if ($_SESSION['userlevel'] >= "5") 
 {
diff --git a/html/includes/graphs/device/auth.inc.php b/html/includes/graphs/device/auth.inc.php
index 8fdbe9994e..7487d44a44 100644
--- a/html/includes/graphs/device/auth.inc.php
+++ b/html/includes/graphs/device/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(is_numeric($id) && device_permitted($id)) 
 {
diff --git a/html/includes/graphs/graph.inc.php b/html/includes/graphs/graph.inc.php
index 5565c9c9f1..e325037a60 100644
--- a/html/includes/graphs/graph.inc.php
+++ b/html/includes/graphs/graph.inc.php
@@ -21,8 +21,18 @@ if($_GET['debug']) {
   include("includes/functions.inc.php");
   include("includes/authenticate.inc.php");
 
-  if(!$config['allow_unauth_graphs']) {
-    if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; }
+  $from     = mres($_GET['from']);
+  $to       = mres($_GET['to']);
+  $width    = mres($_GET['width']);
+  $height   = mres($_GET['height']);
+  $title    = mres($_GET['title']);
+  $vertical = mres($_GET['vertical']);
+  $legend   = mres($_GET['legend']);
+  $id       = mres($_GET['id']);
+
+  if(!$config['allow_unauth_graphs']) 
+  {
+    if(!$_SESSION['authenticated']) { graph_error("Not authenticated"); exit; }
   }
   
 #  if($_GET['device']) {
@@ -43,15 +53,6 @@ if($_GET['debug']) {
 
   if($debug) {print_r($graphtype);}
 
-  $from     = mres($_GET['from']);
-  $to       = mres($_GET['to']);
-  $width    = mres($_GET['width']);
-  $height   = mres($_GET['height']);
-  $title    = mres($_GET['title']);
-  $vertical = mres($_GET['vertical']);
-  $legend   = mres($_GET['legend']);
-  $id       = mres($_GET['id']);
-
   $graphfile = $config['temp_dir'] . "/"  . strgen() . ".png";
 
 #  $os = gethostosbyid($device_id);
@@ -76,15 +77,17 @@ if(is_file($config['install_dir'] . "/html/includes/graphs/$type/$subtype.inc.ph
   graph_error("Graph Template Missing");
 }
 
-function graph_error ($string) {
-        global $width, $height;
-        header('Content-type: image/png');
-        $im     = imagecreate($width+79, $height);
-        $orange = imagecolorallocate($im, 255, 225, 225);
-        $px     = (imagesx($im) - 7.5 * strlen($string)) / 2;
-        imagestring($im, 3, $px, $height / 2 - 8, $string, imagecolorallocate($im, 128, 0, 0));
-        imagepng($im);
-        imagedestroy($im);
+function graph_error ($string) 
+{
+  global $width, $height;
+  header('Content-type: image/png');
+  $im     = imagecreate($width+79, $height);
+  $orange = imagecolorallocate($im, 255, 225, 225);
+  $px     = (imagesx($im) - 7.5 * strlen($string)) / 2;
+  imagestring($im, 3, $px, $height / 2 - 8, $string, imagecolorallocate($im, 128, 0, 0));
+  imagepng($im);
+  imagedestroy($im);
+  exit();
 }
 
 
@@ -102,9 +105,6 @@ if(!$auth)
       $rrd_cmd = $config['rrdtool'] . " graph $graphfile $rrd_options" . $rrd_switches;
       $woo = shell_exec($rrd_cmd);
       if($_GET['debug']) { echo("<pre>".$rrd_cmd."</pre>"); }    
-#      $thing = popen($config['rrdtool'] . " -",'w');
-#      fputs($thing, "graph $graphfile $rrd_options");
-#      pclose($thing);
       if(is_file($graphfile)) {
         header('Content-type: image/png');
         $fd = fopen($graphfile,'r');fpassthru($fd);fclose($fd);
@@ -118,5 +118,4 @@ if(!$auth)
   }
 }
 
-
 ?>
diff --git a/html/includes/graphs/mempool/auth.inc.php b/html/includes/graphs/mempool/auth.inc.php
index 3a8b7614cd..7b19754183 100755
--- a/html/includes/graphs/mempool/auth.inc.php
+++ b/html/includes/graphs/mempool/auth.inc.php
@@ -1,8 +1,8 @@
-<?
+<?php
 
-if(is_numeric($_GET['id']))
+if(is_numeric($id))
 {
-  $sql = mysql_query("SELECT * FROM `mempools` AS C, `devices` AS D where C.`mempool_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id");
+  $sql = mysql_query("SELECT * FROM `mempools` AS C, `devices` AS D where C.`mempool_id` = '".mres($id)."' AND C.device_id = D.device_id");
   $mempool = mysql_fetch_assoc($sql);
 
   if(is_numeric($mempool['device_id']) && device_permitted($mempool['device_id']))   
diff --git a/html/includes/graphs/multiport/auth.inc.php b/html/includes/graphs/multiport/auth.inc.php
index 7a79bf4245..8d62f590a7 100644
--- a/html/includes/graphs/multiport/auth.inc.php
+++ b/html/includes/graphs/multiport/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ### FIXME
 
diff --git a/html/includes/graphs/port/auth.inc.php b/html/includes/graphs/port/auth.inc.php
index 13f2210322..002feb7d0e 100644
--- a/html/includes/graphs/port/auth.inc.php
+++ b/html/includes/graphs/port/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(is_numeric($id) && port_permitted($id)) {
   $port   = get_port_by_id($id);
diff --git a/html/includes/graphs/processor/auth.inc.php b/html/includes/graphs/processor/auth.inc.php
index 0e9df72f15..98363488be 100755
--- a/html/includes/graphs/processor/auth.inc.php
+++ b/html/includes/graphs/processor/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $sql = mysql_query("SELECT * FROM `processors` where `processor_id` = '".mres($_GET['id'])."'");
 $proc = mysql_fetch_assoc($sql);
diff --git a/html/includes/graphs/storage/auth.inc.php b/html/includes/graphs/storage/auth.inc.php
index 2fd8f9a54a..0343201a41 100755
--- a/html/includes/graphs/storage/auth.inc.php
+++ b/html/includes/graphs/storage/auth.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 if(is_numeric($id))
 {