From f774cb90215680dc878bf8ab0f8c8c4721f0e750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 17 Mar 2009 08:21:51 +0000
Subject: [PATCH] Remove entityid replacement in privacypolicy that included
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1414 44740490-163a-0410-bde0-09ae8108e29a
---
docs/simplesamlphp-reference-idp-hosted.txt | 2 --
docs/simplesamlphp-reference-sp-remote.txt | 2 --
modules/consent/www/getconsent.php | 4 ----
3 files changed, 8 deletions(-)
diff --git a/docs/simplesamlphp-reference-idp-hosted.txt b/docs/simplesamlphp-reference-idp-hosted.txt
index 8afd8ea0c..7cfe0da5e 100644
--- a/docs/simplesamlphp-reference-idp-hosted.txt
+++ b/docs/simplesamlphp-reference-idp-hosted.txt
@@ -59,8 +59,6 @@ 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
diff --git a/docs/simplesamlphp-reference-sp-remote.txt b/docs/simplesamlphp-reference-sp-remote.txt
index 00f6c3a8d..96b698d2f 100644
--- a/docs/simplesamlphp-reference-sp-remote.txt
+++ b/docs/simplesamlphp-reference-sp-remote.txt
@@ -61,8 +61,6 @@ 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
diff --git a/modules/consent/www/getconsent.php b/modules/consent/www/getconsent.php
index c93d34132..983993105 100644
--- a/modules/consent/www/getconsent.php
+++ b/modules/consent/www/getconsent.php
@@ -124,10 +124,6 @@ if (array_key_exists('privacypolicy', $state['Destination'])) {
} else {
$privacypolicy = FALSE;
}
-if($privacypolicy !== FALSE) {
- $privacypolicy = str_replace('%SPENTITYID%', urlencode($spentityid),
- $privacypolicy);
-}
$t->data['sppp'] = $privacypolicy;
--
GitLab