configure wmd to leave text in markdown

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 869d32f9303e41a2e96198615a2171305f6732e6..ee5784f2026db29ac4d48041f6cd355c2356bf1a 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -3,25 +3,25 @@ package IkiWiki::Plugin::remove;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.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 () { #{{{
+sub getsetup () {
        return 
                plugin => {
                        safe => 1,
                        rebuild => 0,
                },
-} #}}}
+}
 
-sub check_canremove ($$$) { #{{{
+sub check_canremove ($$$) {
        my $page=shift;
        my $q=shift;
        my $session=shift;
@@ -41,12 +41,12 @@ sub check_canremove ($$$) { #{{{
                error(sprintf(gettext("%s is not a file"), $file));
        }
        
-       # Must be editiable.
+       # 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 IkiWiki::pagetype($pagesources{$page})) {
+       if (! defined pagetype($pagesources{$page})) {
                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                        IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
                }
@@ -54,21 +54,22 @@ sub check_canremove ($$$) { #{{{
                        error("renaming of attachments is not allowed");
                }
        }
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+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;
 
@@ -89,15 +90,17 @@ sub confirmation_form ($$) { #{{{
        $f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
        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) foreach @pages;
+       foreach my $page (@pages) {
+               check_canremove($page, $q, $session);
+       }
 
        # Save current form state to allow returning to it later
        # without losing any edits.
@@ -110,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",
@@ -119,9 +122,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.
@@ -129,17 +132,18 @@ sub postremove ($) { #{{{
        $session->clear("postremove");
        IkiWiki::cgi_savesession($session);
        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") {
@@ -150,9 +154,9 @@ sub formbuilder (@) { #{{{
                        removal_confirm($q, $session, 1, @selected);
                }
        }
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
         my $q=shift;
 
        if ($q->param("do") eq 'remove') {
@@ -210,11 +214,11 @@ sub sessioncgi ($$) { #{{{
                                if (! exists $pagesources{$parent}) {
                                        $parent="index";
                                }
-                               IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
+                               IkiWiki::redirect($q, urlto($parent, '/', 1));
                        }
                }
                else {
-                       IkiWiki::showform($form, $buttons, $session, $q);
+                       removal_confirm($q, $session, 0, $q->param("page"));
                }
 
                exit 0;