From fcb34088bee9e797590265a26d2bc7a7e508d340 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Mon, 25 Sep 2017 22:07:15 +0200
Subject: [PATCH] Optional landing page via config setting

---
 config/default/default.settings.php | 3 +++
 modules/user/user.pages.inc         | 6 +++++-
 themes/zuitedesk/css/pages.css      | 3 ---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/default/default.settings.php b/config/default/default.settings.php
index 1c57fed..6941518 100644
--- a/config/default/default.settings.php
+++ b/config/default/default.settings.php
@@ -57,6 +57,9 @@ $conf = array(
   'file_dirpublic_path' => 'files/default',
   'file_directory_temp' => '/tmp',
 
+// View the landing page instead of user login page:
+# 'landing_page' => 1,
+
 // Social links:
 # 'social_website'  => 'http://www.example.com',
 # 'social_rss'      => 'http://www.example.com/feed',
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 6a2ec94..8022ad6 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -370,11 +370,15 @@ function user_edit_submit($form, &$form_state) {
  * users.
  */
 function user_page() {
-  global $user;
+  global $user, $conf;
+
   if ($user->uid) {
     menu_set_active_item('user/'. $user->uid);
     return menu_execute_active_handler();
   }
+  elseif (drupal_is_front_page() && !$conf['landing_page']) {
+    drupal_goto('user/login');
+  }
   else {
     return drupal_get_form('user_login');
   }
diff --git a/themes/zuitedesk/css/pages.css b/themes/zuitedesk/css/pages.css
index 0733755..29aa6a9 100644
--- a/themes/zuitedesk/css/pages.css
+++ b/themes/zuitedesk/css/pages.css
@@ -91,9 +91,6 @@ body.not-logged-in[class*="page-user"] #main-wrapper,
 body.not-logged-in[class*="page-user"] #main-content div.tabs {
   background: transparent;
 }
-body.not-logged-in[class*="page-user"] #page-wrapper {
-  height: 100%;
-}
 body.not-logged-in[class*="page-user"] #page-title {
   display: none;
 }