Skip to content
Snippets Groups Projects
Commit 69c91262 authored by Jaime Pérez Crespo's avatar Jaime Pérez Crespo
Browse files

Fix for issue #613.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3330 44740490-163a-0410-bde0-09ae8108e29a
parent e035e426
No related branches found
No related tags found
No related merge requests found
...@@ -189,9 +189,9 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco { ...@@ -189,9 +189,9 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
$idp = $this->getTargetIdp(); $idp = $this->getTargetIdp();
if($idp !== NULL) { if($idp !== NULL) {
if ($this->config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) { $extDiscoveryStorage = $this->config->getString('idpdisco.extDiscoveryStorage');
$extDiscoveryStorage = $this->config->getBoolean('idpdisco.extDiscoveryStorage'); if ($extDiscoveryStorage !== NULL) {
$this->log('Choice made [' . $idp . '] (Forwarding to external discovery storage)'); $this->log('Choice made [' . $idp . '] (Forwarding to external discovery storage)');
SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array( SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
'entityID' => $this->spEntityId, 'entityID' => $this->spEntityId,
......
...@@ -92,10 +92,8 @@ if ($idpentityid === NULL) { ...@@ -92,10 +92,8 @@ if ($idpentityid === NULL) {
$discourl = SimpleSAML_Utilities::getBaseURL() . 'saml2/sp/idpdisco.php'; $discourl = SimpleSAML_Utilities::getBaseURL() . 'saml2/sp/idpdisco.php';
} }
if ($config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) { $extDiscoveryStorage = $config->getString('idpdisco.extDiscoveryStorage', NULL);
if ($extDiscoveryStorage !== NULL) {
$extDiscoveryStorage = $config->getBoolean('idpdisco.extDiscoveryStorage');
SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array( SimpleSAML_Utilities::redirectTrustedURL($extDiscoveryStorage, array(
'entityID' => $spentityid, 'entityID' => $spentityid,
'return' => SimpleSAML_Utilities::addURLparameter($discourl, array( 'return' => SimpleSAML_Utilities::addURLparameter($discourl, array(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment