bugfixes

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 6168ea589073f9c9b4272d96ba4187ec458b8f3f..d2989bb8b8b45d625269a6ae7b96fd37428dad0e 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))";
 
@@ -32,7 +32,7 @@ sub formbuilder (@) { #{{{
 
        if ($form->submitted eq "Upload") {
                my $q=$params{cgi};
-               my $filename=IkiWiki::basename($q->param('attachment'));
+               my $filename=$q->param('attachment');
                if (! defined $filename || ! length $filename) {
                        # no file, so do nothing
                        return;
@@ -42,13 +42,23 @@ sub formbuilder (@) { #{{{
                # of the temp file that CGI writes the upload to.
                my $tempfile=$q->tmpFileName($filename);
                
+               # Put the attachment in a subdir of the page it's attached
+               # to, unless that page is an "index" page.
+               my $page=$form->field('page');
+               $page=~s/(^|\/)index//;
+               $filename=$page."/".IkiWiki::basename($filename);
+               
                # To untaint the filename, escape any hazardous characters,
                # and make sure it isn't pruned.
-               $filename=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($filename));
+               $filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename));
                if (IkiWiki::file_pruned($filename, $config{srcdir})) {
                        error(gettext("bad attachment filename"));
                }
                
+               # Check that the user is allowed to edit a page with the
+               # name of the attachment.
+               IkiWiki::check_canedit($filename, $q, $params{session}, 1);
+               
                # Use a pagespec to test that the attachment is valid.
                if (exists $config{valid_attachments} &&
                    length $config{valid_attachments}) {
@@ -58,15 +68,25 @@ 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";
+
+               # Move the attachment into place.
+               # Try to use a fast rename; fall back to copying.
+               IkiWiki::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
        }
 } # }}}
 
@@ -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 {