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);
+ hook(type => "formbuilder", id => "attachment", call => \&formbuilder, last => 1);
IkiWiki::loadplugin("filecheck");
}
else {
$form->tmpl_param("attachments-class" => "toggleable-open");
}
+
+ # Save attachments in holding area before previewing so
+ # they can be seen in the preview.
+ if ($form->submitted eq "Preview") {
+ attachments_save($form, $params{session});
+ }
}
}
my $filename=Encode::decode_utf8($q->param('attachment'));
if (defined $filename && length $filename &&
($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
- attachment_save($filename, $form, $q, $params{session});
+ attachment_store($filename, $form, $q, $params{session});
}
- elsif ($form->submitted eq "Insert Links") {
+ if ($form->submitted eq "Save Page") {
+ attachments_save($form, $params{session});
+ }
+
+ if ($form->submitted eq "Insert Links") {
my $page=quotemeta(Encode::decode_utf8($q->param("page")));
my $add="";
foreach my $f ($q->param("attachment_select")) {
$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
}
-sub attachment_save {
+sub attachment_holding_location {
+ my $page=attachment_location(shift);
+
+ my $dir=$config{wikistatedir}."/attachments/".
+ IkiWiki::possibly_foolish_untaint(linkpage($page));
+ $dir=~s/\/$//;
+ return $dir;
+}
+
+sub is_held_attachment {
+ my $attachment=shift;
+
+ my $f=attachment_holding_location($attachment);
+ if (-f $f) {
+ return $f
+ }
+ else {
+ return undef;
+ }
+}
+
+# Stores the attachment in a holding area, not yet in the wiki proper.
+sub attachment_store {
my $filename=shift;
my $form=shift;
my $q=shift;
$filename=IkiWiki::basename($filename);
$filename=~s/.*\\+(.+)/$1/; # hello, windows
- $filename=linkpage(IkiWiki::possibly_foolish_untaint(
- attachment_location($form->field('page')).
- $filename));
- if (IkiWiki::file_pruned($filename)) {
+ $filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
+
+ # Check that the user is allowed to edit the attachment.
+ my $final_filename=
+ linkpage(IkiWiki::possibly_foolish_untaint(
+ attachment_location($form->field('page')))).
+ $filename;
+ if (IkiWiki::file_pruned($final_filename)) {
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, $session);
+ IkiWiki::check_canedit($final_filename, $q, $session);
# And that the attachment itself is acceptable.
- check_canattach($session, $filename, $tempfile);
+ check_canattach($session, $final_filename, $tempfile);
- # Needed for fast_file_copy and for rendering below.
- require IkiWiki::Render;
-
- # Move the attachment into place.
+ # Move the attachment into holding directory.
# Try to use a fast rename; fall back to copying.
- IkiWiki::prep_writefile($filename, $config{srcdir});
- unlink($config{srcdir}."/".$filename);
- if (rename($tempfile, $config{srcdir}."/".$filename)) {
+ my $dest=attachment_holding_location($form->field('page'));
+ IkiWiki::prep_writefile($filename, $dest);
+ unlink($dest."/".$filename);
+ if (rename($tempfile, $dest."/".$filename)) {
# The temp file has tight permissions; loosen up.
- chmod(0666 & ~umask, $config{srcdir}."/".$filename);
+ chmod(0666 & ~umask, $dest."/".$filename);
}
else {
my $fh=$q->upload('attachment');
}
}
binmode($fh);
- writefile($filename, $config{srcdir}, undef, 1, sub {
+ require IkiWiki::Render;
+ writefile($filename, $dest, undef, 1, sub {
IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
});
}
+}
+
+# Save all stored attachments for a page.
+sub attachments_save {
+ my $form=shift;
+ my $session=shift;
+
+ # Move attachments out of holding directory.
+ my @attachments;
+ my $dir=attachment_holding_location($form->field('page'));
+ foreach my $filename (glob("$dir/*")) {
+ next unless -f $filename;
+ my $dest=$config{srcdir}."/".
+ linkpage(IkiWiki::possibly_foolish_untaint(
+ attachment_location($form->field('page')))).
+ IkiWiki::basename($filename);
+ unlink($dest);
+ rename($filename, $dest);
+ push @attachments, $dest;
+ }
+ return unless @attachments;
+ require IkiWiki::Render;
+ IkiWiki::prune($dir);
- # Check the attachment in and trigger a wiki refresh.
+ # Check the attachments in and trigger a wiki refresh.
if ($config{rcs}) {
- IkiWiki::rcs_add($filename);
+ IkiWiki::rcs_add($_) foreach @attachments;
IkiWiki::disable_commit_hook();
- IkiWiki::rcs_commit(
- file => $filename,
+ IkiWiki::rcs_commit_staged(
message => gettext("attachment upload"),
- token => IkiWiki::rcs_prepedit($filename),
session => $session,
);
IkiWiki::enable_commit_hook();
my $page=shift;
my $loc=attachment_location($page);
- my @ret;
+ my $std=sub {
+ my $file=shift;
+ my $mtime=shift;
+ my $size=shift;
+
+ "field-select" => '<input type="checkbox" name="attachment_select" value="'.$file.'" />',
+ size => IkiWiki::Plugin::filecheck::humansize($size),
+ mtime => displaytime($mtime),
+ mtime_raw => $mtime,
+ };
+
+ # attachments already in the wiki
+ my %attachments;
foreach my $f (values %pagesources) {
if (! defined pagetype($f) &&
$f=~m/^\Q$loc\E[^\/]+$/) {
- push @ret, {
- "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
+ $attachments{$f}={
+ $std->($f, $IkiWiki::pagemtime{$f}, (stat($f))[7]),
link => htmllink($page, $page, $f, noimageinline => 1),
- size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]),
- mtime => displaytime($IkiWiki::pagemtime{$f}),
- mtime_raw => $IkiWiki::pagemtime{$f},
};
}
}
+
+ # attachments in holding directory
+ my $dir=attachment_holding_location($page);
+ my $heldmsg=gettext("this attachment is not yet saved");
+ foreach my $file (glob("$dir/*")) {
+ next unless -f $file;
+ my $mtime=(stat(_))[9];
+ my $base=IkiWiki::basename($file);
+ my $f=$loc.$base;
+ $attachments{$f}={
+ $std->($f, (stat($file))[9], (stat(_))[7]),
+ link => "<span title=\"$heldmsg\">$base</span>",
+ }
+ }
# 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;
+ return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} }
+ values %attachments;
}
1
sipb-www / ikiwiki.git / blobdiff