adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 451: improvement

Browse Source 
small problem with reconnexion after session timeout
add auto-login function
all staff for session (connexion, auto-login and logout) 
is now in include/user.inc.php


git-svn-id: http://piwigo.org/svn/trunk@1511 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2006-07-28 09:34:27 +00:00
parent f6c2f2b1b1
commit 1873dbd062
5 changed files with 73 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/user.inc.php
+39 -15
View File
@@ -25,26 +25,49 @@
// | USA. |
// +-----------------------------------------------------------------------+
// retrieving connected user informations
if (isset($_COOKIE[session_name()]))
{
session_start();
if (isset($_SESSION['pwg_uid']))
{
$user['id'] = $_SESSION['pwg_uid'];
$user['is_the_guest'] = false;
}
else
{
// session timeout
$user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true;
}
session_start();
if (isset($_GET['act']) and $_GET['act'] == 'logout')
{
// logout
$_SESSION = array();
session_unset();
session_destroy();
setcookie(session_name(),'',0,
ini_get('session.cookie_path'),
ini_get('session.cookie_domain')
);
setcookie($conf['remember_me_name'], '', 0, cookie_path());
redirect(make_index_url());
}
elseif (empty($_SESSION['pwg_uid']))
{
// timeout
setcookie(session_name(),'',0,
ini_get('session.cookie_path'),
ini_get('session.cookie_domain')
);
}
else
{
$user['id'] = $_SESSION['pwg_uid'];
$user['is_the_guest'] = false;
}
}
elseif (!empty($_COOKIE[$conf['remember_me_name']]))
{
auto_login();
}
else
{
$user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true;
$user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true;
}
if ($user['is_the_guest'] and !$conf['guest_access'])
{
redirect (get_root_url().'identification.php');
}
// using Apache authentication override the above user search
@@ -58,6 +81,7 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER']))
$user['is_the_guest'] = false;
}
$user = array_merge(
$user,
getuserdata(