From 82cb034a27f6f141f8c7235e78b4d2573f9cbb5a Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Mon, 16 Mar 2020 20:52:03 +0000 Subject: [PATCH] Reformat LICENSE file so it is recognized by GitHub --- uphpCAS.php | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/uphpCAS.php b/uphpCAS.php index 12f8424..1633119 100644 --- a/uphpCAS.php +++ b/uphpCAS.php @@ -122,10 +122,14 @@ .($returnUrl ? '?service='.urlencode($returnUrl) : ''); } - public function logout($returnUrl = NULL) { + public function logoutLocal() { @session_start(); + unset($_SESSION[$this->sessionName]); + } + + public function logout($returnUrl = NULL) { + $this->logoutLocal(); if($this->isAuthenticated()) { - unset($_SESSION[$this->sessionName]); header('Location: '.$this->logoutUrl($returnUrl)); die(); } elseif($returnUrl) { @@ -144,6 +148,7 @@ return $_SESSION[$this->sessionName]; } elseif(isset($_REQUEST['ticket'])) { $user = $this->verifyTicket($_REQUEST['ticket']); + session_regenerate_id(); $_SESSION[$this->sessionName] = $user; return $user; } else { @@ -228,13 +233,15 @@ } } } catch(Exception $e) { - throw new JasigException('Authentication error: CAS server' - .' response invalid - parse error', 0, $e); - } finally { libxml_clear_errors(); libxml_disable_entity_loader($xmlEntityLoader); libxml_use_internal_errors($xmlInternalErrors); + throw new JasigException('Authentication error: CAS server' + .' response invalid - parse error', 0, $e); } + libxml_clear_errors(); + libxml_disable_entity_loader($xmlEntityLoader); + libxml_use_internal_errors($xmlInternalErrors); $failure = $xml->getElementsByTagName('authenticationFailure'); $success = $xml->getElementsByTagName('authenticationSuccess'); -- Gitblit v1.9.1