From 926b0a2128262974946e40329186ac1863b79231 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 31 Jan 2013 09:05:35 -0500
Subject: [PATCH] - Bugfix: when you delete a client with a web site, website symlinks have to be deleted from the client directory before the client directory is deleted (because otherwise the client directory cannot be deleted).
---
server/plugins-available/apache2_plugin.inc.php | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 6ed7181..091007b 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -2666,6 +2666,12 @@
$client_dir = $web_config['website_basedir'].'/clients/client'.$client_id;
if(is_dir($client_dir) && !stristr($client_dir,'..')) {
+ // remove symlinks from $client_dir
+ $files = array_diff(scandir($client_dir), array('.','..'));
+ foreach($files as $file){
+ if(is_link($client_dir.'/'.$file)) unlink($client_dir.'/'.$file);
+ }
+
@rmdir($client_dir);
$app->log('Removed client directory: '.$client_dir,LOGLEVEL_DEBUG);
}
--
Gitblit v1.9.1