X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=16016f29ec3a82d6d3811d4113f11f15dfcc3b96;hb=d816af9aa9ac1e41f0aa4f580ab36bdf043cc3b5;hp=d3e4312f71152f86e42047250f1361c95c8fd6df;hpb=819d33210d298de74b64dc7ead79e9d9b223b12e;p=quix0rs-gnu-social.git
diff --git a/actions/login.php b/actions/login.php
index d3e4312f71..16016f29ec 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -20,47 +20,21 @@
* 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;
/**
* Prepare page to run
@@ -69,19 +43,15 @@ class LoginAction extends Action
* @param $args
* @return string title
*/
-
- function prepare($args)
+ protected function prepare(array $args=array())
{
- parent::prepare($args);
-
// @todo this check should really be in index.php for all sensitive actions
$ssl = common_config('site', 'ssl');
if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
common_redirect(common_local_url('login'));
- // exit
}
- return true;
+ return parent::prepare($args);
}
/**
@@ -89,23 +59,15 @@ class LoginAction extends Action
*
* 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();
}
/**
@@ -117,45 +79,30 @@ class LoginAction extends Action
*
* @return void
*/
-
- function checkLogin($user_id=null, $token=null)
+ protected function handlePost()
{
- // XXX: login throttle
-
- // CSRF protection - token set in NoticeForm
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $st = common_session_token();
- if (empty($token)) {
- common_log(LOG_WARNING, 'No token provided by client.');
- } else if (empty($st)) {
- common_log(LOG_WARNING, 'No session token stored.');
- } else {
- common_log(LOG_WARNING, 'Token = ' . $token . ' and session token = ' . $st);
- }
+ parent::handlePost();
- $this->clientError(_('There was a problem with your session token. '.
- 'Try again, please.'));
- return;
- }
+ // XXX: login throttle
$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. You are probably not authorized.'));
- 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);
@@ -166,11 +113,10 @@ class LoginAction extends Action
if ($url) {
// We don't have to return to it again
common_set_returnto(null);
- $url = common_inject_session($url);
+ $url = common_inject_session($url);
} else {
$url = common_local_url('all',
- array('nickname' =>
- $user->nickname));
+ array('nickname' => $this->scoped->nickname));
}
common_redirect($url, 303);
@@ -186,11 +132,10 @@ class LoginAction extends Action
*
* @return void
*/
-
- function showForm($error=null)
+ public function showForm($msg=null, $success=false)
{
- $this->error = $error;
- $this->showPage();
+ common_ensure_session();
+ return parent::showForm($msg, $success);
}
function showScripts()
@@ -204,33 +149,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
*
@@ -238,7 +162,6 @@ class LoginAction extends Action
*
* @return void
*/
-
function showContent()
{
$this->elementStart('form', array('method' => 'post',
@@ -246,26 +169,33 @@ class LoginAction extends Action
'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!'));
$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');
}
@@ -278,20 +208,23 @@ class LoginAction extends Action
*
* @return void
*/
-
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 {
+ // 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.');
}
@@ -306,10 +239,17 @@ class LoginAction extends Action
*
* @return void
*/
-
function showLocalNav()
{
$nav = new LoginGroupNav($this);
$nav->show();
}
+
+ function showNoticeForm()
+ {
+ }
+
+ function showProfileBlock()
+ {
+ }
}