From 837d183022759ac5f6786edc32f482685b1d78f3 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Wed, 22 Aug 2012 07:10:53 -0400 Subject: [PATCH] Fix: web content and some other data of vhost subdomain did not get deleted on subdomain deletion --- server/plugins-available/nginx_plugin.inc.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index cf8c98c..6bfd62c 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1310,9 +1310,12 @@ $app->system->unlink($vhost_file); $app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG); - if($data['old']['type'] == 'vhost') { + if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain') { $docroot = escapeshellcmd($data['old']['document_root']); - if($docroot != '' && !stristr($docroot,'..')) exec('rm -rf '.$docroot); + if($docroot != '' && !stristr($docroot,'..')) { + if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot); + elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder; + } //remove the php fastgi starter script if available if ($data['old']['php'] == 'fast-cgi') { -- Gitblit v1.9.1