formatting, layout, indentation, coding style

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

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index e0e8e51df2141feff7fa1285e843e881cac55684..90e2ca56493767f655984973dddb80af58fd1285 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -4,35 +4,39 @@ package IkiWiki::Plugin::passwordauth;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup);
         hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup);
         hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder);
        hook(type => "sessioncgi", id => "passwordauth", call => \&sessioncgi);
        hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup);
         hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup);
         hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder);
        hook(type => "sessioncgi", id => "passwordauth", call => \&sessioncgi);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },

                account_creation_password => {
                        type => "string",
                account_creation_password => {
                        type => "string",

-                       default => "",
+                       example => "s3cr1t",

                        description => "a password that must be entered when signing up for an account",
                        safe => 1,
                        rebuild => 0,
                },
                password_cost => {
                        type => "integer",
                        description => "a password that must be entered when signing up for an account",
                        safe => 1,
                        rebuild => 0,
                },
                password_cost => {
                        type => "integer",

-                       default => 8,
+                       example => 8,

                        description => "cost of generating a password using Authen::Passphrase::BlowfishCrypt",
                        safe => 1,
                        rebuild => 0,
                },
                        description => "cost of generating a password using Authen::Passphrase::BlowfishCrypt",
                        safe => 1,
                        rebuild => 0,
                },

-} #}}}
+}

 
 # Checks if a string matches a user's password, and returns true or false.
 
 # Checks if a string matches a user's password, and returns true or false.

-sub checkpassword ($$;$) { #{{{
+sub checkpassword ($$;$) {

        my $user=shift;
        my $password=shift;
        my $field=shift || "password";
        my $user=shift;
        my $password=shift;
        my $field=shift || "password";


@@ -70,9 +74,9 @@ sub checkpassword ($$;$) { #{{{
        }
 
        return $ret;
        }
 
        return $ret;

-} #}}}
+}

 
 

-sub setpassword ($$;$) { #{{{
+sub setpassword ($$;$) {

        my $user=shift;
        my $password=shift;
        my $field=shift || "password";
        my $user=shift;
        my $password=shift;
        my $field=shift || "password";


@@ -90,9 +94,9 @@ sub setpassword ($$;$) { #{{{
        else {
                IkiWiki::userinfo_set($user, $field, $password);
        }
        else {
                IkiWiki::userinfo_set($user, $field, $password);
        }

-} #}}}
+}

 
 

-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {

        my %params=@_;
 
        my $form=$params{form};
        my %params=@_;
 
        my $form=$params{form};


@@ -218,7 +222,7 @@ sub formbuilder_setup (@) { #{{{
        }
 }
 
        }
 }
 

-sub formbuilder (@) { #{{{
+sub formbuilder (@) {

        my %params=@_;
 
        my $form=$params{form};
        my %params=@_;
 
        my $form=$params{form};


@@ -279,7 +283,9 @@ sub formbuilder (@) { #{{{
                                error($@) if $@;
                                sendmail(
                                        To => IkiWiki::userinfo_get($user_name, "email"),
                                error($@) if $@;
                                sendmail(
                                        To => IkiWiki::userinfo_get($user_name, "email"),

-                                       From => "$config{wikiname} admin <$config{adminemail}>",
+                                       From => "$config{wikiname} admin <".
+                                               (defined $config{adminemail} ? $config{adminemail} : "")
+                                               .">",

                                        Subject => "$config{wikiname} information",
                                        Message => $template->output,
                                ) or error(gettext("Failed to send mail"));
                                        Subject => "$config{wikiname} information",
                                        Message => $template->output,
                                ) or error(gettext("Failed to send mail"));


@@ -307,9 +313,9 @@ sub formbuilder (@) { #{{{
                        }
                }
        }
                        }
                }
        }

-} #}}}
+}

 
 

-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {

        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 


@@ -329,6 +335,6 @@ sub sessioncgi ($$) { #{{{
                IkiWiki::cgi_prefs($q, $session);
                exit;
        }
                IkiWiki::cgi_prefs($q, $session);
                exit;
        }

-} #}}}
+}

 
 1
 
 1