From 8891c7c5e6c5857eec83205815fa023939e1e126 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 03 Sep 2015 21:09:26 +0000
Subject: [PATCH] Extract code constructing current URL to getCurrentUrl() method
---
uphpCAS.php | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/uphpCAS.php b/uphpCAS.php
index b757153..e1276bb 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -13,8 +13,9 @@
const VERSION = '1.0';
protected $serverUrl = '';
protected $serviceUrl;
+ protected $sessionName = 'uphpCAS-user';
- function __construct($serverUrl = NULL, $serviceUrl = NULL) {
+ function __construct($serverUrl = NULL, $serviceUrl = NULL, $sessionName = NULL) {
if($serverUrl != NULL) {
$this->serverUrl = rtrim($serverUrl, '/');
}
@@ -22,28 +23,34 @@
if($serviceUrl != NULL) {
$this->serviceUrl = $serviceUrl;
} else {
- $url = 'http://';
- $port = 0;
- if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
- $url = 'https://';
- if(isset($_SERVER['SERVER_PORT'])
- && $_SERVER['SERVER_PORT'] != '443') {
- $port = $_SERVER['SERVER_PORT'];
- }
- } elseif(isset($_SERVER['SERVER_PORT'])
- && $_SERVER['SERVER_PORT'] != '80') {
+ $this->serviceUrl = $this->getCurrentUrl();
+ }
+
+ if($sessionName) {
+ $this->sessionName = $sessionName;
+ }
+ }
+
+ public function getCurrentUrl() {
+ $url = 'http://';
+ $port = 0;
+ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+ $url = 'https://';
+ if(isset($_SERVER['SERVER_PORT'])
+ && $_SERVER['SERVER_PORT'] != '443') {
$port = $_SERVER['SERVER_PORT'];
}
-
- $url .= $_SERVER['SERVER_NAME'];
-
- if($port != 0) {
- $url .= ':'.$port;
- }
- $url .= $_SERVER['REQUEST_URI'];
-
- $this->serviceUrl = $url;
+ } elseif(isset($_SERVER['SERVER_PORT'])
+ && $_SERVER['SERVER_PORT'] != '80') {
+ $port = $_SERVER['SERVER_PORT'];
}
+
+ $url .= $_SERVER['SERVER_NAME'];
+
+ if($port != 0) {
+ $url .= ':'.$port;
+ }
+ $url .= $_SERVER['REQUEST_URI'];
}
public function getServerUrl() {
@@ -60,6 +67,13 @@
$this->serviceUrl = $serviceUrl;
}
+ public function getSessionName($sessionName) {
+ return $this->sessionName;
+ }
+ public function setSessionName($sessionName) {
+ $this->sessionName = $sessionName;
+ }
+
public function loginUrl() {
return $this->serverUrl.'/login?method=POST&service='.urlencode($this->serviceUrl);
}
@@ -71,7 +85,7 @@
public function logout($returnUrl = NULL) {
session_start();
if($this->isAuthenticated()) {
- unset($_SESSION['uphpCAS-user']);
+ unset($_SESSION[$this->sessionName]);
header('Location: '.$this->logoutUrl($returnUrl));
die();
} elseif($returnUrl) {
@@ -81,16 +95,16 @@
}
public function isAuthenticated() {
- return isset($_SESSION['uphpCAS-user']);
+ return isset($_SESSION[$this->sessionName]);
}
public function authenticate() {
session_start();
if($this->isAuthenticated()) {
- return $_SESSION['uphpCAS-user'];
+ return $_SESSION[$this->sessionName];
} elseif(isset($_REQUEST['ticket'])) {
$user = $this->verifyTicket($_REQUEST['ticket']);
- $_SESSION['uphpCAS-user'] = $user;
+ $_SESSION[$this->sessionName] = $user;
return $user;
} else {
header('Location: '.$this->loginUrl());
--
Gitblit v1.9.1