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.
---
 .../serversetup-bwlp-ipxe/inc/bootentryhook.inc.php         |  4 ++--
 .../serversetup-bwlp-ipxe/inc/pxelinux.inc.php              |  2 +-
 modules-available/serversetup-bwlp-ipxe/page.inc.php        | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'modules-available/serversetup-bwlp-ipxe')

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
index 73611b0a..060b3903 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/bootentryhook.inc.php
@@ -94,8 +94,8 @@ abstract class BootEntryHook
 	public function renderExtraFields()
 	{
 		$list = $this->extraFields();
-		foreach ($list as &$entry) {
-			$entry->currentValue = isset($this->data[$entry->name]) ? $this->data[$entry->name] : $entry->default;
+		foreach ($list as $entry) {
+			$entry->currentValue = $this->data[$entry->name] ?? $entry->default;
 			$entry->hook = $this;
 		}
 		return $list;
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php
index 13c9a86c..cc4f9756 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/pxelinux.inc.php
@@ -76,7 +76,7 @@ class PxeLinux
 				}
 				$section->helpText = $text;
 			} elseif (self::handleKeyword($key, $val, $sectionPropMap, $section)) {
-				continue;
+				//continue;
 			}
 		}
 		if ($section !== null) {
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 4e104e78..8d4a366f 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -615,7 +615,7 @@ class Page_ServerSetup extends Page
 			$error = $status['error'] ?? 'Unknown error';
 		}
 		Render::addTemplate('ipaddress', array(
-			'ips' => $this->addrListTask['data']['addresses'],
+			'ips' => $this->addrListTask['data']['addresses'] ?? [],
 			'chooseHintClass' => $this->hasIpSet ? '' : 'alert alert-danger',
 			'disabled' => ($this->getCompileTask() === false) ? '' : 'disabled',
 			'versions' => $versions,
@@ -626,13 +626,13 @@ class Page_ServerSetup extends Page
 
 	// -----------------------------------------------------------------------------------------------
 
-	private function getLocalAddresses()
+	private function getLocalAddresses(): void
 	{
 		$this->addrListTask = Taskmanager::submit('LocalAddressesList', array());
 
 		if ($this->addrListTask === false) {
 			$this->addrListTask['data']['addresses'] = false;
-			return false;
+			return;
 		}
 
 		if (!Taskmanager::isFinished($this->addrListTask)) { // TODO: Async if just displaying
@@ -641,12 +641,12 @@ class Page_ServerSetup extends Page
 
 		if (Taskmanager::isFailed($this->addrListTask) || !isset($this->addrListTask['data']['addresses'])) {
 			$this->addrListTask['data']['addresses'] = false;
-			return false;
+			return;
 		}
 
 		$sortIp = array();
 		foreach (array_keys($this->addrListTask['data']['addresses']) as $key) {
-			$item = & $this->addrListTask['data']['addresses'][$key];
+			$item =& $this->addrListTask['data']['addresses'][$key];
 			if (!isset($item['ip']) || !preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $item['ip']) || substr($item['ip'], 0, 4) === '127.') {
 				unset($this->addrListTask['data']['addresses'][$key]);
 				continue;
@@ -659,7 +659,6 @@ class Page_ServerSetup extends Page
 		}
 		unset($item);
 		array_multisort($sortIp, SORT_STRING, $this->addrListTask['data']['addresses']);
-		return true;
 	}
 
 	private function deleteBootEntry()
@@ -836,7 +835,7 @@ class Page_ServerSetup extends Page
 	{
 		$newAddress = Request::post('ip', 'none', 'string');
 		$valid = false;
-		foreach ($this->addrListTask['data']['addresses'] as $item) {
+		foreach ($this->addrListTask['data']['addresses'] ?? [] as $item) {
 			if ($item['ip'] !== $newAddress)
 				continue;
 			$valid = true;
-- 
cgit v1.2.3-55-g7522