From aee6feb7ddaa1751478140d8b3f7be81324b4ee1 Mon Sep 17 00:00:00 2001
From: chove <none>
Date: Wed, 3 May 2006 01:54:04 +0200
Subject: [PATCH] Empty log message

darcs-hash:20060502235404-4ec08-3d748bece109de4146c02211f69242f6ac7fdc26.gz
---
 wiki/user.py     | 7 +------
 wiki/userform.py | 7 +++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/wiki/user.py b/wiki/user.py
index 601364cf..0455c2a1 100644
--- a/wiki/user.py
+++ b/wiki/user.py
@@ -148,12 +148,7 @@ def isValidName(request, name):
     @param name: user name, unicode
     """
     normalized = normalizeName(name)
-    #### HACK CRANS
-    #return (name == normalized) and not wikiutil.isGroupPage(request, name)
-    return not name or ((name == normalized) \
-                        and not wikiutil.isGroupPage(request, name)
-                        and wikiutil.isStrictWikiname(name))
-    #### HACK CRANS
+    return (name == normalized) and not wikiutil.isGroupPage(request, name)
 
 
 def encodeList(items):
diff --git a/wiki/userform.py b/wiki/userform.py
index 316d3758..e5af81ad 100644
--- a/wiki/userform.py
+++ b/wiki/userform.py
@@ -145,7 +145,7 @@ space between words. Group page name is not allowed.""") % wikiutil.escape(name)
         else:
             # Save user profile
             theuser = user.User(self.request)
-
+                
             # Require non-empty name
             try:
                 theuser.name = form['username'][0]
@@ -172,7 +172,7 @@ space between words. Group page name is not allowed.""") % wikiutil.escape(theus
                     return _("This user name already belongs to somebody else.")
                 else:
                     newuser = 0
- 
+
             #### HACK SAUVAGE
             import sys
             sys.path.append('/usr/scripts/gestion/')
@@ -184,9 +184,8 @@ Pour des raisons de s
 possible que depuis la zone CRANS.
 Si vous possédez un compte sur zamok, vous pouvez y exécuter
 creer_compte_wiki.""")
-            
             #### FIN DU HACK
-            
+
             # try to get the password and pw repeat
             password = form.get('password', [''])[0]
             password2 = form.get('password2',[''])[0]