From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 6e718b8..04a4249 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -54,7 +54,7 @@
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
$global_config = $app->getconf->get_global_config('sites');
- $backup_dir = $server_config['backup_dir'];
+ $backup_dir = trim($server_config['backup_dir']);
$backup_dir_permissions =0750;
$backup_mode = $server_config['backup_mode'];
@@ -198,13 +198,18 @@
/* 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 */
@@ -214,6 +219,19 @@
}
}
+
+ // remove non-existing backups from database
+ $backups = $app->db->queryAllRecords("SELECT * FROM mail_backup WHERE server_id = ?", $conf['server_id']);
+ if(is_array($backups) && !empty($backups)){
+ foreach($backups as $backup){
+ $mail_backup_dir = $backup_dir.'/mail'.$backup['parent_domain_id'];
+ if(!is_file($mail_backup_dir.'/'.$backup['filename'])){
+ $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
+ $app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
+ }
+ }
+ }
if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
//* end run_backups
}
--
Gitblit v1.9.1