Changeset 876572

Timestamp:

03/17/2014 01:13:32 PM (12 years ago)

Author:

willmot

Message:

BackUpWordPress 2.6

Location:

backupwordpress/trunk

Files:

• admin/actions.php (modified) (8 diffs)
• admin/backups.php (modified) (1 diff)
• admin/constants.php (modified) (1 diff)
• admin/page.php (modified) (3 diffs)
• admin/schedule-form.php (modified) (1 diff)
• admin/schedule.php (modified) (1 diff)
• admin/server-info.php (modified) (1 diff)
• assets/hmbkp.css (modified) (4 diffs)
• assets/hmbkp.js (modified) (23 diffs)
• backupwordpress.php (modified) (2 diffs)
• classes/class-email.php (modified) (4 diffs)
• classes/class-requirements.php (modified) (1 diff)
• classes/class-schedule.php (modified) (17 diffs)
• classes/class-schedules.php (modified) (1 diff)
• classes/wp-cli.php (modified) (2 diffs)
• functions/core.php (modified) (6 diffs)
• functions/interface.php (modified) (2 diffs)
• hm-backup/hm-backup.php (modified) (4 diffs)
• readme.txt (modified) (4 diffs)
• uninstall.php (modified) (1 diff)

backupwordpress/trunk/admin/actions.php

@@ -15 +15 @@
 
     if ( is_wp_error( $deleted ) )
-        echo $deleted->get_error_message();
+        wp_die( $deleted->get_error_message() );
 
     wp_safe_redirect( remove_query_arg( array( 'hmbkp_delete_backup', '_wpnonce' ) ), 303 );
@@ -68 +68 @@
     check_ajax_referer( 'hmbkp_nonce', 'nonce' );
 
-    // Fixes an issue on servers which only allow a single session per client 
+    // Fixes an issue on servers which only allow a single session per client
     session_write_close();
 
@@ -159 +159 @@
         unlink( trailingslashit( hmbkp_path() ) . $schedule->get_running_backup_filename() );
 
+    if ( $schedule->get_schedule_running_path() && file_exists( $schedule->get_schedule_running_path() ) )
+        unlink( $schedule->get_schedule_running_path() );
+
     hmbkp_cleanup();
 
@@ -251 +254 @@
     if ( is_wp_error( $response ) ) {
 
-        echo '<div id="hmbkp-warning" class="updated fade"><p><strong>' . __( 'BackUpWordPress has detected a problem.', 'hmbkp' ) . '</strong> ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled back ups. See the %3$s for more details.', 'hmbkp' ), '<code>wp-cron.php</code>', '<code>' . $response->get_error_message() . '</code>', '<a href="http://wordpress.org/extend/plugins/backupwordpress/faq/">FAQ</a>' ) . '</p></div>';
+        echo '<div id="hmbkp-warning" class="updated fade"><p><strong>' . __( 'BackUpWordPress has detected a problem.', 'hmbkp' ) . '</strong> ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups. See the %3$s for more details.', 'hmbkp' ), '<code>wp-cron.php</code>', '<code>' . $response->get_error_message() . '</code>', '<a href="http://wordpress.org/extend/plugins/backupwordpress/faq/">FAQ</a>' ) . '</p></div>';
 
         update_option( 'hmbkp_wp_cron_test_failed', true );
@@ -257 +260 @@
     } elseif ( wp_remote_retrieve_response_code( $response ) != 200 ) {
 
-        echo '<div id="hmbkp-warning" class="updated fade"><p><strong>' . __( 'BackUpWordPress has detected a problem.', 'hmbkp' ) . '</strong> ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled back ups. See the %3$s for more details.', 'hmbkp' ), '<code>wp-cron.php</code>', '<code>' . esc_html( wp_remote_retrieve_response_code( $response ) ) . ' ' . esc_html( get_status_header_desc( wp_remote_retrieve_response_code( $response ) ) ) . '</code>', '<a href="http://wordpress.org/extend/plugins/backupwordpress/faq/">FAQ</a>' ) . '</p></div>';
+        echo '<div id="hmbkp-warning" class="updated fade"><p><strong>' . __( 'BackUpWordPress has detected a problem.', 'hmbkp' ) . '</strong> ' . sprintf( __( '%1$s is returning a %2$s response which could mean cron jobs aren\'t getting fired properly. BackUpWordPress relies on wp-cron to run scheduled backups. See the %3$s for more details.', 'hmbkp' ), '<code>wp-cron.php</code>', '<code>' . esc_html( wp_remote_retrieve_response_code( $response ) ) . ' ' . esc_html( get_status_header_desc( wp_remote_retrieve_response_code( $response ) ) ) . '</code>', '<a href="http://wordpress.org/extend/plugins/backupwordpress/faq/">FAQ</a>' ) . '</p></div>';
 
         update_option( 'hmbkp_wp_cron_test_failed', true );
@@ -328 +331 @@
  * Validate and either return errors or update the schedule
  */
-function hmnkp_edit_schedule_submit() {
+function hmbkp_edit_schedule_submit() {
 
     if ( empty( $_GET['hmbkp_schedule_id'] ) )
@@ -337 +340 @@
     $errors = array();
 
-
-    if ( isset( $_GET['hmbkp_schedule_type'] ) ) {
-
-        $schedule_type = sanitize_text_field( $_GET['hmbkp_schedule_type'] );
-
-        if ( ! trim( $schedule_type ) )
-            $errors['hmbkp_schedule_type'] = __( 'Backup type cannot be empty', 'hmbkp' );
-
-        elseif ( ! in_array( $schedule_type, array( 'complete', 'file', 'database' ) ) )
-            $errors['hmbkp_schedule_type'] = __( 'Invalid backup type', 'hmbkp' );
-
+    // called from an extension
+    if ( isset( $_GET['is_destination_form'] ) ) {
+
+        // Save the service options
+        foreach ( HMBKP_Services::get_services( $schedule ) as $service )
+            $errors = array_merge( $errors, $service->save() );
+
+        $schedule->save();
+
+        if ( empty( $errors ) )
+            wp_send_json_success();
         else
+            wp_send_json_error( $errors );
+
+    } else {
+
+        $schedule_settings = array();
+
+        if ( isset( $_GET['hmbkp_schedule_recurrence'] ) ) {
+
+            $hmbkp_schedule_recurrence = $_GET['hmbkp_schedule_recurrence'];
+
+            if ( isset( $_GET['hmbkp_schedule_type'] ) ) {
+
+                $schedule_type = sanitize_text_field( $_GET['hmbkp_schedule_type'] );
+
+                if ( ! trim( $schedule_type ) )
+                    $errors['hmbkp_schedule_type'] = __( 'Backup type cannot be empty', 'hmbkp' );
+
+                elseif ( ! in_array( $schedule_type, array( 'complete', 'file', 'database' ) ) )
+                    $errors['hmbkp_schedule_type'] = __( 'Invalid backup type', 'hmbkp' );
+
+                else
+                    $schedule_settings['schedule_type'] = $schedule_type;
+
+            }
+
+            if ( isset( $_GET['hmbkp_schedule_recurrence']['hmbkp_type'] ) ) {
+                $hmbkp_schedule_recurrence_type = sanitize_text_field( $_GET['hmbkp_schedule_recurrence']['hmbkp_type'] );
+
+                if ( empty( $hmbkp_schedule_recurrence_type ) )
+                    $errors['hmbkp_schedule_recurrence']['hmbkp_type'] = __( 'Schedule cannot be empty', 'hmbkp' );
+
+                elseif ( ! in_array( $hmbkp_schedule_recurrence_type, array_keys( hmbkp_get_cron_schedules() ) ) && $hmbkp_schedule_recurrence_type !== 'manually' )
+                    $errors['hmbkp_schedule_recurrence']['hmbkp_type'] = __( 'Invalid schedule', 'hmbkp' );
+
+            }
+
+            if ( 'manually' !== $hmbkp_schedule_recurrence_type ) {
+
+                if ( isset( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_day_of_week'] ) ) {
+
+                    $hmbkp_schedule_time['day_of_week'] = sanitize_text_field( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_day_of_week'] );
+
+                    if ( ! in_array( $hmbkp_schedule_time['day_of_week'], array( 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday' ) ) )
+                        $errors['hmbkp_schedule_start_day_of_week'] = __( 'Day of week must be an integer between 1 and 7', 'backupwordpress' );
+
+                }
+
+                if ( isset( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_day_of_month'] ) ) {
+
+                    $hmbkp_schedule_time['day_of_month'] = absint( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_day_of_month'] );
+
+                    $options = array(
+                        'min_range' => 1,
+                        'max_range' => 31
+                    );
+
+                    if ( false === filter_var( $hmbkp_schedule_time['day_of_month'], FILTER_VALIDATE_INT, array( 'options' => $options ) ) )
+                        $errors['hmbkp_schedule_start_day_of_month'] = __( 'Day of month must be between 1 and 31', 'backupwordpress' );
+
+                }
+
+                if ( isset( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_hours'] ) ) {
+
+                    $hmbkp_schedule_time['hours'] = absint( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_hours'] );
+
+                    $options = array(
+                        'min_range' => 1,
+                        'max_range' => 23
+                    );
+
+                    if ( false === filter_var( $hmbkp_schedule_time['hours'], FILTER_VALIDATE_INT, array( 'options' => $options ) ) )
+                        $errors['hmbkp_schedule_start_hours'] = __( 'Hours must be between 1 and 23', 'backupwordpress' );
+
+                }
+
+                if ( isset( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_minutes'] ) ) {
+
+                    $hmbkp_schedule_time['minutes'] = absint( $_GET['hmbkp_schedule_recurrence']['hmbkp_schedule_start_minutes'] );
+
+                    $options = array(
+                        'min_range' => 0,
+                        'max_range' => 59
+                    );
+
+                    if ( false === filter_var( $hmbkp_schedule_time['minutes'], FILTER_VALIDATE_INT, array( 'options' => $options ) ) )
+                        $errors['hmbkp_schedule_start_minutes'] = __( 'Minutes must be between 0 and 59', 'backupwordpress' );
+
+                }
+
+            }
+        }
+
+        if ( isset( $_GET['hmbkp_schedule_max_backups'] ) ) {
+
+            $schedule_max_backups = sanitize_text_field( $_GET['hmbkp_schedule_max_backups'] );
+
+            if ( empty( $schedule_max_backups ) )
+                $errors['hmbkp_schedule_max_backups'] = __( 'Max backups can\'t be empty', 'hmbkp' );
+
+            elseif ( ! is_numeric( $schedule_max_backups ) )
+                $errors['hmbkp_schedule_max_backups'] = __( 'Max backups must be a number', 'hmbkp' );
+
+            elseif ( ! ( $schedule_max_backups >= 1 ) )
+                $errors['hmbkp_schedule_max_backups'] = __( 'Max backups must be greater than 0', 'hmbkp' );
+
+            else
+                $schedule_settings['schedule_max_backups'] = absint( $schedule_max_backups );
+
+        }
+
+        // Save the service options
+        foreach ( HMBKP_Services::get_services( $schedule ) as $service ) {
+            $errors = array_merge( $errors, $service->save() );
+        }
+
+        if ( $errors ) {
+            wp_send_json_error( $errors );
+
+        } else {
+
+            if ( isset( $hmbkp_schedule_time ) )
+                $schedule->set_schedule_start_time( hmbkp_determine_start_time( $hmbkp_schedule_recurrence_type, $hmbkp_schedule_time ) );
+
+            $schedule->set_reoccurrence( $hmbkp_schedule_recurrence_type );
             $schedule->set_type( $schedule_type );
+            $schedule->set_max_backups( $schedule_settings['schedule_max_backups'] );
+
+            $schedule->save();
+
+            // Remove any old backups in-case max backups was reduced
+            $schedule->delete_old_backups();
+
+            wp_send_json_success();
+
+        }
 
     }
 
-    if ( isset( $_GET['hmbkp_schedule_reoccurrence'] ) ) {
-
-        $schedule_reoccurrence = sanitize_text_field( $_GET['hmbkp_schedule_reoccurrence'] );
-
-        if ( empty( $schedule_reoccurrence ) )
-            $errors['hmbkp_schedule_reoccurrence'] = __( 'Schedule cannot be empty', 'hmbkp' );
-
-        elseif ( ! in_array( $schedule_reoccurrence, array_keys( $schedule->get_cron_schedules() ) ) && $schedule_reoccurrence !== 'manually' )
-            $errors['hmbkp_schedule_reoccurrence'] = __( 'Invalid schedule', 'hmbkp' );
-
-        else
-            $schedule->set_reoccurrence( $schedule_reoccurrence );
-
-    }
-
-    if ( isset( $_GET['hmbkp_schedule_max_backups'] ) ) {
-
-        $schedule_max_backups = sanitize_text_field( $_GET['hmbkp_schedule_max_backups'] );
-
-        if ( empty( $schedule_max_backups ) )
-            $errors['hmbkp_schedule_max_backups'] = __( 'Max backups can\'t be empty', 'hmbkp' );
-
-        elseif ( ! is_numeric( $schedule_max_backups ) )
-            $errors['hmbkp_schedule_max_backups'] = __( 'Max backups must be a number', 'hmbkp' );
-
-        elseif ( ! ( $schedule_max_backups >= 1 ) )
-            $errors['hmbkp_schedule_max_backups'] = __( 'Max backups must be greater than 0', 'hmbkp' );
-
-        else
-            $schedule->set_max_backups( (int) $schedule_max_backups );
-
-        // Remove any old backups in-case max backups was reduced
-        $schedule->delete_old_backups();
-
-    }
-
-    // Save the service options
-    foreach ( HMBKP_Services::get_services( $schedule ) as $service )
-        $errors = array_merge( $errors, $service->save() );
-
-    $schedule->save();
-
-    if ( $errors )
-        echo json_encode( $errors );
-
-    die;
-
-}
-add_action( 'wp_ajax_hmnkp_edit_schedule_submit', 'hmnkp_edit_schedule_submit' );
+    die();
+
+}
+add_action( 'wp_ajax_hmbkp_edit_schedule_submit', 'hmbkp_edit_schedule_submit' );
 
 /**
@@ -553 +645 @@
  * @return void
  */
-function hmbkp_load_enable_support () {
+function hmbkp_load_enable_support() {
 
     check_ajax_referer( 'hmbkp_nonce', '_wpnonce' );

backupwordpress/trunk/admin/backups.php

@@ -38 +38 @@
     <?php endforeach; ?>
 
-        <li><a class="colorbox" href="<?php esc_attr_e( esc_url( add_query_arg( array( 'action' => 'hmbkp_add_schedule_load' ), is_multisite() ? admin_url( 'admin-ajax.php' ) : network_admin_url( 'admin-ajax.php' ) ) ) ); ?>"> + <?php _e( 'add schedule', 'hmbkp' ); ?></a></li>
+        <li><a class="colorbox" href="<?php esc_attr_e( esc_url( add_query_arg( array( 'action' => 'hmbkp_add_schedule_load' ), is_multisite() ? network_admin_url( 'admin-ajax.php' ) : admin_url( 'admin-ajax.php' ) ) ) ); ?>"> + <?php _e( 'add schedule', 'hmbkp' ); ?></a></li>
 
     </ul>

backupwordpress/trunk/admin/constants.php

@@ -1 +1 @@
 <div id="hmbkp-constants">
 
-    <p><?php printf( __( 'You can %1$s any of the following %2$s in your %3$s to control advanced settings. %4$s. Defined %5$s will be highlighted.', 'hmbkp' ), '<code>define</code>', '<code>' . __( 'Constants', 'hmbkp' ) . '</code>', '<code>wp-config.php</code>', '<a href="http://codex.wordpress.org/Editing_wp-config.php">' . __( 'The Codex can help', 'hmbkp' ) . '</a>', '<code>' . __( 'Constants', 'hmbkp' ) . '</code>' ); ?></p>
+    <p><?php printf( __( 'You can %1$s any of the following %2$s in your %3$s to control advanced settings. %4$s. Defined %5$s will be highlighted.', 'hmbkp' ), '<code>define</code>', '<code>' . __( 'Constants', 'hmbkp' ) . '</code>', '<code>wp-config.php</code>', '<a href="http://codex.wordpress.org/Editing_wp-config.php">' . __( 'The Codex can help', 'hmbkp' ) . '</a>', '<code>' . __( 'Constants', 'hmbkp' ) . '</code>' ); ?></p>
 
-    <dl>
+    <table class="widefat">
 
-        <dt<?php if ( defined( 'HMBKP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_PATH</code></dt>
-        <dd><p><?php printf( __( 'The path to folder you would like to store your backup files in, defaults to %s.', 'hmbkp' ), '<code>' . esc_html( hmbkp_path_default() ) . '</code>' ); ?></p><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_PATH', '/home/willmot/backups' );</code></p></dd>
+        <tr<?php if ( defined( 'HMBKP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>>
 
-        <dt<?php if ( defined( 'HMBKP_MYSQLDUMP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_MYSQLDUMP_PATH</code></dt>
-        <dd><p><?php printf( __( 'The path to your %1$s executable. Will be used for the %2$s part of the back up if available.', 'hmbkp' ), '<code>mysqldump</code>', '<code>' . __( 'database', 'hmbkp' ) . '</code>' ); ?></p><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_MYSQLDUMP_PATH', '/opt/local/bin/mysqldump' );</code></p></dd>
+            <td><code>HMBKP_PATH</code></td>
 
-        <dt<?php if ( defined( 'HMBKP_ZIP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_ZIP_PATH</code></dt>
-        <dd><p><?php printf( __( 'The path to your %1$s executable. Will be used to zip up your %2$s and %3$s if available.', 'hmbkp' ), '<code>zip</code>', '<code>' . __( 'files', 'hmbkp' ) . '</code>', '<code>' . __( 'database', 'hmbkp' ) . '</code>' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ZIP_PATH', '/opt/local/bin/zip' );</code></p></dd>
+            <td>
 
-        <dt<?php if ( defined( 'HMBKP_EXCLUDE' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_EXCLUDE</code></dt>
-        <dd><p><?php _e( 'Comma separated list of files or directories to exclude, the backups directory is automatically excluded.', 'hmbkp' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_EXCLUDE', '/wp-content/uploads/, /stats/, .svn/, *.txt' );</code></p></dd>
+                <?php if ( defined( 'HMBKP_PATH' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_PATH . '</code>' ); ?></p>
+                <?php } ?>
 
-        <dt<?php if ( defined( 'HMBKP_CAPABILITY' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_CAPABILITY</code></dt>
-        <dd><p><?php printf( __( 'The capability to use when calling %1$s. Defaults to %2$s.', 'hmbkp' ), '<code>add_menu_page</code>', '<code>manage_options</code>' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_CAPABILITY', 'edit_posts' );</code></p></dd>
+                <p><?php printf( __( 'The path to folder you would like to store your backup files in, defaults to %s.', 'hmbkp' ), '<code>' . esc_html( hmbkp_path_default() ) . '</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_PATH', '/home/willmot/backups' );</code></p>
 
-        <dt<?php if ( defined( 'HMBKP_ROOT' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_ROOT</code></dt>
-        <dd><p><?php printf( __( 'The root directory that is backed up. Defaults to %s.', 'hmbkp' ), '<code>' . HM_Backup::get_home_path() . '</code>' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ROOT', ABSPATH . 'wp/' );</code></p></dd>
+            </td>
 
-        <dt<?php if ( defined( 'HMBKP_SCHEDULE_TIME' ) && HMBKP_SCHEDULE_TIME !== '11pm' ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_SCHEDULE_TIME</code></dt>
-        <dd><p><?php printf( __( 'The time that your schedules should run. Defaults to %s.', 'hmbkp' ), '<code>23:00</code>' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_SCHEDULE_TIME', '07:30' );</code></p></dd>
+        </tr>
 
-        <?php
+        <tr<?php if ( defined( 'HMBKP_MYSQLDUMP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>>
 
-                foreach ( HMBKP_Services::get_services() as $file => $service )
-                    echo wp_kses_post( call_user_func( array( $service, 'constant' ) ) ); ?>
+            <td><code>HMBKP_MYSQLDUMP_PATH</code></td>
 
-    </dl>
+            <td>
+
+                <?php if ( defined( 'HMBKP_MYSQLDUMP_PATH' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_MYSQLDUMP_PATH . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The path to your %1$s executable. Will be used for the %2$s part of the back up if available.', 'hmbkp' ), '<code>mysqldump</code>', '<code>' . __( 'database', 'hmbkp' ) . '</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_MYSQLDUMP_PATH', '/opt/local/bin/mysqldump' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <tr<?php if ( defined( 'HMBKP_ZIP_PATH' ) ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_ZIP_PATH</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_ZIP_PATH' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_ZIP_PATH . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The path to your %1$s executable. Will be used to zip up your %2$s and %3$s if available.', 'hmbkp' ), '<code>zip</code>', '<code>' . __( 'files', 'hmbkp' ) . '</code>', '<code>' . __( 'database', 'hmbkp' ) . '</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ZIP_PATH', '/opt/local/bin/zip' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <tr<?php if ( defined( 'HMBKP_EXCLUDE' ) ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_EXCLUDE</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_EXCLUDE' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_EXCLUDE . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php _e( 'Comma separated list of files or directories to exclude, the backups directory is automatically excluded.', 'hmbkp' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_EXCLUDE', '/wp-content/uploads/, /stats/, .svn/, *.txt' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <tr<?php if ( defined( 'HMBKP_CAPABILITY' ) ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_CAPABILITY</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_CAPABILITY' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_CAPABILITY . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The capability to use when calling %1$s. Defaults to %2$s.', 'hmbkp' ), '<code>add_menu_page</code>', '<code>manage_options</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_CAPABILITY', 'edit_posts' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <tr<?php if ( defined( 'HMBKP_ROOT' ) ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_ROOT</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_ROOT' ) ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_ROOT . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The root directory that is backed up. Defaults to %s.', 'hmbkp' ), '<code>' . HM_Backup::get_home_path() . '</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ROOT', ABSPATH . 'wp/' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <tr<?php if ( defined( 'HMBKP_SCHEDULE_TIME' ) && HMBKP_SCHEDULE_TIME !== '11pm' ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_SCHEDULE_TIME</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_SCHEDULE_TIME' ) && HMBKP_SCHEDULE_TIME !== '11pm' ) { ?>
+                    <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_SCHEDULE_TIME . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The time that your schedules should run. Defaults to %s.', 'hmbkp' ), '<code>23:00</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_SCHEDULE_TIME', '07:30' );</code></p>
+
+            </td>
+
+        </tr>
+
+        <?php foreach ( HMBKP_Services::get_services() as $file => $service )
+            echo wp_kses_post( call_user_func( array( $service, 'constant' ) ) ); ?>
+
+    </table>
 
 </div>

backupwordpress/trunk/admin/page.php

@@ -1 +1 @@
 <div class="wrap">
-
-    <?php screen_icon( HMBKP_PLUGIN_SLUG ); ?>
 
     <h2>
@@ -12 +10 @@
         <?php } else { ?>
 
-        <a id="intercom-info" class="colorbox add-new-h2" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'load_enable_support' ), is_multisite() ? admin_url( 'admin-ajax.php' ) : network_admin_url( 'admin-ajax.php' ) ), 'hmbkp_nonce' ); ?>">Enable Support</a>
+        <a id="intercom-info" class="colorbox add-new-h2" href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'load_enable_support' ), is_multisite() ? admin_url( 'admin-ajax.php' ) : network_admin_url( 'admin-ajax.php' ) ), 'hmbkp_nonce' ); ?>"><?php _e( 'Enable Support', 'hmbkp' ); ?></a>
 
         <?php } ?>
@@ -23 +21 @@
     <?php include_once( HMBKP_PLUGIN_PATH . '/admin/backups.php' ); ?>
 
-<?php else : ?>
-
-    <p><strong><?php _e( 'You need to fix the issues detailed above before BackUpWordPress can start.', 'hmbkp' ); ?></strong></p>
-
-<?php endif; ?>
-
     <p class="howto"><?php printf( __( 'If you\'re finding BackUpWordPress useful, please %1$s rate it on the plugin directory. %2$s', 'hmbkp' ), '<a href="http://wordpress.org/support/view/plugin-reviews/backupwordpress">', '</a>' ); ?></p>
 
     <p class="howto"><?php _e( 'If you need help getting things working then check the FAQ by clicking on help in the top right hand corner of this page.', 'hmbkp' ); ?></p>
 
-    <p class="howto"><strong><?php printf( __( 'Wish you could store your backups in a safer place? Our %1$spremium extensions%2$s enable automatic backups to Dropbox, FTP, Google Drive and more.', 'hmbkp' ), '<a href="http://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=wp-admin&utm_campaign=freeplugin">', '</a>' ); ?></strong></p>
+    <p class="howto"><strong><?php printf( __( 'Wish you could store your backups in a safer place? Our %1$spremium extensions%2$s enable automatic backups to Dropbox, FTP, Google Drive and more.', 'hmbkp' ), '<a href="https://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=wp-admin&utm_campaign=freeplugin">', '</a>' ); ?></strong></p>
+
+<?php endif; ?>
 
 </div>

backupwordpress/trunk/admin/schedule-form.php

@@ -7 +7 @@
         <legend><?php _e( 'Schedule Settings', 'hmbkp' ); ?></legend>
 
-        <label>
+        <div>
 
-            <?php _e( 'Backup', 'hmbkp' ); ?>
+            <label for="hmbkp_schedule_type"><?php _e( 'Backup', 'hmbkp' ); ?></label>
 
-            <select name="hmbkp_schedule_type" id="hmbkp_schedule_type">
-                <option<?php selected( $schedule->get_type(), 'complete' ); ?> value="complete"><?php _e( 'Both Database &amp; files', 'hmbkp' ); ?></option>
-                <option<?php selected( $schedule->get_type(), 'file' ); ?> value="file"><?php _e( 'Files only', 'hmbkp' ); ?></option>
-                <option<?php selected( $schedule->get_type(), 'database' ); ?> value="database"><?php _e( 'Database only', 'hmbkp' ); ?></option>
-            </select>
+                <select name="hmbkp_schedule_type" id="hmbkp_schedule_type">
 
-        </label>
+                <option<?php selected( $schedule->get_type(), 'complete' ); ?> value="complete"><?php _e( 'Both Database &amp; files', 'hmbkp' ); ?></option>
 
-        <label>
+                <option<?php selected( $schedule->get_type(), 'file' ); ?> value="file"><?php _e( 'Files only', 'hmbkp' ); ?></option>
 
-            <?php _e( 'Schedule', 'hmbkp' ); ?>
+                <option<?php selected( $schedule->get_type(), 'database' ); ?> value="database"><?php _e( 'Database only', 'hmbkp' ); ?></option>
 
-            <select name="hmbkp_schedule_reoccurrence" id="hmbkp_schedule_reoccurrence">
+            </select>
 
-                <option value="manually"><?php _e( 'Manual Only', 'hmbkp' ); ?></option>
+        </div>
 
-          <?php foreach ( $schedule->get_cron_schedules() as $cron_schedule => $cron_details ) : ?>
+        <div>
 
-                <option <?php selected( $schedule->get_reoccurrence(), $cron_schedule ); ?> value="<?php echo esc_attr( $cron_schedule ); ?>">
+            <label for="hmbkp_schedule_recurrence_type"><?php _e( 'Schedule', 'hmbkp' ); ?></label>
 
-                            <?php esc_html_e( $cron_details['display'], 'hmbkp' ); ?>
+            <select name="hmbkp_schedule_recurrence[hmbkp_type]" id="hmbkp_schedule_recurrence_type">
 
-                        </option>
+                <option value="manually"><?php _e( 'Manual Only', 'hmbkp' ); ?></option>
 
-          <?php endforeach; ?>
+          <?php foreach ( $schedule->get_cron_schedules() as $cron_schedule => $cron_details ) : ?>
 
-            </select>
+                <option <?php selected( $schedule->get_reoccurrence(), $cron_schedule ); ?> value="<?php echo esc_attr( $cron_schedule ); ?>">
 
-        </label>
+                    <?php esc_html_e( $cron_details['display'], 'hmbkp' ); ?>
 
-        <label>
+                </option>
 
-            <?php _e( 'Number of backups to store on this server', 'hmbkp' ); ?>
+          <?php endforeach; ?>
 
-            <input type="number" name="hmbkp_schedule_max_backups" min="1" step="1" value="<?php echo esc_attr( $schedule->get_max_backups() ); ?>" />
+            </select>
 
-            <p class="description"><?php printf( __( 'Past this limit older backups will be deleted automatically. This schedule will store a maximum of %s of backups', 'hmbkp' ), '<code>' . size_format( $schedule->get_filesize() * $schedule->get_max_backups() ) . '</code>' ); ?></p>
+        </div>
 
-        </label>
+        <?php if ( ! $start_time = $schedule->get_schedule_start_time() )
+            $start_time = time(); ?>
 
-        <?php
+        <div id="start-day" class="recurring-setting">
 
-                foreach ( HMBKP_Services::get_services( $schedule ) as $service )
-                    $service->field();
+            <label for="hmbkp_schedule_start_day_of_week"><?php _e( 'Start Day', 'hmbkp' ); ?></label>
 
-                ?>
+            <select id="hmbkp_schedule_start_day_of_week" name="hmbkp_schedule_recurrence[hmbkp_schedule_start_day_of_week]">
 
-        <p class="submit">
+                <?php $weekdays = array(
+                    'monday' => __( 'Monday', 'hmbkp' ),
+                    'tuesday' => __( 'Tuesday', 'hmbkp' ),
+                    'wednesday' => __( 'Wednesday', 'hmbkp' ),
+                    'thursday' => __( 'Thursday', 'hmbkp' ),
+                    'friday' => __( 'Friday', 'hmbkp' ),
+                    'saturday' => __( 'Saturday', 'hmbkp' ),
+                    'sunday' => __( 'Sunday', 'hmbkp' )
+                );
 
-            <button type="submit" class="button-primary"><?php _e( 'Update', 'hmbkp' ); ?></button>
+                foreach ( $weekdays as $key => $day ) : ?>
+
+                    <option value="<?php echo esc_attr( $key ) ?>" <?php selected( strtolower( date( 'l', $start_time ) ), $key ); ?>><?php echo esc_html( $day ); ?></option>
+
+                <?php endforeach; ?>
+
+            </select>
+
+        </div>
+
+        <div id="start-date" class="recurring-setting">
+
+            <label for="hmbkp_schedule_start_day_of_month"><?php _e( 'Start Day of Month', 'hmbkp' ); ?></label>
+
+            <input type="number" min="0" max="31" step="1" id="hmbkp_schedule_start_day_of_month" name="hmbkp_schedule_recurrence[hmbkp_schedule_start_day_of_month]" value="<?php echo esc_attr( date( 'j', $start_time ) ); ?>">
+
+        </div>
+
+        <div id="schedule-start" class="recurring-setting">
+
+            <label for="hmbkp_schedule_start_hours"><?php _e( 'Start time', 'hmbkp' ); ?></label>
+
+            <span class="field-group">
+
+                <label for="hmbkp_schedule_start_hours"><input type="number" min="0" max="23" step="1" name="hmbkp_schedule_recurrence[hmbkp_schedule_start_hours]" id="hmbkp_schedule_start_hours" value="<?php echo esc_attr( date( 'G', $start_time ) ); ?>">
+
+                <?php _e( 'Hours', 'hmbkp' ); ?></label>
+
+                <label for="hmbkp_schedule_start_minutes"><input type="number" min="0" max="59" step="1" name="hmbkp_schedule_recurrence[hmbkp_schedule_start_minutes]" id="hmbkp_schedule_start_minutes" value="<?php echo esc_attr( (float) date( 'i', $start_time ) ); ?>">
+
+                <?php _e( 'Minutes', 'hmbkp' ); ?></label>
+
+            </span>
+
+            <p class="twice-js description"><?php _e( 'The second backup will run 12 hours after the first', 'hmbkp' ); ?></p>
+
+        </div>
+
+        <div>
+
+            <label for="hmbkp_schedule_max_backups"><?php _e( 'Number of backups to store on this server', 'hmbkp' ); ?></label>
+
+            <input type="number" id="hmbkp_schedule_max_backups" name="hmbkp_schedule_max_backups" min="1" step="1" value="<?php echo esc_attr( $schedule->get_max_backups() ); ?>" />
+
+            <p class="description">
+
+                <?php printf( __( 'Past this limit older backups will be deleted automatically.', 'hmbkp' ) ); ?>
+
+                <?php if ( $schedule->is_filesize_cached() ) {
+                    printf( __( 'This schedule will store a maximum of %s of backups', 'hmbkp' ), '<code>' . size_format( $schedule->get_filesize() * $schedule->get_max_backups() ) . '</code>' );
+                } ?>
+
+            </p>
+
+        </div>
+
+        <?php foreach ( HMBKP_Services::get_services( $schedule ) as $service )
+            $service->field(); ?>
+
+        <p class="submit">
+
+            <button type="submit" class="button-primary"><?php _e( 'Update', 'hmbkp' ); ?></button>
 
         </p>

backupwordpress/trunk/admin/schedule.php

@@ -16 +16 @@
 
     case 'hmbkp_hourly' :
-
-        $reoccurrence = date_i18n( 'i', $schedule->get_next_occurrence( false ) ) === '00' ? '<span ' . $next_backup . '>' . __( 'hourly on the hour', 'hmbkp' ) . '</span>' : sprintf( __( 'hourly at %s minutes past the hour', 'hmbkp' ), '<span ' . $next_backup . '>' . str_replace( '0', '', date_i18n( 'i', $schedule->get_next_occurrence( false ) ) ) ) . '</span>';
+        $reoccurrence = date_i18n( 'i', $schedule->get_next_occurrence( false ) ) === '00' ? '<span ' . $next_backup . '>' . __( 'hourly on the hour', 'hmbkp' ) . '</span>' : sprintf( __( 'hourly at %s minutes past the hour', 'hmbkp' ), '<span ' . $next_backup . '>' . intval( date_i18n( 'i', $schedule->get_next_occurrence( false ) ) ) ) . '</span>';
 
     break;

backupwordpress/trunk/admin/server-info.php

@@ -9 +9 @@
         <?php foreach ( HMBKP_Requirements::get_requirements( $group ) as $requirement ) : ?>
 
+            <?php if ( ( is_string( $requirement->raw_result() ) && strlen( $requirement->result() ) < 20 ) || is_bool( $requirement->raw_result() ) ) { ?>
+
             <tr>
-                <td><?php echo $requirement->name(); ?></td>
-                <td><pre><?php echo $requirement->result(); ?></pre></td>
+
+                <td><?php echo esc_html( $requirement->name() ); ?></td>
+
+                <td>
+                    <code><?php echo esc_html( $requirement->result() ); ?></code>
+                </td>
+
             </tr>
+
+            <?php } else { ?>
+
+            <tr>
+
+                <td colspan="2">
+                    <?php echo esc_html( $requirement->name() ); ?>
+                    <pre><?php echo esc_html( $requirement->result() ); ?></pre>
+                </td>
+
+            </tr>
+
+            <?php } ?>
 
         <?php endforeach; ?>

backupwordpress/trunk/assets/hmbkp.css

@@ -1 +1 @@
 #icon-backupwordpress.icon32 { background: url(icon_backupwordpress_32x32.png); }
 
-tfoot p { margin: 0; font-weight: normal; }
-#hmbkp-constants dl { overflow: hidden; margin: 20px 0; }
-#hmbkp-constants dt { float: left; min-width: 250px; clear: both; padding: 6px; margin: 1px 0; cursor: pointer; }
-#hmbkp-constants dd { color: #666; padding: 7px 0 7px 250px; border-top: 1px solid #DFDFDF; margin: 0; cursor: pointer; min-height: 40px; }
-#hmbkp-constants dd:last-child { border-bottom: 1px solid #DFDFDF; }
-#hmbkp-constants dt:not(.hmbkp_active) + dd { background: #F9F9F9; }
-#hmbkp-constants dd .example { white-space: nowrap; display: none; }
-#hmbkp-constants dd p { margin: 0; }
-#hmbkp-constants dt:not(.hmbkp_active):hover + dd, #hmbkp-constants dt:not(.hmbkp_active) + dd:hover { background-color: #FFF; }
-#hmbkp-constants dd:hover p, #hmbkp-constants dt:hover + dd p { display: none; }
-#hmbkp-constants dd:hover .example, #hmbkp-constants dt:hover + dd .example { display: inline; }
+tfoot p { margin: 0; font-weight: normal; }#hmbkp-constants dl { overflow: hidden; margin: 20px 0; }
 
 .completed th, .completed td { background-color: #FFFFE0; }
-.hmbkp_active:before { content: "\00a0 \2713 "; font-size: 11px; }
-.hmbkp_active, .hmbkp_active code, #hmbkp-constants .hmbkp_active + dd { background: #E5F7E8; }
+.hmbkp_active td:first-child > code:before { content: "\00a0 \2713  "; font-size: 11px; }
+.hmbkp_active { background: #E5F7E8; }
 .contextual-help-tabs-wrap .updated { margin: 15px 0 0; }
 
@@ -25 +15 @@
 .hmbkp_schedule { clear: both; overflow: hidden; }
 
-
 #cboxLoadedContent { margin-bottom: 0; }
 
+.hmbkp-form { overflow: hidden; }
 .hmbkp-form fieldset { float: left; }
 .js .hmbkp-form fieldset + fieldset { display: none; margin-right: -100%; }
+form.hmbkp-form div.recurring-setting { display: none; }
 
-.hmbkp-form label { display: block; line-height: 25px; padding-bottom: 20px; border-bottom: 1px dotted #CCC; margin-bottom: 20px; width: 320px; position: relative; }
+form.hmbkp-form div { display: block; line-height: 25px; padding-bottom: 20px; border-bottom: 1px dotted #CCC; margin-bottom: 20px; width: 320px; position: relative; }
 
 .hmbkp-form legend { padding: 0 0 20px; font-size: 1.17em; font-weight: bold; }
-.hmbkp-form label > * { float: right; }
+.hmbkp-form div > select, .hmbkp-form div > input, .hmbkp-form div > span.field-group, .button-right { float: right; }
 .hmbkp-form label.hidden { display: none; }
-.hmbkp-form label > input[type="text"], .hmbkp-form label > select, .hmbkp-form label > input[type="password"] { min-width: 200px; }
-.hmbkp-form label > input[type="checkbox"] { margin-top: 6px; }
-.hmbkp-form label .description { line-height: 16px; margin-top: 10px; float: none; }
-.hmbkp-form p.submit { margin:0; padding:0; }
+.hmbkp-form div > input[type="text"], .hmbkp-form div > select, .hmbkp-form div > input[type="password"] { min-width: 200px; }
+.hmbkp-form div > input[type="checkbox"] { margin-top: 6px; }
+.hmbkp-form div .description { line-height: 16px; margin-top: 10px; float: none; }
+.hmbkp-form p.submit { margin: 20px 0 0; padding: 0; }
 .hmbkp-form .button-primary { float: right; }
 .hmbkp-form [type="number"] { min-width: 50px; width: 50px; }
-.hmbkp-error span { position: absolute; top: -14px; right: 1px; color: #FFF; background-color: red; white-space: nowrap; line-height: 16px; font-size: 11px; padding: 0 3px; border-radius: 3px 3px 0 0; }
+.hmbkp-error span, span.hmbkp-error { position: absolute; top: -14px; right: 1px; color: #FFF; background-color: red; white-space: nowrap; line-height: 16px; font-size: 11px; padding: 0 3px; border-radius: 3px 3px 0 0; }
 .hmbkp-error input[type], .hmbkp-error select { border-color: red; border-top-right-radius: 0; }
-.hmbkp-edit-schedule-excludes-form .code{word-break: break-word;}
 
 .hmbkp-form ul { width: 320px; overflow: hidden; }
-.hmbkp-form ul.hmbkp_file_list { background-color: #FFF; display: block; border-radius: 4px; box-sizing: border-box; clear: both; box-shadow: inset 0px 0px 2px #CCC; font-size: 11px; }
+.hmbkp-form ul.hmbkp_file_list { background-color: #FFF; max-height: 200px; overflow-y: scroll; display: block; border-radius: 4px; box-sizing: border-box; clear: both; box-shadow: inset 0px 0px 2px #CCC; font-size: 11px; }
 .hmbkp_file_list li { margin: 0; padding: 5px; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; line-height: 16px; }
 .hmbkp_file_list li + li { border-top: 1px dotted #CCC; }
@@ -66 +56 @@
 .hmbkp-schedule-actions { font-size: 12px; font-weight: normal; margin: 0 0 0 26px; }
 
-.hmbkp-ajax-loading, button.hmbkp-ajax-loading { padding-left: 20px; }
-.hmbkp-ajax-loading:before {width: 16px;height: 16px; margin-right: 10px; content: ""; background: transparent url('spinner-2x.gif') no-repeat 0 0; background-size: 16px 16px; vertical-align: middle; display: inline-block; }
+.hmbkp-ajax-loading, button.hmbkp-ajax-loading { padding-left: 20px; position: relative; }
+.hmbkp-ajax-loading::before { content: ""; width: 16px; height: 16px; background-image: url('spinner-2x.gif'); background-size: 16px 16px; background-repeat: no-repeat; background-position: 0 0; position: absolute; left: -30px; top: 5px; }
 
 button { height: 14px; }
@@ -83 +73 @@
 .hmbkp-exclude-preview-open table, .hmbkp-exclude-preview-open .hmbkp-tabs, .hmbkp-exclude-preview-open p.submit { display: none; }
 .hmbkp-exclude-preview-open .hmbkp_add_exclude_rule { margin: 0; }
-.ui-tabs-panel { clear: both;}
+.hmbkp-tabs > div { display: none; }
+.ui-tabs-panel { clear: both; }
 .ui-tabs-panel form { padding-top: 10px; }
 
-table.widefat tbody td { padding: 8px 7px; }
+table.widefat tbody tr:nth-child(odd) { background-color: #f9f9f9 }
 .hmbkp-edit-schedule-excludes-form td a, .hmbkp-edit-schedule-excludes-form td span.reason { float: right; }
+.hmbkp-edit-schedule-excludes-form td span.code { float: left; width: 255px; }
 .hmbkp-edit-schedule-excludes-form td span.reason { color: #CCC; }
 input[type="datetime-local"] { border-radius: 3px; border-width: 1px; border-style: solid; box-sizing: border-box; border-color: #DFDFDF; background-color: white; }

backupwordpress/trunk/assets/hmbkp.js

@@ -6 +6 @@
     // Remove the loading class when ajax requests complete
     $( document ).ajaxComplete( function() {
-        $( '.hmbkp-ajax-loading' ).removeClass( 'hmbkp-ajax-loading' );
+        $( '.hmbkp-ajax-loading' ).removeClass( 'hmbkp-ajax-loading' ).removeAttr( 'disabled' );
     } );
 
@@ -19 +19 @@
     if ( ! $( '.subsubsub a.current' ).size() )
         $( '.subsubsub li:first a').addClass( 'current' );
-
-    // Carries the same resize options we want
-    // to use to all other .resize()
-    var resize_options = {
-        height: '85%'
-    };
 
     // Initialize colorbox
@@ -31 +25 @@
         'initialHeight' : '100px',
         'transition'    : 'elastic',
-        'scrolling'     : true,
-        'innerWidth'    : "320px",
-        'maxHeight'     : resize_options.height, //85% Takes into account the WP Admin bar.
+        'scrolling'     : false,
+        'innerWidth'    : '320px',
+        'maxHeight'     : '85%', // 85% Takes into account the WP Admin bar.
         'escKey'        : false,
         'overlayClose'  : false,
@@ -43 +37 @@
             $( '.hmbkp-tabs' ).tabs();
 
-            if ( $( ".hmbkp-form p.submit:contains('" + hmbkp.update + "')" ).size() )
+            if ( $( ".hmbkp-form p.submit:contains('" + hmbkp.update + "')" ).size() ) {
                 $( '<button type="button" class="button-secondary hmbkp-colorbox-close">' + hmbkp.cancel + '</button>' ).appendTo( '.hmbkp-form p.submit' );
+            }
+
+
+            $( '.recurring-setting' ).hide();
+
+            hmbkpToggleScheduleFields( $('select#hmbkp_schedule_recurrence_type').val() );
+
+            $( document ).on( 'change', 'select#hmbkp_schedule_recurrence_type', function() {
+                hmbkpToggleScheduleFields( $( this ).val() );
+            } );
+
+            $.colorbox.resize();
+
         }
 
@@ -51 +58 @@
     // Resize the colorbox when switching tabs
     $( document).on( 'click', '.ui-tabs-anchor', function( e ) {
-        $.colorbox.resize(resize_options);
+        $.colorbox.resize();
     } );
 
@@ -87 +94 @@
         }
 
-        $( this ).addClass( 'hmbkp-ajax-loading' );
+        $( this ).addClass( 'hmbkp-ajax-loading' ).attr( 'disabled', 'disabled' );
 
         $.post(
@@ -105 +112 @@
                 $( '.hmbkp-edit-schedule-excludes-form' ).addClass( 'hmbkp-exclude-preview-open' );
 
-                $.colorbox.resize(resize_options);
+                $.colorbox.resize();
 
             }
@@ -137 +144 @@
          $( '.hmbkp-edit-schedule-excludes-form' ).removeClass( 'hmbkp-exclude-preview-open' );
 
+         $.colorbox.resize();
+
     } );
 
@@ -142 +151 @@
     $( document ).on( 'click', '.hmbkp_save_exclude_rule', function() {
 
-        $( this ).addClass( 'hmbkp-ajax-loading' );
+        $( this ).addClass( 'hmbkp-ajax-loading' ).attr( 'disabled', 'disabled' );
 
         $.post(
@@ -151 +160 @@
                 $( '.hmbkp-edit-schedule-excludes-form' ).show();
                 $( '.hmbkp-tabs' ).tabs();
-                $.colorbox.resize(resize_options);
+                $.colorbox.resize();
             }
         );
@@ -160 +169 @@
     $( document ).on( 'click', '.hmbkp-edit-schedule-excludes-form td a', function( e ) {
 
-        $( this ).addClass( 'hmbkp-ajax-loading' ).text( '' );
-
-        $.colorbox.resize(resize_options);
+        $( this ).addClass( 'hmbkp-ajax-loading' ).text( '' ).attr( 'disabled', 'disabled' );
+
+        $.colorbox.resize( resize_options );
 
         e.preventDefault();
@@ -173 +182 @@
                 $( '.hmbkp-edit-schedule-excludes-form' ).show();
                 $( '.hmbkp-tabs' ).tabs();
-                $.colorbox.resize(resize_options);
+                $.colorbox.resize();
             }
         );
@@ -184 +193 @@
         var $isDestinationSettingsForm = $( this ).find( 'button[type="submit"]' ).hasClass( "dest-settings-save" );
 
-        isNewSchedule = $( this ).closest( 'form' ).attr( 'data-schedule-action' ) == 'add' ? true : false;
-        scheduleId    = $( this ).closest( 'form' ).find( '[name="hmbkp_schedule_id"]' ).val();
+        var isNewSchedule = $( this ).closest( 'form' ).attr( 'data-schedule-action' ) == 'add' ? true : false;
+        var scheduleId    = $( this ).closest( 'form' ).find( '[name="hmbkp_schedule_id"]' ).val();
 
         // Only continue if we have a schedule id
@@ -195 +204 @@
             return false;
 
-        $( this ).find( 'button[type="submit"]' ).addClass( 'hmbkp-ajax-loading' );
+        $( this ).find( 'button[type="submit"]' ).addClass( 'hmbkp-ajax-loading' ).attr( 'disabled', 'disabled' );
 
         $( '.hmbkp-error span' ).remove();
@@ -204 +213 @@
         $.get(
             ajaxurl + '?' + $( this ).serialize(),
-            { 'action'  : 'hmnkp_edit_schedule_submit' },
-            function( data ) {
-
-                // Assume success if no data passed back
-                if ( ( ! data || data == 0 ) && ( $isDestinationSettingsForm === false ) ) {
+            { 'action'  : 'hmbkp_edit_schedule_submit' },
+            function( data ) {
+
+                if ( ( data.success === true ) && ( $isDestinationSettingsForm === false ) ) {
 
                     $.colorbox.close();
@@ -219 +227 @@
                         location.reload();
 
-                } else if( ! data || data == 0 ) {
+                } else if( data.success === true ) {
                     // nothing for now
                 } else {
 
                     // Get the errors json string
-                    var errors = JSON.parse( data );
+                    var errors = data.data;
 
                     // Loop through the errors
                     $.each( errors, function( key, value ) {
 
+                        var selector = key.replace(/(:|\.|\[|\])/g,'\\$1');
+
                         // Focus the first field that errored
                         if ( typeof( hmbkp_focused ) == 'undefined' ) {
 
-                            $( '[name="' + key + '"]' ).focus();
+                            $( '#' + selector ).focus();
 
                             hmbkp_focused = true;
@@ -239 +249 @@
 
                         // Add an error class to all fields with errors
-                        $( '[name="' + key + '"]' ).closest( 'label' ).addClass( 'hmbkp-error' );
+                        $( 'label[for=' + selector + ']' ).addClass( 'hmbkp-error' );
+
+                        $( '#' + selector ).next( 'span' ).remove();
 
                         // Add the error message
-                        $( '[name="' + key + '"]' ).after( '<span>' + value + '</span>' );
+                        $( '#' + selector ).after( '<span class="hmbkp-error">' + value + '</span>' );
+
 
                     } );
@@ -286 +299 @@
         hmbkpRedirectOnBackupComplete( $( '[data-hmbkp-schedule-id]' ).attr( 'data-hmbkp-schedule-id' ), true );
 
+    // Run a backup
     $( document ).on( 'click', '.hmbkp-run', function( e ) {
 
@@ -299 +313 @@
         ).done( function( data ) {
 
-            catchResponseAndOfferToEmail( data );
+            hmbkpCatchResponseAndOfferToEmail( data );
 
         // Redirect back on error
         } ).fail( function( jqXHR, textStatus ) {
 
-            catchResponseAndOfferToEmail( jqXHR.responseText );
+                    hmbkpCatchResponseAndOfferToEmail( jqXHR.responseText );
 
         } );
@@ -318 +332 @@
 } );
 
-function catchResponseAndOfferToEmail( data ) {
-
-    // Carries the same resize options we want
-    // to use to all other .resize()
-    var resize_options = {
-        height: '85%'
-    };
+function hmbkpToggleScheduleFields( recurrence  ){
+
+    recurrence = typeof recurrence !== 'undefined' ? recurrence : 'manually';
+
+    var settingFields         = jQuery( '.recurring-setting');
+    var scheduleSettingFields = jQuery( '#schedule-start');
+    var twiceDailyNote        = jQuery( 'p.twice-js' );
+
+    switch( recurrence ) {
+
+        case 'manually':
+            settingFields.hide();
+            break;
+
+        case 'hmbkp_hourly' : // fall through
+        case 'hmbkp_daily' :
+            settingFields.hide();
+            scheduleSettingFields.show();
+            twiceDailyNote.hide();
+            break;
+
+        case 'hmbkp_twicedaily' :
+            settingFields.hide();
+            scheduleSettingFields.show();
+            twiceDailyNote.show();
+            break;
+
+        case 'hmbkp_weekly' : // fall through
+        case 'hmbkp_fortnightly' :
+            settingFields.hide();
+            jQuery( '#start-day' ).show();
+            scheduleSettingFields.show();
+            twiceDailyNote.hide();
+            break;
+
+        case 'hmbkp_monthly' :
+            settingFields.hide();
+            scheduleSettingFields.show();
+            jQuery( '#start-date' ).show();
+            twiceDailyNote.hide();
+            break;
+
+    }
+
+    jQuery.colorbox.resize();
+
+}
+
+function hmbkpCatchResponseAndOfferToEmail( data ) {
 
     // Backup Succeeded
@@ -345 +401 @@
                 jQuery.colorbox( {
                     'innerWidth'    : "320px",
-                    'maxHeight'     : "85%",
+                    'maxHeight'     : "100%",
                     'html'          : data,
                     'overlayClose'  : false,
@@ -351 +407 @@
                     'onLoad'        : function() {
                         jQuery( '#cboxClose' ).remove();
-                        jQuery.colorbox.resize(resize_options);
+                        jQuery.colorbox.resize();
                     }
                 } );
@@ -364 +420 @@
         e.preventDefault();
 
-        jQuery( this ).addClass( 'hmbkp-ajax-loading' );
+        jQuery( this ).addClass( 'hmbkp-ajax-loading' ).attr( 'disabled', 'disabled' );
 
         jQuery.post(

backupwordpress/trunk/backupwordpress.php

@@ -6 +6 @@
 Description: Simple automated backups of your WordPress powered website. Once activated you'll find me under <strong>Tools &rarr; Backups</strong>.
 Author: Human Made Limited
-Version: 2.5
+Version: 2.6
 Author URI: http://hmn.md/
 */
@@ -62 +62 @@
 if ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) )
     define( 'WP_MAX_MEMORY_LIMIT', '256M' );
-
-if ( ! defined( 'HMBKP_SCHEDULE_TIME' ) )
-    define( 'HMBKP_SCHEDULE_TIME', '11pm' );
 
 if ( ! defined( 'HMBKP_ADMIN_PAGE' ) ) {

backupwordpress/trunk/classes/class-email.php

@@ -27 +27 @@
     public function field() { ?>
 
-    <label>
-
-            <?php _e( 'Email notification', 'hmbkp' ); ?>
-
-            <input type="email" name="<?php echo esc_attr( $this->get_field_name( 'email' ) ); ?>" value="<?php echo esc_attr( $this->get_field_value( 'email' ) ); ?>" />
-
-            <p class="description"><?php printf( __( 'Receive a notification email when a backup completes, if the backup is small enough (&lt; %s) then it will be attached to the email. Separate multiple email address\'s with a comma.', 'hmbkp' ), '<code>' . size_format( hmbkp_get_max_attachment_size() ) . '</code>' ); ?></p>
-
-        </label>
+        <div>
+
+            <label for="<?php echo esc_attr( $this->get_field_name( 'email' ) ); ?>"><?php _e( 'Email notification', 'hmbkp' ); ?></label>
+
+            <input type="email" id="<?php echo esc_attr( $this->get_field_name( 'email' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'email' ) ); ?>" value="<?php echo esc_attr( $this->get_field_value( 'email' ) ); ?>" />
+
+       <p class="description"><?php printf( __( 'Receive a notification email when a backup completes, if the backup is small enough (&lt; %s) then it will be attached to the email. Separate multiple email address\'s with a comma.', 'hmbkp' ), '<code>' . size_format( hmbkp_get_max_attachment_size() ) . '</code>' ); ?></p>
+
+        </div>
 
     <?php }
@@ -51 +51 @@
     public static function constant() { ?>
 
-        <dt<?php if ( defined( 'HMBKP_ATTACHMENT_MAX_FILESIZE' ) ) { ?> class="hmbkp_active"<?php } ?>><code>HMBKP_ATTACHMENT_MAX_FILESIZE</code></dt>
-        <dd><p><?php printf( __( 'The maximum filesize of your backup that will be attached to your notification emails . Defaults to %s.', 'hmbkp' ), '<code>10MB</code>' ); ?><p class="example"><?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ATTACHMENT_MAX_FILESIZE', '25MB' );</code></p></dd>
+        <tr<?php if ( defined( 'HMBKP_ATTACHMENT_MAX_FILESIZE' ) ) { ?> class="hmbkp_active"<?php } ?>>
+
+            <td><code>HMBKP_ATTACHMENT_MAX_FILESIZE</code></td>
+
+            <td>
+
+                <?php if ( defined( 'HMBKP_ATTACHMENT_MAX_FILESIZE' ) ) { ?>
+                <p><?php printf( __( 'You\'ve set it to: %s', 'hmbkp' ), '<code>' . HMBKP_ATTACHMENT_MAX_FILESIZE . '</code>' ); ?></p>
+                <?php } ?>
+
+                <p><?php printf( __( 'The maximum filesize of your backup that will be attached to your notification emails . Defaults to %s.', 'hmbkp' ), '<code>10MB</code>' ); ?> <?php _e( 'e.g.', 'hmbkp' ); ?> <code>define( 'HMBKP_ATTACHMENT_MAX_FILESIZE', '25MB' );</code></p>
+
+            </td>
+
+        </tr>
 
     <?php }
@@ -74 +87 @@
 
     }
-    
+
     /**
      * Used to determine if the service is in use or not
@@ -95 +108 @@
         if ( isset( $new_data['email'] ) ) {
 
-            if ( ! empty( $new_data['email'] ) )
-                foreach ( explode( ',', $new_data['email'] ) as $email )
-                    if ( ! is_email( $email ) )
+            if ( ! empty( $new_data['email'] ) ) {
+
+                foreach ( explode( ',', $new_data['email'] ) as $email ) {
+
+                    $email = trim( $email );
+
+                    if ( ! is_email( $email ) ) {
                         $errors['email'] = sprintf( __( '%s isn\'t a valid email',  'hmbkp' ), $email );
-
-            if ( ! empty( $errors['email'] ) )
-                $new_data['email'] = '';
+                    }
+
+                    if ( ! empty( $errors['email'] ) ) {
+                        $new_data['email'] = '';
+                    }
+
+                }
+
+            }
+
+            return $errors;
 
         }
-
-        return $errors;
 
     }

backupwordpress/trunk/classes/class-requirements.php

@@ -564 +564 @@
     protected function test() {
 
+        $backup_sizes = array();
+
         $schedules = HMBKP_Schedules::get_instance();
 

backupwordpress/trunk/classes/class-schedule.php

@@ -33 +33 @@
 
     /**
-     * The schedule start time
-     *
-     * (default value: current_time( 'timestamp' ))
-     *
-     * @var mixed
-     * @access private
-     */
-    private $schedule_start_time = 0;
-
-    /**
      * Setup the schedule object
      * Loads the options from the database and populates properties
@@ -86 +76 @@
             $this->set_zip_command_path( false );
 
+        if ( defined( 'HMBKP_SCHEDULE_START_TIME' ) && strtotime( 'HMBKP_SCHEDULE_START_TIME' ) )
+            $this->set_schedule_start_time( strtotime( 'HMBKP_SCHEDULE_START_TIME' ) );
+
         // Set the path - TODO remove external function dependancy
         $this->set_path( hmbkp_path() );
-
-        $hmbkp_schedules = $this->get_cron_schedules();
 
         // Set the archive filename to site name + schedule slug + date
@@ -96 +87 @@
 
         // Setup the schedule if it isn't set
-        if ( ( ! $this->get_next_occurrence() && in_array( $this->get_reoccurrence(), array_keys( $hmbkp_schedules ) ) ) || ( date( get_option( 'time_format' ), strtotime( HMBKP_SCHEDULE_TIME ) - ( get_option( 'gmt_offset' ) * 3600 ) ) !== date( get_option( 'time_format' ), $this->get_next_occurrence() ) ) )
+        if ( ( ! $this->is_cron_scheduled() && $this->get_reoccurrence() !== 'manually' ) ) {
             $this->schedule();
+        }
 
     }
@@ -133 +125 @@
     public function get_name() {
 
-        $reoccurence = ( 'manually' === $this->get_reoccurrence() ) ? $this->get_reoccurrence() : substr( $this->get_reoccurrence(), 6 );
-
-        return ucwords( $this->get_type() ) . ' ' . $reoccurence;
+        $recurrence = ( 'manually' === $this->get_reoccurrence() ) ? $this->get_reoccurrence() : substr( $this->get_reoccurrence(), 6 );
+
+        return ucwords( $this->get_type() ) . ' ' . $recurrence;
 
     }
@@ -235 +227 @@
 
         if ( empty( $max ) || ! is_int( $max ) )
-            return new WP_Error( 'hmbkp_invalid_type_error', sprintf( __( 'Argument 1 for %s must be a valid integer', 'hmbkp' ) ), __METHOD__ );
+            return new WP_Error( 'hmbkp_invalid_type_error', sprintf( __( 'Argument 1 for %s must be a valid integer', 'hmbkp' ), __METHOD__ ) );
 
         $this->options['max_backups'] = $max;
@@ -427 +419 @@
             return 0;
 
-        if ( empty( $this->schedule_start_time ) ) {
-
-            if ( defined( 'HMBKP_SCHEDULE_TIME' ) && HMBKP_SCHEDULE_TIME )
-                $date = strtotime( HMBKP_SCHEDULE_TIME );
-
-            else
-                $date = strtotime( '11pm' );
-
-            // Convert to UTC
-            $date -= get_option( 'gmt_offset' ) * 3600;
-
-            // if the scheduled time already passed today then start at the next interval instead
-            if ( $date <= strtotime( 'now' ) )
-                $date += $this->get_interval();
-
-            $this->set_schedule_start_time( $date );
-        }
-
-        return $this->schedule_start_time;
+        if ( ! empty( $this->options['schedule_start_time'] ) )
+            return $this->options['schedule_start_time'];
+
+        $this->set_schedule_start_time( time() );
+
+        return time();
 
     }
@@ -452 +431 @@
      * Set the schedule start time.
      *
-     * @access public
-     * @param int $timestamp in UTC
-     * @return void
-     */
-    public function set_schedule_start_time( $timestamp ) {
-        $this->schedule_start_time = $timestamp;
+     * @param array $args
+     */
+    public function set_schedule_start_time( $time ) {
+
+        // Don't allow setting the start time in the past
+        if ( (int) $time <= time() ) {
+            return new WP_Error( 'hmbkp_invalid_argument_error', sprintf( __( 'Argument 1 for %s must be a valid future timestamp', 'hmbkp' ), __METHOD__ ) );
+        }
+
+        $this->options['schedule_start_time'] = $time;
+
+        $this->schedule();
+
     }
 
@@ -468 +454 @@
 
         // Default to no reoccurrence
-        if ( empty( $this->options['reoccurrence'] ) )
+        if ( empty( $this->options['reoccurrence'] ) ) {
             $this->set_reoccurrence( 'manually' );
+        }
 
         return $this->options['reoccurrence'];
@@ -487 +474 @@
         // Check it's valid
         if ( ! is_string( $reoccurrence ) || ! trim( $reoccurrence ) || ( ! in_array( $reoccurrence, array_keys( $hmbkp_schedules ) ) ) && $reoccurrence !== 'manually' )
-            return new WP_Error( 'hmbkp_invalid_argument_error', sprintf( __( 'Argument 1 for %s must be a valid cron reoccurrence or "manually"', 'hmbkp' ) ), __METHOD__ );
-
-        if ( isset( $this->options['reoccurrence'] ) && $this->options['reoccurrence'] === $reoccurrence )
+            return new WP_Error( 'hmbkp_invalid_argument_error', sprintf( __( 'Argument 1 for %s must be a valid cron reoccurrence or "manually"', 'hmbkp' ), __METHOD__ ) );
+
+        // If the recurrence is already set to the same thing then there's no need to continue
+        if ( isset( $this->options['reoccurrence'] ) && $this->options['reoccurrence'] === $reoccurrence && $this->is_cron_scheduled() )
             return;
 
         $this->options['reoccurrence'] = $reoccurrence;
 
-        if ( $reoccurrence === 'manually' )
+        if ( $reoccurrence === 'manually' ) {
             $this->unschedule();
-
-        else
+        }
+
+        else {
             $this->schedule();
+        }
 
         return true;
+
     }
 
@@ -525 +516 @@
      * @return array
      */
-    public function get_cron_schedules() {
+    public static function get_cron_schedules() {
 
         $schedules = wp_get_schedules();
@@ -557 +548 @@
     }
 
+    public function is_cron_scheduled() {
+        return (bool) $this->get_next_occurrence();
+    }
+
 
     /**
      * Get the path to the backup running file that stores the running backup status
      *
-     * @access private
+     * @access public
      * @return string
      */
-    private function get_schedule_running_path() {
+    public function get_schedule_running_path() {
         return $this->get_path() . '/.schedule-' . $this->get_id() . '-running';
     }
@@ -578 +573 @@
         $this->unschedule();
 
-        wp_schedule_event( $this->get_schedule_start_time(), $this->get_reoccurrence(), 'hmbkp_schedule_hook', array( 'id' => $this->get_id() ) );
+        $schedule_timestamp = $this->get_schedule_start_time();
+
+        wp_schedule_event( $schedule_timestamp, $this->get_reoccurrence(), 'hmbkp_schedule_hook', array( 'id' => $this->get_id() ) );
 
     }
@@ -622 +619 @@
 
     /**
-     * Get the status of the running backup.
+     * Get the filename that the running status is stored in.
      *
      * @access public
      * @return string
      */
-    public function get_status() {
+    public function get_running_backup_filename() {
 
         if ( ! file_exists( $this->get_schedule_running_path() ) )
             return '';
 
-        $status = explode( '::', file_get_contents( $this->get_schedule_running_path() ) );
-
-        return end( $status );
-
-    }
-
-    /**
-     * Get the filename that the running status is stored in.
+        $status = json_decode( file_get_contents( $this->get_schedule_running_path() ) );
+
+        if ( ! empty( $status->filename ) )
+            return $status->filename;
+
+        return '';
+
+    }
+
+    /**
+     * Get the status of the running backup.
      *
      * @access public
      * @return string
      */
-    public function get_running_backup_filename() {
+    public function get_status() {
 
         if ( ! file_exists( $this->get_schedule_running_path() ) )
             return '';
 
-        $backup_running_file = explode( '::', file_get_contents( $this->get_schedule_running_path() ) );
-
-        return reset( $backup_running_file );
+        $status = json_decode( file_get_contents( $this->get_schedule_running_path() ) );
+
+        if ( ! empty( $status->status ) )
+            return $status->status;
+
+        return '';
+
     }
 
@@ -666 +670 @@
             return;
 
-        fwrite( $handle, $this->get_archive_filename() . '::' . $message );
+        $status = json_encode( (object) array(
+            'filename' => $this->get_archive_filename(),
+            'started'  => $this->get_schedule_running_start_time(),
+            'status'   => $message
+        ) );
+
+        fwrite( $handle, $status );
 
         fclose( $handle );
+
+    }
+
+    /**
+     * Set the time that the current running backup was started
+     *
+     * @access public
+     * @return int $timestamp
+     */
+    public function get_schedule_running_start_time() {
+
+        if ( ! file_exists( $this->get_schedule_running_path() ) )
+            return 0;
+
+        $status = json_decode( file_get_contents( $this->get_schedule_running_path() ) );
+
+        if ( ! empty( $status->started ) && (int) (string) $status->started === $status->started )
+            return $status->started;
+
+        return time();
 
     }
@@ -677 +707 @@
      */
     protected function do_action( $action ) {
-
-        switch ( $action ) :
-
-            case 'hmbkp_mysqldump_started' :
-
-                $this->set_status( sprintf( __( 'Dumping Database %s', 'hmbkp' ), '(<code>' . $this->get_mysqldump_method() . '</code>)' ) );
-                break;
-
-            case 'hmbkp_mysqldump_verify_started' :
-
-                $this->set_status( sprintf( __( 'Verifying Database Dump %s', 'hmbkp' ), '(<code>' . $this->get_mysqldump_method() . '</code>)' ) );
-                break;
-
-            case 'hmbkp_archive_started' :
-
-                $this->set_status( sprintf( __( 'Creating zip archive %s', 'hmbkp' ), '(<code>' . $this->get_archive_method() . '</code>)' ) );
-                break;
-
-            case 'hmbkp_archive_verify_started' :
-
-                $this->set_status( sprintf( __( 'Verifying Zip Archive %s', 'hmbkp' ), '(<code>' . $this->get_archive_method() . '</code>)' ) );
-                break;
-
-            case 'hmbkp_backup_complete' :
-
-                $this->set_status( __( 'Finishing Backup', 'hmbkp' ) );
-                break;
-
-            case 'hmbkp_error' :
-
-                if ( $this->get_errors() ) {
-
-                    $file = $this->get_path() . '/.backup_errors';
-
-                    if ( file_exists( $file ) )
-                        @unlink( $file );
-
-                    if ( ! $handle = @fopen( $file, 'w' ) )
-                        return;
-
-                    fwrite( $handle, json_encode( $this->get_errors() ) );
-
-                    fclose( $handle );
-
-                }
-
-                break;
-
-            case 'hmbkp_warning' :
-
-                if ( $this->get_warnings() ) {
-
-                    $file = $this->get_path() . '/.backup_warnings';
-
-                    if ( file_exists( $file ) )
-                        @unlink( $file );
-
-                    if ( ! $handle = @fopen( $file, 'w' ) )
-                        return;
-
-                    fwrite( $handle, json_encode( $this->get_warnings() ) );
-
-                    fclose( $handle );
-
-                }
-
-                break;
-
-        endswitch;
 
         // Pass the actions to all the services
@@ -755 +716 @@
         parent::do_action( $action );
 
+        switch ( $action ) :
+
+            case 'hmbkp_mysqldump_started' :
+
+                $this->set_status( sprintf( __( 'Dumping Database %s', 'hmbkp' ), '(<code>' . $this->get_mysqldump_method() . '</code>)' ) );
+                break;
+
+            case 'hmbkp_mysqldump_verify_started' :
+
+                $this->set_status( sprintf( __( 'Verifying Database Dump %s', 'hmbkp' ), '(<code>' . $this->get_mysqldump_method() . '</code>)' ) );
+                break;
+
+            case 'hmbkp_archive_started' :
+
+                $this->set_status( sprintf( __( 'Creating zip archive %s', 'hmbkp' ), '(<code>' . $this->get_archive_method() . '</code>)' ) );
+                break;
+
+            case 'hmbkp_archive_verify_started' :
+
+                $this->set_status( sprintf( __( 'Verifying Zip Archive %s', 'hmbkp' ), '(<code>' . $this->get_archive_method() . '</code>)' ) );
+                break;
+
+            case 'hmbkp_backup_complete' :
+
+                $this->set_status( __( 'Finishing Backup', 'hmbkp' ) );
+                break;
+
+            case 'hmbkp_error' :
+
+                if ( $this->get_errors() ) {
+
+                    $file = $this->get_path() . '/.backup_errors';
+
+                    if ( file_exists( $file ) )
+                        @unlink( $file );
+
+                    if ( ! $handle = @fopen( $file, 'w' ) )
+                        return;
+
+                    fwrite( $handle, json_encode( $this->get_errors() ) );
+
+                    fclose( $handle );
+
+                }
+
+                break;
+
+            case 'hmbkp_warning' :
+
+                if ( $this->get_warnings() ) {
+
+                    $file = $this->get_path() . '/.backup_warnings';
+
+                    if ( file_exists( $file ) )
+                        @unlink( $file );
+
+                    if ( ! $handle = @fopen( $file, 'w' ) )
+                        return;
+
+                    fwrite( $handle, json_encode( $this->get_warnings() ) );
+
+                    fclose( $handle );
+
+                }
+
+                break;
+
+        endswitch;
+
     }
 
@@ -807 +837 @@
         // Check that it's a valid filepath
         if ( empty( $filepath ) || ! is_string( $filepath ) )
-            return new WP_Error( 'hmbkp_empty_string_error', sprintf( __( 'Argument 1 for %s must be a non empty string', 'hmbkp' ) ), __METHOD__ );
+            return new WP_Error( 'hmbkp_empty_string_error', sprintf( __( 'Argument 1 for %s must be a non empty string', 'hmbkp' ), __METHOD__ ) );
 
         // Make sure it exists
         if ( ! file_exists( $filepath ) )
-            return new WP_Error( 'hmbkp_file_error', sprintf( __( '%s dpesn\'t exist', 'hmbkp' ) ), $filepath );
+            return new WP_Error( 'hmbkp_file_error', sprintf( __( '%s doesn\'t exist', 'hmbkp' ), $filepath ) );
 
         // Make sure it was created by this schedule
         if ( strpos( $filepath, $this->get_id() ) === false )
-            return new WP_Error( 'hmbkp_backup_error', sprintf( __( 'That backup wasn\'t created by this schedule', 'hmbkp' ) ) );
+            return new WP_Error( 'hmbkp_backup_error', __( 'That backup wasn\'t created by this schedule', 'hmbkp' ) );
 
         unlink( $filepath );
 
         return true;
+
     }
 

backupwordpress/trunk/classes/class-schedules.php

@@ -30 +30 @@
      */
     private function __construct() {
+        $this->refresh_schedules();
+    }
+
+    public function refresh_schedules() {
 
         global $wpdb;

backupwordpress/trunk/classes/wp-cli.php

@@ -10 +10 @@
 class BackUpCommand extends WP_CLI_Command {
 
-    public function __construct( $args, $assoc_args ) {
+    /**
+     * Generate some posts.
+     *
+     * ## OPTIONS
+     *
+     * [--files_only]
+     * : Backup files only, default to off
+     *
+     * [--database_only]
+     * : Backup database only, defaults to off
+     *
+     * [--path]
+     * : dir that the backup should be save in, defaults to wp-content/backups/
+     *
+     * [--root]
+     * : dir that should be backed up, defaults to site root.
+     *
+     * [--zip_command_path]
+     * : path to your zip binary, standard locations are automatically used
+     *
+     * [--mysqldump_command_path]
+     * : path to your mysqldump binary, standard locations are automatically used
+     *
+     * ## Usage
+     *
+     *     wp backupwordpress backup [--files_only] [--database_only] [--path<dir>] [--root<dir>] [--zip_command_path=<path>] [--mysqldump_command_path=<path>]
+     */
+    public function backup( $args, $assoc_args ) {
 
         // Make sure it's possible to do a backup
@@ -73 +100 @@
     }
 
-    static function help() {
-
-        WP_CLI::line( <<<EOB
-usage: wp backup [--files_only] [--database_only] [--path<dir>] [--root<dir>] [--zip_command_path=<path>] [--mysqldump_command_path=<path>]
-
-     --files_only                   Backup files only, default to off
-     --database_only                Backup database only, defaults to off
-     --path                         dir that the backup should be save in, defaults to wp-content/backups/
-     --root                         dir that should be backed up, defaults to site root.
-     --zip_command_path             path to your zip binary, standard locations are automatically used
-     --mysqldump_command_path       path to your mysqldump binary, standard locations are automatically used
-
-EOB
-        );
-
-    }
-
 }
-WP_CLI::add_command( 'backup', 'BackUpCommand' );
+WP_CLI::add_command( 'backupwordpress', 'BackUpCommand' );

backupwordpress/trunk/functions/core.php

@@ -212 +212 @@
     $database_daily = new HMBKP_Scheduled_Backup( 'default-1' );
     $database_daily->set_type( 'database' );
+    $database_daily->set_schedule_start_time( hmbkp_determine_start_time( 'hmbkp_daily', array( 'hours' => '23', 'minutes' => '0' ) ) );
     $database_daily->set_reoccurrence( 'hmbkp_daily' );
     $database_daily->set_max_backups( 14 );
@@ -222 +223 @@
     $complete_weekly = new HMBKP_Scheduled_Backup( 'default-2' );
     $complete_weekly->set_type( 'complete' );
+    $complete_weekly->set_schedule_start_time( hmbkp_determine_start_time( 'hmbkp_weekly', array( 'day_of_week' => 'sunday', 'hours' => '3', 'minutes' => '0' ) ) );
     $complete_weekly->set_reoccurrence( 'hmbkp_weekly' );
     $complete_weekly->set_max_backups( 12 );
     $complete_weekly->save();
+
+    $schedules->refresh_schedules();
 
     function hmbkp_default_schedules_setup_warning() {
@@ -272 +276 @@
         @unlink( $dir );
 
-    if ( ! is_dir( $dir ) )
+    if ( ! is_dir( $dir ) || ! is_readable( $dir ) )
         return false;
 
@@ -446 +450 @@
         return false;
 
+    $test_backup = new HMBKP_Scheduled_Backup( 'test_backup' );
+
+    if ( ! is_readable( $test_backup->get_root() ) )
+        return false;
+
     return true;
 }
@@ -467 +476 @@
 
         while ( false !== ( $file = readdir( $handle ) ) ) {
-            if ( ! in_array( $file, array( '.', '..', 'index.html' ) ) && pathinfo( $file, PATHINFO_EXTENSION ) !== 'zip' )
+            if ( ! in_array( $file, array( '.', '..', 'index.html' ) ) && pathinfo( $file, PATHINFO_EXTENSION ) !== 'zip' && strpos( $file, '-running' ) === false )
                 hmbkp_rmdirtree( trailingslashit( $hmbkp_path ) . $file );
         }
@@ -525 +534 @@
     return true;
 }
+
+/**
+ * List of schedules
+ *
+ * @return array
+ */
+function hmbkp_get_cron_schedules() {
+
+    $schedules = wp_get_schedules();
+
+    // remove any schedule whose key is not prefixed with 'hmbkp_'
+    foreach ( $schedules as $key => $arr ) {
+        if ( ! preg_match( '/^hmbkp_/', $key ) )
+            unset( $schedules[$key] );
+    }
+
+    return $schedules;
+}
+
+/**
+ * @param string $type the type of the schedule
+ * @param array $times {
+ *     An array of time arguments. Optional.
+ *
+ *     @type int $minutes          The minute to start the schedule on. Defaults to current time + 10 minutes. Accepts
+ *                                 any valid `date( 'i' )` output.
+ *     @type int $hours            The hour to start the schedule on. Defaults to current time + 10 minutes. Accepts
+ *                                 any valid `date( 'G' )` output.
+ *     @type string $day_of_week   The day of the week to start the schedule on. Defaults to current time + 10 minutes. Accepts
+ *                                 any valid `date( 'l' )` output.
+ *     @type int $day_of_month     The day of the month to start the schedule on. Defaults to current time + 10 minutes. Accepts
+ *                                 any valid `date( 'j' )` output.
+ *     @type int $now              The current time. Defaults to `time()`. Accepts any valid timestamp.
+ *
+ * }
+ * @return int $timestamp Returns the resulting timestamp on success and Int 0 on failure
+ */
+function hmbkp_determine_start_time( $type, $times = array() ) {
+
+    // Default to in 10 minutes
+    if ( ! empty( $times['now'] ) ) {
+        $default_timestamp = $times['now'] + 600;
+
+    } else {
+        $default_timestamp = time() + 600;
+    }
+
+    $default_times = array(
+        'minutes'      => date( 'i', $default_timestamp ),
+        'hours'        => date( 'G', $default_timestamp ),
+        'day_of_week'  => date( 'l', $default_timestamp ),
+        'day_of_month' => date( 'j', $default_timestamp ),
+        'now'          => time()
+    );
+
+    $args = wp_parse_args( $times, $default_times );
+
+    $schedule_start = '';
+
+    $intervals = HMBKP_Scheduled_Backup::get_cron_schedules();
+
+    // Allow the hours and minutes to be overwritten by a constant
+    if ( defined( 'HMBKP_SCHEDULE_TIME' ) && HMBKP_SCHEDULE_TIME ) {
+        $hm = HMBKP_SCHEDULE_TIME;
+    }
+
+    // The hour and minute that the schedule should start on
+    else {
+        $hm = $args['hours'] . ':' . $args['minutes'] . ':00';
+    }
+
+    switch ( $type ) {
+
+        case 'hmbkp_hourly' :
+        case 'hmbkp_daily' :
+        case 'hmbkp_twicedaily':
+
+            // The next occurance of the specified time
+            $schedule_start = $hm;
+            break;
+
+        case 'hmbkp_weekly' :
+        case 'hmbkp_fortnightly' :
+
+            // The next day of the week at the specified time
+            $schedule_start = $args['day_of_week'] . ' ' . $hm;
+            break;
+
+        case 'hmbkp_monthly' :
+
+            // The occurance of the time on the specified day of the month
+            $schedule_start = date( 'F', $args['now'] ) . ' ' . $args['day_of_month'] . ' ' . $hm;
+
+            // If we've already gone past that day this month then we'll need to start next month
+            if ( strtotime( $schedule_start, $args['now'] ) <= $args['now'] )
+                $schedule_start = date( 'F', strtotime( '+ 1 month', $args['now'] ) )  . ' ' . $args['day_of_month'] . ' ' . $hm;
+
+            // If that's still in the past then we'll need to jump to next year
+            if ( strtotime( $schedule_start, $args['now'] ) <= $args['now'] )
+                $schedule_start = date( 'F', strtotime( '+ 1 month', $args['now'] ) )  . ' ' . $args['day_of_month'] . ' ' . date( 'Y', strtotime( '+ 1 year', $args['now'] ) ) . ' ' . $hm;
+
+            break;
+        default :
+
+            return 0;
+
+            break;
+
+    }
+
+    $timestamp = strtotime( $schedule_start, $args['now'] );
+
+    // Convert to UTC
+    $timestamp -= get_option( 'gmt_offset' ) * 3600;
+
+    // If the scheduled time already passed then keep adding the interval until we get to a future date
+    while ( $timestamp <= $args['now'] ) {
+        $timestamp += $intervals[ $type ]['interval'];
+    }
+
+    return $timestamp;
+
+}

backupwordpress/trunk/functions/interface.php

@@ -125 +125 @@
     endif;
 
+    $test_backup = new HMBKP_Scheduled_Backup( 'test_backup' );
+
+    if ( ! is_readable( $test_backup->get_root() ) ) :
+
+        function hmbkp_backup_root_unreadable_notice() {
+            $test_backup = new HMBKP_Scheduled_Backup( 'test_backup' );
+            echo '<div id="hmbkp-warning" class="updated fade"><p><strong>' . __( 'BackUpWordPress has detected a problem.', 'hmbkp' ) . '</strong>' . sprintf( __( 'Your backup root path %s isn\'t readable.', 'hmbkp' ), '<code>' . $test_backup->get_root() . '</code>' ) . '</p></div>';
+        }
+
+        add_action( 'admin_notices', 'hmbkp_backup_root_unreadable_notice' );
+
+    endif;
+
 }
 
@@ -278 +291 @@
     ob_start(); ?>
 
-    <span class="hmbkp-status"><?php echo $schedule->get_status() ? wp_kses_data( $schedule->get_status() ) : __( 'Starting Backup', 'hmbkp' ); ?> <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'hmbkp_cancel', 'hmbkp_schedule_id' => $schedule->get_id() ), $settings_url ) ); ?>"><?php _e( 'cancel', 'hmbkp' ); ?></a></span>
+    <span class="hmbkp-status"<?php if ( $schedule->get_status() ) { ?> title="<?php printf( __( 'Started %s ago', 'hmbkp' ), human_time_diff( $schedule->get_schedule_running_start_time() ) ); ?>"<?php } ?>>
+        <?php echo $schedule->get_status() ? wp_kses_data( $schedule->get_status() ) : __( 'Starting Backup', 'hmbkp' ); ?>
+        <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'hmbkp_cancel', 'hmbkp_schedule_id' => $schedule->get_id() ), $settings_url ) ); ?>"><?php _e( 'cancel', 'hmbkp' ); ?></a>
+    </span>
 
     <div class="hmbkp-schedule-actions row-actions">

backupwordpress/trunk/hm-backup/hm-backup.php

@@ -182 +182 @@
         if ( array_intersect( array( 'shell_exec', 'escapeshellarg', 'escapeshellcmd' ), array_map( 'trim', explode( ',', @ini_get( 'disable_functions' ) ) ) ) )
             return false;
-        
+
         // Functions can also be disabled via suhosin
         if ( array_intersect( array( 'shell_exec', 'escapeshellarg', 'escapeshellcmd' ), array_map( 'trim', explode( ',', @ini_get( 'suhosin.executor.func.blacklist' ) ) ) ) )
@@ -208 +208 @@
 
         $home_path = ABSPATH;
+
+        // Attempt to guess the home path based on the location of wp-config.php
+        if ( ! file_exists( ABSPATH . 'wp-config.php' ) ) {
+            $home_path = trailingslashit( dirname( ABSPATH ) );
+        }
 
         // If site_url contains home_url and they differ then assume WordPress is installed in a sub directory
@@ -510 +515 @@
         );
 
-        // Find the one which works
+        // Find the first one which works
         foreach ( $mysqldump_locations as $location ) {
-            if ( @is_executable( self::conform_dir( $location ) ) )
+            if ( @is_executable( self::conform_dir( $location ) ) ) {
                 $this->set_mysqldump_command_path( $location );
+                break;  // Found one
+            }
         }
 
@@ -571 +578 @@
         );
 
-        // Find the one which works
+        // Find the first one which works
         foreach ( $zip_locations as $location ) {
-            if ( @is_executable( self::conform_dir( $location ) ) )
+            if ( @is_executable( self::conform_dir( $location ) ) ) {
                 $this->set_zip_command_path( $location );
+                break;  // Found one
+            }
         }
 

backupwordpress/trunk/readme.txt

@@ -3 +3 @@
 Tags: back up, backup, backups, database, zip, db, files, archive, wp-cli, humanmade
 Requires at least: 3.7.1
-Tested up to: 3.8.1
-Stable tag: 2.5
-
-Simple automated back ups of your WordPress powered website.
+Tested up to: 3.9
+Stable tag: 2.6
+
+Simple automated backups of your WordPress powered website.
 
 == Description ==
 
-[BackUpWordPress](http://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=plugin-page&utm_campaign=freeplugin) will back up your entire site including your database and all your files on a schedule that suits you. Try it now to see how easy it is!
+[BackUpWordPress](https://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=plugin-page&utm_campaign=freeplugin) will back up your entire site including your database and all your files on a schedule that suits you. Try it now to see how easy it is!
 
 = Features =
@@ -18 +18 @@
 * Manage multiple schedules.
 * Option to have each backup file emailed to you.
-* Uses `zip` and `mysqldump` for faster back ups if they are available.
+* Uses `zip` and `mysqldump` for faster backups if they are available.
 * Works on Linux & Windows Server.
-* Exclude files and folders from your back ups.
+* Exclude files and folders from your backups.
 * Good support should you need help.
 * Translations for Spanish, German, Chinese, Romanian, Russian, Serbian, Lithuanian, Italian, Czech, Dutch, French, Basque.
@@ -50 +50 @@
 **What if I want I want to back up my site to another destination?**
 
-BackUpWordPress Pro supports Dropbox, Google Drive, Amazon S3, Rackspace, Azure, DreamObjects and FTP/SFTP. Check it out here: [http://bwp.hmn.md](http://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=plugin-page&utm_campaign=freeplugin)
+BackUpWordPress Pro supports Dropbox, Google Drive, Amazon S3, Rackspace, Azure, DreamObjects and FTP/SFTP. Check it out here: [https://bwp.hmn.md](http://bwp.hmn.md/?utm_source=wordpress-org&utm_medium=plugin-page&utm_campaign=freeplugin)
 
 **How do I restore my site from a backup?**
@@ -107 +107 @@
 
 == Changelog ==
+
+#### 2.6
+
+* It's now possible to choose the time and day that your schedule will run on.
+* Introduces several new unit tests around schedule timings.
+* Fixes a bug that could cause the hourly schedule to run constantly.
+* Improved the layout of the Constants help panel.
+* If the backup root directory is unreadable then the plugin will no longer function.
+* Update the backups table match the standard WordPress table styles.
+* Improved styling for the settings dialogue.
+* Improved styling for the Server Info help tab.
+* /s/back ups/backups.
+* Remove Deprecated call to `screen_icon`.
+* Updated French translation.
+* Update the `WP CLI` command to use the new method for registering command.
+* Reload the schedules when re-setting up the default schedules so they show up straight away.
+* s/dpesnt't/doesn't.
+* Only show the estimated total schedule size when editing an existing schedule.
+* Stop stripping 0 from the minutes on hourly backups so that backups at 10 (& 20, etc.) past the hour correctly show.
+* Disable buttons whilst ajax requests are running.
+* Move spinners outside the buttons as they didn't look very good inside.
+* Improve the detection of the home path on multisite installs which have WordPress in a subdirectory.
+* Track the time that the running backup is started and display how long a backup has been running for.
+* Fix an issue that meant it wasn't possible to run multiple manual backups at the same time.
+* Many other minor improvements.
 
 #### 2.5

backupwordpress/trunk/uninstall.php

@@ -3 +3 @@
 if ( ! defined( 'HMBKP_PLUGIN_PATH' ) )
     define( 'HMBKP_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
-
-if ( ! defined( 'HMBKP_SCHEDULE_TIME' ) )
-    define( 'HMBKP_SCHEDULE_TIME', '11pm' );
 
 // Load the schedules