Merge branch 'error_log_vhost_name' into 'stable-3.1'

Till Brehm · Till Brehm · commit af014c11eedf · 2020-08-07T10:29:28.000+02:00
log subdomain name in error

See merge request ispconfig/ispconfig3!1090
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -613,7 +613,7 @@ function update($event_name, $data) {
 			unset($tmp);
 
 			if($app->system->is_blacklisted_web_path($web_folder)) {
-				$app->log('Vhost is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);
+				$app->log('Vhost ' . $subdomain_host . ' is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);
 				return 0;
 			}
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -455,7 +455,7 @@ function update($event_name, $data) {
 			unset($tmp);
 
 			if($app->system->is_blacklisted_web_path($web_folder)) {
-				$app->log('Vhost is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);
+				$app->log('Vhost ' . $subdomain_host . ' is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);
 				return 0;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ function update($event_name, $data) {`
`613`	`613`	`unset($tmp);`
`614`	`614`
`615`	`615`	`if($app->system->is_blacklisted_web_path($web_folder)) {`
`616`		`- $app->log('Vhost is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);`
	`616`	`+ $app->log('Vhost ' . $subdomain_host . ' is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);`
`617`	`617`	`return 0;`
`618`	`618`	`}`
`619`	`619`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ function update($event_name, $data) {`
`455`	`455`	`unset($tmp);`
`456`	`456`
`457`	`457`	`if($app->system->is_blacklisted_web_path($web_folder)) {`
`458`		`- $app->log('Vhost is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);`
	`458`	`+ $app->log('Vhost ' . $subdomain_host . ' is using a blacklisted web folder: ' . $web_folder, LOGLEVEL_ERROR);`
`459`	`459`	`return 0;`
`460`	`460`	`}`
`461`	`461`