From c2d95ffaeaa289752b4c7b6664b6ca112a02e350 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 2 Nov 2023 19:08:58 +0100
Subject: Roundup of issues reported by PHPStorm

Mostly redundant checks, logic errors, dead code, etc.
---
 modules-available/baseconfig/inc/validator.inc.php | 7 ++++---
 modules-available/baseconfig/page.inc.php          | 9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules-available/baseconfig')

diff --git a/modules-available/baseconfig/inc/validator.inc.php b/modules-available/baseconfig/inc/validator.inc.php
index 7bbccc6d..ee883895 100644
--- a/modules-available/baseconfig/inc/validator.inc.php
+++ b/modules-available/baseconfig/inc/validator.inc.php
@@ -77,18 +77,19 @@ class Validator
 
 	/**
 	 * Validate value against list.
+	 *
 	 * @param string $list The list as a string of items, separated by "|"
 	 * @param string $displayValue The value to validate
 	 * @return boolean|string The value, if in list, false otherwise
 	 */
-	private static function validateList($list, &$displayValue)
+	private static function validateList(string $list, string $displayValue)
 	{
 		$list = explode('|', $list);
 		if (in_array($displayValue, $list))
 			return $displayValue;
 		return false;
 	}
-	private static function validateMultiList($list, &$displayValue)
+	private static function validateMultiList(string $list, string &$displayValue): string
 	{
 		$allowedValues = explode('|', $list);
 		$values = [];
@@ -101,7 +102,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 a1921084..8a9a7534 100644
--- a/modules-available/baseconfig/page.inc.php
+++ b/modules-available/baseconfig/page.inc.php
@@ -120,12 +120,11 @@ class Page_BaseConfig extends Page
 		User::assertPermission('view', $lid);
 		$editForbidden = !User::hasPermission('edit', $lid);
 		// Get stuff that's set in DB already
+		$fields = '';
 		if ($this->targetModule !== false && isset($this->qry_extra['field'])) {
-			$fields = '';
 			$where = " WHERE {$this->qry_extra['field']} = :field_value";
 			$params = array('field_value' => $this->qry_extra['field_value']);
 		} else {
-			$fields = '';
 			$where = '';
 			$params = array();
 		}
@@ -136,7 +135,7 @@ class Page_BaseConfig extends Page
 		// Remember missing variables
 		$missing = $varsFromJson;
 		// Populate structure with existing config from db
-		$this->fillSettings($varsFromJson, $settings, $missing, $this->qry_extra['table'], $fields, $where, $params, false);
+		$this->fillSettings($varsFromJson, $settings, $missing, $this->qry_extra['table'], $fields, $where, $params);
 		// Add entries that weren't in the db (global), setup override checkbox (module specific)
 		foreach ($varsFromJson as $key => $var) {
 			if ($this->targetModule !== false && !isset($settings[$var['catid']]['settings'][$key])) {
@@ -195,7 +194,7 @@ class Page_BaseConfig extends Page
 		) + $this->qry_extra);
 	}
 
-	private function fillSettings($vars, &$settings, &$missing, $table, $fields, $where, $params, $sourceName)
+	private function fillSettings($vars, &$settings, &$missing, $table, $fields, $where, $params): void
 	{
 		$res = Database::simpleQuery("SELECT setting, value, displayvalue $fields FROM $table "
 			. " {$where} ORDER BY setting ASC", $params);
@@ -203,7 +202,7 @@ class Page_BaseConfig extends Page
 			if (!isset($missing[$row['setting']]))
 				continue;
 			if (!isset($vars[$row['setting']]) || !is_array($vars[$row['setting']])) {
-				$unknown[] = $row['setting'];
+				//$unknown[] = $row['setting'];
 				continue;
 			}
 			unset($missing[$row['setting']]);
-- 
cgit v1.2.3-55-g7522