From fe9b73c387c396036a272daa39a809ed02980563 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 17 Nov 2015 08:27:31 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
index 0289350..1b73a99 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -198,14 +198,19 @@
/* remove archives */
$mail_backup_dir = realpath($backup_dir.'/mail'.$domain_rec['domain_id']);
- $mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';
+ $mail_backup_file = 'mail'.$rec['mailuser_id'].'_';
if(is_dir($mail_backup_dir)) {
$dir_handle = opendir($mail_backup_dir.'/');
while ($file = readdir($dir_handle)) {
if(!is_dir($file)) {
- unlink ("$mail_backup_dir/"."$file");
+ if(substr($file,0,strlen($mail_backup_file)) == $mail_backup_file) {
+ unlink ($mail_backup_dir.'/'.$file);
+ }
}
}
+ if(count(glob($mail_backup_dir."/*", GLOB_NOSORT)) === 0) {
+ rmdir($mail_backup_dir);
+ }
}
/* remove backups from db */
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
--
Gitblit v1.9.1