archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r1230 from branch-1_6 into trunk

Browse source 
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
This commit is contained in:
rvelices 2006-04-21 02:11:29 +00:00
commit 4d73790a1b
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/functions_user.inc.php
View file

@ -544,7 +544,7 @@ function log_user($user_id, $remember_me)
} }
session_set_cookie_params($session_length); session_set_cookie_params($session_length);
session_start(); session_start();
$_SESSION['id'] = $user_id; $_SESSION['pwg_uid'] = $user_id;
} }
/* /*

14
include/user.inc.php
View file

@ -26,22 +26,22 @@
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// retrieving connected user informations // retrieving connected user informations
if (isset($_COOKIE[session_name()])) if (isset($_COOKIE[session_name()]))
{ {
session_start(); 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; $user['is_the_guest'] = false;
} }
else else
{ {
// session timeout // session timeout
$user['id'] = $conf['guest_id']; $user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true; $user['is_the_guest'] = true;
} }
} }
else else
{ {
$user['id'] = $conf['guest_id']; $user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true; $user['is_the_guest'] = true;
@ -55,7 +55,7 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER']))
register_user($_SERVER['REMOTE_USER'], '', ''); register_user($_SERVER['REMOTE_USER'], '', '');
$user['id'] = get_userid($_SERVER['REMOTE_USER']); $user['id'] = get_userid($_SERVER['REMOTE_USER']);
} }
$user['is_the_guest'] = false; $user['is_the_guest'] = false;
} }
$user = array_merge( $user = array_merge(