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

also using default cli exceptin handler

Browse Source
This commit is contained in:
Ralf Becker 2008-10-26 12:15:26 +00:00
parent fa73ad5339
commit 94a123c537
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
filemanager/cli.php
View File

@ -491,6 +491,7 @@ function load_egw($user,$passwd,$domain='default')
'currentapp' => 'filemanager', 'currentapp' => 'filemanager',
'noheader' => true, 'noheader' => true,
'autocreate_session_callback' => 'user_pass_from_argv', 'autocreate_session_callback' => 'user_pass_from_argv',
'no_exception_handler' => 'cli',
) )
); );
@ -516,7 +517,6 @@ function load_egw($user,$passwd,$domain='default')
die("Unknown user or password!\n"); die("Unknown user or password!\n");
} }
} }
set_exception_handler('cli_exception_handler'); // otherwise we get html!
$cmd = $GLOBALS['cmd']; $cmd = $GLOBALS['cmd'];
if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir'])) if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
@ -780,12 +780,6 @@ function do_find($bases,$options)
} }
} }
function cli_exception_handler(Exception $e)
{
echo $e->getMessage()."\n";
exit($e->getCode());
}
/** /**
* Convert a numerical mode to a symbolic mode-string * Convert a numerical mode to a symbolic mode-string
* *