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

diff --git a/actions/login.php b/actions/login.php
index 13e14f5bee..3a93c466fa 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -20,12 +20,12 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class LoginAction extends Action {
-	
+
 	function handle($args) {
 		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,42 +38,39 @@ class LoginAction extends Action {
 		$nickname = $this->arg('nickname');
 		$password = $this->arg('password');
 		if (common_check_user($nickname, $password)) {
-			common_set_user($nickname);
-			common_redirect(common_local_url('all',
-											 array('nickname' =>
-												   $nickname)));
+			# success!
+			if (!common_set_user($nickname)) {
+				common_server_error(_t('Error setting user.'));
+				return;
+			}
+			# 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 {
 			$this->show_form(_t('Incorrect username or password.'));
 		}
 	}
-	
+
 	function show_form($error=NULL) {
-		
 		common_show_header(_t('Login'));
-		if (!is_null($error)) {
-			common_element('div', array('class' => 'error'), $msg);
+		if ($error) {
+			common_element('div', array('class' => 'error'), $error);
 		}
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'login',
 										   'action' => common_local_url('login')));
-		common_element('label', array('for' => 'username'),
-					   _t('Name'));
-		common_element('input', array('name' => 'username',
-									  'type' => 'text',
-									  'id' => 'username'));
-		common_element('label', array('for' => 'password'),
-					   _t('Password'));
-		common_element('input', array('name' => 'password',
-									  'type' => 'password',									  
-									  'id' => 'password'));
-		common_element('input', array('name' => 'submit',
-									  'type' => 'submit',
-									  'id' => 'submit'),
-					   _t('Login'));
-		common_element('input', array('name' => 'cancel',
-									  'type' => 'button',
-									  'id' => 'cancel'),
-					   _t('Cancel'));
+		common_input('nickname', _t('Nickname'));
+		common_password('password', _t('Password'));
+		common_submit('submit', _t('Login'));
 		common_element_end('form');
+		common_show_footer();
 	}
 }