From f867b7ede19897005ebb0e5a57dbeb2456d0d1fe Mon Sep 17 00:00:00 2001
From: Dick Visser <dick.visser@geant.org>
Date: Thu, 21 Mar 2019 11:22:52 +0100
Subject: [PATCH] Remove hard coded tabs (#1081)
---
modules/discopower/lib/PowerIdPDisco.php | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index a25f3df14..7eb205473 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -248,21 +248,6 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
$preferredIdP = $this->getRecommendedIdP();
$t = new \SimpleSAML\XHTML\Template($this->config, 'discopower:disco.tpl.php', 'disco');
- $discoPowerTabs = [
- 'denmark' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:denmark}'),
- 'edugain' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:edugain}'),
- 'finland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:finland}'),
- 'greece' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:greece}'),
- 'southafrica' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:southafrica}'),
- 'iceland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:iceland}'),
- 'incommon' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:incommon}'),
- 'kalmar' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:kalmar}'),
- 'misc' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:misc}'),
- 'norway' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:norway}'),
- 'sweden' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:sweden}'),
- 'switzerland' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:switzerland}'),
- 'ukacessfederation' => \SimpleSAML\Locale\Translate::noop('{discopower:tabs:ukacessfederation}'),
- ];
$t->data['return'] = $this->returnURL;
$t->data['returnIDParam'] = $this->returnIdParam;
@@ -290,12 +275,14 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
$session->setData('discopower:tabList', 'defaulttab', $t->data['defaulttab']);
$t->data['score'] = $this->discoconfig->getValue('score', 'quicksilver');
- $t->data['tabNames'] = $discoPowerTabs;
$t->data['preferredidp'] = $preferredIdP;
$t->data['urlpattern'] = htmlspecialchars(\SimpleSAML\Utils\HTTP::getSelfURLNoQuery());
$t->data['rememberenabled'] = $this->config->getBoolean('idpdisco.enableremember', false);
$t->data['rememberchecked'] = $this->config->getBoolean('idpdisco.rememberchecked', false);
$t->data['jquery'] = ['core' => true, 'ui' => true];
+ foreach(array_keys($idpList) as $tab) {
+ $t->data['tabNames'][$tab] = \SimpleSAML\Locale\Translate::noop('{discopower:tabs:' . $tab . '}');
+ }
$t->show();
}
--
GitLab