From afee192d2a77afa1c11d25156d0a44df94e19aed Mon Sep 17 00:00:00 2001
From: A. Täffner <darkalex@firesplash.de>
Date: Sat, 23 Jan 2016 07:30:37 -0500
Subject: [PATCH] fixed the cronjob and noticed a bug in ISPC but not able to report as FlySpray is offline
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 acc324b..04a4249 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -198,7 +198,7 @@
/* 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)) {
@@ -219,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