From 5e3445de0de913d44998ecf3a21e79a68e0571e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 16 Jun 2008 06:18:50 +0000
Subject: [PATCH] Fix for translation of description of idp entries in disco
service
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@656 44740490-163a-0410-bde0-09ae8108e29a
---
templates/default/selectidp-links.php | 9 +++++++--
www/saml2/sp/idpdisco.php | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/default/selectidp-links.php b/templates/default/selectidp-links.php
index e5e27dfb9..7ac0494e6 100644
--- a/templates/default/selectidp-links.php
+++ b/templates/default/selectidp-links.php
@@ -49,7 +49,9 @@ foreach ($this->data['idplist'] AS $idpentry) {
}
echo htmlspecialchars($this->t('idpname_' . $idpentry['entityid'])) . '</h3>';
- echo ' <p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+ if (!empty($idpentry['description'])) {
+ echo ' <p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+ }
echo('<input id="preferredidp" type="submit" name="idp_' .
htmlspecialchars($idpentry['entityid']) . '" value="' .
$this->t('select') . '" /></p>');
@@ -66,7 +68,10 @@ foreach ($this->data['idplist'] AS $idpentry) {
}
echo htmlspecialchars($this->t('idpname_' . $idpentry['entityid'])) . '</h3>';
- echo ' <p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+ if (!empty($idpentry['description'])) {
+
+ echo ' <p>' . htmlspecialchars($this->t('idpdesc_' . $idpentry['entityid'])) . '<br />';
+ }
echo('<input id="preferredidp" type="submit" name="idp_' .
htmlspecialchars($idpentry['entityid']) . '" value="' .
$this->t('select') . '" /></p>');
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index 93fa7fd9e..f6d5d8529 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -105,6 +105,7 @@ if($selectedIdP !== NULL) {
}
}
+ SimpleSAML_Logger::info('SAML2.0 - SP.idpDisco: Choice made [ ' . $selectedIdP . '] (Redirecting the user back)');
SimpleSAML_Utilities::redirect($return, array($returnidparam => $selectedIdP));
}
--
GitLab