From 4887d4e94acb35f3ef9ccb292be6561bbf2582b7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 8 Mar 2014 20:05:47 +0100
Subject: [PATCH] Fixed: FS#3188 - .ftpquota file remains
---
server/plugins-available/ftpuser_base_plugin.inc.php | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/server/plugins-available/ftpuser_base_plugin.inc.php b/server/plugins-available/ftpuser_base_plugin.inc.php
index af33e93b75..d46936100d 100644
--- a/server/plugins-available/ftpuser_base_plugin.inc.php
+++ b/server/plugins-available/ftpuser_base_plugin.inc.php
@@ -112,13 +112,24 @@ class ftpuser_base_plugin {
exec('mkdir -p '.escapeshellcmd($data['new']['dir']));
exec('chown '.escapeshellcmd($web["system_user"]).':'.escapeshellcmd($web['system_group']).' '.$data['new']['dir']);
$app->system->web_folder_protection($web['document_root'], true);
+
+
$app->log("Added ftpuser_dir: ".$data['new']['dir'], LOGLEVEL_DEBUG);
}
+
+ // When the directory has changed, delete the old .ftpquota file
+ if($data['old']['dir'] != '' && $data['old']['dir'] != $data['new']['dir']) {
+ if(is_file($data['old']['dir'].'/.ftpquota')) unlink($data['old']['dir'].'/.ftpquota');
+ }
+
}
function delete($event_name, $data) {
global $app, $conf;
+
+ // Delete the .ftpquota file
+ if(is_file($data['old']['dir'].'/.ftpquota')) unlink($data['old']['dir'].'/.ftpquota');
$app->log("Ftpuser:".$data['new']['username']." deleted.", LOGLEVEL_DEBUG);
--
GitLab