From e24fe2b5607d9fc11b1ec9812cca7c4b9f3a701d 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 11:55:12 +0000 Subject: [PATCH] fix previous fix (discoservice) git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@662 44740490-163a-0410-bde0-09ae8108e29a --- www/saml2/sp/idpdisco.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php index 209dde975..cc16ffef5 100644 --- a/www/saml2/sp/idpdisco.php +++ b/www/saml2/sp/idpdisco.php @@ -23,17 +23,19 @@ $rememberEnabled = $config->getBoolean('idpdisco.enableremember', FALSE); try { if (!isset($_GET['entityID'])) throw new Exception('Missing parameter: entityID'); - - if (!isset($_GET['returnIDParam'])) throw new Exception('Missing parameter: returnIDParam'); + if (!isset($_GET['return'])) throw new Exception('Missing parameter: return'); + + $spentityid = $_GET['entityID']; $return = $_GET['return']; // Default value for "returnIDParam". Added to support Shibboleth 2.0 SP which does not // send this parameter. + // if (!isset($_GET['returnIDParam'])) throw new Exception('Missing parameter: returnIDParam'); $returnidparam = 'idpentityid'; - //if (!isset($_GET['return'])) throw new Exception('Missing parameter: return'); + // if (isset($_GET['returnIDParam'])) { $returnidparam = $_GET['returnIDParam']; } -- GitLab