[phpwiki-checkins] CVS: phpwiki index.php,1.129,1.130

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13838

Modified Files:
	index.php 
Log Message:
fixed $LDAP_SET_OPTION


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -2 -b -p -d -r1.129 -r1.130
--- index.php	29 Feb 2004 04:10:55 -0000	1.129
+++ index.php	9 Mar 2004 17:16:43 -0000	1.130
@@ -519,6 +519,6 @@ if (!defined('LDAP_BASE_DN')) define('LD
 // Some LDAP servers disallow anonymous binds, and need some more options,
 // such as the Windows Active Directory Server:
-// $LDAP_SET_OPTION = array(LDAP_OPT_PROTOCOL_VERSION => 3,
-//                          LDAP_OPT_REFERRALS, 0);
+// $LDAP_SET_OPTION = array('LDAP_OPT_PROTOCOL_VERSION' => 3,
+//                          'LDAP_OPT_REFERRALS' => 0);
 // define(LDAP_AUTH_USER, "CN=ldapuser,CN=Users,DC=uai,DC=int");
 // define(LDAP_AUTH_PASSWORD, '');
@@ -586,8 +586,12 @@ $DBAuthParams = array (
    //   This can be optionally defined in the phpwiki db.
    //   The default is to store it the users homepage.
-   'pref_select' => 'SELECT prefs FROM user WHERE userid="$userid"',
-   //users must be predefined:
-   //Don't use replace here or all other fields here get erased! (passwords e.g.)
-   'pref_update' => 'UPDATE user SET prefs="$pref_blob" WHERE userid="$userid"',
+   // If you choose the user table, only registered user get their prefs from the DB,
+   // self-created users not. Better use the special pref table.
+   //'pref_select' => 'SELECT prefs FROM user WHERE userid="$userid"',
+   'pref_select' => 'SELECT prefs FROM pref WHERE userid="$userid"',
+   //Don't use replace with user or all other fields here get erased! (passwords e.g.)
+   //'pref_update' => 'UPDATE user SET prefs="$pref_blob" WHERE userid="$userid"',
+   // The special prefs table is safe to erase. All users can store their prefs here.
+   'pref_update' => 'REPLACE INTO pref SET prefs="$pref_blob",userid="$userid"',
 
    // USERS <=> GROUPS
@@ -901,5 +905,5 @@ if (!defined('AUTHORPAGE_URL')) define('
 //if (!defined('DISABLE_HTTP_REDIRECT')) define ('DISABLE_HTTP_REDIRECT', true);
 
-if (defined('WIKI_SOAP') and WIKI_SOAP) return;
+//if (defined('WIKI_SOAP') and WIKI_SOAP) return;
 
 ////////////////////////////////////////////////////////////////
@@ -938,4 +942,7 @@ if (defined('VIRTUAL_PATH') and defined(
 
 // $Log$
+// Revision 1.130  2004/03/09 17:16:43  rurban
+// fixed $LDAP_SET_OPTION
+//
 // Revision 1.129  2004/02/29 04:10:55  rurban
 // new POP3 auth (thanks to BiloBilo: pentothal at despammed dot com)