Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index 103df7ee5ad59a53b51e69b3a72ee6fa9774c054..8d51a01449ddaea8019b5d864a1bfa3608f10c3f 100644 (file)
--- 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,7 +89,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -95,8 +112,7 @@ class LoginAction extends Action
      *
      * @return void
      */
-
-    function checkLogin($user_id=null)
+    function checkLogin($user_id=null, $token=null)
     {
         // XXX: login throttle
 
@@ -147,7 +163,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showForm($error=null)
     {
         $this->error = $error;
@@ -165,7 +180,6 @@ class LoginAction extends Action
      *
      * @return string title of the page
      */
-
     function title()
     {
         return _('Login');
@@ -179,7 +193,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         if ($this->error) {
@@ -199,7 +212,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $this->elementStart('form', array('method' => 'post',
@@ -238,7 +250,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function getInstructions()
     {
         if (common_logged_in() && !common_is_real_login() &&
@@ -266,7 +277,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new LoginGroupNav($this);