r4209 remove VIRTUAL_OBJ_LISTSRC config option, replace with an array defined in...

diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index b37302603e6af1a6aae4ba83def89916f0a98107..8d8f31eeedb4f40430f097562794b632a9262197 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -70,6 +70,14 @@ $rtwidth = array
        2 => 9
 );
 
+$virtual_obj_types = array
+(
+       1504,
+       1505,
+       1506,
+       1507
+);
+
 $netmaskbylen = array
 (
        32 => '255.255.255.255',

diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index 391cf7b712869e88369c214c59b91f780e61f3ad..4bc614ff171c9f2f0c3953dc51c4d10205fb0951 100644 (file)
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -667,7 +667,7 @@ function renderNewRackForm ($row_id)
 
 function renderEditObjectForm ($object_id)
 {
-       global $pageno;
+       global $pageno, $virtual_obj_types;
        $object = spotEntity ('object', $object_id);
        startPortlet ();
        printOpFormIntro ('update');
@@ -677,7 +677,7 @@ function renderEditObjectForm ($object_id)
        echo "<tr><td>&nbsp;</td><th colspan=2><h2>Attributes</h2></th></tr>";
        // baseline info
        echo "<tr><td>&nbsp;</td><th class=tdright>Common name:</th><td class=tdleft><input type=text name=object_name value='${object['name']}'></td></tr>\n";
-       if (considerConfiguredConstraint ($object, 'VIRTUAL_OBJ_LISTSRC'))
+       if (in_array($object['objtype_id'], $virtual_obj_types))
        {
                echo "<input type=hidden name=object_label value=''>\n";
                echo "<input type=hidden name=object_asset_no value=''>\n";
@@ -964,7 +964,7 @@ function finishPortlet ()
 
 function renderRackObject ($object_id)
 {
-       global $nextorder, $aac;
+       global $nextorder, $aac, $virtual_obj_types;
        $info = spotEntity ('object', $object_id);
        // FIXME: employ amplifyCell() instead of calling loader functions directly
        amplifyCell ($info);
@@ -1316,7 +1316,7 @@ function renderRackObject ($object_id)
 
        // After left column we have (surprise!) right column with rackspace portlet only.
        echo "<td class=pcright>";
-       if (!considerConfiguredConstraint ($info, 'VIRTUAL_OBJ_LISTSRC'))
+       if (!in_array($info['objtype_id'], $virtual_obj_types))
        {
                // rackspace portlet
                startPortlet ('rackspace allocation');
@@ -3629,19 +3629,18 @@ function renderNATv4ForObject ($object_id)
 
 function renderAddMultipleObjectsForm ()
 {
+       global $virtual_obj_types;
        $typelist = readChapter (CHAP_OBJTYPE, 'o');
        $typelist[0] = 'select type...';
        $typelist = cookOptgroups ($typelist);
        $max = getConfigVar ('MASSCOUNT');
        $tabindex = 100;
-       $virt_obj_listsrc = getConfigVar ('VIRTUAL_OBJ_LISTSRC');
 
        // create a list containing only physical object types
-       // FIXME: find a cleaner way of checking whether or not an object type exists in the config var
        $phys_typelist = $typelist;
        foreach ($phys_typelist['other'] as $key => $value)
        {
-               if ($key > 0 && substr_count($virt_obj_listsrc, 'typeid_'.$key.'}') > 0)
+               if ($key > 0 && in_array($key, $virtual_obj_types))
                        unset($phys_typelist['other'][$key]);
        }
        startPortlet ('Physcial objects');
@@ -3672,11 +3671,10 @@ function renderAddMultipleObjectsForm ()
        finishPortlet();
 
        // create a list containing only virtual object types
-       // FIXME: find a cleaner way of checking whether or not an object type exists in the config var
        $virt_typelist = $typelist;
        foreach ($virt_typelist['other'] as $key => $value)
        {
-               if ($key > 0 && substr_count($virt_obj_listsrc, 'typeid_'.$key.'}') == 0)
+               if ($key > 0 && !in_array($key, $virtual_obj_types))
                        unset($virt_typelist['other'][$key]);
        }
        startPortlet ('Virtual objects');

diff --git a/wwwroot/inc/ophandlers.php b/wwwroot/inc/ophandlers.php
index 1f8e038c6cffd969b1ca34ac0e73d2fcadf33e2e..0d7a714ceef1e4d46afc6e6c8bed10ea7af24c84 100644 (file)
--- a/wwwroot/inc/ophandlers.php
+++ b/wwwroot/inc/ophandlers.php
@@ -1419,7 +1419,6 @@ function resetUIConfig()
        setConfigVar ('SHRINK_TAG_TREE_ON_CLICK', 'yes');
        setConfigVar ('MAX_UNFILTERED_ENTITIES', '0');
        setConfigVar ('SYNCDOMAIN_MAX_PROCESSES', '0');
-    setConfigVar ('VIRTUAL_OBJ_LISTSRC', '{$typeid_1504} or {$typeid_1505} or {$typeid_1506} or {$typeid_1507}');
     setConfigVar ('PORT_EXCLUSION_LISTSRC', '{$typeid_3} or {$typeid_10} or {$typeid_11} or {$typeid_1505} or {$typeid_1506}');
        return buildRedirectURL (__FUNCTION__, 'OK');
 }

diff --git a/wwwroot/inc/triggers.php b/wwwroot/inc/triggers.php
index 0577077445669e298b9cd93a0897752dfc18c797..f8fc0a41fef3493ca7a60e80758d64caeb249156 100644 (file)
--- a/wwwroot/inc/triggers.php
+++ b/wwwroot/inc/triggers.php
@@ -202,9 +202,12 @@ function trigger_file_editText ()
 
 function trigger_rackspace ()
 {
-       // Hide the tab if the object type exists in the virtual config option
+       global $virtual_obj_types;
+
+       // Hide the tab if the object type is virtual
        assertUIntArg ('object_id');
-       if (considerConfiguredConstraint (spotEntity ('object', $_REQUEST['object_id']), 'VIRTUAL_OBJ_LISTSRC')) 
+       $object = spotEntity ('object', $_REQUEST['object_id']);
+       if (in_array($object['objtype_id'], $virtual_obj_types))
                return '';
 
        $rackspace = getRackspaceStats();

diff --git a/wwwroot/install.php b/wwwroot/install.php
index 1365ea51f9b05a6ffa311a79adad15ee6a0e0109..347712e1bbd2c7480fdeb8cb9dcf8c65742b3e49 100644 (file)
--- a/wwwroot/install.php
+++ b/wwwroot/install.php
@@ -1363,7 +1363,6 @@ INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdef
 ('SHRINK_TAG_TREE_ON_CLICK','yes','string','no','no','yes','Dynamically hide useless tags in tagtree'),
 ('MAX_UNFILTERED_ENTITIES','0','uint','no','no','yes','Max item count to display on unfiltered result page'),
 ('SYNCDOMAIN_MAX_PROCESSES','0','uint','yes','no', 'no', 'How many worker proceses syncdomain cron script should create'),
-('VIRTUAL_OBJ_LISTSRC','{\$typeid_1504} or {\$typeid_1505} or {\$typeid_1506} or {\$typeid_1507}','string','yes','no','no','List source: virtual objects'),
 ('PORT_EXCLUSION_LISTSRC','{\$typeid_3} or {\$typeid_10} or {\$typeid_11} or {\$typeid_1505} or {\$typeid_1506}','string','yes','no','no','List source: objects without ports'),
 ('DB_VERSION','0.19.0','string','no','yes','no','Database version.');
 

diff --git a/wwwroot/upgrade.php b/wwwroot/upgrade.php
index 7dc96d56444e9c963bc2bced86e77cdfe1c00cc0..a411c2eda18c9a848a14635df32924edd29b34fc 100644 (file)
--- a/wwwroot/upgrade.php
+++ b/wwwroot/upgrade.php
@@ -910,7 +910,6 @@ CREATE TABLE `EntityLink` (
                        $query[] = "INSERT INTO `ObjectParentCompat` (`parent_objtype_id`, `child_objtype_id`) VALUES (1505,1506)";
                        $query[] = "INSERT INTO `ObjectParentCompat` (`parent_objtype_id`, `child_objtype_id`) VALUES (1505,1507)";
                        $query[] = "INSERT INTO `ObjectParentCompat` (`parent_objtype_id`, `child_objtype_id`) VALUES (1506,1504)";
-                       $query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdefined, description) VALUES ('VIRTUAL_OBJ_LISTSRC','{\$typeid_1504} or {\$typeid_1505} or {\$typeid_1506} or {\$typeid_1507}','string','yes','no','no','List source: virtual objects')";
                        $query[] = "INSERT INTO `Config` (varname, varvalue, vartype, emptyok, is_hidden, is_userdefined, description) VALUES ('PORT_EXCLUSION_LISTSRC','{\$typeid_3} or {\$typeid_10} or {\$typeid_11} or {\$typeid_1505} or {\$typeid_1506}','string','yes','no','no','List source: objects without ports')";
                        $query[] = "UPDATE Config SET varvalue = CONCAT(varvalue, ' or {\$typeid_2} or {\$typeid_6} or {\$typeid_1502} or {\$typeid_1503} or {\$typeid_1504} or {\$typeid_1507}') WHERE varname = 'IPV4OBJ_LISTSRC'";
                        $query[] = "UPDATE Config SET varvalue = '8' WHERE varname = 'MASSCOUNT'";