really fix calls to check_can*

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 4d437cf78825c33e2b8680c0b458e530c66557fb..c69911a7cfbe0130ef7acf8e5b035e7aeaa880ee 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -22,7 +22,6 @@ sub trusted () { #{{{
 
 sub test () { #{{{
        exit 0 if trusted();
-       IkiWiki::rcs_test_receive();
        
        # Dummy up a cgi environment to use when calling check_canedit
        # and friends.
@@ -31,20 +30,19 @@ sub test () { #{{{
        my $cgi=CGI->new;
        require IkiWiki::CGI;
        my $session=IkiWiki::cgi_getsession($cgi);
-       my $user=getuser();
-       $session->param("name", $user);
+       $session->param("name", getuser());
        $ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
 
-       lockwiki();
-       loadindex();
+       IkiWiki::lockwiki();
+       IkiWiki::loadindex();
 
        my %newfiles;
 
        foreach my $change (IkiWiki::rcs_receive()) {
                # This untaint is safe because we check file_pruned and
                # wiki_file_regexp.
-               my $file=$change->{file}=~/$config{wiki_file_regexp}/;
-               $file=possibly_foolish_untaint($file);
+               my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
+               $file=IkiWiki::possibly_foolish_untaint($file);
                if (! defined $file || ! length $file ||
                    IkiWiki::file_pruned($file, $config{srcdir})) {
                        error(gettext("bad file name"));
@@ -60,15 +58,15 @@ sub test () { #{{{
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
-                               if (IkiWiki->can("check_canedit") &&
-                                   IkiWiki::check_canedit($page, $cgi, $session)) {
-                                       next;
+                               if (IkiWiki->can("check_canedit")) {
+                                   IkiWiki::check_canedit($page, $cgi, $session);
+                                   next;
                                }
                        }
                        else {
-                               if (IkiWiki::Plugin::attachment->can("check_canattach") &&
-                                   IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) {
-                                       next;
+                               if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+                                       IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+                                       next;
                                }
                        }
                }
@@ -82,15 +80,15 @@ sub test () { #{{{
                        # could add.)
                        next if $newfiles{$file};
 
-                       if (IkiWiki::Plugin::remove->can("check_canremove") &&
-                           IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) {
+                       if (IkiWiki::Plugin::remove->can("check_canremove")) {
+                               IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
                                next;
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
-                               
+               
                error sprintf(gettext("you are not allowed to change %s"), $file);
        }