Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

 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';