X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/34e8c78c1c9bf65564c1a3086584158e5c3cc415..e2cb19ed9e107d89251655232649a6d2eb9c187b:/IkiWiki/Plugin/attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8c3ff887a..7f88010b5 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -58,7 +58,7 @@ sub check_canattach ($$;$) {
 			$config{allowed_attachments},
 			file => $file,
 			user => $session->param("name"),
-			ip => $ENV{REMOTE_ADDR},
+			ip => $session->remote_addr(),
 		);
 	}
 
@@ -92,7 +92,7 @@ sub formbuilder_setup (@) {
 		# Add the toggle javascript; the attachments interface uses
 		# it to toggle visibility.
 		require IkiWiki::Plugin::toggle;
-		$form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}, 1));
+		$form->tmpl_param("javascript" => IkiWiki::Plugin::toggle::include_javascript($params{page}));
 		# Start with the attachments interface toggled invisible,
 		# but if it was used, keep it open.
 		if ($form->submitted ne "Upload Attachment" &&
@@ -116,86 +116,26 @@ sub formbuilder (@) {
 	my $filename=Encode::decode_utf8($q->param('attachment'));
 	if (defined $filename && length $filename &&
             ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
-		my $session=$params{session};
-		
-		# 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);
-		if (! defined $tempfile || ! length $tempfile) {
-			# perl 5.8 needs an alternative, awful method
-			if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
-				foreach my $key (keys(%{$q->{'.tmpfiles'}})) {
-					$tempfile=$q->tmpFileName(\$key);
-					last if defined $tempfile && length $tempfile;
-				}
-			}
-			if (! defined $tempfile || ! length $tempfile) {
-				error("CGI::tmpFileName failed to return the uploaded file name");
-			}
-		}
-
-		$filename=linkpage(IkiWiki::possibly_foolish_untaint(
-				attachment_location($form->field('page')).
-				IkiWiki::basename($filename)));
-		if (IkiWiki::file_pruned($filename)) {
-			error(gettext("bad attachment filename"));
-		}
-		
-		# Check that the user is allowed to edit a page with the
-		# name of the attachment.
-		IkiWiki::check_canedit($filename, $q, $session, 1);
-		# And that the attachment itself is acceptable.
-		check_canattach($session, $filename, $tempfile);
-
-		# Needed for fast_file_copy and for rendering below.
-		require IkiWiki::Render;
-
-		# Move the attachment into place.
-		# Try to use a fast rename; fall back to copying.
-		IkiWiki::prep_writefile($filename, $config{srcdir});
-		unlink($config{srcdir}."/".$filename);
-		if (rename($tempfile, $config{srcdir}."/".$filename)) {
-			# The temp file has tight permissions; loosen up.
-			chmod(0666 & ~umask, $config{srcdir}."/".$filename);
-		}
-		else {
-			my $fh=$q->upload('attachment');
-			if (! defined $fh || ! ref $fh) {
-				# needed by old CGI versions
-				$fh=$q->param('attachment');
-				if (! defined $fh || ! ref $fh) {
-					# even that doesn't always work,
-					# fall back to opening the tempfile
-					$fh=undef;
-					open($fh, "<", $tempfile) || error("failed to open \"$tempfile\": $!");
-				}
-			}
-			binmode($fh);
-			writefile($filename, $config{srcdir}, undef, 1, sub {
-				IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
-			});
-		}
-
-		# Check the attachment in and trigger a wiki refresh.
-		if ($config{rcs}) {
-			IkiWiki::rcs_add($filename);
-			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($filename, gettext("attachment upload"),
-				IkiWiki::rcs_prepedit($filename),
-				$session->param("name"), $ENV{REMOTE_ADDR});
-			IkiWiki::enable_commit_hook();
-			IkiWiki::rcs_update();
-		}
-		IkiWiki::refresh();
-		IkiWiki::saveindex();
+		attachment_store($filename, $form, $q, $params{session});
+	}
+	if ($form->submitted eq "Save Page") {
+		attachments_save($form, $params{session});
 	}
-	elsif ($form->submitted eq "Insert Links") {
+
+	if ($form->submitted eq "Insert Links") {
 		my $page=quotemeta(Encode::decode_utf8($q->param("page")));
 		my $add="";
 		foreach my $f ($q->param("attachment_select")) {
 			$f=Encode::decode_utf8($f);
 			$f=~s/^$page\///;
-			$add.="[[$f]]\n";
+			if (IkiWiki::isinlinableimage($f) &&
+			    UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+				$add.='[[!img '.$f.' align="right" size="" alt=""]]';
+			}
+			else {
+				$add.="[[$f]]";
+			}
+			$add.="\n";
 		}
 		$form->field(name => 'editcontent',
 			value => $form->field('editcontent')."\n\n".$add,
@@ -207,6 +147,118 @@ sub formbuilder (@) {
 	$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 }
 
+sub attachment_holding_dir {
+	my $page=shift;
+
+	return $config{wikistatedir}."/attachments/".
+		IkiWiki::possibly_foolish_untaint(linkpage($page));
+}
+
+# Stores the attachment in a holding area, not yet in the wiki proper.
+sub attachment_store {
+	my $filename=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);
+	if (! defined $tempfile || ! length $tempfile) {
+		# perl 5.8 needs an alternative, awful method
+		if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
+			foreach my $key (keys(%{$q->{'.tmpfiles'}})) {
+				$tempfile=$q->tmpFileName(\$key);
+				last if defined $tempfile && length $tempfile;
+			}
+		}
+		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));
+	
+	# 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"));
+	}
+	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)) {
+		# The temp file has tight permissions; loosen up.
+		chmod(0666 & ~umask, $dest."/".$filename);
+	}
+	else {
+		my $fh=$q->upload('attachment');
+		if (! defined $fh || ! ref $fh) {
+			# needed by old CGI versions
+			$fh=$q->param('attachment');
+			if (! defined $fh || ! ref $fh) {
+				# even that doesn't always work,
+				# fall back to opening the tempfile
+				$fh=undef;
+				open($fh, "<", $tempfile) || error("failed to open \"$tempfile\": $!");
+			}
+		}
+		binmode($fh);
+		# Needed for fast_file_copy.
+		require IkiWiki::Render;
+		writefile($filename, $dest, undef, 1, sub {
+			IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
+		});
+	}
+}
+
+# Save all stored attachments for a page.
+sub attachments_save {
+	my $form=shift;
+	my $session=shift;
+
+	# Move attachments out of holding directory.
+	my @attachments;
+	my $dir=attachment_holding_dir($form->field('page'));
+	foreach my $filename (glob("$dir/*")) {
+		next unless -f $filename;
+		my $dest=$config{srcdir}."/".
+			linkpage(IkiWiki::possibly_foolish_untaint(
+				attachment_location($form->field('page')))).
+			$filename;
+		unlink($dest);
+		rename($filename, $dest);
+		push @attachments, $dest;
+	}
+	return unless @attachments;
+	rmdir($dir);
+
+	# Check the attachments in and trigger a wiki refresh.
+	if ($config{rcs}) {
+		IkiWiki::rcs_add($_) foreach @attachments;
+		IkiWiki::disable_commit_hook();
+		IkiWiki::rcs_commit_staged(
+			message => gettext("attachment upload"),
+			session => $session,
+		);
+		IkiWiki::enable_commit_hook();
+		IkiWiki::rcs_update();
+	}
+	IkiWiki::refresh();
+	IkiWiki::saveindex();
+}
+
 sub attachment_location ($) {
 	my $page=shift;
 	
@@ -222,24 +274,39 @@ sub attachment_list ($) {
 	my $page=shift;
 	my $loc=attachment_location($page);
 
-	my @ret;
+	# attachments already in the wiki
+	my %attachments;
 	foreach my $f (values %pagesources) {
 		if (! defined pagetype($f) &&
-		    $f=~m/^\Q$loc\E[^\/]+$/ &&
-		    -e "$config{srcdir}/$f") {
-			push @ret, {
+		    $f=~m/^\Q$loc\E[^\/]+$/) {
+			$attachments{$f}={
 				"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
 				link => htmllink($page, $page, $f, noimageinline => 1),
-				size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
+				size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]),
 				mtime => displaytime($IkiWiki::pagemtime{$f}),
 				mtime_raw => $IkiWiki::pagemtime{$f},
 			};
 		}
 	}
+	
+	# attachments in holding directory
+	my $dir=attachment_holding_dir($page);
+	foreach my $file (glob("$dir/*")) {
+		my $mtime=(stat($file))[9];
+		my $f=IkiWiki::basename($file);
+		$attachments{$f}={
+			"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
+			link => $f, # no link possible
+			size => IkiWiki::Plugin::filecheck::humansize((stat($file))[7]),
+			mtime => displaytime($mtime),
+			mtime_raw => $mtime,
+		}
+	}
 
 	# 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} } @ret;
+	return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} }
+		values %attachments;
 }
 
 1