From 2bc9e1279176d05a78349dc0e6bff83ba4719fae Mon Sep 17 00:00:00 2001
From: root <root@angantyr.pwhost.de>
Date: Sat, 21 Nov 2015 15:32:25 +0100
Subject: [PATCH] fixed error in mail_backup -> all mail-backups would have
been deleted with old code because of * in filename
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 5 ++---
1 file changed, 2 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 68795551e9..04a4249f50 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -224,9 +224,8 @@ class cronjob_backup_mail extends cronjob {
$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'.$rec['domain_id'];
- $mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';
- if(!is_file($mail_backup_dir.'/'.$mail_backup_file)){
+ $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);
--
GitLab