consent: Reintroduce %SPENTITYID% replacement in privacy policy URL.

Fixes issue 241.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2134 44740490-163a-0410-bde0-09ae8108e29a

docs/simplesamlphp-reference-idp-hosted.txt

@@ -56,6 +56,8 @@ Common options
 `privacypolicy`
 :   This is an absolute URL for where an user can find a
     privacypolicy. If set, this will be shown on the consent page.
+    `%SPENTITYID%` in the URL will be replaced with the entity id of
+    the service the user is accessing.
 
 :   Note that this option also exists in the SP-remote metadata, and
     any value in the SP-remote metadata overrides the one configured

docs/simplesamlphp-reference-sp-remote.txt

@@ -58,6 +58,8 @@ and Shibboleth 1.3 protocol:
 `privacypolicy`
 :   This is an absolute URL for where an user can find a privacypolicy
     for this SP. If set, this will be shown on the consent page.
+    `%SPENTITYID%` in the URL will be replaced with the entity id of
+    this service provider.
 
 :   Note that this option also exists in the IdP-hosted metadata. This
     entry in the SP-remote metadata overrides the option in the

modules/consent/www/getconsent.php

@@ -124,6 +124,10 @@ if (array_key_exists('privacypolicy', $state['Destination'])) {
 } else {
 	$privacypolicy = FALSE;
 }
+if($privacypolicy !== FALSE) {
+	$privacypolicy = str_replace('%SPENTITYID%', urlencode($spentityid),
+		$privacypolicy);
+}
 $t->data['sppp'] = $privacypolicy;