Merge branch 'renky/ispconfig3-master'

Marius Cramer

2015-01-21 82cf1e84254fc9023b4871ba40967cc4966c9452

 server/plugins-available/backup_plugin.inc.php

@@ -53,6 +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_download_mail', $this->plugin_name, 'backup_action_mail');
      $app->plugins->registerAction('backup_restore_mail', $this->plugin_name, 'backup_action_mail');

   }

@@ -62,7 +64,6 @@

      $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)) {

@@ -158,14 +159,27 @@
         } 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_restore') {
   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;

@@ -223,6 +237,7 @@
      return 'ok';
   }

				
} // end class

?>