diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index c0c26f5be..20189f67b 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -238,7 +238,7 @@ function generate_if_link($args, $text = NULL)
   $graph_array['height']   = "100";
   $graph_array['width']    = "340";
   $graph_array['from']     = $config['day'];
-  $graph_array['port']     = $args['interface_id'];
+  $graph_array['id']       = $args['interface_id'];
   $content .= generate_graph_tag($graph_array);
   $graph_array['from']     = $config['week'];
   $content .= generate_graph_tag($graph_array);
@@ -261,7 +261,7 @@ function generate_if_link($args, $text = NULL)
 function generate_port_thumbnail($args) 
 {
     if(!$args['bg']) { $args['bg'] = "FFFFF"; }
-    $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&subtype=".$args['graph_subtype']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
+    $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&id=".$args['interface_id']."&from=".$args['from']."&to=".$args['to']."&width=".$args['width']."&height=".$args['height']."&legend=no&bg=".$args['bg']."'>";
     $output = generate_if_link($args, $args['content']);
     echo $output;
 }
diff --git a/html/includes/graphs/port/adsl_attainable.inc.php b/html/includes/graphs/port/adsl_attainable.inc.php
index 370b4fe77..684f3f21c 100644
--- a/html/includes/graphs/port/adsl_attainable.inc.php
+++ b/html/includes/graphs/port/adsl_attainable.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
-#}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
@@ -21,7 +10,6 @@ $rrd_list[1]['filename'] = $rrd_filename;
 $rrd_list[1]['descr'] = "Upstream";
 $rrd_list[1]['rra'] = "AtucCurrAttainableR";
 
-
 $unit_text = "Bits/sec";
 
 $units='';
diff --git a/html/includes/graphs/port/adsl_attenuation.inc.php b/html/includes/graphs/port/adsl_attenuation.inc.php
index 359053442..b9fddb80a 100644
--- a/html/includes/graphs/port/adsl_attenuation.inc.php
+++ b/html/includes/graphs/port/adsl_attenuation.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
-#}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
diff --git a/html/includes/graphs/port/adsl_power.inc.php b/html/includes/graphs/port/adsl_power.inc.php
index a71466411..89756b14e 100644
--- a/html/includes/graphs/port/adsl_power.inc.php
+++ b/html/includes/graphs/port/adsl_power.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
-#}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
diff --git a/html/includes/graphs/port/adsl_snr.inc.php b/html/includes/graphs/port/adsl_snr.inc.php
index 981dbf7cc..f20364e36 100644
--- a/html/includes/graphs/port/adsl_snr.inc.php
+++ b/html/includes/graphs/port/adsl_snr.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
-#}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
diff --git a/html/includes/graphs/port/adsl_speed.inc.php b/html/includes/graphs/port/adsl_speed.inc.php
index c0286fe69..7641825a9 100644
--- a/html/includes/graphs/port/adsl_speed.inc.php
+++ b/html/includes/graphs/port/adsl_speed.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-#if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
-#}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . "-adsl.rrd");
 
 $rrd_list[0]['filename'] = $rrd_filename;
 $rrd_list[0]['descr'] = "Downstream";
diff --git a/html/includes/graphs/port/auth.inc.php b/html/includes/graphs/port/auth.inc.php
index 067225874..3c0751793 100644
--- a/html/includes/graphs/port/auth.inc.php
+++ b/html/includes/graphs/port/auth.inc.php
@@ -1,12 +1,14 @@
 <?
 
-if(is_numeric($id)) {
-  $port = get_port_by_id($id);
+if(is_numeric($_GET['id']) && interfacepermitted($_GET['id'])) {
+  $port = get_port_by_id($_GET['id']);
   $device = device_by_id_cache($port['device_id']);
+
+  $title  = generatedevicelink($device);
+  $title .= " :: Port  ".generateiflink($port);
+
+  $auth = TRUE;
+
 }
 
-$title  = generatedevicelink($device);
-$title .= " :: Port  ".generateiflink($port);
-
-
 ?>
diff --git a/html/includes/graphs/port/bits.inc.php b/html/includes/graphs/port/bits.inc.php
index 9366de267..fc10efceb 100644
--- a/html/includes/graphs/port/bits.inc.php
+++ b/html/includes/graphs/port/bits.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
-}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
 
 $rra_in = "INOCTETS";
 $rra_out = "OUTOCTETS";
diff --git a/html/includes/graphs/port/errors.inc.php b/html/includes/graphs/port/errors.inc.php
index 28fdc8295..fdaeb85c4 100644
--- a/html/includes/graphs/port/errors.inc.php
+++ b/html/includes/graphs/port/errors.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
-}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
 
 $rra_in = "INERRORS";
 $rra_out = "OUTERRORS";
diff --git a/html/includes/graphs/port/etherlike.inc.php b/html/includes/graphs/port/etherlike.inc.php
index 4e61d3b3a..7b7334fbc 100644
--- a/html/includes/graphs/port/etherlike.inc.php
+++ b/html/includes/graphs/port/etherlike.inc.php
@@ -1,9 +1,6 @@
 <?php
 
-## Generate a list of ports and then call the multi_bits grapher to generate from the list
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".mres($_GET['id'])."' AND I.device_id = D.device_id");
-$port = mysql_fetch_array($query);
+## Cycle through dot3stats OIDs and build list of RRAs to pass to multi simplex grapher
 
 $oids = array('dot3StatsAlignmentErrors', 'dot3StatsFCSErrors', 'dot3StatsSingleCollisionFrames', 'dot3StatsMultipleCollisionFrames',
               'dot3StatsSQETestErrors', 'dot3StatsDeferredTransmissions', 'dot3StatsLateCollisions', 'dot3StatsExcessiveCollisions',
@@ -11,20 +8,18 @@ $oids = array('dot3StatsAlignmentErrors', 'dot3StatsFCSErrors', 'dot3StatsSingle
               'dot3StatsSymbolErrors');
 
 $i=0;
-$file = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename("etherlike-" . $port['ifIndex'] . ".rrd");
-if(is_file($file)) {
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("etherlike-" . $port['ifIndex'] . ".rrd");
+if(is_file($rrd_filename)) {
   foreach($oids as $oid){
     $oid = str_replace("dot3Stats", "", $oid);
     $oid_rra = truncate($oid, 19, '');
-    $rrd_list[$i]['filename'] = $file;
+    $rrd_list[$i]['filename'] = $rrd_filename;
     $rrd_list[$i]['descr'] = $oid;
     $rrd_list[$i]['rra'] = $oid_rra;
     $i++;
   }
 } else {echo("file missing: $file");  }
 
-if ($_GET['debug']) { print_r($rrd_list); } 
-
 $colours   = "mixed";
 $nototal   = 1;
 $unit_text = "Errors";
diff --git a/html/includes/graphs/port/nupkts.inc.php b/html/includes/graphs/port/nupkts.inc.php
index 06ac45612..9fd99badd 100644
--- a/html/includes/graphs/port/nupkts.inc.php
+++ b/html/includes/graphs/port/nupkts.inc.php
@@ -1,19 +1,10 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-$port = mysql_fetch_array($query);
-
-if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd")))
+if(is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd")))
 {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
+  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
 
-  $rrd_list[1]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
+  $rrd_list[1]['filename'] = $config['rrd_dir'] . "/" . $device['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
   $rrd_list[1]['descr'] = $int['ifDescr'];
   $rrd_list[1]['rra_in'] = "InBroadcastPkts";
   $rrd_list[1]['rra_out'] = "OutBroadcastPkts";
@@ -21,7 +12,7 @@ if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($po
   $rrd_list[1]['colour_area_in'] = "BB77BB";
   $rrd_list[1]['colour_area_out'] = "FFDD88";
 
-  $rrd_list[4]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
+  $rrd_list[4]['filename'] = $config['rrd_dir'] . "/" . $device['hostname'] . "/ifx-" . safename($port['ifIndex'] . ".rrd");
   $rrd_list[4]['descr'] = $int['ifDescr'];
   $rrd_list[4]['rra_in'] = "InMulticastPkts";
   $rrd_list[4]['rra_out'] = "OutMulticastPkts";
@@ -41,9 +32,9 @@ if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/ifx-" . safename($po
   include ("includes/graphs/generic_multi_seperated.inc.php");
 
 }
-elseif(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) 
+elseif(is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) 
 {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
+  $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
 
   $rra_in = "INNUCASTPKTS";
   $rra_out = "OUTNUCASTPKTS";
diff --git a/html/includes/graphs/port/pagp_bits.inc.php b/html/includes/graphs/port/pagp_bits.inc.php
index 1840a1da7..440eb02b8 100644
--- a/html/includes/graphs/port/pagp_bits.inc.php
+++ b/html/includes/graphs/port/pagp_bits.inc.php
@@ -2,9 +2,7 @@
 
 ## Generate a list of ports and then call the multi_bits grapher to generate from the list
 
-$parent = mysql_fetch_array(mysql_query("SELECT * FROM `ports` WHERE interface_id = '".mres($_GET['port'])."'"));
-
-$query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$parent['device_id']."' AND `pagpGroupIfIndex` = '".$parent['ifIndex']."'");
+$query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$port['device_id']."' AND `pagpGroupIfIndex` = '".$port['ifIndex']."'");
 
 $i=0;
 while($int = mysql_fetch_array($query)) {
diff --git a/html/includes/graphs/port/upkts.inc.php b/html/includes/graphs/port/upkts.inc.php
index ef664f98e..89539ea01 100644
--- a/html/includes/graphs/port/upkts.inc.php
+++ b/html/includes/graphs/port/upkts.inc.php
@@ -1,17 +1,6 @@
 <?php
 
-if($_GET['id']) { $interface = $_GET['id'];
-} elseif($_GET['port']) { $interface = $_GET['port'];
-} elseif($_GET['if']) { $interface = $_GET['if'];
-} elseif($_GET['interface']) { $interface = $_GET['interface']; }
-
-$query = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D WHERE I.interface_id = '".$interface."'
-                      AND I.device_id = D.device_id");
-
-$port = mysql_fetch_array($query);
-if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) {
-  $rrd_filename = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
-}
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($port['ifIndex'] . ".rrd");
 
 $rra_in = "INUCASTPKTS";
 $rra_out = "OUTUCASTPKTS";
diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index 2b29ad3ef..38521ded8 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -57,11 +57,11 @@
 
   if($port_details) {
     $interface['graph_type'] = "port_bits";
-    echo(generateiflink($interface, "<img src='graph.php?type=port_bits&port=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>", $interface['graph_type']));
+    echo(generateiflink($interface, "<img src='graph.php?type=port_bits&id=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>", $interface['graph_type']));
     $interface['graph_type'] = "port_upkts";
-    echo(generateiflink($interface, "<img src='graph.php?type=port_upkts&port=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>",$interface['graph_type']));
+    echo(generateiflink($interface, "<img src='graph.php?type=port_upkts&id=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>",$interface['graph_type']));
     $interface['graph_type'] = "port_errors";
-    echo(generateiflink($interface, "<img src='graph.php?type=port_errors&port=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>",$interface['graph_type']));
+    echo(generateiflink($interface, "<img src='graph.php?type=port_errors&id=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>",$interface['graph_type']));
   }
 
   echo("</td><td width=120>");
diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php
index 18f3e7def..b0a83edda 100644
--- a/html/pages/device/ports.inc.php
+++ b/html/pages/device/ports.inc.php
@@ -42,9 +42,9 @@ if($_GET['optc'] == thumbs) {
     <a href='device/".$device['device_id']."/interface/".$interface['interface_id']."/' onmouseover=\"return overlib('\
     <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$interface['ifDescr']."</div>\
     ".$interface['ifAlias']." \
-    <img src=\'graph.php?type=$graph_type&if=".$interface['interface_id']."&from=".$from."&to=".$now."&width=450&height=150\'>\
+    <img src=\'graph.php?type=$graph_type&id=".$interface['interface_id']."&from=".$from."&to=".$now."&width=450&height=150\'>\
     ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\"  >".
-    "<img src='graph.php?type=$graph_type&if=".$interface['interface_id']."&from=".$from."&to=".$now."&width=180&height=45&legend=no'>
+    "<img src='graph.php?type=$graph_type&id=".$interface['interface_id']."&from=".$from."&to=".$now."&width=180&height=45&legend=no'>
     </a>
     <div style='font-size: 9px;'>".truncate(short_port_descr($interface['ifAlias']), 32, '')."</div>
     </div>");