X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bac47cdecd9a9f7db3224eaaed43de0984bcf9ea..0d7bc7402c9a5e922ee3eb1b093e689756b001ff:/IkiWiki/Plugin/attachment.pm?ds=inline

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index acc52f0e9..3fe33c858 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -6,16 +6,35 @@ 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
+		 => {
+			type => "string",
+			default => "",
+			example => "clamdscan -",
+			description => "virus checker program (reads STDIN, returns nonzero if virus found)",
+			safe => 0, # executed
+			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
 
+	# Don't allow an attachment to be uploaded with the same name as an
+	# existing page.
+	if (exists $pagesources{$dest} && $pagesources{$dest} ne $dest) {
+		error(sprintf(gettext("there is already a page named %s"), $dest));
+	}
+
 	# Use a special pagespec to test that the attachment is valid.
 	my $allowed=1;
 	foreach my $admin (@{$config{adminuser}}) {
@@ -37,7 +56,7 @@ sub check_canattach ($$;$) {
 	else {
 		return 1;
 	}
-}
+} #}}}
 
 sub checkconfig () { #{{{
 	$config{cgi_disable_uploads}=0;
@@ -130,7 +149,7 @@ sub formbuilder (@) { #{{{
 			}
 		}
 
-		$filename=IkiWiki::titlepage(
+		$filename=IkiWiki::linkpage(
 			IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
 				IkiWiki::basename($filename)));
@@ -187,8 +206,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',
@@ -201,7 +222,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
@@ -210,9 +231,9 @@ sub attachment_location ($) {
 	$page.="/" if length $page;
 	
 	return $page;
-}
+} #}}}
 
-sub attachment_list ($) {
+sub attachment_list ($) { #{{{
 	my $page=shift;
 	my $loc=attachment_location($page);
 
@@ -234,9 +255,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,
@@ -268,7 +289,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;