From b0f818efec0b74741d6fa53d0e86a95065d4e2d1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:36 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 e16cce1..04a4249 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'];
@@ -65,8 +65,7 @@
//* mount backup directory, if necessary
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']));
-
+ $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,25 +75,26 @@
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';
if ($global_config['backups_include_into_web_quota'] == 'y') {
// this only works, if mail and webdomains are on the same server
// find webdomain fitting to maildomain
- $sql = "SELECT * FROM web_domain WHERE domain = '".$domain_rec['domain']."'";
- $webdomain = $app->db->queryOneRecord($sql);
+ $sql = "SELECT * FROM web_domain WHERE domain = ?";
+ $webdomain = $app->db->queryOneRecord($sql, $domain_rec['domain']);
// if this is not also the website, find website now
if ($webdomain && ($webdomain['parent_domain_id'] != 0)) {
do {
- $sql = "SELECT * FROM web_domain WHERE domain_id = ".$webdomain['parent_domain_id'];
- $webdomain = $app->db->queryOneRecord($sql);
+ $sql = "SELECT * FROM web_domain WHERE domain_id = ?";
+ $webdomain = $app->db->queryOneRecord($sql, $webdomain['parent_domain_id']);
} while ($webdomain && ($webdomain['parent_domain_id'] != 0));
}
// if webdomain is found, change username/group now
@@ -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