Changeset 4955 for branches

Timestamp:

Feb 23, 2010, 4:49:54 PM (14 years ago)

Author:

plg

Message:

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

Location:

branches/2.0

Files:

• identification.php (modified) (1 diff)
• language/en_UK/common.lang.php (modified) (1 diff)
• language/fr_FR/common.lang.php (modified) (1 diff)

branches/2.0/identification.php

@@ -46 +46 @@
 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') );
+    }
   }
 }

branches/2.0/language/en_UK/common.lang.php

@@ -370 +370 @@
 $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.';
 ?>

branches/2.0/language/fr_FR/common.lang.php

@@ -369 +369 @@
 $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.';
 ?>