]> sipb.mit.edu Git - ikiwiki.git/commitdiff
use check_canattach
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 02:44:19 +0000 (22:44 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 22 Jul 2008 02:44:19 +0000 (22:44 -0400)
As noted, this may be overkill..

IkiWiki/Plugin/remove.pm

index bb5f56540f848b8b41dfd2ab9c07a85de358d637..9b665513909bef3a395ab91469742d2d44be64ea 100644 (file)
@@ -129,9 +129,6 @@ sub sessioncgi ($$) { #{{{
                                        error(sprintf(gettext("%s does not exist"),
                                        htmllink("", "", $page, noimageinline => 1)));
                                }
                                        error(sprintf(gettext("%s does not exist"),
                                        htmllink("", "", $page, noimageinline => 1)));
                                }
-                               
-                               # Must be editiable.
-                               IkiWiki::check_canedit($page, $q, $session);
 
                                # Must exist on disk, and be a regular file.
                                my $file=$pagesources{$page};
 
                                # Must exist on disk, and be a regular file.
                                my $file=$pagesources{$page};
@@ -141,12 +138,20 @@ sub sessioncgi ($$) { #{{{
                                elsif (-l "$config{srcdir}/$file" && ! -f _) {
                                        error(sprintf(gettext("%s is not a file"), $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 ($q->param("attachment")) {
+                                       IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+                               }
 
                                push @files, IkiWiki::possibly_foolish_untaint($file);
                        }
 
 
                                push @files, IkiWiki::possibly_foolish_untaint($file);
                        }
 
-                       # TODO check attachment limits.
-
                        # Do removal, and update the wiki.
                        require IkiWiki::Render;
                        if ($config{rcs}) {
                        # Do removal, and update the wiki.
                        require IkiWiki::Render;
                        if ($config{rcs}) {