extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

get exit codes for setup-cli working again (was broken in 1.6)

Browse Source
This commit is contained in:
Ralf Becker 2009-05-31 08:15:11 +00:00
parent f14596e3b0
commit 8a66799414
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/inc/class.setup_cmd.inc.php
View File

@ -41,7 +41,7 @@ abstract class setup_cmd extends admin_cmd
if ($this->header_secret != $secret) if ($this->header_secret != $secret)
{ {
//echo "_check_header_access: header_secret='$this->header_secret' != '$secret'=_calc_header_secret({$GLOBALS['egw_info']['server']['header_admin_user']},{$GLOBALS['egw_info']['server']['header_admin_password']})\n"; //echo "_check_header_access: header_secret='$this->header_secret' != '$secret'=_calc_header_secret({$GLOBALS['egw_info']['server']['header_admin_user']},{$GLOBALS['egw_info']['server']['header_admin_password']})\n";
throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),2); throw new egw_exception_no_permission(lang('Wrong credentials to access the header.inc.php file!'),5);
} }
} }

32
setup/setup-cli.php
View File

@ -49,7 +49,7 @@ $GLOBALS['egw_setup']->system_charset = $charset;
if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version) if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
{ {
fail(98,lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version)); throw new egw_exception_wrong_userinput(lang('You are using PHP version %1. eGroupWare now requires %2 or later, recommended is PHP %3.',PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version),98);
} }
switch($action) switch($action)
@ -246,7 +246,7 @@ function do_backup($arg,$quite_check=false)
} }
else // backup failed ==> dont start the upgrade else // backup failed ==> dont start the upgrade
{ {
fail(50,lang('Backup failed').': '.$f); throw new egw_exception_wrong_userinput(lang('Backup failed').': '.$f,50);
} }
} }
} }
@ -561,12 +561,32 @@ function list_exit_codes()
error_reporting(error_reporting() & ~E_NOTICE); error_reporting(error_reporting() & ~E_NOTICE);
$codes = array('Ok'); $codes = array('Ok');
foreach(file(__FILE__) as $n => $line) $setup_dir = EGW_SERVER_ROOT.'/setup/';
//$files = array('setup-cli.php');
foreach(scandir($setup_dir.'/inc') as $file)
{ {
if (preg_match('/fail\(([0-9]+),(.*)\);/',$line,$matches)) if (substr($file,0,strlen('class.setup_cmd')) == 'class.setup_cmd')
{ {
//echo "Line $n: $matches[1]: $matches[2]\n"; $files[] = 'inc/'.$file;
@eval('$codes['.$matches[1].'] = '.$matches[2].';'); }
}
foreach($files as $file)
{
$content = file_get_contents($setup_dir.'/'.$file);
if (preg_match_all('/throw new (egw_exception[a-z_]*)\((.*),([0-9]+)\);/m',$content,$matches))
{
//echo $file.":\n"; print_r($matches);
foreach($matches[3] as $key => $code)
{
//if (isset($codes[$code])) echo "$file redifines #$code: {$codes[$code]}\n";
$src = $matches[2][$key];
$src = preg_replace('/self::\$[a-z_>-]/i',"''",$src); // gives fatal error otherwise
@eval($src='$codes['.$code.'] = '.$src.';');
//echo "- codes[$code] => '{$codes[$code]}'\n";
}
//echo $file.":\n"; print_r($codes);
} }
} }
ksort($codes,SORT_NUMERIC); ksort($codes,SORT_NUMERIC);