UpdraftPlus WordPress Backup Plugin - Version 1.3.20

Version Description

  • 01/30/2013 =
  • Add extra error checking in S3 method (can prevent logging loop)
Download this release

Release Info

Developer DavidAnderson
Plugin Icon 128x128 UpdraftPlus WordPress Backup Plugin
Version 1.3.20
Comparing to
See all releases

Code changes from version 1.3.19 to 1.3.20

Files changed (3) hide show
  1. includes/S3.php +12 -12
  2. readme.txt +5 -2
  3. updraftplus.php +2 -2
includes/S3.php CHANGED
@@ -535,19 +535,19 @@ class S3
535
  $rest->setHeader('Content-Type', 'application/octet-stream');
536
  $rest->data = "";
537
 
538
- $handle = fopen($filePath, "rb");
539
- if ($fileOffset >0) fseek($handle, $fileOffset);
540
- $bytes_read = 0;
541
-
542
- while ($fileBytes >0) {
543
- $read = fread($handle, min($fileBytes, 32768));
544
- $fileBytes = $fileBytes - strlen($read);
545
- $bytes_read += strlen($read);
546
- $rest->data = $rest->data . $read;
 
 
547
  }
548
 
549
- fclose($handle);
550
-
551
  $rest->setHeader('Content-MD5', base64_encode(md5($rest->data, true)));
552
  $rest->size = $bytes_read;
553
 
@@ -654,7 +654,7 @@ class S3
654
  // Data
655
  if (isset($input['fp']))
656
  $rest->fp =& $input['fp'];
657
- elseif (isset($input['file']))
658
  $rest->fp = @fopen($input['file'], 'rb');
659
  elseif (isset($input['data']))
660
  $rest->data = $input['data'];
535
  $rest->setHeader('Content-Type', 'application/octet-stream');
536
  $rest->data = "";
537
 
538
+ if ($handle = fopen($filePath, "rb")) {
539
+ if ($fileOffset >0) fseek($handle, $fileOffset);
540
+ $bytes_read = 0;
541
+ while ($fileBytes>0 && $read = fread($handle, max($fileBytes, 65536))) {
542
+ $fileBytes = $fileBytes - strlen($read);
543
+ $bytes_read += strlen($read);
544
+ $rest->data = $rest->data . $read;
545
+ }
546
+ fclose($handle);
547
+ } else {
548
+ return false;
549
  }
550
 
 
 
551
  $rest->setHeader('Content-MD5', base64_encode(md5($rest->data, true)));
552
  $rest->size = $bytes_read;
553
 
654
  // Data
655
  if (isset($input['fp']))
656
  $rest->fp =& $input['fp'];
657
+ elseif (isset($input['file']) && is_file($input['file']))
658
  $rest->fp = @fopen($input['file'], 'rb');
659
  elseif (isset($input['data']))
660
  $rest->data = $input['data'];
readme.txt CHANGED
@@ -3,12 +3,12 @@ Contributors: David Anderson
3
  Tags: backup, restore, database, cloud, amazon, s3, dropbox, google drive, ftp, cloud, back up, multisite
4
  Requires at least: 3.2
5
  Tested up to: 3.5.1
6
- Stable tag: 1.3.19
7
  Donate link: http://david.dw-perspective.org.uk/donate
8
  License: GPLv3 or later
9
 
10
  == Upgrade Notice ==
11
- More settings tidying
12
 
13
  == Description ==
14
 
@@ -141,6 +141,9 @@ Thanks for asking - yes, I have. Check out my profile page - http://profiles.wor
141
 
142
  == Changelog ==
143
 
 
 
 
144
  = 1.3.19 - 01/29/2013 =
145
  * Since 1.3.3, the 'Last Backup' indicator in the control panel had not been updating
146
 
3
  Tags: backup, restore, database, cloud, amazon, s3, dropbox, google drive, ftp, cloud, back up, multisite
4
  Requires at least: 3.2
5
  Tested up to: 3.5.1
6
+ Stable tag: 1.3.20
7
  Donate link: http://david.dw-perspective.org.uk/donate
8
  License: GPLv3 or later
9
 
10
  == Upgrade Notice ==
11
+ Prevent potential endless logging loop in S3 method
12
 
13
  == Description ==
14
 
141
 
142
  == Changelog ==
143
 
144
+ = 1.3.20 - 01/30/2013 =
145
+ * Add extra error checking in S3 method (can prevent logging loop)
146
+
147
  = 1.3.19 - 01/29/2013 =
148
  * Since 1.3.3, the 'Last Backup' indicator in the control panel had not been updating
149
 
updraftplus.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: UpdraftPlus - Backup/Restore
4
  Plugin URI: http://wordpress.org/extend/plugins/updraftplus
5
  Description: Backup and restore: your content and database can be automatically backed up to Amazon S3, Dropbox, Google Drive, FTP or email, on separate schedules.
6
  Author: David Anderson.
7
- Version: 1.3.19
8
  Donate link: http://david.dw-perspective.org.uk/donate
9
  License: GPLv3 or later
10
  Author URI: http://wordshell.net
@@ -78,7 +78,7 @@ if (!class_exists('UpdraftPlus_Options')) require_once(UPDRAFTPLUS_DIR.'/options
78
 
79
  class UpdraftPlus {
80
 
81
- var $version = '1.3.19';
82
  var $plugin_title = 'UpdraftPlus Backup/Restore';
83
 
84
  // Choices will be shown in the admin menu in the order used here
4
  Plugin URI: http://wordpress.org/extend/plugins/updraftplus
5
  Description: Backup and restore: your content and database can be automatically backed up to Amazon S3, Dropbox, Google Drive, FTP or email, on separate schedules.
6
  Author: David Anderson.
7
+ Version: 1.3.20
8
  Donate link: http://david.dw-perspective.org.uk/donate
9
  License: GPLv3 or later
10
  Author URI: http://wordshell.net
78
 
79
  class UpdraftPlus {
80
 
81
+ var $version = '1.3.20';
82
  var $plugin_title = 'UpdraftPlus Backup/Restore';
83
 
84
  // Choices will be shown in the admin menu in the order used here