renamed incremental sql-file

Dominik

2015-01-11 053a837fc137b89231b546f70a914f57109e04b9

 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');
		
   }

   //* Do a backup action
@@ -64,44 +65,23 @@
      $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)) {
      if(is_array($backup) && ($action_name != 'backup_mailrestore')) {

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

         $web = $app->db->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'];
         
         //* mount backup directory, if necessary
         /*
         $backup_dir_is_ready = true;
         $server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
         if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
            if(!$app->system->is_mounted($server_config['backup_dir'])){
               exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
               sleep(1);
               if(!$app->system->is_mounted($server_config['backup_dir'])) $backup_dir_is_ready = false;
            }
         }*/
         $backup_dir_is_ready = 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($server_config['backup_dir'])) $backup_dir_is_ready = false;
            }
         }
            //* 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;

         if($backup_dir_is_ready){
            //* Make backup available for download
            if($action_name == 'backup_download') {
               //* Copy the backup file to the backup folder of the website
               if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
               if(file_exists($backup_dir.'/'.$backup['filename']) && file_exists($web['document_root'].'/backup/') && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
                  copy($backup_dir.'/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename']);
                  chgrp($web['document_root'].'/backup/'.$backup['filename'], $web['system_group']);
                  $app->log('cp '.$backup_dir.'/'.$backup['filename'].' '.$web['document_root'].'/backup/'.$backup['filename'], LOGLEVEL_DEBUG);
@@ -180,23 +160,16 @@
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
         }
      //* Restore a mail backup - florian@schaal-24.de
      } elseif (is_array($mail_backup) && $action_name == 'backup_restore') {
      } elseif (is_array($mail_backup) && ($action_name == 'backup_mailrestore')) {
         $app->uses('ini_parser,file,getconf');

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

         //* mount backup directory, if necessary
         $backup_dir_is_ready = true;
         $server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
         if($server_config['backup_dir_is_mount'] == 'y' && $server_config['backup_dir_mount_cmd'] != ''){
            if(!$app->system->is_mounted($backup_dir)){
               exec(escapeshellcmd($server_config['backup_dir_mount_cmd']));
               sleep(1);
               if(!$app->system->is_mounted($backup_dir)) $backup_dir_is_ready = false;
            }
         }
			
         //* 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;

         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']));