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

merge -r1568 from trunk to branch-1_6 (auto_login/redirect corrections)

Browse Source 
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1572 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-10-21 20:16:01 +00:00
parent 8d7aa23a8e
commit 641d335cff
7 changed files with 214 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/user.inc.php
+23 -56
View File
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
// | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far)
// | file : $RCSfile$
@@ -25,53 +25,44 @@
// | USA. |
// +-----------------------------------------------------------------------+
if (isset($_COOKIE[session_name()]))
// by default we start with guest
$user['id'] = $conf['guest_id'];
if (isset($_COOKIE[session_name()]))
{
session_start();
if (isset($_GET['act']) and $_GET['act'] == 'logout')
{
// logout
{ // logout
$_SESSION = array();
session_unset();
session_destroy();
setcookie(session_name(),'',0,
ini_get('session.cookie_path'),
ini_get('session.cookie_domain')
);
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
}
elseif (empty($_SESSION['pwg_uid']))
{ // timeout
setcookie(session_name(),'',0,
ini_get('session.cookie_path'),
ini_get('session.cookie_domain')
);
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']]))
// Now check the auto-login
if ( $user['id']==$conf['guest_id'] )
{
auto_login();
}
else
{
$user['id'] = $conf['guest_id'];
$user['is_the_guest'] = true;
}
if ($user['is_the_guest'] and !$conf['guest_access']
and (basename($_SERVER['PHP_SELF'])!='identification.php')
and (basename($_SERVER['PHP_SELF'])!='password.php')
and (basename($_SERVER['PHP_SELF'])!='register.php'))
{
redirect (get_root_url().'identification.php');
}
// using Apache authentication override the above user search
if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER']))
@@ -81,33 +72,9 @@ 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 = build_user( $user['id'],
( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
);
$user = array_merge(
$user,
getuserdata(
$user['id'],
( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
)
);
// properties of user guest are found in the configuration
if ($user['is_the_guest'])
{
$user['template'] = $conf['default_template'];
$user['nb_image_line'] = $conf['nb_image_line'];
$user['nb_line_page'] = $conf['nb_line_page'];
$user['language'] = $conf['default_language'];
$user['maxwidth'] = $conf['default_maxwidth'];
$user['maxheight'] = $conf['default_maxheight'];
$user['recent_period'] = $conf['recent_period'];
$user['expand'] = $conf['auto_expand'];
$user['show_nb_comments'] = $conf['show_nb_comments'];
$user['enabled_high'] = $conf['newuser_default_enabled_high'];
}
// calculation of the number of picture to display per page
$user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
?>
?>