r1443 + make all functions use buildVServiceName()

+ introduce dynamic title for VS

diff --git a/inc/functions.php b/inc/functions.php
index 7de922631df8dce40692e21e8f0b8ce7b5815ff4..aac418f6160912c0f4f3c25b74a2b36503a5d9ea 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1056,7 +1056,7 @@ function buildVServiceName ($vsinfo = NULL)
                showError ('NULL argument', __FUNCTION__);
                return NULL;
        }
-       return 'VS ' . $vsinfo['vip'] . ':' . $vsinfo['vport'] . '/' . $vsinfo['proto'];
+       return $vsinfo['vip'] . ':' . $vsinfo['vport'] . '/' . $vsinfo['proto'];
 }
 
 ?>

diff --git a/inc/interface.php b/inc/interface.php
index 15eba52287d254d3a85df72c617169f31af3f525..4ee5b9aeff59f2882c83557536a062c561b20c4d 100644 (file)
--- a/inc/interface.php
+++ b/inc/interface.php
@@ -1662,7 +1662,7 @@ function renderAddressspace ()
                foreach ($summary as $vsid => $vsdata)
                {
                        echo "<tr><td class=tdleft><a href='$root?page=vservice&tab=default&id=${vsid}'>";
-                       echo $vsdata['vip'] . ':' . $vsdata['vport'] . '/' . $vsdata['proto'] . '</a></td>';
+                       echo buildVServiceName ($vsdata);
                        echo "<td>${vsdata['name']}</td>";
                        foreach ($lblist as $lb_object_id)
                                echo '<td>' . (isset ($vsdata['rspools'][$lb_object_id]) ? $vsdata['rspools'][$lb_object_id] : '&nbsp;') . '</td>';

diff --git a/inc/navigation.php b/inc/navigation.php
index e05e0af3264c80e9c79691e21ae7c62c4ae4f152..fbf76f9a71ad432bc90d317a6efc31e3aa4292a7 100644 (file)
--- a/inc/navigation.php
+++ b/inc/navigation.php
@@ -151,7 +151,7 @@ $ophandler['ipaddress']['assignment']['delIpAssignment'] = 'delIpAssignment';
 $ophandler['ipaddress']['assignment']['editBondForAddress'] = 'editIpAssignment';
 $ophandler['ipaddress']['assignment']['bindObjectToIp'] = 'addIpAssignment';
 
-$page['vservice']['title'] = 'static_title';
+$page['vservice']['title'] = 'dynamic_title_vservice';
 $page['vservice']['parent'] = 'ipv4space';
 $page['vservice']['bypass'] = 'id';
 $page['vservice']['bypass_type'] = 'uint';

diff --git a/inc/pagetitles.php b/inc/pagetitles.php
index 7accd42adb8d97cc83a4af3d27e1fb215c387cd5..d48ce646f4a73fd97b83df9e6a45291d1a0bf461 100644 (file)
--- a/inc/pagetitles.php
+++ b/inc/pagetitles.php
@@ -91,6 +91,23 @@ function dynamic_title_object ()
        return $ret;
 }
 
+function dynamic_title_vservice ()
+{
+       global $pageno;
+       $ret = array();
+       switch ($pageno)
+       {
+               case 'vservice':
+                       assertUIntArg ('id');
+                       $ret['name'] = buildVServiceName (getVServiceInfo ($_REQUEST['id']));
+                       $ret['params']['id'] = $_REQUEST['id'];
+                       break;
+               default:
+                       return NULL;
+       }
+       return $ret;
+}
+
 function dynamic_title_search ()
 {
        if (isset ($_REQUEST['q']))
@@ -184,9 +201,6 @@ function static_title ($pageno)
                case 'help':
                        $ret['name'] = 'Help';
                        break;
-               case 'vservice':
-                       $ret['name'] = 'Virtual service';
-                       break;
                default:
                        $ret['name'] = 'UNKNOWN';
                        break;