changed sql-query and make ure that the backup-sub-dir exists

Florian Schaal

2014-01-24 c220da99596c4fbca3a4413dbf880dbfc8fd0121

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

@@ -50,13 +50,15 @@
      global $app, $conf;

      $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
      $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');

      $backup_dir = $server_config['backup_dir'];
      $backup_mode = $server_config['backup_mode'];
      if($backup_mode == '') $backup_mode = 'userzip';
      $backup_dir_permissions =0750;

      $backup_mode = $server_config['backup_mode'];
      if($backup_mode == '') $backup_mode = 'userzip';

      if($backup_dir != '') {
/*
         //* mount backup directory, if necessary
         $run_backups = true;
         $server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
@@ -67,39 +69,36 @@
               if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
            }
         }
*/

         $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
			
         if(!is_dir($backup_dir)) {
            mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
         } else {
            chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
         }

         $sql = "SELECT * FROM mail_user WHERE server_id = '".$conf['server_id']."' AND maildir <> ''";
         $sql = "SELECT * FROM mail_user WHERE server_id = '".intval($conf['server_id'])."' AND maildir <> ''";
         $records = $app->db->queryAllRecords($sql);
/*

         if(is_array($records) && $run_backups) {
*/
         if(is_array($records)) {
            if(!is_dir($backup_dir)) {
               mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
            } else {
               chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
            }

            foreach($records as $rec) {
               //* Do the mailbox backup
               if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
                  $sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
                  $sql = "SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
                  $domain_rec=$app->db->queryOneRecord($sql);
                  $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];

                  $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
                  if(!is_dir($mail_backup_dir)) mkdir($mail_backup_dir, 0750);
                  chmod($mail_backup_dir, $backup_dir_permissions);

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

                  $domain_dir=explode('/',$rec['maildir']); 
                  $_temp=array_pop($domain_dir);unset($_temp);
                  $domain_dir=implode('/',$domain_dir);

                  $source_dir=array_pop(explode('/',$rec['maildir']));

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

                  //* 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');
@@ -145,14 +144,12 @@
               }
               /* Remove inactive backups */
               if($rec['backup_interval'] == 'none') {
                  $sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
                  $domain_rec=$app->db->queryOneRecord($sql);
                  /* remove backups from db */
                  $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
                  $app->db->query($sql);
                  if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                  /* remove archives */
                  $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];	
                  $mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];	
                  $mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';
                  if(is_dir($mail_backup_dir)) {
                     foreach (glob($mail_backup_dir.'/'.$mail_backup_file) as $filename) {