1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00

Add check to avoid error in PHP 8

and return some information about the unexpected value

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
This commit is contained in:
RD WebDesign 2022-03-21 18:47:42 -03:00
parent 479b2bc075
commit 0d4c69cc6f

View File

@ -170,7 +170,15 @@ function queryAds($serverName) {
$serverName $serverName
); );
$queryAds = file($queryAdsURL, FILE_IGNORE_NEW_LINES); $queryAds = file($queryAdsURL, FILE_IGNORE_NEW_LINES);
$queryAds = array_values(array_filter(preg_replace("/data:\s+/", "", $queryAds)));
// $queryAds must be an array (to avoid PHP 8.0+ error)
if (is_array($queryAds)) {
$queryAds = array_values(array_filter(preg_replace("/data:\s+/", "", $queryAds)));
} else {
// if not an array, return an error message
return array("0" => "error", "1" => "Not an array:<br>(".gettype($queryAds).")<br>".print_r($queryAds, true));
}
$queryTime = sprintf("%.0f", (microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"]) - $preQueryTime); $queryTime = sprintf("%.0f", (microtime(true)-$_SERVER["REQUEST_TIME_FLOAT"]) - $preQueryTime);
// Exception Handling // Exception Handling