Skip to content

Commit 20e0153

Browse files
author
Marius Cramer
committed
Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
2 parents ddb461f + 2e5b1af commit 20e0153

File tree

9 files changed

+26
-19
lines changed

9 files changed

+26
-19
lines changed

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ backup_dir=/var/backup
1919
backup_dir_is_mount=n
2020
backup_dir_mount_cmd=
2121
backup_mode=rootgz
22+
backup_delete=y
2223
monit_url=
2324
monit_user=
2425
monit_password=

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@
195195
'width' => '40',
196196
'maxlength' => '255'
197197
),
198+
'backup_delete' => array(
199+
'datatype' => 'VARCHAR',
200+
'formtype' => 'CHECKBOX',
201+
'default' => 'y',
202+
'value' => array(0 => 'n', 1 => 'y')
203+
),
198204
'monit_url' => array(
199205
'datatype' => 'VARCHAR',
200206
'formtype' => 'TEXT',

‎interface/web/admin/lib/lang/de_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,4 @@ $wb['munin_url_error_regex'] = 'Ungültige Munin-URL';
193193
$wb['munin_url_note_txt'] = 'Platzhalter:';
194194
$wb['backup_dir_is_mount_txt'] = 'Backupverzeichnis ist ein eigener Mount?';
195195
$wb['backup_dir_mount_cmd_txt'] = 'Mount-Befehl, falls Backupverzeichnis nicht gemountet';
196+
?>

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,5 @@ $wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
196196
$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
197197
$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
198198
$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
199+
$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
199200
?>

‎interface/web/admin/templates/server_config_server_edit.htm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
7373
<select name="backup_mode" id="backup_mode" class="selectInput">
7474
{tmpl_var name='backup_mode'}
7575
</select>
76+
</div>
77+
<div class="ctrlHolder">
78+
<p class="label">{tmpl_var name='backup_delete_txt'}</p>
79+
<div class="multiField">
80+
{tmpl_var name='backup_delete'}
81+
</div>
7682
</div>
7783
<div class="ctrlHolder">
7884
<label for="monit_url">{tmpl_var name='monit_url_txt'}</label>

‎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) {

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1991,7 +1991,7 @@ function delete($event_name, $data) {
19911991
//* mount backup directory, if necessary
19921992
$mount_backup = true;
19931993
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
1994-
if($server_config['backup_dir'] != '') {
1994+
if($server_config['backup_dir'] != '' && $server_config['backup_delete'] == 'y') {
19951995
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
19961996
if(!$app->system->is_mounted($backup_dir)){
19971997
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));

‎server/plugins-available/mail_plugin.inc.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,13 +326,14 @@ function user_delete($event_name, $data) {
326326
} else {
327327
$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'], LOGLEVEL_ERROR);
328328
}
329+
329330
//* Delete the mail-backups
330331
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
331332
$backup_dir = $server_config['backup_dir'];
332333
//* mount backup directory, if necessary
333334
$mount_backup = true;
334335
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
335-
if($server_config['backup_dir'] != '' && $maildir_path_deleted) {
336+
if($server_config['backup_dir'] != '' && $maildir_path_deleted && $server_config['backup_delete'] == 'y') {
336337
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
337338
if(!$app->system->is_mounted($backup_dir)){
338339
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
@@ -391,7 +392,7 @@ function domain_delete($event_name, $data) {
391392
//* mount backup directory, if necessary
392393
$mount_backup = true;
393394
$server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
394-
if($server_config['backup_dir'] != '' && $maildomain_path_deleted) {
395+
if($server_config['backup_dir'] != '' && $maildomain_path_deleted && $server_config['backup_delete'] == 'y'){
395396
if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
396397
if(!$app->system->is_mounted($backup_dir)){
397398
exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));

0 commit comments

Comments
 (0)