Skip to content
Snippets Groups Projects
Commit fb358d98 authored by Olav Morken's avatar Olav Morken
Browse files

IdPDisco: Fix notice in new discovery service & update comments.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@852 44740490-163a-0410-bde0-09ae8108e29a
parent 6989e51c
No related branches found
No related tags found
No related merge requests found
...@@ -59,13 +59,13 @@ class SimpleSAML_XHTML_IdPDisco { ...@@ -59,13 +59,13 @@ class SimpleSAML_XHTML_IdPDisco {
*/ */
private $spEntityId; private $spEntityId;
/* /**
* HTTP parameter from the request, indicating whether the discovery service * HTTP parameter from the request, indicating whether the discovery service
* can interact with the user or not. * can interact with the user or not.
*/ */
private $isPassive; private $isPassive;
/* /**
* The SP request to set the IdPentityID... * The SP request to set the IdPentityID...
*/ */
private $setIdPentityID = NULL; private $setIdPentityID = NULL;
...@@ -138,8 +138,10 @@ class SimpleSAML_XHTML_IdPDisco { ...@@ -138,8 +138,10 @@ class SimpleSAML_XHTML_IdPDisco {
} }
$this->log('isPassive initially set to [' . ($this->isPassive ? 'TRUE' : 'FALSE' ) . ']'); $this->log('isPassive initially set to [' . ($this->isPassive ? 'TRUE' : 'FALSE' ) . ']');
if (!array_key_exists('IdPentityID', $_GET)) { if (array_key_exists('IdPentityID', $_GET)) {
$setIdPentityID = $_GET['IdPentityID']; $this->setIdPentityID = $_GET['IdPentityID'];
} else {
$this->setIdPentityID = NULL;
} }
} }
...@@ -238,14 +240,14 @@ class SimpleSAML_XHTML_IdPDisco { ...@@ -238,14 +240,14 @@ class SimpleSAML_XHTML_IdPDisco {
private function getSelectedIdP() { private function getSelectedIdP() {
/* /* Parameter set from the Extended IdP Metadata Discovery Service Protocol,
* Parameter set from the Extended IdP Metadata Discovery Service Protocol * indicating that the user prefers this IdP.
*/ */
if(array_key_exists('IdPentityID', $_GET)) { if ($this->setIdPentityID) {
return $this->validateIdP($_GET['IdPentityID']); return $this->validateIdP($this->setIdPentityID);
} }
// Set by the user, clicking on a link /* User has clicked on a link, or selected the IdP from a dropdown list. */
if(array_key_exists('idpentityid', $_GET)) { if(array_key_exists('idpentityid', $_GET)) {
return $this->validateIdP($_GET['idpentityid']); return $this->validateIdP($_GET['idpentityid']);
} }
......
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