r4276 formatPortLink: moved from interfaces.php to functions.php

moved because this function is needed in ophandlers sometimes to format error/success messages

diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index 7eb0e6b17d34a06baff6dd9ed00b305aa7ba3c39..57987a82e1ab600762bb805b8d24ab70adcd69a9 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -4107,6 +4107,29 @@ function formatPortIIFOIF ($port)
        return $ret;
 }
 
+// returns '<a...</a>' html string containing a link to specified port or object.
+// link title is "hostname portname" if both parts are defined
+function formatPortLink($host_id, $hostname, $port_id, $portname, $a_class = '')
+{
+       $href = 'index.php?page=object&object_id=' . urlencode($host_id);
+       $additional = '';
+       if (isset ($port_id))
+       {
+               $href .= '&hl_port_id=' . urlencode($port_id);
+               $additional = "name=\"port-$port_id\"";
+       }
+       if (! empty($a_class))
+               $additional .= (empty($additional) ? '' : ' '). "class='$a_class'";
+       
+       $text_items = array();
+       if (isset ($hostname))
+               $text_items[] = $hostname;
+       if (isset ($portname))
+               $text_items[] = $portname;
+               
+       return "<a $additional href=\"$href\">" . implode(' ', $text_items) . '</a>';
+}
+
 function compareDecomposedPortNames ($porta, $portb)
 {
        if (0 != $cmp = strcmp ($porta['prefix'], $portb['prefix']))

diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index 1dadf093f5918976d7bfd063ba86b45173256f1c..4b2a9a26423c007f04cb1cc30f8ea602e19d8b9b 100644 (file)
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -9044,29 +9044,6 @@ function renderDeployQueue()
        echo '</table>';
 }
 
-// returns '<a...</a>' html string containing a link to specified port or object.
-// link title is "hostname portname" if both parts are defined
-function formatPortLink($host_id, $hostname, $port_id, $portname, $a_class = '')
-{
-       $href = 'index.php?page=object&object_id=' . urlencode($host_id);
-       $additional = '';
-       if (isset ($port_id))
-       {
-               $href .= '&hl_port_id=' . urlencode($port_id);
-               $additional = "name=\"port-$port_id\"";
-       }
-       if (! empty($a_class))
-               $additional .= (empty($additional) ? '' : ' '). "class='$a_class'";
-       
-       $text_items = array();
-       if (isset ($hostname))
-               $text_items[] = $hostname;
-       if (isset ($portname))
-               $text_items[] = $portname;
-               
-       return "<a $additional href=\"$href\">" . implode(' ', $text_items) . '</a>';
-}
-
 function renderDiscoveredNeighbors ($object_id)
 {
        global $tabno;