From e46963dd7fa9f6ed973e49ebef6047e6056ed4e5 Mon Sep 17 00:00:00 2001
From: Fraenkiman <frank.pcn@gmail.com>
Date: Fri, 2 Feb 2024 23:33:39 +0100
Subject: [PATCH] File and directory rights

- Sets the file and directory permissions from the FP main directory when executing the setup
- See #307
---
 defaults.php   | 10 +++++++---
 setup/main.php | 40 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/defaults.php b/defaults.php
index 5ef0ce3..68d3422 100755
--- a/defaults.php
+++ b/defaults.php
@@ -18,10 +18,11 @@
 define('DUMB_MODE_ENABLED', false);
 
 // default file permissions
-// change file to 776 and dir to 776 if your webserver "complains"
+// https://binary-butterfly.de/artikel/dateirechte-wie-stelle-ich-das-bei-meinem-hoster-ein/
+// change file to 666 and dir to 777 if your webserver "complains"
 // Note: Lowering the directory and file permissions may result in FlatPress or some additional plugins not working correctly.
-define('FILE_PERMISSIONS', 0776);
-define('DIR_PERMISSIONS', 0776);
+define('FILE_PERMISSIONS', 0666);
+define('DIR_PERMISSIONS', 0777);
 
 // first some webserver setup...
 
@@ -34,6 +35,9 @@ define('SESSION_PATH', '');
 define('ABS_PATH', dirname(__FILE__) . '/');
 // here was blog root in earlier versions. This has been moved to config_load()
 
+// Is required so that the file and directory permissions can be set when executing the setup
+define('BASE_DIR', dirname(__FILE__));
+
 // here are default config files
 define('FP_DEFAULTS', 'fp-defaults/');
 
diff --git a/setup/main.php b/setup/main.php
index e27a67d..639d900 100644
--- a/setup/main.php
+++ b/setup/main.php
@@ -1,37 +1,37 @@
 <?php
-error_reporting($_SERVER ["SERVER_NAME"] == "localhost" ? E_ALL : 0);
+@error_reporting($_SERVER ["SERVER_NAME"] == "localhost" ? E_ALL : 0);
 
 // Changing file/directory permissions recursively
-$start_dir = FP_CONTENT; // Starting directory
+$start_dir = BASE_DIR; // Starting directory
 $perms ['file'] = FILE_PERMISSIONS; // chmod value for files
 $perms ['folder'] = DIR_PERMISSIONS; // chmod value for folders
 
-function chmod_file_folder($dir) {
+function chmod_r($dir) {
 	global $perms;
 
-	$dh = @opendir($dir);
+	$dp = @opendir($dir);
+	while($file = readdir($dp)) {
+		if (($file == ".") || ($file == ".."))
+		continue;
 
-	if ($dh) {
+		$fullPath = $dir . '/' . $file;
 
-		while (false !== ($file = readdir($dh))) {
-
-			if ($file != "." && $file != "..") {
-
-				$fullpath = $dir . '/' . $file;
-				if (!is_dir($fullpath)) {
-
-					chmod($fullpath, $perms ['file']);
-				} else {
-					chmod($fullpath, $perms ['folder']);
-					chmod_file_folder($fullpath);
-				}
-			}
+		if(is_dir($fullPath)) {
+			// echo('DIR:' . $fullPath . "\n");
+			@chmod($fullPath, $perms ['folder']);
+			chmod_r($fullPath, $perms ['folder'], $perms ['file']);
+		} else {
+			// echo('FILE:' . $fullPath . "\n");
+			@chmod($fullPath, $perms ['file']);
 		}
-		closedir($dh);
 	}
+	closedir($dp);
 }
 
-$language = @$_POST ['language'] ?$_POST ['language'] : $browserLang;
+chmod_r($start_dir, $perms ['folder'], $perms ['file']);
+  
+// Sets the local language based on the browser
+$language = @$_POST ['language'] ? $_POST ['language'] : $browserLang;
 
 $lf = "lang.$language.php";
 if (!preg_match('|^lang\.[a-z]{2}-[a-z]{2}\.php$|', $lf))