progress: Display an error if the progress cannot be parsed, and allow the percent...

[git.ikiwiki.info.git] / IkiWiki / Plugin / remove.pm

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index d4f1c7d66e50d66b685794c143b86c6bf86db4dc..9666408bc77ab332866b936f03e3d6dfd5f36fb6 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -6,13 +6,22 @@ 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;
@@ -21,7 +30,7 @@ sub check_canremove ($$$$) {
        # Must be a known source file.
        if (! exists $pagesources{$page}) {
                error(sprintf(gettext("%s does not exist"),
-               htmllink("", "", $page, noimageinline => 1)));
+                       htmllink("", "", $page, noimageinline => 1)));
        }
 
        # Must exist on disk, and be a regular file.
@@ -42,7 +51,7 @@ sub check_canremove ($$$$) {
        if ($attachment) {
                IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
        }
-}
+} #}}}
 
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
@@ -79,7 +88,7 @@ sub confirmation_form ($$) { #{{{
        return $f, ["Remove", "Cancel"];
 } #}}}
 
-sub removal_confirm ($$@) {
+sub removal_confirm ($$@) { #{{{
        my $q=shift;
        my $session=shift;
        my $attachment=shift;
@@ -107,9 +116,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 +126,7 @@ sub postremove ($) {
        $session->clear("postremove");
        IkiWiki::cgi_savesession($session);
        IkiWiki::cgi($postremove, $session);
-}
+} #}}}
 
 sub formbuilder (@) { #{{{
        my %params=@_;
@@ -159,7 +168,10 @@ sub sessioncgi ($$) { #{{{
                        my @files;
                        foreach my $page (@pages) {
                                check_canremove($page, $q, $session, $q->param("attachment"));
-
+                               
+                               # 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});
                        }
 
@@ -168,11 +180,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();
                        }