(no commit message)

[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index b6327f0c5455fdfe1a622e0e26f36663653357da..b81870ffb0ccef5711882f7d4dd045de3b6bff96 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -14,25 +14,25 @@ sub import { #{{{
 
 sub getsetup () { #{{{
        return
-               virus_checker => {
-                       type => "string",
-                       example => "clamdscan -",
-                       description => "virus checker program (reads STDIN, returns nonzero if virus found)",
-                       safe => 0, # executed
+               plugin => {
+                       safe => 1,
                        rebuild => 0,
                },
                allowed_attachments => {
-                       type => "string",
-                       example => "mimetype(image/*) and maxsize(50kb)",
+                       type => "pagespec",
+                       example => "virusfree() and mimetype(image/*) and maxsize(50kb)",
                        description => "enhanced PageSpec specifying what attachments are allowed",
-                       description_html => htmllink("", "", 
-                               "ikiwiki/PageSpec/attachment", 
-                               noimageinline => 1,
-                               linktext => "enhanced PageSpec",
-                               )." specifying what attachments are allowed",
+                       link => "ikiwiki/PageSpec/attachment",
                        safe => 1,
                        rebuild => 0,
                },
+               virus_checker => {
+                       type => "string",
+                       example => "clamdscan -",
+                       description => "virus checker program (reads STDIN, returns nonzero if virus found)",
+                       safe => 0, # executed
+                       rebuild => 0,
+               },
 } #}}}
 
 sub check_canattach ($$;$) { #{{{
@@ -143,6 +143,9 @@ sub formbuilder_setup (@) { #{{{
                                IkiWiki::userinfo_set($user_name, "allowed_attachments",
                                $form->field("allowed_attachments")) ||
                                        error("failed to set allowed_attachments");
+                               if (length $form->field("allowed_attachments")) {
+                                       $form->field(name => "allowed_attachments", type => "hidden");
+                               }
                        }
                }
        }