Rebuild for jessie-backports, no source changes (Closes: #807452)

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index aea70429d0bcc3bc86a776ba8b2dde8352483a37..e8135a8fd8be8abc25e05a1bacb0e142e9108a71 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -132,9 +132,11 @@ sub formbuilder (@) {
 
        return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
 
-       my $filename=Encode::decode_utf8($q->param('attachment'));
+       my $filename=Encode::decode_utf8(scalar $q->param('attachment'));
+       my $handle=$q->upload('attachment');
+
        if (defined $filename && length $filename) {
-               attachment_store($filename, $form, $q, $params{session});
+               attachment_store($filename, $handle, $form, $q, $params{session});
        }
 
        if ($form->submitted eq "Save Page") {
@@ -142,9 +144,9 @@ sub formbuilder (@) {
        }
 
        if ($form->submitted eq "Insert Links") {
-               my $page=quotemeta(Encode::decode_utf8($q->param("page")));
+               my $page=quotemeta(Encode::decode_utf8(scalar $q->param("page")));
                my $add="";
-               foreach my $f ($q->param("attachment_select")) {
+               foreach my $f (@{$q->param_fetch("attachment_select")}) {
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&
@@ -190,13 +192,20 @@ sub is_held_attachment {
 # Stores the attachment in a holding area, not yet in the wiki proper.
 sub attachment_store {
        my $filename=shift;
+       my $handle=shift;
        my $form=shift;
        my $q=shift;
        my $session=shift;
-       
-       # This is an (apparently undocumented) way to get the name
-       # of the temp file that CGI writes the upload to.
-       my $tempfile=$q->tmpFileName($filename);
+
+       my $tempfile;
+       if (defined $handle) {
+               # This is what works in CGI.pm 4.09+: $q->tmpFileName($q->upload('attachment'))
+               $tempfile=$q->tmpFileName($handle);
+       }
+       if (! defined $tempfile || ! length $tempfile) {
+               # This is what is *documented* in CGI.pm 4.09: $q->tmpFileName($q->param('attachment'))
+               $tempfile=$q->tmpFileName($filename);
+       }
        if (! defined $tempfile || ! length $tempfile) {
                # perl 5.8 needs an alternative, awful method
                if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
@@ -205,9 +214,9 @@ sub attachment_store {
                                last if defined $tempfile && length $tempfile;
                        }
                }
-               if (! defined $tempfile || ! length $tempfile) {
-                       error("CGI::tmpFileName failed to return the uploaded file name");
-               }
+       }
+       if (! defined $tempfile || ! length $tempfile) {
+               error("CGI::tmpFileName failed to return the uploaded file name");
        }
 
        $filename=IkiWiki::basename($filename);
@@ -229,8 +238,10 @@ sub attachment_store {
                check_canattach($session, $final_filename, $tempfile);
        };
        if ($@) {
-               json_response($q, $form, $dest."/".$filename, $@);
-               error $@;
+               # save error in case called functions clobber $@
+               my $error = $@;
+               json_response($q, $form, $dest."/".$filename, $error);
+               error $error;
        }
 
        # Move the attachment into holding directory.
@@ -274,15 +285,15 @@ sub attachments_save {
        foreach my $filename (glob("$dir/*")) {
                $filename=Encode::decode_utf8($filename);
                next unless -f $filename;
-               my $destdir=$config{srcdir}."/".
-                       linkpage(IkiWiki::possibly_foolish_untaint(
-                               attachment_location($form->field('page'))));
+               my $destdir=linkpage(IkiWiki::possibly_foolish_untaint(
+                       attachment_location($form->field('page'))));
+               my $absdestdir=$config{srcdir}."/".$destdir;
                my $destfile=IkiWiki::basename($filename);
-               my $dest=$destdir.$destfile;
+               my $dest=$absdestdir.$destfile;
                unlink($dest);
-               IkiWiki::prep_writefile($destfile, $destdir);
+               IkiWiki::prep_writefile($destfile, $absdestdir);
                rename($filename, $dest);
-               push @attachments, $dest;
+               push @attachments, $destdir.$destfile;
        }
        return unless @attachments;
        require IkiWiki::Render;