X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/af9c5e4bbadc87850f435cfc530ffc1d81419564..885e4b607ae6cdcd48c792ce45c8b7faa29a76fb:/IkiWiki/Plugin/remove.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index a37240680..781501662 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -5,32 +5,76 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "remove", call => \&getsetup);
 	hook(type => "formbuilder_setup", id => "remove", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "remove", call => \&formbuilder);
 	hook(type => "sessioncgi", id => "remove", call => \&sessioncgi);
 
-} # }}}
+}
+
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+sub check_canremove ($$$) {
+	my $page=shift;
+	my $q=shift;
+	my $session=shift;
+
+	# Must be a known source file.
+	if (! exists $pagesources{$page}) {
+		error(sprintf(gettext("%s does not exist"),
+			htmllink("", "", $page, noimageinline => 1)));
+	}
 
-sub formbuilder_setup (@) { #{{{
+	# Must exist on disk, and be a regular file.
+	my $file=$pagesources{$page};
+	if (! -e "$config{srcdir}/$file") {
+		error(sprintf(gettext("%s is not in the srcdir, so it cannot be deleted"), $file));
+	}
+	elsif (-l "$config{srcdir}/$file" && ! -f _) {
+		error(sprintf(gettext("%s is not a file"), $file));
+	}
+	
+	# Must be editable.
+	IkiWiki::check_canedit($page, $q, $session);
+
+	# If a user can't upload an attachment, don't let them delete it.
+	# This is sorta overkill, but better safe than sorry.
+	if (! defined pagetype($pagesources{$page})) {
+		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+		}
+		else {
+			error("renaming of attachments is not allowed");
+		}
+	}
+}
+
+sub formbuilder_setup (@) {
 	my %params=@_;
 	my $form=$params{form};
 	my $q=$params{cgi};
 
-	if (defined $form->field("do") && $form->field("do") eq "edit") {
+	if (defined $form->field("do") && ($form->field("do") eq "edit" ||
+	    $form->field("do") eq "create")) {
 		# Removal button for the page, and also for attachments.
-		push @{$params{buttons}}, "Remove";
+		push @{$params{buttons}}, "Remove" if $form->field("do") eq "edit";
 		$form->tmpl_param("field-remove" => '<input name="_submit" type="submit" value="Remove Attachments" />');
 	}
-} #}}}
+}
 
-sub confirmation_form ($$) { #{{{ 
+sub confirmation_form ($$) {
 	my $q=shift;
 	my $session=shift;
 
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
-	my @fields=qw(do page);
 	my $f = CGI::FormBuilder->new(
 		name => "remove",
 		header => 0,
@@ -40,13 +84,13 @@ sub confirmation_form ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		stylesheet => IkiWiki::baseurl()."style.css",
-		fields => \@fields,
+		fields => [qw{do page}],
 	);
 	
 	$f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
 	return $f, ["Remove", "Cancel"];
-} #}}}
+}
 
 sub removal_confirm ($$@) {
 	my $q=shift;
@@ -54,6 +98,10 @@ sub removal_confirm ($$@) {
 	my $attachment=shift;
 	my @pages=@_;
 
+	foreach my $page (@pages) {
+		check_canremove($page, $q, $session);
+	}
+
    	# Save current form state to allow returning to it later
 	# without losing any edits.
 	# (But don't save what button was submitted, to avoid
@@ -65,7 +113,7 @@ sub removal_confirm ($$@) {
 	
 	my ($f, $buttons)=confirmation_form($q, $session);
 	$f->title(sprintf(gettext("confirm removal of %s"),
-		join(", ", map { IkiWiki::pagetitle($_) } @pages)));
+		join(", ", map { pagetitle($_) } @pages)));
 	$f->field(name => "page", type => "hidden", value => \@pages, force => 1);
 	if (defined $attachment) {
 		$f->field(name => "attachment", type => "hidden",
@@ -86,24 +134,29 @@ sub postremove ($) {
 	IkiWiki::cgi($postremove, $session);
 }
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
-	if (defined $form->field("do") && $form->field("do") eq "edit") {
+	if (defined $form->field("do") && ($form->field("do") eq "edit" ||
+	    $form->field("do") eq "create")) {
 		my $q=$params{cgi};
 		my $session=$params{session};
 
-		if ($form->submitted eq "Remove") {
+		if ($form->submitted eq "Remove" && $form->field("do") eq "edit") {
 			removal_confirm($q, $session, 0, $form->field("page"));
 		}
 		elsif ($form->submitted eq "Remove Attachments") {
-			removal_confirm($q, $session, 1, $q->param("attachment_select"));
+			my @selected=$q->param("attachment_select");
+			if (! @selected) {
+				error(gettext("Please select the attachments to remove."));
+			}
+			removal_confirm($q, $session, 1, @selected);
 		}
 	}
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
         my $q=shift;
 
 	if ($q->param("do") eq 'remove') {
@@ -116,16 +169,17 @@ sub sessioncgi ($$) { #{{{
 		}
 		elsif ($form->submitted eq 'Remove' && $form->validate) {
 			my @pages=$q->param("page");
-			my @files = map { $pagesources{$_} } @pages;
 	
 			# Validate removal by checking that the page exists,
 			# and that the user is allowed to edit(/remove) it.
+			my @files;
 			foreach my $page (@pages) {
-				if (! exists $pagesources{$page}) {
-					error(sprintf(gettext("%s does not exist"),
-					htmllink("", "", $page, noimageinline => 1)));
-				}
-				IkiWiki::check_canedit($page, $q, $session);
+				check_canremove($page, $q, $session);
+				
+				# This untaint is safe because of the
+				# checks performed above, which verify the
+				# page is a normal file, etc.
+				push @files, IkiWiki::possibly_foolish_untaint($pagesources{$page});
 			}
 
 			# Do removal, and update the wiki.
@@ -134,22 +188,23 @@ sub sessioncgi ($$) { #{{{
 				IkiWiki::disable_commit_hook();
 				foreach my $file (@files) {
 					IkiWiki::rcs_remove($file);
-					IkiWiki::rcs_commit($file, gettext("removed"),
-						IkiWiki::rcs_prepedit($file),
-						$session->param("name"), $ENV{REMOTE_ADDR});
 				}
+				IkiWiki::rcs_commit_staged(gettext("removed"),
+					$session->param("name"), $ENV{REMOTE_ADDR});
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
-			foreach my $file (@files) {
-				IkiWiki::prune("$config{srcdir}/$file");
+			else {
+				foreach my $file (@files) {
+					IkiWiki::prune("$config{srcdir}/$file");
+				}
 			}
 			IkiWiki::refresh();
 			IkiWiki::saveindex();
 
 			if ($q->param("attachment")) {
 				# Attachments were deleted, so redirect
-				# to the edit form.
+				# back to the edit form.
 				postremove($session);
 			}
 			else {
@@ -159,7 +214,7 @@ sub sessioncgi ($$) { #{{{
 				if (! exists $pagesources{$parent}) {
 					$parent="index";
 				}
-				IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
+				IkiWiki::redirect($q, urlto($parent, '/', 1));
 			}
 		}
 		else {