[phpwiki-checkins] CVS: phpwiki/lib WikiUserNew.php,1.138,1.139

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

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

Modified Files:
	WikiUserNew.php 
Log Message:
Remove too early and too strict isValidName check in _PassUser. This really should be done in 
the method, when we know it. This fixes NTLM auth. (userid=domain\user)


Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -2 -b -p -d -r1.138 -r1.139
--- WikiUserNew.php	18 Jun 2006 11:02:55 -0000	1.138
+++ WikiUserNew.php	3 Sep 2006 09:55:37 -0000	1.139
@@ -228,5 +228,5 @@ function _determineBogoUserOrPassUser($U
  */
 function WikiUser ($UserName = '') {
-    global $ForbiddenUser;
+    global $ForbiddenUser, $HTTP_SESSION_VARS;
 
     //Maybe: Check sessionvar for username & save username into
@@ -237,5 +237,5 @@ function WikiUser ($UserName = '') {
         return _determineAdminUserOrOtherUser($UserName);
     }
-    elseif (!empty($_SESSION['userid'])) {
+    elseif (!empty($HTTP_SESSION_VARS['userid'])) {
         // Found a user name.
         $ForbiddenUser = new _ForbiddenUser($_SESSION['userid']);
@@ -527,5 +527,5 @@ class _WikiUser
     function isValidName ($userid = false) {
         if (!$userid) $userid = $this->_userid;
-        return preg_match("/^[\w\.@\-]+$/",$userid) and strlen($userid) < 32;
+        return preg_match("/^[\w\.@\-]+$/", $userid) and strlen($userid) < 32;
     }
 
@@ -829,6 +829,6 @@ extends _AnonUser
         //global $DBAuthParams, $DBParams;
         if ($UserName) {
-            if (!$this->isValidName($UserName))
-                return false;
+            /*if (!$this->isValidName($UserName))
+                return false;*/
             $this->_userid = $UserName;
             if ($this->hasHomePage())
@@ -1156,5 +1156,5 @@ extends _AnonUser
                 eval("\$this = \$user;");
             // /*PHP5 patch*/$this = $user;
-            UpgradeUser($this,$user);
+            UpgradeUser($this, $user);
             if ($user->userExists()) {
                 return true;
@@ -2108,4 +2108,8 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.139  2006/09/03 09:55:37  rurban
+// Remove too early and too strict isValidName check in _PassUser. This really should be done in
+// the method, when we know it. This fixes NTLM auth. (userid=domain\user)
+//
 // Revision 1.138  2006/06/18 11:02:55  rurban
 // pref->value > -name, fix bug #1355533