From 69c91262bfd64c0145dc17c6e5583f0628964841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20P=C3=A9rez=20Crespo?= <jaime.perez@uninett.no>
Date: Fri, 24 Jan 2014 16:35:49 +0000
Subject: [PATCH] Fix for issue #613.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3330 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discopower/lib/PowerIdPDisco.php | 6 +++---
www/saml2/sp/initSSO.php | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/modules/discopower/lib/PowerIdPDisco.php b/modules/discopower/lib/PowerIdPDisco.php
index bb33a3c6d..22459312b 100644
--- a/modules/discopower/lib/PowerIdPDisco.php
+++ b/modules/discopower/lib/PowerIdPDisco.php
@@ -189,9 +189,9 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
$idp = $this->getTargetIdp();
if($idp !== NULL) {
-
- if ($this->config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) {
- $extDiscoveryStorage = $this->config->getBoolean('idpdisco.extDiscoveryStorage');
+
+ $extDiscoveryStorage = $this->config->getString('idpdisco.extDiscoveryStorage');
+ if ($extDiscoveryStorage !== NULL) {
$this->log('Choice made [' . $idp . '] (Forwarding to external discovery storage)');
SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
'entityID' => $this->spEntityId,
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 880674837..a9ee60fbe 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -92,10 +92,8 @@ if ($idpentityid === NULL) {
$discourl = SimpleSAML_Utilities::getBaseURL() . 'saml2/sp/idpdisco.php';
}
- if ($config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) {
-
- $extDiscoveryStorage = $config->getBoolean('idpdisco.extDiscoveryStorage');
-
+ $extDiscoveryStorage = $config->getString('idpdisco.extDiscoveryStorage', NULL);
+ if ($extDiscoveryStorage !== NULL) {
SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
'entityID' => $spentityid,
'return' => SimpleSAML_Utilities::addURLparameter($discourl, array(
--
GitLab