From b476ca7d0e21900d0c8b9c740e4740ba0aa452e8 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <lucas.bartholemy@humhub.com>
Date: Tue, 19 Apr 2016 15:09:52 +0200
Subject: [PATCH] Fixed: Login page redirect for guests

---
 .../components/ContentContainerController.php | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/protected/humhub/modules/content/components/ContentContainerController.php b/protected/humhub/modules/content/components/ContentContainerController.php
index db30c62974..eb3844e626 100644
--- a/protected/humhub/modules/content/components/ContentContainerController.php
+++ b/protected/humhub/modules/content/components/ContentContainerController.php
@@ -55,11 +55,6 @@ class ContentContainerController extends Controller
      */
     public function init()
     {
-        // Directly redirect guests to login page - if guest access isn't enabled
-        if (Yii::$app->user->isGuest && \humhub\models\Setting::Get('allowGuestAccess', 'authentication_internal') != 1) {
-            return Yii::$app->user->loginRequired();
-        }
-
         $spaceGuid = Yii::$app->request->get('sguid', '');
         $userGuid = Yii::$app->request->get('uguid', '');
 
@@ -107,10 +102,29 @@ class ContentContainerController extends Controller
             throw new HttpException(405, Yii::t('base', 'Module is not on this content container enabled!'));
         }
 
-
         return parent::init();
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function beforeAction($action)
+    {
+
+        if (parent::beforeAction($action)) {
+
+            // Directly redirect guests to login page - if guest access isn't enabled
+            if (Yii::$app->user->isGuest && \humhub\models\Setting::Get('allowGuestAccess', 'authentication_internal') != 1) {
+                Yii::$app->user->loginRequired();
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Checks if current user can access current ContentContainer by using
      * underlying behavior ProfileControllerBehavior/SpaceControllerBehavior.