r4337 generateAutoPorts(): dismiss dead code

showMessageOrError(): remove two unused message codes

diff --git a/wwwroot/inc/interface.php b/wwwroot/inc/interface.php
index 7397d507e1ba5c52474e47c53509afd335f59fbc..222e1e516d361f26031b5cc8a8be81f3c61367c7 100644 (file)
--- a/wwwroot/inc/interface.php
+++ b/wwwroot/inc/interface.php
@@ -1504,7 +1504,6 @@ function showMessageOrError ()
                                67 => array ('code' => 'success', 'format' => "Tag rolling done, %u objects involved"),
                                71 => array ('code' => 'success', 'format' => 'File "%s" was linked successfully'),
                                72 => array ('code' => 'success', 'format' => 'File was unlinked successfully'),
-                               80 => array ('code' => 'success', 'format' => "Added new object '%s'"),
                                81 => array ('code' => 'success', 'format' => "SNMP: completed '%s' work"),
                                82 => array ('code' => 'success', 'format' => "Bulk port creation was successful. %u ports created, %u failed"),
                                87 => array ('code' => 'success', 'format' => '802.1Q recalculate: %d ports changed on %d switches'),
@@ -1521,7 +1520,6 @@ function showMessageOrError ()
                                127 => array ('code' => 'error', 'format' => 'Added %u real servers and encountered %u errors'),
                                131 => array ('code' => 'error', 'format' => 'invalid format requested'),
                                141 => array ('code' => 'error', 'format' => 'Encountered %u errors, updated %u record(s)'),
-                               142 => array ('code' => 'error', 'format' => 'executeAutoPorts() failed'),
                                143 => array ('code' => 'error', 'format' => 'Tried chaining %u tags, but experienced %u errors.'),
                                144 => array ('code' => 'error', 'format' => "Error deleting tag: '%s'"),
                                147 => array ('code' => 'error', 'format' => 'failed adding record "%s"'),

diff --git a/wwwroot/inc/ophandlers.php b/wwwroot/inc/ophandlers.php
index af6f1a1d8f975d6f1f5011951ca85a054d3a30c6..a287c8fa076f87b4eb73c66cea3f18be86b9c8f7 100644 (file)
--- a/wwwroot/inc/ophandlers.php
+++ b/wwwroot/inc/ophandlers.php
@@ -1740,16 +1740,11 @@ function importPTRData ()
 }
 
 $msgcode['generateAutoPorts']['OK'] = 21;
-$msgcode['generateAutoPorts']['ERR'] = 142;
 function generateAutoPorts ()
 {
-       global $pageno;
-       $info = spotEntity ('object', $_REQUEST['object_id']);
-       // Navigate away in case of success, stay at the place otherwise.
-       if (executeAutoPorts ($_REQUEST['object_id'], $info['objtype_id']))
-               return buildRedirectURL (__FUNCTION__, 'OK', array(), $pageno, 'ports');
-       else
-               return buildRedirectURL (__FUNCTION__, 'ERR');
+       $object = spotEntity ('object', getBypassValue());
+       executeAutoPorts ($object['id'], $object['objtype_id']);
+       return buildRedirectURL (__FUNCTION__, 'OK', array(), NULL, 'ports');
 }
 
 $msgcode['saveEntityTags']['OK'] = 26;