use check_canattach

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

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index badcfe667eac4bd327922f18dd116a9f87494f13..9b665513909bef3a395ab91469742d2d44be64ea 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -30,7 +30,6 @@ sub confirmation_form ($$) { #{{{
 
        eval q{use CGI::FormBuilder};
        error($@) if $@;
-       my @fields=qw(do page);
        my $f = CGI::FormBuilder->new(
                name => "remove",
                header => 0,
@@ -40,7 +39,7 @@ sub confirmation_form ($$) { #{{{
                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);
@@ -98,7 +97,11 @@ sub formbuilder (@) { #{{{
                        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);
                }
        }
 } #}}}
@@ -116,26 +119,37 @@ sub sessioncgi ($$) { #{{{
                }
                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) {
+                               # Must be a known source file.
                                if (! exists $pagesources{$page}) {
                                        error(sprintf(gettext("%s does not exist"),
                                        htmllink("", "", $page, noimageinline => 1)));
                                }
-                               IkiWiki::check_canedit($page, $q, $session);
 
-                               my $file=$pagesources{$_};
+                               # 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 (! -f "$config{srcdir}/$file") {
+                               elsif (-l "$config{srcdir}/$file" && ! -f _) {
                                        error(sprintf(gettext("%s is not a file"), $file));
                                }
-                               push @files, $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 ($q->param("attachment")) {
+                                       IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+                               }
+
+                               push @files, IkiWiki::possibly_foolish_untaint($file);
                        }
 
                        # Do removal, and update the wiki.
@@ -156,11 +170,6 @@ sub sessioncgi ($$) { #{{{
                                        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();