X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cbf1c8b810cf782e36bbe87343d5f4a81f5dd52e..4c6d359b5fbe8f746965a2646a7bea03284b23cc:/IkiWiki/Plugin/remove.pm diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index f263db9b8..869d32f93 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -6,17 +6,25 @@ use strict; use IkiWiki 2.00; 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 check_canremove ($$$$) { +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => 0, + }, +} #}}} + +sub check_canremove ($$$) { #{{{ my $page=shift; my $q=shift; my $session=shift; - my $attachment=shift; # Must be a known source file. if (! exists $pagesources{$page}) { @@ -36,13 +44,17 @@ sub check_canremove ($$$$) { # Must be editiable. IkiWiki::check_canedit($page, $q, $session); - # This is sorta overkill, but better safe - # than sorry. If a user can't upload an - # attachment, don't let them delete it. - if ($attachment) { - IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + # 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 IkiWiki::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=@_; @@ -79,13 +91,13 @@ sub confirmation_form ($$) { #{{{ return $f, ["Remove", "Cancel"]; } #}}} -sub removal_confirm ($$@) { +sub removal_confirm ($$@) { #{{{ my $q=shift; my $session=shift; my $attachment=shift; my @pages=@_; - check_canremove($_, $q, $session, $attachment) foreach @pages; + check_canremove($_, $q, $session) foreach @pages; # Save current form state to allow returning to it later # without losing any edits. @@ -107,9 +119,9 @@ sub removal_confirm ($$@) { IkiWiki::showform($f, $buttons, $session, $q); exit 0; -} +} #}}} -sub postremove ($) { +sub postremove ($) { #{{{ my $session=shift; # Load saved form state and return to edit form. @@ -117,7 +129,7 @@ sub postremove ($) { $session->clear("postremove"); IkiWiki::cgi_savesession($session); IkiWiki::cgi($postremove, $session); -} +} #}}} sub formbuilder (@) { #{{{ my %params=@_; @@ -158,7 +170,7 @@ sub sessioncgi ($$) { #{{{ # and that the user is allowed to edit(/remove) it. my @files; foreach my $page (@pages) { - check_canremove($page, $q, $session, $q->param("attachment")); + check_canremove($page, $q, $session); # This untaint is safe because of the # checks performed above, which verify the @@ -171,11 +183,10 @@ sub sessioncgi ($$) { #{{{ if ($config{rcs}) { IkiWiki::disable_commit_hook(); foreach my $file (@files) { - my $token=IkiWiki::rcs_prepedit($file); IkiWiki::rcs_remove($file); - IkiWiki::rcs_commit($file, gettext("removed"), - $token, $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(); }