Merge branch '4992-vapps-vhost-can-not-be-disabled' into 'develop'

Marius Burkard · Marius Burkard · commit 2e0f2d257cb5 · 2021-02-27T09:11:26.000Z
Resolve "VApps VHost can not be disabled"

Closes #4992

See merge request ispconfig/ispconfig3!1420
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -251,7 +251,7 @@ function update($event_name, $data) {
 			file_put_contents("$vhost_conf_dir/apps.vhost", $content);
 
 			// enabled / disable apps-vhost
-			$vhost_symlink = $web_config['vhost_conf_enabled_dir'].'/000-apps.vhost';
+			$vhost_symlink = $vhost_conf_enabled_dir . '/000-apps.vhost';
 			if(is_link($vhost_symlink) && $web_config['apps_vhost_enabled'] == 'n') {
 				$app->system->unlink($vhost_symlink);
 			}

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ function update($event_name, $data) {`
`251`	`251`	`file_put_contents("$vhost_conf_dir/apps.vhost", $content);`
`252`	`252`
`253`	`253`	`// enabled / disable apps-vhost`
`254`		`- $vhost_symlink = $web_config['vhost_conf_enabled_dir'].'/000-apps.vhost';`
	`254`	`+ $vhost_symlink = $vhost_conf_enabled_dir . '/000-apps.vhost';`
`255`	`255`	`if(is_link($vhost_symlink) && $web_config['apps_vhost_enabled'] == 'n') {`
`256`	`256`	`$app->system->unlink($vhost_symlink);`
`257`	`257`	`}`