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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index f8a3a68c6..d56dd18ad 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -6,7 +6,9 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	add_underlay("attachment");
 	add_underlay("javascript");
+	add_underlay("jquery");
 	hook(type => "getsetup", id => "attachment", call => \&getsetup);
 	hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
 	hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
@@ -89,10 +91,20 @@ sub formbuilder_setup (@) {
 		$form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
 		$form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
 
-		# Add the toggle javascript; the attachments interface uses
-		# it to toggle visibility.
+		# Add all the javascript used by the attachments interface.
 		require IkiWiki::Plugin::toggle;
-		$form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}));
+		my $js=IkiWiki::Plugin::toggle::include_javascript($params{page});
+		$js.='<link rel="stylesheet" href="'.urlto("ikiwiki/jquery-ui.min.css", $params{page}).'" id="theme">'."\n";
+		my @jsfiles=qw{jquery.min jquery-ui.min
+			jquery.tmpl.min jquery.iframe-transport
+			jquery.fileupload jquery.fileupload-ui
+		};
+		foreach my $file (@jsfiles) {
+			$js.='<script src="'.urlto("ikiwiki/$file.js", $params{page}).
+			     '" type="text/javascript" charset="utf-8"></script>'."\n";
+		}
+		$form->tmpl_param("javascript" => $js);
+
 		# Start with the attachments interface toggled invisible,
 		# but if it was used, keep it open.
 		if ($form->submitted ne "Upload Attachment" &&
@@ -104,9 +116,10 @@ sub formbuilder_setup (@) {
 			$form->tmpl_param("attachments-class" => "toggleable-open");
 		}
 		
-		# Save attachments in holding area before previewing so
-		# they can be seen in the preview.
-		if ($form->submitted eq "Preview") {
+		# Save attachments in holding area before previewing and
+		# saving.
+		if ($form->submitted eq "Preview" ||
+		    $form->submitted eq "Save Page") {
 			attachments_save($form, $params{session});
 		}
 	}
@@ -120,10 +133,10 @@ 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'));
-	if (defined $filename && length $filename &&
-            ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
+	if (defined $filename && length $filename) {
 		attachment_store($filename, $form, $q, $params{session});
 	}
+
 	if ($form->submitted eq "Save Page") {
 		attachments_save($form, $params{session});
 	}
@@ -135,7 +148,7 @@ sub formbuilder (@) {
 			$f=Encode::decode_utf8($f);
 			$f=~s/^$page\///;
 			if (IkiWiki::isinlinableimage($f) &&
-			    UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+			    IkiWiki::Plugin::img->can("import")) {
 				$add.='[[!img '.$f.' align="right" size="" alt=""]]';
 			}
 			else {
@@ -153,18 +166,19 @@ sub formbuilder (@) {
 	$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 }
 
-sub attachment_holding_dir {
+sub attachment_holding_location {
 	my $page=attachment_location(shift);
 
-	return $config{wikistatedir}."/attachments/".
+	my $dir=$config{wikistatedir}."/attachments/".
 		IkiWiki::possibly_foolish_untaint(linkpage($page));
+	$dir=~s/\/$//;
+	return $dir;
 }
 
 sub is_held_attachment {
 	my $attachment=shift;
 
-	my $f=attachment_holding_dir($attachment);
-	$f=~s/\/$//;
+	my $f=attachment_holding_location($attachment);
 	if (-f $f) {
 		return $f
 	}
@@ -199,22 +213,30 @@ 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 ($@) {
+		# save error in case called functions clobber $@
+		my $error = $@;
+		json_response($q, $form, $dest."/".$filename, $error);
+		error $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_dir($form->field('page'));
 	IkiWiki::prep_writefile($filename, $dest);
 	unlink($dest."/".$filename);
 	if (rename($tempfile, $dest."/".$filename)) {
@@ -239,6 +261,8 @@ sub attachment_store {
 			IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
 		});
 	}
+
+	json_response($q, $form, $dest."/".$filename, stored_msg());
 }
 
 # Save all stored attachments for a page.
@@ -248,20 +272,23 @@ sub attachments_save {
 
 	# Move attachments out of holding directory.
 	my @attachments;
-	my $dir=attachment_holding_dir($form->field('page'));
+	my $dir=attachment_holding_location($form->field('page'));
 	foreach my $filename (glob("$dir/*")) {
+		$filename=Encode::decode_utf8($filename);
 		next unless -f $filename;
-		my $dest=$config{srcdir}."/".
-			linkpage(IkiWiki::possibly_foolish_untaint(
-				attachment_location($form->field('page')))).
-			IkiWiki::basename($filename);
+		my $destdir=linkpage(IkiWiki::possibly_foolish_untaint(
+			attachment_location($form->field('page'))));
+		my $absdestdir=$config{srcdir}."/".$destdir;
+		my $destfile=IkiWiki::basename($filename);
+		my $dest=$absdestdir.$destfile;
 		unlink($dest);
+		IkiWiki::prep_writefile($destfile, $absdestdir);
 		rename($filename, $dest);
-		push @attachments, $dest;
+		push @attachments, $destdir.$destfile;
 	}
 	return unless @attachments;
 	require IkiWiki::Render;
-	IkiWiki::prune($dir);
+	IkiWiki::prune($dir, $config{wikistatedir}."/attachments");
 
 	# Check the attachments in and trigger a wiki refresh.
 	if ($config{rcs}) {
@@ -282,8 +309,8 @@ sub attachment_location ($) {
 	my $page=shift;
 	
 	# Put the attachment in a subdir of the page it's attached
-	# to, unless that page is an "index" page.
-	$page=~s/(^|\/)index//;
+	# to, unless that page is the "index" page.
+	return "" if $page eq 'index';
 	$page.="/" if length $page;
 	
 	return $page;
@@ -296,11 +323,12 @@ sub attachment_list ($) {
 	my $std=sub {
 		my $file=shift;
 		my $mtime=shift;
+		my $date=shift;
 		my $size=shift;
 
-		"field-select" => '<input type="checkbox" name="attachment_select" value="'.$file.'" />',
+		name => $file,
 		size => IkiWiki::Plugin::filecheck::humansize($size),
-		mtime => displaytime($mtime),
+		mtime => $date,
 		mtime_raw => $mtime,
 	};
 
@@ -310,30 +338,58 @@ sub attachment_list ($) {
 		if (! defined pagetype($f) &&
 		    $f=~m/^\Q$loc\E[^\/]+$/) {
 			$attachments{$f}={
-				$std->($f, $IkiWiki::pagemtime{$f}, (stat($f))[7]),
+				$std->($f, $IkiWiki::pagemtime{$f}, displaytime($IkiWiki::pagemtime{$f}), (stat($f))[7]),
 				link => htmllink($page, $page, $f, noimageinline => 1),
 			};
 		}
 	}
 	
 	# attachments in holding directory
-	my $dir=attachment_holding_dir($page);
+	my $dir=attachment_holding_location($page);
 	my $heldmsg=gettext("this attachment is not yet saved");
 	foreach my $file (glob("$dir/*")) {
+		$file=Encode::decode_utf8($file);
 		next unless -f $file;
-		my $mtime=(stat(_))[9];
 		my $base=IkiWiki::basename($file);
 		my $f=$loc.$base;
 		$attachments{$f}={
-			$std->($f, (stat($file))[9], (stat(_))[7]),
-			link => "<span title=\"$heldmsg\">$base</span>",
+			$std->($f, (stat($file))[9]*2, stored_msg(), (stat(_))[7]),
+			link => $base,
 		}
 	}
 
-	# Sort newer attachments to the top of the list, so a newly-added
-	# attachment appears just before the form used to add it.
-	return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} }
+	# Sort newer attachments to the end of the list.
+	return sort { $a->{mtime_raw} <=> $b->{mtime_raw} || $a->{link} cmp $b->{link} }
 		values %attachments;
 }
 
+sub stored_msg {
+	gettext("just uploaded");
+}
+
+sub json_response ($$$$) {
+	my $q=shift;
+	my $form=shift;
+	my $filename=shift;
+	my $stored_msg=shift;
+
+	if (! defined $form->submitted ||
+	    $form->submitted ne "Upload Attachment") {
+		eval q{use JSON};
+		error $@ if $@;
+		print "Content-type: text/html\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