Changeset 2820 for branches/release-41/lib/MT/CMS/User.pm

Timestamp:

07/19/08 22:39:51 (17 months ago)

Author:

bchoate

Message:

Make the display name a required field for all authentication methods. BugId:80675

Files:

• branches/release-41/lib/MT/CMS/User.pm (modified) (3 diffs)

branches/release-41/lib/MT/CMS/User.pm

@@ -1557 +1557 @@
     my $name     = $app->param('name');
     my $nickname = $app->param('nickname');
+
     if ( $pref eq 'MT' ) {
         if ( defined $name ) {
@@ -1564 +1565 @@
         return $eh->error( $app->translate("User requires username") )
           if ( !$name );
-
-        if ( defined $nickname ) {
-            $nickname =~ s/(^\s+|\s+$)//g;
-            $app->param( 'nickname', $nickname );
-        }
+    }
+
+    # Display name is required for all auth types; for new users
+    # under external auth, the field is not shown, so the value is
+    # undefined. Only check requirement if the value is defined.
+    if ( defined $nickname ) {
+        $nickname =~ s/(^\s+|\s+$)//g;
+        $app->param( 'nickname', $nickname );
         return $eh->error( $app->translate("User requires display name") )
-          if ( !$nickname );
+          if ( !length( $nickname ) );
     }
 
@@ -1614 +1618 @@
     if ( $app->param('url') ) {
         my $url = $app->param('url');
-        return $eh->error( MT->translate("Website URL is imperfect") )
+        return $eh->error( MT->translate("Website URL is invalid") )
           unless is_url($url);
     }