Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up last backup file name handling - only path to the last backup file is necessary. #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Clean up last backup file name handling - only path to the last backup file is necessary. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions all-in-one-wp-security/admin/wp-security-database-menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<div id="message" class="updated fade"><p>';
_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 '</p><p>';
_e('Your DB Backup File location: ');
echo '<strong>'.$aiowps_backup_file_path.'</strong>';
echo '<strong>'.$aio_wp_security->backup_obj->last_backup_file_path.'</strong>';
echo '</p></div>';
}
}
else
{
$aio_wp_security->debug_logger->log_debug("DB Backup - Backup operation failed!",4);
Expand Down
16 changes: 5 additions & 11 deletions all-in-one-wp-security/classes/wp-security-backup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?php
class AIOWPSecurity_Backup
{
var $last_backup_file_name;//Stores the name of the last backup file when execute_backup function is called
var $last_backup_file_path;
var $last_backup_file_dir_multisite;

function __construct()
var $last_backup_file_path; // Stores the path to the last backup file when execute_backup function is called

function __construct()
{
add_action('aiowps_perform_scheduled_backup_tasks', array(&$this, 'aiowps_scheduled_backup_handler'));
add_action('aiowps_perform_db_cleanup_tasks', array(&$this, 'aiowps_scheduled_db_cleanup_handler'));
Expand Down Expand Up @@ -196,13 +194,9 @@ function execute_backup()
{
$fileext = '.sql';
}
$this->last_backup_file_name = $file . $fileext;//database-backup-YYYYMMDD-HHIISS-<random-string>.zip or database-backup-YYYYMMDD-HHIISS-<random-string>.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;
Expand Down