* Patch from hb to fix the pagestats plugin, which was broken by a past

[ikiwiki.git] / IkiWiki / Plugin / passwordauth.pm

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index 86a5ba49e964fd6456a4249e0b82ae4dff9e6c0d..1520cea837c5a5b014bcab4b4763930ac0059cdb 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -26,6 +26,7 @@ sub formbuilder_setup (@) { #{{{
                
                if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
                        $form->field(name => "confirm_password", type => "password");
+                       $form->field(name => "account_creation_password", type => "password") if (length $config{account_creation_password});
                        $form->field(name => "email", size => 50);
                        $form->title("register");
                        $form->text("");
@@ -51,6 +52,13 @@ sub formbuilder_setup (@) { #{{{
                                                shift eq $form->field("password");
                                        },
                                );
+                               $form->field(
+                                       name => "account_creation_password",
+                                       validate => sub {
+                                               shift eq $config{account_creation_password};
+                                       },
+                                       required => 1,
+                               ) if (length $config{account_creation_password});
                                $form->field(
                                        name => "email",
                                        validate => "EMAIL",
@@ -189,7 +197,7 @@ sub formbuilder (@) { #{{{
                if ($form->submitted eq "Save Preferences" && $form->validate) {
                        my $user_name=$form->field('name');
                        foreach my $field (qw(password)) {
-                               if (defined $form->field($field) && length $form->field($field)) {
+                               if (defined $form->field($field)) {
                                        IkiWiki::userinfo_set($user_name, $field, $form->field($field)) ||
                                                error("failed to set $field");
                                }