call check_canedit

[ikiwiki.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 186f3ea21991439aa97dc8f6478e97b54e6b614d..8babe2be287067865f6253fb39fab1be590f4566 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -6,7 +6,7 @@ use strict;
 use IkiWiki 2.00;
 use CGI;
 $CGI::DISABLE_UPLOADS=0;
-       
+
 # TODO move to admin prefs
 $config{valid_attachments}="(*.mp3 and maxsize(15mb)) or (!ispage() and maxsize(50kb))";
 
@@ -49,6 +49,12 @@ sub formbuilder (@) { #{{{
                        error(gettext("bad attachment filename"));
                }
                
+               # XXX Put the attachment in a subdir corresponding to the
+               # page being edited.
+               # The editpage code has already checked that
+               # $form->field('page') is valid.
+               $filename="XXX/$filename";
+               
                # Use a pagespec to test that the attachment is valid.
                if (exists $config{valid_attachments} &&
                    length $config{valid_attachments}) {
@@ -58,15 +64,29 @@ sub formbuilder (@) { #{{{
                                error(gettext("attachment rejected")." ($result)");
                        }
                }
-               
-               my $fh=$q->upload('attachment');
-               if (! defined $fh || ! ref $fh) {
-                       error("failed to get filehandle");
-               }
-               binmode($fh);
-               while (<$fh>) {
-                       print STDERR $_."\n";
+
+               # Also check that the user is allowed to edit it by other
+               # policies.
+               IkiWiki::check_canedit($filename, $q, $params{session}, 1);
+
+               # Move the attachment into place.
+               # Try to use a fast rename; fall back to copying.
+               prep_writefile($filename, $config{srcdir});
+               unlink($config{srcdir}."/".$filename);
+               if (! rename($tempfile, $config{srcdir}."/".$filename)) {
+                       my $fh=$q->upload('attachment');
+                       if (! defined $fh || ! ref $fh) {
+                               error("failed to get filehandle");
+                       }
+                       binmode($fh);
+                       writefile($filename, $config{srcdir}, undef, 1, sub {
+                               IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
+                       });
                }
+
+               # TODO add to vcs
+               
+               # TODO trigger a wiki build if there's no vcs
        }
 } # }}}
 
@@ -102,7 +122,7 @@ sub match_maxsize ($$;@) { #{{{
 
        my %params=@_;
        if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no tempfile specified");
+               return IkiWiki::FailReason->new("no file specified");
        }
 
        if (-s $params{file} > $maxsize) {
@@ -122,7 +142,7 @@ sub match_minsize ($$;@) { #{{{
 
        my %params=@_;
        if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no tempfile specified");
+               return IkiWiki::FailReason->new("no file specified");
        }
 
        if (-s $params{file} < $minsize) {
@@ -136,7 +156,7 @@ sub match_minsize ($$;@) { #{{{
 sub match_ispage ($$;@) { #{{{
        my $filename=shift;
 
-       if (IkiWiki::pagetype($filename)) {
+       if (defined IkiWiki::pagetype($filename)) {
                return IkiWiki::SuccessReason->new("file is a wiki page");
        }
        else {