Since chown and chgrp doesn't work recursively -> use parameters of mkdirpath instead

renky · renky · commit dbae22d215d9 · 2014-02-25T22:28:25.000+01:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -2110,9 +2110,7 @@ function web_folder_user($event_name, $data) {
 
 		//* Create the folder path, if it does not exist
 		if(!is_dir($folder_path)) {
-			$app->system->mkdirpath($folder_path);
-			$app->system->chown($folder_path, $website['system_user']);
-			$app->system->chgrp($folder_path, $website['system_group']);
+			$app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);
 		}
 
 		//* Create empty .htpasswd file, if it does not exist
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -2043,9 +2043,7 @@ function web_folder_user($event_name, $data) {
 
 		//* Create the folder path, if it does not exist
 		if(!is_dir($folder_path)) {
-			$app->system->mkdirpath($folder_path);
-			$app->system->chown($folder_path, $website['system_user']);
-			$app->system->chgrp($folder_path, $website['system_group']);
+			$app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);
 		}
 
 		//* Create empty .htpasswd file, if it does not exist

Original file line number	Diff line number	Diff line change
`@@ -2110,9 +2110,7 @@ function web_folder_user($event_name, $data) {`
`2110`	`2110`
`2111`	`2111`	`//* Create the folder path, if it does not exist`
`2112`	`2112`	`if(!is_dir($folder_path)) {`
`2113`		`- $app->system->mkdirpath($folder_path);`
`2114`		`- $app->system->chown($folder_path, $website['system_user']);`
`2115`		`- $app->system->chgrp($folder_path, $website['system_group']);`
	`2113`	`+ $app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);`
`2116`	`2114`	`}`
`2117`	`2115`
`2118`	`2116`	`//* Create empty .htpasswd file, if it does not exist`
Original file line number	Diff line number	Diff line change
`@@ -2043,9 +2043,7 @@ function web_folder_user($event_name, $data) {`
`2043`	`2043`
`2044`	`2044`	`//* Create the folder path, if it does not exist`
`2045`	`2045`	`if(!is_dir($folder_path)) {`
`2046`		`- $app->system->mkdirpath($folder_path);`
`2047`		`- $app->system->chown($folder_path, $website['system_user']);`
`2048`		`- $app->system->chgrp($folder_path, $website['system_group']);`
	`2046`	`+ $app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);`
`2049`	`2047`	`}`
`2050`	`2048`
`2051`	`2049`	`//* Create empty .htpasswd file, if it does not exist`