aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--identification.php22
-rw-r--r--language/en_UK/common.lang.php1
-rw-r--r--language/fr_FR/common.lang.php1
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 34ebb8317..698d60dc9 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.';
?>
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