From c408f8b9c66b94cb19b9a3b454904c32e809f334 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Jul 2014 12:18:50 +0200 Subject: [PATCH] [ticket/324] Do not load module if column is disabled --- controller/helper.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/controller/helper.php b/controller/helper.php index 3a843c2b..d34dcc8d 100644 --- a/controller/helper.php +++ b/controller/helper.php @@ -139,6 +139,12 @@ class helper return false; } + // Check if module shouldn't be loaded + if ($this->check_column_disabled($row)) + { + return false; + } + /** * Check for permissions before loading anything * the default group of a user always defines his/her permission @@ -146,6 +152,18 @@ class helper return ($this->check_group_access($row)) ? $module : false; } + /** + * Check if column is disabled + * + * @param array $row Module database row + * + * @return bool False if column is not disabled, true if it is + */ + protected function check_column_disabled($row) + { + return ($this->config['board3_left_column'] === false && column_num_string($row['module_column']) === 'left') || ($this->config['board3_right_column'] === false && column_num_string($row['module_column']) === 'right'); + } + /** * Check if user is in required groups *