diff options
Diffstat (limited to 'lib/SimpleSAML/Auth/Simple.php')
| -rw-r--r-- | lib/SimpleSAML/Auth/Simple.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php index da0881d..a82419f 100644 --- a/lib/SimpleSAML/Auth/Simple.php +++ b/lib/SimpleSAML/Auth/Simple.php @@ -110,11 +110,11 @@ class SimpleSAML_Auth_Simple { } else if (array_key_exists('ReturnCallback', $params)) { $returnTo = (array)$params['ReturnCallback']; } else { - $returnTo = SimpleSAML_Utilities::selfURL(); + $returnTo = \SimpleSAML\Utils\HTTP::getSelfURL(); } if (is_string($returnTo) && $keepPost && $_SERVER['REQUEST_METHOD'] === 'POST') { - $returnTo = SimpleSAML_Utilities::createPostRedirectLink($returnTo, $_POST); + $returnTo = \SimpleSAML\Utils\HTTP::getPOSTRedirectURL($returnTo, $_POST); } if (array_key_exists('ErrorURL', $params)) { @@ -159,7 +159,7 @@ class SimpleSAML_Auth_Simple { assert('is_array($params) || is_string($params) || is_null($params)'); if ($params === NULL) { - $params = SimpleSAML_Utilities::selfURL(); + $params = \SimpleSAML\Utils\HTTP::getSelfURL(); } if (is_string($params)) { @@ -217,8 +217,7 @@ class SimpleSAML_Auth_Simple { $stateID = SimpleSAML_Auth_State::saveState($state, $state['ReturnStateStage']); $params[$state['ReturnStateParam']] = $stateID; } - - SimpleSAML_Utilities::redirectTrustedURL($state['ReturnTo'], $params); + \SimpleSAML\Utils\HTTP::redirectTrustedURL($state['ReturnTo'], $params); } } @@ -290,7 +289,7 @@ class SimpleSAML_Auth_Simple { assert('is_null($returnTo) || is_string($returnTo)'); if ($returnTo === NULL) { - $returnTo = SimpleSAML_Utilities::selfURL(); + $returnTo = \SimpleSAML\Utils\HTTP::getSelfURL(); } $login = SimpleSAML_Module::getModuleURL('core/as_login.php', array( @@ -313,7 +312,7 @@ class SimpleSAML_Auth_Simple { assert('is_null($returnTo) || is_string($returnTo)'); if ($returnTo === NULL) { - $returnTo = SimpleSAML_Utilities::selfURL(); + $returnTo = \SimpleSAML\Utils\HTTP::getSelfURL(); } $logout = SimpleSAML_Module::getModuleURL('core/as_logout.php', array( |