[TWiki-Dev] [SVN] MichaelDaum r12494 - twiki/branches/MAIN/lib/TWiki/UI

[<de...@de...>]

Author: MichaelDaum
Date: 2007-01-10 08:41:07 -0600 (Wed, 10 Jan 2007)
New Revision: 12494

Modified:
   twiki/branches/MAIN/lib/TWiki/UI/Register.pm
Log:
Item3422: fixed bulk registration so that data passes validation



Modified: twiki/branches/MAIN/lib/TWiki/UI/Register.pm
===================================================================
--- twiki/branches/MAIN/lib/TWiki/UI/Register.pm	2007-01-10 14:40:30 UTC (rev 12493)
+++ twiki/branches/MAIN/lib/TWiki/UI/Register.pm	2007-01-10 14:41:07 UTC (rev 12494)
@@ -235,6 +235,7 @@
         #-- Following two lines untaint WikiName as required and verify it is
         #-- not zero length
         $row->{WikiName} = TWiki::Sandbox::untaintUnchecked($row->{WikiName});
+        $row->{LoginName} = $row->{WikiName} unless $row->{LoginName};
         next ROW if (length($row->{WikiName}) == 0);
 
         try {
@@ -1063,22 +1064,23 @@
                                     params => [ $data->{WikiName} ] );
     }
 
-    my $doCheckPasswordLength  =
-        ($TWiki::cfg{PasswordManager}  ne  'none')  &&
-	!$TWiki::cfg{Register}{AllowLoginName}      &&
-         $TWiki::cfg{MinPasswordLength};
-    if ($doCheckPasswordLength &&
-          (!$data->{passwordA} ||
-             length($data->{passwordA}) < $TWiki::cfg{MinPasswordLength})) {
-        throw TWiki::OopsException(
-            'attention',
-            web => $data->{webName},
-            topic => $topic,
-            def => 'bad_password',
-            params => [ $TWiki::cfg{MinPasswordLength} ] );
-    }
+    if (exists $data->{passwordA}) {
+        # check password length
+        my $doCheckPasswordLength  =
+            ($TWiki::cfg{PasswordManager}  ne  'none')  &&
+            !$TWiki::cfg{Register}{AllowLoginName}      &&
+             $TWiki::cfg{MinPasswordLength};
 
-    if (exists $data->{passwordA}) {
+        if ($doCheckPasswordLength &&
+            length($data->{passwordA}) < $TWiki::cfg{MinPasswordLength}) {
+            throw TWiki::OopsException(
+                'attention',
+                web => $data->{webName},
+                topic => $topic,
+                def => 'bad_password',
+                params => [ $TWiki::cfg{MinPasswordLength} ] );
+        }
+
         # check if passwords are identical
         if ( $data->{passwordA} ne $data->{passwordB} ) {
             throw TWiki::OopsException( 'attention',