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/statistics/inc/statisticsfilter.inc.php | 10 +---------
 modules-available/statistics/inc/statisticshooks.inc.php  |  2 +-
 modules-available/statistics/pages/replace.inc.php        |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'modules-available/statistics')

diff --git a/modules-available/statistics/inc/statisticsfilter.inc.php b/modules-available/statistics/inc/statisticsfilter.inc.php
index 7b00fb12..cfc724c1 100644
--- a/modules-available/statistics/inc/statisticsfilter.inc.php
+++ b/modules-available/statistics/inc/statisticsfilter.inc.php
@@ -629,15 +629,7 @@ class IpStatisticsFilter extends StatisticsFilter
 			}
 			return 'INET_ATON(clientip) BETWEEN ' . $range['start'] . ' AND ' . $range['end'];
 		} elseif (($num = substr_count($argument, ':')) !== 0 && $num <= 7) {
-			// IPv6, not yet in DB but let's prepare
-			if ($num > 7 || strpos($argument, '::') !== false) { // Too many :, or invalid compressed format
-				Message::addError('invalid-ip-address', $argument);
-				return '0';
-			} elseif ($num <= 7 && substr($argument, -1) === ':') {
-				$argument .= '*';
-			} elseif ($num < 7) {
-				$argument .= ':*';
-			}
+			// TODO: Probably valid IPv6, not yet in DB
 		} elseif (($num = substr_count($argument, '.')) !== 0 && $num <= 3) {
 			if (substr($argument, -1) === '.') {
 				$argument .= '*';
diff --git a/modules-available/statistics/inc/statisticshooks.inc.php b/modules-available/statistics/inc/statisticshooks.inc.php
index 746bdabf..de20d599 100644
--- a/modules-available/statistics/inc/statisticshooks.inc.php
+++ b/modules-available/statistics/inc/statisticshooks.inc.php
@@ -18,7 +18,7 @@ class StatisticsHooks
 		self::getRow($machineuuid);
 		if (self::$row === false)
 			return false;
-		return self::$row['hostname'] ? self::$row['hostname'] : self::$row['clientip'];
+		return self::$row['hostname'] ?: self::$row['clientip'];
 	}
 
 	public static function baseconfigLocationResolver($machineuuid)
diff --git a/modules-available/statistics/pages/replace.inc.php b/modules-available/statistics/pages/replace.inc.php
index 29e02292..50bfd6cf 100644
--- a/modules-available/statistics/pages/replace.inc.php
+++ b/modules-available/statistics/pages/replace.inc.php
@@ -18,7 +18,7 @@ class SubPage
 	private static function handleReplace()
 	{
 		$replace = Request::post('replace', false, 'array');
-		if ($replace === false || empty($replace)) {
+		if (empty($replace)) {
 			Message::addError('main.parameter-empty', 'replace');
 			return;
 		}
-- 
cgit v1.2.3-55-g7522