1 files changed, 24 insertions, 34 deletions

diff --git a/modules-available/sysconfig/addmodule.inc.php b/modules-available/sysconfig/addmodule.inc.php
index 91fee45d..4564537e 100644
--- a/modules-available/sysconfig/addmodule.inc.php
+++ b/modules-available/sysconfig/addmodule.inc.php
@@ -9,34 +9,39 @@ abstract class AddModule_Base
 
 	/**
 	 * Holds the instance for the currently executing step
-	 * @var \AddModule_Base
+	 *
+	 * @var AddModule_Base
 	 */
 	private static $instance = false;
 	
 	/**
 	 * Instance of ConfigModule we're editing. False if not editing but creating.
-	 * @var \ConfigModule
+	 *
+	 * @var ?ConfigModule
 	 */
-	protected $edit = false;
+	protected $edit = null;
 
 	/**
 	 * 
 	 * @param string $step name of class representing the current step
 	 * @param int $editId (optional) overwrite for the request parameter 'edit'
 	 */
-	public static function setStep($step, $editId = false)
+	public static function setStep(string $step, int $editId = null): void
 	{
 		if (empty($step) || !class_exists($step) || get_parent_class($step) !== 'AddModule_Base') {
 			Message::addError('invalid-action', $step);
 			Util::redirect('?do=SysConfig');
 		}
 		self::$instance = new $step();
-		if ($editId = $editId ? $editId : Request::any('edit')) {
+		if ($editId === null) {
+			$editId = Request::any('edit', 0, 'int');
+		}
+		if ($editId !== 0) {
 			self::$instance->edit = ConfigModule::get($editId);
-			if (self::$instance->edit === false)
-				Util::traceError('Invalid module id for editing');
+			if (self::$instance->edit === null)
+				ErrorHandler::traceError('Invalid module id for editing');
 			if ($step !== 'AddModule_Assign' && !preg_match('/^' . self::$instance->edit->moduleType() . '_/', $step))
-				Util::traceError('Module to edit is of different type!');
+				ErrorHandler::traceError('Module to edit is of different type!');
 			Util::addRedirectParam('edit', self::$instance->edit->id());
 		}
 	}
@@ -90,7 +95,7 @@ abstract class AddModule_Base
 	public static function preprocess()
 	{
 		if (self::$instance === false) {
-			Util::traceError('No step instance yet');
+			ErrorHandler::traceError('No step instance yet');
 		}
 		self::$instance->preprocessInternal();
 	}
@@ -98,9 +103,9 @@ abstract class AddModule_Base
 	public static function render()
 	{
 		if (self::$instance === false) {
-			Util::traceError('No step instance yet');
+			ErrorHandler::traceError('No step instance yet');
 		}
-		if (get_class(self::$instance) !== 'AddModule_Assign' && self::$instance->edit !== false) {
+		if (get_class(self::$instance) !== 'AddModule_Assign' && self::$instance->edit !== null) {
 			Message::addInfo('replacing-module', self::$instance->edit->title());
 		}
 		self::$instance->renderInternal();
@@ -109,7 +114,7 @@ abstract class AddModule_Base
 	public static function ajax()
 	{
 		if (self::$instance === false) {
-			Util::traceError('No step instance yet');
+			ErrorHandler::traceError('No step instance yet');
 		}
 		self::$instance->ajaxInternal();
 	}
@@ -155,7 +160,7 @@ class AddModule_Assign extends AddModule_Base
 
 			if (ConfigModule::getList()[$moduleType]['unique']) {
 				$moduleIds = [];
-				foreach (ConfigModule::getAll($moduleType) as $module) {
+				foreach (ConfigModule::getAll($moduleType) ?? [] as $module) {
 					$moduleIds[] = $module->id();
 				}
 
@@ -209,41 +214,26 @@ class AddModule_Assign extends AddModule_Base
  * Helper functions to set/get a batch of vars from/to post variables or a module
  */
 
-/**
- * 
- * @param \ConfigModule $module
- * @param array $array
- * @param array $keys
- */
-function moduleToArray($module, &$array, $keys)
+function moduleToArray(ConfigModule $module, array &$array, array $keys): void
 {
 	foreach ($keys as $key) {
 		$array[$key] = $module->getData($key);
 	}
 }
 
-/**
- * 
- * @param \ConfigModule $module
- * @param array $array
- * @param array $keys
- */
-function arrayToModule($module, $array, $keys)
+function arrayToModule(ConfigModule $module, array $array, array $keys): void
 {
 	foreach ($keys as $key) {
 		$module->setData($key, $array[$key]);
 	}
 }
-/**
- * 
- * @param array $array
- * @param array $keys
- */
-function postToArray(&$array, $keys, $ignoreMissing = false)
+
+function postToArray(array &$array, array $keys, $ignoreMissing = false): void
 {
 	foreach ($keys as $key) {
 		$val = Request::post($key, '--not-in-post');
-		if ($ignoreMissing && $val === '--not-in-post') continue;
+		if ($ignoreMissing && $val === '--not-in-post')
+			continue;
 		$array[$key] = $val;
 	}
 }