remember autofiles always

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 087c315a9af355569921c9150c05c0ba89ec8df1..8c3ff887af16076e9f6d41126d11ddac47fb3567 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -19,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "web",

                },
                allowed_attachments => {
                        type => "pagespec",
                },
                allowed_attachments => {
                        type => "pagespec",


@@ -112,7 +113,7 @@ sub formbuilder (@) {
 
        return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
 
 
        return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
 

-       my $filename=$q->param('attachment');
+       my $filename=Encode::decode_utf8($q->param('attachment'));

        if (defined $filename && length $filename &&
             ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
                my $session=$params{session};
        if (defined $filename && length $filename &&
             ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
                my $session=$params{session};


@@ -136,7 +137,7 @@ sub formbuilder (@) {
                $filename=linkpage(IkiWiki::possibly_foolish_untaint(
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));
                $filename=linkpage(IkiWiki::possibly_foolish_untaint(
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));

-               if (IkiWiki::file_pruned($filename, $config{srcdir})) {
+               if (IkiWiki::file_pruned($filename)) {

                        error(gettext("bad attachment filename"));
                }
                
                        error(gettext("bad attachment filename"));
                }
                


@@ -189,9 +190,10 @@ sub formbuilder (@) {
                IkiWiki::saveindex();
        }
        elsif ($form->submitted eq "Insert Links") {
                IkiWiki::saveindex();
        }
        elsif ($form->submitted eq "Insert Links") {

-               my $page=quotemeta($q->param("page"));
+               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")) {

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

                        $f=~s/^$page\///;
                        $add.="[[$f]]\n";
                }
                        $f=~s/^$page\///;
                        $add.="[[$f]]\n";
                }


@@ -230,6 +232,7 @@ sub attachment_list ($) {
                                link => htmllink($page, $page, $f, noimageinline => 1),
                                size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
                                mtime => displaytime($IkiWiki::pagemtime{$f}),
                                link => htmllink($page, $page, $f, noimageinline => 1),
                                size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
                                mtime => displaytime($IkiWiki::pagemtime{$f}),

+                               mtime_raw => $IkiWiki::pagemtime{$f},

                        };
                }
        }
                        };
                }
        }