Skip to content

Commit d2c52bb

Browse files
author
Dominik
committed
fixed confusion about restoring mail/web-backup with same id
1 parent 053a837 commit d2c52bb

File tree

3 files changed

+47
-22
lines changed

3 files changed

+47
-22
lines changed

‎interface/lib/classes/plugin_backuplist_mail.inc.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function onShow() {
5353
if(isset($_GET['backup_action'])) {
5454
$backup_id = $app->functions->intval($_GET['backup_id']);
5555
/*
56-
if($_GET['backup_action'] == 'download' && $backup_id > 0) {
56+
if($_GET['backup_action'] == 'download_mail' && $backup_id > 0) {
5757
$sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_download' AND action_param = '$backup_id'";
5858
$tmp = $app->db->queryOneRecord($sql);
5959
if($tmp['number'] == 0) {
@@ -73,8 +73,8 @@ function onShow() {
7373
}
7474
}
7575
*/
76-
if($_GET['backup_action'] == 'restore' && $backup_id > 0) {
77-
$sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_restore' AND action_param = '$backup_id'";
76+
if($_GET['backup_action'] == 'restore_mail' && $backup_id > 0) {
77+
$sql = "SELECT count(action_id) as number FROM sys_remoteaction WHERE action_state = 'pending' AND action_type = 'backup_restore_mail' AND action_param = '$backup_id'";
7878
$tmp = $app->db->queryOneRecord($sql);
7979
if($tmp['number'] == 0) {
8080
$message .= $wb['restore_info_txt'];

‎interface/web/mail/templates/mail_user_backup_list.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ <h3><tmpl_var name="list_head_txt"></h3>
2626
<td>{tmpl_var name="filesize"}</td>
2727
<td class="text-right">
2828
<div class="buttons">
29-
<button class="btn btn-default formbutton-default" type="button" onclick="confirm_action('mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=mailrestore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');">{tmpl_var name="restore_backup_txt"}</button>
30-
<!-- <button class="btn btn-default formbutton-default" type="button" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=maildownload&backup_id={tmpl_var name='backup_id'}">{tmpl_var name="download_backup_txt"}</button>
29+
<button class="btn btn-default formbutton-default" type="button" onclick="confirm_action('mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore_mail&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');">{tmpl_var name="restore_backup_txt"}</button>
30+
<!-- <button class="btn btn-default formbutton-default" type="button" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download_mail&backup_id={tmpl_var name='backup_id'}">{tmpl_var name="download_backup_txt"}</button>
3131
-->
3232
</div>
3333
</td>

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

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public function onLoad() {
5353
//* Register for actions
5454
$app->plugins->registerAction('backup_download', $this->plugin_name, 'backup_action');
5555
$app->plugins->registerAction('backup_restore', $this->plugin_name, 'backup_action');
56-
$app->plugins->registerAction('backup_mailrestore', $this->plugin_name, 'backup_action');
56+
//$app->plugins->registerAction('backup_download_mail', $this->plugin_name, 'backup_action_mail');
57+
$app->plugins->registerAction('backup_restore_mail', $this->plugin_name, 'backup_action_mail');
5758

5859
}
5960

@@ -63,9 +64,8 @@ public function backup_action($action_name, $data) {
6364

6465
$backup_id = intval($data);
6566
$backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id");
66-
$mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = $backup_id");
6767

68-
if(is_array($backup) && ($action_name != 'backup_mailrestore')) {
68+
if(is_array($backup)) {
6969

7070
$app->uses('ini_parser,file,getconf,system');
7171

@@ -159,38 +159,62 @@ public function backup_action($action_name, $data) {
159159
} else {
160160
$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
161161
}
162-
//* Restore a mail backup - florian@schaal-24.de
163-
} elseif (is_array($mail_backup) && ($action_name == 'backup_mailrestore')) {
164-
$app->uses('ini_parser,file,getconf');
162+
} else {
163+
$app->log('No backup with ID '.$backup_id.' found.', LOGLEVEL_DEBUG);
164+
}
165+
166+
return 'ok';
167+
}
165168

169+
//* Restore a mail backup - florian@schaal-24.de
170+
public function backup_action_mail($action_name, $data) {
171+
global $app, $conf;
172+
173+
$backup_id = intval($data);
174+
$mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = $backup_id");
175+
176+
if (is_array($mail_backup) && $action_name == 'backup_restore_mail') {
177+
$app->uses('ini_parser,file,getconf');
178+
166179
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
167180
$backup_dir = $server_config['backup_dir'];
168-
169-
$backup_dir_is_ready = true;
181+
170182
//* mount backup directory, if necessary
171-
if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $backup_dir_is_ready = false;
172-
173-
if($backup_dir_is_ready){
183+
$run_backups = true;
184+
$backup_dir_mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh';
185+
if( $server_config['backup_dir_is_mount'] == 'y' &&
186+
is_file($backup_dir_mount_cmd) &&
187+
is_executable($backup_dir_mount_cmd) &&
188+
fileowner($backup_dir_mount_cmd) === 0
189+
){
190+
if(!$app->system->is_mounted($backup_dir)){
191+
exec($backup_dir_mount_cmd);
192+
sleep(1);
193+
if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
194+
}
195+
}
196+
197+
if($run_backups){
174198
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
175199
$domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain_id = ".intval($mail_backup['parent_domain_id']));
176-
200+
177201
$backup_dir = $server_config['backup_dir'].'/mail'.$domain_rec['domain_id'];
178202
$mail_backup_file = $backup_dir.'/'.$mail_backup['filename'];
179-
203+
180204
$sql = "SELECT * FROM mail_user WHERE server_id = '".$conf['server_id']."' AND mailuser_id = ".intval($mail_backup['mailuser_id']);
181205
$record = $app->db->queryOneRecord($sql);
182-
206+
183207
//* strip mailbox from maildir
184208
$domain_dir=explode('/',$record['maildir']);
185209
$_temp=array_pop($domain_dir);unset($_temp);
186210
$domain_dir=implode('/',$domain_dir);
187-
211+
188212
if(!is_dir($domain_dir)) {
189213
mkdir($domain_dir, 0700); //* never create the full path
190214
chown($domain_dir, $mail_config['mailuser_name']);
191215
chgrp($domain_dir, $mail_config['mailuser_group']);
192216
}
193-
217+
194218
if(file_exists($mail_backup_file) && $record['homedir'] != '' && $record['homedir'] != '/' && !stristr($mail_backup_file,'..') && !stristr($mail_backup_file,'etc') && $mail_config['homedir_path'] == $record['homedir'] && is_dir($domain_dir)) {
195219
if($mail_backup['backup_mode'] == 'userzip') {
196220
copy($mail_backup_file, $domain_dir.'/'.$mail_backup['filename']);
@@ -223,7 +247,8 @@ public function backup_action($action_name, $data) {
223247

224248
return 'ok';
225249
}
226-
250+
251+
227252
} // end class
228253

229254
?>

0 commit comments

Comments
 (0)