Merge branch '6858-incorrect-root-directive-after-snippet-application-in-ispconfig-3-3-beta-1' into 'develop'

Till Brehm · Till Brehm · commit 9537d7bb7364 · 2025-04-21T17:51:08.000Z
Resolve "Incorrect root directive after snippet application in ISPConfig 3.3 Beta 1"

Closes #6858

See merge request ispconfig/ispconfig3!2010
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -3170,7 +3170,7 @@ private function nginx_merge_locations($vhost_conf) {
                 $app->log('Token ##subroot is unsecure (server ID: '.$conf['server_id'].').', LOGLEVEL_WARN);
             } else {
                 $insert_pos = strpos($vhost_conf, ';', strpos($vhost_conf, 'root '));
-                $vhost_conf = substr_replace($vhost_conf, ltrim($subroot[1], '/'), $insert_pos, 0);
+                $vhost_conf = substr_replace($vhost_conf, '/'.ltrim($subroot[1], '/'), $insert_pos, 0);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3170,7 +3170,7 @@ private function nginx_merge_locations($vhost_conf) {`
`3170`	`3170`	`$app->log('Token ##subroot is unsecure (server ID: '.$conf['server_id'].').', LOGLEVEL_WARN);`
`3171`	`3171`	`} else {`
`3172`	`3172`	`$insert_pos = strpos($vhost_conf, ';', strpos($vhost_conf, 'root '));`
`3173`		`- $vhost_conf = substr_replace($vhost_conf, ltrim($subroot[1], '/'), $insert_pos, 0);`
	`3173`	`+ $vhost_conf = substr_replace($vhost_conf, '/'.ltrim($subroot[1], '/'), $insert_pos, 0);`
`3174`	`3174`	`}`
`3175`	`3175`	`}`
`3176`	`3176`