[simplesamlphp] r3400 committed - Honour UIInfo/DisplayName in IdP's metadata in the IdP selection templ...

[simple...@googlecode.com]

Revision: 3400
Author: jai...@gmail.com
Date: Thu Feb 27 09:53:06 2014 UTC
Log: Honour UIInfo/DisplayName in IdP's metadata in the IdP selection
templates.
http://code.google.com/p/simplesamlphp/source/detail?r=3400

Modified:
/branches/simplesamlphp-1.12/templates/selectidp-dropdown.php
/branches/simplesamlphp-1.12/templates/selectidp-links.php

=======================================
--- /branches/simplesamlphp-1.12/templates/selectidp-dropdown.php Wed Feb
10 11:32:00 2010 UTC
+++ /branches/simplesamlphp-1.12/templates/selectidp-dropdown.php Thu Feb
27 09:53:06 2014 UTC
@@ -10,7 +10,9 @@
$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']);
=======================================
--- /branches/simplesamlphp-1.12/templates/selectidp-links.php Thu May 26
10:40:00 2011 UTC
+++ /branches/simplesamlphp-1.12/templates/selectidp-links.php Thu Feb 27
09:53:06 2014 UTC
@@ -10,7 +10,9 @@
$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']);