Changeset 5210

Timestamp:

01/22/10 17:40:06 (2 months ago)

Author:

plim

Message:

 

Location:

plugins/VWPass/trunk/plugins/VWPass

Files:

• config.yaml (modified) (1 diff)
• lib/VWPass.pm (modified) (3 diffs)

plugins/VWPass/trunk/plugins/VWPass/config.yaml

@@ -10 +10 @@
 init_app: $VWPass::VWPass::init_app
 
-callbacks:
-        api_pre_save.author: $VWPass::VWPass::pre_save_author
-        cms_pre_save.author: $VWPass::VWPass::pre_save_author
-
-
-

plugins/VWPass/trunk/plugins/VWPass/lib/VWPass.pm

@@ -22 +22 @@
         
         # password must be at least 8 characters long
-        unless (scalar(split("",$p)) >= 8) { 
+        unless (scalar(split("",$password)) >= 8) { 
                 push(@errors, "Password must be at least 8 characters long."); 
         }
@@ -32 +32 @@
         
         return $error_string;
-}
-  
-sub pre_save_author {
-        my ($cb, $app, $author, $original) = @_;
-        my $password = $app->param('pass') || $app->param('password');
-        my $error_string = password_is_strong($password);
-        $cb->error("$error_string") if ($error_string);
-        return 1;
 }
 
@@ -62 +54 @@
         *MT::CMS::User::save_filter = sub {
                 my ($eh, $app) = @_;
-                my $password = $app->param('pass') || $app->param('password');
-                if ($password) {
-                        my $error_string = password_is_strong($password);
-                        $app->error("$error_string") if ($error_string);
+                
+                if ( !$app->param('id') ) {    # it's a new object
+                        return $app->error("User requires password") if ( !$app->param('pass') );
+                } else {
+                        my $password = $app->param('pass') || $app->param('password');
+                        if ($password) {
+                                my $error_string = password_is_strong($password);
+                                $app->error("$error_string") if ($error_string);
+                        }
                 }
                 return $orig_method2->($eh, $app);