Marius Cramer
2014-12-19 77cc4a99b15f4639b56c29a1207dc04b459c5d54
server/plugins-available/backup_plugin.inc.php
@@ -72,30 +72,9 @@
         $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
@@ -186,17 +165,10 @@
         $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']));