X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb394fdae8ba488f1031d6f053f1544c689a3628..aee84387713a6a3f122b478b2fae3b5b87c76c9f:/IkiWiki/Plugin/attachment.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index b6327f0c5..b81870ffb 100644
--- 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");
+				}
 			}
 		}
 	}