X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogin.php;h=f9fe71ed40503744562639af8676d8fbcf10fae9;hb=06f60b57c10c37fe6114ff09949b187e4cb2c964;hp=7ec9c321391d1ea04994266834948f0871a36ac1;hpb=cd4b23aa399a51744787e580f8dfdb3886bfc8f5;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index 7ec9c32139..f9fe71ed40 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -20,88 +20,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Login
- * @package   StatusNet
+ * @package   GNUsocial
  * @author    Evan Prodromou <evan@status.net>
  * @author    Sarven Capadisli <csarven@status.net>
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
  * @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 <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @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;
-    }
-
-    /**
-     * 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;
-    }
+    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()) {
-            // TRANS: Client error displayed when trying to log in while already logged in.
-            $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();
     }
 
     /**
@@ -113,7 +61,7 @@ class LoginAction extends Action
      *
      * @return void
      */
-    function checkLogin($user_id=null, $token=null)
+    protected function doPost()
     {
         // XXX: login throttle
 
@@ -122,20 +70,19 @@ class LoginAction extends Action
 
         $user = common_check_user($nickname, $password);
 
-        if (!$user) {
+        if (!$user instanceof User) {
             // TRANS: Form validation error displayed when trying to log in with incorrect credentials.
-            $this->showForm(_('Incorrect username or password.'));
-            return;
+            throw new ServerException(_('Incorrect username or password.'));
         }
 
         // success!
         if (!common_set_user($user)) {
             // TRANS: Server error displayed when during login a server error occurs.
-            $this->serverError(_('Error setting user. You are probably not authorized.'));
-            return;
+            throw new ServerException(_('Error setting user. You are probably not authorized.'));
         }
 
         common_real_login(true);
+        $this->updateScopedProfile(); 
 
         if ($this->boolean('rememberme')) {
             common_rememberme($user);
@@ -146,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);
+            $url = common_inject_session($url);
         } else {
             $url = common_local_url('all',
-                                    array('nickname' =>
-                                          $user->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();
@@ -189,26 +119,6 @@ class LoginAction extends Action
         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
      *
@@ -228,7 +138,7 @@ class LoginAction extends Action
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         // TRANS: Field label on login page.
-        $this->input('nickname', _('Nickname'));
+        $this->input('nickname', _('Username or email address'));
         $this->elementEnd('li');
         $this->elementStart('li');
         // TRANS: Field label on login page.
@@ -244,6 +154,7 @@ class LoginAction extends Action
         $this->elementEnd('ul');
         // 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');
@@ -261,7 +172,7 @@ class LoginAction extends Action
      *
      * @return void
      */
-    function getInstructions()
+    protected function getInstructions()
     {
         if (common_logged_in() && !common_is_real_login() &&
             common_get_returnto()) {