summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaimepc@gmail.com <jaimepc@gmail.com@44740490-163a-0410-bde0-09ae8108e29a>2014-02-27 09:44:19 (GMT)
committerjaimepc@gmail.com <jaimepc@gmail.com@44740490-163a-0410-bde0-09ae8108e29a>2014-02-27 09:44:19 (GMT)
commitc2830a4fe1cfc2a10965f6daf76386a740ba571f (patch)
tree8544e4e83c112714d67a1c5569acb1a0f86eb10b
parentc342cbbdcd9452b6c6de17e61629531d57a4ad19 (diff)
downloadsimplesamlphp-c2830a4fe1cfc2a10965f6daf76386a740ba571f.zip
simplesamlphp-c2830a4fe1cfc2a10965f6daf76386a740ba571f.tar.gz
simplesamlphp-c2830a4fe1cfc2a10965f6daf76386a740ba571f.tar.bz2
Honour UIInfo/DisplayName in IdP's metadata in the IdP selection templates.
git-svn-id: http://simplesamlphp.googlecode.com/svn/trunk@3398 44740490-163a-0410-bde0-09ae8108e29a
-rw-r--r--templates/selectidp-dropdown.php4
-rw-r--r--templates/selectidp-links.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/templates/selectidp-dropdown.php b/templates/selectidp-dropdown.php
index c7aaa1c..6f54bbf 100644
--- a/templates/selectidp-dropdown.php
+++ b/templates/selectidp-dropdown.php
@@ -10,7 +10,9 @@ $this->data['autofocus'] = 'dropdownlist';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (isset($idpentry['name'])) {
+ if (isset($idpentry['UIInfo']['DisplayName'])) {
+ $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
+ } elseif (isset($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
} elseif (isset($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);
diff --git a/templates/selectidp-links.php b/templates/selectidp-links.php
index 85aa3ca..0763525 100644
--- a/templates/selectidp-links.php
+++ b/templates/selectidp-links.php
@@ -10,7 +10,9 @@ $this->data['autofocus'] = 'preferredidp';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (isset($idpentry['name'])) {
+ if (isset($idpentry['UIInfo']['DisplayName'])) {
+ $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
+ } elseif (isset($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
} elseif (isset($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);