Revert spam

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c77837e3cbd5c92016977fe7b273286a21abd71a..cd367da704a2913d7076289eb2f0a81194e20143 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -107,12 +107,12 @@ sub preprocess (@) {
                # fallthrough
        }
        elsif ($key eq 'license') {
                # fallthrough
        }
        elsif ($key eq 'license') {

-               push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
+               push @{$metaheaders{$page}}, '<link rel="license" href="#pagelicense" />';

                $pagestate{$page}{meta}{license}=$value;
                return "";
        }
        elsif ($key eq 'copyright') {
                $pagestate{$page}{meta}{license}=$value;
                return "";
        }
        elsif ($key eq 'copyright') {

-               push @{$metaheaders{$page}}, '<link rel="copyright" href="#page_copyright" />';
+               push @{$metaheaders{$page}}, '<link rel="copyright" href="#pagecopyright" />';

                $pagestate{$page}{meta}{copyright}=$value;
                return "";
        }
                $pagestate{$page}{meta}{copyright}=$value;
                return "";
        }


@@ -128,8 +128,10 @@ sub preprocess (@) {
                }
                add_depends($page, $link, deptype("presence"));
 
                }
                add_depends($page, $link, deptype("presence"));
 

-               $value=urlto($link, $page);
+               $value=urlto($link, $page, 1);

                $pagestate{$page}{meta}{enclosure}=$value;
                $pagestate{$page}{meta}{enclosure}=$value;

+               $pagestate{$page}{meta}{enclosurefile}=$link;
+               # fallthrough

        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;


@@ -153,14 +155,30 @@ sub preprocess (@) {
                eval q{use Date::Parse};
                if (! $@) {
                        my $time = str2time($value);
                eval q{use Date::Parse};
                if (! $@) {
                        my $time = str2time($value);

-                       $IkiWiki::pagectime{$page}=$time if defined $time;
+                       if (defined $time) {
+                               $IkiWiki::pagectime{$page}=$time;
+                       }
+                       else {
+                               error(sprintf(gettext('cannot parse date/time: %s'), $value));
+                       }
+               }
+               else {
+                       error $@;

                }
        }
        elsif ($key eq 'updated') {
                eval q{use Date::Parse};
                if (! $@) {
                        my $time = str2time($value);
                }
        }
        elsif ($key eq 'updated') {
                eval q{use Date::Parse};
                if (! $@) {
                        my $time = str2time($value);

-                       $pagestate{$page}{meta}{updated}=$time if defined $time;
+                       if (defined $time) {
+                               $pagestate{$page}{meta}{updated}=$time;
+                       }
+                       else {
+                               error(sprintf(gettext('cannot parse date/time: %s'), $value));
+                       }
+               }
+               else {
+                       error $@;

                }
        }
 
                }
        }
 


@@ -292,6 +310,7 @@ sub preprocess (@) {
        elsif ($key eq 'name') {
                push @{$metaheaders{$page}}, scrub('<meta name="'.
                        encode_entities($value).
        elsif ($key eq 'name') {
                push @{$metaheaders{$page}}, scrub('<meta name="'.
                        encode_entities($value).

+                       '" '.

                        join(' ', map { "$_=\"$params{$_}\"" } keys %params).
                        ' />', $page, $destpage);
        }
                        join(' ', map { "$_=\"$params{$_}\"" } keys %params).
                        ' />', $page, $destpage);
        }


@@ -329,7 +348,7 @@ sub pagetemplate (@) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {

-               $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
+               $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));

        }
 
        foreach my $field (qw{authorurl}) {
        }
 
        foreach my $field (qw{authorurl}) {