fix calls to check_*

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 63944bb81260b5a72a4224879ace1a0ebfc8e761..33f548a1473ba271d4a1ccaaaba44ce92eb292ed 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -22,7 +22,6 @@ sub trusted () { #{{{
 
 sub test () { #{{{
        exit 0 if trusted();
 
 sub test () { #{{{
        exit 0 if trusted();

-       IkiWiki::rcs_test_receive();

        
        # Dummy up a cgi environment to use when calling check_canedit
        # and friends.
        
        # 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 $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};
 
        $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 %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"));
                if (! defined $file || ! length $file ||
                    IkiWiki::file_pruned($file, $config{srcdir})) {
                        error(gettext("bad file name"));


@@ -66,11 +64,10 @@ sub test () { #{{{
                                }
                        }
                        else {
                                }
                        }
                        else {

-                               # TODO
-                               #if (IkiWiki::Plugin::attachment->can("check_canattach") &&
-                               #    IkiWiki::Plugin::attachment::check_canattach($session, $file, $path)) {
-                               #       next;
-                               #}
+                               if (IkiWiki::Plugin::attachment->can("check_canattach") &&
+                                   IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) {
+                                       next;
+                               }

                        }
                }
                elsif ($change->{action} eq 'remove') {
                        }
                }
                elsif ($change->{action} eq 'remove') {