]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
more fixes to subscription prefs
authorJoey Hess <joey@kitenet.net>
Thu, 29 Mar 2012 00:56:22 +0000 (20:56 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 29 Mar 2012 00:56:22 +0000 (20:56 -0400)
IkiWiki/Plugin/notifyemail.pm

index 0c067270cf6e9c4c1bd70baffa96d1c42be0ccb6..58f0c9920716020cbdf38458efbafd3d9d7c4321 100644 (file)
@@ -6,7 +6,6 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
-       hook(type => "formbuilder_setup", id => "notifyemail", call => \&formbuilder_setup);
        hook(type => "formbuilder", id => "notifyemail", call => \&formbuilder);
        hook(type => "getsetup", id => "notifyemail",  call => \&getsetup);
        hook(type => "changes", id => "notifyemail", call => \&notify);
@@ -20,28 +19,23 @@ sub getsetup () {
                },
 }
 
-sub formbuilder_setup (@) {
+sub formbuilder (@) {
        my %params=@_;
-
        my $form=$params{form};
        return unless $form->title eq "preferences";
        my $session=$params{session};
+       my $username=$session->param("name");
        $form->field(name => "subscriptions", size => 50,
                fieldset => "preferences",
                comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
        if (! $form->submitted) {
                $form->field(name => "subscriptions", force => 1,
-                       value => getsubscriptions($session->param("name")));
+                       value => getsubscriptions($username));
+       }
+       elsif ($form->submitted eq "Save Preferences" && $form->validate &&
+              defined $form->field("subscriptions")) {
+               setsubscriptions($username, $form->field('subscriptions'));
        }
-}
-
-sub formbuilder (@) {
-       my %params=@_;
-       my $form=$params{form};
-       return unless $form->title eq "preferences" &&
-               $form->submitted eq "Save Preferences" && $form->validate &&
-               defined $form->field("subscriptions");
-       setsubscriptions($form->field('name'), $form->field('subscriptions'));
 }
 
 sub getsubscriptions ($) {