From e71ce681bdae620477f46591279412a0143b6b0e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 3 Oct 2006 14:15:46 +0200 Subject: 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 --- inc/toolbar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/toolbar.php') 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; -- cgit v1.2.3