support for removing attachments
parent
a1df39ed4a
commit
af9c5e4bba
|
@ -24,17 +24,14 @@ sub formbuilder_setup (@) { #{{{
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub confirmation_form ($$$) { #{{{
|
sub confirmation_form ($$) { #{{{
|
||||||
my $q=shift;
|
my $q=shift;
|
||||||
my $session=shift;
|
my $session=shift;
|
||||||
my $page=shift;
|
|
||||||
|
|
||||||
eval q{use CGI::FormBuilder};
|
eval q{use CGI::FormBuilder};
|
||||||
error($@) if $@;
|
error($@) if $@;
|
||||||
my @fields=qw(do page);
|
my @fields=qw(do page);
|
||||||
my $f = CGI::FormBuilder->new(
|
my $f = CGI::FormBuilder->new(
|
||||||
title => sprintf(gettext("confirm removal of %s"),
|
|
||||||
IkiWiki::pagetitle($page)),
|
|
||||||
name => "remove",
|
name => "remove",
|
||||||
header => 0,
|
header => 0,
|
||||||
charset => "utf-8",
|
charset => "utf-8",
|
||||||
|
@ -47,19 +44,15 @@ sub confirmation_form ($$$) { #{{{
|
||||||
);
|
);
|
||||||
|
|
||||||
$f->field(name => "do", type => "hidden", value => "remove", force => 1);
|
$f->field(name => "do", type => "hidden", value => "remove", force => 1);
|
||||||
$f->field(name => "page", type => "hidden", value => $page, force => 1);
|
|
||||||
|
|
||||||
return $f, ["Remove", "Cancel"];
|
return $f, ["Remove", "Cancel"];
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub formbuilder (@) { #{{{
|
sub removal_confirm ($$@) {
|
||||||
my %params=@_;
|
my $q=shift;
|
||||||
my $form=$params{form};
|
my $session=shift;
|
||||||
|
my $attachment=shift;
|
||||||
if (defined $form->field("do") && $form->field("do") eq "edit") {
|
my @pages=@_;
|
||||||
if ($form->submitted eq "Remove") {
|
|
||||||
my $q=$params{cgi};
|
|
||||||
my $session=$params{session};
|
|
||||||
|
|
||||||
# Save current form state to allow returning to it later
|
# Save current form state to allow returning to it later
|
||||||
# without losing any edits.
|
# without losing any edits.
|
||||||
|
@ -70,13 +63,42 @@ sub formbuilder (@) { #{{{
|
||||||
$session->param(postremove => scalar $q->Vars);
|
$session->param(postremove => scalar $q->Vars);
|
||||||
IkiWiki::cgi_savesession($session);
|
IkiWiki::cgi_savesession($session);
|
||||||
|
|
||||||
# Display a small confirmation form.
|
my ($f, $buttons)=confirmation_form($q, $session);
|
||||||
my ($f, $buttons)=confirmation_form($q, $session, $form->field("page"));
|
$f->title(sprintf(gettext("confirm removal of %s"),
|
||||||
|
join(", ", map { IkiWiki::pagetitle($_) } @pages)));
|
||||||
|
$f->field(name => "page", type => "hidden", value => \@pages, force => 1);
|
||||||
|
if (defined $attachment) {
|
||||||
|
$f->field(name => "attachment", type => "hidden",
|
||||||
|
value => $attachment, force => 1);
|
||||||
|
}
|
||||||
|
|
||||||
IkiWiki::showform($f, $buttons, $session, $q);
|
IkiWiki::showform($f, $buttons, $session, $q);
|
||||||
exit 0;
|
exit 0;
|
||||||
}
|
}
|
||||||
elsif ($form->submitted eq "Remove Attachments") {
|
|
||||||
|
|
||||||
|
sub postremove ($) {
|
||||||
|
my $session=shift;
|
||||||
|
|
||||||
|
# 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
sub formbuilder (@) { #{{{
|
||||||
|
my %params=@_;
|
||||||
|
my $form=$params{form};
|
||||||
|
|
||||||
|
if (defined $form->field("do") && $form->field("do") eq "edit") {
|
||||||
|
my $q=$params{cgi};
|
||||||
|
my $session=$params{session};
|
||||||
|
|
||||||
|
if ($form->submitted eq "Remove") {
|
||||||
|
removal_confirm($q, $session, 0, $form->field("page"));
|
||||||
|
}
|
||||||
|
elsif ($form->submitted eq "Remove Attachments") {
|
||||||
|
removal_confirm($q, $session, 1, $q->param("attachment_select"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
@ -86,50 +108,60 @@ sub sessioncgi ($$) { #{{{
|
||||||
|
|
||||||
if ($q->param("do") eq 'remove') {
|
if ($q->param("do") eq 'remove') {
|
||||||
my $session=shift;
|
my $session=shift;
|
||||||
my ($form, $buttons)=confirmation_form($q, $session, $session->param("page"));
|
my ($form, $buttons)=confirmation_form($q, $session);
|
||||||
IkiWiki::decode_form_utf8($form);
|
IkiWiki::decode_form_utf8($form);
|
||||||
|
|
||||||
if ($form->submitted eq 'Cancel') {
|
if ($form->submitted eq 'Cancel') {
|
||||||
# Load saved form state and return to edit form.
|
postremove($session);
|
||||||
my $postremove=CGI->new($session->param("postremove"));
|
|
||||||
$session->clear("postremove");
|
|
||||||
IkiWiki::cgi_savesession($session);
|
|
||||||
IkiWiki::cgi($postremove, $session);
|
|
||||||
}
|
}
|
||||||
elsif ($form->submitted eq 'Remove' && $form->validate) {
|
elsif ($form->submitted eq 'Remove' && $form->validate) {
|
||||||
my $page=$form->field("page");
|
my @pages=$q->param("page");
|
||||||
my $file=$pagesources{$page};
|
my @files = map { $pagesources{$_} } @pages;
|
||||||
|
|
||||||
# Validate removal by checking that the page exists,
|
# Validate removal by checking that the page exists,
|
||||||
# and that the user is allowed to edit(/remove) it.
|
# and that the user is allowed to edit(/remove) it.
|
||||||
|
foreach my $page (@pages) {
|
||||||
if (! exists $pagesources{$page}) {
|
if (! exists $pagesources{$page}) {
|
||||||
error(sprintf(gettext("%s does not exist"),
|
error(sprintf(gettext("%s does not exist"),
|
||||||
htmllink("", "", $page, noimageinline => 1)));
|
htmllink("", "", $page, noimageinline => 1)));
|
||||||
}
|
}
|
||||||
IkiWiki::check_canedit($page, $q, $session);
|
IkiWiki::check_canedit($page, $q, $session);
|
||||||
|
}
|
||||||
|
|
||||||
# Do removal, and update the wiki.
|
# Do removal, and update the wiki.
|
||||||
require IkiWiki::Render;
|
require IkiWiki::Render;
|
||||||
if ($config{rcs}) {
|
if ($config{rcs}) {
|
||||||
IkiWiki::rcs_remove($file);
|
|
||||||
IkiWiki::disable_commit_hook();
|
IkiWiki::disable_commit_hook();
|
||||||
|
foreach my $file (@files) {
|
||||||
|
IkiWiki::rcs_remove($file);
|
||||||
IkiWiki::rcs_commit($file, gettext("removed"),
|
IkiWiki::rcs_commit($file, gettext("removed"),
|
||||||
IkiWiki::rcs_prepedit($file),
|
IkiWiki::rcs_prepedit($file),
|
||||||
$session->param("name"), $ENV{REMOTE_ADDR});
|
$session->param("name"), $ENV{REMOTE_ADDR});
|
||||||
|
}
|
||||||
IkiWiki::enable_commit_hook();
|
IkiWiki::enable_commit_hook();
|
||||||
IkiWiki::rcs_update();
|
IkiWiki::rcs_update();
|
||||||
}
|
}
|
||||||
|
foreach my $file (@files) {
|
||||||
IkiWiki::prune("$config{srcdir}/$file");
|
IkiWiki::prune("$config{srcdir}/$file");
|
||||||
|
}
|
||||||
IkiWiki::refresh();
|
IkiWiki::refresh();
|
||||||
IkiWiki::saveindex();
|
IkiWiki::saveindex();
|
||||||
|
|
||||||
# Redirect to parent of the page.
|
if ($q->param("attachment")) {
|
||||||
my $parent=IkiWiki::dirname($page);
|
# Attachments were deleted, so redirect
|
||||||
|
# to the edit form.
|
||||||
|
postremove($session);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
# The page is gone, so redirect to parent
|
||||||
|
# of the page.
|
||||||
|
my $parent=IkiWiki::dirname($pages[0]);
|
||||||
if (! exists $pagesources{$parent}) {
|
if (! exists $pagesources{$parent}) {
|
||||||
$parent="index";
|
$parent="index";
|
||||||
}
|
}
|
||||||
IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
|
IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
IkiWiki::showform($form, $buttons, $session, $q);
|
IkiWiki::showform($form, $buttons, $session, $q);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue