holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"when directly calling cmd object:

Browse Source 
- set domain as first argument, to select the right domain in header include
- allow to give 1-dimensional arrays on command line (like php does it with urls, eg. 'config[name]=value')"
This commit is contained in:
Ralf Becker 2009-05-24 13:59:03 +00:00
parent 2175ee37b0
commit 02587c2153
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup/setup-cli.php
View File

@ -6,7 +6,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package setup * @package setup
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2006-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2006-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -112,7 +112,8 @@ switch($action)
if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) && if (substr($action,0,2) == '--' && class_exists($class = str_replace('-','_',substr($action,2))) &&
is_subclass_of($class,'admin_cmd') && constant($class.'::SETUP_CLI_CALLABLE')) is_subclass_of($class,'admin_cmd') && constant($class.'::SETUP_CLI_CALLABLE'))
{ {
$args = null; $args = array();
$args['domain'] = array_shift($arguments); // domain must be first argument, to ensure right domain get's selected in header-include
foreach($arguments as $arg) foreach($arguments as $arg)
{ {
list($name,$value) = explode('=',$arg,2); list($name,$value) = explode('=',$arg,2);
@ -120,8 +121,16 @@ switch($action)
{ {
throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90); throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90);
} }
if (substr($name,-1) == ']') // allow 1-dim. arrays
{
list($name,$sub) = explode('[',substr($name,0,-1),2);
$args[$name][$sub] = $value;
}
else
{
$args[$name] = $value; $args[$name] = $value;
} }
}
$cmd = new $class($args); $cmd = new $class($args);
$msg = $cmd->run(); $msg = $cmd->run();
if (is_array($msg)) $msg = print_r($msg,true); if (is_array($msg)) $msg = print_r($msg,true);