diff options
| -rw-r--r-- | IkiWiki/Plugin/openid.pm | 14 | ||||
| -rw-r--r-- | IkiWiki/Plugin/passwordauth.pm | 19 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 24 insertions, 12 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index dc0e0f48e..b60740c0e 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -82,13 +82,13 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences") { - if (! defined $form->field(name => "name")) { - $form->field(name => "OpenID", disabled => 1, - value => $session->param("name"), - size => 50, force => 1, - fieldset => "login"); - } + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { + $form->field(name => "openid_url", disabled => 1, + label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), + value => $session->param("name"), + size => 50, force => 1, + fieldset => "login"); } } diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 8cf5af51e..b70f9b788 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -104,11 +104,11 @@ sub formbuilder_setup (@) { my $session=$params{session}; my $cgi=$params{cgi}; - if ($form->title eq "signin" || $form->title eq "register") { + if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") { $form->field(name => "name", required => 0); $form->field(name => "password", type => "password", required => 0); - if ($form->submitted eq "Register" || $form->submitted eq "Create Account") { + if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") { $form->field(name => "confirm_password", type => "password"); $form->field(name => "account_creation_password", type => "password") if (defined $config{account_creation_password} && @@ -206,7 +206,8 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences") { + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { $form->field(name => "name", disabled => 1, value => $session->param("name"), force => 1, fieldset => "login"); @@ -232,7 +233,7 @@ sub formbuilder (@) { my $buttons=$params{buttons}; if ($form->title eq "signin" || $form->title eq "register") { - if ($form->submitted && $form->validate) { + if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") { if ($form->submitted eq 'Login') { $session->param("name", $form->field("name")); IkiWiki::cgi_postsignin($cgi, $session); @@ -295,7 +296,7 @@ sub formbuilder (@) { $form->field(name => "name", required => 0); push @$buttons, "Reset Password"; } - elsif ($form->submitted eq "Register") { + elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") { @$buttons="Create Account"; } } @@ -336,6 +337,14 @@ sub sessioncgi ($$) { IkiWiki::cgi_prefs($q, $session); exit; } + elsif ($q->param("do") eq "register") { + # After registration, need to go somewhere, so show prefs page. + $session->param(postsignin => "do=prefs"); + # Due to do=register, this will run in registration-only + # mode. + IkiWiki::cgi_signin($q, $session); + exit; + } } sub auth ($$) { diff --git a/debian/changelog b/debian/changelog index 8e01950a8..9867cf75a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * img: Fix a bug that could taint @links with undef values. * setup automator: Configure Term::Readline to use bold for prompt, rather than default underline. Closes: #517656 + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register + * Improve display of openid in preferences page. -- Joey Hess <joeyh@debian.org> Tue, 26 Jan 2010 22:25:33 -0500 |