attachment: Use relative paths when inserting links.

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8f9d7f5a442c7635458c5d0e1591489797b0773c..720078be15cfcd51399f375815b4d22e1a2e8d7b 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -11,11 +11,17 @@ sub import { #{{{
        hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
 } # }}}
 
-sub check_canattach ($$;$) {
+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 $pagesources{$dest} && $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;
        foreach my $admin (@{$config{adminuser}}) {
@@ -32,12 +38,12 @@ sub check_canattach ($$;$) {
                }
        }
        if (! $allowed) {
-               error(gettext("attachment rejected")." ($allowed)");
+               error(gettext("prohibited by allowed_attachments")." ($allowed)");
        }
        else {
                return 1;
        }
-}
+} #}}}
 
 sub checkconfig () { #{{{
        $config{cgi_disable_uploads}=0;
@@ -130,7 +136,7 @@ sub formbuilder (@) { #{{{
                        }
                }
 
-               $filename=IkiWiki::titlepage(
+               $filename=IkiWiki::linkpage(
                        IkiWiki::possibly_foolish_untaint(
                                attachment_location($form->field('page')).
                                IkiWiki::basename($filename)));
@@ -187,8 +193,10 @@ sub formbuilder (@) { #{{{
                IkiWiki::saveindex();
        }
        elsif ($form->submitted eq "Insert Links") {
+               my $page=quotemeta($q->param("page"));
                my $add="";
                foreach my $f ($q->param("attachment_select")) {
+                       $f=~s/^$page\///;
                        $add.="[[$f]]\n";
                }
                $form->field(name => 'editcontent',
@@ -201,7 +209,7 @@ sub formbuilder (@) { #{{{
        $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 } # }}}
 
-sub attachment_location ($) {
+sub attachment_location ($) { #{{{
        my $page=shift;
        
        # Put the attachment in a subdir of the page it's attached
@@ -210,9 +218,9 @@ sub attachment_location ($) {
        $page.="/" if length $page;
        
        return $page;
-}
+} #}}}
 
-sub attachment_list ($) {
+sub attachment_list ($) { #{{{
        my $page=shift;
        my $loc=attachment_location($page);
 
@@ -234,9 +242,9 @@ sub attachment_list ($) {
        # 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 %units=(            # size in bytes
+my %units=( #{{{       # size in bytes
        B               => 1,
        byte            => 1,
        KB              => 2 ** 10,
@@ -268,7 +276,7 @@ my %units=(         # size in bytes
        # 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;
@@ -430,6 +438,9 @@ sub match_user ($$;@) { #{{{
        if (defined $params{user} && lc $params{user} eq lc $user) {
                return IkiWiki::SuccessReason->new("user is $user");
        }
+       elsif (! defined $params{user}) {
+               return IkiWiki::FailReason->new("not logged in");
+       }
        else {
                return IkiWiki::FailReason->new("user is $params{user}, not $user");
        }