From e1b719620c5a86d75dafae86d37c2d06f506dd24 Mon Sep 17 00:00:00 2001 From: Michael Telgkamp Date: Fri, 11 Sep 2020 12:08:10 +0200 Subject: [PATCH] Code cleanup - simplify the check - do not invert the result of `preg_match()` - do not set the `$result` in loop, it is already set after the loop - fix the order of code, first set `$this->error` then `$result` --- src/psm/Util/Server/Updater/StatusUpdater.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/psm/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php index 80f7e094..e299ae98 100644 --- a/src/psm/Util/Server/Updater/StatusUpdater.php +++ b/src/psm/Util/Server/Updater/StatusUpdater.php @@ -331,23 +331,20 @@ class StatusUpdater list ($key, $value) = explode(': ', $line); // Header found (case-insensitive) if (strcasecmp($key, $this->server['header_name']) == 0) { - // The value doesn't match what we needed - if (!preg_match("/{$this->server['header_value']}/i", $value)) { - $result = false; - } else { + // The value matches what we need, everything is fine + if (preg_match("/{$this->server['header_value']}/i", $value)) { $header_flag = true; - break; // No need to go further + break; // The correct header is found, we leave the loop } } } } if (!$header_flag) { - // Header was not present - $result = false; - $this->error = - 'HEADER ERROR : Header "' . $this->server['header_name'] . + // Header was not present, set error message and $result variable + $this->error = 'HEADER ERROR : Header "' . $this->server['header_name'] . '" not found or does not match "/' . $this->server['header_value'] . '/i".'; + $result = false; } } }