From dbd337a2d97cb5095ffab04e2ec9cf105d6b5791 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 10 Oct 2011 13:55:04 +0000
Subject: [PATCH] use correct ifname/ifrescr on vlan page, remove base_url from
 interfacepicker

git-svn-id: http://www.observium.org/svn/observer/trunk@2676 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/javascript-interfacepicker.inc.php | 2 +-
 html/includes/print-vlan.inc.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/includes/javascript-interfacepicker.inc.php b/html/includes/javascript-interfacepicker.inc.php
index 61116f5948..9cc33fc4ab 100644
--- a/html/includes/javascript-interfacepicker.inc.php
+++ b/html/includes/javascript-interfacepicker.inc.php
@@ -11,7 +11,7 @@ function getInterfaceList(sel)
                 var index = ajax.length;
                 ajax[index] = new sack();
 
-                ajax[index].requestFile = '<?php echo($config['base_url']); ?>/ajax_listports.php?device_id='+deviceId;    // Specifying which file to get
+                ajax[index].requestFile = 'ajax_listports.php?device_id='+deviceId;    // Specifying which file to get
                 ajax[index].onCompletion = function() { createInterfaces(index) };       // Specify function that will be executed after file has been found
                 ajax[index].runAJAX();          // Execute AJAX function
         }
diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php
index e85f56bb78..a61957584f 100644
--- a/html/includes/print-vlan.inc.php
+++ b/html/includes/print-vlan.inc.php
@@ -26,7 +26,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
   }
   else
   {
-    echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['ifDescr'])));
+    echo($vlan['port_sep'] . generate_port_link($port, makeshortif(ifnamedescr($port))));
     $vlan['port_sep'] = ", ";
   }
 }