X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9776bbf8532d0a952e907c160dc31ce27c0d08e5..903213e63fd6c409046f66e73881aba33c3926de:/IkiWiki/Plugin/attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index c6711aa05..404ca07fa 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -6,12 +6,36 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "attachment", call => \&getsetup);
 	hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
 	hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
 	hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
 } # }}}
 
-sub check_canattach ($$;$) {
+sub getsetup () { #{{{
+	return
+		plugin => {
+			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,
+		},
+		allowed_attachments => {
+			type => "pagespec",
+			example => "virusfree() and mimetype(image/*) and maxsize(50kb)",
+			description => "enhanced PageSpec specifying what attachments are allowed",
+			link => "ikiwiki/PageSpec/attachment",
+			safe => 1,
+			rebuild => 0,
+		},
+} #}}}
+
+sub check_canattach ($$;$) { #{{{
 	my $session=shift;
 	my $dest=shift; # where it's going to be put, under the srcdir
 	my $file=shift; # the path to the attachment currently
@@ -24,26 +48,40 @@ sub check_canattach ($$;$) {
 
 	# Use a special pagespec to test that the attachment is valid.
 	my $allowed=1;
-	foreach my $admin (@{$config{adminuser}}) {
-		my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
-		if (defined $allowed_attachments &&
-		    length $allowed_attachments) {
-			$allowed=pagespec_match($dest,
-				$allowed_attachments,
-				file => $file,
-				user => $session->param("name"),
-				ip => $ENV{REMOTE_ADDR},
-			);
-			last if $allowed;
+	if (defined $config{allowed_attachments} &&
+	    length $config{allowed_attachments}) {
+		$allowed=pagespec_match($dest,
+			$config{allowed_attachments},
+			file => $file,
+			user => $session->param("name"),
+			ip => $ENV{REMOTE_ADDR},
+		);
+	}
+
+	# XXX deprecated, should be removed eventually
+	if ($allowed) {
+		foreach my $admin (@{$config{adminuser}}) {
+			my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
+			if (defined $allowed_attachments &&
+			    length $allowed_attachments) {
+				$allowed=pagespec_match($dest,
+					$allowed_attachments,
+					file => $file,
+					user => $session->param("name"),
+					ip => $ENV{REMOTE_ADDR},
+				);
+				last if $allowed;
+			}
 		}
 	}
+
 	if (! $allowed) {
 		error(gettext("prohibited by allowed_attachments")." ($allowed)");
 	}
 	else {
 		return 1;
 	}
-}
+} #}}}
 
 sub checkconfig () { #{{{
 	$config{cgi_disable_uploads}=0;
@@ -79,30 +117,35 @@ sub formbuilder_setup (@) { #{{{
 		}
 	}
 	elsif ($form->title eq "preferences") {
+		# XXX deprecated, should remove eventually
 		my $session=$params{session};
 		my $user_name=$session->param("name");
 
 		$form->field(name => "allowed_attachments", size => 50,
 			fieldset => "admin",
-			comment => "(".
-				htmllink("", "", 
-					"ikiwiki/PageSpec/attachment", 
-					noimageinline => 1,
-					linktext => "Enhanced PageSpec",
-				).")"
+			comment => "deprecated; please move to allowed_attachments in setup file",
 		);
 		if (! IkiWiki::is_admin($user_name)) {
 			$form->field(name => "allowed_attachments", type => "hidden");
 		}
                 if (! $form->submitted) {
-			$form->field(name => "allowed_attachments", force => 1,
-				value => IkiWiki::userinfo_get($user_name, "allowed_attachments"));
+			my $value=IkiWiki::userinfo_get($user_name, "allowed_attachments");
+			if (length $value) {
+				$form->field(name => "allowed_attachments", force => 1,
+					value => IkiWiki::userinfo_get($user_name, "allowed_attachments"));
+			}
+			else {
+				$form->field(name => "allowed_attachments", type => "hidden");
+			}
                 }
 		if ($form->submitted && $form->submitted eq 'Save Preferences') {
 			if (defined $form->field("allowed_attachments")) {
 				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");
+				}
 			}
 		}
 	}
@@ -136,7 +179,7 @@ sub formbuilder (@) { #{{{
 			}
 		}
 
-		$filename=IkiWiki::titlepage(
+		$filename=IkiWiki::linkpage(
 			IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
 				IkiWiki::basename($filename)));
@@ -193,8 +236,10 @@ sub formbuilder (@) { #{{{
 		IkiWiki::saveindex();
 	}
 	elsif ($form->submitted eq "Insert Links") {
+		my $page=quotemeta($q->param("page"));
 		my $add="";
 		foreach my $f ($q->param("attachment_select")) {
+			$f=~s/^$page\///;
 			$add.="[[$f]]\n";
 		}
 		$form->field(name => 'editcontent',
@@ -207,7 +252,7 @@ sub formbuilder (@) { #{{{
 	$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 } # }}}
 
-sub attachment_location ($) {
+sub attachment_location ($) { #{{{
 	my $page=shift;
 	
 	# Put the attachment in a subdir of the page it's attached
@@ -216,9 +261,9 @@ sub attachment_location ($) {
 	$page.="/" if length $page;
 	
 	return $page;
-}
+} #}}}
 
-sub attachment_list ($) {
+sub attachment_list ($) { #{{{
 	my $page=shift;
 	my $loc=attachment_location($page);
 
@@ -240,9 +285,9 @@ sub attachment_list ($) {
 	# Sort newer attachments to the top of the list, so a newly-added
 	# attachment appears just before the form used to add it.
 	return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
-}
+} #}}}
 
-my %units=(		# size in bytes
+my %units=( #{{{	# size in bytes
 	B		=> 1,
 	byte		=> 1,
 	KB		=> 2 ** 10,
@@ -274,7 +319,7 @@ my %units=(		# size in bytes
 	# ikiwiki, if you find you need larger data quantities, either modify
 	# yourself to add them, or travel back in time to 2008 and kill me.
 	#   -- Joey
-);
+); #}}}
 
 sub parsesize ($) { #{{{
 	my $size=shift;