From cc5e2904619f00482ca79a75f4e073795850c8ca Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Thu, 03 Sep 2015 17:09:44 +0000
Subject: [PATCH] Add $returnUrl parameter to logout() method
---
uphpCAS.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/uphpCAS.php b/uphpCAS.php
index 40bddad..b757153 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -46,7 +46,7 @@
}
}
- public function getServerUrl($serverUrl) {
+ public function getServerUrl() {
return $this->serverUrl;
}
public function setServerUrl($serverUrl) {
@@ -68,13 +68,16 @@
return $this->serverUrl.'/logout'.($returnUrl ? '?service='.urlencode($returnUrl) : '');
}
- public function logout() {
+ public function logout($returnUrl = NULL) {
session_start();
- if(isset($_SESSION['uphpCAS-user'])) {
+ if($this->isAuthenticated()) {
unset($_SESSION['uphpCAS-user']);
+ header('Location: '.$this->logoutUrl($returnUrl));
+ die();
+ } elseif($returnUrl) {
+ header('Location: '.$returnUrl);
+ die();
}
- header('Location: '.$this->logoutUrl());
- die();
}
public function isAuthenticated() {
--
Gitblit v1.9.1