From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 108 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 71 insertions(+), 37 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 81e39ed..6e718b8 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -31,6 +31,7 @@
// job schedule
protected $_schedule = '0 0 * * *';
+ private $tmp_backup_dir = '';
/* this function is optional if it contains no custom code */
public function onPrepare() {
@@ -64,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);
@@ -75,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
@@ -111,23 +112,46 @@
$mail_backup_file = 'mail'.$rec['mailuser_id'].'_'.date('Y-m-d_H-i');
- $domain_dir=explode('/',$rec['maildir']);
- $_temp=array_pop($domain_dir);unset($_temp);
- $domain_dir=implode('/',$domain_dir);
-
- $parts=explode('/',$rec['maildir']);
- $source_dir=array_pop($parts);
- unset($parts);
-
- //* create archives
- if($backup_mode == 'userzip') {
- $mail_backup_file.='.zip';
- exec('cd '.$domain_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r '.$source_dir.' > /dev/null', $tmp_output, $retval);
- } else {
- /* Create a tar.gz backup */
- $mail_backup_file.='.tar.gz';
- exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$domain_dir.' '.$source_dir), $tmp_output, $retval);
+ // in case of mdbox -> create backup with doveadm before zipping
+ if ($rec['maildir_format'] == 'mdbox') {
+ if (empty($this->tmp_backup_dir)) $this->tmp_backup_dir = $rec['maildir'];
+ // Create temporary backup-mailbox
+ exec("su -c 'dsync backup -u \"".$rec["email"]."\" mdbox:".$this->tmp_backup_dir."/backup'", $tmp_output, $retval);
+
+ if($backup_mode == 'userzip') {
+ $mail_backup_file.='.zip';
+ exec('cd '.$this->tmp_backup_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r backup > /dev/null && rm -rf backup', $tmp_output, $retval);
+ }
+ else {
+ $mail_backup_file.='.tar.gz';
+ exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$this->tmp_backup_dir.' backup && rm -rf '.$this->tmp_backup_dir.'/backup'), $tmp_output, $retval);
+ }
+
+ if ($retval != 0) {
+ // Cleanup
+ if (file_exists($this->tmp_backup_dir.'/backup')) exec('rm -rf '.$this->tmp_backup_dir.'/backup');
+ }
}
+ else {
+ $domain_dir=explode('/',$rec['maildir']);
+ $_temp=array_pop($domain_dir);unset($_temp);
+ $domain_dir=implode('/',$domain_dir);
+
+ $parts=explode('/',$rec['maildir']);
+ $source_dir=array_pop($parts);
+ unset($parts);
+
+ //* create archives
+ if($backup_mode == 'userzip') {
+ $mail_backup_file.='.zip';
+ exec('cd '.$domain_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r '.$source_dir.' > /dev/null', $tmp_output, $retval);
+ } else {
+ /* Create a tar.gz backup */
+ $mail_backup_file.='.tar.gz';
+ exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$domain_dir.' '.$source_dir), $tmp_output, $retval);
+ }
+ }
+
if($retval == 0){
chown($mail_backup_dir.'/'.$mail_backup_file, $backupusername);
chgrp($mail_backup_dir.'/'.$mail_backup_file, $backupgroup);
@@ -141,6 +165,10 @@
} else {
/* Backup failed - remove archive */
if(is_file($mail_backup_dir.'/'.$mail_backup_file)) unlink($mail_backup_dir.'/'.$mail_backup_file);
+ // And remove backup-mdbox
+ if ($rec['maildir_format'] == 'mdbox') {
+ if(file_exists($rec['maildir'].'/backup')) exec("su -c 'rm -rf ".$rec['maildir']."/backup'");
+ }
$app->log($mail_backup_file.' NOK:'.implode('',$tmp_output), LOGLEVEL_DEBUG);
}
/* Remove old backups */
@@ -166,23 +194,29 @@
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)) {
+ unlink ("$mail_backup_dir/"."$file");
+ }
+ }
+ }
/* 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);
- }
- }
+
}
}
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