meta: Add openid delegate parameter to allow delegating only openid or openid2.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cc5455d64042ae3afef8bcd7e52a42e0ec1ad915..b2295923e31d94ed8d393a09d1ebeb2f05604878 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -163,17 +163,22 @@ sub preprocess (@) {
                        "\" type=\"text/css\" />";
        }
        elsif ($key eq 'openid') {
+               my $delegate=0; # both by default
+               if (exists $params{delegate}) {
+                       $delegate = 1 if lc $params{delegate} eq 'openid';
+                       $delegate = 2 if lc $params{delegate} eq 'openid2';
+               }
                if (exists $params{server} && safeurl($params{server})) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
-                               '" rel="openid.server" />';
+                               '" rel="openid.server" />' if $delegate ne 2;
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($params{server}).
-                               '" rel="openid2.provider" />';
+                               '" rel="openid2.provider" />' if $delegate ne 1;
                }
                if (safeurl($value)) {
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
-                               '" rel="openid.delegate" />';
+                               '" rel="openid.delegate" />' if $delegate ne 2;
                        push @{$metaheaders{$page}}, '<link href="'.encode_entities($value).
-                               '" rel="openid2.local_id" />';
+                               '" rel="openid2.local_id" />' if $delegate ne 1;
                }
                if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) {
                        push @{$metaheaders{$page}}, '<meta http-equiv="X-XRDS-Location"'.

diff --git a/debian/changelog b/debian/changelog
index 126c1826ba60943d9b5f9c5e9add845cb4be63b3..dd24e0bba78bc71b6c1f8d4e9e760cfd8dbbeec7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.15) UNRELEASED; urgency=low
+ikiwiki (3.141) UNRELEASED; urgency=low
 
   * comment: Make comment directives no longer use the internal "_comment"
     form, and document the comment directive syntax.
@@ -20,6 +20,8 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     by the 404 plugin.
   * Optimise use of gettext, and avoid ugly warnings if Locale::gettext
     is not available. Closes: #532285
+  * meta: Add openid delegate parameter to allow delegating only
+    openid or openid2.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 

diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
index 16382a936ef98c88c94581a37e8a4e0b78acc2c7..d926cebedb8978eaafe6138216418f1923a25e77 100644 (file)
--- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
+++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn
@@ -60,3 +60,6 @@ Thanks Joey. --[Mick](http://www.lunix.com.au)
 >> Not clear to me if identi.ca or certifi.ca is at failt,
 >> but luckily he runs both..
 >> --[[Joey]] 
+
+>> ikiwiki's next release will allow adding 'delegate=1' to the 
+>> meta directive to only delegate to openid1. --[[Joey]] 

diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index f29a118bfea91d9957c30022312e558bc3b8b980..7a7b0fa199444076a2cc08b74d2bb7252f2f4c56 100644 (file)
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -78,6 +78,9 @@ Supported fields:
        server="http://www.myopenid.com/server"
        xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]]
 
+  By default this will delegate for both `openid` and `openid2`. To only
+  delegate for one, add a parameter such as `delegate=openid`.
+
 * link
 
   Specifies a link to another page. This can be used as a way to make the