banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scripts/shells/shell.php:

Browse Source 
- disable some unused code


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1531 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz 11 years ago
parent ade5fd0c24
commit ba7ebe7adb
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File

41
scripts/shells/shell.php
Unescape Escape View File

@ -137,14 +137,14 @@ class Shell {
$shellKey = Inflector::underscore($this->className); $shellKey = Inflector::underscore($this->className);
if (!PHP5 && isset($this->args[0])) { # if (!PHP5 && isset($this->args[0])) {
if(strpos($this->className, strtolower(Inflector::camelize($this->args[0]))) !== false) { # if(strpos($this->className, strtolower(Inflector::camelize($this->args[0]))) !== false) {
$dispatch->shiftArgs(); # $dispatch->shiftArgs();
} # }
if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) { # if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
$dispatch->shiftArgs(); # $dispatch->shiftArgs();
} # }
} # }
$this->Dispatch =& $dispatch; $this->Dispatch =& $dispatch;
} }
@ -210,22 +210,23 @@ if ( empty($this->params['q'] ) ) {
if ($taskName == 'Add' || $taskName == 'Update') { if ($taskName == 'Add' || $taskName == 'Update') {
$taskClass = 'CliEdit'; $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; $this->taskNames[] = $taskName;
if (!PHP5) { # if (!PHP5) {
$this->{$taskName} = new $taskClass($this->Dispatch); # $this->{$taskName} = new $taskClass($this->Dispatch);
} else { # } else {
$this->{$taskName} = new $taskClass($this->Dispatch); $this->{$taskName} = new $taskClass($this->Dispatch);
} # }
if ($taskName == 'Add') { if ($taskName == 'Add') {
$this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler'; $this->{$taskName}->handler_to_use = ucfirst($this->shell) . 'Handler';

Write Preview
Loading…
Cancel
Save