From 6ebb4e262ef70ec85436b7f0bff134009ce08f3b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 16 Jun 2011 13:01:23 -0400
Subject: [PATCH] show ikiwiki error when attachment is rejected

---
 IkiWiki/Plugin/attachment.pm | 62 ++++++++++++++++++++++--------------
 debian/changelog             |  7 ++--
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 4af9ac92b..490014a7e 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -212,22 +212,28 @@ sub attachment_store {
 	$filename=IkiWiki::basename($filename);
 	$filename=~s/.*\\+(.+)/$1/; # hello, windows
 	$filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
+	my $dest=attachment_holding_location($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')))).
 		$filename;
-	if (IkiWiki::file_pruned($final_filename)) {
-		error(gettext("bad attachment filename"));
+	eval {
+		if (IkiWiki::file_pruned($final_filename)) {
+			error(gettext("bad attachment filename"));
+		}
+		IkiWiki::check_canedit($final_filename, $q, $session);
+		# And that the attachment itself is acceptable.
+		check_canattach($session, $final_filename, $tempfile);
+	};
+	if ($@) {
+		json_response($q, $dest."/".$filename, $@);
+		error $@;
 	}
-	IkiWiki::check_canedit($final_filename, $q, $session);
-	# And that the attachment itself is acceptable.
-	check_canattach($session, $final_filename, $tempfile);
 
 	# Move the attachment into holding directory.
 	# Try to use a fast rename; fall back to copying.
-	my $dest=attachment_holding_location($form->field('page'));
 	IkiWiki::prep_writefile($filename, $dest);
 	unlink($dest."/".$filename);
 	if (rename($tempfile, $dest."/".$filename)) {
@@ -253,24 +259,7 @@ sub attachment_store {
 		});
 	}
 
-	# Return JSON response for the jquery file upload widget.
-	if ($q->Accept("application/json") >= 1.0 &&
-	    grep { /application\/json/i } $q->Accept) {
-		eval q{use JSON};
-		error $@ if $@;
-		print "Content-type: application/json\n\n";
-		my $size=-s $dest."/".$filename;
-		print to_json([
-			{
-				name => $filename,
-				size => $size,
-				humansize => IkiWiki::Plugin::filecheck::humansize($size),
-				stored_msg => stored_msg(),
-				
-			}
-		]);
-		exit 0;
-	}
+	json_response($q, $dest."/".$filename, stored_msg());
 }
 
 # Save all stored attachments for a page.
@@ -371,4 +360,29 @@ sub stored_msg {
 	gettext("just uploaded");
 }
 
+sub json_response ($$$) {
+	my $q=shift;
+	my $filename=shift;
+	my $stored_msg=shift;
+
+	# for the jquery file upload widget
+	if ($q->Accept("application/json") >= 1.0 &&
+	    grep { /application\/json/i } $q->Accept) {
+		eval q{use JSON};
+		error $@ if $@;
+		print "Content-type: application/json\n\n";
+		my $size=-s $filename;
+		print to_json([
+			{
+				name => IkiWiki::basename($filename),
+				size => $size,
+				humansize => IkiWiki::Plugin::filecheck::humansize($size),
+				stored_msg => $stored_msg,
+				
+			}
+		]);
+		exit 0;
+	}
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 5900b4e5f..c807c6da2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,12 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
   * attachment: Speed up multiple file uploads by storing uploaded files
     in a staging area until the page is saved/previewed, rather than
     refreshing the site after each upload.
+    (Sponsored by The TOVA Company.)
   * attachment: Files can be dragged into the edit page to upload them.
-    Multiple file upload support. Upload progress bars.
-    Impemented using the jQuery-File-Upload widget.
+    Multiple file batch upload support. Upload progress bars.
+    AJAX special effects. Impemented using the jQuery-File-Upload widget.
+    (If you don't have javascript don't worry, I kept that working too.)
+    (Sponsored by The TOVA Company.)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Jun 2011 10:06:44 -0400
 
-- 
2.44.0