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 849a13e37bfb2c437ba4bc7c998710548b943f49..4a22fed3057015156c27d9f8159e9f4b47e3a633 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -4,21 +4,31 @@ 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 => "needsbuild", id => "meta", call => \&needsbuild);
        hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);

-} # }}}
+}
+
+sub getsetup () {
+       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}) {

-                       if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+                       if (exists $pagesources{$page} &&
+                           grep { $_ eq $pagesources{$page} } @$needsbuild) {

                                # remove state, it will be re-added
                                # if the preprocessor directive is still
                                # there during the rebuild
                                # remove state, it will be re-added
                                # if the preprocessor directive is still
                                # there during the rebuild


@@ -28,25 +38,37 @@ 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 htmlize ($$$) { #{{{
+sub safeurl ($) {
+       my $url=shift;
+       if (exists $IkiWiki::Plugin::htmlscrubber::{safe_url_regexp} &&
+           defined $IkiWiki::Plugin::htmlscrubber::safe_url_regexp) {
+               return $url=~/$IkiWiki::Plugin::htmlscrubber::safe_url_regexp/;
+       }
+       else {
+               return 1;
+       }
+}
+
+sub htmlize ($$$) {

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

-       return IkiWiki::htmlize($page, pagetype($pagesources{$page}),
+       return IkiWiki::htmlize($page, $destpage, pagetype($pagesources{$page}),

                IkiWiki::linkify($page, $destpage,
                IkiWiki::preprocess($page, $destpage, shift)));
 }
 
                IkiWiki::linkify($page, $destpage,
                IkiWiki::preprocess($page, $destpage, shift)));
 }
 

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

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


@@ -66,6 +88,15 @@ sub preprocess (@) { #{{{
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
                $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
        # Metadata collection that needs to happen during the scan pass.
        if ($key eq 'title') {
                $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);

+               # fallthrough
+       }
+       elsif ($key eq 'description') {
+               $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value);
+               # fallthrough
+       }
+       elsif ($key eq 'guid') {
+               $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value);
+               # fallthrough

        }
        elsif ($key eq 'license') {
                push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';
        }
        elsif ($key eq 'license') {
                push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />';


@@ -87,9 +118,23 @@ sub preprocess (@) { #{{{
                # fallthorough
        }
        elsif ($key eq 'authorurl') {
                # fallthorough
        }
        elsif ($key eq 'authorurl') {

-               $pagestate{$page}{meta}{authorurl}=$value;
+               $pagestate{$page}{meta}{authorurl}=$value if safeurl($value);

                # fallthrough
        }
                # 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


@@ -97,17 +142,12 @@ 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;
+       if ($key eq 'permalink') {
+               if (safeurl($value)) {
+                       $pagestate{$page}{meta}{permalink}=$value;
+                       push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);

                }
        }
                }
        }

-       elsif ($key eq 'permalink') {
-               $pagestate{$page}{meta}{permalink}=$value;
-               push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />');
-       }

        elsif ($key eq 'stylesheet') {
                my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet";
                my $title=exists $params{title} ? $params{title} : $value;
        elsif ($key eq 'stylesheet') {
                my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet";
                my $title=exists $params{title} ? $params{title} : $value;


@@ -115,7 +155,7 @@ sub preprocess (@) { #{{{
                # editable page as a stylesheet
                my $stylesheet=bestlink($page, $value.".css");
                if (! length $stylesheet) {
                # editable page as a stylesheet
                my $stylesheet=bestlink($page, $value.".css");
                if (! length $stylesheet) {

-                       return "[[meta ".gettext("stylesheet not found")."]]";
+                       error gettext("stylesheet not found")

                }
                push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
                        '" rel="'.encode_entities($rel).
                }
                push @{$metaheaders{$page}}, '<link href="'.urlto($stylesheet, $page).
                        '" rel="'.encode_entities($rel).


@@ -123,12 +163,22 @@ sub preprocess (@) { #{{{
                        "\" type=\"text/css\" />";
        }
        elsif ($key eq 'openid') {
                        "\" type=\"text/css\" />";
        }
        elsif ($key eq 'openid') {

-               if (exists $params{server}) {
+               if (exists $params{server} && safeurl($params{server})) {

                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
                                '" rel="openid.server" />';
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
                                '" rel="openid.server" />';

+                       push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
+                               '" rel="openid2.provider" />';
+               }
+               if (safeurl($value)) {
+                       push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
+                               '" rel="openid.delegate" />';
+                       push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
+                               '" rel="openid2.local_id" />';
+               }
+               if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
+                       push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
+                               'content="'.encode_entities($params{"xrds-location"}).'" />';

                }
                }

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

        }
        elsif ($key eq 'redir') {
                return "" if $page ne $destpage;
        }
        elsif ($key eq 'redir') {
                return "" if $page ne $destpage;


@@ -139,7 +189,7 @@ sub preprocess (@) { #{{{
                        add_depends($page, $redir_page);
                        my $link=bestlink($page, $redir_page);
                        if (! length $link) {
                        add_depends($page, $redir_page);
                        my $link=bestlink($page, $redir_page);
                        if (! length $link) {

-                               return "[[meta ".gettext("redir page not found")."]]";
+                               error gettext("redir page not found")

                        }
 
                        $value=urlto($link, $page);
                        }
 
                        $value=urlto($link, $page);


@@ -152,7 +202,7 @@ sub preprocess (@) { #{{{
                        my %seen;
                        while (exists $pagestate{$at}{meta}{redir}) {
                                if ($seen{$at}) {
                        my %seen;
                        while (exists $pagestate{$at}{meta}{redir}) {
                                if ($seen{$at}) {

-                                       return "[[meta ".gettext("redir cycle is not allowed")."]]";
+                                       error gettext("redir cycle is not allowed")

                                }
                                $seen{$at}=1;
                                $at=$pagestate{$at}{meta}{redir};
                                }
                                $seen{$at}=1;
                                $at=$pagestate{$at}{meta}{redir};


@@ -162,9 +212,9 @@ sub preprocess (@) { #{{{
                        $value=encode_entities($value);
                }
                my $delay=int(exists $params{delay} ? $params{delay} : 0);
                        $value=encode_entities($value);
                }
                my $delay=int(exists $params{delay} ? $params{delay} : 0);

-               my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\">";
+               my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";

                if (! $safe) {
                if (! $safe) {

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

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


@@ -174,18 +224,22 @@ 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') {
+               push @{$metaheaders{$page}}, '<meta name="robots"'.
+                       ' content="'.encode_entities($value).'" />';
+       }

        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};


@@ -213,23 +267,21 @@ 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;
        
        # turn glob into a safe regexp
        my $field=shift;
        my $page=shift;
        
        # turn glob into a safe regexp

-       my $re=quotemeta(shift);
-       $re=~s/\\\*/.*/g;
-       $re=~s/\\\?/./g;
+       my $re=IkiWiki::glob2re(shift);

 
        my $val;
        if (exists $pagestate{$page}{meta}{$field}) {
                $val=$pagestate{$page}{meta}{$field};
        }
        elsif ($field eq 'title') {
 
        my $val;
        if (exists $pagestate{$page}{meta}{$field}) {
                $val=$pagestate{$page}{meta}{$field};
        }
        elsif ($field eq 'title') {

-               $val=pagetitle($page);
+               $val = pagetitle($page);

        }
 
        if (defined $val) {
        }
 
        if (defined $val) {


@@ -243,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