From 556347f64b48c124d3f5be5dd34a10ee6072f372 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 9 Jun 2008 08:39:48 +0000
Subject: [PATCH] Clarified documentation for the IdP discovery service icon,
and added the icon parameter to the valid metadata fields for remote IdPs.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@621 44740490-163a-0410-bde0-09ae8108e29a
---
docs/source/simplesamlphp-sp.xml | 13 +++++++++----
www/admin/metadata.php | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 2acacfe90..b17a1eaeb 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -549,8 +549,10 @@
<glossterm>icon</glossterm>
<glossdef>
- <para>An icon for this IdP. This icon will be displayed in the
- IdP discovery service.</para>
+ <para>An icon for this IdP. This is a URL to a icon which will
+ be displayed next to this IdP in the IdP discovery service. The
+ URL can be absolute or relative. If it is relative, it will be
+ relative to the simpleSAMPphp www-directory.</para>
</glossdef>
</glossentry>
</glosslist>
@@ -803,8 +805,11 @@
<glossterm>icon</glossterm>
<glossdef>
- <para>An icon for this IdP. This icon will be displayed in the
- IdP discovery service. This field is optional.</para>
+ <para>An icon for this IdP. This is a URL to a icon which will
+ be displayed next to this IdP in the IdP discovery service. The
+ URL can be absolute or relative. If it is relative, it will be
+ relative to the simpleSAMPphp www-directory. This field is
+ optional.</para>
</glossdef>
</glossentry>
</glosslist>
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index 298496dc1..248f0685b 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -39,7 +39,7 @@ try {
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
array('entityid', 'SingleSignOnService', 'SingleLogoutService', 'certFingerprint'),
- array('name', 'description', 'base64attributes', 'certificate', 'hint.cidr', 'saml2.relaxvalidation', 'SingleLogoutServiceResponse', 'request.signing', 'attributemap', 'attributealter', 'sharedkey', 'assertion.encryption')
+ array('name', 'description', 'base64attributes', 'certificate', 'hint.cidr', 'saml2.relaxvalidation', 'SingleLogoutServiceResponse', 'request.signing', 'attributemap', 'attributealter', 'sharedkey', 'assertion.encryption', 'icon')
);
}
$et->data['metadata.saml20-idp-remote'] = $results;
@@ -89,7 +89,7 @@ try {
foreach ($metalist AS $entityid => $mentry) {
$results[$entityid] = SimpleSAML_Utilities::checkAssocArrayRules($mentry,
array('entityid', 'SingleSignOnService', 'certFingerprint'),
- array('name', 'description', 'base64attributes')
+ array('name', 'description', 'base64attributes', 'icon')
);
}
$et->data['metadata.shib13-idp-remote'] = $results;
--
GitLab