echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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`
This commit is contained in:
Michael Telgkamp 2020-09-11 12:08:10 +02:00
parent a7709cbbd1
commit e1b719620c
No known key found for this signature in database
GPG Key ID: D56A6B18219D5263
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/psm/Util/Server/Updater/StatusUpdater.php
View File

@ -331,23 +331,20 @@ class StatusUpdater
list ($key, $value) = explode(': ', $line); list ($key, $value) = explode(': ', $line);
// Header found (case-insensitive) // Header found (case-insensitive)
if (strcasecmp($key, $this->server['header_name']) == 0) { if (strcasecmp($key, $this->server['header_name']) == 0) {
// The value doesn't match what we needed // The value matches what we need, everything is fine
if (!preg_match("/{$this->server['header_value']}/i", $value)) { if (preg_match("/{$this->server['header_value']}/i", $value)) {
$result = false;
} else {
$header_flag = true; $header_flag = true;
break; // No need to go further break; // The correct header is found, we leave the loop
} }
} }
} }
} }
if (!$header_flag) { if (!$header_flag) {
// Header was not present // Header was not present, set error message and $result variable
$result = false; $this->error = 'HEADER ERROR : Header "' . $this->server['header_name'] .
$this->error =
'HEADER ERROR : Header "' . $this->server['header_name'] .
'" not found or does not match "/' . $this->server['header_value'] . '/i".'; '" not found or does not match "/' . $this->server['header_value'] . '/i".';
$result = false;
} }
} }
} }