diff --git a/all-in-one-wp-security/admin/wp-security-database-menu.php b/all-in-one-wp-security/admin/wp-security-database-menu.php index 5174aec..3e4f0f3 100644 --- a/all-in-one-wp-security/admin/wp-security-database-menu.php +++ b/all-in-one-wp-security/admin/wp-security-database-menu.php @@ -212,23 +212,13 @@ function render_tab2() $result = $aio_wp_security->backup_obj->execute_backup(); if ($result) { - $backup_file_name = $aio_wp_security->backup_obj->last_backup_file_name; - if (function_exists('is_multisite') && is_multisite()) - { - $aiowps_backup_file_path = $aio_wp_security->backup_obj->last_backup_file_dir_multisite . '/' . $backup_file_name; - } - else - { - $aiowps_backup_dir = WP_CONTENT_DIR.'/'.AIO_WP_SECURITY_BACKUPS_DIR_NAME; - $aiowps_backup_file_path = $aiowps_backup_dir. '/' . $backup_file_name; - } echo '

'; _e('DB Backup was successfully completed! You will receive the backup file via email if you have enabled "Send Backup File Via Email", otherwise you can retrieve it via FTP from the following directory:','all-in-one-wp-security-and-firewall'); echo '

'; _e('Your DB Backup File location: '); - echo ''.$aiowps_backup_file_path.''; + echo ''.$aio_wp_security->backup_obj->last_backup_file_path.''; echo '

'; - } + } else { $aio_wp_security->debug_logger->log_debug("DB Backup - Backup operation failed!",4); diff --git a/all-in-one-wp-security/classes/wp-security-backup.php b/all-in-one-wp-security/classes/wp-security-backup.php index 47d6312..058a73d 100644 --- a/all-in-one-wp-security/classes/wp-security-backup.php +++ b/all-in-one-wp-security/classes/wp-security-backup.php @@ -1,11 +1,9 @@ last_backup_file_name = $file . $fileext;//database-backup-YYYYMMDD-HHIISS-.zip or database-backup-YYYYMMDD-HHIISS-.sql + $this->last_backup_file_path = $dirpath . '/' . $file . $fileext; - if ($is_multi_site) - { - $this->last_backup_file_dir_multisite = $aiowps_backup_dir . '/blogid_' . $blog_id; - } - + $this->aiowps_send_backup_email(); //Send backup file via email if applicable $this->aiowps_delete_backup_files(); return true;