From 0f4a38db4f16a68eeaef368da2707c473ef337d3 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Fri, 13 Aug 2010 20:32:50 +0000
Subject: [PATCH] fix auth for atmvp graphs

git-svn-id: http://www.observium.org/svn/observer/trunk@1683 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/graphs/atmvp/auth.inc.php    | 24 ++++++++++++++++++++++
 html/includes/graphs/atmvp/bits.inc.php    | 14 -------------
 html/includes/graphs/atmvp/cells.inc.php   | 14 -------------
 html/includes/graphs/atmvp/errors.inc.php  | 14 -------------
 html/includes/graphs/atmvp/packets.inc.php | 14 -------------
 5 files changed, 24 insertions(+), 56 deletions(-)
 create mode 100644 html/includes/graphs/atmvp/auth.inc.php

diff --git a/html/includes/graphs/atmvp/auth.inc.php b/html/includes/graphs/atmvp/auth.inc.php
new file mode 100644
index 000000000..bb3cd20f8
--- /dev/null
+++ b/html/includes/graphs/atmvp/auth.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+
+if($_GET['id'] && is_numeric($_GET['id'])) { $atm_vp_id = $_GET['id']; }
+
+$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
+$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
+
+$query = mysql_query($sql);
+$vp = mysql_fetch_array($query);
+
+if(port_permitted($vp['interface_id'])) {
+
+  $port   = $vp;
+  $device = device_by_id_cache($port['device_id']);
+  $title  = generate_device_link($device);
+  $title .= " :: Port  ".generate_port_link($port);
+  $title .= " :: VP ".$vp['vp_id'];
+  $auth = TRUE;
+  $rrd_filename = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
+
+}
+
+?>
diff --git a/html/includes/graphs/atmvp/bits.inc.php b/html/includes/graphs/atmvp/bits.inc.php
index a7f8b6b23..3ad1ca1da 100644
--- a/html/includes/graphs/atmvp/bits.inc.php
+++ b/html/includes/graphs/atmvp/bits.inc.php
@@ -1,19 +1,5 @@
 <?php
 
-if($_GET['id']) { $atm_vp_id = $_GET['id']; }
-
-$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
-$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
-
-$query = mysql_query($sql);
-$vp = mysql_fetch_array($query);
-
-
-$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
-if(is_file($rrd_test)) {
-  $rrd_filename = $rrd_test;
-}
-
 $rra_in = "inpacketoctets";
 $rra_out = "outpacketoctets";
 
diff --git a/html/includes/graphs/atmvp/cells.inc.php b/html/includes/graphs/atmvp/cells.inc.php
index dd119ea41..cb048acb9 100644
--- a/html/includes/graphs/atmvp/cells.inc.php
+++ b/html/includes/graphs/atmvp/cells.inc.php
@@ -1,19 +1,5 @@
 <?php
 
-if($_GET['id']) { $atm_vp_id = $_GET['id']; }
-
-$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
-$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
-
-$query = mysql_query($sql);
-$vp = mysql_fetch_array($query);
-
-
-$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
-if(is_file($rrd_test)) {
-  $rrd_filename = $rrd_test;
-}
-
 $rra_in = "incells";
 $rra_out = "outcells";
 
diff --git a/html/includes/graphs/atmvp/errors.inc.php b/html/includes/graphs/atmvp/errors.inc.php
index 4a66a04ac..14e7d3708 100644
--- a/html/includes/graphs/atmvp/errors.inc.php
+++ b/html/includes/graphs/atmvp/errors.inc.php
@@ -1,19 +1,5 @@
 <?php
 
-if($_GET['id']) { $atm_vp_id = $_GET['id']; }
-
-$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
-$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
-
-$query = mysql_query($sql);
-$vp = mysql_fetch_array($query);
-
-
-$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
-if(is_file($rrd_test)) {
-  $rrd_filename = $rrd_test;
-}
-
 $rra_in = "inpacketerrors";
 $rra_out = "outpacketerrors";
 
diff --git a/html/includes/graphs/atmvp/packets.inc.php b/html/includes/graphs/atmvp/packets.inc.php
index 66774d3c1..4f471ed48 100644
--- a/html/includes/graphs/atmvp/packets.inc.php
+++ b/html/includes/graphs/atmvp/packets.inc.php
@@ -1,19 +1,5 @@
 <?php
 
-if($_GET['id']) { $atm_vp_id = $_GET['id']; }
-
-$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
-$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
-
-$query = mysql_query($sql);
-$vp = mysql_fetch_array($query);
-
-
-$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
-if(is_file($rrd_test)) {
-  $rrd_filename = $rrd_test;
-}
-
 $rra_in = "inpackets";
 $rra_out = "outpackets";