diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-05 11:59:25 +0000 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-05 11:59:25 +0000 |
| commit | 5fc8e2cfee706ae311a4ec4c2b57aa8515bf42e9 (patch) | |
| tree | c8a6e3da90dee0f1942b7f2e33ebad7abe776398 /inc/init.php | |
| parent | 5c3bcd038aad2063bd5f467667bc7e620985cb96 (diff) | |
| parent | 55a71a16cbfacd3836ca70e37e45f85bd44ceab1 (diff) | |
| download | rpg-5fc8e2cfee706ae311a4ec4c2b57aa8515bf42e9.tar.gz rpg-5fc8e2cfee706ae311a4ec4c2b57aa8515bf42e9.tar.bz2 | |
Merge pull request #578 from splitbrain/sessionprops
define overridable constants for session properties FS#1913
Diffstat (limited to 'inc/init.php')
| -rw-r--r-- | inc/init.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/inc/init.php b/inc/init.php index 3e422453d..9b8465911 100644 --- a/inc/init.php +++ b/inc/init.php @@ -140,18 +140,21 @@ if ($conf['gzip_output'] && } // init session -if (!headers_sent() && !defined('NOSESSION')){ - session_name("DokuWiki"); - $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; - if (version_compare(PHP_VERSION, '5.2.0', '>')) { - session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true); - }else{ - session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl())); +if(!headers_sent() && !defined('NOSESSION')) { + if(!defined('DOKU_SESSION_NAME')) define ('DOKU_SESSION_NAME', "DokuWiki"); + if(!defined('DOKU_SESSION_LIFETIME')) define ('DOKU_SESSION_LIFETIME', 0); + if(!defined('DOKU_SESSION_PATH')) { + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + define ('DOKU_SESSION_PATH', $cookieDir); } + if(!defined('DOKU_SESSION_DOMAIN')) define ('DOKU_SESSION_DOMAIN', ''); + + session_name(DOKU_SESSION_NAME); + session_set_cookie_params(DOKU_SESSION_LIFETIME, DOKU_SESSION_PATH, DOKU_SESSION_DOMAIN, ($conf['securecookie'] && is_ssl()), true); session_start(); // load left over messages - if(isset($_SESSION[DOKU_COOKIE]['msg'])){ + if(isset($_SESSION[DOKU_COOKIE]['msg'])) { $MSG = $_SESSION[DOKU_COOKIE]['msg']; unset($_SESSION[DOKU_COOKIE]['msg']); } |