[phpwiki-checkins] SF.net SVN: phpwiki:[7047] trunk/lib/WikiUser/LdapUpper.php

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

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.