lcase tname

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index 649f7ec9a4f695de80b4fe43bd9d0634a25b52fa..0f2dec1a41e38ba9403f4eedcde91b9a0b83e7ed 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -66,7 +66,7 @@ class LoginAction extends Action {
 
                # success!
                if (!common_set_user($user)) {
-                       common_server_error(_t('Error setting user.'));
+                       common_server_error(_('Error setting user.'));
                        return;
                }
 
@@ -109,10 +109,21 @@ class LoginAction extends Action {
        }
 
        function get_instructions() {
-               return _('Login with your username and password. ' .
-                                 'Don\'t have a username yet? ' .
-                                 '[Register](%%action.register%%) a new account, or ' .
-                                 'try [OpenID](%%action.openidlogin%%). ');
+               if (common_logged_in() &&
+                       !common_is_real_login() &&
+                       common_get_returnto())
+               {
+                       # rememberme logins have to reauthenticate before
+                       # changing any profile settings (cookie-stealing protection)
+                       return _('For security reasons, please re-enter your ' .
+                                        'user name and password ' .
+                                        'before changing your settings.');
+               } else {
+                       return _('Login with your username and password. ' .
+                                        'Don\'t have a username yet? ' .
+                                        '[Register](%%action.register%%) a new account, or ' .
+                                        'try [OpenID](%%action.openidlogin%%). ');
+               }
        }
 
        function show_top($error=NULL) {
@@ -127,4 +138,3 @@ class LoginAction extends Action {
                }
        }
 }
-#
\ No newline at end of file