[rendertime] Fix empty minimal_time

[friendica-addons.git] / saml / saml.php

diff --git a/saml/saml.php b/saml/saml.php
index 53e65b570f1e81480b452a0cd99a7e25d20955c6..95f751aa34a5713dd7d58caab32be6057294d3f9 100755 (executable)
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -108,7 +108,7 @@ function saml_is_configured()
                DI::config()->get('saml', 'idp_cert');
 }
 
-function saml_sso_initiate(App $a, array &$b)
+function saml_sso_initiate(App $a, string &$body)
 {
        if (!saml_is_configured()) {
                Logger::warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
@@ -117,7 +117,7 @@ function saml_sso_initiate(App $a, array &$b)
 
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
        $ssoBuiltUrl = $auth->login(null, [], false, false, true);
-       $_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
+       DI::session()->set('AuthNRequestID', $auth->getLastRequestID());
        header('Pragma: no-cache');
        header('Cache-Control: no-cache, must-revalidate');
        header('Location: ' . $ssoBuiltUrl);
@@ -129,12 +129,12 @@ function saml_sso_reply(App $a)
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
        $requestID = null;
 
-       if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
-               $requestID = $_SESSION['AuthNRequestID'];
+       if (DI::session()->exists('AuthNRequestID')) {
+               $requestID = DI::session()->get('AuthNRequestID');
        }
 
        $auth->processResponse($requestID);
-       unset($_SESSION['AuthNRequestID']);
+       DI::session()->remove('AuthNRequestID');
 
        $errors = $auth->getErrors();
 
@@ -173,7 +173,7 @@ function saml_sso_reply(App $a)
        }
 }
 
-function saml_slo_initiate(App $a, array &$b)
+function saml_slo_initiate(App $a)
 {
        if (!saml_is_configured()) {
                Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
@@ -183,7 +183,7 @@ function saml_slo_initiate(App $a, array &$b)
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
 
        $sloBuiltUrl = $auth->logout();
-       $_SESSION['LogoutRequestID'] = $auth->getLastRequestID();
+       DI::session()->set('LogoutRequestID', $auth->getLastRequestID());
        header('Pragma: no-cache');
        header('Cache-Control: no-cache, must-revalidate');
        header('Location: ' . $sloBuiltUrl);
@@ -194,8 +194,8 @@ function saml_slo_reply()
 {
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
 
-       if (isset($_SESSION) && isset($_SESSION['LogoutRequestID'])) {
-               $requestID = $_SESSION['LogoutRequestID'];
+       if (DI::session()->exists('LogoutRequestID')) {
+               $requestID = DI::session()->get('LogoutRequestID');
        } else {
                $requestID = null;
        }