From deadb1b99a2907729028064fde8b2b0996a9fd4b Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Thu, 03 Sep 2015 16:46:09 +0000
Subject: [PATCH] Remove unused parameter from getServerUrl method

---
 uphpCAS.php |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/uphpCAS.php b/uphpCAS.php
index acc9c21..9162886 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -1,7 +1,7 @@
 <?php
 // Thrown when internal error occurs
 class JasigException extends Exception {}
-// Thrown when CAS server return authentication error
+// Thrown when CAS server returns authentication error
 class JasigAuthException extends JasigException {}
 
 class JasigUser {
@@ -46,7 +46,7 @@
 		}
 	}
 	
-	public function getServerUrl($serverUrl) {
+	public function getServerUrl() {
 		return $this->serverUrl;
 	}
 	public function setServerUrl($serverUrl) {
@@ -64,8 +64,8 @@
 		return $this->serverUrl.'/login?method=POST&service='.urlencode($this->serviceUrl);
 	}
 	
-	public function logoutUrl() {
-		return $this->serverUrl.'/logout';
+	public function logoutUrl($returnUrl = NULL) {
+		return $this->serverUrl.'/logout'.($returnUrl ? '?service='.urlencode($returnUrl) : '');
 	}
 	
 	public function logout() {
@@ -157,8 +157,7 @@
 						break;
 				}
 			}
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			throw new JasigException('Authentication error: CAS server'
 					.' response invalid - parse error', 0, $e);
 		} finally {
@@ -192,7 +191,7 @@
 			}
 			
 			$user = trim($user->item(0)->textContent);
-			if(strlen($user)<1) {
+			if(strlen($user) < 1) {
 				throw new JasigException('Authentication error: CAS server'
 						.' response invalid - user value');
 			}
@@ -209,9 +208,7 @@
 			}
 			
 			return $jusr;
-		}
-		else
-		{
+		} else {
 			throw new JasigException('Authentication error: CAS server'
 					.' response invalid - required tag not found');
 		}

--
Gitblit v1.9.1