From a49fc326d3e2dcd73999bcf75b1901e14bc0d1e9 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 6 Jun 2004 13:42:31 +0000
Subject: [PATCH] followed suggestion in bug #966861 USE_TAGLINE changed to
 FORTUNE_DIR french homepage name changed

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3619 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 config/config-dist.ini | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/config/config-dist.ini b/config/config-dist.ini
index d88fce278..055d20033 100644
--- a/config/config-dist.ini
+++ b/config/config-dist.ini
@@ -40,9 +40,6 @@
 ; Currently broken. Default: false
 ;JS_SEARCHREPLACE = true
 
-; Insert random taglines at the creation of an empty page. Default: false
-;USE_TAGLINES = true
-
 ;==========================================================================
 ; Part One: Authentication and security settings.
 ;
@@ -406,7 +403,7 @@ ALLOW_USER_PASSWORDS = true
 ;   BogoLogin:     WikiWord username, with no *actual* password checking,
 ;                   although the user will still have to enter one.
 ;   PersonalPage:  Store passwords in the users homepage metadata (simple)
-;   Db:            Use $DBAuthParams[] (see below) with the PearDB or 
+;   Db:            Use DBAUTH_AUTH_* (see below) with PearDB or 
 ;                   ADODB only.
 ;   LDAP:          Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN
 ;   IMAP:          Authenticate against IMAP_AUTH_HOST (email account)
@@ -435,7 +432,7 @@ PASSWORD_LENGTH_MINIMUM = 2
 ;                       dont try the other methods on failure then
 ;       stacked:    check the given user - password combination for all
 ;                       methods and return true on the first success.
-USER_AUTH_POLICY = old
+USER_AUTH_POLICY = stacked
 
 ; LDAP authentication options:
 ;
@@ -543,7 +540,7 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
 ; If you want to use Unix crypt()ed passwords, you can use DBAUTH_AUTH_CHECK
 ; to get the password out of the database with a simple SELECT query, and
 ; specify DBAUTH_AUTH_USER_EXISTS and DBAUTH_AUTH_CRYPT_METHOD:
-; DBAUTH_AUTH_CHECK = "SELECT password FROM user where userid='$userid'"
+; DBAUTH_AUTH_CHECK = "SELECT passwd FROM user where userid='$userid'"
 ; DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM user WHERE userid='$userid'"
 ; DBAUTH_AUTH_CRYPT_METHOD = crypt
 ;
@@ -568,11 +565,11 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
 ;
 ; The prefs field stores the serialized form of the user's preferences array,
 ; to ease the complication of storage.
-; DBAUTH_PREF_SELECT = SELECT prefs FROM user WHERE userid='$userid'
-; DBAUTH_PREF_SELECT = SELECT prefs FROM pref WHERE userid='$userid'
+; DBAUTH_PREF_SELECT = "SELECT prefs FROM user WHERE userid='$userid'"
+; DBAUTH_PREF_SELECT = "SELECT prefs FROM pref WHERE userid='$userid'"
 
 ; Update the user's preferences
-; DBAUTH_PREF_UPDATE = UPDATE user SET prefs='$pref_blob' WHERE userid='$userid'
+; DBAUTH_PREF_UPDATE = "UPDATE user SET prefs='$pref_blob' WHERE userid='$userid'"
 ; Note that REPLACE works only with mysql and destroy all other columns!
 ; DBAUTH_PREF_UPDATE = "REPLACE INTO pref SET prefs='$pref_blob',userid='$userid'"
 
@@ -582,13 +579,13 @@ DBAUTH_AUTH_CRYPT_METHOD = plain
 ;
 ; Sample configurations:
 ;  only one group per user (1:n):
-;   DBAUTH_IS_MEMBER = SELECT user FROM user WHERE user='$userid' AND group='$groupname'
-;   DBAUTH_GROUP_MEMBERS = SELECT user FROM user WHERE group='$groupname'
-;   DBAUTH_USER_GROUPS = SELECT group FROM user WHERE user='$userid'
+;   DBAUTH_IS_MEMBER = "SELECT user FROM user WHERE user='$userid' AND group='$groupname'"
+;   DBAUTH_GROUP_MEMBERS = "SELECT user FROM user WHERE group='$groupname'"
+;   DBAUTH_USER_GROUPS = "SELECT group FROM user WHERE user='$userid'"
 ;  multiple groups per user (n:m):
-;   DBAUTH_IS_MEMBER = SELECT userid FROM member WHERE userid='$userid' AND groupname='$groupname'
-;   DBAUTH_GROUP_MEMBERS = SELECT DISTINCT userid FROM member WHERE groupname='$groupname'
-;   DBAUTH_USER_GROUPS = SELECT groupname FROM member WHERE userid='$userid'
+;   DBAUTH_IS_MEMBER = "SELECT userid FROM member WHERE userid='$userid' AND groupname='$groupname'"
+;   DBAUTH_GROUP_MEMBERS = "SELECT DISTINCT userid FROM member WHERE groupname='$groupname'"
+;   DBAUTH_USER_GROUPS = "SELECT groupname FROM member WHERE userid='$userid'"
 
 ; A interim page which gets displayed on every edit attempt
 EDITING_POLICY = EditingPolicy
@@ -644,7 +641,7 @@ CHARSET = iso-8859-1
 ; English "en"  (English    - HomePage)
 ; Dutch   "nl" (Nederlands - ThuisPagina)
 ; Spanish "es" (Español    - PáginaPrincipal)
-; French  "fr" (Français   - Accueil)
+; French  "fr" (Français   - PageAccueil))
 ; German  "de" (Deutsch    - StartSeite)
 ; Swedish "sv" (Svenska    - Framsida)
 ; Italian "it" (Italiano   - PaginaPrincipale)
-- 
2.45.0