[phpwiki-checkins] CVS: phpwiki/lib WikiUserNew.php,1.127,1.128 WikiUser.php,1.64,1.65

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

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

Modified Files:
	WikiUserNew.php WikiUser.php 
Log Message:
Default ENABLE_DOUBLECLICKEDIT = false. Moved to UserPreferences

Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -2 -b -p -d -r1.127 -r1.128
--- WikiUserNew.php	2 Apr 2005 18:01:41 -0000	1.127
+++ WikiUserNew.php	5 Jun 2005 05:38:02 -0000	1.128
@@ -521,7 +521,10 @@ class _WikiUser
     }
 
+    /* This is quite restrictive and not according the login description online. 
+       Any word char (A-Za-z0-9_), ".", "@" and "-"
+       The backends may loosen this.
+    */
     function isValidName ($userid = false) {
-        if (!$userid)
-            $userid = $this->_userid;
+        if (!$userid) $userid = $this->_userid;
         return preg_match("/^[\w\.@\-]+$/",$userid) and strlen($userid) < 32;
     }
@@ -588,5 +591,5 @@ class _WikiUser
             $class = "_" . $this->_current_method . "PassUser";
             include_once("lib/WikiUser/".$this->_current_method.".php");
-            $user = new $class($userid,$this->_prefs);
+            $user = new $class($userid, $this->_prefs);
             if (!check_php_version(5))
                 eval("\$this = \$user;");
@@ -1772,4 +1775,5 @@ class UserPreferences
                     'relativeDates' => new _UserPreference_bool(),
                     'googleLink'    => new _UserPreference_bool(), // 1.3.10
+                    'doubleClickEdit' => new _UserPreference_bool(), // 1.3.11
                     );
         // add custom theme-specific pref types:
@@ -2069,4 +2073,7 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.128  2005/06/05 05:38:02  rurban
+// Default ENABLE_DOUBLECLICKEDIT = false. Moved to UserPreferences
+//
 // Revision 1.127  2005/04/02 18:01:41  uckelman
 // Fixed regex for RFC822 addresses.

Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -2 -b -p -d -r1.64 -r1.65
--- WikiUser.php	8 Feb 2005 13:25:50 -0000	1.64
+++ WikiUser.php	5 Jun 2005 05:38:02 -0000	1.65
@@ -41,4 +41,5 @@ $UserPreferences = array(
                          'relativeDates' => new _UserPreference_bool(),
                          'googleLink'    => new _UserPreference_bool(), // 1.3.10
+                         'doubleClickEdit' => new _UserPreference_bool(), // 1.3.11
                          );
 
@@ -746,4 +747,7 @@ class UserPreferences {
 
 // $Log$
+// Revision 1.65  2005/06/05 05:38:02  rurban
+// Default ENABLE_DOUBLECLICKEDIT = false. Moved to UserPreferences
+//
 // Revision 1.64  2005/02/08 13:25:50  rurban
 // encrypt password. fix strict logic.