From c665515b99c039618e1993848cccdf2f8d31b6de Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Tue, 3 Nov 2015 13:57:24 +0100
Subject: [PATCH] Reformat and enhance the federation tab page.
---
.../templates/frontpage_federation.tpl.php | 261 ++++++++----------
1 file changed, 117 insertions(+), 144 deletions(-)
diff --git a/modules/core/templates/frontpage_federation.tpl.php b/modules/core/templates/frontpage_federation.tpl.php
index 2be7e0755..c4e18d247 100644
--- a/modules/core/templates/frontpage_federation.tpl.php
+++ b/modules/core/templates/frontpage_federation.tpl.php
@@ -3,164 +3,137 @@
$this->data['header'] = $this->t('{core:frontpage:page_title}');
$this->includeAtTemplateBase('includes/header.php');
-?>
-
-
-<!--
-<div id="tabdiv">
-<ul>
- <li><a href="#welcome"><?php echo $this->t('{core:frontpage:welcome}'); ?></a></li>
- <li><a href="#configuration"><?php echo $this->t('{core:frontpage:configuration}'); ?></a></li>
- <li><a href="#metadata"><?php echo $this->t('{core:frontpage:metadata}'); ?></a></li>
-</ul> -->
-<?php
if ($this->data['isadmin']) {
- echo '<p class="float-r youareadmin">' . $this->t('{core:frontpage:loggedin_as_admin}') . '</p>';
+ echo '<p class="float-r youareadmin">'.$this->t('{core:frontpage:loggedin_as_admin}').'</p>';
} else {
- echo '<p class="float-r youareadmin"><a href="' . $this->data['loginurl'] . '">' . $this->t('{core:frontpage:login_as_admin}') . '</a></p>';
+ echo '<p class="float-r youareadmin"><a href="'.$this->data['loginurl'].'">'.
+ $this->t('{core:frontpage:login_as_admin}').'</a></p>';
}
-?>
-
-
-
-
-
-
-
-
-<?php
-
-
-function mtype($set) {
- switch($set) {
- case 'saml20-sp-remote': return '{admin:metadata_saml20-sp}';
- case 'saml20-sp-hosted': return '{admin:metadata_saml20-sp}';
- case 'saml20-idp-remote': return '{admin:metadata_saml20-idp}';
- case 'saml20-idp-hosted': return '{admin:metadata_saml20-idp}';
- case 'shib13-sp-remote': return '{admin:metadata_shib13-sp}';
- case 'shib13-sp-hosted': return '{admin:metadata_shib13-sp}';
- case 'shib13-idp-remote': return '{admin:metadata_shib13-idp}';
- case 'shib13-idp-hosted': return '{admin:metadata_shib13-idp}';
- case 'adfs-sp-remote'; return '{admin:metadata_adfs-sp}';
- case 'adfs-sp-hosted'; return '{admin:metadata_adfs-sp}';
- case 'adfs-idp-remote'; return '{admin:metadata_adfs-idp}';
- case 'adfs-idp-hosted'; return '{admin:metadata_adfs-idp}';
- }
+function mtype($set)
+{
+ switch ($set) {
+ case 'saml20-sp-remote':
+ return '{admin:metadata_saml20-sp}';
+ case 'saml20-sp-hosted':
+ return '{admin:metadata_saml20-sp}';
+ case 'saml20-idp-remote':
+ return '{admin:metadata_saml20-idp}';
+ case 'saml20-idp-hosted':
+ return '{admin:metadata_saml20-idp}';
+ case 'shib13-sp-remote':
+ return '{admin:metadata_shib13-sp}';
+ case 'shib13-sp-hosted':
+ return '{admin:metadata_shib13-sp}';
+ case 'shib13-idp-remote':
+ return '{admin:metadata_shib13-idp}';
+ case 'shib13-idp-hosted':
+ return '{admin:metadata_shib13-idp}';
+ case 'adfs-sp-remote':
+ return '{admin:metadata_adfs-sp}';
+ case 'adfs-sp-hosted':
+ return '{admin:metadata_adfs-sp}';
+ case 'adfs-idp-remote':
+ return '{admin:metadata_adfs-idp}';
+ case 'adfs-idp-hosted':
+ return '{admin:metadata_adfs-idp}';
+ }
}
$now = time();
echo '<dl>';
-if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaentries']['hosted']) > 0)
-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 (!empty($hm['name']))
- echo '<br /><strong>' . $this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['name'], 'en')) . '</strong>';
- if (!empty($hm['descr']))
- echo '<br /><strong>' . $this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['descr'], 'en')) . '</strong>';
-
- echo '<br />[ <a href="' . $hm['metadata-url'] . '">' . $this->t('{core:frontpage:show_metadata}') . '</a> ]';
-
- echo '</p></dd>';
+if (is_array($this->data['metaentries']['hosted']) && count($this->data['metaentries']['hosted']) > 0) {
+ 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 (!empty($hm['name'])) {
+ echo '<br /><strong>'.$this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['name'], 'en')).
+ '</strong>';
+ }
+ if (!empty($hm['descr'])) {
+ echo '<br /><strong>'.$this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($hm['descr'], 'en')).
+ '</strong>';
+ }
+
+ echo '<br />[ <a href="'.$hm['metadata-url'].'">'.$this->t('{core:frontpage:show_metadata}').'</a> ]';
+
+ echo '</p></dd>';
+ }
}
echo '</dl>';
-if (is_array($this->data['metaentries']['remote']) && count($this->data['metaentries']['remote']) > 0)
-foreach($this->data['metaentries']['remote'] AS $setkey => $set) {
-
- echo '<fieldset class="fancyfieldset"><legend>' . $this->t(mtype($setkey)) . ' (Trusted)</legend>';
- echo '<ul>';
- foreach($set AS $entry) {
- echo '<li>';
- echo ('<a href="' .
- htmlspecialchars(SimpleSAML_Module::getModuleURL('core/show_metadata.php', array('entityid' => $entry['entityid'], 'set' => $setkey ))) .
- '">');
- if (!empty($entry['name'])) {
- echo htmlspecialchars($this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['name'], 'en')));
- } elseif (!empty($entry['OrganizationDisplayName'])) {
- echo htmlspecialchars($this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['OrganizationDisplayName'], 'en')));
- } else {
- echo htmlspecialchars($entry['entityid']);
- }
- echo '</a>';
- if (array_key_exists('expire', $entry)) {
- if ($entry['expire'] < $now) {
- echo('<span style="color: #500; font-weight: bold"> (expired ' . number_format(($now - $entry['expire'])/3600, 1) . ' hours ago)</span>');
- } else {
- echo(' (expires in ' . number_format(($entry['expire'] - $now)/3600, 1) . ' hours)');
- }
- }
- echo '</li>';
- }
- echo '</ul>';
- echo '</fieldset>';
+if (is_array($this->data['metaentries']['remote']) && count($this->data['metaentries']['remote']) > 0) {
+ foreach ($this->data['metaentries']['remote'] as $setkey => $set) {
+
+ echo '<fieldset class="fancyfieldset"><legend>'.$this->t(mtype($setkey)).' (Trusted)</legend>';
+ echo '<ul>';
+ foreach ($set as $entry) {
+ echo '<li>';
+ echo('<a href="'.
+ htmlspecialchars(
+ SimpleSAML_Module::getModuleURL(
+ 'core/show_metadata.php',
+ array('entityid' => $entry['entityid'], 'set' => $setkey)
+ )
+ ).'">');
+ if (!empty($entry['name'])) {
+ echo htmlspecialchars($this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['name'], 'en')));
+ } elseif (!empty($entry['OrganizationDisplayName'])) {
+ echo htmlspecialchars(
+ $this->getTranslation(SimpleSAML\Utils\Arrays::arrayize($entry['OrganizationDisplayName'], 'en'))
+ );
+ } else {
+ echo htmlspecialchars($entry['entityid']);
+ }
+ echo '</a>';
+ if (array_key_exists('expire', $entry)) {
+ if ($entry['expire'] < $now) {
+ echo '<span style="color: #500; font-weight: bold"> (expired '.
+ number_format(($now - $entry['expire']) / 3600, 1).' hours ago)</span>';
+ } else {
+ echo ' (expires in '.number_format(($entry['expire'] - $now) / 3600, 1).' hours)';
+ }
+ }
+ echo '</li>';
+ }
+ echo '</ul>';
+ echo '</fieldset>';
+ }
}
-
-
-
-
?>
-
-
-
-
-
-<h2><?php echo $this->t('{core:frontpage:tools}'); ?></h2>
-<ul>
-<?php
- foreach ($this->data['links_federation'] AS $link) {
- echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . $this->t($link['text']) . '</a></li>';
- }
+ <h2><?php echo $this->t('{core:frontpage:tools}'); ?></h2>
+ <ul><?php
+ foreach ($this->data['links_federation'] as $link) {
+ echo '<li><a href="'.htmlspecialchars($link['href']).'">'.$this->t($link['text']).'</a></li>';
+ }
?>
-</ul>
-
+ </ul>
<?php
-
-if ($this->data['isadmin']) {
-
+ if ($this->data['isadmin']) { ?>
+ <fieldset class="fancyfieldset">
+ <legend>Lookup metadata</legend>
+ <form action="<?php echo SimpleSAML_Module::getModuleURL('core/show_metadata.php'); ?>" method="get">
+ <p style="margin: 1em 2em ">Look up metadata for entity:
+ <select name="set"><?php
+ if (is_array($this->data['metaentries']['remote']) && count($this->data['metaentries']['remote']) > 0) {
+ foreach ($this->data['metaentries']['remote'] as $setkey => $set) {
+ echo '<option value="'.htmlspecialchars($setkey).'">'.$this->t(mtype($setkey)).'</option>';
+ }
+ }
?>
-
-<fieldset class="fancyfieldset"><legend>Lookup metadata</legend>
- <form action="<?php echo SimpleSAML_Module::getModuleURL('core/show_metadata.php'); ?>" method="get" >
- <p style="margin: 1em 2em ">Look up metadata for entity:
- <select name="set">
-
- <?php
- if (is_array($this->data['metaentries']['remote']) && count($this->data['metaentries']['remote']) > 0) {
- foreach($this->data['metaentries']['remote'] AS $setkey => $set) {
- echo '<option value="' . htmlspecialchars($setkey) . '">' . $this->t(mtype($setkey)) . '</option>';
- }
- }
-
- ?>
-
-
- </select>
- <input type="text" name="entityid">
- <input type="submit" value="Lookup">
- </p>
- </form>
-</fieldset>
-
+ </select>
+ <input type="text" name="entityid" />
+ <button class="btn" type="submit">Lookup </button>
+ </p>
+ </form>
+ </fieldset>
<?php
-
-}
-
-?>
-
-
-
-
-
-
-
-
-
-
-<?php $this->includeAtTemplateBase('includes/footer.php');
+ }
+$this->includeAtTemplateBase('includes/footer.php');
--
GitLab