correct logic on error fallthrough
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 22:20:34 +0000 (18:20 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 22:20:34 +0000 (18:20 -0400)
IkiWiki/Receive.pm

index 3a5f91758363bd6cd4521af3a7a6e966c2c91488..972e3578de0103650ba5455b609a175b06ea95cf 100644 (file)
@@ -96,11 +96,13 @@ sub test () {
                    $change->{action} eq 'add') {
                        if (defined $page) {
                                IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
                    $change->{action} eq 'add') {
                        if (defined $page) {
                                IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
+                               next;
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
                                        IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
                                        IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
+                                       next;
                                }
                        }
                }
                                }
                        }
                }
@@ -117,11 +119,14 @@ sub test () {
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
                                IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
                                IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
+                               next;
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
+               
+               error sprintf(gettext("you are not allowed to change %s"), $file);
        }
 
        exit 0;
        }
 
        exit 0;