ovidiul / XCloner-Wordpress

includes/class-xcloner-archive.php

Indentation +350 added lines, -350 removed lines

@@ -214,9 +214,9 @@ 
      * @return bool
      */
 
-    /**
-     * @param string $error_message
-     */
+	/**
+	 * @param string $error_message
+	 */
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 
@@ -255,486 +255,486 @@ 
      *
      * @return bool
      */
-    public function send_notification(
-        $to,
-        $from,
-        $subject,
-        $backup_name,
-        $params,
-        $error_message = "",
-        $additional = array()
-    ) {
-        if (!$from) {
-            $from = "XCloner Backup";
-        }
+	public function send_notification(
+		$to,
+		$from,
+		$subject,
+		$backup_name,
+		$params,
+		$error_message = "",
+		$additional = array()
+	) {
+		if (!$from) {
+			$from = "XCloner Backup";
+		}
 
-        if (($error_message)) {
-            return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
-        }
+		if (($error_message)) {
+			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
+		}
 
-        $params = (array)$params;
+		$params = (array)$params;
 
-        if (!$subject) {
-            $subject = sprintf(__("New backup generated %s"), $backup_name);
-        }
+		if (!$subject) {
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
+		}
 
-        $body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
-        $body .= "<br /><br />";
+		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
+		$body .= "<br /><br />";
 
-        if (isset($additional['lines_total'])) {
-            $body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
-            $body .= "<br /><br />";
-        }
+		if (isset($additional['lines_total'])) {
+			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
+			$body .= "<br /><br />";
+		}
 
-        $backup_parts = $this->filesystem->get_multipart_files($backup_name);
+		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 
-        if (!$backups_counter = sizeof($backup_parts)) {
-            $backups_counter = 1;
-        }
+		if (!$backups_counter = sizeof($backup_parts)) {
+			$backups_counter = 1;
+		}
 
-        $body .= sprintf(__("Backup Parts: %s"), $backups_counter);
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
+		$body .= "<br />";
 
-        if (sizeof($backup_parts)) {
-            $body .= implode("<br />", $backup_parts);
-            $body .= "<br />";
-        }
+		if (sizeof($backup_parts)) {
+			$body .= implode("<br />", $backup_parts);
+			$body .= "<br />";
+		}
 
-        $body .= "<br />";
+		$body .= "<br />";
 
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br />";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br />";
 
-        if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
-            $body .= "<br /><br />";
-        }
+		if (isset($params['backup_params']->backup_comments)) {
+			$body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
+			$body .= "<br /><br />";
+		}
 
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
-                                                                        $this->logger->getLastDebugLines(50));
-        }
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
+																		$this->logger->getLastDebugLines(50));
+		}
 
-        $attachments = $this->filesystem->get_backup_attachments();
+		$attachments = $this->filesystem->get_backup_attachments();
 
-        $attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
+		$attachments_archive = $this->xcloner_settings->get_xcloner_tmp_path().DS."info.tgz";
 
-        $tar = new Tar();
-        $tar->create($attachments_archive);
+		$tar = new Tar();
+		$tar->create($attachments_archive);
 
-        foreach ($attachments as $key => $file) {
-            $tar->addFile($file, basename($file));
-        }
-        $tar->close();
+		foreach ($attachments as $key => $file) {
+			$tar->addFile($file, basename($file));
+		}
+		$tar->close();
 
-        $this->logger->info(sprintf("Sending backup notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup notification to %s", $to));
 
-        $admin_email = get_option("admin_email");
+		$admin_email = get_option("admin_email");
 
-        $headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
+		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 
-        $return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Incremental Backup method
      *
      */
-    public function start_incremental_backup($backup_params, $extra_params, $init)
-    {
-        $return = array();
-
-        if (!isset($extra_params['backup_part'])) {
-            $extra_params['backup_part'] = 0;
-        }
-
-        $return['extra']['backup_part'] = $extra_params['backup_part'];
+	public function start_incremental_backup($backup_params, $extra_params, $init)
+	{
+		$return = array();
 
-        if (isset($extra_params['backup_archive_name'])) {
-            $this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
-        } else {
-            $this->set_archive_name($backup_params['backup_name']);
-        }
+		if (!isset($extra_params['backup_part'])) {
+			$extra_params['backup_part'] = 0;
+		}
 
-        if (!$this->get_archive_name()) {
-            $this->set_archive_name();
-        }
+		$return['extra']['backup_part'] = $extra_params['backup_part'];
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
+		if (isset($extra_params['backup_archive_name'])) {
+			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
+		} else {
+			$this->set_archive_name($backup_params['backup_name']);
+		}
 
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		if (!$this->get_archive_name()) {
+			$this->set_archive_name();
+		}
 
-        if ($init) {
-            $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
 
-            $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-            $return['extra']['backup_init'] = 1;
+		if ($init) {
+			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-        } else {
-            $this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
+			$this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
-            $this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
+			$return['extra']['backup_init'] = 1;
 
-            $return['extra']['backup_init'] = 0;
+		} else {
+			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 
-        }
+			$this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
 
-        $return['extra']['backup_archive_name'] = $this->get_archive_name();
-        $return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
+			$return['extra']['backup_init'] = 0;
 
-        if (!isset($extra_params['start_at_line'])) {
-            $extra_params['start_at_line'] = 0;
-        }
+		}
 
-        if (!isset($extra_params['start_at_byte'])) {
-            $extra_params['start_at_byte'] = 0;
-        }
+		$return['extra']['backup_archive_name'] = $this->get_archive_name();
+		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 
-        if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
-            $this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
-                $this->filesystem->get_included_files_handler()));
+		if (!isset($extra_params['start_at_line'])) {
+			$extra_params['start_at_line'] = 0;
+		}
 
-            $return['finished'] = 1;
-            return $return;
-        }
+		if (!isset($extra_params['start_at_byte'])) {
+			$extra_params['start_at_byte'] = 0;
+		}
 
-        $included_files_handler = $this->filesystem->get_included_files_handler(1);
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler())) {
+			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...",
+				$this->filesystem->get_included_files_handler()));
 
-        $file = new SplFileObject($included_files_handler);
+			$return['finished'] = 1;
+			return $return;
+		}
 
-        $file->seek(PHP_INT_MAX);
+		$included_files_handler = $this->filesystem->get_included_files_handler(1);
 
-        $return['extra']['lines_total'] = ($file->key() - 1);
+		$file = new SplFileObject($included_files_handler);
 
-        //we skip the first CSV line with headers
-        if (!$extra_params['start_at_line']) {
-            $file->seek(1);
-        } else {
-            $file->seek($extra_params['start_at_line'] + 1);
-        }
+		$file->seek(PHP_INT_MAX);
 
-        $this->processed_size_bytes = 0;
+		$return['extra']['lines_total'] = ($file->key() - 1);
 
-        $counter = 0;
+		//we skip the first CSV line with headers
+		if (!$extra_params['start_at_line']) {
+			$file->seek(1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
+		}
 
-        $start_byte = $extra_params['start_at_byte'];
+		$this->processed_size_bytes = 0;
 
-        $byte_limit = 0;
+		$counter = 0;
 
-        while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
-            $current_line_str = $file->current();
+		$start_byte = $extra_params['start_at_byte'];
 
-            $line = str_getcsv($current_line_str);
+		$byte_limit = 0;
 
-            $relative_path = stripslashes($line[0]);
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
+			$current_line_str = $file->current();
 
-            $start_filesystem = "start_filesystem";
+			$line = str_getcsv($current_line_str);
 
-            if (isset($line[4])) {
-                $start_filesystem = $line[4];
-            }
+			$relative_path = stripslashes($line[0]);
 
-            //$adapter = $this->filesystem->get_adapter($start_filesystem);
+			$start_filesystem = "start_filesystem";
 
-            if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
-                if ($relative_path != "") {
-                    $this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
-                        $relative_path));
-                }
+			if (isset($line[4])) {
+				$start_filesystem = $line[4];
+			}
 
-                $extra_params['start_at_line']++;
-                $file->next();
-                continue;
-            }
+			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 
-            $file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path)) {
+				if ($relative_path != "") {
+					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found",
+						$relative_path));
+				}
 
-            if (!isset($file_info['size'])) {
-                $file_info['size'] = 0;
-            }
+				$extra_params['start_at_line']++;
+				$file->next();
+				continue;
+			}
 
-            if ($start_filesystem == "tmp_filesystem") {
-                $file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
-            }
+			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 
-            $byte_limit = (int)$this->file_size_per_request_limit / 512;
+			if (!isset($file_info['size'])) {
+				$file_info['size'] = 0;
+			}
 
-            $append = 0;
+			if ($start_filesystem == "tmp_filesystem") {
+				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 
-            if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
-                $append = 1;
-            }
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 
-            if (!isset($return['extra']['backup_size'])) {
-                $return['extra']['backup_size'] = 0;
-            }
+			$append = 0;
 
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
+				$append = 1;
+			}
 
-            $estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
+			if (!isset($return['extra']['backup_size'])) {
+				$return['extra']['backup_size'] = 0;
+			}
 
-            //we create a new backup part if we reach the Split Achive Limit
-            if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
-                $this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
-                    $this->xcloner_split_backup_limit, $estimated_new_size));
-                list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-                if ($file_info['size'] > $this->xcloner_split_backup_limit) {
-                    $this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
-                        $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
-                    $extra_params['start_at_line']++;
-                }
+			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = 0;
+			//we create a new backup part if we reach the Split Achive Limit
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte)) {
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",
+					$this->xcloner_split_backup_limit, $estimated_new_size));
+				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 
-                $return['finished'] = 0;
+				if ($file_info['size'] > $this->xcloner_split_backup_limit) {
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",
+						$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$extra_params['start_at_line']++;
+				}
 
-                return $return;
-            }
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = 0;
 
-            list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
-                $append, $start_filesystem);
-            $this->processed_size_bytes += $bytes_wrote;
+				$return['finished'] = 0;
 
-            //echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-            $return['extra']['backup_size'] = $archive_info->getSize();
+				return $return;
+			}
 
-            if ($last_position > 0) {
-                $start_byte = $last_position;
-            } else {
-                $extra_params['start_at_line']++;
-                $file->next();
-                $start_byte = 0;
-                $counter++;
-            }
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit,
+				$append, $start_filesystem);
+			$this->processed_size_bytes += $bytes_wrote;
+
+			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+			$return['extra']['backup_size'] = $archive_info->getSize();
+
+			if ($last_position > 0) {
+				$start_byte = $last_position;
+			} else {
+				$extra_params['start_at_line']++;
+				$file->next();
+				$start_byte = 0;
+				$counter++;
+			}
 
-            if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
-                clearstatcache();
-                $return['extra']['backup_size'] = $archive_info->getSize();
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit) {
+				clearstatcache();
+				$return['extra']['backup_size'] = $archive_info->getSize();
 
-                $return['finished'] = 0;
-                $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = $last_position;
-                $this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
-                    $this->file_size_per_request_limit));
-                return $return;
-            }
-        }
+				$return['finished'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = $last_position;
+				$this->logger->info(sprintf("Reached the maximum %s request data limit, returning response",
+					$this->file_size_per_request_limit));
+				return $return;
+			}
+		}
 
-        if (!$file->eof()) {
-            clearstatcache();
-            $return['extra']['backup_size'] = $archive_info->getSize();
+		if (!$file->eof()) {
+			clearstatcache();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $return['finished'] = 0;
-            $return['extra']['start_at_line'] = $extra_params['start_at_line'];
-            $return['extra']['start_at_byte'] = $last_position;
-            $this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
-                $this->files_to_process_per_request));
+			$return['finished'] = 0;
+			$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+			$return['extra']['start_at_byte'] = $last_position;
+			$this->logger->info(sprintf("We have reached the maximum files to process per request limit of %s, returning response",
+				$this->files_to_process_per_request));
 
-            return $return;
-        }
+			return $return;
+		}
 
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
 
-        /**
-         * XCloner HOOK backup_archive_finished.
-         *
-         * This will get triggered when a backup archive is finished writing.
-         */
-        //do_action('backup_archive_finished', $this->backup_archive, $this);
+		/**
+		 * XCloner HOOK backup_archive_finished.
+		 *
+		 * This will get triggered when a backup archive is finished writing.
+		 */
+		//do_action('backup_archive_finished', $this->backup_archive, $this);
 
-        //updating archive_info
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		//updating archive_info
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($return['extra']['backup_part']) {
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		if ($return['extra']['backup_part']) {
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 
-        if (isset($file_info)) {
-            $return['extra']['processed_file'] = $file_info['path'];
-            $return['extra']['processed_file_size'] = $file_info['size'];
-        }
+		if (isset($file_info)) {
+			$return['extra']['processed_file'] = $file_info['path'];
+			$return['extra']['processed_file_size'] = $file_info['size'];
+		}
 
-        clearstatcache();
-        $return['extra']['backup_size'] = $archive_info->getSize();
+		clearstatcache();
+		$return['extra']['backup_size'] = $archive_info->getSize();
 
-        $return['finished'] = 1;
-        return $return;
-    }
+		$return['finished'] = 1;
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Write multipart file components
      *
      */
-    private function write_multipart_file($path = "")
-    {
-        if (!$path) {
-            $path = $this->get_archive_name_with_extension();
-        }
+	private function write_multipart_file($path = "")
+	{
+		if (!$path) {
+			$path = $this->get_archive_name_with_extension();
+		}
 
-        $file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
-        //print_r($file_info);
-        $line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
+		$file = $this->filesystem->get_filesystem("storage_filesystem_append")->getMetadata($path);
+		//print_r($file_info);
+		$line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
 
 
-        $this->filesystem->get_filesystem("storage_filesystem_append")
-            ->write($this->get_archive_name_multipart(), $line);
-    }
+		$this->filesystem->get_filesystem("storage_filesystem_append")
+			->write($this->get_archive_name_multipart(), $line);
+	}
 
-    /*
+	/*
      *
      * Create a new backup part
      *
      */
-    private function create_new_backup_part($part = 0)
-    {
-        //close the backup archive by adding 2*512 blocks of zero bytes
-        $this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
-            $this->get_archive_name_with_extension()));
-        $this->backup_archive->close();
-
-        if (!$part) {
-            $old_name = $this->get_archive_name_with_extension();
-            $this->set_archive_name($this->get_archive_name(), ++$part);
-            $this->rename_archive($old_name, $this->get_archive_name_with_extension());
-
-            if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
-                $this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
-            }
+	private function create_new_backup_part($part = 0)
+	{
+		//close the backup archive by adding 2*512 blocks of zero bytes
+		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.",
+			$this->get_archive_name_with_extension()));
+		$this->backup_archive->close();
+
+		if (!$part) {
+			$old_name = $this->get_archive_name_with_extension();
+			$this->set_archive_name($this->get_archive_name(), ++$part);
+			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
+
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart())) {
+				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
+			}
 
-            $this->write_multipart_file($this->get_archive_name_with_extension());
+			$this->write_multipart_file($this->get_archive_name_with_extension());
 
-        } else {
-            $this->logger->info(sprintf("Creating new multipart info file %s",
-                $this->get_archive_name_with_extension()));
-            $this->write_multipart_file($this->get_archive_name_with_extension());
-        }
+		} else {
+			$this->logger->info(sprintf("Creating new multipart info file %s",
+				$this->get_archive_name_with_extension()));
+			$this->write_multipart_file($this->get_archive_name_with_extension());
+		}
 
-        $this->set_archive_name($this->get_archive_name(), ++$part);
+		$this->set_archive_name($this->get_archive_name(), ++$part);
 
-        $this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
+		$this->logger->info(sprintf("Creating new backup archive part %s", $this->get_archive_name_with_extension()));
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
-        $archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
-        $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
+		$this->backup_archive = new Tar();
+		$this->backup_archive->setCompression($this->compression_level);
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
+		$this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
-        return array($archive_info, $part);
+		return array($archive_info, $part);
 
-    }
+	}
 
-    /*
+	/*
      *
      * Add file to archive
      *
      */
 
-    /**
-     * @param integer $append
-     */
-    public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
-    {
+	/**
+	 * @param integer $append
+	 */
+	public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
+	{
 
-        $start_adapter = $this->filesystem->get_adapter($filesystem);
-        $start_filesystem = $this->filesystem->get_adapter($filesystem);
+		$start_adapter = $this->filesystem->get_adapter($filesystem);
+		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 
-        if (!$file_info['path']) {
-            return;
-        }
+		if (!$file_info['path']) {
+			return;
+		}
 
-        if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
-        } else {
-            $file_info['target_path'] = $file_info['path'];
-        }
+		if (isset($file_info['archive_prefix_path'])) {
+			$file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
+		} else {
+			$file_info['target_path'] = $file_info['path'];
+		}
 
-        $last_position = $start_at_byte;
+		$last_position = $start_at_byte;
 
-        //$start_adapter = $this->filesystem->get_start_adapter();
+		//$start_adapter = $this->filesystem->get_start_adapter();
 
-        if (!$append) {
-            $bytes_wrote = $file_info['size'];
-            $this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
-                $file_info['target_path'], $this->get_archive_name_with_extension()));
-            $this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
-                $file_info['target_path']);
-        } else {
-            $tmp_file = md5($file_info['path']);
+		if (!$append) {
+			$bytes_wrote = $file_info['size'];
+			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote,
+				$file_info['target_path'], $this->get_archive_name_with_extension()));
+			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']),
+				$file_info['target_path']);
+		} else {
+			$tmp_file = md5($file_info['path']);
 
-            //we isolate file to tmp if we are at byte 0, the starting point of file reading
-            if (!$start_at_byte) {
-                $this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
-                    $file_info['path'], $tmp_file));
-                $file_stream = $start_filesystem->readStream($file_info['path']);
+			//we isolate file to tmp if we are at byte 0, the starting point of file reading
+			if (!$start_at_byte) {
+				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes",
+					$file_info['path'], $tmp_file));
+				$file_stream = $start_filesystem->readStream($file_info['path']);
 
-                if (is_resource($file_stream['stream'])) {
-                    $this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
-                }
-            }
+				if (is_resource($file_stream['stream'])) {
+					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
+				}
+			}
 
-            if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
-                $is_tmp = 1;
-                $last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
-                                                        ->applyPathPrefix($tmp_file),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            } else {
-                $is_tmp = 0;
-                $last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
-                    $file_info['target_path'], $start_at_byte, $byte_limit);
-            }
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file)) {
+				$is_tmp = 1;
+				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()
+														->applyPathPrefix($tmp_file),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			} else {
+				$is_tmp = 0;
+				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']),
+					$file_info['target_path'], $start_at_byte, $byte_limit);
+			}
 
 
-            if ($last_position == -1) {
-                $bytes_wrote = $file_info['size'] - $start_at_byte;
-            } else {
-                $bytes_wrote = $last_position - $start_at_byte;
-            }
+			if ($last_position == -1) {
+				$bytes_wrote = $file_info['size'] - $start_at_byte;
+			} else {
+				$bytes_wrote = $last_position - $start_at_byte;
+			}
 
 
-            if ($is_tmp) {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
-                    $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
-            } else {
-                $this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
-                    $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
-            }
+			if ($is_tmp) {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ",
+					$bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
+			} else {
+				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ",
+					$bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
+			}
 
-            //we delete here the isolated tmp file
-            if ($last_position == -1) {
-                if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
-                    $this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
-                    $this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
-                }
-            }
+			//we delete here the isolated tmp file
+			if ($last_position == -1) {
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file)) {
+					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
+					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);
+				}
+			}
 
-        }
+		}
 
-        return array($bytes_wrote, $last_position);
-    }
+		return array($bytes_wrote, $last_position);
+	}
 
-    /**
-     * Open a TAR archive and put the file cursor at the end for data appending
-     *
-     * If $file is empty, the tar file will be created in memory
-     *
-     * @param string $file
-     * @throws ArchiveIOException
-     */
-    /*
+	/**
+	 * Open a TAR archive and put the file cursor at the end for data appending
+	 *
+	 * If $file is empty, the tar file will be created in memory
+	 *
+	 * @param string $file
+	 * @throws ArchiveIOException
+	 */
+	/*
     public function openForAppend($file = '')
     {
         $this->file   = $file;

includes/class-xcloner-file-transfer.php

Indentation +99 added lines, -99 removed lines

@@ -29,137 +29,137 @@
 class Xcloner_File_Transfer extends Xcloner_File_System
 {
 
-    /**
-     * Target url web address of the restore script
-     * @var string
-     */
-    private $target_url;
-    /**
-     * Transfer data limit in bytes
-     * @var int
-     */
-    private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
+	/**
+	 * Target url web address of the restore script
+	 * @var string
+	 */
+	private $target_url;
+	/**
+	 * Transfer data limit in bytes
+	 * @var int
+	 */
+	private $transfer_limit = 1048576; //bytes 1MB= 1048576 300KB = 358400
 
 
-    /**
-     * @param $target_url
-     *
-     * @return mixed
-     */
-    public function set_target($target_url)
-    {
-        return $this->target_url = $target_url;
-    }
+	/**
+	 * @param $target_url
+	 *
+	 * @return mixed
+	 */
+	public function set_target($target_url)
+	{
+		return $this->target_url = $target_url;
+	}
 
-    /**
-     * @return string
-     */
-    public function get_target()
-    {
-        return $this->target_url;
-    }
+	/**
+	 * @return string
+	 */
+	public function get_target()
+	{
+		return $this->target_url;
+	}
 
 
-    /**
-     * @param $file
-     * @param int $start
-     * @param string $hash
-     *
-     * @return bool|int
-     * @throws Exception
-     */
-    public function transfer_file($file, $start = 0, $hash = "")
-    {
-        if (!$this->target_url) {
-            throw new Exception("Please setup a target url for upload");
-        }
+	/**
+	 * @param $file
+	 * @param int $start
+	 * @param string $hash
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
+	public function transfer_file($file, $start = 0, $hash = "")
+	{
+		if (!$this->target_url) {
+			throw new Exception("Please setup a target url for upload");
+		}
 
 
-        $fp = $this->get_storage_filesystem()->readStream($file);
+		$fp = $this->get_storage_filesystem()->readStream($file);
 
-        fseek($fp, $start, SEEK_SET);
+		fseek($fp, $start, SEEK_SET);
 
-        $binary_data = fread($fp, $this->transfer_limit);
+		$binary_data = fread($fp, $this->transfer_limit);
 
-        $tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
+		$tmp_filename = "xcloner_upload_".substr(md5(time()), 0, 5);
 
-        $this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
+		$this->get_tmp_filesystem()->write($tmp_filename, $binary_data);
 
-        $tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
+		$tmp_file_path = $this->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_filename);
 
-        $send_array = array();
+		$send_array = array();
 
-        $send_array['file'] = $file;
-        $send_array['start'] = $start;
-        $send_array['xcloner_action'] = "write_file";
-        $send_array['hash'] = $hash;
-        #$send_array['blob'] 	= $binary_data;
-        $send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
+		$send_array['file'] = $file;
+		$send_array['start'] = $start;
+		$send_array['xcloner_action'] = "write_file";
+		$send_array['hash'] = $hash;
+		#$send_array['blob'] 	= $binary_data;
+		$send_array['blob'] = $this->curl_file_create($tmp_file_path, 'application/x-binary', $tmp_filename);
 
-        //$data = http_build_query($send_array);
+		//$data = http_build_query($send_array);
 
-        $this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
-            $this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
+		$this->get_logger()->info(sprintf("Sending curl request to %s with %s data of file %s starting position %s using temporary file %s",
+			$this->target_url, $this->transfer_limit, $file, $start, $tmp_filename));
 
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->target_url);
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $this->target_url);
 
-        curl_setopt($ch, CURLOPT_POST, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
-        //curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_POST, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+		//curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 60);
+		curl_setopt($ch, CURLOPT_TIMEOUT, 1200);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
-        curl_setopt($ch, CURLOPT_VERBOSE, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $send_array);
+		curl_setopt($ch, CURLOPT_VERBOSE, true);
 
-        $original_result = curl_exec($ch);
+		$original_result = curl_exec($ch);
 
 
-        $this->get_tmp_filesystem()->delete($tmp_filename);
+		$this->get_tmp_filesystem()->delete($tmp_filename);
 
-        $result = json_decode($original_result);
+		$result = json_decode($original_result);
 
-        if (!$result) {
-            throw new Exception("We have received no valid response from the remote host, original message: ".$original_result);
-        }
+		if (!$result) {
+			throw new Exception("We have received no valid response from the remote host, original message: ".$original_result);
+		}
 
-        if ($result->status != 200) {
-            throw new Exception($result->response);
-        }
+		if ($result->status != 200) {
+			throw new Exception($result->response);
+		}
 
-        if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
-            $this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
-                $file, $this->target_url, ftell($fp)));
-            $this->remove_tmp_filesystem();
+		if (ftell($fp) >= $this->get_storage_filesystem()->getSize($file)) {
+			$this->get_logger()->info(sprintf("Upload done for file %s to target url %s, transferred a total of %s bytes",
+				$file, $this->target_url, ftell($fp)));
+			$this->remove_tmp_filesystem();
 
-            return false;
-        }
+			return false;
+		}
 
-        return ftell($fp);
-    }
+		return ftell($fp);
+	}
 
-    /**
-     * @param string $filename
-     * @param string $mimetype
-     * @param string $postname
-     *
-     * @return CURLFile|string
-     */
-    private function curl_file_create($filename, $mimetype = '', $postname = '')
-    {
-        if (!function_exists('curl_file_create')) {
+	/**
+	 * @param string $filename
+	 * @param string $mimetype
+	 * @param string $postname
+	 *
+	 * @return CURLFile|string
+	 */
+	private function curl_file_create($filename, $mimetype = '', $postname = '')
+	{
+		if (!function_exists('curl_file_create')) {
 
-            return "@$filename;filename="
-                . ($postname ?: basename($filename))
-                . ($mimetype ? ";type=$mimetype" : '');
+			return "@$filename;filename="
+				. ($postname ?: basename($filename))
+				. ($mimetype ? ";type=$mimetype" : '');
 
-        } else {
+		} else {
 
-            return curl_file_create($filename, $mimetype, $postname);
+			return curl_file_create($filename, $mimetype, $postname);
 
-        }
-    }
+		}
+	}
 }

includes/class-xcloner-logger.php

Indentation +16 added lines, -16 removed lines

@@ -10,13 +10,13 @@ 
 	private $max_logger_files = 7;
 	private $main_logger_url;
 
-    /**
-     * Xcloner_Logger constructor.
-     * @param Xcloner $xcloner_container
-     * @param string $logger_name
-     * @throws Exception
-     */
-    public function __construct(Xcloner $xcloner_container, $logger_name = "xcloner_logger") {
+	/**
+	 * Xcloner_Logger constructor.
+	 * @param Xcloner $xcloner_container
+	 * @param string $logger_name
+	 * @throws Exception
+	 */
+	public function __construct(Xcloner $xcloner_container, $logger_name = "xcloner_logger") {
 		if (!$xcloner_container->get_xcloner_settings()) {
 			$xcloner_settings = new Xcloner_Settings($xcloner_container);
 		} else {
@@ -76,18 +76,18 @@ 
 		//return $this;
 	}
 
-    /**
-     * @return string|null
-     */
-    function get_main_logger_url() {
+	/**
+	 * @return string|null
+	 */
+	function get_main_logger_url() {
 		return $this->main_logger_url;
 	}
 
-    /**
-     * @param int $totalLines
-     * @return array|bool
-     */
-    function getLastDebugLines($totalLines = 200) {
+	/**
+	 * @param int $totalLines
+	 * @return array|bool
+	 */
+	function getLastDebugLines($totalLines = 200) {
 		$lines = array();
 
 		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {

admin/class-xcloner-admin.php

Indentation +20 added lines, -20 removed lines

@@ -40,28 +40,28 @@ 
 	 */
 	private $version;
 
-    /**
-     * @var Xcloner
-     */
-    private $xcloner_container;
-
-    /**
-     * Initialize the class and set its properties.
-     *
-     * Xcloner_Admin constructor.
-     * @param Xcloner $xcloner_container
-     */
-    public function __construct(Xcloner $xcloner_container) {
+	/**
+	 * @var Xcloner
+	 */
+	private $xcloner_container;
+
+	/**
+	 * Initialize the class and set its properties.
+	 *
+	 * Xcloner_Admin constructor.
+	 * @param Xcloner $xcloner_container
+	 */
+	public function __construct(Xcloner $xcloner_container) {
 
 		$this->plugin_name       = $xcloner_container->get_plugin_name();
 		$this->version           = $xcloner_container->get_version();
 		$this->xcloner_container = $xcloner_container;
 	}
 
-    /**
-     * @return Xcloner
-     */
-    public function get_xcloner_container() {
+	/**
+	 * @return Xcloner
+	 */
+	public function get_xcloner_container() {
 		return $this->xcloner_container;
 	}
 
@@ -144,10 +144,10 @@ 
 
 	}
 
-    /**
-     * Returns the XCloner Storage Page
-     */
-    public function xcloner_remote_storage_page() {
+	/**
+	 * Returns the XCloner Storage Page
+	 */
+	public function xcloner_remote_storage_page() {
 		$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
 		$remote_storage       = $this->get_xcloner_container()->get_xcloner_remote_storage();
 

includes/class-xcloner-api.php

Indentation +24 added lines, -24 removed lines

@@ -106,13 +106,13 @@ 
 	}
 
 
-    /**
-     * Checks API access
-     */
-    private function check_access()
+	/**
+	 * Checks API access
+	 */
+	private function check_access()
 	{
 		if (function_exists('current_user_can') && !current_user_can('manage_options')) {
-            $this->send_response(json_encode("Not allowed access here!"));
+			$this->send_response(json_encode("Not allowed access here!"));
 		}
 	}
 
@@ -291,8 +291,8 @@ 
      */
 	public function backup_files()
 	{
-        $return = array();
-        $additional = array();
+		$return = array();
+		$additional = array();
 
 		$this->check_access();
 
@@ -356,7 +356,7 @@ 
      */
 	public function backup_database()
 	{
-        $data = array();
+		$data = array();
 
 		$this->check_access();
 
@@ -392,7 +392,7 @@ 
      */
 	public function scan_filesystem()
 	{
-        $data = array();
+		$data = array();
 
 		$this->check_access();
 
@@ -400,7 +400,7 @@ 
 		$init = (int)$_POST['init'];
 
 		if ($params === null) {
-            $this->send_response('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
+			$this->send_response('{"status":false,"msg":"The post_data parameter must be valid JSON"}');
 		}
 
 		$this->process_params($params);
@@ -677,7 +677,7 @@ 
      */
 	public function get_scheduler_list()
 	{
-        $return = array();
+		$return = array();
 
 		$this->check_access();
 
@@ -761,7 +761,7 @@ 
      */
 	public function delete_schedule_by_id()
 	{
-        $data = array();
+		$data = array();
 
 		$this->check_access();
 
@@ -779,7 +779,7 @@ 
      */
 	public function delete_backup_by_name()
 	{
-        $data = array();
+		$data = array();
 
 		$this->check_access();
 
@@ -928,9 +928,9 @@ 
 
 	public function get_manage_backups_list() {
 
-        $this->check_access();
+		$this->check_access();
 
-        $return = array();
+		$return = array();
 		$storage_selection = "";
 
 		if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
@@ -1113,7 +1113,7 @@ 
 		$this->check_access();
 
 		$backup_parts = array();
-        $return = array();
+		$return = array();
 
 		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
@@ -1225,7 +1225,7 @@ 
 	{
 		$this->check_access();
 
-        $return = array();
+		$return = array();
 
 		$backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$storage_type = $this->xcloner_sanitization->sanitize_input_as_string($_POST['storage_type']);
@@ -1264,7 +1264,7 @@ 
 	{
 		$this->check_access();
 
-        $return = array();
+		$return = array();
 
 		$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
@@ -1334,10 +1334,10 @@ 
 		}
 
 		try {
-            unlink($tmp_file);
-        }catch(Exception $e) {
-		    //We are not interested in the error here
-        }
+			unlink($tmp_file);
+		}catch(Exception $e) {
+			//We are not interested in the error here
+		}
 
 		die();
 	}
@@ -1378,7 +1378,7 @@ 
 		}
 		fclose($read_stream);
 
-        wp_die();
+		wp_die();
 
 	}
 
@@ -1389,7 +1389,7 @@ 
 	{
 		$this->check_access();
 
-        $return = array();
+		$return = array();
 
 		$return['part'] = 0;
 		$return['total_parts'] = 0;

includes/class-xcloner-remote-storage.php

Indentation +5 added lines, -5 removed lines

@@ -162,11 +162,11 @@
 	private $logger;
 	private $xcloner;
 
-    /**
-     * Xcloner_Remote_Storage constructor.
-     * @param Xcloner $xcloner_container
-     */
-    public function __construct( Xcloner $xcloner_container ) {
+	/**
+	 * Xcloner_Remote_Storage constructor.
+	 * @param Xcloner $xcloner_container
+	 */
+	public function __construct( Xcloner $xcloner_container ) {
 		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
 		$this->xcloner_file_system  = $xcloner_container->get_xcloner_filesystem();
 		$this->logger               = $xcloner_container->get_xcloner_logger()->withName( "xcloner_remote_storage" );

includes/class-xcloner-loader.php

Indentation +22 added lines, -22 removed lines

@@ -59,24 +59,24 @@ 
 	 */
 	protected $filters;
 
-    /**
-     * @var Xcloner
-     */
-    private $xcloner_plugin;
-
-    /**
-     * @var Xcloner
-     */
-    private $xcloner_container;
-
-
-    /**
-     * Initialize the collections used to maintain the actions and filters.
-     *
-     * Xcloner_Loader constructor.
-     * @param Xcloner $xcloner_container
-     */
-    public function __construct(Xcloner $xcloner_container)
+	/**
+	 * @var Xcloner
+	 */
+	private $xcloner_plugin;
+
+	/**
+	 * @var Xcloner
+	 */
+	private $xcloner_container;
+
+
+	/**
+	 * Initialize the collections used to maintain the actions and filters.
+	 *
+	 * Xcloner_Loader constructor.
+	 * @param Xcloner $xcloner_container
+	 */
+	public function __construct(Xcloner $xcloner_container)
 	{
 
 		$this->actions = array();
@@ -86,10 +86,10 @@ 
 
 	}
 
-    /**
-     * Add XCloner to Admin Menu
-     */
-    public function xcloner_backup_add_admin_menu()
+	/**
+	 * Add XCloner to Admin Menu
+	 */
+	public function xcloner_backup_add_admin_menu()
 	{
 		if (function_exists('add_menu_page')) {
 			add_menu_page(__('Site Backup', 'xcloner-backup-and-restore'),

includes/class-xcloner-encryption.php

Indentation +15 added lines, -15 removed lines

@@ -19,11 +19,11 @@ 
 	private $xcloner_container;
 	private $verification = false;
 
-    /**
-     * Xcloner_Encryption constructor.
-     * @param Xcloner $xcloner_container
-     */
-    public function __construct(Xcloner $xcloner_container)
+	/**
+	 * Xcloner_Encryption constructor.
+	 * @param Xcloner $xcloner_container
+	 */
+	public function __construct(Xcloner $xcloner_container)
 	{
 		$this->xcloner_container = $xcloner_container;
 		if (method_exists($xcloner_container, 'get_xcloner_settings')) {
@@ -63,12 +63,12 @@ 
 	public function is_encrypted_file($filename) {
 		$fp = fopen($this->get_xcloner_path().$filename, 'r');
 		if($fp) {
-            $encryption_length = fread($fp, 16);
-            fclose($fp);
-            if (is_numeric($encryption_length)) {
-                return true;
-            }
-        }
+			$encryption_length = fread($fp, 16);
+			fclose($fp);
+			if (is_numeric($encryption_length)) {
+				return true;
+			}
+		}
 
 		return false;
 
@@ -372,10 +372,10 @@ 
 	if (isset($argv[1])) {
 
 		class Xcloner {
-            /**
-             * Xcloner constructor.
-             */
-            public function __construct()
+			/**
+			 * Xcloner constructor.
+			 */
+			public function __construct()
 			{
 			}
 		}

restore/xcloner_restore.php

Indentation +10 added lines, -10 removed lines

@@ -253,7 +253,7 @@ 
 				try {
 					unlink($_FILES['blob']['tmp_name']);
 				}catch (Exception $e) {
-                    //silent message
+					//silent message
 				}
 
 			}elseif (isset($_POST['blob'])) {
@@ -424,18 +424,18 @@ 
 				
 			}
 
-            $return['start'] = ftell($fp);
+			$return['start'] = ftell($fp);
 
-            $this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start'] - $start)));
+			$this->logger->info(sprintf("Executed %s queries of size %s bytes", $line_count, ($return['start'] - $start)));
 
-            if (!feof($fp))
-            {
-                $return['finished'] = 0;
-            } else {
-                $this->logger->info(sprintf("Mysql Import Done."));
-            }
+			if (!feof($fp))
+			{
+				$return['finished'] = 0;
+			} else {
+				$this->logger->info(sprintf("Mysql Import Done."));
+			}
 
-            fclose($fp);
+			fclose($fp);
 		}
 		
 		$this->send_response(200, $return);