Changeset 549264

Timestamp:

05/26/2012 11:06:33 AM (13 years ago)

Author:

hel.io

Message:

Resumable upload media link now requested from Google

Location:

backup/trunk

Files:

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

backup/trunk/backup.php

@@ -2 +2 @@
 /*
 Plugin Name: Backup
-Version: 1.1.4
+Version: 1.1.5
 Plugin URI: http://hel.io/wordpress/backup/
 Description: Backup your WordPress website to Google Drive.
@@ -27 +27 @@
         }
 
-        // check allow_url_fopen
+        // check zip extension
         if(!extension_loaded('zip')) {
             throw new Exception(__('Please load the \'zip\' PHP extension. It is needed in order to create the archive to be backed up.', 'backup'));
@@ -157 +157 @@
                         <div class="misc-pub-section"><?php _e( 'Most recent backup:', 'backup' ); ?><br/><?php 
                             if ( $options['last_backup'] ) {
-                                echo '<strong>' . date( __( "M j, Y \a\\t H:i:s", 'backup' ), $options['last_backup'] ) . '</strong><br/><br/>';
+                                echo '<strong>' . date( __( "M j, Y \a\\t H:i:s", 'backup' ), $options['last_backup'] ) . '</strong>';
                                 if ( $options['local_number'] > 0 ) {
-                                    ?><a class="button-secondary" title="<?php _e( 'Download most recent backup', 'backup'); ?>" href="<?php echo WP_CONTENT_URL . substr( end( $options['local_files'] ), strlen( WP_CONTENT_DIR ) ); ?>">Download backup</a><?php
+                                    ?><br/><br/><a class="button-secondary" title="<?php _e( 'Download most recent backup', 'backup'); ?>" href="<?php echo WP_CONTENT_URL . substr( end( $options['local_files'] ), strlen( WP_CONTENT_DIR ) ); ?>">Download backup</a><?php
                                 }
                             }
@@ -320 +320 @@
         $options['last_backup'] = $backup_time;
         $options['local_files'][] = $file_path;
-        if ( $options['token'] && $options['client_id'] && $options['client_secret'] ) {
+        if ( $options['drive_number'] > 0 && $options['token'] && $options['client_id'] && $options['client_secret'] ) {
             if ( $access = access_token( $options['token'], $options['client_id'], $options['client_secret'] ) ) {
                 backup_log( 'NOTICE', 'Attempting to upload archive to Google Drive' );
@@ -329 +329 @@
                     backup_log( 'NOTICE', 'Archive ' . $file_name . ' uploaded to Google Drive in ' . ( microtime( true ) - $timer_start ) . ' seconds' );
                     $options['drive_files'][] = $id;
-                    while ( 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 );
                 }
             }
@@ -340 +335 @@
             }    
         }
+        
+        // Delete excess Drive files
+        while ( 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 );
+        
+        // Delete excess local files    
         while ( count( $options['local_files'] ) > $options['local_number'] )
             if ( unlink( $f = array_shift( $options['local_files'] ) ) )
@@ -345 +349 @@
             else    
                 backup_log( 'WARNING', 'Could not delete file ' . $f );
+        
         update_option( 'backup_options', $options );
     }
@@ -386 +391 @@
     );
 
-    $url = 'https://docs.google.com/feeds/upload/create-session/default/private/full';
-    if ( $parent )
-        $url .= '/folder%3A' . $parent . '/contents';
-    $url .= '?convert=false'; // needed to upload a file
+    $url = get_resumable_create_media_link( $token, $parent );
+    if ( $url )
+        $url .= '?convert=false'; // needed to upload a file
+    else {
+        backup_log( 'ERROR', 'Could not retrieve resumable create media link.', __FILE__, __LINE__ );
+        return false;
+    }
     
     $result = @file_get_contents( $url, false, stream_context_create( $context ) );
@@ -420 +428 @@
         }
         else {
-            backup_log( 'ERROR', 'Bad response: ' . $response . '. Request header: ' . join( "; ", $header ), __FILE__, __LINE__ );
+            backup_log( 'ERROR', 'Bad response: ' . $response . ' Response header: ' . var_export( $response_header, true ) . ' Response body: ' . $result . ' Request URL: ' . $url, __FILE__, __LINE__ );
             return false;
         }
@@ -512 +520 @@
     if ( strpos( $headers[0], '200' ) )
         return true;
+    return false;
+}
+/**
+ * Get the resumable-create-media link needed to upload files
+ *
+ * @param  string $token  The Google Account access token
+ * @param  string $parent The Id of the folder where the upload is to be made. Default is empty string.
+ * @return string|boolean Returns a link on success, FALSE on failure. 
+ */
+function get_resumable_create_media_link( $token, $parent = '' ) {
+    $header = array(
+        'Authorization: Bearer ' . $token,
+        'GData-Version: 3.0'
+    );
+    $context = array(
+        'http' => array(
+            'method' => 'GET',
+            'header' => join( "\r\n", $header )
+        )
+    );
+    $url = 'https://docs.google.com/feeds/default/private/full';
+
+    if ( $parent )
+        $url .= '/' . $parent;
+
+    $result = @file_get_contents( $url, false, stream_context_create( $context ) );
+
+    if ( $result !== false ) {
+        $xml = new SimpleXMLElement( $result );
+        error_log( $result );
+        foreach ( $xml->link as $link )
+            if ( $link['rel'] == 'http://schemas.google.com/g/2005#resumable-create-media' )
+                return $link['href'];
+    }
     return false;
 }

backup/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0
 Tested up to: 3.3.2
-Stable tag: 1.1.3
+Stable tag: 1.1.5
 
 Make backups of your Wordpress site to Google Drive.
@@ -26 +26 @@
 
 == Changelog ==
+= 1.1.5 =
+* You can now chose not to upload backups to Google Drive by entering `0` in the appropriate field on the settings page.
+* Resumable create media link is no longer hard coded.
+
 = 1.1.3 =
 * Fixed some issues created by the `1.1.2` update