extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed not working --webserver-url option, it even sets empty URL for eGW installed in the docroot now

Browse Source
This commit is contained in:
Ralf Becker 2006-06-01 03:53:07 +00:00
parent 208a375928
commit 5fa113916e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/setup-cli.php
View File

@ -137,9 +137,9 @@ function do_config($args)
foreach(explode(',',array_shift($args)) as $n => $value) foreach(explode(',',array_shift($args)) as $n => $value)
{ {
if ($value === '') continue; if ($value === '' && is_array($config[$arg])) continue;
$name = $config[$arg][$n]; $name = is_array($config[$arg]) || $n ? $config[$arg][$n] : $config[$arg];
if (is_array($name)) if (is_array($name))
{ {
if (!in_array($value,$name['allowed'])) fail(91,"'%1' is not allowed as %2. arguments of option %3 !!!",$value,1+$n,$arg); if (!in_array($value,$name['allowed'])) fail(91,"'%1' is not allowed as %2. arguments of option %3 !!!",$value,1+$n,$arg);
@ -576,8 +576,8 @@ function do_header($create,&$arguments)
$password = trim(fgets($f = fopen('php://stdin','rb'))); $password = trim(fgets($f = fopen('php://stdin','rb')));
fclose($f); fclose($f);
} }
$options[0] = $user; $options[0] = $password;
$options[1] = $password; $options[1] = $user;
$arguments[0] = implode(',',$options); $arguments[0] = implode(',',$options);
if (!$GLOBALS['egw_setup']->check_auth($user,$password,$GLOBALS['egw_info']['server']['header_admin_user'], if (!$GLOBALS['egw_setup']->check_auth($user,$password,$GLOBALS['egw_info']['server']['header_admin_user'],