From cd55ead3e2810e209b726faca12fa749f6875d0f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 16 Dec 2017 18:33:16 +0100
Subject: Fix A LOT of type problems, logic flaws, uninitialized variables etc.

Most of them were found by phpstorm, so I put in some time and
went through the list, fixing quite a bunch of them.
---
 modules-available/baseconfig/inc/baseconfigutil.inc.php | 12 +++++++++---
 modules-available/baseconfig/inc/validator.inc.php      |  2 +-
 modules-available/baseconfig/page.inc.php               |  5 ++++-
 modules-available/baseconfig/templates/_page.html       |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'modules-available/baseconfig')

diff --git a/modules-available/baseconfig/inc/baseconfigutil.inc.php b/modules-available/baseconfig/inc/baseconfigutil.inc.php
index 3039ea12..a48eb93b 100644
--- a/modules-available/baseconfig/inc/baseconfigutil.inc.php
+++ b/modules-available/baseconfig/inc/baseconfigutil.inc.php
@@ -37,12 +37,18 @@ class BaseConfigUtil
 		return $settings;
 	}
 
+	/**
+	 * Get configuration categories for given module, or all modules if false is passed.
+	 *
+	 * @param \Module $module
+	 * @return array
+	 */
 	public static function getCategories($module = false)
 	{
 		$categories = array();
 		if ($module === false) {
 			$module = '*';
-		} else {
+		} elseif (is_object($module)) {
 			$module = $module->getIdentifier();
 		}
 		foreach (glob("modules/{$module}/baseconfig/categories.json", GLOB_NOSORT) as $file) {
@@ -61,8 +67,8 @@ class BaseConfigUtil
 	/**
 	 * Mark variables that would be shadowed according to the given values.
 	 *
-	 * @param $vars list of vars as obtained from BaseConfigUtil::getVariables()
-	 * @param $values key-value-pairs of variable assignments to work with
+	 * @param array $vars list of vars as obtained from BaseConfigUtil::getVariables()
+	 * @param array $values key-value-pairs of variable assignments to work with
 	 */
 	public static function markShadowedVars(&$vars, $values) {
 		foreach ($vars as $key => &$var) {
diff --git a/modules-available/baseconfig/inc/validator.inc.php b/modules-available/baseconfig/inc/validator.inc.php
index d65b592c..2dfeed7c 100644
--- a/modules-available/baseconfig/inc/validator.inc.php
+++ b/modules-available/baseconfig/inc/validator.inc.php
@@ -99,7 +99,7 @@ class Validator
 		return $displayValue;
 	}
 
-	private static function validateMultiInput(&$list, &$displayValue)
+	private static function validateMultiInput($list, &$displayValue)
 	{
 		return $displayValue;
 	}
diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php
index 366a1238..426d3fdd 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -30,11 +30,14 @@ class Page_BaseConfig extends Page
 				$qry_values = ', :enabled';
 				$qry_update = ', enabled = :enabled';
 				$params = array();
+				$delExtra = '';
 			} elseif (empty($this->qry_extra['field'])) {
 				// Module specific, but module doesn't have an extra field
 				$qry_insert = '';
 				$qry_values = '';
 				$qry_update = '';
+				$params = array();
+				$delExtra = '';
 			} else {
 				// Module with extra field
 				$qry_insert = ', ' . $this->qry_extra['field'];
@@ -290,7 +293,7 @@ class Page_BaseConfig extends Page
 	
 	/**
 	 * Create html snippet for setting, based on given validator
-	 * @param type $validator
+	 * @param string $validator
 	 * @return boolean
 	 */
 	private function makeInput($validator, $setting, $current, $shadows)
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html
index f2dfd17b..89caf9f2 100644
--- a/modules-available/baseconfig/templates/_page.html
+++ b/modules-available/baseconfig/templates/_page.html
@@ -127,7 +127,7 @@ document.addEventListener("DOMContentLoaded", function () {
 	});
 
 	/* data-shadowing bindings */
-	$allShadowingFields = $('[data-shadows]');
+	var $allShadowingFields = $('[data-shadows]');
 	$allShadowingFields.on('change', function (event) { updateShadows(event.target); });
 	$allShadowingFields.each(function (idx, elem) { updateShadows(elem); });
 });
-- 
cgit v1.2.3-55-g7522