"- quitening warning if LANG does NOT contain nation

- create dummy mailserver config, as fmail otherwise gives fatal error otherwise"
This commit is contained in:
Ralf Becker 2009-07-30 09:32:19 +00:00
parent 821f0daf42
commit f751deb019

View File

@ -47,7 +47,7 @@ $config = array(
// read language from LANG enviroment variable // read language from LANG enviroment variable
if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG'])) if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
{ {
list($lang,$nat) = preg_split('/[_.]/',$lang); @list($lang,$nat) = preg_split('/[_.]/',$lang);
if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw'))) if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
{ {
$lang .= '-'.strtolower($nat); $lang .= '-'.strtolower($nat);
@ -178,6 +178,10 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200) // def
' --files-dir '.escapeshellarg($config['data_dir'].'/files').' --backup-dir '.escapeshellarg($config['data_dir'].'/backup'); ' --files-dir '.escapeshellarg($config['data_dir'].'/files').' --backup-dir '.escapeshellarg($config['data_dir'].'/backup');
run_cmd($setup_config); run_cmd($setup_config);
} }
// create dummy mailserver config, as fmail otherwise gives fatal error otherwise
$setup_mailserver = $setup_cli.' --config '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd']).
' --mailserver localhost,imap --smtpserver localhost,25';
run_cmd($setup_config);
// create first user // create first user
$setup_admin = $setup_cli.' --admin '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd'].','. $setup_admin = $setup_cli.' --admin '.escapeshellarg($config['domain'].','.$config['config_user'].','.$config['config_passwd'].','.