diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-10-03 14:15:46 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-10-03 14:15:46 +0200 |
| commit | e71ce681bdae620477f46591279412a0143b6b0e (patch) | |
| tree | ee04b780f596711f94ad6ae89cc6437e214a8e90 /inc/toolbar.php | |
| parent | 2d18445dc9ce9189da11f62ae9602e1f17ee64b6 (diff) | |
| download | rpg-e71ce681bdae620477f46591279412a0143b6b0e.tar.gz rpg-e71ce681bdae620477f46591279412a0143b6b0e.tar.bz2 | |
use DOKU_URL as key for sessions and auth cookie #896 #581 #884
This patch changes the DOKU_COOKIE define to be based on the DOKU_URL define.
DOKU_COOKIE is now used as session key as well, making sessions no longer
dependend on the title option. This should fix problems with multiple
wikis on the same host (using the same title) and wikis accessed through
different URLs.
darcs-hash:20061003121546-7ad00-aea4c256b7752815ed422ce74a659152a601d267.gz
Diffstat (limited to 'inc/toolbar.php')
| -rw-r--r-- | inc/toolbar.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/toolbar.php b/inc/toolbar.php index 3cd58e5c6..66780ac50 100644 --- a/inc/toolbar.php +++ b/inc/toolbar.php @@ -186,8 +186,8 @@ function toolbar_signature(){ $sig = $conf['signature']; $sig = strftime($sig); $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig); - $sig = str_replace('@NAME@',$_SESSION[$conf['title']]['auth']['info']['name'],$sig); - $sig = str_replace('@MAIL@',$_SESSION[$conf['title']]['auth']['info']['mail'],$sig); + $sig = str_replace('@NAME@',$_SESSION[DOKU_COOKIE]['auth']['info']['name'],$sig); + $sig = str_replace('@MAIL@',$_SESSION[DOKU_COOKIE]['auth']['info']['mail'],$sig); $sig = str_replace('@DATE@',date($conf['dformat']),$sig); $sig = str_replace('\\\\n','\\n',addslashes($sig)); return $sig; |