web commit by JoshTriplett: Use example.org as the example domain throughout. In...

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index fcf5e0dd8c42a5ba4c7297e1edf96807ba6a04d1..ce4b6ada18ebd486a4ed12c2ae9f2e0b55097fb4 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -74,10 +74,13 @@ sub cgi_recentchanges ($) { #{{{
        # during page builds as the return values may change, but they
        # won't here.)
        eval q{use Memoize};
+       error($@) if $@;
        memoize("htmllink");
 
        eval q{use Time::Duration};
+       error($@) if $@;
        eval q{use CGI 'escapeHTML'};
+       error($@) if $@;
 
        my $changelog=[rcs_recentchanges(100)];
        foreach my $change (@$changelog) {
@@ -114,9 +117,10 @@ sub cgi_signin ($$) { #{{{
        my $session=shift;
 
        eval q{use CGI::FormBuilder};
+       error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "signin",
-               fields => [qw(do title page subpage from name password confirm_password email)],
+               fields => [qw(do title page subpage from name password)],
                header => 1,
                charset => "utf-8",
                method => 'POST',
@@ -145,8 +149,13 @@ sub cgi_signin ($$) { #{{{
        $form->field(name => "from", type => "hidden");
        $form->field(name => "subpage", type => "hidden");
        $form->field(name => "password", type => "password", required => 0);
-       $form->field(name => "confirm_password", type => "password", required => 0);
-       $form->field(name => "email", required => 0);
+       if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
+               $form->title("register");
+               $form->text("");
+               $form->fields(qw(do title page subpage from name password confirm_password email));
+               $form->field(name => "confirm_password", type => "password");
+               $form->field(name => "email", type => "text");
+       }
        if ($q->param("do") ne "signin" && !$form->submitted) {
                $form->text("You need to log in first.");
        }
@@ -155,7 +164,8 @@ sub cgi_signin ($$) { #{{{
                # Set required fields based on how form was submitted.
                my %required=(
                        "Login" => [qw(name password)],
-                       "Register" => [qw(name password confirm_password email)],
+                       "Register" => [],
+                       "Create Account" => [qw(name password confirm_password email)],
                        "Mail Password" => [qw(name)],
                );
                foreach my $opt (@{$required{$form->submitted}}) {
@@ -179,7 +189,8 @@ sub cgi_signin ($$) { #{{{
                }
                # And make sure the entered name exists when logging
                # in or sending email, and does not when registering.
-               if ($form->submitted eq 'Register') {
+               if ($form->submitted eq 'Create Account' ||
+                   $form->submitted eq 'Register') {
                        $form->field(
                                name => "name",
                                validate => sub {
@@ -204,8 +215,6 @@ sub cgi_signin ($$) { #{{{
        else {
                # First time settings.
                $form->field(name => "name", comment => "use FirstnameLastName");
-               $form->field(name => "confirm_password", comment => "(only needed");
-               $form->field(name => "email",            comment => "for registration)");
                if ($session->param("name")) {
                        $form->field(name => "name", value => $session->param("name"));
                }
@@ -228,7 +237,7 @@ sub cgi_signin ($$) { #{{{
                                redirect($q, $config{url});
                        }
                }
-               elsif ($form->submitted eq 'Register') {
+               elsif ($form->submitted eq 'Create Account') {
                        my $user_name=$form->field('name');
                        if (userinfo_setall($user_name, {
                                           'email' => $form->field('email'),
@@ -237,12 +246,12 @@ sub cgi_signin ($$) { #{{{
                                         })) {
                                $form->field(name => "confirm_password", type => "hidden");
                                $form->field(name => "email", type => "hidden");
-                               $form->text("Registration successful. Now you can Login.");
+                               $form->text("Account creation successful. Now you can Login.");
                                printheader($session);
                                print misctemplate($form->title, $form->render(submit => ["Login"]));
                        }
                        else {
-                               error("Error saving registration.");
+                               error("Error creating account.");
                        }
                }
                elsif ($form->submitted eq 'Mail Password') {
@@ -257,6 +266,7 @@ sub cgi_signin ($$) { #{{{
                        );
                        
                        eval q{use Mail::Sendmail};
+                       error($@) if $@;
                        sendmail(
                                To => userinfo_get($user_name, "email"),
                                From => "$config{wikiname} admin <$config{adminemail}>",
@@ -267,9 +277,17 @@ sub cgi_signin ($$) { #{{{
                        $form->text("Your password has been emailed to you.");
                        $form->field(name => "name", required => 0);
                        printheader($session);
-                       print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
+                       print misctemplate($form->title, $form->render(submit => ["Login", "Mail Password"]));
+               }
+               elsif ($form->submitted eq "Register") {
+                       printheader($session);
+                       print misctemplate($form->title, $form->render(submit => ["Create Account"]));
                }
        }
+       elsif ($form->submitted eq "Create Account") {
+               printheader($session);
+               print misctemplate($form->title, $form->render(submit => ["Create Account"]));
+       }
        else {
                printheader($session);
                print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
@@ -281,6 +299,7 @@ sub cgi_prefs ($$) { #{{{
        my $session=shift;
 
        eval q{use CGI::FormBuilder};
+       error($@) if $@;
        my $form = CGI::FormBuilder->new(
                title => "preferences",
                fields => [qw(do name password confirm_password email 
@@ -375,6 +394,7 @@ sub cgi_editpage ($$) { #{{{
        my @buttons=("Save Page", "Preview", "Cancel");
        
        eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+       error($@) if $@;
        my $renderer=CGI::FormBuilder::Template::HTML->new(
                fields => \@fields,
                template_params("editpage.tmpl"),
@@ -626,8 +646,8 @@ sub cgi_editpage ($$) { #{{{
 } #}}}
 
 sub cgi () { #{{{
-       eval q{use CGI};
-       eval q{use CGI::Session};
+       eval q{use CGI; use CGI::Session};
+       error($@) if $@;
        
        my $q=CGI->new;
        
@@ -691,8 +711,9 @@ sub cgi () { #{{{
                }
        }
 
-       if (userinfo_get($session->param("name"), "banned")) {
+       if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
                print $q->header(-status => "403 Forbidden");
+               $session->delete();
                print "You are banned.";
                exit;
        }