From: Reini U. <ru...@us...> - 2004-02-01 09:16:02
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv776/lib/plugin Modified Files: _AuthInfo.php Log Message: Started with Group_Ldap (not yet ready) added new _AuthInfo plugin to help in auth problems (warning: may display passwords) fixed some configurator vars renamed LDAP_AUTH_SEARCH to LDAP_BASE_DN changed PHPWIKI_VERSION from 1.3.8a to 1.3.8pre USE_DB_SESSION defaults to true on SQL changed GROUP_METHOD definition to string, not constants changed sample user DBAuthParams from UPDATE to REPLACE to be able to create users. (Not to be used with external databases generally, but with the default internal user table) fixed the IndexAsConfigProblem logic. this was flawed: scripts which are the same virtual path defined their own lib/main call (hmm, have to test this better, phpwiki.sf.net/demo works again) Index: _AuthInfo.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/_AuthInfo.php,v retrieving revision 1.1 retrieving revision 1.2 diff -u -2 -b -p -d -r1.1 -r1.2 --- _AuthInfo.php 1 Feb 2004 01:04:34 -0000 1.1 +++ _AuthInfo.php 1 Feb 2004 09:14:11 -0000 1.2 @@ -67,4 +67,16 @@ extends WikiPlugin } $table->pushContent($this->_showhash("AUTH DEFINES", $auth_defines)); + if ((defined('ALLOW_LDAP_LOGIN') && ALLOW_LDAP_LOGIN) or in_array("LDAP",$GLOBALS['USER_AUTH_ORDER'])) + $table->pushContent($this->_showhash("LDAP DEFINES", array("LDAP_AUTH_HOST" => LDAP_AUTH_HOST, + "LDAP_AUTH_SEARCH" => LDAP_AUTH_SEARCH))); + if ((defined('ALLOW_IMAP_LOGIN') && ALLOW_IMAP_LOGIN) or in_array("IMAP",$GLOBALS['USER_AUTH_ORDER'])) + $table->pushContent($this->_showhash("IMAP DEFINES", array("IMAP_AUTH_HOST" => IMAP_AUTH_HOST))); + if (defined('AUTH_USER_FILE') or in_array("File",$GLOBALS['USER_AUTH_ORDER'])) + $table->pushContent($this->_showhash("AUTH_USER_FILE", array("AUTH_USER_FILE" => AUTH_USER_FILE, + "AUTH_USER_FILE_STORABLE" => AUTH_USER_FILE_STORABLE, + "AUTH_GROUP_FILE" => AUTH_GROUP_FILE + ))); + if (defined('GROUP_METHOD')) + $table->pushContent($this->_showhash("GROUP_METHOD", array("GROUP_METHOD" => GROUP_METHOD))); $table->pushContent($this->_showhash("\$USER_AUTH_ORDER[]", $GLOBALS['USER_AUTH_ORDER'])); $table->pushContent($this->_showhash("USER_AUTH_POLICY", array("USER_AUTH_POLICY"=>USER_AUTH_POLICY))); @@ -155,4 +167,20 @@ extends WikiPlugin // $Log$ +// Revision 1.2 2004/02/01 09:14:11 rurban +// Started with Group_Ldap (not yet ready) +// added new _AuthInfo plugin to help in auth problems (warning: may display passwords) +// fixed some configurator vars +// renamed LDAP_AUTH_SEARCH to LDAP_BASE_DN +// changed PHPWIKI_VERSION from 1.3.8a to 1.3.8pre +// USE_DB_SESSION defaults to true on SQL +// changed GROUP_METHOD definition to string, not constants +// changed sample user DBAuthParams from UPDATE to REPLACE to be able to +// create users. (Not to be used with external databases generally, but +// with the default internal user table) +// +// fixed the IndexAsConfigProblem logic. this was flawed: +// scripts which are the same virtual path defined their own lib/main call +// (hmm, have to test this better, phpwiki.sf.net/demo works again) +// // Revision 1.1 2004/02/01 01:04:34 rurban // Used to debug auth problems and settings. |