basic attachment list

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 48cd954d958c3220a753c93867ae01985d13d2eb..1d392589e4f44d5a29d2e2f7cd67c71e09013539 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -15,12 +15,50 @@ sub checkconfig () { #{{{
        $config{cgi_disable_uploads}=0;
 } #}}}
 
+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 $loc=attachment_location(shift);
+
+       my @ret;
+       foreach my $f (values %pagesources) {
+               print STDERR ">>$f\n" if ! defined IkiWiki::pagetype($f);
+               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 => $f,
+                               size => (stat(_))[7],
+                               mtime => displaytime($IkiWiki::pagemtime{$f}),
+                       };
+               }
+       }
+
+       return @ret;
+}
+
 sub formbuilder_setup (@) { #{{{
        my %params=@_;
        my $form=$params{form};
 
        if ($form->field("do") eq "edit") {
                $form->field(name => 'attachment', type => 'file');
+               $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
+
+               # These buttons are not put in the usual place, so
+               # is not added to the normal formbuilder button list.
+               $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" />');
        }
        elsif ($form->title eq "preferences") {
                my $session=$params{session};
@@ -66,15 +104,10 @@ sub formbuilder (@) { #{{{
                # of the temp file that CGI writes the upload to.
                my $tempfile=$q->tmpFileName($filename);
                
-               # Put the attachment in a subdir of the page it's attached
-               # to, unless that page is an "index" page.
-               my $page=$form->field('page');
-               $page=~s/(^|\/)index//;
-               $filename=(length $page ? $page."/" : "").IkiWiki::basename($filename);
-               
-               # To untaint the filename, escape any hazardous characters,
-               # and make sure it isn't pruned.
-               $filename=IkiWiki::titlepage(IkiWiki::possibly_foolish_untaint($filename));
+               $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"));
                }

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 36b616f5b7d7df80d6d4922b7f13281f85ec39a3..1a27beb6f7dcdce9fd85c3d93b80b217f56757a2 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -61,9 +61,19 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
-<div id=attachment><p>
-Attach a file: <TMPL_VAR FIELD-ATTACHMENT><input name="_submit" type="submit" value="Upload" />
-</p></div>
+<div id=attachments>
+<br />
+<table><caption>Attachments</caption>
+<tr><td colspan=5><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
+<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
+</TMPL_LOOP>
+<TMPL_IF NAME="ATTACHMENT_LIST">
+<tr><td colspan=2><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-DELETE><TMPL_VAR FIELD-RENAME></td></tr>
+</TMPL_IF>
+</tr>
+</table>
+</div>
 </TMPL_IF>
 <TMPL_VAR FORM-END>