Allow jumping directly into account registration process by going to ikiwiki.cgi...

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index a43f511b37353da5850070549b1db8714bb5fd2c..3c1e0c713c85b0b679b1d00c0ed19e56ea685006 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -3,34 +3,97 @@ package IkiWiki::Plugin::remove;
 
 use warnings;
 use strict;
 
 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);
 
        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)));
+       }
+
+       # 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("removal of attachments is not allowed");
+               }
+       }

 
 

-sub formbuilder_setup (@) { #{{{
+       my $canremove;
+       IkiWiki::run_hooks(canremove => sub {
+               return if defined $canremove;
+               my $ret=shift->(page => $page, cgi => $q, session => $session);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $canremove=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->();
+                               $canremove=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret);
+                               $canremove=0;
+                       }
+               }
+       });
+}
+
+sub formbuilder_setup (@) {

        my %params=@_;
        my $form=$params{form};
        my $q=$params{cgi};
 
        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.
                # 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" />');
        }
                $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 $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,
        my $f = CGI::FormBuilder->new(
                name => "remove",
                header => 0,


@@ -40,13 +103,13 @@ sub confirmation_form ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                stylesheet => IkiWiki::baseurl()."style.css",
                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"];
        );
        
        $f->field(name => "do", type => "hidden", value => "remove", force => 1);
 
        return $f, ["Remove", "Cancel"];

-} #}}}
+}

 
 sub removal_confirm ($$@) {
        my $q=shift;
 
 sub removal_confirm ($$@) {
        my $q=shift;


@@ -54,6 +117,10 @@ sub removal_confirm ($$@) {
        my $attachment=shift;
        my @pages=@_;
 
        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
        # 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 +132,7 @@ sub removal_confirm ($$@) {
        
        my ($f, $buttons)=confirmation_form($q, $session);
        $f->title(sprintf(gettext("confirm removal of %s"),
        
        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",
        $f->field(name => "page", type => "hidden", value => \@pages, force => 1);
        if (defined $attachment) {
                $f->field(name => "attachment", type => "hidden",


@@ -86,24 +153,29 @@ sub postremove ($) {
        IkiWiki::cgi($postremove, $session);
 }
 
        IkiWiki::cgi($postremove, $session);
 }
 

-sub formbuilder (@) { #{{{
+sub formbuilder (@) {

        my %params=@_;
        my $form=$params{form};
 
        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};
 
                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, 0, $form->field("page"));
                }
                elsif ($form->submitted eq "Remove Attachments") {

-                       removal_confirm($q, $session, 1, $q->param("attachment_select"));
+                       my @selected=map { Encode::decode_utf8($_) } $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') {
         my $q=shift;
 
        if ($q->param("do") eq 'remove') {


@@ -115,31 +187,18 @@ sub sessioncgi ($$) { #{{{
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {
                        postremove($session);
                }
                elsif ($form->submitted eq 'Remove' && $form->validate) {

-                       my @pages=$q->param("page");
+                       my @pages=$form->field("page");

        
                        # Validate removal by checking that the page exists,
                        # and that the user is allowed to edit(/remove) it.
                        my @files;
                        foreach my $page (@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);
-
-                               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 (! -f "$config{srcdir}/$file") {
-                                       error(sprintf(gettext("%s is not a file"), $file));
-                               }
-
-                               # This untaint is safe because we've
-                               # verified the file is a known source file,
-                               # and is in the srcdir, and is a regular
-                               # file.
-                               push @files, IkiWiki::possibly_foolish_untaint($file);
+                               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.
                        }
 
                        # Do removal, and update the wiki.


@@ -147,11 +206,10 @@ sub sessioncgi ($$) { #{{{
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                foreach my $file (@files) {
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                foreach my $file (@files) {

-                                       my $token=IkiWiki::rcs_prepedit($file);

                                        IkiWiki::rcs_remove($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();
                        }
                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();
                        }


@@ -160,11 +218,6 @@ sub sessioncgi ($$) { #{{{
                                        IkiWiki::prune("$config{srcdir}/$file");
                                }
                        }
                                        IkiWiki::prune("$config{srcdir}/$file");
                                }
                        }

-                       foreach my $file (@files) {
-                               delete $IkiWiki::pagecase{$file};
-                               print STDERR "delete $file\n";
-                               delete $IkiWiki::links{$file};
-                       }

                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 


@@ -180,11 +233,11 @@ sub sessioncgi ($$) { #{{{
                                if (! exists $pagesources{$parent}) {
                                        $parent="index";
                                }
                                if (! exists $pagesources{$parent}) {
                                        $parent="index";
                                }

-                               IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
+                               IkiWiki::redirect($q, urlto($parent, '/', 1));

                        }
                }
                else {
                        }
                }
                else {

-                       IkiWiki::showform($form, $buttons, $session, $q);
+                       removal_confirm($q, $session, 0, $form->field("page"));

                }
 
                exit 0;
                }
 
                exit 0;