Skip to content

Commit f2f7901

Browse files
author
Florian Schaal
committed
backup only active domains
1 parent a812388 commit f2f7901

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

‎server/lib/classes/cron.d/500-backup.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function onRunJob() {
7272
chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
7373
}
7474

75-
$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain')";
75+
$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'";
7676
$records = $app->db->queryAllRecords($sql);
7777
if(is_array($records)) {
7878
foreach($records as $rec) {

‎server/lib/classes/cron.d/500-backup_mail.inc.php‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public function onRunJob() {
5656
$backup_dir_permissions =0750;
5757

5858
if($backup_dir != '') {
59-
/*
6059
//* mount backup directory, if necessary
6160
$run_backups = true;
6261
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
@@ -67,7 +66,6 @@ public function onRunJob() {
6766
if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
6867
}
6968
}
70-
*/
7169

7270
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
7371

@@ -77,18 +75,13 @@ public function onRunJob() {
7775
chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
7876
}
7977

80-
$sql = "SELECT * FROM mail_user WHERE server_id = '".$conf['server_id']."' AND maildir <> ''";
78+
$sql="SELECT * FROM mail_user JOIN mail_domain ON (mail_domain.active='y' AND mail_user.email like concat('%',mail_domain.domain)) WHERE mail_user.server_id=".$conf['server_id']." AND maildir <> '' ORDER BY mail_domain.domain_id";
8179
$records = $app->db->queryAllRecords($sql);
82-
/*
8380
if(is_array($records) && $run_backups) {
84-
*/
85-
if(is_array($records)) {
8681
foreach($records as $rec) {
8782
//* Do the mailbox backup
8883
if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
89-
$sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
90-
$domain_rec=$app->db->queryOneRecord($sql);
91-
$mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
84+
$mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];
9285

9386
if(!is_dir($mail_backup_dir)) mkdir($mail_backup_dir, 0750);
9487
chmod($mail_backup_dir, $backup_dir_permissions);
@@ -113,7 +106,7 @@ public function onRunJob() {
113106
chgrp($mail_backup_dir.'/'.$mail_backup_file, 'root');
114107
chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);
115108
/* Insert mail backup record in database */
116-
$sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$domain_rec['domain_id'].",".$rec['mailuser_id'].",'".$backup_mode."',".time().",'".$app->db->quote($mail_backup_file)."','".$app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file))."')";
109+
$sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$rec['domain_id'].",".$rec['mailuser_id'].",'".$backup_mode."',".time().",'".$app->db->quote($mail_backup_file)."','".$app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file))."')";
117110
$app->db->query($sql);
118111
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
119112
} else {
@@ -135,7 +128,7 @@ public function onRunJob() {
135128
for ($n = $backup_copies; $n <= 10; $n++) {
136129
if(isset($files[$n]) && is_file($mail_backup_dir.'/'.$files[$n])) {
137130
unlink($mail_backup_dir.'/'.$files[$n]);
138-
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
131+
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
139132
$app->db->query($sql);
140133
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
141134
}
@@ -145,14 +138,12 @@ public function onRunJob() {
145138
}
146139
/* Remove inactive backups */
147140
if($rec['backup_interval'] == 'none') {
148-
$sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
149-
$domain_rec=$app->db->queryOneRecord($sql);
150141
/* remove backups from db */
151-
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
142+
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
152143
$app->db->query($sql);
153144
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
154145
/* remove archives */
155-
$mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
146+
$mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];
156147
$mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';
157148
if(is_dir($mail_backup_dir)) {
158149
foreach (glob($mail_backup_dir.'/'.$mail_backup_file) as $filename) {

0 commit comments

Comments
 (0)