X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=fca5995a9ab2eed2828e0b2d221139160d252aee;hb=5519da95fdadf61828b2ed5d8a89f59ed79fdff0;hp=f6d0163105f42675a8667c55411ce4a8c96626e7;hpb=c5047fd90ac8f6f057780a34065e320883c7a31f;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index f6d0163105..fca5995a9a 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -42,13 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @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
 {
     /**
      * Has there been an error?
      */
-
     var $error = null;
 
     /**
@@ -56,12 +54,32 @@ class LoginAction extends Action
      *
      * @return boolean false
      */
-
     function isReadOnly($args)
     {
         return false;
     }
 
+    /**
+     * Prepare page to run
+     *
+     *
+     * @param $args
+     * @return string title
+     */
+    function prepare($args)
+    {
+        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;
+    }
+
     /**
      * Handle input, produce output
      *
@@ -71,10 +89,10 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
+
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -94,20 +112,28 @@ class LoginAction extends Action
      *
      * @return void
      */
-
-    function checkLogin()
+    function checkLogin($user_id=null, $token=null)
     {
         // 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);
+	    }
+
             $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);
@@ -119,7 +145,7 @@ class LoginAction extends Action
 
         // success!
         if (!common_set_user($user)) {
-            $this->serverError(_('Error setting user.'));
+            $this->serverError(_('Error setting user. You are probably not authorized.'));
             return;
         }
 
@@ -134,10 +160,11 @@ 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));
+                                          $user->nickname));
         }
 
         common_redirect($url, 303);
@@ -153,7 +180,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showForm($error=null)
     {
         $this->error = $error;
@@ -171,7 +197,6 @@ class LoginAction extends Action
      *
      * @return string title of the page
      */
-
     function title()
     {
         return _('Login');
@@ -185,7 +210,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         if ($this->error) {
@@ -205,13 +229,12 @@ 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');
         $this->element('legend', null, _('Login to site'));
         $this->elementStart('ul', 'form_data');
@@ -224,7 +247,7 @@ class LoginAction extends Action
         $this->elementStart('li');
         $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
-                           'not for shared computers!'));
+                          'not for shared computers!'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Login'));
@@ -245,7 +268,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function getInstructions()
     {
         if (common_logged_in() && !common_is_real_login() &&
@@ -256,9 +278,13 @@ class LoginAction extends Action
                      '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.');
+            $prompt = _('Login with your username and password.');
+            if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+                $prompt .= ' ';
+                $prompt .= _('Don\'t have a username yet? ' .
+                             '[Register](%%action.register%%) a new account.');
+            }
+            return $prompt;
         }
     }
 
@@ -269,7 +295,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new LoginGroupNav($this);