simplify key determination code

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b9886472250ba9e78194ff1ccdf05275979408a0..0afe1c3622561654bf682df6ea2e6d5b9551f135 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -140,14 +140,18 @@ sub preprocess (@) { #{{{
                if (exists $params{server} && safeurl($params{server})) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
                                '" rel="openid.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="openid2.provider" />';

                }
                if (safeurl($value)) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
                                '" rel="openid.delegate" />';
                }
                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})) {
+               if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {

                        push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.
                        push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.

-                               'content="'.encode_entities($params{xrds-location}).'" />';
+                               'content="'.encode_entities($params{"xrds-location"}).'" />';

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


@@ -182,7 +186,7 @@ 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) {
                        $redir=scrub($redir);
                }
                if (! $safe) {
                        $redir=scrub($redir);
                }


@@ -199,7 +203,7 @@ sub preprocess (@) { #{{{
        }
        elsif ($key eq 'robots') {
                push @{$metaheaders{$page}}, '<meta name="robots"'.
        }
        elsif ($key eq 'robots') {
                push @{$metaheaders{$page}}, '<meta name="robots"'.

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

        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).