- ported some patches

Marius Cramer

2015-04-15 7ee336c7ccb5f8d35b8eb05cf5e812a42154cbc2

 server/plugins-available/backup_plugin.inc.php

@@ -63,13 +63,13 @@
      global $app, $conf;

      $backup_id = intval($data);
      $backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = $backup_id");
      $backup = $app->dbmaster->queryOneRecord("SELECT * FROM web_backup WHERE backup_id = ?", $backup_id);

      if(is_array($backup)) {

         $app->uses('ini_parser,file,getconf,system');

         $web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$backup['parent_domain_id']);
         $web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
         $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
         $backup_dir = $server_config['backup_dir'].'/web'.$web['domain_id'];
         
@@ -156,6 +156,7 @@
                  }
               }
            }
            if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
         } else {
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
         }
@@ -171,38 +172,27 @@
      global $app, $conf;
   
      $backup_id = intval($data);
      $mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = $backup_id");
      $mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = ?", $backup_id);
   
      if (is_array($mail_backup) && $action_name == 'backup_restore_mail') {
         $app->uses('ini_parser,file,getconf');
   
         $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
         $backup_dir = $server_config['backup_dir'];
         $backup_dir_is_ready = true;
   
         //* mount backup directory, if necessary
         $run_backups = true;
         $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($backup_dir_mount_cmd);
               sleep(1);
               if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
            }
         }
         if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $backup_dir_is_ready = false;
   
         if($run_backups){
         if($backup_dir_is_ready){
            $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
            $domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain_id = ".intval($mail_backup['parent_domain_id']));
            $domain_rec = $app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain_id = ?", $mail_backup['parent_domain_id']);
         
            $backup_dir = $server_config['backup_dir'].'/mail'.$domain_rec['domain_id'];
            $mail_backup_file = $backup_dir.'/'.$mail_backup['filename'];
         
            $sql = "SELECT * FROM mail_user WHERE server_id = '".$conf['server_id']."' AND mailuser_id = ".intval($mail_backup['mailuser_id']);
            $record = $app->db->queryOneRecord($sql);
            $sql = "SELECT * FROM mail_user WHERE server_id = ? AND mailuser_id = ?";
            $record = $app->db->queryOneRecord($sql, $conf['server_id'], $mail_backup['mailuser_id']);
         
            //* strip mailbox from maildir
            $domain_dir=explode('/',$record['maildir']);
@@ -238,6 +228,7 @@
                  }
               }
            }
            if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
         } else {
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
         }