From 4d73790a1b6194c024f4cc159311b260349df6a0 Mon Sep 17 00:00:00 2001 From: rvelices Date: Fri, 21 Apr 2006 02:11:29 +0000 Subject: merge r1230 from branch-1_6 into trunk bugs 344 and 308: broken user id in $_SESSION due to php.ini register_globals git-svn-id: http://piwigo.org/svn/trunk@1231 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_user.inc.php | 2 +- include/user.inc.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index c5efa98ad..0965467ce 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -544,7 +544,7 @@ function log_user($user_id, $remember_me) } session_set_cookie_params($session_length); session_start(); - $_SESSION['id'] = $user_id; + $_SESSION['pwg_uid'] = $user_id; } /* diff --git a/include/user.inc.php b/include/user.inc.php index 83d86a6c7..47b318eeb 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -26,22 +26,22 @@ // +-----------------------------------------------------------------------+ // retrieving connected user informations -if (isset($_COOKIE[session_name()])) +if (isset($_COOKIE[session_name()])) { session_start(); - if (isset($_SESSION['id'])) + if (isset($_SESSION['pwg_uid'])) { - $user['id'] = $_SESSION['id']; + $user['id'] = $_SESSION['pwg_uid']; $user['is_the_guest'] = false; } - else + else { // session timeout $user['id'] = $conf['guest_id']; $user['is_the_guest'] = true; } -} -else +} +else { $user['id'] = $conf['guest_id']; $user['is_the_guest'] = true; @@ -55,7 +55,7 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER'])) register_user($_SERVER['REMOTE_USER'], '', ''); $user['id'] = get_userid($_SERVER['REMOTE_USER']); } - + $user['is_the_guest'] = false; } $user = array_merge( -- cgit v1.2.3