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});
+ }
}
}
($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
attachment_store($filename, $form, $q, $params{session});
}
- if ($form->submitted eq "Save Page" || $form->submitted eq "Preview") {
+ if ($form->submitted eq "Save Page") {
attachments_save($form, $params{session});
}
$form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
}
-sub attachment_holding_dir {
- my $page=shift;
+sub attachment_holding_location {
+ my $page=attachment_location(shift);
- return $config{wikistatedir}."/attachments/".
+ 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.
# Move the attachment into holding directory.
# Try to use a fast rename; fall back to copying.
- my $dest=attachment_holding_dir($form->field('page'));
+ my $dest=attachment_holding_location($form->field('page'));
IkiWiki::prep_writefile($filename, $dest);
unlink($dest."/".$filename);
if (rename($tempfile, $dest."/".$filename)) {
}
}
binmode($fh);
- # Needed for fast_file_copy.
- require IkiWiki::Render;
+ require IkiWiki::Render;
writefile($filename, $dest, undef, 1, sub {
IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
});
# Move attachments out of holding directory.
my @attachments;
- my $dir=attachment_holding_dir($form->field('page'));
+ my $dir=attachment_holding_location($form->field('page'));
foreach my $filename (glob("$dir/*")) {
next unless -f $filename;
my $dest=$config{srcdir}."/".
push @attachments, $dest;
}
return unless @attachments;
- rmdir($dir);
+ require IkiWiki::Render;
+ IkiWiki::prune($dir);
# Check the attachments in and trigger a wiki refresh.
if ($config{rcs}) {
my $page=shift;
my $loc=attachment_location($page);
+ 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[^\/]+$/) {
$attachments{$f}={
- "field-select" => '<input type="checkbox" name="attachment_select" value="'.$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_dir($page);
+ my $dir=attachment_holding_location($page);
my $heldmsg=gettext("this attachment is not yet saved");
foreach my $file (glob("$dir/*")) {
- my $mtime=(stat($file))[9];
- my $f=IkiWiki::basename($file);
+ next unless -f $file;
+ my $mtime=(stat(_))[9];
+ my $base=IkiWiki::basename($file);
+ my $f=$loc.$base;
$attachments{$f}={
- "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
- link => "<span title=\"$heldmsg\">$f</span>",
- size => IkiWiki::Plugin::filecheck::humansize((stat($file))[7]),
- mtime => displaytime($mtime),
- mtime_raw => $mtime,
+ $std->($f, (stat($file))[9], (stat(_))[7]),
+ link => "<span title=\"$heldmsg\">$base</span>",
}
}