Merge branch 'ready/perf'

[git.ikiwiki.info.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ef6d79a9c52a1db7006d223730a1636c6ab71bf6..d56dd18ad8ded90e3dd6f46598e7bc632359d4b5 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -3,24 +3,86 @@ package IkiWiki::Plugin::attachment;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       add_underlay("attachment");
+       add_underlay("javascript");
+       add_underlay("jquery");
+       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 => "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");
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+                       section => "web",
+               },
+               allowed_attachments => {
+                       type => "pagespec",
+                       example => "virusfree() and mimetype(image/*) and maxsize(50kb)",
+                       description => "enhanced PageSpec specifying what attachments are allowed",
+                       link => "ikiwiki/PageSpec/attachment",
+                       safe => 1,
+                       rebuild => 0,
+               },
+               virus_checker => {
+                       type => "string",
+                       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 $IkiWiki::pagesources{$dest} &&
+           $IkiWiki::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;
+       if (defined $config{allowed_attachments} &&
+           length $config{allowed_attachments}) {
+               $allowed=pagespec_match($dest,
+                       $config{allowed_attachments},
+                       file => $file,
+                       user => $session->param("name"),
+                       ip => $session->remote_addr(),
+               );
+       }
+
+       if (! $allowed) {
+               error(gettext("prohibited by allowed_attachments")." ($allowed)");
+       }
+       else {
+               return 1;
+       }
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        $config{cgi_disable_uploads}=0;
        $config{cgi_disable_uploads}=0;

-} #}}}
+}

 
 

-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {

        my %params=@_;
        my $form=$params{form};
        my $q=$params{cgi};
 
        my %params=@_;
        my $form=$params{form};
        my $q=$params{cgi};
 

-       if (defined $form->field("do") && $form->field("do") eq "edit") {
+       if (defined $form->field("do") && ($form->field("do") eq "edit" ||
+           $form->field("do") eq "create")) {

                # Add attachment field, set type to multipart.
                $form->enctype(&CGI::MULTIPART);
                $form->field(name => 'attachment', type => 'file');
                # Add attachment field, set type to multipart.
                $form->enctype(&CGI::MULTIPART);
                $form->field(name => 'attachment', type => 'file');


@@ -29,10 +91,20 @@ sub formbuilder_setup (@) { #{{{
                $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
                $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
 
                $form->tmpl_param("field-upload" => '<input name="_submit" type="submit" value="Upload Attachment" />');
                $form->tmpl_param("field-link" => '<input name="_submit" type="submit" value="Insert Links" />');
 

-               # Add the javascript from the toggle plugin;
-               # the attachments interface uses it to toggle visibility.
+               # Add all the javascript used by the attachments interface.

                require IkiWiki::Plugin::toggle;
                require IkiWiki::Plugin::toggle;

-               $form->tmpl_param("javascript" => $IkiWiki::Plugin::toggle::javascript);
+               my $js=IkiWiki::Plugin::toggle::include_javascript($params{page});
+               $js.='<link rel="stylesheet" href="'.urlto("ikiwiki/jquery-ui.min.css", $params{page}).'" id="theme">'."\n";
+               my @jsfiles=qw{jquery.min jquery-ui.min
+                       jquery.tmpl.min jquery.iframe-transport
+                       jquery.fileupload jquery.fileupload-ui
+               };
+               foreach my $file (@jsfiles) {
+                       $js.='<script src="'.urlto("ikiwiki/$file.js", $params{page}).
+                            '" type="text/javascript" charset="utf-8"></script>'."\n";
+               }
+               $form->tmpl_param("javascript" => $js);
+

                # Start with the attachments interface toggled invisible,
                # but if it was used, keep it open.
                if ($form->submitted ne "Upload Attachment" &&
                # Start with the attachments interface toggled invisible,
                # but if it was used, keep it open.
                if ($form->submitted ne "Upload Attachment" &&


@@ -43,142 +115,46 @@ sub formbuilder_setup (@) { #{{{
                else {
                        $form->tmpl_param("attachments-class" => "toggleable-open");
                }
                else {
                        $form->tmpl_param("attachments-class" => "toggleable-open");
                }

-       }
-       elsif ($form->title eq "preferences") {
-               my $session=$params{session};
-               my $user_name=$session->param("name");
-
-               $form->field(name => "allowed_attachments", size => 50,
-                       fieldset => "admin",
-                       comment => "(".
-                               htmllink("", "", 
-                                       "ikiwiki/PageSpec/attachment", 
-                                       noimageinline => 1,
-                                       linktext => "Enhanced PageSpec",
-                               ).")"
-               );
-               if (! IkiWiki::is_admin($user_name)) {
-                       $form->field(name => "allowed_attachments", type => "hidden");
-               }
-                if (! $form->submitted) {
-                       $form->field(name => "allowed_attachments", force => 1,
-                               value => IkiWiki::userinfo_get($user_name, "allowed_attachments"));
-                }
-               if ($form->submitted && $form->submitted eq 'Save Preferences') {
-                       if (defined $form->field("allowed_attachments")) {
-                               IkiWiki::userinfo_set($user_name, "allowed_attachments",
-                               $form->field("allowed_attachments")) ||
-                                       error("failed to set allowed_attachments");
-                       }
+               
+               # Save attachments in holding area before previewing and
+               # saving.
+               if ($form->submitted eq "Preview" ||
+                   $form->submitted eq "Save Page") {
+                       attachments_save($form, $params{session});

                }
        }
                }
        }

-} #}}}
+}

 
 

-sub formbuilder (@) { #{{{
+sub formbuilder (@) {

        my %params=@_;
        my $form=$params{form};
        my $q=$params{cgi};
 
        my %params=@_;
        my $form=$params{form};
        my $q=$params{cgi};
 

-       return if ! defined $form->field("do") || $form->field("do") ne "edit";
-
-       my $filename=$q->param('attachment');
-       if (defined $filename && length $filename &&
-            ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
-               my $session=$params{session};
-               
-               # This is an (apparently undocumented) way to get the name
-               # of the temp file that CGI writes the upload to.
-               my $tempfile=$q->tmpFileName($filename);
-               if (! defined $tempfile || ! length $tempfile) {
-                       # perl 5.8 needs an alternative, awful method
-                       if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
-                               foreach my $key (keys(%{$q->{'.tmpfiles'}})) {
-                                       $tempfile=$q->tmpFileName(\$key);
-                                       last if defined $tempfile && length $tempfile;
-                               }
-                       }
-                       if (! defined $tempfile || ! length $tempfile) {
-                               error("CGI::tmpFileName failed to return the uploaded file name");
-                       }
-               }
-
-               $filename=IkiWiki::titlepage(
-                       IkiWiki::possibly_foolish_untaint(
-                               attachment_location($form->field('page')).
-                               IkiWiki::basename($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, $session, 1);
-               
-               # Use a special pagespec to test that the attachment is valid.
-               my $allowed=1;
-               foreach my $admin (@{$config{adminuser}}) {
-                       my $allowed_attachments=IkiWiki::userinfo_get($admin, "allowed_attachments");
-                       if (defined $allowed_attachments &&
-                           length $allowed_attachments) {
-                               $allowed=pagespec_match($filename,
-                                       $allowed_attachments,
-                                       file => $tempfile,
-                                       user => $session->param("name"),
-                                       ip => $ENV{REMOTE_ADDR},
-                               );
-                               last if $allowed;
-                       }
-               }
-               if (! $allowed) {
-                       error(gettext("attachment rejected")." ($allowed)");
-               }
+       return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;

 
 

-               # Needed for fast_file_copy and for rendering below.
-               require IkiWiki::Render;
-
-               # Move the attachment into place.
-               # 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)) {
-                       # The temp file has tight permissions; loosen up.
-                       chmod(0666 & ~umask, $config{srcdir}."/".$filename);
-               }
-               else {
-                       my $fh=$q->upload('attachment');
-                       if (! defined $fh || ! ref $fh) {
-                               # needed by old CGI versions
-                               $fh=$q->param('attachment');
-                               if (! defined $fh || ! ref $fh) {
-                                       # even that doesn't always work,
-                                       # fall back to opening the tempfile
-                                       $fh=undef;
-                                       open($fh, "<", $tempfile) || error("failed to open \"$tempfile\": $!");
-                               }
-                       }
-                       binmode($fh);
-                       writefile($filename, $config{srcdir}, undef, 1, sub {
-                               IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
-                       });
-               }
+       my $filename=Encode::decode_utf8($q->param('attachment'));
+       if (defined $filename && length $filename) {
+               attachment_store($filename, $form, $q, $params{session});
+       }

 
 

-               # Check the attachment in and trigger a wiki refresh.
-               if ($config{rcs}) {
-                       IkiWiki::rcs_add($filename);
-                       IkiWiki::disable_commit_hook();
-                       IkiWiki::rcs_commit($filename, gettext("attachment upload"),
-                               IkiWiki::rcs_prepedit($filename),
-                               $session->param("name"), $ENV{REMOTE_ADDR});
-                       IkiWiki::enable_commit_hook();
-                       IkiWiki::rcs_update();
-               }
-               IkiWiki::refresh();
-               IkiWiki::saveindex();
+       if ($form->submitted eq "Save Page") {
+               attachments_save($form, $params{session});

        }
        }

-       elsif ($form->submitted eq "Insert Links") {
+
+       if ($form->submitted eq "Insert Links") {
+               my $page=quotemeta(Encode::decode_utf8($q->param("page")));

                my $add="";
                foreach my $f ($q->param("attachment_select")) {
                my $add="";
                foreach my $f ($q->param("attachment_select")) {

-                       $add.="[[$f]]\n";
+                       $f=Encode::decode_utf8($f);
+                       $f=~s/^$page\///;
+                       if (IkiWiki::isinlinableimage($f) &&
+                           IkiWiki::Plugin::img->can("import")) {
+                               $add.='[[!img '.$f.' align="right" size="" alt=""]]';
+                       }
+                       else {
+                               $add.="[[$f]]";
+                       }
+                       $add.="\n";

                }
                $form->field(name => 'editcontent',
                        value => $form->field('editcontent')."\n\n".$add,
                }
                $form->field(name => 'editcontent',
                        value => $form->field('editcontent')."\n\n".$add,


@@ -188,254 +164,232 @@ sub formbuilder (@) { #{{{
        # Generate the attachment list only after having added any new
        # attachments.
        $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
        # Generate the attachment list only after having added any new
        # attachments.
        $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);

-} # }}}
-
-sub attachment_location ($) {
-       my $page=shift;
-       
-       # Put the attachment in a subdir of the page it's attached
-       # to, unless that page is an "index" page.
-       $page=~s/(^|\/)index//;
-       $page.="/" if length $page;
-       
-       return $page;

 }
 
 }
 

-sub attachment_list ($) {
-       my $page=shift;
-       my $loc=attachment_location($page);
-
-       my @ret;
-       foreach my $f (values %pagesources) {
-               if (! defined IkiWiki::pagetype($f) &&
-                   $f=~m/^\Q$loc\E[^\/]+$/ &&
-                   -e "$config{srcdir}/$f") {
-                       push @ret, {
-                               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
-                               link => htmllink($page, $page, $f, noimageinline => 1),
-                               size => humansize((stat(_))[7]),
-                               mtime => displaytime($IkiWiki::pagemtime{$f}),
-                               mtime_raw => $IkiWiki::pagemtime{$f},
-                       };
-               }
-       }
+sub attachment_holding_location {
+       my $page=attachment_location(shift);

 
 

-       # 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 $dir=$config{wikistatedir}."/attachments/".
+               IkiWiki::possibly_foolish_untaint(linkpage($page));
+       $dir=~s/\/$//;
+       return $dir;

 }
 
 }
 

-my %units=(            # size in bytes
-       B               => 1,
-       byte            => 1,
-       KB              => 2 ** 10,
-       kilobyte        => 2 ** 10,
-       K               => 2 ** 10,
-       KB              => 2 ** 10,
-       kilobyte        => 2 ** 10,
-       M               => 2 ** 20,
-       MB              => 2 ** 20,
-       megabyte        => 2 ** 20,
-       G               => 2 ** 30,
-       GB              => 2 ** 30,
-       gigabyte        => 2 ** 30,
-       T               => 2 ** 40,
-       TB              => 2 ** 40,
-       terabyte        => 2 ** 40,
-       P               => 2 ** 50,
-       PB              => 2 ** 50,
-       petabyte        => 2 ** 50,
-       E               => 2 ** 60,
-       EB              => 2 ** 60,
-       exabyte         => 2 ** 60,
-       Z               => 2 ** 70,
-       ZB              => 2 ** 70,
-       zettabyte       => 2 ** 70,
-       Y               => 2 ** 80,
-       YB              => 2 ** 80,
-       yottabyte       => 2 ** 80,
-       # 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;
-
-       no warnings;
-       my $base=$size+0; # force to number
-       use warnings;
-       foreach my $unit (sort keys %units) {
-               if ($size=~/[0-9\s]\Q$unit\E$/i) {
-                       return $base * $units{$unit};
-               }
-       }
-       return $base;
-} #}}}
-
-sub humansize ($) { #{{{
-       my $size=shift;
-
-       foreach my $unit (reverse sort { $units{$a} <=> $units{$b} || $b cmp $a } keys %units) {
-               if ($size / $units{$unit} > 0.25) {
-                       return (int($size / $units{$unit} * 10)/10).$unit;
-               }
-       }
-       return $size; # near zero, or negative
-} #}}}
-
-package IkiWiki::PageSpec;
-
-sub match_maxsize ($$;@) { #{{{
-       shift;
-       my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-               return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
-       }
-
-       my %params=@_;
-       if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no file specified");
-       }
-
-       if (-s $params{file} > $maxsize) {
-               return IkiWiki::FailReason->new("file too large (".(-s $params{file})." >  $maxsize)");
-       }
-       else {
-               return IkiWiki::SuccessReason->new("file not too large");
-       }
-} #}}}
-
-sub match_minsize ($$;@) { #{{{
-       shift;
-       my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-               return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
-       }
-
-       my %params=@_;
-       if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no file specified");
-       }
+sub is_held_attachment {
+       my $attachment=shift;

 
 

-       if (-s $params{file} < $minsize) {
-               return IkiWiki::FailReason->new("file too small");
+       my $f=attachment_holding_location($attachment);
+       if (-f $f) {
+               return $f

        }
        else {
        }
        else {

-               return IkiWiki::SuccessReason->new("file not too small");
+               return undef;

        }
        }

-} #}}}
-
-sub match_mimetype ($$;@) { #{{{
-       shift;
-       my $wanted=shift;
+}

 
 

-       my %params=@_;
-       if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no file specified");
+# 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;
+       my $session=shift;
+       
+       # This is an (apparently undocumented) way to get the name
+       # of the temp file that CGI writes the upload to.
+       my $tempfile=$q->tmpFileName($filename);
+       if (! defined $tempfile || ! length $tempfile) {
+               # perl 5.8 needs an alternative, awful method
+               if ($q =~ /HASH/ && exists $q->{'.tmpfiles'}) {
+                       foreach my $key (keys(%{$q->{'.tmpfiles'}})) {
+                               $tempfile=$q->tmpFileName(\$key);
+                               last if defined $tempfile && length $tempfile;
+                       }
+               }
+               if (! defined $tempfile || ! length $tempfile) {
+                       error("CGI::tmpFileName failed to return the uploaded file name");
+               }

        }
 
        }
 

-       # Use ::magic to get the mime type, the idea is to only trust
-       # data obtained by examining the actual file contents.
-       eval q{use File::MimeInfo::Magic};
+       $filename=IkiWiki::basename($filename);
+       $filename=~s/.*\\+(.+)/$1/; # hello, windows
+       $filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
+       my $dest=attachment_holding_location($form->field('page'));
+       
+       # Check that the user is allowed to edit the attachment.
+       my $final_filename=
+               linkpage(IkiWiki::possibly_foolish_untaint(
+                       attachment_location($form->field('page')))).
+               $filename;
+       eval {
+               if (IkiWiki::file_pruned($final_filename)) {
+                       error(gettext("bad attachment filename"));
+               }
+               IkiWiki::check_canedit($final_filename, $q, $session);
+               # And that the attachment itself is acceptable.
+               check_canattach($session, $final_filename, $tempfile);
+       };

        if ($@) {
        if ($@) {

-               return IkiWiki::FailReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type");
-       }
-       my $mimetype=File::MimeInfo::Magic::magic($params{file});
-       if (! defined $mimetype) {
-               $mimetype="unknown";
+               # save error in case called functions clobber $@
+               my $error = $@;
+               json_response($q, $form, $dest."/".$filename, $error);
+               error $error;

        }
 
        }
 

-       my $regexp=IkiWiki::glob2re($wanted);
-       if ($mimetype!~/^$regexp$/i) {
-               return IkiWiki::FailReason->new("file MIME type is $mimetype, not $wanted");
+       # Move the attachment into holding directory.
+       # Try to use a fast rename; fall back to copying.
+       IkiWiki::prep_writefile($filename, $dest);
+       unlink($dest."/".$filename);
+       if (rename($tempfile, $dest."/".$filename)) {
+               # The temp file has tight permissions; loosen up.
+               chmod(0666 & ~umask, $dest."/".$filename);

        }
        else {
        }
        else {

-               return IkiWiki::SuccessReason->new("file MIME type is $mimetype");
+               my $fh=$q->upload('attachment');
+               if (! defined $fh || ! ref $fh) {
+                       # needed by old CGI versions
+                       $fh=$q->param('attachment');
+                       if (! defined $fh || ! ref $fh) {
+                               # even that doesn't always work,
+                               # fall back to opening the tempfile
+                               $fh=undef;
+                               open($fh, "<", $tempfile) || error("failed to open \"$tempfile\": $!");
+                       }
+               }
+               binmode($fh);
+               require IkiWiki::Render; 
+               writefile($filename, $dest, undef, 1, sub {
+                       IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
+               });

        }
        }

-} #}}}

 
 

-sub match_virusfree ($$;@) { #{{{
-       shift;
-       my $wanted=shift;
+       json_response($q, $form, $dest."/".$filename, stored_msg());
+}

 
 

-       my %params=@_;
-       if (! exists $params{file}) {
-               return IkiWiki::FailReason->new("no file specified");
+# 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/*")) {
+               $filename=Encode::decode_utf8($filename);
+               next unless -f $filename;
+               my $destdir=linkpage(IkiWiki::possibly_foolish_untaint(
+                       attachment_location($form->field('page'))));
+               my $absdestdir=$config{srcdir}."/".$destdir;
+               my $destfile=IkiWiki::basename($filename);
+               my $dest=$absdestdir.$destfile;
+               unlink($dest);
+               IkiWiki::prep_writefile($destfile, $absdestdir);
+               rename($filename, $dest);
+               push @attachments, $destdir.$destfile;
+       }
+       return unless @attachments;
+       require IkiWiki::Render;
+       IkiWiki::prune($dir, $config{wikistatedir}."/attachments");
+
+       # Check the attachments in and trigger a wiki refresh.
+       if ($config{rcs}) {
+               IkiWiki::rcs_add($_) foreach @attachments;
+               IkiWiki::disable_commit_hook();
+               IkiWiki::rcs_commit_staged(
+                       message => gettext("attachment upload"),
+                       session => $session,
+               );
+               IkiWiki::enable_commit_hook();
+               IkiWiki::rcs_update();

        }
        }

+       IkiWiki::refresh();
+       IkiWiki::saveindex();
+}

 
 

-       if (! exists $IkiWiki::config{virus_checker} ||
-           ! length $IkiWiki::config{virus_checker}) {
-               return IkiWiki::FailReason->new("no virus_checker configured");
-       }
+sub attachment_location ($) {
+       my $page=shift;
+       
+       # Put the attachment in a subdir of the page it's attached
+       # to, unless that page is the "index" page.
+       return "" if $page eq 'index';
+       $page.="/" if length $page;
+       
+       return $page;
+}

 
 

-       # The file needs to be fed into the virus checker on stdin,
-       # because the file is not world-readable, and if clamdscan is
-       # used, clamd would fail to read it.
-       eval q{use IPC::Open2};
-       error($@) if $@;
-       open (IN, "<", $params{file}) || return IkiWiki::FailReason->new("failed to read file");
-       binmode(IN);
-       my $sigpipe=0;
-       $SIG{PIPE} = sub { $sigpipe=1 };
-       my $pid=open2(\*CHECKER_OUT, "<&IN", $IkiWiki::config{virus_checker}); 
-       my $reason=<CHECKER_OUT>;
-       chomp $reason;
-       1 while (<CHECKER_OUT>);
-       close(CHECKER_OUT);
-       waitpid $pid, 0;
-       $SIG{PIPE}="DEFAULT";
-       if ($sigpipe || $?) {
-               return IkiWiki::FailReason->new("file seems to contain a virus ($reason)");
-       }
-       else {
-               return IkiWiki::SuccessReason->new("file seems virusfree ($reason)");
-       }
-} #}}}
+sub attachment_list ($) {
+       my $page=shift;
+       my $loc=attachment_location($page);

 
 

-sub match_ispage ($$;@) { #{{{
-       my $filename=shift;
+       my $std=sub {
+               my $file=shift;
+               my $mtime=shift;
+               my $date=shift;
+               my $size=shift;

 
 

-       if (defined IkiWiki::pagetype($filename)) {
-               return IkiWiki::SuccessReason->new("file is a wiki page");
-       }
-       else {
-               return IkiWiki::FailReason->new("file is not a wiki page");
-       }
-} #}}}
+               name => $file,
+               size => IkiWiki::Plugin::filecheck::humansize($size),
+               mtime => $date,
+               mtime_raw => $mtime,
+       };

 
 

-sub match_user ($$;@) { #{{{
-       shift;
-       my $user=shift;
-       my %params=@_;
+       # attachments already in the wiki
+       my %attachments;
+       foreach my $f (values %pagesources) {
+               if (! defined pagetype($f) &&
+                   $f=~m/^\Q$loc\E[^\/]+$/) {
+                       $attachments{$f}={
+                               $std->($f, $IkiWiki::pagemtime{$f}, displaytime($IkiWiki::pagemtime{$f}), (stat($f))[7]),
+                               link => htmllink($page, $page, $f, noimageinline => 1),
+                       };
+               }
+       }

        
        

-       if (! exists $params{user}) {
-               return IkiWiki::FailReason->new("no user specified");
+       # attachments in holding directory
+       my $dir=attachment_holding_location($page);
+       my $heldmsg=gettext("this attachment is not yet saved");
+       foreach my $file (glob("$dir/*")) {
+               $file=Encode::decode_utf8($file);
+               next unless -f $file;
+               my $base=IkiWiki::basename($file);
+               my $f=$loc.$base;
+               $attachments{$f}={
+                       $std->($f, (stat($file))[9]*2, stored_msg(), (stat(_))[7]),
+                       link => $base,
+               }

        }
 
        }
 

-       if (defined $params{user} && lc $params{user} eq lc $user) {
-               return IkiWiki::SuccessReason->new("user is $user");
-       }
-       else {
-               return IkiWiki::FailReason->new("user is $params{user}, not $user");
-       }
-} #}}}
+       # Sort newer attachments to the end of the list.
+       return sort { $a->{mtime_raw} <=> $b->{mtime_raw} || $a->{link} cmp $b->{link} }
+               values %attachments;
+}

 
 

-sub match_ip ($$;@) { #{{{
-       shift;
-       my $ip=shift;
-       my %params=@_;
-       
-       if (! exists $params{ip}) {
-               return IkiWiki::FailReason->new("no IP specified");
-       }
+sub stored_msg {
+       gettext("just uploaded");
+}

 
 

-       if (defined $params{ip} && lc $params{ip} eq lc $ip) {
-               return IkiWiki::SuccessReason->new("IP is $ip");
-       }
-       else {
-               return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
+sub json_response ($$$$) {
+       my $q=shift;
+       my $form=shift;
+       my $filename=shift;
+       my $stored_msg=shift;
+
+       if (! defined $form->submitted ||
+           $form->submitted ne "Upload Attachment") {
+               eval q{use JSON};
+               error $@ if $@;
+               print "Content-type: text/html\n\n";
+               my $size=-s $filename;
+               print to_json([
+                       {
+                               name => IkiWiki::basename($filename),
+                               size => $size,
+                               humansize => IkiWiki::Plugin::filecheck::humansize($size),
+                               stored_msg => $stored_msg,
+                               
+                       }
+               ]);
+               exit 0;

        }
        }

-} #}}}
+}

 
 1
 
 1