fixed confusion about restoring mail/web-backup with same id

Dominik

2015-01-11 d2c52bba80df37187d2ce80c80290d6a1473a247

 server/plugins-available/backup_plugin.inc.php

@@ -53,7 +53,8 @@
      //* Register for actions
      $app->plugins->registerAction('backup_download', $this->plugin_name, 'backup_action');
      $app->plugins->registerAction('backup_restore', $this->plugin_name, 'backup_action');
      $app->plugins->registerAction('backup_mailrestore', $this->plugin_name, 'backup_action');
      //$app->plugins->registerAction('backup_download_mail', $this->plugin_name, 'backup_action_mail');
      $app->plugins->registerAction('backup_restore_mail', $this->plugin_name, 'backup_action_mail');
      
   }

@@ -63,9 +64,8 @@

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

      if(is_array($backup) && ($action_name != 'backup_mailrestore')) {
      if(is_array($backup)) {

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

@@ -159,18 +159,42 @@
         } else {
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
         }
      } else {
         $app->log('No backup with ID '.$backup_id.' found.', LOGLEVEL_DEBUG);
      }

      return 'ok';
   }

      //* Restore a mail backup - florian@schaal-24.de
      } elseif (is_array($mail_backup) && ($action_name == 'backup_mailrestore')) {
   public function backup_action_mail($action_name, $data) {
      global $app, $conf;
	
      $backup_id = intval($data);
      $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
         if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $backup_dir_is_ready = false;
         $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($backup_dir_is_ready){
         if($run_backups){
            $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']));

@@ -224,6 +248,7 @@
      return 'ok';
   }

				
} // end class

?>