Merge branch 'renky/ispconfig3-mdbox-format'

Marius Cramer

2015-04-30 57496f7c08945031b90b1e4bc5b2e0d5f4c2cec4

 server/lib/classes/cron.d/500-backup_mail.inc.php

@@ -31,6 +31,7 @@

   // job schedule
   protected $_schedule = '0 0 * * *';
   private $tmp_backup_dir = '';

   /* this function is optional if it contains no custom code */
   public function onPrepare() {
@@ -111,6 +112,27 @@

                  $mail_backup_file = 'mail'.$rec['mailuser_id'].'_'.date('Y-m-d_H-i');

                  // in case of mdbox -> create backup with doveadm before zipping
                  if ($rec['maildir_format'] == 'mdbox') {
                     if (empty($this->tmp_backup_dir)) $this->tmp_backup_dir = $rec['maildir'];
                     // Create temporary backup-mailbox
                     exec("su -c 'dsync backup -u \"".$rec["email"]."\" mdbox:".$this->tmp_backup_dir."/backup'", $tmp_output, $retval);
		
                     if($backup_mode == 'userzip') {
                        $mail_backup_file.='.zip';
                        exec('cd '.$this->tmp_backup_dir.' && zip '.$mail_backup_dir.'/'.$mail_backup_file.' -b /tmp -r backup > /dev/null && rm -rf backup', $tmp_output, $retval);
                     }
                     else {
                        $mail_backup_file.='.tar.gz';
                        exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$this->tmp_backup_dir.' backup && rm -rf '.$this->tmp_backup_dir.'/backup'), $tmp_output, $retval);
                     }
							
                     if ($retval != 0) {
                        // Cleanup
                        if (file_exists($this->tmp_backup_dir.'/backup')) exec('rm -rf '.$this->tmp_backup_dir.'/backup');
                     }
                  }
                  else {
                  $domain_dir=explode('/',$rec['maildir']); 
                  $_temp=array_pop($domain_dir);unset($_temp);
                  $domain_dir=implode('/',$domain_dir);
@@ -128,6 +150,8 @@
                     $mail_backup_file.='.tar.gz';
                     exec(escapeshellcmd('tar pczf '.$mail_backup_dir.'/'.$mail_backup_file.' --directory '.$domain_dir.' '.$source_dir), $tmp_output, $retval);
                  }
                  }
						
                  if($retval == 0){
                     chown($mail_backup_dir.'/'.$mail_backup_file, $backupusername);
                     chgrp($mail_backup_dir.'/'.$mail_backup_file, $backupgroup);
@@ -141,6 +165,10 @@
                  } else {
                     /* Backup failed - remove archive */
                     if(is_file($mail_backup_dir.'/'.$mail_backup_file)) unlink($mail_backup_dir.'/'.$mail_backup_file);
                     // And remove backup-mdbox
                     if ($rec['maildir_format'] == 'mdbox') {
                        if(file_exists($rec['maildir'].'/backup'))  exec("su -c 'rm -rf ".$rec['maildir']."/backup'");
                     }
                     $app->log($mail_backup_file.' NOK:'.implode('',$tmp_output), LOGLEVEL_DEBUG);
                  }
                  /* Remove old backups */