restore enhanced login instructions, lost in gettext() switchover

darcs-hash:20080713151004-84dde-6818a5392e8d78e6672399dfbc183b571751953a.gz

diff --git a/actions/login.php b/actions/login.php
index d84a0b8cb9184e5846704aa4ca77f876fcd3cafb..a60f3c65ce929675d0a965e82b24dd392a609e85 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -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) {