better deletion of old avatars

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

diff --git a/actions/login.php b/actions/login.php
index 4795dfdbd64939a5a1ca800e322ebde224c66122..293d07faed91f027fd3263bf45a276b28ad178a7 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -38,7 +38,12 @@ class LoginAction extends Action {
                $nickname = $this->arg('nickname');
                $password = $this->arg('password');
                if (common_check_user($nickname, $password)) {
-                       common_set_user($nickname);
+                       # success!
+                       if (!common_set_user($nickname)) {
+                               common_server_error(_t('Error setting user.'));
+                               return;
+                       }
+                       # success!                      
                        common_redirect(common_local_url('all',
                                                                                         array('nickname' =>
                                                                                                   $nickname)));
@@ -56,11 +61,11 @@ class LoginAction extends Action {
                common_element_start('form', array('method' => 'POST',
                                                                                   'id' => 'login',
                                                                                   'action' => common_local_url('login')));
-               common_element('label', array('for' => 'username'),
+               common_element('label', array('for' => 'nickname'),
                                           _t('Name'));
-               common_element('input', array('name' => 'username',
+               common_element('input', array('name' => 'nickname',
                                                                          'type' => 'text',
-                                                                         'id' => 'username'));
+                                                                         'id' => 'nickname'));
                common_element('label', array('for' => 'password'),
                                           _t('Password'));
                common_element('input', array('name' => 'password',
@@ -68,12 +73,12 @@ class LoginAction extends Action {
                                                                          'id' => 'password'));
                common_element('input', array('name' => 'submit',
                                                                          'type' => 'submit',
-                                                                         'id' => 'submit'),
-                                          _t('Login'));
+                                                                         'id' => 'submit',
+                                                                         'value' => _t('Login')));
                common_element('input', array('name' => 'cancel',
                                                                          'type' => 'button',
-                                                                         'id' => 'cancel'),
-                                          _t('Cancel'));
+                                                                         'id' => 'cancel',
+                                                                         'value' => _t('Cancel')));
                common_element_end('form');
        }
 }