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

missed admin-cli.php when converting to api

Browse Source
This commit is contained in:
Ralf Becker 2016-04-29 13:02:10 +00:00
parent e0aea9cf39
commit bf43122c65
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/admin-cli.php
View File

@ -12,6 +12,8 @@
*/ */
use EGroupware\Api; use EGroupware\Api;
use EGroupware\Api\Framework;
use EGroupware\Api\Vfs;
chdir(dirname(__FILE__)); // to enable our relative pathes to work chdir(dirname(__FILE__)); // to enable our relative pathes to work
@ -87,7 +89,7 @@ switch($action)
list($name,$value) = explode('=',$arg,2); list($name,$value) = explode('=',$arg,2);
if(property_exists('admin_cmd',$name)) // dont allow to overwrite admin_cmd properties if(property_exists('admin_cmd',$name)) // dont allow to overwrite admin_cmd properties
{ {
throw new egw_exception_wrong_userinput(lang("Invalid argument '%1' !!!",$arg),90); throw new Api\Exception\WrongUserinput(lang("Invalid argument '%1' !!!",$arg),90);
} }
if (substr($name,-1) == ']') // allow 1-dim. arrays if (substr($name,-1) == ']') // allow 1-dim. arrays
{ {
@ -177,7 +179,7 @@ function run_command(admin_cmd $cmd)
{ {
$url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache'; $url = $GLOBALS['egw_info']['server']['webserver_url'].'/json.php?menuaction=admin.admin_hooks.ajax_clear_cache';
if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url; if ($url[0] == '/') $url = 'http://'.(!empty($domain) && $domain != 'default' ? $domain : 'localhost').$url;
$data = file_get_contents($url, false, Api\Framework::proxy_context($user,$arg0s[1])); $data = file_get_contents($url, false, Framework::proxy_context($user,$arg0s[1]));
error_log("file_get_contents('$url') returned ".array2string($data)); error_log("file_get_contents('$url') returned ".array2string($data));
if ($data && strpos($data, '"success"') !== false) if ($data && strpos($data, '"success"') !== false)
{ {
@ -189,7 +191,7 @@ function run_command(admin_cmd $cmd)
} }
} }
} }
catch (egw_exception_wrong_userinput $e) { catch (Api\Exception\WrongUserinput $e) {
echo "\n".$e->getMessage()."\n\n"; echo "\n".$e->getMessage()."\n\n";
exit($e->getCode()); exit($e->getCode());
} }
@ -273,7 +275,7 @@ function load_egw($user,$passwd,$domain='default')
_check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'],$passwd)) _check_pw($GLOBALS['egw_domain'][$_GET['domain']]['config_passwd'],$passwd))
{ {
echo "\nRoot access granted!\n"; echo "\nRoot access granted!\n";
egw_vfs::$is_root = true; Vfs::$is_root = true;
} }
else else
{ {
@ -539,7 +541,7 @@ function do_subscribe_other($account_lid,$pw=null)
/* ToDo: this cant work, not even in 14.x /* ToDo: this cant work, not even in 14.x
if (!($account_id = $GLOBALS['egw']->accounts->name2id($account_lid))) if (!($account_id = $GLOBALS['egw']->accounts->name2id($account_lid)))
{ {
throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account_lid),15); throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account_lid),15);
} }
$GLOBALS['egw_info']['user'] = array( $GLOBALS['egw_info']['user'] = array(
'account_id' => $account_id, 'account_id' => $account_id,