Revision: 1845
Author: andreassolberg
Date: Mon Oct 12 23:45:33 2009
Log: List Remote IdPs regardless of the SP enable settings. Works better
with new SP module
http://code.google.com/p/simplesamlphp/source/detail?r=1845
Modified:
/trunk/modules/core/www/frontpage_federation.php
=======================================
--- /trunk/modules/core/www/frontpage_federation.php Mon Oct 5 06:01:13
2009
+++ /trunk/modules/core/www/frontpage_federation.php Mon Oct 12 23:45:33
2009
@@ -93,13 +93,18 @@
$metadata =
SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
$metaentries = array('hosted' => $metadataHosted, 'remote' => array() );
+
+
+if ($isadmin) {
+ $metaentries['remote']['saml20-idp-remote'] =
$metadata->getList('saml20-idp-remote');
+ $metaentries['remote']['shib13-idp-remote'] =
$metadata->getList('shib13-idp-remote');
+}
+
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');
} catch(Exception $e) {}
}
if ($config->getBoolean('enable.saml20-idp', FALSE) === true) {
@@ -115,8 +120,6 @@
$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');
} catch(Exception $e) {}
}
if ($config->getBoolean('enable.shib13-idp', FALSE) === true) {
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
