Dominik
2015-04-14 3bb9ef8a12ee71a16887ca73a86b6fc8eaa183fe
server/plugins-available/backup_plugin.inc.php
@@ -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);
         }
@@ -178,23 +179,12 @@
   
         $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']));
         
@@ -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);
         }