From 42539643c396f9d8865dcf9a51b13dc869709d16 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:16:50 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5
---
server/cron_daily.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index b9b3432..ee54a46 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -647,7 +647,7 @@
// function for sending notification emails
//########
function send_notification_email($template, $placeholders, $recipients) {
- global $conf;
+ global $conf, $app;
if(!is_array($recipients) || count($recipients) < 1) return false;
if(!is_array($placeholders)) $placeholders = array();
@@ -1104,10 +1104,14 @@
//* mount backup directory, if necessary
$run_backups = true;
- $server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
- if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
+ $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(escapeshellcmd($server_config['backup_dir_mount_cmd']));
+ exec($backup_dir_mount_cmd);
sleep(1);
if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
}
--
Gitblit v1.9.1