Merge branch '6827-fix-issue-with-been-added-to-web-folder-in-nginx-plugin-when-web-folder-is-empty' into 'develop'

Resolve "Fix issue with / been added to web folder in Nginx plugin when web folder is empty"

Closes #6827

See merge request ispconfig/ispconfig3!1984

Author: Till Brehm

server/plugins-available/nginx_plugin.inc.php

@@ -388,14 +388,14 @@ function update($event_name, $data) {
 			if($data['new']['web_folder'] != ''){
 				if(substr($data['new']['web_folder'],0,1) == '/') $data['new']['web_folder'] = substr($data['new']['web_folder'],1);
 				if(substr($data['new']['web_folder'],-1) == '/') $data['new']['web_folder'] = substr($data['new']['web_folder'],0,-1);
+				$web_folder .= '/'.$data['new']['web_folder'];
 			}
-			$web_folder .= '/'.$data['new']['web_folder'];
 
 			if($data['old']['web_folder'] != ''){
 				if(substr($data['old']['web_folder'],0,1) == '/') $data['old']['web_folder'] = substr($data['old']['web_folder'],1);
 				if(substr($data['old']['web_folder'],-1) == '/') $data['old']['web_folder'] = substr($data['old']['web_folder'],0,-1);
+				$old_web_folder .= '/'.$data['old']['web_folder'];
 			}
-			$old_web_folder .= '/'.$data['old']['web_folder'];
 		}
 		if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
 			// new one
@@ -882,7 +882,7 @@ function update($event_name, $data) {
 				//$app->system->chmod($data['new']['document_root'].'/webdav',0710);
 				$app->system->chmod($data['new']['document_root'].'/private', 0710);
 				$app->system->chmod($data['new']['document_root'].'/ssl', 0755);
-				if($web_folder != 'web') $app->system->chmod($data['new']['document_root'].'/'.$web_folder, 0751);
+				if($web_folder != 'web') $app->system->chmod($data['new']['document_root'].'/'.$web_folder, $web_folder_permission);
 
 				// make tmp directory writable for nginx and the website users
 				$app->system->chmod($data['new']['document_root'].'/tmp', 0770);