Changeset 547958

Timestamp:

05/23/2012 10:57:07 AM (13 years ago)

Author:

hel.io

Message:

Fixed some more frequency problems

Location:

backup/trunk

Files:

• backup.php (modified) (11 diffs)
• readme.txt (modified) (2 diffs)

backup/trunk/backup.php

@@ -2 +2 @@
 /*
 Plugin Name: Backup
-Version: 1.1.1
+Version: 1.1.2
 Plugin URI: http://hel.io/wordpress/backup/
 Description: Backup your WordPress website to Google Drive.
@@ -68 +68 @@
         'client_secret' => '',
         'last_backup' => '',
-        'number_of_backups' => 10,
+        'local_number' => 10,
+        'drive_number' => 10,
         'local_files' => array(),
         'drive_files' => array(),
@@ -77 +78 @@
     
 }
+
+/**
+ * Backup Deactivation
+ *
+ * This function is called whenever the plugin is being deactivated and removes
+ * all files and directories it created as well as the options stored in the database.
+ * It also revokes access to the Google Account associated with it and removes all scheduled events created.
+ */
+function backup_deactivation() {
+    $options = get_option( 'backup_options' );
+    if ( ! empty( $options['token'] ) )
+        @file_get_contents( 'https://accounts.google.com/o/oauth2/revoke?token=' . $options['token'] );
+    delete_option( 'backup_options' );
+    if ( wp_next_scheduled( 'backup_schedule' ) ) {
+        wp_clear_scheduled_hook('backup_schedule');
+    }
+    rrmdir( WP_CONTENT_DIR . '/backup' );
+    if ( file_exists( WP_CONTENT_DIR . '/backup.sql' ) )
+        unlink( WP_CONTENT_DIR . '/backup.sql' );
+}
+register_deactivation_hook( __FILE__, 'backup_deactivation' );
 
 // Add custom schedule intervals
@@ -198 +220 @@
                         <th scope="row"><?php _e( 'Store a maximum of', 'backup' ); ?></th>
                         <td>
-                            <input name='number' type='text' class='small-text' value='<?php echo $options['number_of_backups']; ?>' /> <?php _e( 'backups.', 'backup' ); ?>
-                            <span class="description"><?php _e( 'Oldest backups will be deleted first.', 'backup' ) ?></span>
-
+                            <input name='local_number' type='text' class='small-text' value='<?php echo $options['local_number']; ?>' /> <?php _e( 'backups locally and ', 'backup' ); ?>
+                            <input name='drive_number' type='text' class='small-text' value='<?php echo $options['drive_number']; ?>' /> <?php _e( 'backups on Google Drive.', 'backup' ); ?>
                         </td>
                     </tr>
@@ -206 +227 @@
                         <th scope="row"><?php _e( 'When to backup', 'backup' ); ?></th>
                         <td> 
-                            <select name='frequency'>   
+                            <select name='frequency'>
                                 <option value='never' <?php selected( 'never', $options['frequency'] ); ?> ><?php _e( 'Never', 'backup' ); ?></option>
                                 <option value='daily' <?php selected( 'daily', $options['frequency'] ); ?> ><?php _e( 'Daily', 'backup' ); ?></option>
@@ -236 +257 @@
 
         // If number isn't an integer stop function execution
-        if ( ! (int) $_POST['number'] )
+        $local_number = intval( $_POST['local_number'] );
+        $drive_number = intval( $_POST['drive_number'] );
+        if ( $local_number < 0 || $drive_number < 0 )
             return false;
         
         $options['folder'] = $_POST['folder'];
         $options['frequency'] = $_POST['frequency'];
-        $options['number_of_backups'] = $_POST['number'];
+        $options['local_number'] = $local_number;
+        $options['drive_number'] = $drive_number;
 
         update_option( 'backup_options', $options );
+
+        // If we have already scheduled a backup before, clear it first
+        if ( wp_next_scheduled( 'backup_schedule' ) ) {
+            wp_clear_scheduled_hook('backup_schedule');
+        }
 
         // Schedule backup if frequency is something else than never
         if ( $options['frequency'] != 'never' ) {
-
-            // If we have already scheduled a backup before, clear it first
-            if ( wp_next_scheduled( 'backup_schedule' ) ) {
-                wp_clear_scheduled_hook('backup_schedule');
-            }
-
-            // Schedule backups
             wp_schedule_event( current_time( 'timestamp' ), $options['frequency'], 'backup_schedule');
         }    
@@ -294 +316 @@
         $options['last_backup'] = $backup_time;
         $options['local_files'][] = $file_path;
-        if ( count( $options['local_files'] ) > $options['number_of_backups'] )
+        if ( count( $options['local_files'] ) > $options['local_number'] )
             if ( unlink( $f = array_shift( $options['local_files'] ) ) )
                 backup_log( 'NOTICE', 'Deleted old backup file ' . $f );
@@ -300 +322 @@
                 backup_log( 'WARNING', 'Could not delete file ' . $f );
         if ( $options['token'] && $options['client_id'] && $options['client_secret'] ) {
-            $access = access_token( $options['token'], $options['client_id'], $options['client_secret'] );
-            backup_log( 'NOTICE', 'Attempting to upload archive to Google Drive' );
-            $timer_start = microtime( true );
-            if ( ! $id = upload_file( $file_path, $file_name, $options['folder'], $access ) )
-                backup_log( 'ERROR', 'Failed to upload archive to Google Drive!' );
+            if ( $access = access_token( $options['token'], $options['client_id'], $options['client_secret'] ) ) {
+                backup_log( 'NOTICE', 'Attempting to upload archive to Google Drive' );
+                $timer_start = microtime( true );
+                if ( ! $id = upload_file( $file_path, $file_name, $options['folder'], $access ) )
+                    backup_log( 'ERROR', 'Failed to upload archive to Google Drive!' );
+                else {
+                    backup_log( 'NOTICE', 'Archive ' . $file_name . ' uploaded to Google Drive in ' . ( microtime( true ) - $timer_start ) . ' seconds' );
+                    $options['drive_files'][] = $id;
+                    if ( count( $options['drive_files'] ) > $options['drive_number'] )
+                        if ( delete_file( $r = array_shift( $options['drive_files'] ), $access ) )
+                            backup_log( 'NOTICE', 'Deleted Google Drive file ' . $r );
+                        else    
+                            backup_log( 'WARNING', 'Could not delete Google Drive file ' . $r );
+                }
+            }
             else {
-                backup_log( 'NOTICE', 'Archive ' . $file_name . ' uploaded to Google Drive in ' . ( microtime( true ) - $timer_start ) . ' seconds' );
-                $options['drive_files'][] = $id;
-                if ( count( $options['drive_files'] ) > $options['number_of_backups'] )
-                    if ( delete_file( $r = array_shift( $options['drive_files'] ), $access ) )
-                        backup_log( 'NOTICE', 'Deleted Google Drive file ' . $r );
-                    else    
-                        backup_log( 'WARNING', 'Could not delete Google Drive file ' . $r );
-            }
+                backup_log( 'ERROR', 'Did not receive an access token from Google!', __FILE__, __LINE__ );
+            }    
         }
         update_option( 'backup_options', $options );
@@ -362 +388 @@
     
     $result = @file_get_contents( $url, false, stream_context_create( $context ) );
-    if ( strpos( array_shift( $http_response_header ), '200' ) ) {
-        $response_header = array();
-        foreach ( $http_response_header as $header_line ) {
-            list( $key, $value ) = explode( ':', $header_line, 2 );
-            $response_header[trim( $key )] = trim( $value );
-        }
-        if ( isset( $response_header['Location'] ) ) {
-            $next_location = $response_header['Location'];
-            $pointer = 0;
-            $max_chunk_size = 524288;
-            while ( $pointer < $size - 1 ) {
-                $chunk = file_get_contents( $file, false, NULL, $pointer, $max_chunk_size );
-                $next_location = upload_chunk( $next_location, $chunk, $pointer, $size, $token );
-                if( $next_location === false ) {
-                    return false;
-                }    
-                // if object it means we have our simpleXMLElement response
-                if ( is_object( $next_location ) ) {
-                    // return resource Id
-                    return substr( $next_location->children( "http://schemas.google.com/g/2005" )->resourceId, 5 );
+    if ( $result ) {
+        if ( strpos( $response = array_shift( $http_response_header ), '200' ) ) {
+            $response_header = array();
+            foreach ( $http_response_header as $header_line ) {
+                list( $key, $value ) = explode( ':', $header_line, 2 );
+                $response_header[trim( $key )] = trim( $value );
+            }
+            if ( isset( $response_header['Location'] ) ) {
+                $next_location = $response_header['Location'];
+                $pointer = 0;
+                $max_chunk_size = 524288;
+                while ( $pointer < $size - 1 ) {
+                    $chunk = file_get_contents( $file, false, NULL, $pointer, $max_chunk_size );
+                    $next_location = upload_chunk( $next_location, $chunk, $pointer, $size, $token );
+                    if( $next_location === false ) {
+                        return false;
+                    }    
+                    // if object it means we have our simpleXMLElement response
+                    if ( is_object( $next_location ) ) {
+                        // return resource Id
+                        return substr( $next_location->children( "http://schemas.google.com/g/2005" )->resourceId, 5 );
+                    }
+                    $pointer += strlen( $chunk );
+                    
                 }
-                $pointer += strlen( $chunk );
-                
-            }
-        } 
+            } 
+        }
+        else {
+            backup_log( 'ERROR', 'Bad response: ' . $response, __FILE__, __LINE__ );
+            return false;
+        }
+    }
+    else {
+        backup_log( 'ERROR', 'Unable to request file from ' . $url, __FILE__, __LINE__ );
     }    
-    return false;
 }
 /**
@@ -440 +474 @@
         }
         else {
-            backup_log( 'ERROR', 'Bad Response: ' . $response );
+            backup_log( 'ERROR', 'Bad response: ' . $response, __FILE__, __LINE__ );
             return false;
         }
@@ -768 +802 @@
 
 /**
+ * Recursively remove a directory
+ *
+ * @param string $dir The path to the directory to be removed
+ */
+function rrmdir( $dir ) {
+    foreach ( glob( $dir . '/*' ) as $file ) {
+        if ( is_dir( $file ) )
+            rrmdir( $file );
+        else
+            unlink( $file );
+    }
+    rmdir( $dir );
+}
+
+/**
  * Custom logging function for the backup plugin
  *

backup/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0
 Tested up to: 3.3.2
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 
 Make backups of your Wordpress site to Google Drive.
@@ -27 +27 @@
 == Changelog ==
 
+= 1.1.2 =
+* Added the ability to store a different number of backups locally then on Google Drive
+* On deactivation the plugin deletes all traces of itself (backups stored locally, options) and revokes access to the Google Account
+* Fixed some more frequency issues
+
 = 1.1.1 =
 * Fixed mothly backup frequency