File savesettings.php-better-error-handling.patch of Package pihole-admin-lte

Overview Repositories Revisions Requests Users Attributes Meta

File savesettings.php-better-error-handling.patch of Package pihole-admin-lte (Revision dfd1956c62cda5aebf6b5a73f7a0e94d)

Currently displaying revision dfd1956c62cda5aebf6b5a73f7a0e94d , Show latest

Index: AdminLTE-5.1.1/scripts/pi-hole/php/savesettings.php
===================================================================
--- AdminLTE-5.1.1.orig/scripts/pi-hole/php/savesettings.php
+++ AdminLTE-5.1.1/scripts/pi-hole/php/savesettings.php
@@ -27,7 +27,7 @@ function validCIDRIP($address){
 		$v6elem = "[0-9A-Fa-f]{1,4}";
 		// CIDR for IPv6 is any multiple of 4 from 4 up to 128 bit
 		$v6cidr = "(4";
-		for ($i=8; $i <= 128; $i+=4) { 
+		for ($i=8; $i <= 128; $i+=4) {
 			$v6cidr .= "|$i";
 		}
 		$v6cidr .= ")";
@@ -106,7 +106,7 @@ function readStaticLeasesFile($origin_fi
 	if(!file_exists($origin_file) || !is_readable($origin_file))
 		return false;
 
-	$dhcpstatic = @fopen($origin_file, 'r');
+	$dhcpstatic = fopen($origin_file, 'r');
 	if(!is_resource($dhcpstatic))
 		return false;
 
@@ -163,7 +163,7 @@ function readDNSserversList()
 {
 	// Reset list
 	$list = [];
-	$handle = @fopen("/etc/pihole/dns-servers.conf", "r");
+	$handle = fopen("/etc/pihole/dns-servers.conf", "r");
 	if ($handle)
 	{
 		while (($line = fgets($handle)) !== false)
@@ -184,7 +184,7 @@ function readDNSserversList()
 			if (!empty($line[4]) && validIP($line[4])) {
 				$values["v6_2"] = $line[4];
 			}
-            $list[$name] = $values;
+			$list[$name] = $values;
 		}
 		fclose($handle);
 	}
@@ -273,7 +273,7 @@ function addStaticDHCPLease($mac, $ip, $
 				{
 					foreach(["v4_1", "v4_2", "v6_1", "v6_2"] as $type)
 					{
-						if(@array_key_exists("DNSserver".str_replace(".","_",$value[$type]),$_POST))
+						if(isset($value[$type]) && array_key_exists("DNSserver".str_replace(".","_",$value[$type]),$_POST))
 						{
 							array_push($DNSservers,$value[$type]);
 						}

Places

File savesettings.php-better-error-handling.patch of Package pihole-admin-lte (Revision dfd1956c62cda5aebf6b5a73f7a0e94d)

Places