X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=c9d887300140f2cd94014fab1346de62a986b277;hb=e18c5321c49e8559cea55d1130dbfe436f2867a7;hp=13e14f5bee6a10ecbe44b5061869955d872b7254;hpb=1a15570339fa7ae5e33a98a7fe6a8645e3d3af72;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index 13e14f5bee..c9d8873001 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -25,7 +25,7 @@ class LoginAction extends Action {
 		parent::handle($args);
 		if (common_logged_in()) {
 			common_user_error(_t('Already logged in.'));
-		} else if ($this->arg('METHOD') == 'POST') {
+		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$this->check_login();
 		} else {
 			$this->show_form();
@@ -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,13 @@ 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');
+		common_show_footer();
 	}
 }