Marius Cramer
2015-11-17 fe9b73c387c396036a272daa39a809ed02980563
Merge branch 'master' into 'master'

Master



See merge request !244
1 files modified
9 ■■■■ changed files
server/lib/classes/cron.d/500-backup_mail.inc.php 9 ●●●● patch | view | raw | blame | history
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 = ?";