From 3c5737224eeb4fa409b0eac9845993283ddffdef Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 20 Sep 2020 09:42:13 +0100 Subject: [PATCH] Check for empty strings --- includes/adblock.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/includes/adblock.php b/includes/adblock.php index ead21f0f..74f94e51 100755 --- a/includes/adblock.php +++ b/includes/adblock.php @@ -24,19 +24,21 @@ function DisplayAdBlockConfig() if ($_POST['adblock-custom-enable'] == "1") { // validate custom hosts input $lines = preg_split('/\r\n|\n|\r/', trim($_POST['adblock-custom-hosts'])); - foreach ($lines as $line) { - $ip_host = preg_split('/\s+/', $line); - $index++; - if (!filter_var($ip_host[0], FILTER_VALIDATE_IP)) { - $errors .= _('Invalid custom IP address found on line '.$index); - break; - } - if (!validate_host($ip_host[1])) { - $errors .= _('Invalid custom host found on line '.$index); - break; + if (!in_array("", $lines, true)) { + foreach ($lines as $line) { + $ip_host = preg_split('/\s+/', $line); + $index++; + if (!filter_var($ip_host[0], FILTER_VALIDATE_IP)) { + $errors .= _('Invalid custom IP address found on line '.$index); + break; + } + if (!validate_host($ip_host[1])) { + $errors .= _('Invalid custom host found on line '.$index); + break; + } } } - file_put_contents("/tmp/dnsmasq_custom", $_POST['adblock-custom-hosts']); + file_put_contents("/tmp/dnsmasq_custom", $_POST['adblock-custom-hosts'].PHP_EOL); system("sudo cp /tmp/dnsmasq_custom " .RASPI_ADBLOCK_LISTPATH .'custom.txt', $return); $config.= 'addn-hosts=' .RASPI_ADBLOCK_LISTPATH .'custom.txt'.PHP_EOL; $custom_enabled = true;