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 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}) {
+ 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 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);
+ }
+} #}}}
+
sub formbuilder_setup (@) { #{{{
my %params=@_;
my $form=$params{form};
eval q{use CGI::FormBuilder};
error($@) if $@;
- my @fields=qw(do page);
my $f = CGI::FormBuilder->new(
name => "remove",
header => 0,
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"];
} #}}}
-sub removal_confirm ($$@) {
+sub removal_confirm ($$@) { #{{{
my $q=shift;
my $session=shift;
my $attachment=shift;
my @pages=@_;
+ check_canremove($_, $q, $session, $attachment) foreach @pages;
+
# Save current form state to allow returning to it later
# without losing any edits.
# (But don't save what button was submitted, to avoid
IkiWiki::showform($f, $buttons, $session, $q);
exit 0;
-}
+} #}}}
-sub postremove ($) {
+sub postremove ($) { #{{{
my $session=shift;
# Load saved form state and return to edit form.
$session->clear("postremove");
IkiWiki::cgi_savesession($session);
IkiWiki::cgi($postremove, $session);
-}
+} #}}}
sub formbuilder (@) { #{{{
my %params=@_;
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=$q->param("attachment_select");
+ if (! @selected) {
+ error(gettext("Please select the attachments to remove."));
+ }
+ removal_confirm($q, $session, 1, @selected);
}
}
} #}}}
}
elsif ($form->submitted eq 'Remove' && $form->validate) {
my @pages=$q->param("page");
- my @files = map { $pagesources{$_} } @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{$_};
- 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, possibly_foolish_untaint($file);
+ 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});
}
# Do removal, and update the wiki.
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();
}
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();