diff options
| author | Dominik Eckelmann <deckelmann@gmail.com> | 2011-08-18 03:40:04 -0700 |
|---|---|---|
| committer | Dominik Eckelmann <deckelmann@gmail.com> | 2011-08-18 03:40:04 -0700 |
| commit | b546d8640010d9b5940657881056706d1c4591cc (patch) | |
| tree | 97ec7ffff2d8ae10d778050da6dfdde9b5ed4f88 /inc | |
| parent | 02782d1287173f3981a008755958543c178de296 (diff) | |
| parent | 73ab87de7441c9c0eac123c1c44c2cf1ffdbe189 (diff) | |
| download | rpg-b546d8640010d9b5940657881056706d1c4591cc.tar.gz rpg-b546d8640010d9b5940657881056706d1c4591cc.tar.bz2 | |
Merge pull request #19 from gbirke/master
Make cookie path configurable
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/auth.php | 10 | ||||
| -rw-r--r-- | inc/init.php | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/inc/auth.php b/inc/auth.php index a480a4a8a..eff984b36 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -348,10 +348,11 @@ function auth_logoff($keepbc=false){ unset($_SERVER['REMOTE_USER']); $USERINFO=null; //FIXME + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; if (version_compare(PHP_VERSION, '5.2.0', '>')) { - setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true); + setcookie(DOKU_COOKIE,'',time()-600000,$cookieDir,'',($conf['securecookie'] && is_ssl()),true); }else{ - setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl())); + setcookie(DOKU_COOKIE,'',time()-600000,$cookieDir,'',($conf['securecookie'] && is_ssl())); } if($auth) $auth->logOff(); @@ -977,11 +978,12 @@ function auth_setCookie($user,$pass,$sticky) { // set cookie $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass); + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; $time = $sticky ? (time()+60*60*24*365) : 0; //one year if (version_compare(PHP_VERSION, '5.2.0', '>')) { - setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true); + setcookie(DOKU_COOKIE,$cookie,$time,$cookieDir,'',($conf['securecookie'] && is_ssl()),true); }else{ - setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl())); + setcookie(DOKU_COOKIE,$cookie,$time,$cookieDir,'',($conf['securecookie'] && is_ssl())); } // set session $_SESSION[DOKU_COOKIE]['auth']['user'] = $user; diff --git a/inc/init.php b/inc/init.php index 819d92bdc..dfa25f8b1 100644 --- a/inc/init.php +++ b/inc/init.php @@ -146,10 +146,11 @@ 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,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true); + session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true); }else{ - session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl())); + session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl())); } session_start(); |