From 07e48031cbae577e90d5533f9ae64184a017fc2f Mon Sep 17 00:00:00 2001 From: seek3r Date: Sun, 7 Jan 2001 10:43:48 +0000 Subject: [PATCH] moved config to use new design --- admin/setup/config.inc.php | 103 ++++++++++-- preferences/setup/config.inc.php | 65 ++++++++ setup/config.php | 262 +------------------------------ setup/inc/phpgw_setup.inc.php | 6 +- 4 files changed, 162 insertions(+), 274 deletions(-) create mode 100644 preferences/setup/config.inc.php diff --git a/admin/setup/config.inc.php b/admin/setup/config.inc.php index 82976cceef..da247c245f 100644 --- a/admin/setup/config.inc.php +++ b/admin/setup/config.inc.php @@ -1,15 +1,92 @@ - +   + - /* $Id$ */ + +  Authentication / Accounts + - $phpgw_info["setup"]["admin"]["name"] = "Administration"; - $phpgw_info["setup"]["admin"]["hide_from_navbar"] = False; + + + Select which type of authentication you are using. + + + + + + + + + Select where you want to store/retrieve user accounts. + + + + + + + + Auto create account records for authenticated users: + > + + + + + If no ACL records for user or any group the user is a member of: + + + + + + + LDAP host: + "> + + + + LDAP context: + " size="40"> + + + + LDAP root dn: + " size="40"> + + + + LDAP root password: + "> + + + + + LDAP encryption type + + + + + + + + Use cookies to pass sessionid: + > + + + + Enter some random text for app_session
encryption (requires mcrypt) + " size="40"> + diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php new file mode 100644 index 0000000000..274acfc155 --- /dev/null +++ b/preferences/setup/config.inc.php @@ -0,0 +1,65 @@ + +   + + + +  Preferences + + + + + Showed powered by logo on: + + + + + + + + + Interface/Template Selection:
+ + + + + + + + + Frame support: + + + + + + + + + Use pure HTML compliant code (not fully working yet): + + + + + + + + Would like like phpGroupWare to check for new version
when admins login ?: + > + diff --git a/setup/config.php b/setup/config.php index 0b7dc07f82..d1db7317e4 100644 --- a/setup/config.php +++ b/setup/config.php @@ -104,164 +104,6 @@   - -  Mail settings - - - - Enter the location of your mail server: - "> - - - - - Select your mail server type: - - - - - - - - - IMAP server type: - - - - - - - - Enter your mail sufix: - "> - - - - - Mail server login type: - - - - - - - - Enter your SMTP server hostname: - "> - - - - Enter your SMTP server port: - "> - - - -   - - - -  Authentication / Accounts - - - - - Select which type of authentication you are using. - - - - - - - - - Select where you want to store/retrieve user accounts. - - - - - - - - Auto create account records for authenticated users: - > - - - - - If no ACL records for user or any group the user is a member of: - - - - - - - LDAP host: - "> - - - - LDAP context: - " size="40"> - - - - LDAP root dn: - " size="40"> - - - - LDAP root password: - "> - - - - - LDAP encryption type - - - - - - - - Use cookies to pass sessionid: - > - - - - Enter some random text for app_session
encryption (requires mcrypt) - " size="40"> - - - -   - -  Server information @@ -281,64 +123,6 @@ "> - - - Showed powered by logo on: - - - - - - - - - Interface/Template Selection:
(if user choice, and they dont make a selection, then classic will be used) - - - - - - - - - Frame support: - - - - - - - - - Use pure HTML compliant code (not fully working yet): - - - - - - - - Would like like phpGroupWare to check for new version
when admins login ?: - > - - Enter the title for your site. "> @@ -349,48 +133,10 @@ - -   - - - -  NNTP settings - - - - Enter your NNTP server hostname: - "> - - - - Enter your NNTP server port: - "> - - - - Enter your NNTP sender: - "> - - - - Enter your NNTP organization: - "> - - - - Enter your NNTP admins email address: - "> - - - - Enter your NNTP login: - "> - - - - Enter your NNTP password: - "> - + execute_script("config"); + //$phpgw_setup->execute_script("config",array("accounts", "preferences","email")); + ?>   diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php index bbf7812270..ce36b54265 100644 --- a/setup/inc/phpgw_setup.inc.php +++ b/setup/inc/phpgw_setup.inc.php @@ -279,8 +279,8 @@ function get_template_list(){ global $phpgw_info; $d = dir($phpgw_info["server"]["server_root"]."/phpgwapi/templates"); - $list["user_choice"]["name"] = "user_choice"; - $list["user_choice"]["title"] = "Users Choice"; + //$list["user_choice"]["name"] = "user_choice"; + //$list["user_choice"]["title"] = "Users Choice"; while($entry=$d->read()) { if ($entry != "CVS" && $entry != "." && $entry != ".."){ $list[$entry]["name"] = $entry; @@ -335,7 +335,7 @@ echo "phpgw_info[setup][$key][status]: ".$phpgw_info["setup"][$key]["status"]."< } function execute_script($script, $appname = ""){ - global $phpgw_info, $phpgw_domain; + global $phpgw_info, $phpgw_domain, $current_config, $newsetting, $phpgw_setup; if ($appname == ""){ $d = dir($phpgw_info["server"]["server_root"]); while($entry=$d->read()) {