8.7.2.0 Release

Signed-off-by: Kolja Nolte <kolja.nolte@gmail.com>

Author: thaikolja

.DS_Store

@@ -3,7 +3,7 @@
  * Plugin Name: BackupBuddy
  * Plugin URI: http://ithemes.com/purchase/backupbuddy/
  * Description: The most complete WordPress solution for Backup, Restoration, Migration, and Deployment to the same host or a new domain. Backs up a customizable selection of files, settings, and content for a complete snapshot of your site. Stash Live feature allows for real-time live backups to the cloud.
- * Version: 8.6.2.0
+ * Version: 8.7.2.0
  * Author: iThemes
  * Author URI: http://ithemes.com/
  * iThemes Package: backupbuddy

backupbuddy.php

@@ -167,7 +167,7 @@ public static function deleteSchedule( $scheduleID, $confirm = false ) {
 
 
 	// $sha1 = whether or not to use sha1 for file comparison. performance hit. bool or '1'/'0'. $destinationSettings = array of dest settings.
-	public static function getPreDeployInfo( $sha1 = false, $destinationSettings ) {
+	public static function getPreDeployInfo( $sha1 = false, $destinationSettings = array() ) {
 		self::_before();
 
 		if ( '1' == $sha1 ) {

classes/api.php

@@ -270,7 +270,7 @@ public function start_backup_process( $profile, $trigger = 'manual', $pre_backup
 	 *
 	 * @return bool  True on success; false otherwise.
 	 */
-	public function pre_backup( $serial, $archiveFile, $profile, $trigger, $pre_backup = array(), $post_backup = array(), $schedule_title = '', $export_plugins = array(), $deployDirection, $deployDestinationSettings ) {
+	public function pre_backup( $serial, $archiveFile, $profile, $trigger, $pre_backup = array(), $post_backup = array(), $schedule_title = '', $export_plugins = array(), $deployDirection = '', $deployDestinationSettings = array() ) {
 
 		pb_backupbuddy::status(
 			'startFunction',

classes/backup.php

@@ -120,7 +120,7 @@ public static function shutdown_function() {
 	 * @param	bool	$returnRaw		When true returns body raw text/data rather than decoding encoded data first.
 	 *
 	 */
-	public static function remoteCall( $remoteAPI, $verb, $moreParams = array(), $timeout, $files = array(), $returnRaw = false ) {
+	public static function remoteCall( $remoteAPI, $verb, $moreParams = array(), $timeout = null, $files = array(), $returnRaw = false ) {
 		pb_backupbuddy::status( 'details', 'Preparing remote API call verb `' . $verb . '`.' );
 		$now = time();
 

classes/remote_api.php

@@ -1,10 +1,15 @@
 {
     "name": "wordpress-premium/backupbuddy",
 	"type": "wordpress-plugin",
-	"version": "8.6.2.0 ",
-	"time": "2020-10-07",
+	"version": "8.7.2.0 ",
+	"time": "2020-12-22",
+    "author": "Brian DiChiara",
     "require": {
-        "composer/installers": ">=1.0"
+        "composer/installers": ">=1.6",
+        "krizalys/onedrive-php-sdk": "^2.6",
+        "stevenmaguire/oauth2-dropbox": "^3.0",
+        "google/apiclient": "^2.4",
+        "monolog/monolog": "1.25.3"
     },
-    "license": "GPLv2 or later"
+    "license": "GPLv3 or later"
 }

composer.json

@@ -104,7 +104,7 @@ public function __toString()
 	 * @param boolean $is_prefix (Optional) (No description provided by PHP.net.)
 	 * @return CFSimpleXML Creates a new <CFSimpleXML> element.
 	 */
-	public static function init($data, $options = 0, $data_is_url, $ns, $is_prefix = false)
+	public static function init($data, $options = 0, $data_is_url = false, $ns = '', $is_prefix = false)
 	{
 		if (version_compare(PHP_VERSION, '5.3.0', '<'))
 		{

destinations/_s3lib/aws-sdk/utilities/simplexml.class.php

@@ -91,7 +91,7 @@ private static function _normalizeSettings( $settings ) {
 	 *	@param		array			$file		Array of one or more files to send.
 	 *	@return		boolean						True on success single-process, array on multipart with remaining steps, else false (failed).
 	 */
-	public static function send( $settings = array(), $file, $send_id = '', $delete_after = false ) {
+	public static function send( $settings = array(), $file = '', $send_id = '', $delete_after = false ) {
 		global $pb_backupbuddy_destination_errors;
 		if ( '1' == $settings['disabled'] ) {
 			$pb_backupbuddy_destination_errors[] = __( 'Error #48933: This destination is currently disabled. Enable it under this destination\'s Advanced Settings.', 'it-l10n-backupbuddy' );
@@ -494,19 +494,16 @@ public static function listFiles( $settings = array() ) {
 
 	} // End listFiles().
 
-
-
-	/*	getFile()
-	 *
+	/**
 	 * Download a file to local.
 	 *
-	 *	@param		array			$settings			Destination settings.
-	 *	@param		string			$remote_file		Remote file to retrieve. Filename only. Directory, path, bucket, etc handled in $destination_settings.
-	 *	@param		string			$local_file			Local file to save to.
-	 *	@return		array|boolean						Array of items in directory OR bool FALSE on failure.
+	 * @param array  $settings     Destination settings.
+	 * @param string $remote_file  Remote file to retrieve. Filename only. Directory, path, bucket, etc handled in $destination_settings.
+	 * @param string $local_file   Local file to save to.
+	 *
+	 * @return array|bool  Array of items in directory OR bool FALSE on failure.
 	 */
-	public static function getFile( $settings = array(), $remote_file, $local_file ) {
-
+	public static function getFile( $settings = array(), $remote_file = '', $local_file = '' ) {
 		pb_backupbuddy::status( 'details', 'Dropbox2 List Function Started.' );
 
 		// Normalize settings, apply defaults, etc.
@@ -517,7 +514,6 @@ public static function getFile( $settings = array(), $remote_file, $local_file )
 			return false;
 		}
 
-
 		// Open local file to write to.
 		$f = @fopen( $local_file, 'w+b' );
 		if ( false === $f ) {
@@ -550,16 +546,15 @@ public static function getFile( $settings = array(), $remote_file, $local_file )
 
 	} // End getFile().
 
-
-
-	/*	delete()
+	/**
+	 * Delete files in this destination & directory. Path / directory provided in settings.
 	 *
-	 *	Delete files in this destination & directory. Path / directory provided in settings.
+	 * @param array $settings       Destination settings.
+	 * @param array $file_or_files  File or array of files.
 	 *
-	 *	@param		array			$settings		Destination settings.
-	 *	@return		bool|string						Bool TRUE on success, else string error message.
+	 * @return bool|string  Bool TRUE on success, else string error message.
 	 */
-	public static function delete( $settings = array(), $file_or_files ) {
+	public static function delete( $settings = array(), $file_or_files = array() ) {
 
 		if ( ! is_array( $file_or_files ) ) {
 			$files = array( $file_or_files );

destinations/dropbox2/init.php

@@ -102,7 +102,7 @@ class pb_backupbuddy_destination_live {
 	 *	@param		array			$file			Array of one or more files to send.
 	 *	@return		boolean							True on success, else false.
 	 */
-	public static function send( $settings = array(), $file, $send_id = '', $delete_after = false ) {
+	public static function send( $settings = array(), $file = '', $send_id = '', $delete_after = false ) {
 		$settings = self::_init( $settings );
 		//return true;
 		global $pb_backupbuddy_destination_errors;

destinations/live/init.php

@@ -163,11 +163,11 @@ function __construct($api_version)
         # variable.
         $OS_CAFILE_NONUPDATED=array(
             "win","dar"
-        ); 
+        );
 
         if (in_array((strtolower (substr(PHP_OS, 0,3))), $OS_CAFILE_NONUPDATED))
             $this->ssl_use_cabundle();
-        
+
     }
 
     function ssl_use_cabundle($path=NULL)
@@ -239,7 +239,7 @@ function list_cdn_containers($enabled_only)
         $this->_write_callback_type = "TEXT_LIST";
         if ($enabled_only)
         {
-            $return_code = $this->_send_request($conn_type, $url_path . 
+            $return_code = $this->_send_request($conn_type, $url_path .
             '/?enabled_only=true');
         }
         else
@@ -287,7 +287,7 @@ function purge_from_cdn($path, $email=null)
 
     # (CDN) POST /v1/Account/Container
     function update_cdn_container($container_name, $ttl=86400, $cdn_log_retention=False,
-                                  $cdn_acl_user_agent="", $cdn_acl_referrer)
+                                  $cdn_acl_user_agent="", $cdn_acl_referrer=null)
     {
         if ($container_name == "")
             throw new SyntaxException("Container name not set.");
@@ -329,7 +329,7 @@ function add_cdn_container($container_name, $ttl=86400)
 
         if ($container_name != "0" and !isset($container_name))
             throw new SyntaxException("Container name not set.");
-        
+
         $url_path = $this->_make_path("CDN", $container_name);
         $hdrs = array(
             CDN_ENABLED => "True",
@@ -357,7 +357,7 @@ function remove_cdn_container($container_name)
 
         if ($container_name != "0" and !isset($container_name))
             throw new SyntaxException("Container name not set.");
-        
+
         $url_path = $this->_make_path("CDN", $container_name);
         $hdrs = array(CDN_ENABLED => "False");
         $return_code = $this->_send_request("DEL_POST",$url_path,$hdrs,"POST");
@@ -385,7 +385,7 @@ function head_cdn_container($container_name)
 
         if ($container_name != "0" and !isset($container_name))
             throw new SyntaxException("Container name not set.");
-        
+
         $conn_type = "HEAD";
         $url_path = $this->_make_path("CDN", $container_name);
         $return_code = $this->_send_request($conn_type, $url_path, NULL, "GET", True);
@@ -598,7 +598,7 @@ function list_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
         if (!empty($params)) {
             $url_path .= "?" . implode("&", $params);
         }
- 
+
         $conn_type = "GET_CALL";
         $this->_write_callback_type = "TEXT_LIST";
         $return_code = $this->_send_request($conn_type,$url_path);
@@ -616,7 +616,7 @@ function list_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
             return array($return_code,$this->error_str,array());
         }
         if ($return_code == 200) {
-	    $this->create_array();	
+	    $this->create_array();
             return array($return_code,$this->response_reason, $this->_text_list);
         }
         $this->error_str = "Unexpected HTTP response code: $return_code";
@@ -652,7 +652,7 @@ function get_objects($cname,$limit=0,$marker=NULL,$prefix=NULL,$path=NULL)
         if (!empty($params)) {
             $url_path .= "?" . implode("&", $params);
         }
- 
+
         $conn_type = "GET_CALL";
         $this->_write_callback_type = "OBJECT_STRING";
         $return_code = $this->_send_request($conn_type,$url_path);
@@ -687,12 +687,12 @@ function head_container($container_name)
             $this->error_str = "Container name not set.";
             return False;
         }
-        
+
         if ($container_name != "0" and !isset($container_name)) {
             $this->error_str = "Container name not set.";
             return False;
         }
-    
+
         $conn_type = "HEAD";
 
         $url_path = $this->_make_path("STORAGE", $container_name);
@@ -920,12 +920,12 @@ function delete_object($container_name, $object_name)
             $this->error_str = "Container name not set.";
             return 0;
         }
-        
+
         if ($container_name != "0" and !isset($container_name)) {
             $this->error_str = "Container name not set.";
             return 0;
         }
-        
+
         if (!$object_name) {
             $this->error_str = "Object name not set.";
             return 0;
@@ -1050,7 +1050,7 @@ private function _header_cb($ch, $header)
                 trim(substr($header, strlen(CDN_ACL_REFERRER)+1));
             return strlen($header);
         }
-        
+
         if (stripos($header, ACCOUNT_CONTAINER_COUNT) === 0) {
             $this->_account_container_count = (float) trim(substr($header,
                     strlen(ACCOUNT_CONTAINER_COUNT)+1))+0;
@@ -1328,7 +1328,7 @@ private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET",
             throw new ConnectionNotOpenException (
                 "Connection is not open."
                 );
-        
+
         switch ($method) {
         case "DELETE":
             curl_setopt($this->connections[$conn_type],
@@ -1339,7 +1339,7 @@ private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET",
                 CURLOPT_CUSTOMREQUEST, "POST");
         default:
             break;
-        }        
+        }
 
         curl_setopt($this->connections[$conn_type],
                     CURLOPT_HTTPHEADER, $headers);
@@ -1355,7 +1355,7 @@ private function _send_request($conn_type, $url_path, $hdrs=NULL, $method="GET",
         }
         return curl_getinfo($this->connections[$conn_type], CURLINFO_HTTP_CODE);
     }
-    
+
     function close()
     {
         foreach ($this->connections as $cnx) {