urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add an ispage limit

master
Joey Hess 2008-06-30 23:17:01 -04:00
parent 622033f5d6
commit b01ee9b3b3
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
IkiWiki/Plugin/attachment.pm
View File

@ -8,7 +8,7 @@ use CGI;
$CGI::DISABLE_UPLOADS=0; $CGI::DISABLE_UPLOADS=0;
# TODO move to admin prefs # TODO move to admin prefs
$config{valid_attachments}="(*.mp3 and maxsize(15mb)) or (* and maxsize(50kb))"; $config{valid_attachments}="(*.mp3 and maxsize(15mb)) or (!ispage() and maxsize(50kb))";
sub import { #{{{ sub import { #{{{
hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup); hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
@ -53,7 +53,7 @@ sub formbuilder (@) { #{{{
if (exists $config{valid_attachments} && if (exists $config{valid_attachments} &&
length $config{valid_attachments}) { length $config{valid_attachments}) {
my $result=pagespec_match($filename, $config{valid_attachments}, my $result=pagespec_match($filename, $config{valid_attachments},
tempfile => $tempfile); file => $tempfile);
if (! $result) { if (! $result) {
error(gettext("attachment rejected")." ($result)"); error(gettext("attachment rejected")." ($result)");
} }
@ -101,15 +101,15 @@ sub match_maxsize ($$;@) { #{{{
} }
my %params=@_; my %params=@_;
if (! exists $params{tempfile}) { if (! exists $params{file}) {
return IkiWiki::FailReason->new("no tempfile specified"); return IkiWiki::FailReason->new("no tempfile specified");
} }
if (-s $params{tempfile} > $maxsize) { if (-s $params{file} > $maxsize) {
return IkiWiki::FailReason->new("attachment too large"); return IkiWiki::FailReason->new("file too large");
} }
else { else {
return IkiWiki::SuccessReason->new("attachment size ok"); return IkiWiki::SuccessReason->new("file not too large");
} }
} #}}} } #}}}
@ -121,15 +121,26 @@ sub match_minsize ($$;@) { #{{{
} }
my %params=@_; my %params=@_;
if (! exists $params{tempfile}) { if (! exists $params{file}) {
return IkiWiki::FailReason->new("no tempfile specified"); return IkiWiki::FailReason->new("no tempfile specified");
} }
if (-s $params{tempfile} < $minsize) { if (-s $params{file} < $minsize) {
return IkiWiki::FailReason->new("attachment too small"); return IkiWiki::FailReason->new("file too small");
} }
else { else {
return IkiWiki::SuccessReason->new("attachment size ok"); return IkiWiki::SuccessReason->new("file not too small");
}
} #}}}
sub match_ispage ($$;@) { #{{{
my $filename=shift;
if (IkiWiki::pagetype($filename)) {
return IkiWiki::SuccessReason->new("file is a wiki page");
}
else {
return IkiWiki::FailReason->new("file is not a wiki page");
} }
} #}}} } #}}}

12
doc/plugins/attachment.mdwn
View File

@ -28,7 +28,7 @@ expanded with additional tests.
For example, to limit arbitrary files to 50 kilobtes, but allow For example, to limit arbitrary files to 50 kilobtes, but allow
larger mp3 files to be uploaded, a test like this could be used: larger mp3 files to be uploaded, a test like this could be used:
(*.mp3 and maxsize(15mb)) or (* and maxsize(50kb)) (*.mp3 and maxsize(15mb)) or (!ispage() and maxsize(50kb))
The following additional tests are available: The following additional tests are available:
@ -41,3 +41,13 @@ The following additional tests are available:
* minsize(size) * minsize(size)
Tests whether the attachment is no smaller than the specified size. Tests whether the attachment is no smaller than the specified size.
* ispage()
Tests whether the attachment will be treated by ikiwiki as a wiki page.
(Ie, if it has an extension of ".mdwn", or of any other enabled page
format).
So, if you don't want to allow wiki pages to be uploaded as attachments,
use `!ispage()` ; if you only want to allow wiki pages to be uploaded
as attachments, use `ispage()`.