X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=f9fe71ed40503744562639af8676d8fbcf10fae9;hb=aa6da5965da099e6c029a62a96a3b13d9448da4d;hp=f6d0163105f42675a8667c55411ce4a8c96626e7;hpb=c012b278f00664470e74a0009791e8b2bca2a5e3;p=quix0rs-gnu-social.git
diff --git a/actions/login.php b/actions/login.php
index f6d0163105..f9fe71ed40 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -20,69 +20,36 @@
* along with this program. If not, see .
*
* @category Login
- * @package StatusNet
+ * @package GNUsocial
* @author Evan Prodromou
* @author Sarven Capadisli
+ * @author Mikael Nordfeldth
* @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2013 Free Software Foundation, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
+ * @link http://www.gnu.org/software/social/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
-/**
- * Login form
- *
- * @category Personal
- * @package StatusNet
- * @author Evan Prodromou
- * @author Sarven Capadisli
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://status.net/
- */
-
-class LoginAction extends Action
+class LoginAction extends FormAction
{
- /**
- * Has there been an error?
- */
-
- var $error = null;
-
- /**
- * Is this a read-only action?
- *
- * @return boolean false
- */
-
- function isReadOnly($args)
- {
- return false;
- }
+ protected $needLogin = false;
/**
* Handle input, produce output
*
* Switches on request method; either shows the form or handles its input.
*
- * @param array $args $_REQUEST data
- *
* @return void
*/
-
- function handle($args)
+ protected function handle()
{
- parent::handle($args);
if (common_is_real_login()) {
- $this->clientError(_('Already logged in.'));
- } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $this->checkLogin();
- } else {
- common_ensure_session();
- $this->showForm();
+ common_redirect(common_local_url('all', array('nickname' => $this->scoped->nickname)), 307);
}
+
+ return parent::handle();
}
/**
@@ -94,36 +61,28 @@ class LoginAction extends Action
*
* @return void
*/
-
- function checkLogin()
+ protected function doPost()
{
// XXX: login throttle
- // CSRF protection - token set in NoticeForm
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->clientError(_('There was a problem with your session token. '.
- 'Try again, please.'));
- return;
- }
-
- $nickname = common_canonical_nickname($this->trimmed('nickname'));
+ $nickname = $this->trimmed('nickname');
$password = $this->arg('password');
$user = common_check_user($nickname, $password);
- if (!$user) {
- $this->showForm(_('Incorrect username or password.'));
- return;
+ if (!$user instanceof User) {
+ // TRANS: Form validation error displayed when trying to log in with incorrect credentials.
+ throw new ServerException(_('Incorrect username or password.'));
}
// success!
if (!common_set_user($user)) {
- $this->serverError(_('Error setting user.'));
- return;
+ // TRANS: Server error displayed when during login a server error occurs.
+ throw new ServerException(_('Error setting user. You are probably not authorized.'));
}
common_real_login(true);
+ $this->updateScopedProfile();
if ($this->boolean('rememberme')) {
common_rememberme($user);
@@ -134,32 +93,15 @@ class LoginAction extends Action
if ($url) {
// We don't have to return to it again
common_set_returnto(null);
+ $url = common_inject_session($url);
} else {
$url = common_local_url('all',
- array('nickname' =>
- $nickname));
+ array('nickname' => $this->scoped->nickname));
}
common_redirect($url, 303);
}
- /**
- * Store an error and show the page
- *
- * This used to show the whole page; now, it's just a wrapper
- * that stores the error in an attribute.
- *
- * @param string $error error, if any.
- *
- * @return void
- */
-
- function showForm($error=null)
- {
- $this->error = $error;
- $this->showPage();
- }
-
function showScripts()
{
parent::showScripts();
@@ -171,33 +113,12 @@ class LoginAction extends Action
*
* @return string title of the page
*/
-
function title()
{
+ // TRANS: Page title for login page.
return _('Login');
}
- /**
- * Show page notice
- *
- * Display a notice for how to use the page, or the
- * error if it exists.
- *
- * @return void
- */
-
- function showPageNotice()
- {
- if ($this->error) {
- $this->element('p', 'error', $this->error);
- } else {
- $instr = $this->getInstructions();
- $output = common_markup_to_html($instr);
-
- $this->raw($output);
- }
- }
-
/**
* Core of the display code
*
@@ -205,34 +126,40 @@ class LoginAction extends Action
*
* @return void
*/
-
function showContent()
{
$this->elementStart('form', array('method' => 'post',
- 'id' => 'form_login',
- 'class' => 'form_settings',
- 'action' => common_local_url('login')));
+ 'id' => 'form_login',
+ 'class' => 'form_settings',
+ 'action' => common_local_url('login')));
$this->elementStart('fieldset');
+ // TRANS: Form legend on login page.
$this->element('legend', null, _('Login to site'));
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('nickname', _('Nickname'));
+ // TRANS: Field label on login page.
+ $this->input('nickname', _('Username or email address'));
$this->elementEnd('li');
$this->elementStart('li');
+ // TRANS: Field label on login page.
$this->password('password', _('Password'));
$this->elementEnd('li');
$this->elementStart('li');
+ // TRANS: Checkbox label label on login page.
$this->checkbox('rememberme', _('Remember me'), false,
+ // TRANS: Checkbox title on login page.
_('Automatically login in the future; ' .
- 'not for shared computers!'));
+ 'not for shared computers!'));
$this->elementEnd('li');
$this->elementEnd('ul');
- $this->submit('submit', _('Login'));
+ // TRANS: Button text for log in on login page.
+ $this->submit('submit', _m('BUTTON','Login'));
$this->hidden('token', common_session_token());
$this->elementEnd('fieldset');
$this->elementEnd('form');
$this->elementStart('p');
$this->element('a', array('href' => common_local_url('recoverpassword')),
+ // TRANS: Link text for link to "reset password" on login page.
_('Lost or forgotten password?'));
$this->elementEnd('p');
}
@@ -245,20 +172,27 @@ class LoginAction extends Action
*
* @return void
*/
-
- function getInstructions()
+ protected function getInstructions()
{
if (common_logged_in() && !common_is_real_login() &&
common_get_returnto()) {
// rememberme logins have to reauthenticate before
// changing any profile settings (cookie-stealing protection)
+ // TRANS: Form instructions on login page before being able to change user settings.
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.');
+ // TRANS: Form instructions on login page.
+ $prompt = _('Login with your username and password.');
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+ $prompt .= ' ';
+ // TRANS: Form instructions on login page. This message contains Markdown links in the form [Link text](Link).
+ // TRANS: %%action.register%% is a link to the registration page.
+ $prompt .= _('Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account.');
+ }
+ return $prompt;
}
}
@@ -269,10 +203,17 @@ class LoginAction extends Action
*
* @return void
*/
-
function showLocalNav()
{
$nav = new LoginGroupNav($this);
$nav->show();
}
+
+ function showNoticeForm()
+ {
+ }
+
+ function showProfileBlock()
+ {
+ }
}