bugfix

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 3c1e0c713c85b0b679b1d00c0ed19e56ea685006..95f148183cba558be65a95a9687992293d122839 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -18,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "web",

                },
 }
 
                },
 }
 


@@ -48,7 +49,7 @@ sub check_canremove ($$$) {
        # This is sorta overkill, but better safe than sorry.
        if (! defined pagetype($pagesources{$page})) {
                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
        # 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);
+                       IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");

                }
                else {
                        error("removal of attachments is not allowed");
                }
                else {
                        error("removal of attachments is not allowed");


@@ -102,10 +103,12 @@ sub confirmation_form ($$) {
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               stylesheet => IkiWiki::baseurl()."style.css",
+               stylesheet => 1,

                fields => [qw{do page}],
        );
        
                fields => [qw{do page}],
        );
        

+       $f->field(name => "sid", type => "hidden", value => $session->id,
+               force => 1);

        $f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
        return $f, ["Remove", "Cancel"];
        $f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
        return $f, ["Remove", "Cancel"];


@@ -187,6 +190,8 @@ sub sessioncgi ($$) {
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {

+                       IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+

                        my @pages=$form->field("page");
        
                        # Validate removal by checking that the page exists,
                        my @pages=$form->field("page");
        
                        # Validate removal by checking that the page exists,


@@ -208,8 +213,10 @@ sub sessioncgi ($$) {
                                foreach my $file (@files) {
                                        IkiWiki::rcs_remove($file);
                                }
                                foreach my $file (@files) {
                                        IkiWiki::rcs_remove($file);
                                }

-                               IkiWiki::rcs_commit_staged(gettext("removed"),
-                                       $session->param("name"), $ENV{REMOTE_ADDR});
+                               IkiWiki::rcs_commit_staged(
+                                       message => gettext("removed"),
+                                       session => $session,
+                               );

                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();
                        }
                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();
                        }