From: <ru...@us...> - 2009-01-17 14:50:14
|
Revision: 6411 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6411&view=rev Author: rurban Date: 2009-01-17 14:50:05 +0000 (Sat, 17 Jan 2009) Log Message: ----------- add LdapUpper: search LDAP lowercase, force uppercase to match Windows Added Paths: ----------- trunk/lib/WikiUser/LdapUpper.php Added: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php (rev 0) +++ trunk/lib/WikiUser/LdapUpper.php 2009-01-17 14:50:05 UTC (rev 6411) @@ -0,0 +1,47 @@ +<?php //-*-php-*- +rcs_id('$Id: LDAP.php,v 1.5 2005/10/10 19:43:49 rurban Exp $'); +/* Copyright (C) 2007,2009 Reini Urban + * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2) + */ +include_once("lib/WikiUser/LDAP.php"); + +/** + * Overrides for LDAP (Windows domain) usernames: + * Search lowercase, but convert it then to uppercase to match the WINDOWS name. + * Define the vars LDAP_AUTH_HOST, LDAP_BASE_DN, LDAP_SEARCH_FILTER in config/config.ini + * Preferences are handled in _PassUser + */ +class _LdapUpperPassUser +extends _LDAPPassUser +{ + + function checkPass($submitted_password) { + $userid = strtolower($this->_userid); + return parent::checkPass($submitted_password); + } + + function UserName() { + if (!empty($this->_userid)) { + $this->_userid = strtoupper($this->_userid); + if (!empty($this->_HomePagehandle) and is_object($this->_HomePagehandle)) + $this->_HomePagehandle->_pagename = $this->_userid; + return strtoupper($this->_userid); + } + } + + function userExists() { + // lowercase check and uppercase visibility + $userid = strtolower($this->_userid); + $this->_userid = strtoupper($this->_userid); + return parent::userExists(); + } +} + +// Local Variables: +// mode: php +// tab-width: 8 +// c-basic-offset: 4 +// c-hanging-comment-ender-p: nil +// indent-tabs-mode: nil +// End: +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-07-24 06:12:25
|
Revision: 7047 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7047&view=rev Author: rurban Date: 2009-07-24 06:12:19 +0000 (Fri, 24 Jul 2009) Log Message: ----------- remove unused code trim spaces from usernames as LDAP does it internally Modified Paths: -------------- trunk/lib/WikiUser/LdapUpper.php Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2009-07-24 06:02:36 UTC (rev 7046) +++ trunk/lib/WikiUser/LdapUpper.php 2009-07-24 06:12:19 UTC (rev 7047) @@ -16,13 +16,12 @@ { function checkPass($submitted_password) { - $userid = strtolower($this->_userid); return parent::checkPass($submitted_password); } function UserName() { if (!empty($this->_userid)) { - $this->_userid = strtoupper($this->_userid); + $this->_userid = trim(strtoupper($this->_userid)); if (!empty($this->_HomePagehandle) and is_object($this->_HomePagehandle)) $this->_HomePagehandle->_pagename = $this->_userid; return strtoupper($this->_userid); @@ -31,8 +30,7 @@ function userExists() { // lowercase check and uppercase visibility - $userid = strtolower($this->_userid); - $this->_userid = strtoupper($this->_userid); + $this->_userid = trim(strtoupper($this->_userid)); return parent::userExists(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2009-07-24 06:22:23
|
Revision: 7049 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7049&view=rev Author: rurban Date: 2009-07-24 06:22:16 +0000 (Fri, 24 Jul 2009) Log Message: ----------- svn propset svn:keywords Id Modified Paths: -------------- trunk/lib/WikiUser/LdapUpper.php Property Changed: ---------------- trunk/lib/WikiUser/LdapUpper.php Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2009-07-24 06:18:16 UTC (rev 7048) +++ trunk/lib/WikiUser/LdapUpper.php 2009-07-24 06:22:16 UTC (rev 7049) @@ -1,5 +1,5 @@ <?php //-*-php-*- -rcs_id('$Id: LDAP.php,v 1.5 2005/10/10 19:43:49 rurban Exp $'); +rcs_id('$Id$'); /* Copyright (C) 2007,2009 Reini Urban * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2) */ Property changes on: trunk/lib/WikiUser/LdapUpper.php ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-27 10:59:21
|
Revision: 8686 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8686&view=rev Author: vargenau Date: 2012-12-27 10:59:14 +0000 (Thu, 27 Dec 2012) Log Message: ----------- Add return Modified Paths: -------------- trunk/lib/WikiUser/LdapUpper.php Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2012-12-27 10:58:30 UTC (rev 8685) +++ trunk/lib/WikiUser/LdapUpper.php 2012-12-27 10:59:14 UTC (rev 8686) @@ -44,6 +44,7 @@ $this->_HomePagehandle->_pagename = $this->_userid; return strtoupper($this->_userid); } + return ''; } function userExists() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-20 09:12:32
|
Revision: 10575 http://sourceforge.net/p/phpwiki/code/10575 Author: vargenau Date: 2021-09-20 09:12:29 +0000 (Mon, 20 Sep 2021) Log Message: ----------- Remove function checkPass, same as parent Modified Paths: -------------- trunk/lib/WikiUser/LdapUpper.php Modified: trunk/lib/WikiUser/LdapUpper.php =================================================================== --- trunk/lib/WikiUser/LdapUpper.php 2021-09-20 09:09:55 UTC (rev 10574) +++ trunk/lib/WikiUser/LdapUpper.php 2021-09-20 09:12:29 UTC (rev 10575) @@ -32,12 +32,6 @@ class _LdapUpperPassUser extends _LDAPPassUser { - - function checkPass($submitted_password) - { - return parent::checkPass($submitted_password); - } - function UserName() { if (!empty($this->_userid)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |