From 990ca8a44d72cddc12db503f8e623fb9979e5b45 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 06 Nov 2014 04:47:00 -0500
Subject: [PATCH] moved "mount backup_dir" from various plugins to system.inc.php
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 15 ++-------------
1 files changed, 2 insertions(+), 13 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 851aeed..2473afe 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -59,20 +59,9 @@
if($backup_mode == '') $backup_mode = 'userzip';
if($backup_dir != '') {
- //* mount backup directory, if necessary
$run_backups = true;
- $backup_dir_mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh';
- if( $server_config['backup_dir_is_mount'] == 'y' &&
- is_file($backup_dir_mount_cmd) &&
- is_executable($backup_dir_mount_cmd) &&
- fileowner($backup_dir_mount_cmd) === 0
- ){
- if(!$app->system->is_mounted($backup_dir)){
- exec($backup_dir_mount_cmd);
- sleep(1);
- if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
- }
- }
+ //* 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']));
--
Gitblit v1.9.1