r4269 links to swithports allowing the vlan added in page Vlan info

getPortinfoByName: new function to search object's portlist by name
renderVLANInfo: call to formatPortLink added to render links to ports, not only names

diff --git a/ChangeLog b/ChangeLog
index 867e878029647cb958dea60725350ffaebfa1439..441cd28aa2896a638d427666a0f5210f72f4effd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        update: new DB table indexes speeding up IP tree operations
        update: tolerate user-visible newlines in secret.php and local.php
        update: ability to delete a file entity from the Edit tab of the File page
+       update: 802.1q: links to swithports allowing the vlan added in page Vlan info
 0.19.1 2011-02-22
        update: UI: rack lists are now reduced by common tags with object on Rackspace tab (FILTER_RACKLIST_BY_TAGS config var)
        update: 802.1q: If switch has IP interface in some VLAN linked to IP subnet, this VLAN is not pruned from switch's uplink

diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index bf2ebcd1699968a269862d4803fe33caee99e59b..c6afbd3d69b25c8b8d4862ee8b8e7105886db2c1 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -4689,4 +4689,15 @@ function getConfigVar ($varname = '')
        return $configCache[$varname]['varvalue'];
 }
 
+// return portinfo array if object has a port with such name, or NULL
+function getPortinfoByName (&$object, $portname)
+{
+       if (! isset ($object['ports']))
+               amplifyCell ($object);
+       foreach ($object['ports'] as $portinfo)
+               if ($portinfo['name'] == $portname)
+                       return $portinfo;
+       return NULL;
+}
+
 ?>

diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index ee73a3d1b20687395e17af0bd4ece3adb718c4bf..19a799b7343cd81485025d0750e6fe4819cea1f3 100644 (file)
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -8462,10 +8462,18 @@ function renderVLANInfo ($vlan_ck)
                {
                        usort_portlist ($portlist);
                        echo "<tr class=row_${order} valign=top><td>";
-                       renderCell (spotEntity ('object', $switch_id));
+                       $object = spotEntity ('object', $switch_id);
+                       renderCell ($object);
                        echo '</td><td class=tdleft><ul>';
                        foreach ($portlist as $port_name)
-                               echo "<li>${port_name}</li>";
+                       {
+                               echo '<li>';
+                               if ($portinfo = getPortinfoByName ($object, $port_name))
+                                       echo formatPortLink ($object['id'], NULL, $portinfo['id'], $portinfo['name']);
+                               else
+                                       echo $port_name;
+                               echo '</li>';
+                       }
                        echo '</ul></td></tr>';
                        $order = $nextorder[$order];
                }