reply_to is now stored on the notice, not on the reply record

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

diff --git a/actions/login.php b/actions/login.php
index ae75c90445441d3528fa7a5ebf30e7966077206d..4d7c8470bf73c7d0fba422fe1ddb4c028bc61e7c 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -31,37 +31,42 @@ class LoginAction extends Action {
                        $this->show_form();
                }
        }
-
+       
        function check_login() {
                # XXX: form token in $_SESSION to prevent XSS
                # XXX: login throttle
                $nickname = $this->arg('nickname');
                $password = $this->arg('password');
-               if (common_check_user($nickname, $password)) {
-                       # success!
-                       if (!common_set_user($nickname)) {
-                               common_server_error(_t('Error setting user.'));
-                               return;
-                       }
-                       common_real_login(true);
-                       if ($this->boolean('rememberme')) {
-                               common_debug('Adding rememberme cookie for ' . $nickname);
-                               common_rememberme();
-                       }
-                       # success!
-                       $url = common_get_returnto();
-                       if ($url) {
-                               # We don't have to return to it again
-                               common_set_returnto(NULL);
-                       } else {
-                               $url = common_local_url('all',
-                                                                               array('nickname' =>
-                                                                                         $nickname));
-                       }
-                       common_redirect($url);
-               } else {
+               $user = common_check_user($nickname, $password);
+
+               if (!$user) {
                        $this->show_form(_t('Incorrect username or password.'));
+                       return;
+               }
+               
+               # success!
+               if (!common_set_user($user)) {
+                       common_server_error(_t('Error setting user.'));
+                       return;
+               }
+               
+               common_real_login(true);
+               
+               if ($this->boolean('rememberme')) {
+                       common_debug('Adding rememberme cookie for ' . $nickname);
+                       common_rememberme($user);
+               }
+               # success!
+               $url = common_get_returnto();
+               if ($url) {
+                       # We don't have to return to it again
+                       common_set_returnto(NULL);
+               } else {
+                       $url = common_local_url('all',
+                                                                       array('nickname' =>
+                                                                                 $nickname));
                }
+               common_redirect($url);
        }
 
        function show_form($error=NULL) {
@@ -90,9 +95,10 @@ class LoginAction extends Action {
                {
                        # rememberme logins have to reauthenticate before
                        # changing any profile settings (cookie-stealing protection)
-                       return _t('To change your settings, login with your ' .
+                       return _t('For security reasons, ' . 
+                                         'please re-enter your ' .
                                          'user name and password ' . 
-                                         '(or use [OpenID](%%action.openidlogin%%)).');
+                                         'before changing your settings. ');
                } else {
                        return _t('Login with your username and password. ' .
                                          'Don\'t have a username yet? ' .
@@ -113,3 +119,4 @@ class LoginAction extends Action {
                }
        }
 }
+#
\ No newline at end of file