SF.net SVN: postfixadmin:[1531] trunk/scripts/shells/shell.php

[<chr...@us...>]

Revision: 1531
          http://sourceforge.net/p/postfixadmin/code/1531
Author:   christian_boltz
Date:     2013-10-07 20:09:03 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
scripts/shells/shell.php:
- disable some unused code

Modified Paths:
--------------
    trunk/scripts/shells/shell.php

Modified: trunk/scripts/shells/shell.php
===================================================================
--- trunk/scripts/shells/shell.php	2013-10-07 20:01:52 UTC (rev 1530)
+++ trunk/scripts/shells/shell.php	2013-10-07 20:09:03 UTC (rev 1531)
@@ -137,14 +137,14 @@
 
                 $shellKey = Inflector::underscore($this->className);
 
-                if (!PHP5 && isset($this->args[0])) {
-                        if(strpos($this->className, strtolower(Inflector::camelize($this->args[0]))) !== false) {
-                                $dispatch->shiftArgs();
-                        }
-                        if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
-                                $dispatch->shiftArgs();
-                        }
-                }
+#                if (!PHP5 && isset($this->args[0])) {
+#                        if(strpos($this->className, strtolower(Inflector::camelize($this->args[0]))) !== false) {
+#                                $dispatch->shiftArgs();
+#                        }
+#                        if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
+#                                $dispatch->shiftArgs();
+#                        }
+#                }
 
                 $this->Dispatch =& $dispatch;
         }
@@ -210,22 +210,23 @@
                                 if ($taskName == 'Add' || $taskName == 'Update') {
                                     $taskClass = 'CliEdit';
 
-                                } elseif (!class_exists($taskClass)) {
-                                        foreach ($this->Dispatch->shellPaths as $path) {
-                                                $taskPath = $path . 'tasks' . DS . $task.'.php';
-                                                if (file_exists($taskPath)) {
-                                                        require_once $taskPath;
-                                                        break;
-                                                }
-                                        }
                                 }
+#                                elseif (!class_exists($taskClass)) {
+#                                        foreach ($this->Dispatch->shellPaths as $path) {
+#                                                $taskPath = $path . 'tasks' . DS . $task.'.php';
+#                                                if (file_exists($taskPath)) {
+#                                                        require_once $taskPath;
+#                                                        break;
+#                                                }
+#                                        }
+#                                }
                                 
                                         $this->taskNames[] = $taskName;
-                                        if (!PHP5) {
+#                                        if (!PHP5) {
+#                                                $this->{$taskName} = new $taskClass($this->Dispatch);
+#                                        } else {
                                                 $this->{$taskName} = new $taskClass($this->Dispatch);
-                                        } else {
-                                                $this->{$taskName} = new $taskClass($this->Dispatch);
-                                        }
+#                                        }
 
                                 if ($taskName == 'Add') {
                                     $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.