X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1405006fbf8d78e3f629c60a98e01b5254de414e..0ffcafc1305de5ec242f3f0835064682d408c3d0:/IkiWiki/Plugin/attachment.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 4141cc04a..1d392589e 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -15,12 +15,50 @@ sub checkconfig () { #{{{
 	$config{cgi_disable_uploads}=0;
 } #}}}
 
+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//;
+	$page.="/" if length $page;
+	
+	return $page;
+}
+
+sub attachment_list ($) {
+	my $loc=attachment_location(shift);
+
+	my @ret;
+	foreach my $f (values %pagesources) {
+		print STDERR ">>$f\n" if ! defined IkiWiki::pagetype($f);
+		if (! defined IkiWiki::pagetype($f) &&
+		    $f=~m/^\Q$loc\E[^\/]+$/ &&
+		    -e "$config{srcdir}/$f") {
+			push @ret, {
+				"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'">',
+				link => $f,
+				size => (stat(_))[7],
+				mtime => displaytime($IkiWiki::pagemtime{$f}),
+			};
+		}
+	}
+
+	return @ret;
+}
+
 sub formbuilder_setup (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
 
 	if ($form->field("do") eq "edit") {
 		$form->field(name => 'attachment', type => 'file');
+		$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
+
+		# These buttons are not put in the usual place, so
+		# is not added to the normal formbuilder button list.
+		$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" />');
 	}
 	elsif ($form->title eq "preferences") {
 		my $session=$params{session};
@@ -52,7 +90,7 @@ sub formbuilder (@) { #{{{
 
 	return if $form->field("do") ne "edit";
 
-	if ($form->submitted eq "Upload") {
+	if ($form->submitted eq "Upload" || $form->submitted eq "Save Page") {
 		my $q=$params{cgi};
 		my $session=$params{session};
 
@@ -66,15 +104,10 @@ 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=(length $page ? $page."/" : "").IkiWiki::basename($filename);
-		
-		# To untaint the filename, escape any hazardous characters,
-		# and make sure it isn't pruned.
-		$filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename));
+		$filename=IkiWiki::titlepage(
+			IkiWiki::possibly_foolish_untaint(
+				attachment_location($form->field('page')).
+				IkiWiki::basename($filename)));
 		if (IkiWiki::file_pruned($filename, $config{srcdir})) {
 			error(gettext("bad attachment filename"));
 		}
@@ -112,7 +145,6 @@ sub formbuilder (@) { #{{{
 				error("failed to get filehandle");
 			}
 			binmode($fh);
-			print STDERR "copying $filename\n";
 			writefile($filename, $config{srcdir}, undef, 1, sub {
 				IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
 			});
@@ -128,7 +160,6 @@ sub formbuilder (@) { #{{{
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
-		print STDERR "refreshing\n";
 		IkiWiki::refresh();
 		IkiWiki::saveindex();
 	}