From 425b61258c0a988e2f6cacdb6b40d1f88626a6a3 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Sun, 06 Sep 2015 14:58:12 +0000
Subject: [PATCH] Fix code sample in README
---
uphpCAS.php | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/uphpCAS.php b/uphpCAS.php
index 955d204..77ba8d3 100644
--- a/uphpCAS.php
+++ b/uphpCAS.php
@@ -56,7 +56,16 @@
if($port != 0) {
$url .= ':'.$port;
}
+
$url .= $_SERVER['REQUEST_URI'];
+
+ if(isset($_GET['ticket'])) {
+ $pos = max(
+ strrpos($url, '?ticket='),
+ strrpos($url, '&ticket=')
+ );
+ $url = substr($url, 0, $pos);
+ }
return $url;
}
@@ -114,7 +123,7 @@
}
public function logout($returnUrl = NULL) {
- session_start();
+ @session_start();
if($this->isAuthenticated()) {
unset($_SESSION[$this->sessionName]);
header('Location: '.$this->logoutUrl($returnUrl));
@@ -130,7 +139,7 @@
}
public function authenticate() {
- session_start();
+ @session_start();
if($this->isAuthenticated()) {
return $_SESSION[$this->sessionName];
} elseif(isset($_REQUEST['ticket'])) {
@@ -219,13 +228,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