comments: Fix anchor ids to be legal xhtml. Closes: #521339

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 8d444109f68dc304d6c055df1191b3efbc2b9b60..4a22fed3057015156c27d9f8159e9f4b47e3a633 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,26 +4,26 @@ package IkiWiki::Plugin::meta;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my %metaheaders;
 
 
 my %metaheaders;
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "meta", call => \&getsetup);
        hook(type => "needsbuild", id => "meta", call => \&needsbuild);
        hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
        hook(type => "getsetup", id => "meta", call => \&getsetup);
        hook(type => "needsbuild", id => "meta", call => \&needsbuild);
        hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
                },
        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
                },

-} #}}}
+}

 
 

-sub needsbuild (@) { #{{{
+sub needsbuild (@) {

        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{meta}) {
        my $needsbuild=shift;
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{meta}) {


@@ -38,16 +38,17 @@ sub needsbuild (@) { #{{{
        }
 }
 
        }
 }
 

-sub scrub ($) { #{{{
+sub scrub ($$) {

        if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
        if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {

-               return IkiWiki::Plugin::htmlscrubber::sanitize(content => shift);
+               return IkiWiki::Plugin::htmlscrubber::sanitize(
+                       content => shift, destpage => shift);

        }
        else {
                return shift;
        }
        }
        else {
                return shift;
        }

-} #}}}
+}

 
 

-sub safeurl ($) { #{{{
+sub safeurl ($) {

        my $url=shift;
        if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
            defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
        my $url=shift;
        if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
            defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {


@@ -56,9 +57,9 @@ sub safeurl ($) { #{{{
        else {
                return 1;
        }
        else {
                return 1;
        }

-} #}}}
+}

 
 

-sub htmlize ($$$) { #{{{
+sub htmlize ($$$) {

        my $page = shift;
        my $destpage = shift;
 
        my $page = shift;
        my $destpage = shift;
 


@@ -67,7 +68,7 @@ sub htmlize ($$$) { #{{{
                IkiWiki::preprocess($page, $destpage, shift)));
 }
 
                IkiWiki::preprocess($page, $destpage, shift)));
 }
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        return "" unless @_;
        my %params=@_;
        my $key=shift;
        return "" unless @_;
        my %params=@_;
        my $key=shift;


@@ -120,6 +121,20 @@ sub preprocess (@) { #{{{
                $pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
                # fallthrough
        }
                $pagestate{$page}{meta}{authorurl}=$value if safeurl($value);
                # fallthrough
        }

+       elsif ($key eq 'date') {
+               eval q{use Date::Parse};
+               if (! $@) {
+                       my $time = str2time($value);
+                       $IkiWiki::pagectime{$page}=$time if defined $time;
+               }
+       }
+       elsif ($key eq 'updated') {
+               eval q{use Date::Parse};
+               if (! $@) {
+                       my $time = str2time($value);
+                       $pagestate{$page}{meta}{updated}=$time if defined $time;
+               }
+       }

 
        if (! defined wantarray) {
                # avoid collecting duplicate data during scan pass
 
        if (! defined wantarray) {
                # avoid collecting duplicate data during scan pass


@@ -127,17 +142,10 @@ sub preprocess (@) { #{{{
        }
 
        # Metadata collection that happens only during preprocessing pass.
        }
 
        # Metadata collection that happens only during preprocessing pass.

-       if ($key eq 'date') {
-               eval q{use Date::Parse};
-               if (! $@) {
-                       my $time = str2time($value);
-                       $IkiWiki::pagectime{$page}=$time if defined $time;
-               }
-       }
-       elsif ($key eq 'permalink') {
+       if ($key eq 'permalink') {

                if (safeurl($value)) {
                        $pagestate{$page}{meta}{permalink}=$value;
                if (safeurl($value)) {
                        $pagestate{$page}{meta}{permalink}=$value;

-                       push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
+                       push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);

                }
        }
        elsif ($key eq 'stylesheet') {
                }
        }
        elsif ($key eq 'stylesheet') {


@@ -206,7 +214,7 @@ sub preprocess (@) { #{{{
                my $delay=int(exists $params{delay} ? $params{delay} : 0);
                my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
                if (! $safe) {
                my $delay=int(exists $params{delay} ? $params{delay} : 0);
                my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
                if (! $safe) {

-                       $redir=scrub($redir);
+                       $redir=scrub($redir, $destpage);

                }
                push @{$metaheaders{$page}}, $redir;
        }
                }
                push @{$metaheaders{$page}}, $redir;
        }


@@ -216,7 +224,7 @@ sub preprocess (@) { #{{{
                                join(" ", map {
                                        encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
                                } keys %params).
                                join(" ", map {
                                        encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
                                } keys %params).

-                               " />\n");
+                               " />\n", $destpage);

                }
        }
        elsif ($key eq 'robots') {
                }
        }
        elsif ($key eq 'robots') {


@@ -225,13 +233,13 @@ sub preprocess (@) { #{{{
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).

-                       '" content="'.encode_entities($value).'" />');
+                       '" content="'.encode_entities($value).'" />', $destpage);

        }
 
        return "";
        }
 
        return "";

-} # }}}
+}

 
 

-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {

        my %params=@_;
         my $page=$params{page};
         my $destpage=$params{destpage};
        my %params=@_;
         my $page=$params{page};
         my $destpage=$params{destpage};


@@ -259,9 +267,9 @@ sub pagetemplate (@) { #{{{
                        $template->param($field => htmlize($page, $destpage, $pagestate{$page}{meta}{$field}));
                }
        }
                        $template->param($field => htmlize($page, $destpage, $pagestate{$page}{meta}{$field}));
                }
        }

-} # }}}
+}

 
 

-sub match { #{{{
+sub match {

        my $field=shift;
        my $page=shift;
        
        my $field=shift;
        my $page=shift;
        


@@ -287,28 +295,28 @@ sub match { #{{{
        else {
                return IkiWiki::FailReason->new("$page does not have a $field");
        }
        else {
                return IkiWiki::FailReason->new("$page does not have a $field");
        }

-} #}}}
+}

 
 package IkiWiki::PageSpec;
 
 
 package IkiWiki::PageSpec;
 

-sub match_title ($$;@) { #{{{
+sub match_title ($$;@) {

        IkiWiki::Plugin::meta::match("title", @_);      
        IkiWiki::Plugin::meta::match("title", @_);      

-} #}}}
+}

 
 

-sub match_author ($$;@) { #{{{
+sub match_author ($$;@) {

        IkiWiki::Plugin::meta::match("author", @_);
        IkiWiki::Plugin::meta::match("author", @_);

-} #}}}
+}

 
 

-sub match_authorurl ($$;@) { #{{{
+sub match_authorurl ($$;@) {

        IkiWiki::Plugin::meta::match("authorurl", @_);
        IkiWiki::Plugin::meta::match("authorurl", @_);

-} #}}}
+}

 
 

-sub match_license ($$;@) { #{{{
+sub match_license ($$;@) {

        IkiWiki::Plugin::meta::match("license", @_);
        IkiWiki::Plugin::meta::match("license", @_);

-} #}}}
+}

 
 

-sub match_copyright ($$;@) { #{{{
+sub match_copyright ($$;@) {

        IkiWiki::Plugin::meta::match("copyright", @_);
        IkiWiki::Plugin::meta::match("copyright", @_);

-} #}}}
+}

 
 1
 
 1