From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Sun, 24 Jul 2016 05:30:59 -0400 Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders --- server/lib/classes/cron.d/500-backup_mail.inc.php | 58 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 17 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 89cb167..2eacaed 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']; @@ -66,7 +66,6 @@ if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $run_backups = false; $records = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE server_id = ? AND maildir != ''", intval($conf['server_id'])); - if(is_array($records) && $run_backups) { if(!is_dir($backup_dir)) { mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true); @@ -76,12 +75,13 @@ foreach($records as $rec) { //* Do the mailbox backup + $email = $rec['email']; + $temp = explode("@",$email); + $domain = $temp[1]; + unset($temp); + $domain_rec=$app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = ?", $domain); + if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) { - $email = $rec['email']; - $temp = explode("@",$email); - $domain = $temp[1]; - unset($temp);; - $domain_rec=$app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = ?", $domain); $backupusername = 'root'; $backupgroup = 'root'; @@ -176,7 +176,7 @@ $dir_handle = dir($mail_backup_dir); $files = array(); while (false !== ($entry = $dir_handle->read())) { - if($entry != '.' && $entry != '..' && substr($entry,0,4+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'] && is_file($mail_backup_dir.'/'.$entry)) { + if($entry != '.' && $entry != '..' && substr($entry,0,5+strlen($rec['mailuser_id'])) == 'mail'.$rec['mailuser_id'].'_' && is_file($mail_backup_dir.'/'.$entry)) { $files[] = $entry; } } @@ -194,23 +194,47 @@ unset($dir_handle); } /* Remove inactive backups */ - if($rec['backup_interval'] == 'none') { + if($rec['backup_interval'] == 'none' || $rec['backup_interval'] == '') { + + /* remove archives */ + $mail_backup_dir = realpath($backup_dir.'/mail'.$domain_rec['domain_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)) { + 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 = ?"; $app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']); - /* remove archives */ - $mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id']; - $mail_backup_file = 'mail'.$rec['mailuser_id'].'_*'; - if(is_dir($mail_backup_dir)) { - foreach (glob($mail_backup_dir.'/'.$mail_backup_file) as $filename) { - unlink($filename); - } + + } + } + + // 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 + //* end run_backups + } } parent::onRunJob(); -- Gitblit v1.9.1