git: do not fail to commit if committer is anonymous

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8a31beb391ffbb99259f49e352c8fc1e4ece16a8..ab1929e3618e39ead815bfe71639272e2a71d55b 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});
                # 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
                my @jsfiles=qw{jquery.min jquery-ui.min
                        jquery.tmpl.min jquery.iframe-transport
                        jquery.fileupload jquery.fileupload-ui


@@ -116,9 +116,10 @@ sub formbuilder_setup (@) {
                        $form->tmpl_param("attachments-class" => "toggleable-open");
                }
                
                        $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") {
+               # Save attachments in holding area before previewing and
+               # saving.
+               if ($form->submitted eq "Preview" ||
+                   $form->submitted eq "Save Page") {

                        attachments_save($form, $params{session});
                }
        }
                        attachments_save($form, $params{session});
                }
        }


@@ -147,7 +148,7 @@ sub formbuilder (@) {
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&
                        $f=Encode::decode_utf8($f);
                        $f=~s/^$page\///;
                        if (IkiWiki::isinlinableimage($f) &&

-                           UNIVERSAL::can("IkiWiki::Plugin::img", "import")) {
+                           IkiWiki::Plugin::img->can("import")) {

                                $add.='[[!img '.$f.' align="right" size="" alt=""]]';
                        }
                        else {
                                $add.='[[!img '.$f.' align="right" size="" alt=""]]';
                        }
                        else {


@@ -155,14 +156,15 @@ sub formbuilder (@) {
                        }
                        $add.="\n";
                }
                        }
                        $add.="\n";
                }

+               my $content = $form->field('editcontent');

                $form->field(name => 'editcontent',
                $form->field(name => 'editcontent',

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

                        force => 1) if length $add;
        }
        
        # Generate the attachment list only after having added any new
        # attachments.
                        force => 1) if length $add;
        }
        
        # Generate the attachment list only after having added any new
        # attachments.

-       $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
+       $form->tmpl_param("attachment_list" => [attachment_list(scalar $form->field('page'))]);

 }
 
 sub attachment_holding_location {
 }
 
 sub attachment_holding_location {


@@ -212,22 +214,28 @@ sub attachment_store {
        $filename=IkiWiki::basename($filename);
        $filename=~s/.*\\+(.+)/$1/; # hello, windows
        $filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
        $filename=IkiWiki::basename($filename);
        $filename=~s/.*\\+(.+)/$1/; # hello, windows
        $filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));

+       my $dest=attachment_holding_location(scalar $form->field('page'));

        
        # Check that the user is allowed to edit the attachment.
        my $final_filename=
                linkpage(IkiWiki::possibly_foolish_untaint(
        
        # Check that the user is allowed to edit the attachment.
        my $final_filename=
                linkpage(IkiWiki::possibly_foolish_untaint(

-                       attachment_location($form->field('page')))).
+                       attachment_location(scalar $form->field('page')))).

                $filename;
                $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.
 
        # 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)) {
        IkiWiki::prep_writefile($filename, $dest);
        unlink($dest."/".$filename);
        if (rename($tempfile, $dest."/".$filename)) {


@@ -252,22 +260,8 @@ sub attachment_store {
                        IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
                });
        }
                        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.
 }
 
 # Save all stored attachments for a page.


@@ -277,20 +271,23 @@ sub attachments_save {
 
        # Move attachments out of holding directory.
        my @attachments;
 
        # Move attachments out of holding directory.
        my @attachments;

-       my $dir=attachment_holding_location($form->field('page'));
+       my $dir=attachment_holding_location(scalar $form->field('page'));

        foreach my $filename (glob("$dir/*")) {
        foreach my $filename (glob("$dir/*")) {

+               $filename=Encode::decode_utf8($filename);

                next unless -f $filename;
                next unless -f $filename;

-               my $dest=$config{srcdir}."/".
+               my $destdir=$config{srcdir}."/".

                        linkpage(IkiWiki::possibly_foolish_untaint(
                        linkpage(IkiWiki::possibly_foolish_untaint(

-                               attachment_location($form->field('page')))).
-                       IkiWiki::basename($filename);
+                               attachment_location(scalar $form->field('page'))));
+               my $destfile=IkiWiki::basename($filename);
+               my $dest=$destdir.$destfile;

                unlink($dest);
                unlink($dest);

+               IkiWiki::prep_writefile($destfile, $destdir);

                rename($filename, $dest);
                push @attachments, $dest;
        }
        return unless @attachments;
        require IkiWiki::Render;
                rename($filename, $dest);
                push @attachments, $dest;
        }
        return unless @attachments;
        require IkiWiki::Render;

-       IkiWiki::prune($dir);
+       IkiWiki::prune($dir, $config{wikistatedir}."/attachments");

 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {
 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {


@@ -311,8 +308,8 @@ sub attachment_location ($) {
        my $page=shift;
        
        # Put the attachment in a subdir of the page it's attached
        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//;
+       # to, unless that page is the "index" page.
+       return "" if $page eq 'index';

        $page.="/" if length $page;
        
        return $page;
        $page.="/" if length $page;
        
        return $page;


@@ -350,11 +347,12 @@ sub attachment_list ($) {
        my $dir=attachment_holding_location($page);
        my $heldmsg=gettext("this attachment is not yet saved");
        foreach my $file (glob("$dir/*")) {
        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}={
                next unless -f $file;
                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,
                }
        }
                        link => $base,
                }
        }


@@ -368,4 +366,29 @@ sub stored_msg {
        gettext("just uploaded");
 }
 
        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
 1