From 5fa113916ec4cc786a7aeadda3f68a598feb3475 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 1 Jun 2006 03:53:07 +0000 Subject: [PATCH] fixed not working --webserver-url option, it even sets empty URL for eGW installed in the docroot now --- setup/setup-cli.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/setup-cli.php b/setup/setup-cli.php index 709fe50a60..45896a5727 100755 --- a/setup/setup-cli.php +++ b/setup/setup-cli.php @@ -137,9 +137,9 @@ function do_config($args) 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 (!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'))); fclose($f); } - $options[0] = $user; - $options[1] = $password; + $options[0] = $password; + $options[1] = $user; $arguments[0] = implode(',',$options); if (!$GLOBALS['egw_setup']->check_auth($user,$password,$GLOBALS['egw_info']['server']['header_admin_user'],