From e100328a7f3d495dfddf71f7c71f24ac14bfd9a0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 14 Feb 2014 06:04:01 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/lib/classes/cron.d/500-backup_mail.inc.php | 8 +++++---
1 files changed, 5 insertions(+), 3 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 f95f815..2197251 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -95,13 +95,15 @@
$domain_dir=explode('/',$rec['maildir']);
$_temp=array_pop($domain_dir);unset($_temp);
$domain_dir=implode('/',$domain_dir);
-
- $source_dir=array_pop(explode('/',$rec['maildir']));
+
+ $parts=explode('/',$rec['maildir']);
+ $source_dir=array_pop($parts);
+ unset($parts);
//* create archives
if($backup_mode == 'userzip') {
$mail_backup_file.='.zip';
- exec('cd '.$rec['homedir'].' && zip -b /tmp -r '.$mail_backup_dir.'/'.$mail_backup_file.' '.$source_dir.' > /dev/nul');
+ exec('cd '.$domain_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r '.$source_dir.' > /dev/nul', $tmp_output, $retval);
} else {
/* Create a tar.gz backup */
$mail_backup_file.='.tar.gz';
--
Gitblit v1.9.1