Marius Burkard
2015-12-08 10e9f75e0948d9dd72a4431c67292a05d582483c
Merge branch 'master' into 'master'

fixed error in mail_backup -> all mail-backups would have been deleted with old …

…code because of * in filename

See merge request !247
1 files modified
5 ■■■■■ changed files
server/lib/classes/cron.d/500-backup_mail.inc.php 5 ●●●●● patch | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -224,9 +224,8 @@
                $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);