use IkiWiki 2.00;
use CGI;
$CGI::DISABLE_UPLOADS=0;
-
+
# 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 { #{{{
hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
# of the temp file that CGI writes the upload to.
my $tempfile=$q->tmpFileName($filename);
+ # Put the attachment in a subdir of the page it's attached
+ # to, unless that page is an "index" page.
+ my $page=$form->field('page');
+ $page=~s/(^|\/)index//;
+ $filename="$page/$filename";
+
# To untaint the filename, escape any hazardous characters,
# and make sure it isn't pruned.
- $filename=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($filename));
+ $filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename);
if (IkiWiki::file_pruned($filename, $config{srcdir})) {
error(gettext("bad attachment filename"));
}
-
+
+ # Check that the user is allowed to edit a page with the
+ # name of the attachment.
+ IkiWiki::check_canedit($filename, $q, $params{session}, 1);
+
# Use a pagespec to test that the attachment is valid.
if (exists $config{valid_attachments} &&
length $config{valid_attachments}) {
my $result=pagespec_match($filename, $config{valid_attachments},
- tempfile => $tempfile);
+ file => $tempfile);
if (! $result) {
error(gettext("attachment rejected")." ($result)");
}
}
-
- my $fh=$q->upload('attachment');
- if (! defined $fh || ! ref $fh) {
- error("failed to get filehandle");
- }
- binmode($fh);
- while (<$fh>) {
- print STDERR $_."\n";
+
+ # Move the attachment into place.
+ # Try to use a fast rename; fall back to copying.
+ prep_writefile($filename, $config{srcdir});
+ unlink($config{srcdir}."/".$filename);
+ if (! rename($tempfile, $config{srcdir}."/".$filename)) {
+ my $fh=$q->upload('attachment');
+ if (! defined $fh || ! ref $fh) {
+ error("failed to get filehandle");
+ }
+ binmode($fh);
+ writefile($filename, $config{srcdir}, undef, 1, sub {
+ IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
+ });
}
+
+ # TODO add to vcs
+
+ # TODO trigger a wiki build if there's no vcs
}
} # }}}
}
my %params=@_;
- if (! exists $params{tempfile}) {
- return IkiWiki::FailReason->new("no tempfile specified");
+ if (! exists $params{file}) {
+ return IkiWiki::FailReason->new("no file specified");
}
- if (-s $params{tempfile} > $maxsize) {
- return IkiWiki::FailReason->new("attachment too large");
+ if (-s $params{file} > $maxsize) {
+ return IkiWiki::FailReason->new("file too large");
}
else {
- return IkiWiki::SuccessReason->new("attachment size ok");
+ return IkiWiki::SuccessReason->new("file not too large");
}
} #}}}
}
my %params=@_;
- if (! exists $params{tempfile}) {
- return IkiWiki::FailReason->new("no tempfile specified");
+ if (! exists $params{file}) {
+ return IkiWiki::FailReason->new("no file specified");
+ }
+
+ if (-s $params{file} < $minsize) {
+ return IkiWiki::FailReason->new("file too small");
}
+ else {
+ return IkiWiki::SuccessReason->new("file not too small");
+ }
+} #}}}
+
+sub match_ispage ($$;@) { #{{{
+ my $filename=shift;
- if (-s $params{tempfile} < $minsize) {
- return IkiWiki::FailReason->new("attachment too small");
+ if (defined IkiWiki::pagetype($filename)) {
+ return IkiWiki::SuccessReason->new("file is a wiki page");
}
else {
- return IkiWiki::SuccessReason->new("attachment size ok");
+ return IkiWiki::FailReason->new("file is not a wiki page");
}
} #}}}