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

Fix up setup class #687

Merged
merged 22 commits into from
Feb 3, 2015
Merged

Fix up setup class #687

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
176c084
Make the uninstall, activation and deactivation hooks work
Jan 21, 2015
5130b38
Remove debugging
Jan 21, 2015
fee584f
Remove namespacing
Jan 21, 2015
867ff5d
Use get_col to directly have an array of schedule option names
Jan 21, 2015
b5261a5
We dont need to check for this constant in the hook callback
Jan 21, 2015
51eaa6e
We still need to require some scripts...
Jan 21, 2015
f084b60
Remove phpdocumentor
Jan 21, 2015
32c6b8e
Remove double line break
Jan 21, 2015
660fd78
Remove double lie break
Jan 22, 2015
bf672f6
Add tests for uninstall and deactivate
Jan 23, 2015
fc912ee
Revert to using uninstall.php
Jan 23, 2015
d0e23a0
Fix stable tag number
Jan 23, 2015
de70b1f
Remove tests for now
Jan 26, 2015
ea32820
Merge branch 'master' into fixup-setup-class
Jan 28, 2015
ec54f3b
Merge branch 'master' into fixup-setup-class
Jan 28, 2015
5746c66
Fix some classes and requires
Jan 28, 2015
4d25ebe
Merge branch 'master' into fixup-setup-class
Jan 29, 2015
08ebd69
Update BackUp class include
Jan 29, 2015
0c1d81f
Fix include paths after moving uninstall to own file herpderp
Jan 29, 2015
2ae3630
wrap in parenthesis
Jan 29, 2015
2ff2b3c
Do not delete backups on uninstall
Feb 1, 2015
acad348
Add missing transients to uninstall routine
Feb 2, 2015
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
4 changes: 2 additions & 2 deletions backupwordpress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

namespace HM\BackUpWordPress;

include_once( dirname( __FILE__ ) . '/classes/class-setup.php' );
require_once plugin_dir_path( __FILE__ ) . 'classes/class-setup.php';

register_activation_hook( __FILE__, array( 'HM\BackUpWordPress\Setup', 'activate' ) );
register_deactivation_hook( __FILE__, array( 'HM\BackUpWordPress\Setup', 'deactivate' ) );
Expand Down Expand Up @@ -163,7 +163,7 @@ protected function includes() {

// Load the backup scheduling classes
require_once( HMBKP_PLUGIN_PATH . 'classes/class-schedule.php' );
require_once( HMBKP_PLUGIN_PATH . 'classes/class-schedules.php' );
require_once( plugin_dir_path( __FILE__ ) . 'classes/class-schedules.php' );

// Load the core functions
require_once( HMBKP_PLUGIN_PATH . 'functions/core.php' );
Expand Down
4 changes: 2 additions & 2 deletions classes/class-schedules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class Schedules {

public static function get_instance() {

if ( ! self::$instance ) {
self::$instance = new self;
if ( ! ( self::$instance instanceof Schedules ) ) {
self::$instance = new Schedules();
}

return self::$instance;
Expand Down
25 changes: 6 additions & 19 deletions classes/class-setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,15 @@ public static function deactivate() {
return;
}

// Determine if we need to do any cleanup
if ( ! class_exists( 'Schedules' ) ) {
return;
}
// Delete Cron schedules.
global $wpdb;

$schedules = Schedules::get_instance();
$schedules = $wpdb->get_col( $wpdb->prepare( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s", 'hmbkp_schedule_%' ) );

if ( empty( $schedules ) ) {
return;
foreach ( array_map( function( $item ){ return ltrim( $item, 'hmbkp_schedule_' ); }, $schedules ) as $item ) {
wp_clear_scheduled_hook( 'hmbkp_schedule_hook', array( 'id' => $item ) );
}

// Clear schedule crons
foreach ( $schedules->get_schedules() as $schedule ) {
$schedule->unschedule();
}

// Opt them out of support
delete_option( 'hmbkp_enable_support' );

// Remove the directory filesize cache
delete_transient( 'hmbkp_directory_filesizes' );

}

/**
Expand Down Expand Up @@ -139,7 +126,7 @@ protected static function is_supported_wp_version() {
*/
public static function display_admin_notices() {

echo '<div class="error"><p>' . self::get_notice_message() . '</p></div>';
echo '<div class="error"><p>' . esc_html( self::get_notice_message() ) . '</p></div>';

}

Expand Down
26 changes: 17 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
{
"name": "humanmade/backupwordpress",
"description": "Simple automated backups of your WordPress powered website",
"require-dev": {
"phpdocumentor/phpdocumentor":"dev-master"
},
"authors": [
"name" : "humanmade/backupwordpress",
"description": "Simple automated backups of your WordPress powered website.",
"keywords" : [
"wordpress",
"backup"
],
"type" : "wordpress-plugin",
"homepage" : "https://github.com/humanmade/backupwordpress",
"license" : "GPLv2",
"authors" : [
{
"name": "Human Made Limited",
"email": "hello@hmn.md"
"name" : "Human Made Limited",
"email" : "hello@hmn.md",
"homepage": "https://bwp.hmn.md/"
}
]
],
"support" : {
"issues": "https://github.com/humanmade/backupwordpress/issues"
}
}
Loading