stylesheet => IkiWiki::baseurl()."style.css",
fields => \@fields,
);
-
+
$f->field(name => "do", type => "hidden", value => "remove", force => 1);
- $f->field(name => "page", label => "Will remove:", validate => sub {
- my $page=shift;
+ $f->field(name => "page", label => "Will remove:", size => 60,
+ validate => sub {
+ # Validate page by checking that the page exists, and that
+ # the user is allowed to edit(/delete) it.
+ my $page=IkiWiki::titlepage(shift);
if (! exists $pagesources{$page}) {
$f->field(name => "page", message => gettext("page does not exist"));
return 0;
if (defined $form->field("do") && $form->field("do") eq "edit" &&
$form->submitted eq "Remove") {
- # When the remove button is pressed on the edit form,
- # save the rest of the form state and generate a small
- # remove confirmation form.
-
- # TODO save state
-
-
my $q=$params{cgi};
my $session=$params{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
+ # looping back to here.)
+ # Note: "_submit" is CGI::FormBuilder internals.
+ $q->param(-name => "_submit", -value => "");
+ $session->param(postremove => scalar $q->Vars);
+ IkiWiki::cgi_savesession($session);
+
+ # Display a small confirmation form.
my ($f, $buttons)=confirmation_form($q, $session);
- $f->field(name => "page", value => $form->field("page"),
+ $f->field(name => "page",
+ value => IkiWiki::pagetitle($form->field("page")),
force => 1);
IkiWiki::showform($f, $buttons, $session, $q);
exit 0;
my ($form, $buttons)=confirmation_form($q, $session);
IkiWiki::decode_form_utf8($form);
if ($form->submitted eq 'Cancel') {
- error("canceled"); # TODO load state
+ # Load saved form state and return to edit form.
+ my $postremove=CGI->new($session->param("postremove"));
+ $session->clear("postremove");
+ IkiWiki::cgi_savesession($session);
+ IkiWiki::cgi($postremove, $session);
+ exit 0;
}
elsif ($form->submitted eq 'Remove' && $form->validate) {
- error("removal not yet implemented"); # TODO
+ my $page=IkiWiki::titlepage($form->field("page"));
+ my $file=$pagesources{$page};
+
+ # Do removal, and update the wiki.
+ require IkiWiki::Render;
+ if ($config{rcs}) {
+ IkiWiki::rcs_remove($file);
+ IkiWiki::disable_commit_hook();
+ IkiWiki::rcs_commit($file, gettext("removed"),
+ IkiWiki::rcs_prepedit($file),
+ $session->param("name"), $ENV{REMOTE_ADDR});
+ IkiWiki::enable_commit_hook();
+ IkiWiki::rcs_update();
+ }
+ IkiWiki::prune("$config{srcdir}/$file");
+ IkiWiki::refresh();
+ IkiWiki::saveindex();
}
else {
IkiWiki::showform($form, $buttons, $session, $q);