diff options
author | Udo Walter | 2017-09-01 15:27:06 +0200 |
---|---|---|
committer | Udo Walter | 2017-09-01 15:27:06 +0200 |
commit | 599c259845cd94a0bb64233b9935ea8c38be65b0 (patch) | |
tree | f6b2601d774aa5a0ca8785015d997545ef9952f7 /inc/session.inc.php | |
parent | [js_stupidtable] changed one-line code to formatted code; (diff) | |
parent | [locationinfo] Add backend for Microsoft Exchange Server (diff) | |
download | slx-admin-599c259845cd94a0bb64233b9935ea8c38be65b0.tar.gz slx-admin-599c259845cd94a0bb64233b9935ea8c38be65b0.tar.xz slx-admin-599c259845cd94a0bb64233b9935ea8c38be65b0.zip |
Merge remote-tracking branch 'origin/master' into permission-manager
Diffstat (limited to 'inc/session.inc.php')
-rw-r--r-- | inc/session.inc.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/inc/session.inc.php b/inc/session.inc.php index 26effa3f..24bf6ac0 100644 --- a/inc/session.inc.php +++ b/inc/session.inc.php @@ -74,10 +74,15 @@ class Session { if (self::$sid === false) return; @unlink(self::getSessionFile()); - @setcookie('sid', '', time() - 8640000, null, null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true); + self::deleteCookie(); self::$sid = false; self::$data = false; } + + public static function deleteCookie() + { + setcookie('sid', '', time() - 8640000, null, null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true); + } private static function getSessionFile() { @@ -104,7 +109,7 @@ class Session $sessionfile = self::getSessionFile(); $ret = @file_put_contents($sessionfile, @serialize(self::$data)); if (!$ret) Util::traceError('Storing session data in ' . $sessionfile . ' failed.'); - $ret = @setcookie('sid', self::$sid, time() + CONFIG_SESSION_TIMEOUT, null, null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true); + $ret = setcookie('sid', self::$sid, time() + CONFIG_SESSION_TIMEOUT, null, null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true); if (!$ret) Util::traceError('Error: Could not set Cookie for Client (headers already sent)'); } } |