Revision: 2134
Author: olavmrk
Date: Tue Jan 26 01:03:39 2010
Log: consent: Reintroduce %SPENTITYID% replacement in privacy policy URL.
Fixes issue 241.
http://code.google.com/p/simplesamlphp/source/detail?r=2134
Modified:
/trunk/docs/simplesamlphp-reference-idp-hosted.txt
/trunk/docs/simplesamlphp-reference-sp-remote.txt
/trunk/modules/consent/www/getconsent.php
=======================================
--- /trunk/docs/simplesamlphp-reference-idp-hosted.txt Fri Jan 15 02:10:50
2010
+++ /trunk/docs/simplesamlphp-reference-idp-hosted.txt Tue Jan 26 01:03:39
2010
@@ -56,6 +56,8 @@
`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
=======================================
--- /trunk/docs/simplesamlphp-reference-sp-remote.txt Tue Jan 5 05:52:11
2010
+++ /trunk/docs/simplesamlphp-reference-sp-remote.txt Tue Jan 26 01:03:39
2010
@@ -58,6 +58,8 @@
`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
=======================================
--- /trunk/modules/consent/www/getconsent.php Wed Oct 14 00:44:45 2009
+++ /trunk/modules/consent/www/getconsent.php Tue Jan 26 01:03:39 2010
@@ -124,6 +124,10 @@
} else {
$privacypolicy = FALSE;
}
+if($privacypolicy !== FALSE) {
+ $privacypolicy = str_replace('%SPENTITYID%', urlencode($spentityid),
+ $privacypolicy);
+}
$t->data['sppp'] = $privacypolicy;
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
