X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ddc9441beb0c85e1f7578f4e31c9bf5497955e5e..cd8fbd3ec531508b2d2376afd9341f27ec08b4f6:/IkiWiki/Plugin/attachment.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index d56dd18ad..852769f60 100644
--- 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) &&
@@ -156,14 +158,15 @@ sub formbuilder (@) {
 			}
 			$add.="\n";
 		}
+		my $content = $form->field('editcontent');
 		$form->field(name => 'editcontent',
-			value => $form->field('editcontent')."\n\n".$add,
+			value => $content."\n\n".$add,
 			force => 1) if length $add;
 	}
 	
 	# Generate the attachment list only after having added any new
 	# attachments.
-	$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
+	$form->tmpl_param("attachment_list" => [attachment_list(scalar $form->field('page'))]);
 }
 
 sub attachment_holding_location {
@@ -190,13 +193,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,20 +215,20 @@ 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);
 	$filename=~s/.*\\+(.+)/$1/; # hello, windows
 	$filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
-	my $dest=attachment_holding_location($form->field('page'));
+	my $dest=attachment_holding_location(scalar $form->field('page'));
 	
 	# Check that the user is allowed to edit the attachment.
 	my $final_filename=
 		linkpage(IkiWiki::possibly_foolish_untaint(
-			attachment_location($form->field('page')))).
+			attachment_location(scalar $form->field('page')))).
 		$filename;
 	eval {
 		if (IkiWiki::file_pruned($final_filename)) {
@@ -272,12 +282,12 @@ sub attachments_save {
 
 	# Move attachments out of holding directory.
 	my @attachments;
-	my $dir=attachment_holding_location($form->field('page'));
+	my $dir=attachment_holding_location(scalar $form->field('page'));
 	foreach my $filename (glob("$dir/*")) {
 		$filename=Encode::decode_utf8($filename);
 		next unless -f $filename;
 		my $destdir=linkpage(IkiWiki::possibly_foolish_untaint(
-			attachment_location($form->field('page'))));
+			attachment_location(scalar $form->field('page'))));
 		my $absdestdir=$config{srcdir}."/".$destdir;
 		my $destfile=IkiWiki::basename($filename);
 		my $dest=$absdestdir.$destfile;