Skip to content
Snippets Groups Projects
Commit e5828dc6 authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Spaces / Braces

parent 5015959f
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ if ($config->getBoolean('idpdisco.enableremember', false)) { ...@@ -26,7 +26,7 @@ if ($config->getBoolean('idpdisco.enableremember', false)) {
$links_federation[] = array( $links_federation[] = array(
'href' => \SimpleSAML\Utils\HTTP::getBaseURL() . 'admin/metadata-converter.php', 'href' => \SimpleSAML\Utils\HTTP::getBaseURL().'admin/metadata-converter.php',
'text' => '{core:frontpage:link_xmlconvert}', 'text' => '{core:frontpage:link_xmlconvert}',
); );
...@@ -46,7 +46,7 @@ $metadataHosted = array(); ...@@ -46,7 +46,7 @@ $metadataHosted = array();
$metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler(); $metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
$metaentries = array('hosted' => $metadataHosted, 'remote' => array() ); $metaentries = array('hosted' => $metadataHosted, 'remote' => array());
if ($isadmin) { if ($isadmin) {
...@@ -59,9 +59,10 @@ if ($config->getBoolean('enable.saml20-idp', false) === true) { ...@@ -59,9 +59,10 @@ if ($config->getBoolean('enable.saml20-idp', false) === true) {
$metaentries['hosted']['saml20-idp'] = $metadata->getMetaDataCurrent('saml20-idp-hosted'); $metaentries['hosted']['saml20-idp'] = $metadata->getMetaDataCurrent('saml20-idp-hosted');
$metaentries['hosted']['saml20-idp']['metadata-url'] = $metaentries['hosted']['saml20-idp']['metadata-url'] =
$config->getBasePath().'saml2/idp/metadata.php?output=xhtml'; $config->getBasePath().'saml2/idp/metadata.php?output=xhtml';
if ($isadmin) if ($isadmin) {
$metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote'); $metaentries['remote']['saml20-sp-remote'] = $metadata->getList('saml20-sp-remote');
} catch(Exception $e) { }
} catch (Exception $e) {
\SimpleSAML\Logger::error('Federation: Error loading saml20-idp: '.$e->getMessage()); \SimpleSAML\Logger::error('Federation: Error loading saml20-idp: '.$e->getMessage());
} }
} }
...@@ -70,9 +71,10 @@ if ($config->getBoolean('enable.shib13-idp', false) === true) { ...@@ -70,9 +71,10 @@ if ($config->getBoolean('enable.shib13-idp', false) === true) {
$metaentries['hosted']['shib13-idp'] = $metadata->getMetaDataCurrent('shib13-idp-hosted'); $metaentries['hosted']['shib13-idp'] = $metadata->getMetaDataCurrent('shib13-idp-hosted');
$metaentries['hosted']['shib13-idp']['metadata-url'] = $metaentries['hosted']['shib13-idp']['metadata-url'] =
$config->getBasePath().'shib13/idp/metadata.php?output=xhtml'; $config->getBasePath().'shib13/idp/metadata.php?output=xhtml';
if ($isadmin) if ($isadmin) {
$metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote'); $metaentries['remote']['shib13-sp-remote'] = $metadata->getList('shib13-sp-remote');
} catch(Exception $e) { }
} catch (Exception $e) {
\SimpleSAML\Logger::error('Federation: Error loading shib13-idp: ' . $e->getMessage()); \SimpleSAML\Logger::error('Federation: Error loading shib13-idp: ' . $e->getMessage());
} }
} }
...@@ -83,9 +85,10 @@ if ($config->getBoolean('enable.adfs-idp', false) === true) { ...@@ -83,9 +85,10 @@ if ($config->getBoolean('enable.adfs-idp', false) === true) {
'adfs/idp/metadata.php', 'adfs/idp/metadata.php',
array('output' => 'xhtml') array('output' => 'xhtml')
); );
if ($isadmin) if ($isadmin) {
$metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote'); $metaentries['remote']['adfs-sp-remote'] = $metadata->getList('adfs-sp-remote');
} catch(Exception $e) { }
} catch (Exception $e) {
\SimpleSAML\Logger::error('Federation: Error loading adfs-idp: ' . $e->getMessage()); \SimpleSAML\Logger::error('Federation: Error loading adfs-idp: ' . $e->getMessage());
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment