From 38ad62d4b7bde45eff2ca6475a67768c6613dae0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 4 Sep 2021 17:32:43 +0200
Subject: [PATCH] [ticket/701] Some more clean up

B3P-701
---
 acp/portal_module.php               |  8 ++++----
 portal/modules/database_handler.php | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/acp/portal_module.php b/acp/portal_module.php
index f101761f..93afc893 100644
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -142,8 +142,8 @@ class portal_module
 							'MODULE_IMAGE_WIDTH'	=> $module_data['module_image_width'],
 							'MODULE_IMAGE_HEIGHT'	=> $module_data['module_image_height'],
 							'MODULE_IMAGE_SRC'		=> ($module_data['module_image_src']) ? $this->root_path . 'styles/all/theme/images/portal/' . $module_data['module_image_src'] : '',
-							'MODULE_FA'             => $module_data['module_fa_icon'],
-							'MODULE_FA_SIZE'        => $module_data['module_fa_size'],
+							'MODULE_FA'				=> $module_data['module_fa_icon'],
+							'MODULE_FA_SIZE'		=> $module_data['module_fa_size'],
 							'MODULE_ENABLED'		=> ($module_data['module_status']) ? true : false,
 							'MODULE_SHOW_IMAGE'		=> (in_array($this->portal_columns->number_to_string($module_data['module_column']), array('center', 'top', 'bottom'))) ? false : true,
 						));
@@ -277,8 +277,8 @@ class portal_module
 						'module_image_src'		=> $this->request->variable('module_image', ''),
 						'module_image_width'	=> $this->request->variable('module_img_width', 0),
 						'module_image_height'	=> $this->request->variable('module_img_height', 0),
-						'module_fa_icon'        => $this->request->variable('module_fa', ''),
-						'module_fa_size'        => $this->request->variable('module_fa_size', 16),
+						'module_fa_icon'		=> $this->request->variable('module_fa', ''),
+						'module_fa_size'		=> $this->request->variable('module_fa_size', 16),
 						'module_group_ids'		=> $module_permission,
 						'module_status'			=> $this->request->variable('module_status', self::B3_MODULE_ENABLED),
 					);
diff --git a/portal/modules/database_handler.php b/portal/modules/database_handler.php
index 5b1f2478..43ef6af8 100644
--- a/portal/modules/database_handler.php
+++ b/portal/modules/database_handler.php
@@ -28,6 +28,9 @@ class database_handler
 	/** @var int Board3 module enabled */
 	const B3_MODULE_ENABLED = 1;
 
+	/** @var int Default icon size in px */
+	const DEFAULT_ICON_SIZE = 16;
+
 	/** @var driver_interface */
 	protected $db;
 
@@ -70,14 +73,14 @@ class database_handler
 	public function reset_module($module, $module_id)
 	{
 		$sql_ary = array(
-			'module_name'		=> $module->get_name(),
-			'module_image_src'	=> $module->get_image(),
-			'module_group_ids'	=> '',
-			'module_image_height'	=> 16,
-			'module_image_width'	=> 16,
-			'module_fa_icon'    => '',
-			'module_fa_size'    => 1,
-			'module_status'		=> self::B3_MODULE_ENABLED,
+			'module_name'			=> $module->get_name(),
+			'module_image_src'		=> $module->get_image(),
+			'module_group_ids'		=> '',
+			'module_image_height'	=> self::DEFAULT_ICON_SIZE,
+			'module_image_width'	=> self::DEFAULT_ICON_SIZE,
+			'module_fa_icon'		=> '',
+			'module_fa_size'		=> self::DEFAULT_ICON_SIZE,
+			'module_status'			=> self::B3_MODULE_ENABLED,
 		);
 		$sql = 'UPDATE ' . PORTAL_MODULES_TABLE . '
 					SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '