From 1850f10ded7afa1400fb0e8dccf7d3011063729e Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 1 Mar 2003 12:22:35 +0000 Subject: [PATCH] fixed a bug in config.php changed appearrance of wizard --- lam/config/config.php | 9 ++++----- lam/config/conflogin.php | 7 ++++--- lam/config/confmain.php | 27 ++++++++++++++++----------- lam/config/confsave.php | 5 +++-- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/lam/config/config.php b/lam/config/config.php index 0dcc05f3..ba7ab036 100644 --- a/lam/config/config.php +++ b/lam/config/config.php @@ -138,11 +138,10 @@ class Config { // prints current preferences function printconf() { - echo _("SSL: " ) . $this->SSL . "
"; - echo _("Host: ") . $this->Host . "
"; - echo _("Port: ") . $this->Port . "
"; - echo _("Passwd: ") . $this->Passwd . "
"; - echo _("Admins: "); for ($i = 0; $i < sizeof($this->Admins); $i++) { echo $this->Admins[$i] . "   "; } + echo _("SSL: " ) . $this->SSL . "
"; + echo _("Host: ") . $this->Host . "
"; + echo _("Port: ") . $this->Port . "
"; + echo _("Admins: ") . $this->Adminstring; } function get_SSL() { diff --git a/lam/config/conflogin.php b/lam/config/conflogin.php index 865140f7..05fe41ed 100644 --- a/lam/config/conflogin.php +++ b/lam/config/conflogin.php @@ -33,10 +33,11 @@ $Id$ -

+

LDAP Account Manager



+

- - > +

+ >

diff --git a/lam/config/confmain.php b/lam/config/confmain.php index 534387d0..fbdb4306 100644 --- a/lam/config/confmain.php +++ b/lam/config/confmain.php @@ -43,19 +43,24 @@ echo ("\n"); echo ("" . _("LDAP Account Manager Configuration") . "\n"); echo ("\n"); echo ("\n"); +echo ("

LDAP Account Manager



\n"); echo ("
\n"); -echo ("" . _("Hostname") . ": get_Host() . "\">
\n"); -echo ("" . _("Portnumber") . ": get_Port() . "\">
\n"); -if ($conf->get_SSL() == "True") echo ("" . _("Use SSL") . ":

\n"); -else echo ("" . _("Use SSL") . ":

\n"); -echo ("" . _("List of valid users") . ": get_Adminstring() . "\">
\n"); -echo _("Usernames must be seperated by semicolons (e.g. cn=admin,dc=yourcompany,dc=com ; uid=root,ou=people,dc=yourcompany,cd=com)\n"); -echo ("


\n"); -echo ("" . _("New Password") . ":
\n"); -echo ("" . _("Reenter Password") . ":
\n"); +echo ("

"); +echo ("\n"); +echo ("\n"); +echo _("\n"); +if ($conf->get_SSL() == "True") echo ("\n"); +else echo ("\n"); +echo ("\n"); +echo _("\n"); +echo (""); +echo ("\n"); +echo ("\n"); echo ("
\n"); -echo ("


\n"); -echo ("\n"); +echo ("\n"); +echo ("\n"); +echo ("\n"); +echo ("

" . _("Hostname") . ":

get_Host() . "\">

" . _("Portnumber") . ":

get_Port() . "\">

Default is 389, use 636 for SSL connections

" . _("Use SSL") . ":

" . _("Use SSL") . ":

" . _("List of valid users") . ":

get_Adminstring() . "\">

Usernames must be seperated by semicolons
(e.g. cn=admin,dc=yourcompany,dc=com ; uid=root,ou=people,dc=yourcompany,cd=com)

 

" . _("New Password") . ":

" . _("Reenter Password") . ":

 
 

\n"); echo ("

\n"); echo ("\n"); echo ("\n"); diff --git a/lam/config/confsave.php b/lam/config/confsave.php index 7a7df5af..b7c9c997 100644 --- a/lam/config/confsave.php +++ b/lam/config/confsave.php @@ -54,6 +54,9 @@ $conf->set_Adminstring($admins); if ($ssl == "on") $conf->set_SSL("True"); else $conf->set_SSL("False"); +echo ("

LDAP Account Manager



"); + + // check if password was changed if ($pass1 != $pass2) { echo _("" . _("Passwords are different!") . ""); @@ -66,6 +69,4 @@ if ($pass1 != "") { // save settings echo ("" . _("Saving the following settings:") . "

"); $conf->printconf(); -if ($conf->save()) echo ("

" . _("Failed!") . ""); -else echo ("

" . _("Successfully saved!") . ""); ?>