diff options
| author | plegall <plg@piwigo.org> | 2010-02-23 15:49:54 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-02-23 15:49:54 +0000 |
| commit | 080af5a8896b3ac007a249582b971af4f207f159 (patch) | |
| tree | b2d9dcb5236df31c1c79cddb43be8a8186fdff12 | |
| parent | d0f215731db408a463257789d9497b20a4d26bab (diff) | |
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/branches/2.0@4955 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | identification.php | 22 | ||||
| -rw-r--r-- | language/en_UK/common.lang.php | 1 | ||||
| -rw-r--r-- | language/fr_FR/common.lang.php | 1 |
3 files changed, 18 insertions, 6 deletions
diff --git a/identification.php b/identification.php index 802a2c170..2b6e856b9 100644 --- a/identification.php +++ b/identification.php @@ -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') ); + } } } diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index 2f7612eb2..c7d38d9c0 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -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.'; ?>
\ No newline at end of file diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index 032a9b603..72fb3eacb 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -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.'; ?>
\ No newline at end of file |