From 689185ccebf885383c3460654e05e1265431c72a Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 5 Oct 2009 13:01:13 +0000
Subject: [PATCH] Frontpage: Mark old saml20 and shib13 metadata as deprecated.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1819 44740490-163a-0410-bde0-09ae8108e29a
---
modules/core/templates/frontpage_federation.tpl.php | 2 ++
modules/core/www/frontpage_federation.php | 2 ++
2 files changed, 4 insertions(+)
diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index 874de7ec7..6bc4039ee 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -55,6 +55,8 @@ foreach ($this->data['metaentries']['hosted'] AS $hm) {
echo '<dt>' . $this->t(mtype($hm['metadata-set'])) . '</dt>';
echo '<dd>';
echo '<p>Entity ID: ' . $hm['entityid'];
+ if (isset($hm['deprecated']) && $hm['deprecated'])
+ echo '<br /><b>Deprecated</b>';
if ($hm['entityid'] !== $hm['metadata-index'])
echo '<br />Index: ' . $hm['metadata-index'];
if (array_key_exists('name', $hm))
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 429b84d81..9b91f3285 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -96,6 +96,7 @@ $metaentries = array('hosted' => $metadataHosted, 'remote' => array() );
if ($config->getBoolean('enable.saml20-sp', TRUE) === true) {
try {
$metaentries['hosted']['saml20-sp'] = $metadata->getMetaDataCurrent('saml20-sp-hosted');
+ $metaentries['hosted']['saml20-sp']['deprecated'] = TRUE;
$metaentries['hosted']['saml20-sp']['metadata-url'] = '/' . $config->getBaseURL() . 'saml2/sp/metadata.php?output=xhtml';
if ($isadmin)
$metaentries['remote']['saml20-idp-remote'] = $metadata->getList('saml20-idp-remote');
@@ -112,6 +113,7 @@ if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
if ($config->getBoolean('enable.shib13-sp', FALSE) === true) {
try {
$metaentries['hosted']['shib13-sp'] = $metadata->getMetaDataCurrent('shib13-sp-hosted');
+ $metaentries['hosted']['shib13-sp']['deprecated'] = TRUE;
$metaentries['hosted']['shib13-sp']['metadata-url'] = '/' . $config->getBaseURL() . 'shib13/sp/metadata.php?output=xhtml';
if ($isadmin)
$metaentries['remote']['shib13-idp-remote'] = $metadata->getList('shib13-idp-remote');
--
GitLab