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

merge r4955 from branch 2.0 to trunk

Browse source 
bug 1452 fixed: check cookies are enabled in web browser and notify user
otherwise that she can't connect.


git-svn-id: http://piwigo.org/svn/trunk@4956 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-02-23 15:52:32 +00:00
parent 570c905556
commit 149268353d
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
identification.php
View file

@ -45,15 +45,25 @@ if ( !empty($_GET['redirect']) )
if (isset($_POST['login']))
{
$redirect_to = isset($_POST['redirect']) ? $_POST['redirect'] : '';
$remember_me = isset($_POST['remember_me']) and $_POST['remember_me']==1;
if ( try_log_user($_POST['username'], $_POST['password'], $remember_me) )
if (!isset($_COOKIE[session_name()]))
{
redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
array_push(
$errors,
l10n('Cookies are blocked or not supported by your browser. You must enable cookies to connect.')
);
}
else
{
array_push( $errors, l10n('invalid_pwd') );
{
$redirect_to = isset($_POST['redirect']) ? $_POST['redirect'] : '';
$remember_me = isset($_POST['remember_me']) and $_POST['remember_me']==1;
if ( try_log_user($_POST['username'], $_POST['password'], $remember_me) )
{
redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
}
else
{
array_push( $errors, l10n('invalid_pwd') );
}
}
}

1
language/en_UK/common.lang.php
View file

@ -369,4 +369,5 @@ $lang['Reset_To_Default'] = 'Reset to default values';
// --------- Starting below: New or revised $lang ---- from Colibri (2.1)
$lang['del_all_favorites_hint'] = 'delete all images from your favorites';
$lang['Sent by'] = 'Sent by';
$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies are blocked or not supported by your browser. You must enable cookies to connect.';
?>

1
language/fr_FR/common.lang.php
View file

@ -368,4 +368,5 @@ $lang['cloud'] = 'nuage';
$lang['Reset_To_Default'] = 'Rétablir les valeurs par défaut';
$lang['del_all_favorites_hint'] = 'supprimer toutes les images de vos favoris';
$lang['Sent by'] = 'Envoyé par';
$lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Les cookies sont bloqués ou non supportés par votre navigateur web. Vous devez activer les cookies pour vous connecter.';
?>