emails in wikilinks are always email addresses

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8a31beb391ffbb99259f49e352c8fc1e4ece16a8..4d6dee23e75a2fe4e1f76889b53b19e68483c001 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -94,7 +94,7 @@ sub formbuilder_setup (@) {
                # Add all the javascript used by the attachments interface.
                require IkiWiki::Plugin::toggle;
                my $js=IkiWiki::Plugin::toggle::include_javascript($params{page});
-               $js.='<link rel="stylesheet" href="'.urlto("ikiwiki/jquery-ui.css", $params{page}).' id="theme">\n';
+               $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
@@ -212,22 +212,28 @@ sub attachment_store {
        $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;
-       if (IkiWiki::file_pruned($final_filename)) {
-               error(gettext("bad attachment 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 ($@) {
+               json_response($q, $form, $dest."/".$filename, $@);
+               error $@;
        }
-       IkiWiki::check_canedit($final_filename, $q, $session);
-       # And that the attachment itself is acceptable.
-       check_canattach($session, $final_filename, $tempfile);
 
        # Move the attachment into holding directory.
        # Try to use a fast rename; fall back to copying.
-       my $dest=attachment_holding_location($form->field('page'));
        IkiWiki::prep_writefile($filename, $dest);
        unlink($dest."/".$filename);
        if (rename($tempfile, $dest."/".$filename)) {
@@ -252,22 +258,8 @@ sub attachment_store {
                        IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
                });
        }
-       
-       # Return JSON response for the jquery file upload widget.
-       eval q{use JSON};
-       error $@ if $@;
-       print "Content-type: application/json\n\n";
-       my $size=-s $dest."/".$filename;
-       print to_json([
-               {
-                       name => $filename,
-                       size => $size,
-                       humansize => IkiWiki::Plugin::filecheck::humansize($size),
-                       stored_msg => stored_msg(),
-                       
-               }
-       ]);
-       exit 0;
+
+       json_response($q, $form, $dest."/".$filename, stored_msg());
 }
 
 # Save all stored attachments for a page.
@@ -354,7 +346,7 @@ sub attachment_list ($) {
                my $base=IkiWiki::basename($file);
                my $f=$loc.$base;
                $attachments{$f}={
-                       $std->($f, (stat($file))[9], stored_msg(), (stat(_))[7]),
+                       $std->($f, (stat($file))[9]*2, stored_msg(), (stat(_))[7]),
                        link => $base,
                }
        }
@@ -368,4 +360,29 @@ sub stored_msg {
        gettext("just uploaded");
 }
 
+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