Merge pull request #1326 from pi-hole/tweak/notAnError

Remove an error log output that was presumably leftover from debugging
pi-hole · May 25, 2020 · 3bfef7b · 3bfef7b
2 parents 61a3ec1 + e3cd70d
commit 3bfef7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scripts/pi-hole/php/FTL.php b/scripts/pi-hole/php/FTL.php
@@ -36,16 +36,21 @@ function connectFTL($address, $port=4711)
 	{
 		$config = piholeFTLConfig();
 		// Read port
-		$portfile = file_get_contents($config["PORTFILE"]);
-		if(is_numeric($portfile))
-			$port = intval($portfile);
+		$portfileName = isset($config['PORTFILE']) ? $config['PORTFILE'] : '';
+		if ($portfileName != '')
+		{
+			$portfileContents = file_get_contents($portfileName);
+			if(is_numeric($portfileContents))
+				$port = intval($portfileContents);
+		}
 	}
 
 	// Open Internet socket connection
 	$socket = @fsockopen($address, $port, $errno, $errstr, 1.0);
 
 	return $socket;
 }
+
 function sendRequestFTL($requestin)
 {
 	global $socket;

diff --git a/scripts/pi-hole/php/theme.php b/scripts/pi-hole/php/theme.php
@@ -42,7 +42,6 @@
 $checkbox_theme_name = $available_themes[$webtheme][3];
 $checkbox_theme_variant = $available_themes[$webtheme][4];
 
-error_log(print_r($available_themes,true));
 function theme_selection() {
     global $available_themes, $webtheme;
     foreach ($available_themes as $key => $value) {