ovidiul / XCloner-Wordpress

includes/class-xcloner-archive.php

Doc Comments +8 added lines

@@ -213,6 +213,10 @@ 
      *
      * @return bool
      */
+
+    /**
+     * @param string $error_message
+     */
     public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
     {
 
@@ -638,6 +642,10 @@ 
      * Add file to archive
      *
      */
+
+    /**
+     * @param integer $append
+     */
     public function add_file_to_archive($file_info, $start_at_byte, $byte_limit = 0, $append, $filesystem)
     {
 

Indentation +515 added lines, -515 removed lines

@@ -36,171 +36,171 @@ 
  */
 class Xcloner_Archive extends Tar
 {
-    /**
-     * Process file size per API request
-     * @var float|int
-     */
-    private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
-    /**
-     * Files count to process per API request
-     * @var int
-     */
-    private $files_to_process_per_request = 250; //block of 512 bytes
-    /**
-     * Compression level, 0-uncompressed, 9-maximum compression
-     * @var int
-     */
-    private $compression_level = 0; //0-9 , 0 uncompressed
-    /**
-     * Split backup size limit
-     * Create a new backup archive file once the set size is reached
-     * @var float|int
-     */
-    private $xcloner_split_backup_limit = 2048; //2048MB
-    /**
-     * Number of processed bytes
-     * @var int
-     */
-    private $processed_size_bytes = 0;
-
-    /**
-     * Archive name
-     * @var string
-     */
-    private $archive_name;
-    /**
-     * @var Tar
-     */
-    private $backup_archive;
-    /**
-     * @var Xcloner_File_System
-     */
-    private $filesystem;
-    /**
-     * @var Xcloner_Logger
-     */
-    private $logger;
-    /**
-     * @var Xcloner_Settings
-     */
-    private $xcloner_settings;
-
-    /**
-     * [__construct description]
-     * @param Xcloner $xcloner_container XCloner Container
-     * @param string $archive_name Achive Name
-     */
-    public function __construct(Xcloner $xcloner_container, $archive_name = "")
-    {
-        $this->filesystem = $xcloner_container->get_xcloner_filesystem();
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
-            $this->file_size_per_request_limit = $value * 1024 * 1024;
-        } //MB
-
-        if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
-            $this->files_to_process_per_request = $value;
-        }
+	/**
+	 * Process file size per API request
+	 * @var float|int
+	 */
+	private $file_size_per_request_limit = 52428800; //50MB = 52428800; 1MB = 1048576
+	/**
+	 * Files count to process per API request
+	 * @var int
+	 */
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	/**
+	 * Compression level, 0-uncompressed, 9-maximum compression
+	 * @var int
+	 */
+	private $compression_level = 0; //0-9 , 0 uncompressed
+	/**
+	 * Split backup size limit
+	 * Create a new backup archive file once the set size is reached
+	 * @var float|int
+	 */
+	private $xcloner_split_backup_limit = 2048; //2048MB
+	/**
+	 * Number of processed bytes
+	 * @var int
+	 */
+	private $processed_size_bytes = 0;
+
+	/**
+	 * Archive name
+	 * @var string
+	 */
+	private $archive_name;
+	/**
+	 * @var Tar
+	 */
+	private $backup_archive;
+	/**
+	 * @var Xcloner_File_System
+	 */
+	private $filesystem;
+	/**
+	 * @var Xcloner_Logger
+	 */
+	private $logger;
+	/**
+	 * @var Xcloner_Settings
+	 */
+	private $xcloner_settings;
+
+	/**
+	 * [__construct description]
+	 * @param Xcloner $xcloner_container XCloner Container
+	 * @param string $archive_name Achive Name
+	 */
+	public function __construct(Xcloner $xcloner_container, $archive_name = "")
+	{
+		$this->filesystem = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request')) {
+			$this->file_size_per_request_limit = $value * 1024 * 1024;
+		} //MB
+
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request')) {
+			$this->files_to_process_per_request = $value;
+		}
 
-        if ($value = get_option('xcloner_backup_compression_level')) {
-            $this->compression_level = $value;
-        }
+		if ($value = get_option('xcloner_backup_compression_level')) {
+			$this->compression_level = $value;
+		}
 
-        if ($value = get_option('xcloner_split_backup_limit')) {
-            $this->xcloner_split_backup_limit = $value;
-        }
+		if ($value = get_option('xcloner_split_backup_limit')) {
+			$this->xcloner_split_backup_limit = $value;
+		}
 
-        $this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 
-        if (isset($archive_name) && $archive_name) {
-            $this->set_archive_name($archive_name);
-        }
-    }
+		if (isset($archive_name) && $archive_name) {
+			$this->set_archive_name($archive_name);
+		}
+	}
 
-    /*
+	/*
      * Rename backup archive
      *
      * @param string $old_name
      * @param string $new_name
      *
      */
-    public function rename_archive($old_name, $new_name)
-    {
-        $this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
-        $storage_filesystem = $this->filesystem->get_storage_filesystem();
-        $storage_filesystem->rename($old_name, $new_name);
-    }
-
-    /*
+	public function rename_archive($old_name, $new_name)
+	{
+		$this->logger->info(sprintf("Renaming backup archive %s to %s", $old_name, $new_name));
+		$storage_filesystem = $this->filesystem->get_storage_filesystem();
+		$storage_filesystem->rename($old_name, $new_name);
+	}
+
+	/*
      *
      * Set the backup archive name
      *
      */
-    public function set_archive_name($name = "", $part = 0)
-    {
+	public function set_archive_name($name = "", $part = 0)
+	{
 
-        $this->archive_name = $this->filesystem->process_backup_name($name);
+		$this->archive_name = $this->filesystem->process_backup_name($name);
 
-        if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
-            //$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
-            $new_name = $this->archive_name;
+		if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start()) {
+			//$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
+			$new_name = $this->archive_name;
 
-            if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
-            }
+			if (!stristr($new_name, "-diff")) {
+				$new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+			}
 
-            $this->archive_name = $new_name;
+			$this->archive_name = $new_name;
 
-        }
+		}
 
-        if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
-            if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
-            }
+		if (isset($part) and $part) {
+			$new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+			if (!stristr($new_name, "-part")) {
+				$new_name = $this->archive_name . "-part" . $part;
+			}
 
-            $this->archive_name = $new_name;
-        }
+			$this->archive_name = $new_name;
+		}
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /*
+	/*
      *
      * Returns the backup archive name
      *
      * @return string archive name
      */
-    public function get_archive_name()
-    {
-        return $this->archive_name;
-    }
+	public function get_archive_name()
+	{
+		return $this->archive_name;
+	}
 
-    /*
+	/*
      *
      * Returns the multipart naming for the backup archive
      *
      * @return string multi-part backup name
      */
-    public function get_archive_name_multipart()
-    {
-        $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
-    }
+	public function get_archive_name_multipart()
+	{
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
+		return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+	}
 
-    /*
+	/*
      *
      * Returns the full backup name including extension
      *
      */
-    public function get_archive_name_with_extension()
-    {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
-    }
+	public function get_archive_name_with_extension()
+	{
+		return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+	}
 
-    /*
+	/*
      *
      * Send notification error by E-Mail
      *
@@ -213,31 +213,31 @@ 
      *
      * @return bool
      */
-    public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
-    {
+	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
+	{
 
-        $body = "";
-        $body .= sprintf(__("Backup Site Url: %s"), get_site_url());
-        $body .= "<br /><>";
+		$body = "";
+		$body .= sprintf(__("Backup Site Url: %s"), get_site_url());
+		$body .= "<br /><>";
 
-        $body .= sprintf(__("Error Message: %s"), $error_message);
+		$body .= sprintf(__("Error Message: %s"), $error_message);
 
-        $this->logger->info(sprintf("Sending backup error notification to %s", $to));
+		$this->logger->info(sprintf("Sending backup error 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');
+		$headers = array('Content-Type: text/html; charset=UTF-8');
 
-        if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
-        }
+		if ($admin_email and $from) {
+			$headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+		}
 
-        $return = wp_mail($to, $subject, $body, $headers);
+		$return = wp_mail($to, $subject, $body, $headers);
 
-        return $return;
-    }
+		return $return;
+	}
 
-    /*
+	/*
      *
      * Send backup archive notfication by E-Mail
      *
@@ -251,482 +251,482 @@ 
      *
      * @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();
+	public function start_incremental_backup($backup_params, $extra_params, $init)
+	{
+		$return = array();
 
-        if (!isset($extra_params['backup_part'])) {
-            $extra_params['backup_part'] = 0;
-        }
+		if (!isset($extra_params['backup_part'])) {
+			$extra_params['backup_part'] = 0;
+		}
 
-        $return['extra']['backup_part'] = $extra_params['backup_part'];
+		$return['extra']['backup_part'] = $extra_params['backup_part'];
 
-        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_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 (!$this->get_archive_name()) {
-            $this->set_archive_name();
-        }
+		if (!$this->get_archive_name()) {
+			$this->set_archive_name();
+		}
 
-        $this->backup_archive = new Tar();
-        $this->backup_archive->setCompression($this->compression_level);
+		$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());
+		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 
-        if ($init) {
-            $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
+		if ($init) {
+			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 1;
+			$return['extra']['backup_init'] = 1;
 
-        } else {
-            $this->logger->info(sprintf(__("Opening for append 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->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
+			$this->backup_archive->openForAppend($archive_info->getPath() . DS . $archive_info->getFilename());
 
-            $return['extra']['backup_init'] = 0;
+			$return['extra']['backup_init'] = 0;
 
-        }
+		}
 
-        $return['extra']['backup_archive_name'] = $this->get_archive_name();
-        $return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
+		$return['extra']['backup_archive_name'] = $this->get_archive_name();
+		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 
-        if (!isset($extra_params['start_at_line'])) {
-            $extra_params['start_at_line'] = 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;
-        }
+		if (!isset($extra_params['start_at_byte'])) {
+			$extra_params['start_at_byte'] = 0;
+		}
 
-        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 (!$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()));
 
-            $return['finished'] = 1;
-            return $return;
-        }
+			$return['finished'] = 1;
+			return $return;
+		}
 
-        $included_files_handler = $this->filesystem->get_included_files_handler(1);
+		$included_files_handler = $this->filesystem->get_included_files_handler(1);
 
-        $file = new SplFileObject($included_files_handler);
+		$file = new SplFileObject($included_files_handler);
 
-        $file->seek(PHP_INT_MAX);
+		$file->seek(PHP_INT_MAX);
 
-        $return['extra']['lines_total'] = ($file->key() - 1);
+		$return['extra']['lines_total'] = ($file->key() - 1);
 
-        //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);
-        }
+		//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);
+		}
 
-        $this->processed_size_bytes = 0;
+		$this->processed_size_bytes = 0;
 
-        $counter = 0;
+		$counter = 0;
 
-        $start_byte = $extra_params['start_at_byte'];
+		$start_byte = $extra_params['start_at_byte'];
 
-        $byte_limit = 0;
+		$byte_limit = 0;
 
-        while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
-            $current_line_str = $file->current();
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request) {
+			$current_line_str = $file->current();
 
-            $line = str_getcsv($current_line_str);
+			$line = str_getcsv($current_line_str);
 
-            $relative_path = stripslashes($line[0]);
+			$relative_path = stripslashes($line[0]);
 
-            $start_filesystem = "start_filesystem";
+			$start_filesystem = "start_filesystem";
 
-            if (isset($line[4])) {
-                $start_filesystem = $line[4];
-            }
+			if (isset($line[4])) {
+				$start_filesystem = $line[4];
+			}
 
-            //$adapter = $this->filesystem->get_adapter($start_filesystem);
+			//$adapter = $this->filesystem->get_adapter($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 (!$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));
+				}
 
-                $extra_params['start_at_line']++;
-                $file->next();
-                continue;
-            }
+				$extra_params['start_at_line']++;
+				$file->next();
+				continue;
+			}
 
-            $file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
+			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 
-            if (!isset($file_info['size'])) {
-                $file_info['size'] = 0;
-            }
+			if (!isset($file_info['size'])) {
+				$file_info['size'] = 0;
+			}
 
-            if ($start_filesystem == "tmp_filesystem") {
-                $file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
-            }
+			if ($start_filesystem == "tmp_filesystem") {
+				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
+			}
 
-            $byte_limit = (int)$this->file_size_per_request_limit / 512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 
-            $append = 0;
+			$append = 0;
 
-            if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
-                $append = 1;
-            }
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte) {
+				$append = 1;
+			}
 
-            if (!isset($return['extra']['backup_size'])) {
-                $return['extra']['backup_size'] = 0;
-            }
+			if (!isset($return['extra']['backup_size'])) {
+				$return['extra']['backup_size'] = 0;
+			}
 
-            $return['extra']['backup_size'] = $archive_info->getSize();
+			$return['extra']['backup_size'] = $archive_info->getSize();
 
-            $estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
+			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 
-            //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']);
+			//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']);
 
-                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']++;
-                }
+				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['extra']['start_at_line'] = $extra_params['start_at_line'];
-                $return['extra']['start_at_byte'] = 0;
+				$return['extra']['start_at_line'] = $extra_params['start_at_line'];
+				$return['extra']['start_at_byte'] = 0;
 
-                $return['finished'] = 0;
+				$return['finished'] = 0;
 
-                return $return;
-            }
+				return $return;
+			}
 
-            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;
+			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();
+			//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 ($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());
-            }
-
-            $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());
-        }
+	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());
+
+		} 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
      *
      */
-    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);
-
-        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'];
-        }
-
-        $last_position = $start_at_byte;
-
-        //$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']);
-
-            //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 ($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;
-            }
+	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);
 
-            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 (!$file_info['path']) {
+			return;
+		}
 
-            //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);
-                }
-            }
+		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;
+
+		//$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']);
+
+			//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 ($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 ($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);
+				}
+			}
 
-        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
-     */
-    /*
+		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
+	 */
+	/*
     public function openForAppend($file = '')
     {
         $this->file   = $file;
@@ -756,17 +756,17 @@ 
     }
     */
 
-    /**
-     * Append data to a file to the current TAR archive using an existing file in the filesystem
-     *
-     * @param string $file path to the original file
-     * @param int $start starting reading position in file
-     * @param int $end end position in reading multiple with 512
-     * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
-     * all meta data, empty to take from original
-     * @throws ArchiveIOException
-     */
-    /*
+	/**
+	 * Append data to a file to the current TAR archive using an existing file in the filesystem
+	 *
+	 * @param string $file path to the original file
+	 * @param int $start starting reading position in file
+	 * @param int $end end position in reading multiple with 512
+	 * @param string|FileInfo $fileinfo either the name to us in archive (string) or a FileInfo oject with
+	 * all meta data, empty to take from original
+	 * @throws ArchiveIOException
+	 */
+	/*
      * public function appendFileData($file, $fileinfo = '', $start = 0, $limit = 0)
     {
 		$end = $start+($limit*512);
@@ -822,15 +822,15 @@ 
         return $last_position;
     }*/
 
-    /**
-     * Adds a file to a TAR archive by appending it's data
-     *
-     * @param string $archive name of the archive file
-     * @param string $file name of the file to read data from
-     * @param string $start start position from where to start reading data
-     * @throws ArchiveIOException
-     */
-    /*public function addFileToArchive($archive, $file, $start = 0)
+	/**
+	 * Adds a file to a TAR archive by appending it's data
+	 *
+	 * @param string $archive name of the archive file
+	 * @param string $file name of the file to read data from
+	 * @param string $start start position from where to start reading data
+	 * @throws ArchiveIOException
+	 */
+	/*public function addFileToArchive($archive, $file, $start = 0)
     {
         $this->openForAppend($archive);
         return $start = $this->appendFileData($file, $start, $this->file_size_per_request_limit);

Spacing +16 added lines, -16 removed lines

@@ -148,7 +148,7 @@ 
             $new_name = $this->archive_name;
 
             if (!stristr($new_name, "-diff")) {
-                $new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+                $new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
             }
 
             $this->archive_name = $new_name;
@@ -156,9 +156,9 @@ 
         }
 
         if (isset($part) and $part) {
-            $new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+            $new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
             if (!stristr($new_name, "-part")) {
-                $new_name = $this->archive_name . "-part" . $part;
+                $new_name = $this->archive_name."-part".$part;
             }
 
             $this->archive_name = $new_name;
@@ -187,7 +187,7 @@ 
     public function get_archive_name_multipart()
     {
         $new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-        return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+        return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
     }
 
     /*
@@ -197,7 +197,7 @@ 
      */
     public function get_archive_name_with_extension()
     {
-        return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+        return $this->archive_name.$this->xcloner_settings->get_backup_extension_name();
     }
 
     /*
@@ -229,7 +229,7 @@ 
         $headers = array('Content-Type: text/html; charset=UTF-8');
 
         if ($admin_email and $from) {
-            $headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+            $headers[] = 'From: '.$from.' <'.$admin_email.'>';
         }
 
         $return = wp_mail($to, $subject, $body, $headers);
@@ -302,18 +302,18 @@ 
         $body .= "<br />";
 
         if (isset($params['backup_params']->backup_comments)) {
-            $body .= __("Backup Comments: ") . $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",
+            $body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n",
                                                                         $this->logger->getLastDebugLines(50));
         }
 
         $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);
@@ -327,7 +327,7 @@ 
 
         $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));
 
@@ -367,14 +367,14 @@ 
         if ($init) {
             $this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 
-            $this->backup_archive->create($archive_info->getPath() . DS . $archive_info->getFilename());
+            $this->backup_archive->create($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 1;
 
         } 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());
+            $this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
 
             $return['extra']['backup_init'] = 0;
 
@@ -578,13 +578,13 @@ 
      */
     private function write_multipart_file($path = "")
     {
-        if(!$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;
+        $line = '"'.$file['path'].'","'.$file['timestamp'].'","'.$file['size'].'"'.PHP_EOL;
 
 
         $this->filesystem->get_filesystem("storage_filesystem_append")
@@ -627,7 +627,7 @@ 
         $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->create($archive_info->getPath().DS.$archive_info->getFilename());
 
         return array($archive_info, $part);
 
@@ -649,7 +649,7 @@ 
         }
 
         if (isset($file_info['archive_prefix_path'])) {
-            $file_info['target_path'] = $file_info['archive_prefix_path'] . "/" . $file_info['path'];
+            $file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
         } else {
             $file_info['target_path'] = $file_info['path'];
         }

includes/class-xcloner-encryption.php

Doc Comments +8 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
     /**
      * Returns the filename with encrypted suffix
      *
-     * @param $filename
+     * @param string $filename
      * @return string
      */
     public function get_encrypted_target_backup_file_name( $filename ) {
@@ -81,7 +81,7 @@ 
     /**
      * Returns the filename without encrypted suffix
      *
-     * @param $filename
+     * @param string $filename
      * @return string
      */
     public function get_decrypted_target_backup_file_name( $filename ) {
@@ -96,8 +96,8 @@ 
      * @param string $dest   File name where the encryped file should be written to.
      * @param string $key    The key used for the encryption
      * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @param bool $verfication   Weather we should we try to verify the decryption.
+     * @param integer $iv   The IV key to use.
+     * @param bool $verification   Weather we should we try to verify the decryption.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
     */
     public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
@@ -206,6 +206,9 @@ 
         return array("target_file" => $dest, "finished" => 1);
     }
 
+    /**
+     * @param string $file
+     */
     public function verify_encrypted_file($file) {
         if(is_object($this->logger)) {
             $this->logger->info(sprintf('Verifying encrypted file %s', $file));
@@ -224,7 +227,7 @@ 
      * @param string $dest   File name where the decryped file should be written to.
      * @param string $key    The key used for the decryption (must be the same as for encryption)
      * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
+     * @param integer $iv   The IV key to use.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
      */
     public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)

Indentation +359 added lines, -359 removed lines

@@ -10,370 +10,370 @@
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024*1024;
-    const FILE_ENCRYPTION_SUFFIX = ".encrypted";
-    const FILE_DECRYPTION_SUFFIX = ".decrypted";
-
-    private $xcloner_settings;
-    private $logger;
-    private $verification = false;
-
-    public function __construct(Xcloner $xcloner_container)
-    {
-        $this->xcloner_container = $xcloner_container;
-        if(method_exists($xcloner_container, 'get_xcloner_settings')) {
-            $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
-            $this->xcloner_settings = "";
-        }
-
-        if(method_exists($xcloner_container, 'get_xcloner_logger')) {
-            $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
-            $this->logger = "";
-        }
-    }
-
-    /**
-     * Returns the backup encryption key
-     *
-     * @return SECURE_AUTH_SALT|null
-     */
-    public function get_backup_encryption_key()
-    {
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_encryption_key();
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Check if provided filename has encrypted suffix
-     *
-     * @param $filename
-     * @return bool
-     */
-    public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path() .$filename, 'r');
-        $encryption_length = fread($fp, 16);
-        fclose($fp);
-        if(is_numeric($encryption_length)) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Returns the filename with encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_encrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
-    }
-
-    /**
-     * Returns the filename without encrypted suffix
-     *
-     * @param $filename
-     * @return string
-     */
-    public function get_decrypted_target_backup_file_name( $filename ) {
-
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
-    }
-
-    /**
-     * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
-     *
-     * @param string $source Path to file that should be encrypted
-     * @param string $dest   File name where the encryped file should be written to.
-     * @param string $key    The key used for the encryption
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @param bool $verfication   Weather we should we try to verify the decryption.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-    */
-    public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_encrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if(!$iv || !$start) {
-            //$iv = openssl_random_pseudo_bytes(16);
-            $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
-        }
-
-        if( !$start ) {
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
-        }
-
-        if ( $fpOut ) {
-
-            // Put the initialization vector to the beginning of the file
-            if(!$start) {
-                fwrite($fpOut, $iv);
-            }
-
-            if (file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                fseek($fpIn, (int)$start);
-
-                if (!feof($fpIn)) {
-
-                    $plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
-                    $ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-                    //$iv = openssl_random_pseudo_bytes(16);
-
-                    fwrite($fpOut, $ciphertext);
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        //echo "\n NEW:".$key.md5($iv);
-                        //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if($recursive ){
-                            $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
-
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                        }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for encryption.');
-                }
-                throw new \Exception("Unable to read source file for encryption.");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for encryption.');
-            }
-            throw new \Exception("Unable to write destination file for encryption.");
-        }
-
-        if($verification) {
-            $this->verify_encrypted_file($dest);
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && copy($this->get_xcloner_path() .$dest,
-             $this->get_xcloner_path() .$source) ) {
-            unlink($this->get_xcloner_path() .$dest);
-        }
-
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function verify_encrypted_file($file) {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Verifying encrypted file %s', $file));
-        }
-
-        $this->verification = true;
-        $this->decrypt_file($file);
-        $this->verification = false;
-    }
-
-    /**
-     * Dencrypt the passed file and saves the result in a new file, removing the
-     * last 4 characters from file name.
-     *
-     * @param string $source Path to file that should be decrypted
-     * @param string $dest   File name where the decryped file should be written to.
-     * @param string $key    The key used for the decryption (must be the same as for encryption)
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param string $iv   The IV key to use.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-     */
-    public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
-    {
-        if(is_object($this->logger)) {
-            $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
-            $key = self::get_backup_encryption_key();
-        }
-
-        $key_digest = openssl_digest ($key, "md5", true);
-
-        $keep_local = 1;
-        if(!$dest) {
-            $dest = $this->get_decrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if( !$start ) {
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'w');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
-            }
-        }else{
-            if($this->verification){
-                $fpOut = fopen("php://stdout", 'a');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
-            }
-        }
-
-        if ( $fpOut ) {
-            if ( file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
-
-                $encryption_length = (int)fread($fpIn, 16);
-                if(!$encryption_length) {
-                    $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
-                }
-
-                fseek($fpIn, (int)$start);
-
-                // Get the initialzation vector from the beginning of the file
-                if(!$iv) {
-                    $iv = fread($fpIn, 16);
-                }
-
-                if (!feof($fpIn)) {
-
-                    // we have to read one block more for decrypting than for encrypting
-                    $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
-                    $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    if(!$plaintext){
-                        unlink($this->get_xcloner_path() . $dest);
-                        if(is_object($this->logger)) {
-                            $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
-                        }
-                        throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
-                    }
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-
-                    if( !$this->verification) {
-                        fwrite($fpOut, $plaintext);
-                    }
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut );
-
-                    if(!feof($fpIn)) {
-                        fclose($fpIn);
-                        if($this->verification || $recursive) {
-                            $ciphertext = "";
-                            $plaintext = "";
-                            $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
-                            if(($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "encryption_length" => $encryption_length,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                    }
-                    }
-
-                }
-            } else {
-                if(is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for decryption');
-                }
-                throw new \Exception("Unable to read source file for decryption");
-            }
-        } else {
-            if(is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for decryption');
-            }
-            throw new \Exception("Unable to write destination file for decryption");
-        }
-
-        //we replace the original backup with the encrypted one
-        if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
-            $this->get_xcloner_path()  .$source) ) {
-            unlink($this->get_xcloner_path()  .$dest);
-        }
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function get_xcloner_path(){
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path() . DS;
-        }
-
-        return null;
-    }
+	const FILE_ENCRYPTION_BLOCKS = 1024*1024;
+	const FILE_ENCRYPTION_SUFFIX = ".encrypted";
+	const FILE_DECRYPTION_SUFFIX = ".decrypted";
+
+	private $xcloner_settings;
+	private $logger;
+	private $verification = false;
+
+	public function __construct(Xcloner $xcloner_container)
+	{
+		$this->xcloner_container = $xcloner_container;
+		if(method_exists($xcloner_container, 'get_xcloner_settings')) {
+			$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		}else{
+			$this->xcloner_settings = "";
+		}
+
+		if(method_exists($xcloner_container, 'get_xcloner_logger')) {
+			$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
+		}else{
+			$this->logger = "";
+		}
+	}
+
+	/**
+	 * Returns the backup encryption key
+	 *
+	 * @return SECURE_AUTH_SALT|null
+	 */
+	public function get_backup_encryption_key()
+	{
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_encryption_key();
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Check if provided filename has encrypted suffix
+	 *
+	 * @param $filename
+	 * @return bool
+	 */
+	public function is_encrypted_file($filename) {
+		$fp = fopen($this->get_xcloner_path() .$filename, 'r');
+		$encryption_length = fread($fp, 16);
+		fclose($fp);
+		if(is_numeric($encryption_length)) {
+			return true;
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Returns the filename with encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_encrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Returns the filename without encrypted suffix
+	 *
+	 * @param $filename
+	 * @return string
+	 */
+	public function get_decrypted_target_backup_file_name( $filename ) {
+
+		return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
+	 *
+	 * @param string $source Path to file that should be encrypted
+	 * @param string $dest   File name where the encryped file should be written to.
+	 * @param string $key    The key used for the encryption
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @param bool $verfication   Weather we should we try to verify the decryption.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_encrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if(!$iv || !$start) {
+			//$iv = openssl_random_pseudo_bytes(16);
+			$iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
+		}
+
+		if( !$start ) {
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
+		}else{
+			$fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
+		}
+
+		if ( $fpOut ) {
+
+			// Put the initialization vector to the beginning of the file
+			if(!$start) {
+				fwrite($fpOut, $iv);
+			}
+
+			if (file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				fseek($fpIn, (int)$start);
+
+				if (!feof($fpIn)) {
+
+					$plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
+					$ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+					//$iv = openssl_random_pseudo_bytes(16);
+
+					fwrite($fpOut, $ciphertext);
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						//echo "\n NEW:".$key.md5($iv);
+						//self::encryptFile($source, $dest, $key, $start, $iv);
+						if($recursive ){
+							$this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
+						}else {
+
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+						}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for encryption.');
+				}
+				throw new \Exception("Unable to read source file for encryption.");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for encryption.');
+			}
+			throw new \Exception("Unable to write destination file for encryption.");
+		}
+
+		if($verification) {
+			$this->verify_encrypted_file($dest);
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && copy($this->get_xcloner_path() .$dest,
+			 $this->get_xcloner_path() .$source) ) {
+			unlink($this->get_xcloner_path() .$dest);
+		}
+
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function verify_encrypted_file($file) {
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Verifying encrypted file %s', $file));
+		}
+
+		$this->verification = true;
+		$this->decrypt_file($file);
+		$this->verification = false;
+	}
+
+	/**
+	 * Dencrypt the passed file and saves the result in a new file, removing the
+	 * last 4 characters from file name.
+	 *
+	 * @param string $source Path to file that should be decrypted
+	 * @param string $dest   File name where the decryped file should be written to.
+	 * @param string $key    The key used for the decryption (must be the same as for encryption)
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param string $iv   The IV key to use.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
+	{
+		if(is_object($this->logger)) {
+			$this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if(!$key){
+			$key = self::get_backup_encryption_key();
+		}
+
+		$key_digest = openssl_digest ($key, "md5", true);
+
+		$keep_local = 1;
+		if(!$dest) {
+			$dest = $this->get_decrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if( !$start ) {
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'w');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
+			}
+		}else{
+			if($this->verification){
+				$fpOut = fopen("php://stdout", 'a');
+			}else {
+				$fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
+			}
+		}
+
+		if ( $fpOut ) {
+			if ( file_exists($this->get_xcloner_path() .$source) &&
+				$fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+
+				$encryption_length = (int)fread($fpIn, 16);
+				if(!$encryption_length) {
+					$encryption_length = self::FILE_ENCRYPTION_BLOCKS;
+				}
+
+				fseek($fpIn, (int)$start);
+
+				// Get the initialzation vector from the beginning of the file
+				if(!$iv) {
+					$iv = fread($fpIn, 16);
+				}
+
+				if (!feof($fpIn)) {
+
+					// we have to read one block more for decrypting than for encrypting
+					$ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
+					$plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					if(!$plaintext){
+						unlink($this->get_xcloner_path() . $dest);
+						if(is_object($this->logger)) {
+							$this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
+						}
+						throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
+					}
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+
+					if( !$this->verification) {
+						fwrite($fpOut, $plaintext);
+					}
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut );
+
+					if(!feof($fpIn)) {
+						fclose($fpIn);
+						if($this->verification || $recursive) {
+							$ciphertext = "";
+							$plaintext = "";
+							$this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
+						}else {
+							if(($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"encryption_length" => $encryption_length,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+					}
+					}
+
+				}
+			} else {
+				if(is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for decryption');
+				}
+				throw new \Exception("Unable to read source file for decryption");
+			}
+		} else {
+			if(is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for decryption');
+			}
+			throw new \Exception("Unable to write destination file for decryption");
+		}
+
+		//we replace the original backup with the encrypted one
+		if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
+			$this->get_xcloner_path()  .$source) ) {
+			unlink($this->get_xcloner_path()  .$dest);
+		}
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function get_xcloner_path(){
+		if(is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_store_path() . DS;
+		}
+
+		return null;
+	}
 
 }
 
 
 try {
 
-    if(isset($argv[1])) {
-
-        class Xcloner {
-            public function __construct()
-            {
-            }
-        }
-        $xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
-
-        if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
-        } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
-        }
-    }
+	if(isset($argv[1])) {
+
+		class Xcloner {
+			public function __construct()
+			{
+			}
+		}
+		$xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
+
+		if ($argv[1] == "-e") {
+			$xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
+		} elseif ($argv[1] == "-d") {
+			$xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
+		}
+	}
 }catch(\Exception $e) {
-    echo "CAUGHT: " . $e->getMessage();
+	echo "CAUGHT: " . $e->getMessage();
 }

Spacing +78 added lines, -78 removed lines

@@ -10,7 +10,7 @@ 
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024*1024;
+    const FILE_ENCRYPTION_BLOCKS = 1024 * 1024;
     const FILE_ENCRYPTION_SUFFIX = ".encrypted";
     const FILE_DECRYPTION_SUFFIX = ".decrypted";
 
@@ -21,15 +21,15 @@ 
     public function __construct(Xcloner $xcloner_container)
     {
         $this->xcloner_container = $xcloner_container;
-        if(method_exists($xcloner_container, 'get_xcloner_settings')) {
+        if (method_exists($xcloner_container, 'get_xcloner_settings')) {
             $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
+        } else {
             $this->xcloner_settings = "";
         }
 
-        if(method_exists($xcloner_container, 'get_xcloner_logger')) {
+        if (method_exists($xcloner_container, 'get_xcloner_logger')) {
             $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
+        } else {
             $this->logger = "";
         }
     }
@@ -41,7 +41,7 @@ 
      */
     public function get_backup_encryption_key()
     {
-        if(is_object($this->xcloner_settings)) {
+        if (is_object($this->xcloner_settings)) {
             return $this->xcloner_settings->get_xcloner_encryption_key();
         }
 
@@ -56,10 +56,10 @@ 
      * @return bool
      */
     public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path() .$filename, 'r');
+        $fp = fopen($this->get_xcloner_path().$filename, 'r');
         $encryption_length = fread($fp, 16);
         fclose($fp);
-        if(is_numeric($encryption_length)) {
+        if (is_numeric($encryption_length)) {
             return true;
         }
 
@@ -73,9 +73,9 @@ 
      * @param $filename
      * @return string
      */
-    public function get_encrypted_target_backup_file_name( $filename ) {
+    public function get_encrypted_target_backup_file_name($filename) {
 
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename) . self::FILE_ENCRYPTION_SUFFIX;
+        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename).self::FILE_ENCRYPTION_SUFFIX;
     }
 
     /**
@@ -84,9 +84,9 @@ 
      * @param $filename
      * @return string
      */
-    public function get_decrypted_target_backup_file_name( $filename ) {
+    public function get_decrypted_target_backup_file_name($filename) {
 
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename) . self::FILE_DECRYPTION_SUFFIX;
+        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename).self::FILE_DECRYPTION_SUFFIX;
     }
 
     /**
@@ -100,44 +100,44 @@ 
      * @param bool $verfication   Weather we should we try to verify the decryption.
      * @return string|false  Returns the file name that has been created or FALSE if an error occured
     */
-    public function encrypt_file($source, $dest = "" , $key= "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+    public function encrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $verification = true, $recursive = false)
     {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
         }
 
         //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
+        if (!$key) {
             $key = self::get_backup_encryption_key();
         }
-        $key_digest = openssl_digest ($key, "md5", true);
+        $key_digest = openssl_digest($key, "md5", true);
 
         $keep_local = 1;
-        if(!$dest) {
+        if (!$dest) {
             $dest = $this->get_encrypted_target_backup_file_name($source);
             $keep_local = 0;
         }
 
-        if(!$iv || !$start) {
+        if (!$iv || !$start) {
             //$iv = openssl_random_pseudo_bytes(16);
             $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
         }
 
-        if( !$start ) {
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
-            $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
+        if (!$start) {
+            $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
+        } else {
+            $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
         }
 
-        if ( $fpOut ) {
+        if ($fpOut) {
 
             // Put the initialization vector to the beginning of the file
-            if(!$start) {
+            if (!$start) {
                 fwrite($fpOut, $iv);
             }
 
-            if (file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+            if (file_exists($this->get_xcloner_path().$source) &&
+                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
 
                 fseek($fpIn, (int)$start);
 
@@ -154,17 +154,17 @@ 
 
                     $start = ftell($fpIn);
 
-                    fclose($fpOut );
+                    fclose($fpOut);
 
-                    if(!feof($fpIn)) {
+                    if (!feof($fpIn)) {
                         fclose($fpIn);
                         //echo "\n NEW:".$key.md5($iv);
                         //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if($recursive ){
+                        if ($recursive) {
                             $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
+                        } else {
 
-                            if(($iv) != base64_decode(base64_encode($iv)))
+                            if (($iv) != base64_decode(base64_encode($iv)))
                             {
                                 throw new \Exception('Could not encode IV for transport');
                             }
@@ -180,26 +180,26 @@ 
 
                 }
             } else {
-                if(is_object($this->logger)) {
+                if (is_object($this->logger)) {
                     $this->logger->error('Unable to read source file for encryption.');
                 }
                 throw new \Exception("Unable to read source file for encryption.");
             }
         } else {
-            if(is_object($this->logger)) {
+            if (is_object($this->logger)) {
                 $this->logger->error('Unable to write destination file for encryption.');
             }
             throw new \Exception("Unable to write destination file for encryption.");
         }
 
-        if($verification) {
+        if ($verification) {
             $this->verify_encrypted_file($dest);
         }
 
         //we replace the original backup with the encrypted one
-        if( !$keep_local && copy($this->get_xcloner_path() .$dest,
-             $this->get_xcloner_path() .$source) ) {
-            unlink($this->get_xcloner_path() .$dest);
+        if (!$keep_local && copy($this->get_xcloner_path().$dest,
+             $this->get_xcloner_path().$source)) {
+            unlink($this->get_xcloner_path().$dest);
         }
 
 
@@ -207,7 +207,7 @@ 
     }
 
     public function verify_encrypted_file($file) {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Verifying encrypted file %s', $file));
         }
 
@@ -229,50 +229,50 @@ 
      */
     public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
     {
-        if(is_object($this->logger)) {
+        if (is_object($this->logger)) {
             $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
         }
 
         //$key = substr(sha1($key, true), 0, 16);
-        if(!$key){
+        if (!$key) {
             $key = self::get_backup_encryption_key();
         }
 
-        $key_digest = openssl_digest ($key, "md5", true);
+        $key_digest = openssl_digest($key, "md5", true);
 
         $keep_local = 1;
-        if(!$dest) {
+        if (!$dest) {
             $dest = $this->get_decrypted_target_backup_file_name($source);
             $keep_local = 0;
         }
 
-        if( !$start ) {
-            if($this->verification){
+        if (!$start) {
+            if ($this->verification) {
                 $fpOut = fopen("php://stdout", 'w');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
+            } else {
+                $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
             }
-        }else{
-            if($this->verification){
+        } else {
+            if ($this->verification) {
                 $fpOut = fopen("php://stdout", 'a');
-            }else {
-                $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
+            } else {
+                $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
             }
         }
 
-        if ( $fpOut ) {
-            if ( file_exists($this->get_xcloner_path() .$source) &&
-                $fpIn = fopen($this->get_xcloner_path() .$source, 'rb')) {
+        if ($fpOut) {
+            if (file_exists($this->get_xcloner_path().$source) &&
+                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
 
                 $encryption_length = (int)fread($fpIn, 16);
-                if(!$encryption_length) {
+                if (!$encryption_length) {
                     $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
                 }
 
                 fseek($fpIn, (int)$start);
 
                 // Get the initialzation vector from the beginning of the file
-                if(!$iv) {
+                if (!$iv) {
                     $iv = fread($fpIn, 16);
                 }
 
@@ -282,9 +282,9 @@ 
                     $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
                     $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
 
-                    if(!$plaintext){
-                        unlink($this->get_xcloner_path() . $dest);
-                        if(is_object($this->logger)) {
+                    if (!$plaintext) {
+                        unlink($this->get_xcloner_path().$dest);
+                        if (is_object($this->logger)) {
                             $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
                         }
                         throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
@@ -293,22 +293,22 @@ 
                     // Use the first 16 bytes of the ciphertext as the next initialization vector
                     $iv = substr($ciphertext, 0, 16);
 
-                    if( !$this->verification) {
+                    if (!$this->verification) {
                         fwrite($fpOut, $plaintext);
                     }
 
                     $start = ftell($fpIn);
 
-                    fclose($fpOut );
+                    fclose($fpOut);
 
-                    if(!feof($fpIn)) {
+                    if (!feof($fpIn)) {
                         fclose($fpIn);
-                        if($this->verification || $recursive) {
+                        if ($this->verification || $recursive) {
                             $ciphertext = "";
                             $plaintext = "";
                             $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
-                            if(($iv) != base64_decode(base64_encode($iv)))
+                        } else {
+                            if (($iv) != base64_decode(base64_encode($iv)))
                             {
                                 throw new \Exception('Could not encode IV for transport');
                             }
@@ -325,30 +325,30 @@ 
 
                 }
             } else {
-                if(is_object($this->logger)) {
+                if (is_object($this->logger)) {
                     $this->logger->error('Unable to read source file for decryption');
                 }
                 throw new \Exception("Unable to read source file for decryption");
             }
         } else {
-            if(is_object($this->logger)) {
+            if (is_object($this->logger)) {
                 $this->logger->error('Unable to write destination file for decryption');
             }
             throw new \Exception("Unable to write destination file for decryption");
         }
 
         //we replace the original backup with the encrypted one
-        if( !$keep_local && !$this->verification && copy($this->get_xcloner_path()  .$dest,
-            $this->get_xcloner_path()  .$source) ) {
-            unlink($this->get_xcloner_path()  .$dest);
+        if (!$keep_local && !$this->verification && copy($this->get_xcloner_path().$dest,
+            $this->get_xcloner_path().$source)) {
+            unlink($this->get_xcloner_path().$dest);
         }
 
         return array("target_file" => $dest, "finished" => 1);
     }
 
-    public function get_xcloner_path(){
-        if(is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path() . DS;
+    public function get_xcloner_path() {
+        if (is_object($this->xcloner_settings)) {
+            return $this->xcloner_settings->get_xcloner_store_path().DS;
         }
 
         return null;
@@ -359,21 +359,21 @@ 
 
 try {
 
-    if(isset($argv[1])) {
+    if (isset($argv[1])) {
 
         class Xcloner {
             public function __construct()
             {
             }
         }
-        $xcloner_encryption = new Xcloner_Encryption( new Xcloner() );
+        $xcloner_encryption = new Xcloner_Encryption(new Xcloner());
 
         if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2] . ".enc", $argv[4], '', '', '', true);
+            $xcloner_encryption->encrypt_file($argv[2], $argv[2].".enc", $argv[4], '', '', '', true);
         } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
+            $xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
         }
     }
-}catch(\Exception $e) {
-    echo "CAUGHT: " . $e->getMessage();
+}catch (\Exception $e) {
+    echo "CAUGHT: ".$e->getMessage();
 }

Braces +9 added lines, -9 removed lines

@@ -23,13 +23,13 @@ 
         $this->xcloner_container = $xcloner_container;
         if(method_exists($xcloner_container, 'get_xcloner_settings')) {
             $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        }else{
+        } else{
             $this->xcloner_settings = "";
         }
 
         if(method_exists($xcloner_container, 'get_xcloner_logger')) {
             $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        }else{
+        } else{
             $this->logger = "";
         }
     }
@@ -125,7 +125,7 @@ 
 
         if( !$start ) {
             $fpOut = fopen($this->get_xcloner_path() .$dest, 'w');
-        }else{
+        } else{
             $fpOut = fopen($this->get_xcloner_path() .$dest, 'a');
         }
 
@@ -162,7 +162,7 @@ 
                         //self::encryptFile($source, $dest, $key, $start, $iv);
                         if($recursive ){
                             $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        }else {
+                        } else {
 
                             if(($iv) != base64_decode(base64_encode($iv)))
                             {
@@ -249,13 +249,13 @@ 
         if( !$start ) {
             if($this->verification){
                 $fpOut = fopen("php://stdout", 'w');
-            }else {
+            } else {
                 $fpOut = fopen($this->get_xcloner_path() . $dest, 'w');
             }
-        }else{
+        } else{
             if($this->verification){
                 $fpOut = fopen("php://stdout", 'a');
-            }else {
+            } else {
                 $fpOut = fopen($this->get_xcloner_path() . $dest, 'a');
             }
         }
@@ -307,7 +307,7 @@ 
                             $ciphertext = "";
                             $plaintext = "";
                             $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        }else {
+                        } else {
                             if(($iv) != base64_decode(base64_encode($iv)))
                             {
                                 throw new \Exception('Could not encode IV for transport');
@@ -374,6 +374,6 @@ 
             $xcloner_encryption->decrypt_file($argv[2], $argv[2] . ".dec", $argv[4], '', '', true);
         }
     }
-}catch(\Exception $e) {
+} catch(\Exception $e) {
     echo "CAUGHT: " . $e->getMessage();
 }

includes/class-xcloner-file-system.php

Doc Comments +9 added lines

@@ -207,6 +207,9 @@ 
         return $this->start_filesystem->normalizeFileInfo($info);
     }
 
+    /**
+     * @param string $file
+     */
     public function get_storage_path_file_info($file)
     {
         return $this->getMetadataFull('storage_adapter', $file);
@@ -741,6 +744,9 @@ 
 
     }
 
+    /**
+     * @param string $tmp_file
+     */
     public function estimate_reading_time($tmp_file)
     {
         $this->logger->debug(sprintf(("Estimating file system reading time")));
@@ -781,6 +787,9 @@ 
         return $name;
     }
 
+    /**
+     * @param string $field
+     */
     public function sort_by(&$array, $field, $direction = 'asc')
     {
         if (strtolower($direction) == "desc" || $direction == SORT_DESC) {

Indentation +957 added lines, -957 removed lines

@@ -37,848 +37,848 @@ 
 class Xcloner_File_System
 {
 
-    private $excluded_files = "";
-    private $additional_regex_patterns = array();
-    private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
-    private $included_files_handler = "backup_files.csv";
-    private $temp_dir_handler = ".dir";
-    public $filesystem;
-    public $tmp_filesystem;
-    public $storage_filesystem;
-    private $xcloner_container;
-    private $diff_timestamp_start = "";
-
-    private $logger;
-    private $start_adapter;
-    private $tmp_adapter;
-    private $storage_adapter;
-    private $xcloner_settings;
-    private $start_filesystem;
-    private $tmp_filesystem_append;
-    private $storage_filesystem_append;
-
-    private $files_counter;
-    private $files_size;
-    private $last_logged_file;
-    private $folders_to_process_per_session = 25;
-    private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv", "encrypted", "decrypted");
-    private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
-
-    /**
-     * Xcloner_File_System constructor.
-     * @param Xcloner $xcloner_container
-     * @param string $hash
-     */
-    public function __construct(Xcloner $xcloner_container, $hash = "")
-    {
-        $this->xcloner_container = $xcloner_container;
-
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
-        $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-
-        try {
-
-            $this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->start_filesystem = new Filesystem($this->start_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-            $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-            $this->tmp_filesystem_append = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
-            $this->storage_filesystem = new Filesystem($adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-
-            $this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
-                'SKIP_LINKS');
-            $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
-                'disable_asserts' => true,
-            ]));
-        } catch (Exception $e) {
-            $this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
-        }
-
-
-        if ($value = get_option('xcloner_directories_to_scan_per_request')) {
-            $this->folders_to_process_per_session = $value;
-        }
-
-    }
-
-    /**
-     * Set differential timestamp date
-     * @param string $timestamp
-     */
-    public function set_diff_timestamp_start($timestamp = "")
-    {
-        if ($timestamp) {
-            $this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
-                "FILESYSTEM",
-                "DIFF"
-            ));
-            $this->diff_timestamp_start = $timestamp;
-        }
-    }
-
-    /**
-     * Gets the differential timestamp date
-     * @return string
-     */
-    public function get_diff_timestamp_start()
-    {
-        return $this->diff_timestamp_start;
-    }
-
-    private function get_xcloner_container()
-    {
-        return $this->xcloner_container;
-    }
-
-    public function set_hash($hash)
-    {
-        $this->xcloner_settings->set_hash($hash);
-    }
-
-    public function get_hash($hash)
-    {
-        $this->xcloner_settings->get_hash();
-    }
-
-    public function get_tmp_filesystem()
-    {
-        return $this->tmp_filesystem;
-    }
-
-    public function get_storage_filesystem($remote_storage_selection = "")
-    {
-        if ($remote_storage_selection != "") {
-            $remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
-            $method = "get_" . $remote_storage_selection . "_filesystem";
-
-            if (!method_exists($remote_storage, $method)) {
-                return false;
-            }
-
-            list($adapter, $filesystem) = $remote_storage->$method();
-
-            return $filesystem;
-        }
-
-        return $this->storage_filesystem;
-    }
-
-    public function get_tmp_filesystem_adapter()
-    {
-        return $this->tmp_adapter;
-    }
-
-    public function get_tmp_filesystem_append()
-    {
-        return $this->tmp_filesystem_append;
-    }
-
-    public function get_start_adapter()
-    {
-        return $this->start_adapter;
-    }
-
-    public function get_start_filesystem()
-    {
-        return $this->start_filesystem;
-    }
-
-    public function get_logger()
-    {
-        return $this->logger;
-    }
-
-    public function get_start_path_file_info($file)
-    {
-        $info = $this->getMetadataFull('start_adapter', $file);
-
-        return $this->start_filesystem->normalizeFileInfo($info);
-    }
-
-    public function get_storage_path_file_info($file)
-    {
-        return $this->getMetadataFull('storage_adapter', $file);
-    }
-
-    public function get_included_files_handler($metadata = 0)
-    {
-        $path = $this->included_files_handler;
-        if (!$metadata) {
-            return $path;
-        }
-
-        $spl_info = $this->getMetadataFull('tmp_adapter', $path);
-
-        return $spl_info;
-
-    }
-
-    public function get_temp_dir_handler()
-    {
-        return $this->temp_dir_handler;
-    }
-
-    public function get_latest_backup()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        if (isset($new_list[0])) {
-            return $new_list[0];
-        }
-    }
-
-    public function get_latest_backups()
-    {
-        $files = $this->get_backup_archives_list();
-
-        if (is_array($files)) {
-            $this->sort_by($files, "timestamp", "desc");
-        }
-
-        $new_list = array();
-
-        foreach ($files as $key => $file) {
-            if (!isset($file['parent'])) {
-                $new_list[] = ($files[$key]);
-            }
-        }
-
-        return $new_list;
-    }
-
-    public function get_storage_usage()
-    {
-        $files = $this->get_backup_archives_list();
-        $total = 0;
-
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                $total += $file['size'];
-            }
-        }
-
-        return $total;
-    }
-
-    public function is_part($backup_name)
-    {
-        if (stristr($backup_name, "-part")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function is_multipart($backup_name)
-    {
-        if (stristr($backup_name, "-multipart")) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function get_backup_size($backup_name)
-    {
-        $backup_size = $this->get_storage_filesystem()->getSize($backup_name);
-        if ($this->is_multipart($backup_name)) {
-            $backup_parts = $this->get_multipart_files($backup_name);
-            foreach ($backup_parts as $part_file) {
-                $backup_size += $this->get_storage_filesystem()->getSize($part_file);
-            }
-        }
-
-        return $backup_size;
-    }
-
-    public function get_multipart_files($backup_name, $storage_selection = "")
-    {
-        $files = array();
-
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $files[] = $data[0];
-                }
-            }
-        }
-
-        return $files;
-    }
-
-    public function delete_backup_by_name($backup_name, $storage_selection = "")
-    {
-        if ($this->is_multipart($backup_name)) {
-            $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
-            foreach ($lines as $line) {
-                if ($line) {
-                    $data = str_getcsv($line);
-                    $this->get_storage_filesystem($storage_selection)->delete($data[0]);
-                }
-            }
-        }
-
-        if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
-            $return = true;
-        } else {
-            $return = false;
-        }
-
-        return $return;
-    }
-
-    public function getMetadataFull($adapter = "storage_adapter", $path)
-    {
-        $location = $this->$adapter->applyPathPrefix($path);
-        $spl_info = new SplFileInfo($location);
-
-        return ($spl_info);
-    }
-
-
-    public function get_backup_archives_list($storage_selection = "")
-    {
-        $list = array();
-
-
-        if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
-            $list = $this->get_storage_filesystem($storage_selection)->listContents();
-        }
-
-        $backup_files = array();
-        $parents = array();
-
-        foreach ($list as $file_info) {
-            if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
-                $data = array();
-
-                $lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
-                foreach ($lines as $line) {
-                    if ($line) {
-                        $data = str_getcsv($line);
-                        if (is_array($data)) {
-                            $parents[$data[0]] = $file_info['basename'];
-                            $file_info['childs'][] = $data;
-                            $file_info['size'] += $data[2];
-                        }
-                    }
-                }
-
-            }
-
-            if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'],
-                    $this->backup_archive_extensions)) {
-                $backup_files[$file_info['path']] = $file_info;
-            }
-        }
-
-        foreach ($backup_files as $key => $file_info) {
-            if (!isset($backup_files[$key]['timestamp'])) {
-                //$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
-            }
-
-            if (isset($parents[$file_info['basename']])) {
-                $backup_files[$key]['parent'] = $parents[$file_info['basename']];
-            }
-        }
-
-        return $backup_files;
-    }
-
-    public function start_file_recursion($init = 0)
-    {
-        if ($init) {
-            $this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
-                $this->xcloner_settings->get_xcloner_start_path()));
-            $this->do_system_init();
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            //.dir exists, we presume we have files to iterate
-            $content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
-            $files = array_filter(explode("\n", $content));
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-
-            $counter = 0;
-            foreach ($files as $file) {
-                if ($counter < $this->folders_to_process_per_session) {
-                    $this->build_files_list($file);
-                    $counter++;
-                } else {
-                    $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
-                }
-            }
-        } else {
-            $this->build_files_list();
-        }
-
-        if ($this->scan_finished()) {
-            $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
-            $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-            $this->files_counter++;
-
-            //adding included dump file to the included files list
-            if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            //adding a default index.html to the temp xcloner folder
-            if (!$this->get_tmp_filesystem()->has("index.html")) {
-                $this->get_tmp_filesystem()->write("index.html", "");
-            }
-
-            //adding the default log file
-            if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
-                $metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
-                $this->store_file($metadata_dumpfile, 'tmp_filesystem');
-                $this->files_counter++;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    public function get_backup_attachments()
-    {
-        $return = array();
-
-        $files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
-        if (file_exists($files_list_file)) {
-            $return[] = $files_list_file;
-        }
-
-        if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
-            $log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
-            if (!file_exists($log_file)) {
-                $log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
-            }
-
-            if (file_exists($log_file)) {
-                $return[] = $log_file;
-            }
-        }
-
-        return $return;
-    }
-
-    public function remove_tmp_filesystem()
-    {
-        //delete the temporary folder
-        $this->logger->debug(sprintf("Deleting the temporary storage folder %s",
-            $this->xcloner_settings->get_xcloner_tmp_path()));
-
-        $contents = $this->get_tmp_filesystem()->listContents();
-
-        if (is_array($contents)) {
-            foreach ($contents as $file_info) {
-                $this->get_tmp_filesystem()->delete($file_info['path']);
-            }
-        }
-
-        @rmdir($this->xcloner_settings->get_xcloner_tmp_path());
-
-        return;
-    }
-
-    public function cleanup_tmp_directories()
-    {
-        $adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
-        $tmp_filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
-
-        $contents = $tmp_filesystem->listContents();
-
-        foreach ($contents as $file) {
-
-            if (preg_match("/.xcloner-(.*)/", $file['path'])) {
-                if ($file['timestamp'] < strtotime("-1days")) {
-                    $tmp_filesystem->deleteDir($file['path']);
-                    $this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
-                }
-            }
-        }
-
-        return true;
-    }
-
-    private function do_system_init()
-    {
-        $this->files_counter = 0;
-
-        if (!$this->storage_filesystem->has("index.html")) {
-            $this->storage_filesystem->write("index.html", "");
-        }
-
-        if (!$this->tmp_filesystem->has("index.html")) {
-            $this->tmp_filesystem->write("index.html", "");
-        }
-
-        if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
-            $this->tmp_filesystem->delete($this->get_included_files_handler());
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-    }
-
-    public function get_scanned_files_num()
-    {
-        return $this->files_counter;
-    }
-
-    public function get_scanned_files_total_size()
-    {
-        return $this->files_size;
-    }
-
-    public function last_logged_file()
-    {
-        return $this->last_logged_file;
-    }
-
-    public static function is_regex($regex)
-    {
-        return preg_match("/^\^(.*)\$$/i", $regex);
-    }
+	private $excluded_files = "";
+	private $additional_regex_patterns = array();
+	private $excluded_files_by_default = array("administrator/backups", "wp-content/backups");
+	private $included_files_handler = "backup_files.csv";
+	private $temp_dir_handler = ".dir";
+	public $filesystem;
+	public $tmp_filesystem;
+	public $storage_filesystem;
+	private $xcloner_container;
+	private $diff_timestamp_start = "";
+
+	private $logger;
+	private $start_adapter;
+	private $tmp_adapter;
+	private $storage_adapter;
+	private $xcloner_settings;
+	private $start_filesystem;
+	private $tmp_filesystem_append;
+	private $storage_filesystem_append;
+
+	private $files_counter;
+	private $files_size;
+	private $last_logged_file;
+	private $folders_to_process_per_session = 25;
+	private $backup_archive_extensions = array("tar", "tgz", "tar.gz", "gz", "csv", "encrypted", "decrypted");
+	private $backup_name_tags = array('[time]', '[hostname]', '[domain]');
+
+	/**
+	 * Xcloner_File_System constructor.
+	 * @param Xcloner $xcloner_container
+	 * @param string $hash
+	 */
+	public function __construct(Xcloner $xcloner_container, $hash = "")
+	{
+		$this->xcloner_container = $xcloner_container;
+
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_file_system");
+		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+
+		try {
+
+			$this->start_adapter = new Local($this->xcloner_settings->get_xcloner_start_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->start_filesystem = new Filesystem($this->start_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->tmp_adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->tmp_filesystem = new Filesystem($this->tmp_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+			$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+			$this->tmp_filesystem_append = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), LOCK_EX, 'SKIP_LINKS');
+			$this->storage_filesystem = new Filesystem($adapter, new Config([
+				'disable_asserts' => true,
+			]));
+
+			$this->storage_adapter = new Local($this->xcloner_settings->get_xcloner_store_path(), FILE_APPEND,
+				'SKIP_LINKS');
+			$this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
+				'disable_asserts' => true,
+			]));
+		} catch (Exception $e) {
+			$this->logger->error("Filesystem Initialization Error: " . $e->getMessage());
+		}
+
+
+		if ($value = get_option('xcloner_directories_to_scan_per_request')) {
+			$this->folders_to_process_per_session = $value;
+		}
+
+	}
+
+	/**
+	 * Set differential timestamp date
+	 * @param string $timestamp
+	 */
+	public function set_diff_timestamp_start($timestamp = "")
+	{
+		if ($timestamp) {
+			$this->logger->info(sprintf("Setting Differential Timestamp To %s", date("Y-m-d", $timestamp)), array(
+				"FILESYSTEM",
+				"DIFF"
+			));
+			$this->diff_timestamp_start = $timestamp;
+		}
+	}
+
+	/**
+	 * Gets the differential timestamp date
+	 * @return string
+	 */
+	public function get_diff_timestamp_start()
+	{
+		return $this->diff_timestamp_start;
+	}
+
+	private function get_xcloner_container()
+	{
+		return $this->xcloner_container;
+	}
+
+	public function set_hash($hash)
+	{
+		$this->xcloner_settings->set_hash($hash);
+	}
+
+	public function get_hash($hash)
+	{
+		$this->xcloner_settings->get_hash();
+	}
+
+	public function get_tmp_filesystem()
+	{
+		return $this->tmp_filesystem;
+	}
+
+	public function get_storage_filesystem($remote_storage_selection = "")
+	{
+		if ($remote_storage_selection != "") {
+			$remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+			$method = "get_" . $remote_storage_selection . "_filesystem";
+
+			if (!method_exists($remote_storage, $method)) {
+				return false;
+			}
+
+			list($adapter, $filesystem) = $remote_storage->$method();
+
+			return $filesystem;
+		}
+
+		return $this->storage_filesystem;
+	}
+
+	public function get_tmp_filesystem_adapter()
+	{
+		return $this->tmp_adapter;
+	}
+
+	public function get_tmp_filesystem_append()
+	{
+		return $this->tmp_filesystem_append;
+	}
+
+	public function get_start_adapter()
+	{
+		return $this->start_adapter;
+	}
+
+	public function get_start_filesystem()
+	{
+		return $this->start_filesystem;
+	}
+
+	public function get_logger()
+	{
+		return $this->logger;
+	}
+
+	public function get_start_path_file_info($file)
+	{
+		$info = $this->getMetadataFull('start_adapter', $file);
+
+		return $this->start_filesystem->normalizeFileInfo($info);
+	}
+
+	public function get_storage_path_file_info($file)
+	{
+		return $this->getMetadataFull('storage_adapter', $file);
+	}
+
+	public function get_included_files_handler($metadata = 0)
+	{
+		$path = $this->included_files_handler;
+		if (!$metadata) {
+			return $path;
+		}
+
+		$spl_info = $this->getMetadataFull('tmp_adapter', $path);
+
+		return $spl_info;
+
+	}
+
+	public function get_temp_dir_handler()
+	{
+		return $this->temp_dir_handler;
+	}
+
+	public function get_latest_backup()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		if (isset($new_list[0])) {
+			return $new_list[0];
+		}
+	}
+
+	public function get_latest_backups()
+	{
+		$files = $this->get_backup_archives_list();
+
+		if (is_array($files)) {
+			$this->sort_by($files, "timestamp", "desc");
+		}
+
+		$new_list = array();
+
+		foreach ($files as $key => $file) {
+			if (!isset($file['parent'])) {
+				$new_list[] = ($files[$key]);
+			}
+		}
+
+		return $new_list;
+	}
+
+	public function get_storage_usage()
+	{
+		$files = $this->get_backup_archives_list();
+		$total = 0;
+
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				$total += $file['size'];
+			}
+		}
+
+		return $total;
+	}
+
+	public function is_part($backup_name)
+	{
+		if (stristr($backup_name, "-part")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function is_multipart($backup_name)
+	{
+		if (stristr($backup_name, "-multipart")) {
+			return true;
+		}
+
+		return false;
+	}
+
+	public function get_backup_size($backup_name)
+	{
+		$backup_size = $this->get_storage_filesystem()->getSize($backup_name);
+		if ($this->is_multipart($backup_name)) {
+			$backup_parts = $this->get_multipart_files($backup_name);
+			foreach ($backup_parts as $part_file) {
+				$backup_size += $this->get_storage_filesystem()->getSize($part_file);
+			}
+		}
+
+		return $backup_size;
+	}
+
+	public function get_multipart_files($backup_name, $storage_selection = "")
+	{
+		$files = array();
+
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$files[] = $data[0];
+				}
+			}
+		}
+
+		return $files;
+	}
+
+	public function delete_backup_by_name($backup_name, $storage_selection = "")
+	{
+		if ($this->is_multipart($backup_name)) {
+			$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($backup_name));
+			foreach ($lines as $line) {
+				if ($line) {
+					$data = str_getcsv($line);
+					$this->get_storage_filesystem($storage_selection)->delete($data[0]);
+				}
+			}
+		}
+
+		if ($this->get_storage_filesystem($storage_selection)->delete($backup_name)) {
+			$return = true;
+		} else {
+			$return = false;
+		}
+
+		return $return;
+	}
+
+	public function getMetadataFull($adapter = "storage_adapter", $path)
+	{
+		$location = $this->$adapter->applyPathPrefix($path);
+		$spl_info = new SplFileInfo($location);
+
+		return ($spl_info);
+	}
+
+
+	public function get_backup_archives_list($storage_selection = "")
+	{
+		$list = array();
+
+
+		if (method_exists($this->get_storage_filesystem($storage_selection), "listContents")) {
+			$list = $this->get_storage_filesystem($storage_selection)->listContents();
+		}
+
+		$backup_files = array();
+		$parents = array();
+
+		foreach ($list as $file_info) {
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv") {
+				$data = array();
+
+				$lines = explode(PHP_EOL, $this->get_storage_filesystem($storage_selection)->read($file_info['path']));
+				foreach ($lines as $line) {
+					if ($line) {
+						$data = str_getcsv($line);
+						if (is_array($data)) {
+							$parents[$data[0]] = $file_info['basename'];
+							$file_info['childs'][] = $data;
+							$file_info['size'] += $data[2];
+						}
+					}
+				}
+
+			}
+
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'],
+					$this->backup_archive_extensions)) {
+				$backup_files[$file_info['path']] = $file_info;
+			}
+		}
+
+		foreach ($backup_files as $key => $file_info) {
+			if (!isset($backup_files[$key]['timestamp'])) {
+				//$backup_files[$key]['timestamp'] = $this->get_storage_filesystem($storage_selection)->getTimestamp($file_info['path']);
+			}
+
+			if (isset($parents[$file_info['basename']])) {
+				$backup_files[$key]['parent'] = $parents[$file_info['basename']];
+			}
+		}
+
+		return $backup_files;
+	}
+
+	public function start_file_recursion($init = 0)
+	{
+		if ($init) {
+			$this->logger->info(sprintf(__("Starting the filesystem scanner on root folder %s"),
+				$this->xcloner_settings->get_xcloner_start_path()));
+			$this->do_system_init();
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			//.dir exists, we presume we have files to iterate
+			$content = $this->tmp_filesystem->read($this->get_temp_dir_handler());
+			$files = array_filter(explode("\n", $content));
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+
+			$counter = 0;
+			foreach ($files as $file) {
+				if ($counter < $this->folders_to_process_per_session) {
+					$this->build_files_list($file);
+					$counter++;
+				} else {
+					$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file . "\n");
+				}
+			}
+		} else {
+			$this->build_files_list();
+		}
+
+		if ($this->scan_finished()) {
+			$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata("index.html");
+			$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+			$this->files_counter++;
+
+			//adding included dump file to the included files list
+			if ($this->get_tmp_filesystem()->has($this->get_included_files_handler())) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->get_included_files_handler());
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			//adding a default index.html to the temp xcloner folder
+			if (!$this->get_tmp_filesystem()->has("index.html")) {
+				$this->get_tmp_filesystem()->write("index.html", "");
+			}
+
+			//adding the default log file
+			if ($this->get_tmp_filesystem()->has($this->xcloner_settings->get_logger_filename(1))) {
+				$metadata_dumpfile = $this->get_tmp_filesystem()->getMetadata($this->xcloner_settings->get_logger_filename(1));
+				$this->store_file($metadata_dumpfile, 'tmp_filesystem');
+				$this->files_counter++;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+
+	public function get_backup_attachments()
+	{
+		$return = array();
+
+		$files_list_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->get_included_files_handler();
+		if (file_exists($files_list_file)) {
+			$return[] = $files_list_file;
+		}
+
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+			$log_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . $this->xcloner_settings->get_logger_filename(1);
+			if (!file_exists($log_file)) {
+				$log_file = $this->xcloner_settings->get_xcloner_store_path() . DS . $this->xcloner_settings->get_logger_filename();
+			}
+
+			if (file_exists($log_file)) {
+				$return[] = $log_file;
+			}
+		}
+
+		return $return;
+	}
+
+	public function remove_tmp_filesystem()
+	{
+		//delete the temporary folder
+		$this->logger->debug(sprintf("Deleting the temporary storage folder %s",
+			$this->xcloner_settings->get_xcloner_tmp_path()));
+
+		$contents = $this->get_tmp_filesystem()->listContents();
+
+		if (is_array($contents)) {
+			foreach ($contents as $file_info) {
+				$this->get_tmp_filesystem()->delete($file_info['path']);
+			}
+		}
+
+		@rmdir($this->xcloner_settings->get_xcloner_tmp_path());
+
+		return;
+	}
+
+	public function cleanup_tmp_directories()
+	{
+		$adapter = new Local($this->xcloner_settings->get_xcloner_tmp_path(false), LOCK_EX | FILE_APPEND, 'SKIP_LINKS');
+		$tmp_filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
+
+		$contents = $tmp_filesystem->listContents();
+
+		foreach ($contents as $file) {
+
+			if (preg_match("/.xcloner-(.*)/", $file['path'])) {
+				if ($file['timestamp'] < strtotime("-1days")) {
+					$tmp_filesystem->deleteDir($file['path']);
+					$this->logger->debug(sprintf("Delete temporary directory %s", $file['path']));
+				}
+			}
+		}
+
+		return true;
+	}
+
+	private function do_system_init()
+	{
+		$this->files_counter = 0;
+
+		if (!$this->storage_filesystem->has("index.html")) {
+			$this->storage_filesystem->write("index.html", "");
+		}
+
+		if (!$this->tmp_filesystem->has("index.html")) {
+			$this->tmp_filesystem->write("index.html", "");
+		}
+
+		if ($this->tmp_filesystem->has($this->get_included_files_handler())) {
+			$this->tmp_filesystem->delete($this->get_included_files_handler());
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+	}
+
+	public function get_scanned_files_num()
+	{
+		return $this->files_counter;
+	}
+
+	public function get_scanned_files_total_size()
+	{
+		return $this->files_size;
+	}
+
+	public function last_logged_file()
+	{
+		return $this->last_logged_file;
+	}
+
+	public static function is_regex($regex)
+	{
+		return preg_match("/^\^(.*)\$$/i", $regex);
+	}
 
-    public function set_excluded_files($excluded_files = array())
-    {
-        if (!is_array($excluded_files)) {
-            $excluded_files = array();
-        }
+	public function set_excluded_files($excluded_files = array())
+	{
+		if (!is_array($excluded_files)) {
+			$excluded_files = array();
+		}
 
-        foreach ($excluded_files as $excl) {
+		foreach ($excluded_files as $excl) {
 
-            if ($this->is_regex($excl)) {
-                $this->additional_regex_patterns[] = $excl;
-            }
-        }
+			if ($this->is_regex($excl)) {
+				$this->additional_regex_patterns[] = $excl;
+			}
+		}
 
-        $this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
+		$this->excluded_files = array_merge($excluded_files, $this->excluded_files_by_default);
 
-        return $this->excluded_files;
-    }
+		return $this->excluded_files;
+	}
 
-    public function get_excluded_files()
-    {
-        return $this->excluded_files_by_default;
-    }
+	public function get_excluded_files()
+	{
+		return $this->excluded_files_by_default;
+	}
 
-    public function list_directory($path)
-    {
-        return $this->start_filesystem->listContents($path);
-    }
+	public function list_directory($path)
+	{
+		return $this->start_filesystem->listContents($path);
+	}
 
-    public function build_files_list($folder = "")
-    {
-        $this->logger->debug(sprintf(("Building the files system list")));
+	public function build_files_list($folder = "")
+	{
+		$this->logger->debug(sprintf(("Building the files system list")));
 
-        //if we start with the root folder(empty value), we initializa the file system
-        if (!$folder) {
+		//if we start with the root folder(empty value), we initializa the file system
+		if (!$folder) {
 
-        }
+		}
 
-        try {
+		try {
 
-            $files = $this->start_filesystem->listContents($folder);
-            foreach ($files as $file) {
-                if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
-                        $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "NOT READABLE"
-                    ));
-                } elseif (!$matching_pattern = $this->is_excluded($file)) {
-                    $this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
-                        "FILESYSTEM SCAN",
-                        "INCLUDE"
-                    ));
-                    $file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
-                    if ($this->store_file($file)) {
-                        $this->files_counter++;
-                    }
-                    if (isset($file['size'])) {
-                        $this->files_size += $file['size'];
-                    }
-
-                } else {
-                    $this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
-                        $file['path'], $matching_pattern), array(
-                        "FILESYSTEM SCAN",
-                        "EXCLUDE"
-                    ));
-                }
-            }
+			$files = $this->start_filesystem->listContents($folder);
+			foreach ($files as $file) {
+				if (!is_readable($this->xcloner_settings->get_xcloner_start_path() . DS . $file['path'])) {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, file not readable"),
+						$file['path']), array(
+						"FILESYSTEM SCAN",
+						"NOT READABLE"
+					));
+				} elseif (!$matching_pattern = $this->is_excluded($file)) {
+					$this->logger->info(sprintf(__("Adding %s to the filesystem list"), $file['path']), array(
+						"FILESYSTEM SCAN",
+						"INCLUDE"
+					));
+					$file['visibility'] = $this->start_filesystem->getVisibility($file['path']);
+					if ($this->store_file($file)) {
+						$this->files_counter++;
+					}
+					if (isset($file['size'])) {
+						$this->files_size += $file['size'];
+					}
+
+				} else {
+					$this->logger->info(sprintf(__("Excluding %s from the filesystem list, matching pattern %s"),
+						$file['path'], $matching_pattern), array(
+						"FILESYSTEM SCAN",
+						"EXCLUDE"
+					));
+				}
+			}
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_read_write_time()
-    {
-        $tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
+	public function estimate_read_write_time()
+	{
+		$tmp_file = ".xcloner" . substr(md5(time()), 0, 5);
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        $data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
+		$data = str_repeat(rand(0, 9), 1024 * 1024); //write 1MB data
 
-        try {
-            $this->tmp_filesystem->write($tmp_file, $data);
+		try {
+			$this->tmp_filesystem->write($tmp_file, $data);
 
-            $end_time = microtime(true) - $start_time;
+			$end_time = microtime(true) - $start_time;
 
-            $return['writing_time'] = $end_time;
+			$return['writing_time'] = $end_time;
 
-            $return['reading_time'] = $this->estimate_reading_time($tmp_file);
+			$return['reading_time'] = $this->estimate_reading_time($tmp_file);
 
-            $this->tmp_filesystem->delete($tmp_file);
+			$this->tmp_filesystem->delete($tmp_file);
 
-        } catch (Exception $e) {
+		} catch (Exception $e) {
 
-            $this->logger->error($e->getMessage());
+			$this->logger->error($e->getMessage());
 
-        }
+		}
 
-        return $return;
-    }
+		return $return;
+	}
 
-    public function backup_storage_cleanup()
-    {
-        $this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
+	public function backup_storage_cleanup()
+	{
+		$this->logger->info(sprintf(("Cleaning the backup storage on matching rules")));
 
-        $_storage_size = 0;
-        $_backup_files_list = array();
+		$_storage_size = 0;
+		$_backup_files_list = array();
 
-        //rule date limit
-        $current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
+		//rule date limit
+		$current_timestamp = strtotime("-" . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') . " days");
 
-        $files = $this->storage_filesystem->listContents();
+		$files = $this->storage_filesystem->listContents();
 
-        if (is_array($files)) {
-            foreach ($files as $file) {
-                if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
-                    $_storage_size += $file['size']; //bytes
-                    $_backup_files_list[] = $file;
-                }
-            }
-        }
+		if (is_array($files)) {
+			foreach ($files as $file) {
+				if (isset($file['extension']) and in_array($file['extension'], $this->backup_archive_extensions)) {
+					$_storage_size += $file['size']; //bytes
+					$_backup_files_list[] = $file;
+				}
+			}
+		}
 
 
-        $this->sort_by($_backup_files_list, "timestamp", "asc");
+		$this->sort_by($_backup_files_list, "timestamp", "asc");
 
-        $_backups_counter = sizeof($_backup_files_list);
+		$_backups_counter = sizeof($_backup_files_list);
 
-        foreach ($_backup_files_list as $file) {
-            //processing rule folder capacity
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
-            {
-                $this->storage_filesystem->delete($file['path']);
-                $_storage_size -= $file['size'];
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "STORAGE SIZE LIMIT",
-                    $_storage_size . " >= " . $set_storage_limit
-                ));
-            }
-
-            //processing rule days limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
-                $this->storage_filesystem->delete($file['path']);
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "RETENTION LIMIT TIMESTAMP",
-                    $file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
-                ));
-            }
-
-            //processing backup countert limit
-            if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
-                $this->storage_filesystem->delete($file['path']);
-                $_backups_counter--;
-                $this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
-                    "BACKUP QUANTITY LIMIT",
-                    $_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
-                ));
-            }
+		foreach ($_backup_files_list as $file) {
+			//processing rule folder capacity
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
+				$_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+			{
+				$this->storage_filesystem->delete($file['path']);
+				$_storage_size -= $file['size'];
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"STORAGE SIZE LIMIT",
+					$_storage_size . " >= " . $set_storage_limit
+				));
+			}
+
+			//processing rule days limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days') && $current_timestamp >= $file['timestamp']) {
+				$this->storage_filesystem->delete($file['path']);
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"RETENTION LIMIT TIMESTAMP",
+					$file['timestamp'] . " =< " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_days')
+				));
+			}
+
+			//processing backup countert limit
+			if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives') && $_backups_counter >= $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')) {
+				$this->storage_filesystem->delete($file['path']);
+				$_backups_counter--;
+				$this->logger->info("Deleting backup " . $file['path'] . " matching rule", array(
+					"BACKUP QUANTITY LIMIT",
+					$_backups_counter . " >= " . $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_retention_limit_archives')
+				));
+			}
 
 
-        }
+		}
 
-    }
+	}
 
-    public function estimate_reading_time($tmp_file)
-    {
-        $this->logger->debug(sprintf(("Estimating file system reading time")));
+	public function estimate_reading_time($tmp_file)
+	{
+		$this->logger->debug(sprintf(("Estimating file system reading time")));
 
-        $start_time = microtime(true);
+		$start_time = microtime(true);
 
-        if ($this->tmp_filesystem->has($tmp_file)) {
-            $this->tmp_filesystem->read($tmp_file);
-        }
-
-        $end_time = microtime(true) - $start_time;
-
-        return $end_time;
-
-    }
-
-    public function process_backup_name($name = "", $max_length = 100)
-    {
-        if (!$name) {
-            $name = $this->xcloner_settings->get_default_backup_name();
-        }
-
-        foreach ($this->backup_name_tags as $tag) {
-            if ($tag == '[time]') {
-                $name = str_replace($tag, date("Y-m-d_H-i"), $name);
-            } elseif ($tag == '[hostname]') {
-                $name = str_replace($tag, gethostname(), $name);
-            } elseif ($tag == '[domain]') {
-                $domain = parse_url(admin_url(), PHP_URL_HOST);
-                $name = str_replace($tag, $domain, $name);
-            }
-        }
-
-        if ($max_length) {
-            $name = substr($name, 0, $max_length);
-        }
-
-        return $name;
-    }
-
-    public function sort_by(&$array, $field, $direction = 'asc')
-    {
-        if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
-            $direction = SORT_DESC;
-        } else {
-            $direction = SORT_ASC;
-        }
-
-        $array = $this->array_orderby($array, $field, $direction);
-
-        return true;
-    }
-
-    private function array_orderby()
-    {
-        $args = func_get_args();
-        $data = array_shift($args);
-
-        foreach ($args as $n => $field) {
-            if (is_string($field)) {
-                $tmp = array();
-                foreach ($data as $key => $row) {
-                    if (is_array($row)) {
-                        $tmp[$key] = $row[$field];
-                    } else {
-                        $tmp[$key] = $row->$field;
-                    }
-                }
-                $args[$n] = $tmp;
-            }
-        }
-        $args[] = &$data;
-
-        call_user_func_array('array_multisort', $args);
-
-        return array_pop($args);
-    }
-
-    private function check_file_diff_time($file)
-    {
-        if ($this->get_diff_timestamp_start() != "") {
-            $fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
-            $timestamp = $fileMeta->getMTime();
-            if ($timestamp < $fileMeta->getCTime()) {
-                $timestamp = $fileMeta->getCTime();
-            }
-
-            if ($timestamp <= $this->get_diff_timestamp_start()) {
-                return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
-            }
-        }
-
-        return false;
-    }
-
-    public function is_excluded($file)
-    {
-        $this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
-            if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
-                return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
-            }
-        }
-
-        if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
-            $this->set_excluded_files();
-        }
-
-        if (is_array($this->excluded_files)) {
-            foreach ($this->excluded_files as $excluded_file_pattern) {
-                if ($excluded_file_pattern == "/") {
-                    $needle = "$";
-                } else {
-                    $needle = "$" . $excluded_file_pattern;
-                }
-
-                if (strstr("$" . $file['path'], $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        if ($regex = $this->is_excluded_regex($file)) {
-            return $regex;
-        }
-
-        if ($file['type'] == "file") {
-            $check_file_diff_timestamp = $this->check_file_diff_time($file);
-            if ($check_file_diff_timestamp) {
-                return $check_file_diff_timestamp;
-            }
-        }
-
-        return false;
-    }
-
-    /*REGEX examples
+		if ($this->tmp_filesystem->has($tmp_file)) {
+			$this->tmp_filesystem->read($tmp_file);
+		}
+
+		$end_time = microtime(true) - $start_time;
+
+		return $end_time;
+
+	}
+
+	public function process_backup_name($name = "", $max_length = 100)
+	{
+		if (!$name) {
+			$name = $this->xcloner_settings->get_default_backup_name();
+		}
+
+		foreach ($this->backup_name_tags as $tag) {
+			if ($tag == '[time]') {
+				$name = str_replace($tag, date("Y-m-d_H-i"), $name);
+			} elseif ($tag == '[hostname]') {
+				$name = str_replace($tag, gethostname(), $name);
+			} elseif ($tag == '[domain]') {
+				$domain = parse_url(admin_url(), PHP_URL_HOST);
+				$name = str_replace($tag, $domain, $name);
+			}
+		}
+
+		if ($max_length) {
+			$name = substr($name, 0, $max_length);
+		}
+
+		return $name;
+	}
+
+	public function sort_by(&$array, $field, $direction = 'asc')
+	{
+		if (strtolower($direction) == "desc" || $direction == SORT_DESC) {
+			$direction = SORT_DESC;
+		} else {
+			$direction = SORT_ASC;
+		}
+
+		$array = $this->array_orderby($array, $field, $direction);
+
+		return true;
+	}
+
+	private function array_orderby()
+	{
+		$args = func_get_args();
+		$data = array_shift($args);
+
+		foreach ($args as $n => $field) {
+			if (is_string($field)) {
+				$tmp = array();
+				foreach ($data as $key => $row) {
+					if (is_array($row)) {
+						$tmp[$key] = $row[$field];
+					} else {
+						$tmp[$key] = $row->$field;
+					}
+				}
+				$args[$n] = $tmp;
+			}
+		}
+		$args[] = &$data;
+
+		call_user_func_array('array_multisort', $args);
+
+		return array_pop($args);
+	}
+
+	private function check_file_diff_time($file)
+	{
+		if ($this->get_diff_timestamp_start() != "") {
+			$fileMeta = $this->getMetadataFull("start_adapter", $file['path']);
+			$timestamp = $fileMeta->getMTime();
+			if ($timestamp < $fileMeta->getCTime()) {
+				$timestamp = $fileMeta->getCTime();
+			}
+
+			if ($timestamp <= $this->get_diff_timestamp_start()) {
+				return " file DIFF timestamp " . $timestamp . " < " . $this->diff_timestamp_start;
+			}
+		}
+
+		return false;
+	}
+
+	public function is_excluded($file)
+	{
+		$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		if ($xcloner_exclude_files_larger_than_mb = $this->xcloner_settings->get_xcloner_option('xcloner_exclude_files_larger_than_mb')) {
+			if (isset($file['size']) && $file['size'] > $this->calc_to_bytes($xcloner_exclude_files_larger_than_mb)) {
+				return "> " . $xcloner_exclude_files_larger_than_mb . "MB";
+			}
+		}
+
+		if (!is_array($this->excluded_files) || !sizeof($this->excluded_files)) {
+			$this->set_excluded_files();
+		}
+
+		if (is_array($this->excluded_files)) {
+			foreach ($this->excluded_files as $excluded_file_pattern) {
+				if ($excluded_file_pattern == "/") {
+					$needle = "$";
+				} else {
+					$needle = "$" . $excluded_file_pattern;
+				}
+
+				if (strstr("$" . $file['path'], $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		if ($regex = $this->is_excluded_regex($file)) {
+			return $regex;
+		}
+
+		if ($file['type'] == "file") {
+			$check_file_diff_timestamp = $this->check_file_diff_time($file);
+			if ($check_file_diff_timestamp) {
+				return $check_file_diff_timestamp;
+			}
+		}
+
+		return false;
+	}
+
+	/*REGEX examples
      *
     * exclude all except .php file
     * PATTERN: ^(.*)\.(.+)$(?<!(php))
@@ -910,163 +910,163 @@ 
     * exclude the backup folders
     * PATTERN: (^|^\/)(wp-content\/backups|administrator\/backups)(.*)$";
     */
-    private function is_excluded_regex($file)
-    {
-        //$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
-
-        $regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
-
-        if (is_array($this->additional_regex_patterns)) {
-            $regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
-        }
-
-        //print_r($regex_patterns);exit;
-
-        if (is_array($regex_patterns)) {
-            //$this->excluded_files = array();
-            //$this->excluded_files[] ="(.*)\.(git)(.*)$";
-            //$this->excluded_files[] ="wp-content\/backups(.*)$";
-
-            foreach ($regex_patterns as $excluded_file_pattern) {
-
-                if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
-                        strlen($excluded_file_pattern)) == "\r") {
-                    $excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
-                }
-
-                if ($file['path'] == "/") {
-                    $needle = "/";
-                } else {
-                    $needle = "/" . $file['path'];
-                }
-                //echo $needle."---".$excluded_file_pattern."---\n";
-
-                if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
-                    return $excluded_file_pattern;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    public function store_file($file, $storage = 'start_filesystem')
-    {
-        $this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
-
-        if (!isset($file['size'])) {
-            $file['size'] = 0;
-        }
-        if (!isset($file['visibility'])) {
-            $file['visibility'] = "private";
-        }
-
-        $csv_filename = str_replace('"', '""', $file['path']);
-
-        $line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
-
-        $this->last_logged_file = $file['path'];
-
-        if ($file['type'] == "dir") {
-            try {
-                $this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
-            } catch (Exception $e) {
-                $this->logger->error($e->getMessage());
-            }
-        }
-
-        if ($this->get_diff_timestamp_start()) {
-            if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
-                $this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
-                    $response), array(
-                    "FILESYSTEM SCAN",
-                    "DIR DIFF"
-                ));
-
-                return false;
-            }
-        }
-
-        try {
-            if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
-                //adding fix for UTF-8 CSV preview
-                $start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
-                $this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
-            }
-
-            $this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
-
-        } catch (Exception $e) {
-
-            $this->logger->error($e->getMessage());
-        }
-
-        return true;
-    }
-
-    public function get_fileystem_handler()
-    {
-        return $this;
-    }
-
-    public function get_filesystem($system = "")
-    {
-        if ($system == "storage_filesystem_append") {
-            return $this->storage_filesystem_append;
-        } elseif ($system == "tmp_filesystem_append") {
-            return $this->tmp_filesystem_append;
-        } elseif ($system == "tmp_filesystem") {
-            return $this->tmp_filesystem;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_filesystem;
-        } else {
-            return $this->start_filesystem;
-        }
-    }
-
-    public function get_adapter($system)
-    {
-        if ($system == "tmp_filesystem") {
-            return $this->tmp_adapter;
-        } elseif ($system == "storage_filesystem") {
-            return $this->storage_adapter;
-        } else {
-            return $this->start_adapter;
-        }
-    }
-
-    /**
-     * File scan finished
-     * Method called when file scan is finished
-     *
-     * @return bool
-     */
-    private function scan_finished()
-    {
-        if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
-            $this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
-            return false;
-        }
-
-        if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
-            $this->tmp_filesystem->delete($this->get_temp_dir_handler());
-        }
-
-        $this->logger->debug(sprintf(("File scan finished")));
-
-        return true;
-    }
-
-    /**
-     * Calculate bytes from MB value
-     *
-     * @param int $mb_size
-     *
-     * @return float|int
-     */
-    private function calc_to_bytes($mb_size)
-    {
-        return $mb_size * (1024 * 1024);
-    }
+	private function is_excluded_regex($file)
+	{
+		//$this->logger->debug(sprintf(("Checking if %s is excluded"), $file['path']));
+
+		$regex_patterns = explode(PHP_EOL, $this->xcloner_settings->get_xcloner_option('xcloner_regex_exclude'));
+
+		if (is_array($this->additional_regex_patterns)) {
+			$regex_patterns = array_merge($regex_patterns, $this->additional_regex_patterns);
+		}
+
+		//print_r($regex_patterns);exit;
+
+		if (is_array($regex_patterns)) {
+			//$this->excluded_files = array();
+			//$this->excluded_files[] ="(.*)\.(git)(.*)$";
+			//$this->excluded_files[] ="wp-content\/backups(.*)$";
+
+			foreach ($regex_patterns as $excluded_file_pattern) {
+
+				if (substr($excluded_file_pattern, strlen($excluded_file_pattern) - 1,
+						strlen($excluded_file_pattern)) == "\r") {
+					$excluded_file_pattern = substr($excluded_file_pattern, 0, strlen($excluded_file_pattern) - 1);
+				}
+
+				if ($file['path'] == "/") {
+					$needle = "/";
+				} else {
+					$needle = "/" . $file['path'];
+				}
+				//echo $needle."---".$excluded_file_pattern."---\n";
+
+				if (@preg_match("/(^|^\/)" . $excluded_file_pattern . "/i", $needle)) {
+					return $excluded_file_pattern;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	public function store_file($file, $storage = 'start_filesystem')
+	{
+		$this->logger->debug(sprintf("Storing %s in the backup list", $file['path']));
+
+		if (!isset($file['size'])) {
+			$file['size'] = 0;
+		}
+		if (!isset($file['visibility'])) {
+			$file['visibility'] = "private";
+		}
+
+		$csv_filename = str_replace('"', '""', $file['path']);
+
+		$line = '"' . ($csv_filename) . '","' . $file['timestamp'] . '","' . $file['size'] . '","' . $file['visibility'] . '","' . $storage . '"' . PHP_EOL;
+
+		$this->last_logged_file = $file['path'];
+
+		if ($file['type'] == "dir") {
+			try {
+				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path'] . "\n");
+			} catch (Exception $e) {
+				$this->logger->error($e->getMessage());
+			}
+		}
+
+		if ($this->get_diff_timestamp_start()) {
+			if ($file['type'] != "file" && $response = $this->check_file_diff_time($file)) {
+				$this->logger->info(sprintf("Directory %s archiving skipped on differential backup %s", $file['path'],
+					$response), array(
+					"FILESYSTEM SCAN",
+					"DIR DIFF"
+				));
+
+				return false;
+			}
+		}
+
+		try {
+			if (!$this->tmp_filesystem_append->has($this->get_included_files_handler())) {
+				//adding fix for UTF-8 CSV preview
+				$start_line = "\xEF\xBB\xBF" . '"Filename","Timestamp","Size","Visibility","Storage"' . PHP_EOL;
+				$this->tmp_filesystem_append->write($this->get_included_files_handler(), $start_line);
+			}
+
+			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
+
+		} catch (Exception $e) {
+
+			$this->logger->error($e->getMessage());
+		}
+
+		return true;
+	}
+
+	public function get_fileystem_handler()
+	{
+		return $this;
+	}
+
+	public function get_filesystem($system = "")
+	{
+		if ($system == "storage_filesystem_append") {
+			return $this->storage_filesystem_append;
+		} elseif ($system == "tmp_filesystem_append") {
+			return $this->tmp_filesystem_append;
+		} elseif ($system == "tmp_filesystem") {
+			return $this->tmp_filesystem;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_filesystem;
+		} else {
+			return $this->start_filesystem;
+		}
+	}
+
+	public function get_adapter($system)
+	{
+		if ($system == "tmp_filesystem") {
+			return $this->tmp_adapter;
+		} elseif ($system == "storage_filesystem") {
+			return $this->storage_adapter;
+		} else {
+			return $this->start_adapter;
+		}
+	}
+
+	/**
+	 * File scan finished
+	 * Method called when file scan is finished
+	 *
+	 * @return bool
+	 */
+	private function scan_finished()
+	{
+		if ($this->tmp_filesystem_append->has($this->get_temp_dir_handler()) &&
+			$this->tmp_filesystem_append->getSize($this->get_temp_dir_handler())) {
+			return false;
+		}
+
+		if ($this->tmp_filesystem->has($this->get_temp_dir_handler())) {
+			$this->tmp_filesystem->delete($this->get_temp_dir_handler());
+		}
+
+		$this->logger->debug(sprintf(("File scan finished")));
+
+		return true;
+	}
+
+	/**
+	 * Calculate bytes from MB value
+	 *
+	 * @param int $mb_size
+	 *
+	 * @return float|int
+	 */
+	private function calc_to_bytes($mb_size)
+	{
+		return $mb_size * (1024 * 1024);
+	}
 
 }

restore/xcloner_restore.php

Doc Comments +9 added lines, -5 removed lines

@@ -651,7 +651,7 @@ 
      * Update Wordpress url in wp-config.php method
      * @param $wp_path
      * @param $url
-     * @param $mysqli
+     * @param mysqli $mysqli
      * @return bool
      * @throws Exception
      */
@@ -781,7 +781,7 @@ 
      * Get backup hash method
      *
      * @param $backup_file
-     * @return bool
+     * @return false|string
      */
 	private function get_hash_from_backup($backup_file)
 	{
@@ -1004,7 +1004,7 @@ 
     /**
      * Return bytes from human readable value
      *
-     * @param $val
+     * @param string $val
      * @return int
      *
      */
@@ -1088,7 +1088,7 @@ 
      * Sort_by method
      *
      * @param $array
-     * @param $field
+     * @param string $field
      * @param string $direction
      * @return bool
      */
@@ -1097,6 +1097,10 @@ 
         $direction = strtolower($direction);
 
         usort($array,
+
+            /**
+             * @param string $b
+             */
             function($a, $b) use($field, $direction){
 
                 $a = $a[$field];
@@ -1162,7 +1166,7 @@ 
      * Serialize fix methods below for mysql query lines
      *
      * @param $query
-     * @return string|string[]|null
+     * @return string
      */
 	 
 	function do_serialized_fix($query)

Indentation +243 added lines, -243 removed lines

@@ -106,11 +106,11 @@ 
 	private $backup_storage_dir;
 	private $parent_api;
 
-    /**
-     * Xcloner_Restore constructor.
-     * @param string $parent_api
-     * @throws Exception
-     */
+	/**
+	 * Xcloner_Restore constructor.
+	 * @param string $parent_api
+	 * @throws Exception
+	 */
 	public function __construct($parent_api = "")
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
@@ -150,9 +150,9 @@ 
 
 	}
 
-    /**
-     * Exception handler method
-     */
+	/**
+	 * Exception handler method
+	 */
 	public function exception_handler() {
 		
 		$error = error_get_last();
@@ -164,20 +164,20 @@ 
 	
 	}
 
-    /**
-     * @param $type
-     * @return mixed|string
-     */
+	/**
+	 * @param $type
+	 * @return mixed|string
+	 */
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 	
 	public function get_logger_filename()
@@ -187,12 +187,12 @@ 
 		return $filename;
 	}
 
-    /**
-     * Init method
-     *
-     * @return mixed|void
-     * @throws Exception
-     */
+	/**
+	 * Init method
+	 *
+	 * @return mixed|void
+	 * @throws Exception
+	 */
 	public function init()
 	{
 		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
@@ -216,12 +216,12 @@ 
 		return $this->check_system();
 	}
 
-    /**
-     * Write file method
-     *
-     * @return bool|int
-     * @throws Exception
-     */
+	/**
+	 * Write file method
+	 *
+	 * @return bool|int
+	 * @throws Exception
+	 */
 	public function write_file_action()
 	{
 		if(isset($_POST['file']))
@@ -266,16 +266,16 @@ 
 		
 	}
 
-    /**
-     * Connect to mysql server method
-     *
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return mysqli
-     * @throws Exception
-     */
+	/**
+	 * Connect to mysql server method
+	 *
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return mysqli
+	 * @throws Exception
+	 */
 	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
@@ -297,11 +297,11 @@ 
 		return $mysqli;	
 	}
 
-    /**
-     * Restore mysql backup file
-     *
-     * @throws Exception
-     */
+	/**
+	 * Restore mysql backup file
+	 *
+	 * @throws Exception
+	 */
 	public function restore_mysql_backup_action()
 	{
 		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
@@ -432,14 +432,14 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Url replace method inside database backup file
-     *
-     * @param $search
-     * @param $replace
-     * @param $query
-     * @return mixed|string|string[]|null
-     */
+	/**
+	 * Url replace method inside database backup file
+	 *
+	 * @param $search
+	 * @param $replace
+	 * @param $query
+	 * @return mixed|string|string[]|null
+	 */
 	private function url_replace($search, $replace, $query)
 	{
 		$this->logger->info(sprintf("Doing url replace on query with length %s", strlen($query)), array("QUERY_REPLACE"));
@@ -462,11 +462,11 @@ 
 		return $query;
 	}
 
-    /**
-     * List backup files method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup files method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_files_action()
 	{
 		$backup_parts = array();
@@ -532,11 +532,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Finish backup restore method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Finish backup restore method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function restore_finish_action()
 	{
 		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
@@ -577,12 +577,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Delete backup temporary folder
-     *
-     * @param $remote_path
-     * @return bool
-     */
+	/**
+	 * Delete backup temporary folder
+	 *
+	 * @param $remote_path
+	 * @return bool
+	 */
 	private function delete_backup_temporary_folder($remote_path)
 	{
 		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
@@ -610,11 +610,11 @@ 
 	
 	}
 
-    /**
-     * Delete restore script method
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Delete restore script method
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	private function delete_self()
 	{
 		if($this->filesystem->has("vendor.phar"))
@@ -647,14 +647,14 @@ 
 		
 	}
 
-    /**
-     * Update Wordpress url in wp-config.php method
-     * @param $wp_path
-     * @param $url
-     * @param $mysqli
-     * @return bool
-     * @throws Exception
-     */
+	/**
+	 * Update Wordpress url in wp-config.php method
+	 * @param $wp_path
+	 * @param $url
+	 * @param $mysqli
+	 * @return bool
+	 * @throws Exception
+	 */
 	private function update_wp_url($wp_path, $url, $mysqli)
 	{
 		$wp_config = $wp_path.DS."wp-config.php";
@@ -682,17 +682,17 @@ 
 		return true;
 	}
 
-    /**
-     * Update local wp-config.php file method
-     *
-     * @param $remote_path
-     * @param $remote_mysql_host
-     * @param $remote_mysql_user
-     * @param $remote_mysql_pass
-     * @param $remote_mysql_db
-     * @return string
-     * @throws Exception
-     */
+	/**
+	 * Update local wp-config.php file method
+	 *
+	 * @param $remote_path
+	 * @param $remote_mysql_host
+	 * @param $remote_mysql_user
+	 * @param $remote_mysql_pass
+	 * @param $remote_mysql_db
+	 * @return string
+	 * @throws Exception
+	 */
 	private function update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
@@ -724,10 +724,10 @@ 
 		
 	}
 
-    /**
-     * List mysqldump database backup files
-     *
-     */
+	/**
+	 * List mysqldump database backup files
+	 *
+	 */
 	public function list_mysqldump_backups_action()
 	{
 		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -777,12 +777,12 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get backup hash method
-     *
-     * @param $backup_file
-     * @return bool
-     */
+	/**
+	 * Get backup hash method
+	 *
+	 * @param $backup_file
+	 * @return bool
+	 */
 	private function get_hash_from_backup($backup_file)
 	{
 		if(!$backup_file)
@@ -796,11 +796,11 @@ 
 		return false;
 	}
 
-    /**
-     * List backup archives found on local system
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * List backup archives found on local system
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function list_backup_archives_action()
 	{
 		$local_backup_file = filter_input(INPUT_POST, 'local_backup_file', FILTER_SANITIZE_STRING);
@@ -859,12 +859,12 @@ 
 		
 	}
 
-    /**
-     * Restore backup archive to local path
-     *
-     * @throws \League\Flysystem\FileNotFoundException
-     * @throws \splitbrain\PHPArchive\ArchiveIOException
-     */
+	/**
+	 * Restore backup archive to local path
+	 *
+	 * @throws \League\Flysystem\FileNotFoundException
+	 * @throws \splitbrain\PHPArchive\ArchiveIOException
+	 */
 	public function restore_backup_to_path_action()
 	{
 		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
@@ -939,9 +939,9 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Get current directory method
-     */
+	/**
+	 * Get current directory method
+	 */
 	public function get_current_directory_action()
 	{	
 		global $wpdb;
@@ -975,11 +975,11 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Check current filesystem
-     *
-     * @throws Exception
-     */
+	/**
+	 * Check current filesystem
+	 *
+	 * @throws Exception
+	 */
 	public function check_system()
 	{
 		//check if i can write
@@ -1001,35 +1001,35 @@ 
 		$this->send_response(200, $return);
 	}
 
-    /**
-     * Return bytes from human readable value
-     *
-     * @param $val
-     * @return int
-     *
-     */
-    private function return_bytes($val) {
-        $numeric_val = (int)trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
-            // The 'G' modifier is available since PHP 5.1.0
-            case 'g':
-                $numeric_val *= 1024;
-            case 'm':
-                $numeric_val *= 1024;
-            case 'k':
-                $numeric_val *= 1024;
-        }
+	/**
+	 * Return bytes from human readable value
+	 *
+	 * @param $val
+	 * @return int
+	 *
+	 */
+	private function return_bytes($val) {
+		$numeric_val = (int)trim($val);
+		$last = strtolower($val[strlen($val)-1]);
+		switch($last) {
+			// The 'G' modifier is available since PHP 5.1.0
+			case 'g':
+				$numeric_val *= 1024;
+			case 'm':
+				$numeric_val *= 1024;
+			case 'k':
+				$numeric_val *= 1024;
+		}
 
-        return $numeric_val;
-    }
+		return $numeric_val;
+	}
 
-    /**
-     * Check if backup archive os multipart
-     *
-     * @param $backup_name
-     * @return bool
-     */
+	/**
+	 * Check if backup archive os multipart
+	 *
+	 * @param $backup_name
+	 * @return bool
+	 */
 	public function is_multipart($backup_name)
 	{
 		if(stristr($backup_name, "-multipart"))
@@ -1038,13 +1038,13 @@ 
 		return false;	
 	}
 
-    /**
-     * Get backup archive size
-     *
-     * @param $backup_name
-     * @return bool|false|int
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get backup archive size
+	 *
+	 * @param $backup_name
+	 * @return bool|false|int
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
@@ -1058,12 +1058,12 @@ 
 		return $backup_size;
 	}
 
-    /**
-     * Get multipart backup files list
-     * @param $backup_name
-     * @return array
-     * @throws \League\Flysystem\FileNotFoundException
-     */
+	/**
+	 * Get multipart backup files list
+	 * @param $backup_name
+	 * @return array
+	 * @throws \League\Flysystem\FileNotFoundException
+	 */
 	public function get_multipart_files($backup_name)
 	{
 		$files = array();
@@ -1084,58 +1084,58 @@ 
 		return $files;
 	}
 
-    /**
-     * Sort_by method
-     *
-     * @param $array
-     * @param $field
-     * @param string $direction
-     * @return bool
-     */
-    private function sort_by( &$array, $field, $direction = 'asc')
-    {
-        $direction = strtolower($direction);
+	/**
+	 * Sort_by method
+	 *
+	 * @param $array
+	 * @param $field
+	 * @param string $direction
+	 * @return bool
+	 */
+	private function sort_by( &$array, $field, $direction = 'asc')
+	{
+		$direction = strtolower($direction);
 
-        usort($array,
-            function($a, $b) use($field, $direction){
+		usort($array,
+			function($a, $b) use($field, $direction){
 
-                $a = $a[$field];
-                $b = $b[$field];
+				$a = $a[$field];
+				$b = $b[$field];
 
-                if ($a == $b)
-                {
-                    return 0;
-                }
+				if ($a == $b)
+				{
+					return 0;
+				}
 
-                if($direction == 'desc') {
-                    if($a > $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }else {
-                    if($a < $b) {
-                        return -1;
-                    }
-                    else{
-                        return 1;
-                    }
-                }
+				if($direction == 'desc') {
+					if($a > $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}else {
+					if($a < $b) {
+						return -1;
+					}
+					else{
+						return 1;
+					}
+				}
 
-                //return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
-            }
-        );
+				//return ($a.($direction == 'desc' ? '>' : '<').$b) ? -1 : 1;
+			}
+		);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Send response method
-     *
-     * @param int $status
-     * @param $response
-     */
+	/**
+	 * Send response method
+	 *
+	 * @param int $status
+	 * @param $response
+	 */
 	public static function send_response($status = 200, $response)
 	{
 		header("Access-Control-Allow-Origin: *");
@@ -1158,12 +1158,12 @@ 
 		exit;
 	}
 
-    /**
-     * Serialize fix methods below for mysql query lines
-     *
-     * @param $query
-     * @return string|string[]|null
-     */
+	/**
+	 * Serialize fix methods below for mysql query lines
+	 *
+	 * @param $query
+	 * @return string|string[]|null
+	 */
 	 
 	function do_serialized_fix($query)
 	{
@@ -1176,51 +1176,51 @@ 
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
-	              //return $this->unescape_quotes($data);
+				  //return $this->unescape_quotes($data);
 	              
-	              return $data;
-	            }, $query);
+				  return $data;
+				}, $query);
 	}
 
-    /**
-     * Unescape quotes method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape quotes method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_quotes($value) {
 		return str_replace('\"', '"', $value);
 	}
 
-    /**
-     * Unescape mysql method
-     *
-     * @param $value
-     * @return mixed
-     */
+	/**
+	 * Unescape mysql method
+	 *
+	 * @param $value
+	 * @return mixed
+	 */
 	private function unescape_mysql($value) {
 		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
 						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
 						   $value);
 	}
 
-    /**
-     * Check if string is in serialized format
-     *
-     * @param $s
-     * @return bool
-     */
+	/**
+	 * Check if string is in serialized format
+	 *
+	 * @param $s
+	 * @return bool
+	 */
 	private function has_serialized($s)
 	{
 		if(
-		    stristr($s, '{' ) != false &&
-		    stristr($s, '}' ) != false &&
-		    stristr($s, ';' ) != false &&
-		    stristr($s, ':' ) != false
-		    ){
-		    return true;
+			stristr($s, '{' ) != false &&
+			stristr($s, '}' ) != false &&
+			stristr($s, ';' ) != false &&
+			stristr($s, ':' ) != false
+			){
+			return true;
 		}else{
-		    return false;
+			return false;
 		}
 
 	}

Spacing +193 added lines, -193 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-if(!defined('AUTH_KEY'))
+if (!defined('AUTH_KEY'))
 {
 	define('AUTH_KEY', '');
 }
 
-if(!defined("DS"))
+if (!defined("DS"))
 {
 	define("DS", DIRECTORY_SEPARATOR);
 }
 
-if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 {	
-	if(!AUTH_KEY)
+	if (!AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY not set!");
 			exit;
 	}
 	
-	if(!isset($_REQUEST['hash']))
+	if (!isset($_REQUEST['hash']))
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, sent HASH is empty!");
 			exit;
 	}
 	
-	if($_REQUEST['hash'] != AUTH_KEY)
+	if ($_REQUEST['hash'] != AUTH_KEY)
 	{
 			Xcloner_Restore::send_response("404", "Could not run restore script, AUTH_KEY doesn't match the sent HASH!");
 			exit;
@@ -32,28 +32,28 @@ 
 }
 
 //check minimum PHP version
-if(version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
+if (version_compare(phpversion(), Xcloner_Restore::xcloner_minimum_version, '<'))
 {
-	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"),Xcloner_Restore::xcloner_minimum_version, phpversion()) );
+	Xcloner_Restore::send_response(500, sprintf(("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Restore::xcloner_minimum_version, phpversion()));
 	exit;
 
 }
 
-$file = dirname( __DIR__ )  . DS.'vendor'.DS.'autoload.php';
+$file = dirname(__DIR__).DS.'vendor'.DS.'autoload.php';
 
-if(file_exists($file))
+if (file_exists($file))
 {
 	
 	require_once($file);
 }
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+elseif (file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else {	
 	
-	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
+	$file = dirname(__FILE__).DS.'vendor'.DS.'autoload.php';
 	
-	if(!file_exists($file))
+	if (!file_exists($file))
 	{
 		Xcloner_Restore::send_response("404", "File $file does not exists, please extract the vendor.tgz archive on the server or enable PHP Phar module!");
 		exit;
@@ -78,16 +78,16 @@ 
 
 //do not modify below
 $that = "";
-if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 {
 	$that = $this;
 }
 $xcloner_restore = new Xcloner_Restore($that);
 
-try{
+try {
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+}catch (Exception $e) {
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -96,10 +96,10 @@ 
 	
 	const 	xcloner_minimum_version = "5.4.0";
 	
-	private $backup_archive_extensions 		= array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
-	private $process_files_limit 			= 150;
-	private $process_files_limit_list 		= 350;
-	private $process_mysql_records_limit 	= 250;
+	private $backup_archive_extensions = array("zip", "tar", "tgz", "tar.gz", "gz", "csv");
+	private $process_files_limit = 150;
+	private $process_files_limit_list = 350;
+	private $process_mysql_records_limit = 250;
 	private $adapter;
 	private $filesystem;
 	private $logger;
@@ -115,12 +115,12 @@ 
 	{
 		register_shutdown_function(array($this, 'exception_handler'));
 
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$dir = $parent_api->get_xcloner_container()->get_xcloner_settings()->get_xcloner_store_path();
 		}
 		
-		if(!isset($dir) || !$dir){
+		if (!isset($dir) || !$dir) {
 			$dir = dirname(__FILE__);
 		}
 		
@@ -128,7 +128,7 @@ 
 		
 		$this->backup_storage_dir = $dir;
 		
-		$this->adapter = new Local($dir ,LOCK_EX, 'SKIP_LINKS');
+		$this->adapter = new Local($dir, LOCK_EX, 'SKIP_LINKS');
 		$this->filesystem = new Filesystem($this->adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -137,15 +137,15 @@ 
 		
 		$logger_path = $this->get_logger_filename();
 		
-		if(!is_writeable($logger_path) and !touch($logger_path))
+		if (!is_writeable($logger_path) and !touch($logger_path))
 		{
 			$logger_path = "php://stderr";
 		}
 		
 		$this->logger->pushHandler(new StreamHandler($logger_path, Logger::DEBUG));
 		
-		if(isset($_POST['API_ID'])){
-			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0 , 15));
+		if (isset($_POST['API_ID'])) {
+			$this->logger->info("Processing ajax request ID ".substr(filter_input(INPUT_POST, 'API_ID', FILTER_SANITIZE_STRING), 0, 15));
 		}
 
 	}
@@ -157,9 +157,9 @@ 
 		
 		$error = error_get_last();
 		
-		if($error['type'] and $this->logger)
+		if ($error['type'] and $this->logger)
 		{
-			$this->logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$this->logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 	
 	}
@@ -169,12 +169,12 @@ 
      * @return mixed|string
      */
 	private function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
+	    static $levels = null;
+	    if ($levels === null) {
+	        $levels = [];
 	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+	            if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 	        }
 	    }
 	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -182,7 +182,7 @@ 
 	
 	public function get_logger_filename()
 	{
-		$filename = $this->backup_storage_dir .DS. "xcloner_restore.log";
+		$filename = $this->backup_storage_dir.DS."xcloner_restore.log";
 		
 		return $filename;
 	}
@@ -195,7 +195,7 @@ 
      */
 	public function init()
 	{
-		if(isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
+		if (isset($_POST['xcloner_action']) and $_POST['xcloner_action'])
 		{
 			$method = filter_input(INPUT_POST, 'xcloner_action', FILTER_SANITIZE_STRING);
 			
@@ -203,13 +203,13 @@ 
 			
 			$method .= "_action";
 			
-			if(method_exists($this, $method))
+			if (method_exists($this, $method))
 			{
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
-				throw new Exception($method ." does not exists");
+			} else {
+				throw new Exception($method." does not exists");
 				}
 		}
 		
@@ -224,38 +224,38 @@ 
      */
 	public function write_file_action()
 	{
-		if(isset($_POST['file']))
+		if (isset($_POST['file']))
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
+			if (!$_POST['start'])
 				$fp = fopen($target_file, "wb+");
 			else
 				$fp = fopen($target_file, "ab+");	
 			
-			if(!$fp)
+			if (!$fp)
 				throw new Exception("Unable to open $target_file file for writing");
 			
 			fseek($fp, $_POST['start']);
 			
-			if(isset($_FILES['blob']))
+			if (isset($_FILES['blob']))
 			{
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using FILES blob', filesize($_FILES['blob']['tmp_name']), $target_file, $_POST['start']));
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}elseif(isset($_POST['blob'])){
+			}elseif (isset($_POST['blob'])) {
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
-			}else{
+			} else {
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -276,20 +276,20 @@ 
      * @return mysqli
      * @throws Exception
      */
-	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
+	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
 
 		$mysqli = new mysqli($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 
 		if ($mysqli->connect_error) {
-			throw new Exception('Connect Error (' . $mysqli->connect_errno . ') '
+			throw new Exception('Connect Error ('.$mysqli->connect_errno.') '
 				. $mysqli->connect_error);
 		}
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
+		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
 			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
 		else
 			$mysqli->query("SET NAMES utf8;");
@@ -304,15 +304,15 @@ 
      */
 	public function restore_mysql_backup_action()
 	{
-		$mysqldump_file 	= filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
-		$remote_path 		= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$mysqldump_file = filter_input(INPUT_POST, 'mysqldump_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
-		$execute_query 		= trim(stripslashes($_POST['query']));
-		$error_line			= filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
-		$start			 	= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$execute_query = trim(stripslashes($_POST['query']));
+		$error_line = filter_input(INPUT_POST, 'error_line', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
 		
 		$wp_home_url 		= filter_input(INPUT_POST, 'wp_home_url', FILTER_SANITIZE_STRING);
 		$remote_restore_url = filter_input(INPUT_POST, 'remote_restore_url', FILTER_SANITIZE_STRING);
@@ -322,8 +322,8 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if (!file_exists($mysql_backup_file))
+			throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -337,7 +337,7 @@ 
 		}*/
 		
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 		}
 		
 		$line_count = 0;
@@ -347,7 +347,7 @@ 
 		$return['backup_size']	= filesize($mysql_backup_file);
 		
 		$fp = fopen($mysql_backup_file, "r");
-		if($fp)
+		if ($fp)
 		{
 			$this->logger->info(sprintf("Opening mysql dump file %s at position %s.", $mysql_backup_file, $start));
 			fseek($fp, $start);
@@ -355,49 +355,49 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
+				if (substr($line, 0, 1) == "#")
 					continue;
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
+				if ($line == "\n" or trim($line) == "")
 					continue;
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
+				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n")
 					$query .= $line;
-				else{
+				else {
 					$query .= $line;
 					continue;
 				}
 				
-				if($execute_query)
+				if ($execute_query)
 				{
-					$query  = (($execute_query));
+					$query = (($execute_query));
 					$execute_query = "";
 				}	
 				
 				//Doing serialized url replace here
 				
-				if($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
+				if ($wp_site_url and $wp_home_url and strlen($wp_home_url) < strlen($wp_site_url))
 				{
-					list($wp_home_url,$wp_site_url) 			= array($wp_site_url,$wp_home_url);
-					list($remote_restore_url,$restore_site_url) = array($restore_site_url,$remote_restore_url);
+					list($wp_home_url, $wp_site_url) = array($wp_site_url, $wp_home_url);
+					list($remote_restore_url, $restore_site_url) = array($restore_site_url, $remote_restore_url);
 					
 				}
 				
-				if($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
+				if ($wp_home_url and $remote_restore_url and strpos($query, $wp_home_url) !== false)
 				{
 					$query = $this->url_replace($wp_home_url, $remote_restore_url, $query);
 				}
 				
-				if($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
+				if ($wp_site_url and $restore_site_url and strpos($query, $wp_site_url) !== false)
 				{
 					$query = $this->url_replace($wp_site_url, $restore_site_url, $query);
 				}
 				
-				if(!$mysqli->query($query) && !stristr($mysqli->error,"Duplicate entry"))
+				if (!$mysqli->query($query) && !stristr($mysqli->error, "Duplicate entry"))
 				{
 					//$return['error_line'] = $line_count;
-					$return['start'] = ftell($fp)-strlen($line);
+					$return['start'] = ftell($fp) - strlen($line);
 					$return['query_error'] = true;
 					$return['query'] = $query;
 					$return['message'] = sprintf("Mysql Error: %s\n", $mysqli->error);
@@ -418,12 +418,12 @@ 
 		
 		$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))
+		if (!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else {
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -446,12 +446,12 @@ 
 		$query = str_replace($search, $replace, $query);
 		$original_query = $query;
 		
-		if($this->has_serialized($query))
+		if ($this->has_serialized($query))
 		{
 			$this->logger->info(sprintf("Query contains serialized data, doing serialized size fix"), array("QUERY_REPLACE"));
 			$query = $this->do_serialized_fix($query);
 			
-			if(!$query)
+			if (!$query)
 			{
 				$this->logger->info(sprintf("Serialization probably failed here..."), array("QUERY_REPLACE"));
 				$query = $original_query;
@@ -472,37 +472,37 @@ 
 		$backup_parts = array();
 		
 		$source_backup_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
-		$start 				= (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
-		$return['part'] 	= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
+		$start = (int)filter_input(INPUT_POST, 'start', FILTER_SANITIZE_STRING);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_STRING);
 		
 		$backup_file = $source_backup_file;
 		
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];
 		}
 		
-		try{
+		try {
 			$tar = new Tar();
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		}catch (Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$this->send_response(200, $return);
 		}
 		
-		$return['files'] 		= array();
-		$return['finished'] 	= 1;
-		$return['total_size'] 	= filesize($this->backup_storage_dir.DS.$backup_file);
+		$return['files'] = array();
+		$return['finished'] = 1;
+		$return['total_size'] = filesize($this->backup_storage_dir.DS.$backup_file);
 		$i = 0;
 		
-		if(isset($data['extracted_files']) and is_array($data['extracted_files']))
+		if (isset($data['extracted_files']) and is_array($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $file)
+			foreach ($data['extracted_files'] as $file)
 			{
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
@@ -512,18 +512,18 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
-			if($this->is_multipart($source_backup_file))
+		} else {
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
@@ -546,28 +546,28 @@ 
 		
 		$remote_mysql_user 	= filter_input(INPUT_POST, 'remote_mysql_user', FILTER_SANITIZE_STRING);
 		$remote_mysql_pass 	= filter_input(INPUT_POST, 'remote_mysql_pass', FILTER_SANITIZE_STRING);
-		$remote_mysql_db 	= filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
+		$remote_mysql_db = filter_input(INPUT_POST, 'remote_mysql_db', FILTER_SANITIZE_STRING);
 		$remote_mysql_host 	= filter_input(INPUT_POST, 'remote_mysql_host', FILTER_SANITIZE_STRING);
 		
-		$update_remote_site_url			 	= filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
-		$delete_restore_script			 	= filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
-		$delete_backup_temporary_folder		= filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
+		$update_remote_site_url = filter_input(INPUT_POST, 'update_remote_site_url', FILTER_SANITIZE_NUMBER_INT);
+		$delete_restore_script = filter_input(INPUT_POST, 'delete_restore_script', FILTER_SANITIZE_NUMBER_INT);
+		$delete_backup_temporary_folder = filter_input(INPUT_POST, 'delete_backup_temporary_folder', FILTER_SANITIZE_NUMBER_INT);
 				
-		if($update_remote_site_url)
+		if ($update_remote_site_url)
 		{
-			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db );
+			$mysqli = $this->mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_config($remote_path, $remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 			$this->update_wp_url($remote_path, $remote_restore_url, $mysqli);
 		}
 		
-		if($delete_backup_temporary_folder)
+		if ($delete_backup_temporary_folder)
 		{
 			$this->delete_backup_temporary_folder($remote_path);
 		}
 		
-		if(!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
+		if (!defined('XCLONER_PLUGIN_ACCESS') || XCLONER_PLUGIN_ACCESS != 1)
 		{
-			if($delete_restore_script)
+			if ($delete_restore_script)
 			{
 				$this->delete_self();
 			}
@@ -585,7 +585,7 @@ 
      */
 	private function delete_backup_temporary_folder($remote_path)
 	{
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -593,13 +593,13 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches)){
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches)) {
 					$this->logger->info(sprintf('Deleting temporary folder %s', $file['path']));
 					$this->target_filesystem->deleteDir($file['path']);
 				}
@@ -617,29 +617,29 @@ 
      */
 	private function delete_self()
 	{
-		if($this->filesystem->has("vendor.phar"))
+		if ($this->filesystem->has("vendor.phar"))
 		{
 			$this->logger->info(sprintf('Deleting vendor.phar'));
 			$this->filesystem->delete("vendor.phar");
 		}
-		if($this->filesystem->has("vendor"))
+		if ($this->filesystem->has("vendor"))
 		{
 			$this->logger->info(sprintf('Deleting vendor folder'));
 			$this->filesystem->deleteDir("vendor");
 		}
-		if($this->filesystem->has("xcloner_restore.php"))
+		if ($this->filesystem->has("xcloner_restore.php"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.php'));
 			$this->filesystem->delete("xcloner_restore.php");
 		}
 		
-		if($this->filesystem->has("xcloner_restore.log"))
+		if ($this->filesystem->has("xcloner_restore.log"))
 		{
 			$this->logger->info(sprintf('Deleting xcloner_restore.log'));
 			$this->filesystem->delete("xcloner_restore.log");
 		}
 		
-		if($this->filesystem->has($this->get_logger_filename()))
+		if ($this->filesystem->has($this->get_logger_filename()))
 		{
 			$this->logger->info(sprintf('Deleting logger file %s', $this->get_logger_filename()));
 			$this->filesystem->delete($this->get_logger_filename());
@@ -661,11 +661,11 @@ 
 		
 		$this->logger->info(sprintf('Updating site url to %s', $url));
 		
-		if(file_exists($wp_config))
+		if (file_exists($wp_config))
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
+			if (isset($matches[1]))
 				$table_prefix = $matches[1];
 			else
 				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
@@ -673,10 +673,10 @@ 
 		else
 			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
 			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
 			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
 		
 		return true;
@@ -697,7 +697,7 @@ 
 	{
 		$wp_config = $remote_path.DS."wp-config.php";
 		
-		if(!file_exists($wp_config))
+		if (!file_exists($wp_config))
 		{
 			throw new Exception("Could not find the wp-config.php in ".$remote_path);
 		}
@@ -715,7 +715,7 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
+		if (!file_put_contents($wp_config, $content))
 			throw new Exception("Could not write updated config data to ".$wp_config);
 		
 		chmod($wp_config, $file_perms);
@@ -735,7 +735,7 @@ 
 	
 		$hash = $this->get_hash_from_backup($source_backup_file);	
 		
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -743,25 +743,25 @@ 
 		$mysqldump_list = array();
 		$list = $this->target_filesystem->listContents();
 		
-		foreach($list as $file)
+		foreach ($list as $file)
 		{
 			$matches = array();
 			
-			if($file['type'] == "dir")
+			if ($file['type'] == "dir")
 			{
-				if(preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
+				if (preg_match("/xcloner-(\w*)/", $file['basename'], $matches))
 				{
 					$files = $this->target_filesystem->listContents($file['basename']);
-					foreach($files as $file)
+					foreach ($files as $file)
 					{
-						if($file['extension'] == "sql")
+						if ($file['extension'] == "sql")
 						{
 							$this->logger->info(sprintf('Found %s mysql backup file', $file['path']));
 							$mysqldump_list[$file['path']]['path'] = $file['path'];
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
-							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
+							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i", $file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
+							if ($hash and $hash == $matches[1])
 								$mysqldump_list[$file['path']]['selected'] = "selected";
 							else
 								$mysqldump_list[$file['path']]['selected'] = "";	
@@ -771,7 +771,7 @@ 
 			}	
 		}
 		
-		$this->sort_by($mysqldump_list, 'timestamp','desc');
+		$this->sort_by($mysqldump_list, 'timestamp', 'desc');
 		$return['files'] = $mysqldump_list;
 		
 		$this->send_response(200, $return);
@@ -785,12 +785,12 @@ 
      */
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
+		if (!$backup_file)
 			return false;
 			
-		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
+		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file) - 10, strlen($backup_file)), $matches);
 		
-		if($result and isset($matches[1]))
+		if ($result and isset($matches[1]))
 			return ($matches[1]);
 		
 		return false;
@@ -809,18 +809,18 @@ 
 		$backup_files = array();
 		$parents = array();
 		
-		foreach($list as $file_info)
+		foreach ($list as $file_info)
 		{
 			$data = array();
 			
-			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
+			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach ($lines as $line)
+					if ($line)
 					{
 						$data = str_getcsv($line);
-						if(is_array($data)){
+						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
 							$file_info['size'] += $data[2];
@@ -829,19 +829,19 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
 				$backup_files[$file_info['path']] = $file_info;
 		}
 		
 		$new_list = array();
 		
-		foreach($backup_files as $key=>$file_info)
+		foreach ($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
+			if (isset($parents[$file_info['path']]))
 				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			else {
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
+				if ($local_backup_file and ($file_info['basename'] == $local_backup_file))
 					$file_info['selected'] = 'selected';
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
@@ -851,7 +851,7 @@ 
 				
 		}
 		
-		$this->sort_by($new_list, "timestamp","desc");
+		$this->sort_by($new_list, "timestamp", "desc");
 		
 		$return['files'] = $new_list;
 		
@@ -867,15 +867,15 @@ 
      */
 	public function restore_backup_to_path_action()
 	{
-		$source_backup_file 	= filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
-		$remote_path 			= filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
+		$source_backup_file = filter_input(INPUT_POST, 'backup_file', FILTER_SANITIZE_STRING);
+		$remote_path = filter_input(INPUT_POST, 'remote_path', FILTER_SANITIZE_STRING);
 		$include_filter_files 	= filter_input(INPUT_POST, 'filter_files', FILTER_SANITIZE_STRING);
 		$exclude_filter_files 	= "";
-		$start 					= filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
-		$return['part'] 		= (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
+		$start = filter_input(INPUT_POST, 'start', FILTER_SANITIZE_NUMBER_INT);
+		$return['part'] = (int)filter_input(INPUT_POST, 'part', FILTER_SANITIZE_NUMBER_INT);
 		$return['processed'] 	= (int)filter_input(INPUT_POST, 'processed', FILTER_SANITIZE_NUMBER_INT);
 				
-		$this->target_adapter = new Local($remote_path ,LOCK_EX, 'SKIP_LINKS');
+		$this->target_adapter = new Local($remote_path, LOCK_EX, 'SKIP_LINKS');
 		$this->target_filesystem = new Filesystem($this->target_adapter, new Config([
 				'disable_asserts' => true,
 			]));
@@ -887,9 +887,9 @@ 
 		$return['total_size'] = $this->get_backup_size($backup_file);
 		
 		$backup_archive = new Tar();
-		if($this->is_multipart($backup_file))
+		if ($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
+			if (!$return['part'])
 				$return['processed'] += $this->filesystem->getSize($backup_file);
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
@@ -897,41 +897,41 @@ 
 		}	
 		
 		$this->logger->info(sprintf('Opening backup archive %s at position %s', $backup_file, $start));
-		$backup_archive->open($this->backup_storage_dir .DS. $backup_file, $start);
+		$backup_archive->open($this->backup_storage_dir.DS.$backup_file, $start);
 
-		$data = $backup_archive->extract($remote_path, '',$exclude_filter_files,$include_filter_files, $this->process_files_limit);
+		$data = $backup_archive->extract($remote_path, '', $exclude_filter_files, $include_filter_files, $this->process_files_limit);
 		
-		if(isset($data['extracted_files']))
+		if (isset($data['extracted_files']))
 		{
-			foreach($data['extracted_files'] as $spl_fileinfo)
+			foreach ($data['extracted_files'] as $spl_fileinfo)
 			{
 				$this->logger->info(sprintf('Extracted %s file', $spl_fileinfo->getPath()));
 				$return['extracted_files'][] = $spl_fileinfo->getPath()." (".$spl_fileinfo->getSize()." bytes)";
 			}
 		}
 		
-		if(isset($data['start']))
+		if (isset($data['start']))
 		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
 			$return['start'] = $data['start'];
-		}else{
+		} else {
 			
 			$return['processed'] += $start;
 			
-			if($this->is_multipart($source_backup_file))
+			if ($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
+				if ($return['part'] < sizeof($backup_parts))	
 					$return['finished'] = 0;
 				
 			}
 		}
 		
-		if($return['finished'])
+		if ($return['finished'])
 			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
 		
 		$return['backup_file'] = $backup_file;
@@ -948,24 +948,24 @@ 
 		
 		$restore_script_url = filter_input(INPUT_POST, 'restore_script_url', FILTER_SANITIZE_STRING);
 		
-		$pathinfo = pathinfo( __FILE__);
+		$pathinfo = pathinfo(__FILE__);
 		
 		$suffix = "";
 		$return['remote_mysql_host'] 	= "localhost";
 		$return['remote_mysql_user'] 	= "";
 		$return['remote_mysql_pass'] 	= "";
-		$return['remote_mysql_db'] 		= "";
+		$return['remote_mysql_db'] = "";
 		
-		if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
+		if (defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
 		{
 			$return['dir'] = realpath(get_home_path().DS.$suffix);
-			$return['restore_script_url']  	= get_site_url();
+			$return['restore_script_url'] = get_site_url();
 			$return['remote_mysql_host'] 	= $wpdb->dbhost;
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
-			$return['remote_mysql_db'] 		= $wpdb->dbname;
+			$return['remote_mysql_db'] = $wpdb->dbname;
 		}
-		else{
+		else {
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -984,17 +984,17 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
+		if (!file_put_contents($tmp_file, "++"))
 			throw new Exception("Could not write to new host");
 		
-		if(!unlink($tmp_file))
+		if (!unlink($tmp_file))
 			throw new Exception("Could not delete temporary file from new host");
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
 
 		$return['max_upload_size'] = min($max_upload, $max_post); // bytes
-		$return['status']		= true;
+		$return['status'] = true;
 		
 		$this->logger->info(sprintf('Current filesystem max upload size is %s bytes', $return['max_upload_size']));
 		
@@ -1010,8 +1010,8 @@ 
      */
     private function return_bytes($val) {
         $numeric_val = (int)trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
+        $last = strtolower($val[strlen($val) - 1]);
+        switch ($last) {
             // The 'G' modifier is available since PHP 5.1.0
             case 'g':
                 $numeric_val *= 1024;
@@ -1032,7 +1032,7 @@ 
      */
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
+		if (stristr($backup_name, "-multipart"))
 			return true;
 		
 		return false;	
@@ -1048,10 +1048,10 @@ 
 	public function get_backup_size($backup_name)
 	{
 		$backup_size = $this->filesystem->getSize($backup_name);
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
+			foreach ($backup_parts as $part_file)
 				$backup_size += $this->filesystem->getSize($part_file);
 		}
 		
@@ -1068,12 +1068,12 @@ 
 	{
 		$files = array();
 		
-		if($this->is_multipart($backup_name))
+		if ($this->is_multipart($backup_name))
 		{
 			$lines = explode(PHP_EOL, $this->filesystem->read($backup_name));
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				if($line)
+				if ($line)
 				{
 					$data = str_getcsv($line);
 					$files[] = $data[0];
@@ -1092,7 +1092,7 @@ 
      * @param string $direction
      * @return bool
      */
-    private function sort_by( &$array, $field, $direction = 'asc')
+    private function sort_by(&$array, $field, $direction = 'asc')
     {
         $direction = strtolower($direction);
 
@@ -1107,18 +1107,18 @@ 
                     return 0;
                 }
 
-                if($direction == 'desc') {
-                    if($a > $b) {
+                if ($direction == 'desc') {
+                    if ($a > $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
-                }else {
-                    if($a < $b) {
+                } else {
+                    if ($a < $b) {
                         return -1;
                     }
-                    else{
+                    else {
                         return 1;
                     }
                 }
@@ -1144,11 +1144,11 @@ 
 		$return['status'] = $status;
 		$return['statusText'] = $response;
 		
-		if(isset($response['error']) && $response['error'])
+		if (isset($response['error']) && $response['error'])
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		}elseif ($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1167,12 +1167,12 @@ 
 	 
 	function do_serialized_fix($query)
 	{
-		$query = str_replace(array("\\n","\\r","\\'"), array("","","\""), ($query));
+		$query = str_replace(array("\\n", "\\r", "\\'"), array("", "", "\""), ($query));
 		
-		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
+		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
+				  if (!isset($m[3]))
 					$m[3] = "";
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
@@ -1199,8 +1199,8 @@ 
      * @return mixed
      */
 	private function unescape_mysql($value) {
-		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z",  "\'", '\"'),
-						   array("\\",   "\0",  "\n",  "\r",  "\x1a", "'", '"'), 
+		return str_replace(array("\\\\", "\\0", "\\n", "\\r", "\Z", "\'", '\"'),
+						   array("\\", "\0", "\n", "\r", "\x1a", "'", '"'), 
 						   $value);
 	}
 
@@ -1212,14 +1212,14 @@ 
      */
 	private function has_serialized($s)
 	{
-		if(
-		    stristr($s, '{' ) != false &&
-		    stristr($s, '}' ) != false &&
-		    stristr($s, ';' ) != false &&
-		    stristr($s, ':' ) != false
-		    ){
+		if (
+		    stristr($s, '{') != false &&
+		    stristr($s, '}') != false &&
+		    stristr($s, ';') != false &&
+		    stristr($s, ':') != false
+		    ) {
 		    return true;
-		}else{
+		} else {
 		    return false;
 		}
 

Braces +116 added lines, -92 removed lines

@@ -45,11 +45,10 @@ 
 {
 	
 	require_once($file);
-}
-elseif(file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif(file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
-}else{	
+} else{	
 	
 	$file = dirname( __FILE__ )  . DS.'vendor'.DS.'autoload.php';
 	
@@ -87,7 +86,7 @@ 
 try{
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch(Exception $e){
+} catch(Exception $e){
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -208,7 +207,7 @@ 
 				$this->logger->debug(sprintf('Starting action %s', $method));
 				return call_user_func(array($this, $method));
 				
-			}else{
+			} else{
 				throw new Exception($method ." does not exists");
 				}
 		}
@@ -228,13 +227,15 @@ 
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
-				$fp = fopen($target_file, "wb+");
-			else
-				$fp = fopen($target_file, "ab+");	
+			if(!$_POST['start']) {
+							$fp = fopen($target_file, "wb+");
+			} else {
+							$fp = fopen($target_file, "ab+");
+			}
 			
-			if(!$fp)
-				throw new Exception("Unable to open $target_file file for writing");
+			if(!$fp) {
+							throw new Exception("Unable to open $target_file file for writing");
+			}
 			
 			fseek($fp, $_POST['start']);
 			
@@ -244,18 +245,20 @@ 
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 				
 				@unlink($_FILES['blob']['tmp_name']);
-			}elseif(isset($_POST['blob'])){
+			} elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
-			}else{
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
+			} else{
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -289,10 +292,11 @@ 
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
-			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
-		else
-			$mysqli->query("SET NAMES utf8;");
+		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file']) {
+					$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
+		} else {
+					$mysqli->query("SET NAMES utf8;");
+		}
 			
 		return $mysqli;	
 	}
@@ -322,8 +326,9 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if(!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		if(!file_exists($mysql_backup_file)) {
+					throw new Exception(sprintf("Mysql backup file %s does not exists",$mysql_backup_file));
+		}
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -355,16 +360,18 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if(substr($line, 0, 1) == "#")
-					continue;
+				if(substr($line, 0, 1) == "#") {
+									continue;
+				}
 				
 				//check if line is empty	
-				if($line == "\n" or trim($line) == "")
-					continue;
+				if($line == "\n" or trim($line) == "") {
+									continue;
+				}
 					
-				if(substr($line, strlen($line)-2, strlen($line)) == ";\n")
-					$query .= $line;
-				else{
+				if(substr($line, strlen($line)-2, strlen($line)) == ";\n") {
+									$query .= $line;
+				} else{
 					$query .= $line;
 					continue;
 				}
@@ -423,7 +430,7 @@ 
 		if(!feof($fp))
 		{
 			$return['finished'] = 0;
-		}else{
+		} else{
 			$this->logger->info(sprintf("Mysql Import Done."));
 		}
 		
@@ -488,7 +495,7 @@ 
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -516,15 +523,16 @@ 
 		{
 			$return['start'] = $data['start'];
 			$return['finished'] = 0;	
-		}else{
+		} else{
 			if($this->is_multipart($source_backup_file))
 			{
 				$return['start'] = 0;
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -665,19 +673,22 @@ 
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if(isset($matches[1]))
-				$table_prefix = $matches[1];
-			else
-				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			if(isset($matches[1])) {
+							$table_prefix = $matches[1];
+			} else {
+							throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			}
+		} else {
+					throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 		}
-		else
-			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
-			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'")) {
+					throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		}
 		
-		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
-			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		if(!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'")) {
+					throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		}
 		
 		return true;
 	}
@@ -715,8 +726,9 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if(!file_put_contents($wp_config, $content))
-			throw new Exception("Could not write updated config data to ".$wp_config);
+		if(!file_put_contents($wp_config, $content)) {
+					throw new Exception("Could not write updated config data to ".$wp_config);
+		}
 		
 		chmod($wp_config, $file_perms);
 		
@@ -761,10 +773,11 @@ 
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
 							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i",$file['timestamp']);
 							
-							if($hash and $hash == $matches[1])
-								$mysqldump_list[$file['path']]['selected'] = "selected";
-							else
-								$mysqldump_list[$file['path']]['selected'] = "";	
+							if($hash and $hash == $matches[1]) {
+															$mysqldump_list[$file['path']]['selected'] = "selected";
+							} else {
+															$mysqldump_list[$file['path']]['selected'] = "";
+							}
 						}
 					}
 				}
@@ -785,13 +798,15 @@ 
      */
 	private function get_hash_from_backup($backup_file)
 	{
-		if(!$backup_file)
-			return false;
+		if(!$backup_file) {
+					return false;
+		}
 			
 		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file)-10, strlen($backup_file)), $matches)	;
 		
-		if($result and isset($matches[1]))
-			return ($matches[1]);
+		if($result and isset($matches[1])) {
+					return ($matches[1]);
+		}
 		
 		return false;
 	}
@@ -816,10 +831,11 @@ 
 			if(isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach($lines as $line)
-					if($line)
+				foreach($lines as $line) {
+									if($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if(is_array($data)){
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -829,20 +845,22 @@ 
 						
 			}
 			
-			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		$new_list = array();
 		
 		foreach($backup_files as $key=>$file_info)
 		{
-			if(isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else{
+			if(isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			} else{
 				
-				if($local_backup_file and ($file_info['basename'] == $local_backup_file))
-					$file_info['selected'] = 'selected';
+				if($local_backup_file and ($file_info['basename'] == $local_backup_file)) {
+									$file_info['selected'] = 'selected';
+				}
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
 					
@@ -889,8 +907,9 @@ 
 		$backup_archive = new Tar();
 		if($this->is_multipart($backup_file))
 		{
-			if(!$return['part'])
-				$return['processed'] += $this->filesystem->getSize($backup_file);
+			if(!$return['part']) {
+							$return['processed'] += $this->filesystem->getSize($backup_file);
+			}
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];	
@@ -910,12 +929,13 @@ 
 			}
 		}
 		
-		if(isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if(isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
-		}else{
+		} else{
 			
 			$return['processed'] += $start;
 			
@@ -925,14 +945,16 @@ 
 				
 				++$return['part'];
 			
-				if($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}
 		
-		if($return['finished'])
-			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		if($return['finished']) {
+					$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		}
 		
 		$return['backup_file'] = $backup_file;
 		
@@ -964,8 +986,7 @@ 
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
 			$return['remote_mysql_db'] 		= $wpdb->dbname;
-		}
-		else{
+		} else{
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -984,11 +1005,13 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if(!file_put_contents($tmp_file, "++"))
-			throw new Exception("Could not write to new host");
+		if(!file_put_contents($tmp_file, "++")) {
+					throw new Exception("Could not write to new host");
+		}
 		
-		if(!unlink($tmp_file))
-			throw new Exception("Could not delete temporary file from new host");
+		if(!unlink($tmp_file)) {
+					throw new Exception("Could not delete temporary file from new host");
+		}
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
@@ -1032,8 +1055,9 @@ 
      */
 	public function is_multipart($backup_name)
 	{
-		if(stristr($backup_name, "-multipart"))
-			return true;
+		if(stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -1051,8 +1075,9 @@ 
 		if($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach($backup_parts as $part_file)
-				$backup_size += $this->filesystem->getSize($part_file);
+			foreach($backup_parts as $part_file) {
+							$backup_size += $this->filesystem->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -1110,15 +1135,13 @@ 
                 if($direction == 'desc') {
                     if($a > $b) {
                         return -1;
-                    }
-                    else{
+                    } else{
                         return 1;
                     }
-                }else {
+                } else {
                     if($a < $b) {
                         return -1;
-                    }
-                    else{
+                    } else{
                         return 1;
                     }
                 }
@@ -1148,7 +1171,7 @@ 
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif($status != 200 and $status != 418)
+		} elseif($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1172,8 +1195,9 @@ 
 		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function ($m) {
 				  $data = "";
 				  	
-				  if(!isset($m[3]))
-					$m[3] = "";
+				  if(!isset($m[3])) {
+				  					$m[3] = "";
+				  }
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
 	              //return $this->unescape_quotes($data);
@@ -1219,7 +1243,7 @@ 
 		    stristr($s, ':' ) != false
 		    ){
 		    return true;
-		}else{
+		} else{
 		    return false;
 		}
 

admin/partials/xcloner_init_page.php

Spacing +64 added lines, -64 removed lines

@@ -20,12 +20,12 @@ 
 
 $logger_content = $logger->getLastDebugLines();
 
-$date_format = get_option( 'date_format' );
-$time_format = get_option( 'time_format' );
+$date_format = get_option('date_format');
+$time_format = get_option('time_format');
 
 //$xcloner_file_system->cleanup_tmp_directories();
 
-if ( $requirements->check_backup_ready_status() ) {
+if ($requirements->check_backup_ready_status()) {
 	$latest_backup = $xcloner_file_system->get_latest_backup();
 	$xcloner_file_system->backup_storage_cleanup();
 }
@@ -34,15 +34,15 @@ 
 <div class="row">
     <div class="col s12">
         <h5 class="left-align">
-			<?php echo __( 'Backup Dashboard', 'xcloner-backup-and-restore' ) ?>
+			<?php echo __('Backup Dashboard', 'xcloner-backup-and-restore') ?>
         </h5>
     </div>
 </div>
 
-<?php if ( isset( $latest_backup['timestamp'] ) and $latest_backup['timestamp'] < strtotime( "-1 day" ) ): ?>
+<?php if (isset($latest_backup['timestamp']) and $latest_backup['timestamp'] < strtotime("-1 day")): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('Your latest backup is older than 24 hours, please create a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -50,10 +50,10 @@ 
     </div>
 <?php endif ?>
 
-<?php if ( ! isset( $latest_backup['timestamp'] ) ): ?>
+<?php if (!isset($latest_backup['timestamp'])): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('You have no backup that I could find, please generate a new backup to keep your site protected.', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -61,10 +61,10 @@ 
     </div>
 <?php endif ?>
 
-<?php if ( ! $requirements->check_backup_ready_status() ): ?>
+<?php if (!$requirements->check_backup_ready_status()): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo __( 'Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore' ) ?>
+				<?php echo __('Backup system not ready, please check and fix the issues marked in red', 'xcloner-backup-and-restore') ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -87,74 +87,74 @@ 
                     <div class="collapsible-body">
                         <div class="" id="backup-status">
                             <div class="row">
-                                <h5><?php echo __( "Latest Backup", 'xcloner-backup-and-restore' ) ?></h5>
+                                <h5><?php echo __("Latest Backup", 'xcloner-backup-and-restore') ?></h5>
                                 <blockquote>
-									<?php if ( isset($latest_backup) ): ?>
+									<?php if (isset($latest_backup)): ?>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Backup Name", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Backup Name", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
 											<?php echo $latest_backup['basename'] ?>
                                         </div>
                                         <div class="item">
                                             <div class="title">
-												<?php echo __( "Backup Size", 'xcloner-backup-and-restore' ) ?>:
+												<?php echo __("Backup Size", 'xcloner-backup-and-restore') ?>:
                                             </div>
-											<?php echo size_format( $latest_backup['size'] ) ?>
+											<?php echo size_format($latest_backup['size']) ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Backup Date", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Backup Date", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
 											<?php
-											echo date( $date_format . " " . $time_format, $latest_backup['timestamp'] + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+											echo date($date_format." ".$time_format, $latest_backup['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 											?>
                                         </div>
 									<?php else: ?>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "No Backup Yet", 'xcloner-backup-and-restore' ) ?></div>
+                                            <div class="title"><?php echo __("No Backup Yet", 'xcloner-backup-and-restore') ?></div>
                                         </div>
 									<?php endif ?>
                                 </blockquote>
                                 <div>
-                                    <h5><?php echo __( "Backup Storage Usage", 'xcloner-backup-and-restore' ) ?></h5>
+                                    <h5><?php echo __("Backup Storage Usage", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Total Size", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Total Size", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php echo size_format( $xcloner_file_system->get_storage_usage() ); ?>
+											<?php echo size_format($xcloner_file_system->get_storage_usage()); ?>
                                         </div>
                                     </blockquote>
-                                    <h5><?php echo __( "Next Scheduled Backup", 'xcloner-backup-and-restore' ) ?></h5>
+                                    <h5><?php echo __("Next Scheduled Backup", 'xcloner-backup-and-restore') ?></h5>
                                     <blockquote>
                                         <div class="item">
 											<?php
-											$list = ( $xcloner_scheduler->get_next_run_schedule() );
+											$list = ($xcloner_scheduler->get_next_run_schedule());
 
-											if ( is_array( $list ) ) {
-												$xcloner_file_system->sort_by( $list, "next_run_time", "asc" );
+											if (is_array($list)) {
+												$xcloner_file_system->sort_by($list, "next_run_time", "asc");
 											}
 
-											if ( isset( $list[0] ) ) {
+											if (isset($list[0])) {
 												$latest_schedule = $list[0];
 											}
 											?>
-											<?php if ( isset( $latest_schedule->name ) ): ?>
-                                                <div class="title"><?php echo __( "Schedule Name", 'xcloner-backup-and-restore' ) ?>
+											<?php if (isset($latest_schedule->name)): ?>
+                                                <div class="title"><?php echo __("Schedule Name", 'xcloner-backup-and-restore') ?>
                                                     :
                                                 </div>
 												<?php echo $latest_schedule->name; ?>
 											<?php endif; ?>
                                         </div>
                                         <div class="item">
-                                            <div class="title"><?php echo __( "Next Call", 'xcloner-backup-and-restore' ) ?>
+                                            <div class="title"><?php echo __("Next Call", 'xcloner-backup-and-restore') ?>
                                                 :
                                             </div>
-											<?php if ( isset( $latest_schedule->next_run_time ) ) {
-												echo date( $date_format . " " . $time_format, $latest_schedule->next_run_time );
+											<?php if (isset($latest_schedule->next_run_time)) {
+												echo date($date_format." ".$time_format, $latest_schedule->next_run_time);
 											} else {
-												echo __( "Unscheduled", 'xcloner-backup-and-restore' );
+												echo __("Unscheduled", 'xcloner-backup-and-restore');
 											}
 											?>
                                         </div>
@@ -163,20 +163,20 @@ 
                             </div>
                 </li>
 
-				<?php if ( $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) : ?>
+				<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) : ?>
                     <li class="active">
                         <div class="collapsible-header active">
-                            <i class="material-icons">bug_report</i><?php echo __( 'XCloner Debugger', 'xcloner-backup-and-restore' ) ?>
+                            <i class="material-icons">bug_report</i><?php echo __('XCloner Debugger', 'xcloner-backup-and-restore') ?>
                             <div class="right">
-                                <a href="#<?php echo $logger_basename = basename( $logger->get_main_logger_url() ) ?>"
+                                <a href="#<?php echo $logger_basename = basename($logger->get_main_logger_url()) ?>"
                                    class="download-logger" title="<?php echo $logger_basename ?>">
                                     <span class="shorten_string"><?php echo $logger_basename ?>&nbsp;&nbsp;&nbsp;</span>
                                 </a>
                             </div>
                         </div>
                         <div class="collapsible-body">
-                            <div class="console" id="xcloner-console"><?php if ( $logger_content ) {
-									echo implode( "<br />\n", array_reverse( $logger_content ) );
+                            <div class="console" id="xcloner-console"><?php if ($logger_content) {
+									echo implode("<br />\n", array_reverse($logger_content));
 								} ?></div>
                         </div>
                     </li>
@@ -201,71 +201,71 @@ 
 
         <div class="card blue-grey darken-1 z-depth-4 backup-ready">
             <div class="card-content white-text">
-                <span class="card-title"><?php echo __( "System Check", 'xcloner-backup-and-restore' ) ?></span>
+                <span class="card-title"><?php echo __("System Check", 'xcloner-backup-and-restore') ?></span>
                 <ul>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_start_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Backup Start Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_start_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Backup Start Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string "><?php echo $requirements->check_xcloner_start_path(); ?></span>
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_store_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Backup Storage Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_store_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Backup Storage Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string"><?php echo $requirements->check_xcloner_store_path(); ?></span>
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_xcloner_tmp_path( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'Temporary Location', 'xcloner-backup-and-restore' ) ?>: <span
+                    <li class="card-panel <?php echo($requirements->check_xcloner_tmp_path(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('Temporary Location', 'xcloner-backup-and-restore') ?>: <span
                                 class="shorten_string"><?php echo $requirements->check_xcloner_tmp_path(); ?></span>
                     </li>
 
-                    <li class="card-panel <?php echo( $requirements->check_min_php_version( 1 ) ? "teal" : "red" ) ?> lighten-2">
-						<?php echo __( 'PHP Version Check', 'xcloner-backup-and-restore' ) ?>
+                    <li class="card-panel <?php echo($requirements->check_min_php_version(1) ? "teal" : "red") ?> lighten-2">
+						<?php echo __('PHP Version Check', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->check_min_php_version(); ?>
-                        ( >= <?php echo $requirements->get_constant( 'min_php_version' ) ?>)
+                        ( >= <?php echo $requirements->get_constant('min_php_version') ?>)
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_safe_mode( 1 ) ? "teal" : "orange" ) ?> lighten-2">
-						<?php echo __( 'PHP Safe Mode', 'xcloner-backup-and-restore' ) ?>
+                    <li class="card-panel <?php echo($requirements->check_safe_mode(1) ? "teal" : "orange") ?> lighten-2">
+						<?php echo __('PHP Safe Mode', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->check_safe_mode(); ?>
-                        ( <?php echo $requirements->get_constant( 'safe_mode' ) ?>)
+                        ( <?php echo $requirements->get_constant('safe_mode') ?>)
                     </li>
-                    <li class="card-panel <?php echo( $requirements->check_backup_ready_status() ? "teal" : "red" ) ?> lighten-2">
-						<?php echo( $requirements->check_backup_ready_status() ? __( 'BACKUP READY', 'xcloner-backup-and-restore' ) : __( 'Backup not ready, please check above requirements', 'xcloner-backup-and-restore' ) ) ?>
-                        <i class="material-icons right tiny"><?php echo( $requirements->check_backup_ready_status() ? 'thumb_up' : 'thumb_down' ) ?></i>
+                    <li class="card-panel <?php echo($requirements->check_backup_ready_status() ? "teal" : "red") ?> lighten-2">
+						<?php echo($requirements->check_backup_ready_status() ? __('BACKUP READY', 'xcloner-backup-and-restore') : __('Backup not ready, please check above requirements', 'xcloner-backup-and-restore')) ?>
+                        <i class="material-icons right tiny"><?php echo($requirements->check_backup_ready_status() ? 'thumb_up' : 'thumb_down') ?></i>
                     </li>
                 </ul>
                 <ul class="additional_system_info">
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP max_execution_time', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP max_execution_time', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_max_execution_time(); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP memory_limit', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP memory_limit', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_memory_limit(); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'PHP open_basedir', 'xcloner-backup-and-restore' ) ?>
+						<?php echo __('PHP open_basedir', 'xcloner-backup-and-restore') ?>
                         : <?php echo $requirements->get_open_basedir(); ?>
                     </li>
 					<?php
 					$data = array();
-					if ( $requirements->check_backup_ready_status() ) {
+					if ($requirements->check_backup_ready_status()) {
 						$data = $xcloner_file_system->estimate_read_write_time();
 					}
 					?>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Reading Time 1MB Block', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo( isset( $data['reading_time'] ) ? $data['reading_time'] : __( "unknown" ) ); ?>
+						<?php echo __('Reading Time 1MB Block', 'xcloner-backup-and-restore') ?>
+                        : <?php echo(isset($data['reading_time']) ? $data['reading_time'] : __("unknown")); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Writing Time 1MB Block', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo( isset( $data['writing_time'] ) ? $data['writing_time'] : __( "unknown" ) ); ?>
+						<?php echo __('Writing Time 1MB Block', 'xcloner-backup-and-restore') ?>
+                        : <?php echo(isset($data['writing_time']) ? $data['writing_time'] : __("unknown")); ?>
                     </li>
                     <li class="card-panel grey darken-1">
-						<?php echo __( 'Free Disk Space', 'xcloner-backup-and-restore' ) ?>
-                        : <?php echo $requirements->get_free_disk_space();; ?>
+						<?php echo __('Free Disk Space', 'xcloner-backup-and-restore') ?>
+                        : <?php echo $requirements->get_free_disk_space(); ; ?>
                     </li>
                 </ul>
             </div>
             <div class="card-action">
-                <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __( 'Toggle Additional System Info', 'xcloner-backup-and-restore' ) ?>
+                <a class="waves-effect waves-light btn system_info_toggle blue darken-1"><i class="material-icons left">list</i><?php echo __('Toggle Additional System Info', 'xcloner-backup-and-restore') ?>
                 </a>
             </div>
         </div>

admin/partials/xcloner_scheduled_backups_page.php

Spacing +44 added lines, -44 removed lines

@@ -4,10 +4,10 @@ 
 $xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 $available_storages     = $xcloner_remote_storage->get_available_storages();
 ?>
-<?php if ( ! defined( "DISABLE_WP_CRON" ) || ! DISABLE_WP_CRON ): ?>
+<?php if (!defined("DISABLE_WP_CRON") || !DISABLE_WP_CRON): ?>
     <div id="setting-error-" class="error settings-error notice is-dismissible">
         <p><strong>
-				<?php echo sprintf( __( 'We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore' ), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress" ) ?>
+				<?php echo sprintf(__('We have noticed that DISABLE_WP_CRON is disabled, we recommend enabling that and setting up wp-cron.php to run manually through your hosting account scheduler as explained <a href="%s" target="_blank">here</a>', 'xcloner-backup-and-restore'), "http://www.inmotionhosting.com/support/website/wordpress/disabling-the-wp-cronphp-in-wordpress") ?>
             </strong>
         </p>
         <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
@@ -15,32 +15,32 @@ 
     </div>
 <?php endif ?>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <div class="row">
     <table id="scheduled_backups" class="col s12" cellspacing="0" width="100%">
         <thead>
         <tr class="grey lighten-2">
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="no-sort"><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th class="no-sort"><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </thead>
         <tfoot>
         <tr>
-            <th><?php echo __( 'ID', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Recurrence', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Next Execution', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Remote Storage', 'xcloner-backup-and-restore' ) ?></th>
-            <th class="hide-on-med-and-down"><?php echo __( 'Last Backup', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Status', 'xcloner-backup-and-restore' ) ?></th>
-            <th><?php echo __( 'Action', 'xcloner-backup-and-restore' ) ?></th>
+            <th><?php echo __('ID', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Recurrence', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Next Execution', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Remote Storage', 'xcloner-backup-and-restore') ?></th>
+            <th class="hide-on-med-and-down"><?php echo __('Last Backup', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Status', 'xcloner-backup-and-restore') ?></th>
+            <th><?php echo __('Action', 'xcloner-backup-and-restore') ?></th>
         </tr>
         </tfoot>
         <tbody>
@@ -50,8 +50,8 @@ 
 
 <div class="row">
     <div class="col s12 m6 offset-m6 teal lighten-1" id="server_time">
-        <h2><?php echo __( 'Current Server Time', 'xcloner-backup-and-restore' ) ?>: <span
-                    class="right"><?php echo current_time( 'mysql' ); ?></span></h2>
+        <h2><?php echo __('Current Server Time', 'xcloner-backup-and-restore') ?>: <span
+                    class="right"><?php echo current_time('mysql'); ?></span></h2>
     </div>
 </div>
 
@@ -65,17 +65,17 @@ 
 
             <div class="row">
                 <div class="col s12 m6">
-                    <h4><?php echo __( 'Edit Schedule', 'xcloner-backup-and-restore' ) ?> #<span
+                    <h4><?php echo __('Edit Schedule', 'xcloner-backup-and-restore') ?> #<span
                                 id="schedule_id"></span></h4>
                 </div>
 
                 <div class="col s12 m6 right-align">
                     <div class="switch">
                         <label>
-							<?php echo __( 'Off', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('Off', 'xcloner-backup-and-restore') ?>
                             <input type="checkbox" id="status" name="status" value="1">
                             <span class="lever"></span>
-							<?php echo __( 'On', 'xcloner-backup-and-restore' ) ?>
+							<?php echo __('On', 'xcloner-backup-and-restore') ?>
                         </label>
                     </div>
                 </div>
@@ -85,10 +85,10 @@ 
 
             <ul class="nav-tab-wrapper content row">
                 <li><a href="#scheduler_settings"
-                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __( 'Scheduler Settings', 'xcloner-backup-and-restore' ) ?></a>
+                       class="nav-tab col s12 m6 nav-tab-active"><?php echo __('Scheduler Settings', 'xcloner-backup-and-restore') ?></a>
                 </li>
                 <li><a href="#advanced_scheduler_settings"
-                       class="nav-tab col s12 m6"><?php echo __( 'Advanced', 'xcloner-backup-and-restore' ) ?></a></li>
+                       class="nav-tab col s12 m6"><?php echo __('Advanced', 'xcloner-backup-and-restore') ?></a></li>
             </ul>
 
             <div class="nav-tab-wrapper-content">
@@ -97,7 +97,7 @@ 
                     <div class="row">
                         <div class="input-field col s12 l6">
                             <input placeholder="" name="schedule_name" id="schedule_name" type="text" required value="">
-                            <label for="schedule_name"><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="schedule_name"><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></label>
                         </div>
                         <div class="input-field col s12 l6">
                             <div class="switch">
@@ -112,11 +112,11 @@ 
                         </div>
                         <!--<div class="input-field inline col s12 l6">
 						<select id="backup_type" class="" name="backup_type" id="backup_type">
-							<option value=""><?php echo __( "Full Backup", "xcloner-backup-and-restore" ); ?></option>
-							<option value="diff"><?php echo __( "Differential Backups", "xcloner-backup-and-restore" ); ?></option>
-							<option value="full_diff"><?php echo __( "Full Backup + Differential Backups", "xcloner-backup-and-restore" ); ?></option>
+							<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+							<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+							<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 						</select>
-						<label for="backup_type"><?php echo __( 'Scheduled Backup Type', 'xcloner-backup-and-restore' ) ?></label>
+						<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore') ?></label>
 					</div>-->
                     </div>
 
@@ -125,18 +125,18 @@ 
                             <input placeholder="" name="schedule_start_date" id="schedule_start_date" type="datetime"
                                    value="">
                             <label for="schedule_start_date"
-                                   class="active"><?php echo __( 'Schedule Start At', 'xcloner-backup-and-restore' ) ?>
+                                   class="active"><?php echo __('Schedule Start At', 'xcloner-backup-and-restore') ?>
                                 :</label>
                         </div>
 
                         <div class="input-field col s12 l6">
                             <select name="schedule_frequency" id="schedule_frequency" class="validate" required>
                                 <option value="" disabled
-                                        selected><?php echo __( 'Schedule Recurrence', 'xcloner-backup-and-restore' ) ?></option>
+                                        selected><?php echo __('Schedule Recurrence', 'xcloner-backup-and-restore') ?></option>
 								<?php
 								$schedules = $xcloner_scheduler->get_available_intervals();
 
-								foreach ( $schedules as $key => $schedule ) {
+								foreach ($schedules as $key => $schedule) {
 									?>
                                     <option value="<?php echo $key ?>"><?php echo $schedule['display'] ?></option>
 									<?php
@@ -146,17 +146,17 @@ 
                         </div>
                     </div>
 
-					<?php if ( sizeof( $available_storages ) ): ?>
+					<?php if (sizeof($available_storages)): ?>
                         <div class="row">
                             <div class="input-field col s12 l12">
                                 <select name="schedule_storage" id="schedule_storage" class="validate">
                                     <option value=""
-                                            selected><?php echo __( 'none', 'xcloner-backup-and-restore' ) ?></option>
-									<?php foreach ( $available_storages as $storage => $text ): ?>
+                                            selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
+									<?php foreach ($available_storages as $storage => $text): ?>
                                         <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 									<?php endforeach ?>
                                 </select>
-                                <label><?php echo __( 'Send To Remote Storage ', 'xcloner-backup-and-restore' ) ?></label>
+                                <label><?php echo __('Send To Remote Storage ', 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 					<?php endif ?>
@@ -165,7 +165,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="email_notification" id="email_notification" type="text"
                                    value="">
-                            <label for="email_notification"><?php echo __( 'Email Notification Address', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="email_notification"><?php echo __('Email Notification Address', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -173,7 +173,7 @@ 
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="diff_start_date" id="diff_start_date" type="text"
                                    class="datepicker_max_today" value="">
-                            <label for="diff_start_date"><?php echo __( 'Backup Only Files Modified/Created After', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="diff_start_date"><?php echo __('Backup Only Files Modified/Created After', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
                 </div>
@@ -182,7 +182,7 @@ 
                     <div class="row">
                         <div class="input-field col s12 l12">
                             <input placeholder="" name="backup_name" id="backup_name" type="text" required value="">
-                            <label for="backup_name"><?php echo __( 'Backup Name', 'xcloner-backup-and-restore' ) ?></label>
+                            <label for="backup_name"><?php echo __('Backup Name', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -191,7 +191,7 @@ 
                             <textarea id="table_params" name="table_params" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="table_params"
-                                   class="active"><?php echo __( 'Included Database Data', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Included Database Data', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
 
@@ -200,7 +200,7 @@ 
                             <textarea id="excluded_files" name="excluded_files" class="materialize-textarea"
                                       rows="15"></textarea>
                             <label for="excluded_files"
-                                   class="active"><?php echo __( 'Excluded Files', 'xcloner-backup-and-restore' ) ?></label>
+                                   class="active"><?php echo __('Excluded Files', 'xcloner-backup-and-restore') ?></label>
                         </div>
                     </div>
                 </div>
@@ -210,7 +210,7 @@ 
 
                 <div class="input-field col s12 ">
                     <button class="right btn waves-effect waves-light" type="submit"
-                            name="action"><?php echo __( 'Save', 'xcloner-backup-and-restore' ) ?>
+                            name="action"><?php echo __('Save', 'xcloner-backup-and-restore') ?>
                         <i class="material-icons right">send</i>
                     </button>
                 </div>

admin/partials/xcloner_manage_backups_page.php

Indentation +4 added lines, -4 removed lines

@@ -7,7 +7,7 @@ 
 $storage_selection = "";
 
 if (isset($_GET['storage_selection']) and $_GET['storage_selection']) {
-    $storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
+	$storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
 }
 
 //$backup_list = $xcloner_file_system->get_backup_archives_list($storage_selection);
@@ -38,7 +38,7 @@ 
 
             <?php foreach ($available_storages as $storage => $text): ?>
                 <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)
-                    echo "selected" ?>><?php echo $text ?></option>
+					echo "selected" ?>><?php echo $text ?></option>
             <?php endforeach ?>
         </select>
         <?php endif ?>
@@ -65,7 +65,7 @@ 
 
 
         <?php
-        /*$i = 0;
+		/*$i = 0;
         foreach ($backup_list as $file_info):?>
             <?php
             if ($storage_selection == "gdrive") {
@@ -302,7 +302,7 @@ 
                 <div class="row">
                     <div class="col s12 label">
                         <label><?php echo sprintf(__('Send %s to remote storage', 'xcloner-backup-and-restore'),
-                                "<span class='backup_name'></span>") ?></label>
+								"<span class='backup_name'></span>") ?></label>
                     </div>
                     <div class="input-field col s8 m10">
                         <select name="transfer_storage" id="transfer_storage" class="validate" required>

Spacing +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
                     <input type="text"
                            name="decryption_key"
                            id="decryption_key"
-                           placeholder="<?=__('Decryption Key', 'xcloner-backup-and-restore' )?>" />
+                           placeholder="<?=__('Decryption Key', 'xcloner-backup-and-restore')?>" />
                 </p>
                 <p class="center-align">
                     <a class="waves-effect waves-light btn"><?php echo __("START DECRYPTION", 'xcloner-backup-and-restore') ?></a>

Braces +5 added lines, -2 removed lines

@@ -31,10 +31,13 @@
             <?php if ($storage_selection): ?>
                 <option value=""
                         selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php else: ?>
+            <?php else {
+	: ?>
                 <option value=""
                         selected><?php echo __('Change To Remote Storage...', 'xcloner-backup-and-restore') ?></option>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <?php foreach ($available_storages as $storage => $text): ?>
                 <option value="<?php echo $storage ?>"<?php if ($storage == $storage_selection)

admin/partials/xcloner_generate_backups_page.php

Spacing +70 added lines, -70 removed lines

@@ -8,25 +8,25 @@ 
 
 <script>var xcloner_backup = new Xcloner_Backup();</script>
 
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <ul class="nav-tab-wrapper content row">
     <li><a href="#backup_options"
-           class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab . ". " . __( 'Backup Options', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 nav-tab-active"><?php echo $tab.". ".__('Backup Options', 'xcloner-backup-and-restore') ?></a>
     </li>
-	<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+	<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
         <li><a href="#database_options"
-               class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Database Options', 'xcloner-backup-and-restore' ) ?></a>
+               class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Database Options', 'xcloner-backup-and-restore') ?></a>
         </li>
 	<?php endif ?>
     <li><a href="#files_options"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Files Options', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Files Options', 'xcloner-backup-and-restore') ?></a>
     </li>
     <li><a href="#generate_backup"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Generate Backup', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Generate Backup', 'xcloner-backup-and-restore') ?></a>
     </li>
     <li><a href="#schedule_backup"
-           class="nav-tab col s12 m3 l2 "><?php echo ++ $tab . ". " . __( 'Schedule Backup', 'xcloner-backup-and-restore' ) ?></a>
+           class="nav-tab col s12 m3 l2 "><?php echo ++$tab.". ".__('Schedule Backup', 'xcloner-backup-and-restore') ?></a>
     </li>
 </ul>
 
@@ -39,11 +39,11 @@ 
                     <i class="material-icons prefix">input</i>
                     <input name="backup_name" id="backup_name" type="text"
                            value=<?php echo $xcloner_settings->get_default_backup_name() ?>>
-                    <label for="backup_name"><?php echo __( 'Backup Name', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_name"><?php echo __('Backup Name', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'The default backup name, supported tags [time], [hostname], [domain]', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('The default backup name, supported tags [time], [hostname], [domain]', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -52,12 +52,12 @@ 
                 <div class="input-field inline col s12 m10 l6">
                     <i class="material-icons prefix">email</i>
                     <input name="email_notification" id="email_notification" type="text"
-                           value="<?php echo get_option( 'admin_email' ); ?>">
-                    <label for="email_notification"><?php echo __( 'Send Email Notification To', 'xcloner-backup-and-restore' ) ?></label>
+                           value="<?php echo get_option('admin_email'); ?>">
+                    <label for="email_notification"><?php echo __('Send Email Notification To', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'If left blank, no notification will be sent', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('If left blank, no notification will be sent', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -67,11 +67,11 @@ 
                     <i class="material-icons prefix">access_time</i>
                     <input type="datetime-local" id="diff_start_date" class="datepicker_max_today"
                            name="diff_start_date">
-                    <label for="diff_start_date"><?php echo __( 'Backup Only Files Modified/Created After', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="diff_start_date"><?php echo __('Backup Only Files Modified/Created After', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-html="true" data-position="center" data-delay="50"
-                       data-tooltip="<?php echo __( "This option allows you to create a differential backup that will include only <br> changed files since the set date, leave blank to include all files", "xcloner-backup-and-restore" ) ?>"><i
+                       data-tooltip="<?php echo __("This option allows you to create a differential backup that will include only <br> changed files since the set date, leave blank to include all files", "xcloner-backup-and-restore") ?>"><i
                                 class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -79,7 +79,7 @@ 
             <div class="row">
                 <div class="input-field col s6 m5 l4">
                     <i class="material-icons prefix">enhanced_encryption</i>
-                    <label for="backup_comments"><?php echo __( 'Encrypt Backup', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_comments"><?php echo __('Encrypt Backup', 'xcloner-backup-and-restore') ?></label>
 
                 </div>
                 <div class="input-field col s6 m5 l2">
@@ -95,7 +95,7 @@ 
 
                 <div class="hide-on-small-only s12 m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Enable this option if you want to encrypt the final backup', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('Enable this option if you want to encrypt the final backup', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -104,11 +104,11 @@ 
                 <div class="input-field col s12 m10 l6">
                     <i class="material-icons prefix">input</i>
                     <textarea name="backup_comments" id="backup_comments" class="materialize-textarea"></textarea>
-                    <label for="backup_comments"><?php echo __( 'Backup Comments', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="backup_comments"><?php echo __('Backup Comments', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="hide-on-small-only m2">
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Some default backup comments that will be stored inside the backup archive', 'xcloner-backup-and-restore' ) ?>"
+                       data-tooltip="<?php echo __('Some default backup comments that will be stored inside the backup archive', 'xcloner-backup-and-restore') ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </div>
             </div>
@@ -121,11 +121,11 @@ 
             </div>
         </div>
 
-		<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+		<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
             <div id="database_options" class="tab-content">
-                <h2><?php echo __( 'Select database data to include in the backup', 'xcloner-backup-and-restore' ) ?>:
+                <h2><?php echo __('Select database data to include in the backup', 'xcloner-backup-and-restore') ?>:
                     <a class="btn-floating tooltipped btn-small" data-position="right" data-delay="50"
-                       data-tooltip="<?php echo __( 'Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install', 'xcloner-backup-and-restore' ); ?>"
+                       data-tooltip="<?php echo __('Enable the \'Backup only WP tables\' setting if you don\'t want to show all other databases and tables not related to this Wordpress install', 'xcloner-backup-and-restore'); ?>"
                        data-tooltip-id=""><i class="material-icons">help_outline</i></a>
                 </h2>
 
@@ -147,10 +147,10 @@ 
 		<?php endif ?>
 
         <div id="files_options" class="tab-content">
-            <h2><?php echo __( 'Select from below the files/folders you want to exclude from your Backup Archive', 'xcloner-backup-and-restore' ) ?>
+            <h2><?php echo __('Select from below the files/folders you want to exclude from your Backup Archive', 'xcloner-backup-and-restore') ?>
                 :
                 <a class="btn-floating tooltipped btn-small" data-position="bottom" data-delay="50" data-html="true"
-                   data-tooltip="<?php echo __( 'You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked', 'xcloner-backup-and-restore' ); ?>"
+                   data-tooltip="<?php echo __('You can navigate below through all your site structure(Backup Start Location) to exclude any file/folder you need by clicking the checkbox near it. <br />If the checkobx is disabled, then it matches a Regex Exclude File option and it can\'t be unchecked', 'xcloner-backup-and-restore'); ?>"
                    data-tooltip-id=""><i class="material-icons">help_outline</i></a>
             </h2>
 
@@ -185,9 +185,9 @@ 
                     <ul class="backup-status collapsible" data-collapsible="accordion">
                         <li class="file-system">
                             <div class="collapsible-header">
-                                <i class="material-icons">folder</i><?php echo __( 'Scanning The File System...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">folder</i><?php echo __('Scanning The File System...', 'xcloner-backup-and-restore') ?>
 
-                                <p class="right"><?php echo sprintf( __( 'Found %s files (%s)', 'xcloner-backup-and-restore' ), '<span class="file-counter">0</span>', '<span  class="file-size-total">0</span>MB' ) ?></p>
+                                <p class="right"><?php echo sprintf(__('Found %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  class="file-size-total">0</span>MB') ?></p>
 
                                 <div>
                                     <p class="right"><span class="last-logged-file"></span></p>
@@ -199,12 +199,12 @@ 
                             </div>
                             <div class="collapsible-body status-body"></div>
                         </li>
-						<?php if ( $xcloner_settings->get_enable_mysql_backup() ): ?>
+						<?php if ($xcloner_settings->get_enable_mysql_backup()): ?>
                             <li class="database-backup">
                                 <div class="collapsible-header">
-                                    <i class="material-icons">storage</i><?php echo __( 'Generating the Mysql Backup...', 'xcloner-backup-and-restore' ) ?>
+                                    <i class="material-icons">storage</i><?php echo __('Generating the Mysql Backup...', 'xcloner-backup-and-restore') ?>
 
-                                    <p class="right"><?php echo sprintf( __( 'Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore' ), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records', 'xcloner-backup-and-restore' ) ?></p>
+                                    <p class="right"><?php echo sprintf(__('Found %s tables in %s databases (%s)', 'xcloner-backup-and-restore'), '<span class="table-counter">0</span>', '<span class="database-counter">0</span>', '<span data-processed="0" class="total-records">0</span> records', 'xcloner-backup-and-restore') ?></p>
 
                                     <div>
                                         <p class="right"><span class="last-logged-table"></span></p>
@@ -228,9 +228,9 @@ 
 						<?php endif ?>
                         <li class="files-backup">
                             <div class="collapsible-header">
-                                <i class="material-icons">archive</i><?php echo __( 'Adding Files to Archive...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">archive</i><?php echo __('Adding Files to Archive...', 'xcloner-backup-and-restore') ?>
 
-                                <p class="right"><?php echo sprintf( __( 'Adding %s files (%s)', 'xcloner-backup-and-restore' ), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB' ) ?></p>
+                                <p class="right"><?php echo sprintf(__('Adding %s files (%s)', 'xcloner-backup-and-restore'), '<span class="file-counter">0</span>', '<span  data-processed="0" class="file-size-total">0</span>MB') ?></p>
 
                                 <div>
                                     <p class="right"><span class="last-logged-file"></span></p>
@@ -243,7 +243,7 @@ 
                             <div class="collapsible-body status-body">
                                 <div class="row">
                                     <div class="col l3 s12">
-                                        <h2><?php echo __( "Backup Parts", 'xcloner-backup-and-restore' ) ?>: </h2>
+                                        <h2><?php echo __("Backup Parts", 'xcloner-backup-and-restore') ?>: </h2>
                                     </div>
                                     <div class="col l9 s12">
                                         <ul class="backup-name"></ul>
@@ -253,7 +253,7 @@ 
                         </li>
                         <li class="backup-encryption">
                             <div class="collapsible-header">
-                                <i class="material-icons">enhanced_encryption</i><?php echo __( 'Encrypting Backup Data...', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">enhanced_encryption</i><?php echo __('Encrypting Backup Data...', 'xcloner-backup-and-restore') ?>
 
                                 <p class="right"><span class="status"></span></p>
 
@@ -268,19 +268,19 @@ 
                         </li>
                         <li class="backup-done">
                             <div class="collapsible-header">
-                                <i class="material-icons">done</i><?php echo __( 'Backup Done', 'xcloner-backup-and-restore' ) ?>
+                                <i class="material-icons">done</i><?php echo __('Backup Done', 'xcloner-backup-and-restore') ?>
 
                                 <p class="right">
-									<?php if ( sizeof( $available_storages ) ): ?>
+									<?php if (sizeof($available_storages)): ?>
                                         <a href="#" class="cloud-upload"
-                                           title="<?php echo __( "Send Backup To Remote Storage", 'xcloner-backup-and-restore' ) ?>"><i
+                                           title="<?php echo __("Send Backup To Remote Storage", 'xcloner-backup-and-restore') ?>"><i
                                                     class="material-icons">cloud_upload</i></a>
 									<?php endif ?>
                                     <a href="#" class="download"
-                                       title="<?php echo __( "Download Backup", 'xcloner-backup-and-restore' ) ?>"><i
+                                       title="<?php echo __("Download Backup", 'xcloner-backup-and-restore') ?>"><i
                                                 class="material-icons">file_download</i></a>
                                     <a href="#" class="list-backup-content"
-                                       title="<?php echo __( "List Backup Content", 'xcloner-backup-and-restore' ) ?>"><i
+                                       title="<?php echo __("List Backup Content", 'xcloner-backup-and-restore') ?>"><i
                                                 class="material-icons">folder_open</i></a>
                                 </p>
 
@@ -291,8 +291,8 @@ 
                             </div>
                             <div class="collapsible-body center-align">
                                 <div class="row">
-                                    <h5><?php echo __( "Thank you for using XCloner.", 'xcloner-backup-and-restore' ) ?></h5>
-                                    <h6><?php echo sprintf( __( "We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore' ), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>' ) ?></h6>
+                                    <h5><?php echo __("Thank you for using XCloner.", 'xcloner-backup-and-restore') ?></h5>
+                                    <h6><?php echo sprintf(__("We would love to hear about your experience in the %s.", 'xcloner-backup-and-restore'), '<a href="https://wordpress.org/support/plugin/xcloner-backup-and-restore/reviews/" target="_blank">Wordpress XCloner Reviews Section</a>') ?></h6>
                                     <a class="twitter-follow-button" href="https://twitter.com/thinkovi"
                                        data-show-count="false">Follow @thinkovi</a>
                                     <script src="//platform.twitter.com/widgets.js" async="" charset="utf-8"></script>
@@ -313,9 +313,9 @@ 
 
             <div class="row">
                 <div id="schedule_backup_success" class="col s12 l6 updated settings-error notice is-dismissible">
-                    <p><strong><?php echo __( 'Schedule Saved', 'xcloner-backup-and-restore' ) ?></strong></p>
+                    <p><strong><?php echo __('Schedule Saved', 'xcloner-backup-and-restore') ?></strong></p>
                     <button type="button" class="notice-dismiss"><span
-                                class="screen-reader-text"><?php echo __( '(Dismiss this notice.', 'xcloner-backup-and-restore' ) ?></span>
+                                class="screen-reader-text"><?php echo __('(Dismiss this notice.', 'xcloner-backup-and-restore') ?></span>
                     </button>
                 </div>
             </div>
@@ -323,18 +323,18 @@ 
             <div class="row">
                 <div class="input-field inline col s12 l7">
                     <input type="text" id="schedule_name" class="" name="schedule_name" required>
-                    <label for="schedule_name"><?php echo __( 'Schedule Name', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="schedule_name"><?php echo __('Schedule Name', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
             <div class="row">
                 <div class="input-field inline col s12 m8 l4">
                     <input type="datetime-local" id="datepicker" class="datepicker" name="schedule_start_date">
-                    <label for="datepicker"><?php echo __( 'Schedule Backup To Start On:', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="datepicker"><?php echo __('Schedule Backup To Start On:', 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="input-field inline col s12 m4 l3">
                     <input id="timepicker_ampm_dark" class="timepicker" type="time" name="schedule_start_time">
-                    <label for="timepicker_ampm_dark"><?php echo __( 'At:', 'xcloner-backup-and-restore' ) ?></label>
+                    <label for="timepicker_ampm_dark"><?php echo __('At:', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
@@ -342,17 +342,17 @@ 
 			<div class="row">
 				<div class="input-field inline col s10 m11 l7">
 					<select id="backup_type" class="" name="backup_type">
-						<option value=""><?php echo __( "Full Backup", "xcloner-backup-and-restore" ); ?></option>
-						<option value="diff"><?php echo __( "Differential Backups", "xcloner-backup-and-restore" ); ?></option>
-						<option value="full_diff"><?php echo __( "Full Backup + Differential Backups", "xcloner-backup-and-restore" ); ?></option>
+						<option value=""><?php echo __("Full Backup", "xcloner-backup-and-restore"); ?></option>
+						<option value="diff"><?php echo __("Differential Backups", "xcloner-backup-and-restore"); ?></option>
+						<option value="full_diff"><?php echo __("Full Backup + Differential Backups", "xcloner-backup-and-restore"); ?></option>
 					</select>
-					<label for="backup_type"><?php echo __( 'Scheduled Backup Type', 'xcloner-backup-and-restore' ) ?></label>
+					<label for="backup_type"><?php echo __('Scheduled Backup Type', 'xcloner-backup-and-restore') ?></label>
 				</div>
 				<div class="col s2 m1">	
 					<a class="btn-floating tooltipped btn-small" data-html="true" data-position="center" data-delay="50" data-tooltip="<ul style='max-width:760px; text-align:left;'>
-						<li><?php echo __( "Full Backup = it will generate a full backup of all included files each time schedule runs", "xcloner-backup-and-restore" ); ?></li>
-						<li><?php echo __( "Differentials Backups = backups will include only changed files since the schedule started to run", "xcloner-backup-and-restore" ); ?></li>
-						<li><?php echo __( "Full Backup +  Differential Backups = the first time schedule runs, it will create a full backup and all next scheduled backups will include only files created/modified since that last full backup; a full backup is recreated when the number of changed files is bigger than the 'Differetial Backups Max Days' XCloner option.", "xcloner-backup-and-restore" ); ?></li>
+						<li><?php echo __("Full Backup = it will generate a full backup of all included files each time schedule runs", "xcloner-backup-and-restore"); ?></li>
+						<li><?php echo __("Differentials Backups = backups will include only changed files since the schedule started to run", "xcloner-backup-and-restore"); ?></li>
+						<li><?php echo __("Full Backup +  Differential Backups = the first time schedule runs, it will create a full backup and all next scheduled backups will include only files created/modified since that last full backup; a full backup is recreated when the number of changed files is bigger than the 'Differetial Backups Max Days' XCloner option.", "xcloner-backup-and-restore"); ?></li>
 					</ul>"><i class="material-icons">help_outline</i></a>
 				</div>
 			</div>	
@@ -361,38 +361,38 @@ 
                 <div class="input-field col s12 l7">
                     <select name="schedule_frequency" id="schedule_frequency" class="validate" required>
                         <option value="" disabled
-                                selected><?php echo __( 'please select', 'xcloner-backup-and-restore' ) ?></option>
+                                selected><?php echo __('please select', 'xcloner-backup-and-restore') ?></option>
 						<?php
 						$schedules = $xcloner_scheduler->get_available_intervals();
 
-						foreach ( $schedules as $key => $schedule ) {
+						foreach ($schedules as $key => $schedule) {
 							?>
                             <option value="<?php echo $key ?>"><?php echo $schedule['display'] ?></option>
 							<?php
 						}
 						?>
                     </select>
-                    <label><?php echo __( 'Schedule Frequency', 'xcloner-backup-and-restore' ) ?></label>
+                    <label><?php echo __('Schedule Frequency', 'xcloner-backup-and-restore') ?></label>
                 </div>
             </div>
 
-			<?php if ( sizeof( $available_storages ) ): ?>
+			<?php if (sizeof($available_storages)): ?>
                 <div class="row">
                     <div class="input-field col s12 m12 l7">
                         <select name="schedule_storage" id="schedule_storage" class="validate">
-                            <option value="" selected><?php echo __( 'none', 'xcloner-backup-and-restore' ) ?></option>
-							<?php foreach ( $available_storages as $storage => $text ): ?>
+                            <option value="" selected><?php echo __('none', 'xcloner-backup-and-restore') ?></option>
+							<?php foreach ($available_storages as $storage => $text): ?>
                                 <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 							<?php endforeach ?>
                         </select>
-                        <label><?php echo __( 'Send To Remote Storage', 'xcloner-backup-and-restore' ) ?></label>
+                        <label><?php echo __('Send To Remote Storage', 'xcloner-backup-and-restore') ?></label>
                     </div>
                 </div>
 			<?php endif ?>
             <div class="row">
                 <div class="col s12 l7">
                     <button class="right btn waves-effect waves-light submit_schedule" type="submit"
-                            name="action"><?php echo __( "Submit", 'xcloner-backup-and-restore' ) ?>
+                            name="action"><?php echo __("Submit", 'xcloner-backup-and-restore') ?>
                         <i class="material-icons right">send</i>
                     </button>
                 </div>
@@ -407,19 +407,19 @@ 
                 class="material-icons medium right">help</i></a>
     <div class="modal-content">
         <h4 class="title_line"><span class="title"></span></h4>
-        <!--<h5 class="title_line"><?php echo __( 'Message' ) ?>: <span class="msg.old"></span></h5>-->
-        <h5><?php echo __( 'Response Code', 'xcloner-backup-and-restore' ) ?>: <span class="status"></span></h5>
+        <!--<h5 class="title_line"><?php echo __('Message') ?>: <span class="msg.old"></span></h5>-->
+        <h5><?php echo __('Response Code', 'xcloner-backup-and-restore') ?>: <span class="status"></span></h5>
         <textarea class="body" rows="5"></textarea>
     </div>
     <div class="modal-footer">
-        <a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __( 'Close', 'xcloner-backup-and-restore' ) ?></a>
+        <a class=" modal-action modal-close waves-effect waves-green btn-flat  red darken-2"><?php echo __('Close', 'xcloner-backup-and-restore') ?></a>
     </div>
 </div>
 
 <!-- List Backup Content Modal-->
 <div id="backup_cotent_modal" class="modal">
     <div class="modal-content">
-        <h4><?php echo sprintf( __( "Listing Backup Content ", 'xcloner-backup-and-restore' ), "" ) ?></h4>
+        <h4><?php echo sprintf(__("Listing Backup Content ", 'xcloner-backup-and-restore'), "") ?></h4>
         <h5 class="backup-name"></h5>
 
         <div class="progress">
@@ -434,18 +434,18 @@ 
     <form method="POST" class="remote-storage-form">
         <input type="hidden" name="file" class="backup_name">
         <div class="modal-content">
-            <h4><?php echo __( "Remote Storage Transfer", 'xcloner-backup-and-restore' ) ?></h4>
+            <h4><?php echo __("Remote Storage Transfer", 'xcloner-backup-and-restore') ?></h4>
             <p>
-				<?php if ( sizeof( $available_storages ) ): ?>
+				<?php if (sizeof($available_storages)): ?>
             <div class="row">
                 <div class="col s12 label">
-                    <label><?php echo __( sprintf( 'Send %s to remote storage', "<span class='backup_name'></span>" ), 'xcloner-backup-and-restore' ) ?></label>
+                    <label><?php echo __(sprintf('Send %s to remote storage', "<span class='backup_name'></span>"), 'xcloner-backup-and-restore') ?></label>
                 </div>
                 <div class="input-field col s8 m10">
                     <select name="transfer_storage" id="transfer_storage" class="validate" required>
                         <option value=""
-                                selected><?php echo __( 'please select...', 'xcloner-backup-and-restore' ) ?></option>
-						<?php foreach ( $available_storages as $storage => $text ): ?>
+                                selected><?php echo __('please select...', 'xcloner-backup-and-restore') ?></option>
+						<?php foreach ($available_storages as $storage => $text): ?>
                             <option value="<?php echo $storage ?>"><?php echo $text ?></option>
 						<?php endforeach ?>
                     </select>
@@ -457,7 +457,7 @@ 
                 </div>
             </div>
             <div class="row status">
-				<?php echo __( "Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore' ) ?>
+				<?php echo __("Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore') ?>
                 <span class="status-text"></span>
                 <div class="progress">
                     <div class="indeterminate"></div>
@@ -541,7 +541,7 @@ 
             }
         });
 
-		<?php if($xcloner_settings->get_enable_mysql_backup()):?>
+		<?php if ($xcloner_settings->get_enable_mysql_backup()):?>
         jQuery('#jstree_database_container').jstree({
             'core': {
                 'check_callback': true,

admin/partials/xcloner_remote_storage_page.php

Spacing +197 added lines, -197 removed lines

@@ -3,13 +3,13 @@ 
 
 $gdrive_auth_url = "";
 
-if ( method_exists( $remote_storage, "get_gdrive_auth_url" ) ) {
+if (method_exists($remote_storage, "get_gdrive_auth_url")) {
 	$gdrive_auth_url = $remote_storage->get_gdrive_auth_url();
 }
 
 $gdrive_construct = $remote_storage->gdrive_construct();
 ?>
-<h1><?= esc_html( get_admin_page_title() ); ?></h1>
+<h1><?= esc_html(get_admin_page_title()); ?></h1>
 
 <form class="remote-storage-form" method="POST">
 
@@ -21,12 +21,12 @@ 
                 <!-- FTP STORAGE-->
                 <li id="ftp">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "FTP Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("FTP Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_ftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -36,121 +36,121 @@ 
                     <div class="collapsible-body">
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_host"><?php echo __( "Ftp Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_host"><?php echo __("Ftp Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class="col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Hostname", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Hostname", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_host" type="text" name="xcloner_ftp_hostname" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_hostname" ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "Ftp Port", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Port", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_port" type="text" name="xcloner_ftp_port" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_port", 21 ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_port", 21) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_username"><?php echo __( "Ftp Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_username"><?php echo __("Ftp Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Username", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_username" type="text" name="xcloner_ftp_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_ftp_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_password"><?php echo __( "Ftp Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_password"><?php echo __("Ftp Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Password", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_password" type="password" name="xcloner_ftp_password" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_password" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_ftp_password") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_root"><?php echo __( "Ftp Storage Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_root"><?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Ftp Storage Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Storage Folder", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_root" type="text" name="xcloner_ftp_path" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_path" ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_path") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_root"><?php echo __( "Ftp Transfer Mode", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_root"><?php echo __("Ftp Transfer Mode", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6 input-field inline">
                                 <input name="xcloner_ftp_transfer_mode" type="radio" id="passive"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_transfer_mode", 1 ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="passive"><?php echo __( "Passive", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="passive"><?php echo __("Passive", 'xcloner-backup-and-restore') ?></label>
 
                                 <input name="xcloner_ftp_transfer_mode" type="radio" id="active"
-                                       value="0" <?php if ( ! get_option( "xcloner_ftp_transfer_mode", 1 ) )
+                                       value="0" <?php if (!get_option("xcloner_ftp_transfer_mode", 1))
 									echo "checked" ?> />
-                                <label for="active"><?php echo __( "Active", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="active"><?php echo __("Active", 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_ssl_mode"><?php echo __( "Ftp Secure Connection", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode"><?php echo __("Ftp Secure Connection", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6 input-field inline">
                                 <input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_inactive"
-                                       value="0" <?php if ( ! get_option( "xcloner_ftp_ssl_mode" ) )
+                                       value="0" <?php if (!get_option("xcloner_ftp_ssl_mode"))
 									echo "checked" ?> />
-                                <label for="ftp_ssl_mode_inactive"><?php echo __( "Disable", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode_inactive"><?php echo __("Disable", 'xcloner-backup-and-restore') ?></label>
 
                                 <input name="xcloner_ftp_ssl_mode" type="radio" id="ftp_ssl_mode_active"
-                                       value="1" <?php if ( get_option( "xcloner_ftp_ssl_mode" ) )
+                                       value="1" <?php if (get_option("xcloner_ftp_ssl_mode"))
 									echo "checked" ?> />
-                                <label for="ftp_ssl_mode_active"><?php echo __( "Enable", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_ssl_mode_active"><?php echo __("Enable", 'xcloner-backup-and-restore') ?></label>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_timeout"><?php echo __( "Ftp Timeout", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_timeout"><?php echo __("Ftp Timeout", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "Ftp Timeout", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Ftp Timeout", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_timeout" type="text" name="xcloner_ftp_timeout" class="validate"
-                                       value="<?php echo get_option( "xcloner_ftp_timeout", 30 ) ?>">
+                                       value="<?php echo get_option("xcloner_ftp_timeout", 30) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="ftp_cleanup_days"><?php echo __( "Ftp Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="ftp_cleanup_days"><?php echo __("Ftp Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_cleanup_days" type="text" name="xcloner_ftp_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_ftp_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_ftp_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="ftp"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="ftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="ftp"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -161,12 +161,12 @@ 
                 <!-- SFTP STORAGE-->
                 <li id="sftp">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "SFTP Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("SFTP Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_sftp_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_sftp_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_sftp_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -176,100 +176,100 @@ 
                     <div class="collapsible-body">
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_host"><?php echo __( "SFTP Hostname", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_host"><?php echo __("SFTP Hostname", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class="col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Hostname", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Hostname", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_host" type="text" name="xcloner_sftp_hostname" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_hostname" ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_hostname") ?>">
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "SFTP Port", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Port", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_port" type="text" name="xcloner_sftp_port" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_port", 22 ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_port", 22) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_username"><?php echo __( "SFTP Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_username"><?php echo __("SFTP Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Username", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_username" type="text" name="xcloner_sftp_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_sftp_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_password"><?php echo __( "SFTP or Private Key Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_password"><?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP or Private Key Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP or Private Key Password", 'xcloner-backup-and-restore') ?>"
                                        id="ftp_spassword" type="password" name="xcloner_sftp_password" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_password" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_sftp_password") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_private_key"><?php echo __( "SFTP Private Key(RSA)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_private_key"><?php echo __("SFTP Private Key(RSA)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
                                 <textarea rows="5"
-                                          placeholder="<?php echo __( "Local Server Path or Contents of the SFTP Private Key RSA File", 'xcloner-backup-and-restore' ) ?>"
+                                          placeholder="<?php echo __("Local Server Path or Contents of the SFTP Private Key RSA File", 'xcloner-backup-and-restore') ?>"
                                           id="sftp_private_key" type="text" name="xcloner_sftp_private_key"
                                           class="validate"
-                                          value=""><?php echo get_option( "xcloner_sftp_private_key" ) ?></textarea>
+                                          value=""><?php echo get_option("xcloner_sftp_private_key") ?></textarea>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_root"><?php echo __( "SFTP Storage Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_root"><?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "SFTP Storage Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Storage Folder", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_root" type="text" name="xcloner_sftp_path" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_path" ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_path") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_timeout"><?php echo __( "SFTP Timeout", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_timeout"><?php echo __("SFTP Timeout", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m2">
-                                <input placeholder="<?php echo __( "SFTP Timeout", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("SFTP Timeout", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_timeout" type="text" name="xcloner_sftp_timeout" class="validate"
-                                       value="<?php echo get_option( "xcloner_sftp_timeout", 30 ) ?>">
+                                       value="<?php echo get_option("xcloner_sftp_timeout", 30) ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="sftp_cleanup_days"><?php echo __( "SFTP Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="sftp_cleanup_days"><?php echo __("SFTP Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="sftp_cleanup_days" type="text" name="xcloner_sftp_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_sftp_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_sftp_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="sftp"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="sftp"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="sftp"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -281,12 +281,12 @@ 
                 <!-- AWS STORAGE-->
                 <li id="aws">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "S3 Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("S3 Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_aws_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_aws_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_aws_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -301,49 +301,49 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.' ), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "Key" and "Secret <br />Visit %s to install your own S3 like service.'), "<a href='https://aws.amazon.com/s3/' target='_blank'>https://aws.amazon.com/s3/</a>", "<a href='https://minio.io/' target='_blank'>https://minio.io/</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_key"><?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_key"><?php echo __("S3 Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Key", 'xcloner-backup-and-restore') ?>"
                                        id="aws_key" type="text" name="xcloner_aws_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_key" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_key") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_secret"><?php echo __( "S3 Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_secret"><?php echo __("S3 Secret", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Secret", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Secret", 'xcloner-backup-and-restore') ?>"
                                        id="aws_secret" type="text" name="xcloner_aws_secret" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_secret" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_secret") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_region"><?php echo __( "S3 Region", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_region"><?php echo __("S3 Region", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <select placeholder="<?php echo __( "example: us-east-1", 'xcloner-backup-and-restore' ) ?>"
+                                <select placeholder="<?php echo __("example: us-east-1", 'xcloner-backup-and-restore') ?>"
                                         id="aws_region" type="text" name="xcloner_aws_region" class="validate"
-                                        value="<?php echo get_option( "xcloner_aws_region" ) ?>" autocomplete="off">
+                                        value="<?php echo get_option("xcloner_aws_region") ?>" autocomplete="off">
                                     <option readonly
-                                            value=""><?php echo __( "Please Select AWS S3 Region or Leave Unselected for Custom Endpoint" ) ?></option>
+                                            value=""><?php echo __("Please Select AWS S3 Region or Leave Unselected for Custom Endpoint") ?></option>
 									<?php
 									$aws_regions = $remote_storage->get_aws_regions();
 
-									foreach ( $aws_regions as $key => $region ) {
+									foreach ($aws_regions as $key => $region) {
 										?>
-                                        <option value="<?php echo $key ?>" <?php echo( $key == get_option( 'xcloner_aws_region' ) ? "selected" : "" ) ?>><?php echo $region ?>
+                                        <option value="<?php echo $key ?>" <?php echo($key == get_option('xcloner_aws_region') ? "selected" : "") ?>><?php echo $region ?>
                                             = <?php echo $key ?></option>
 										<?php
 									}
@@ -354,59 +354,59 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_endpoint"><?php echo __( "S3 EndPoint", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_endpoint"><?php echo __("S3 EndPoint", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 EndPoint, leave blank if you want to use the default Amazon AWS Service", 'xcloner-backup-and-restore') ?>"
                                        id="aws_endpoint" type="text" name="xcloner_aws_endpoint" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_endpoint" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_endpoint") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_bucket_name"><?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_bucket_name"><?php echo __("S3 Bucket Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Bucket Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Bucket Name", 'xcloner-backup-and-restore') ?>"
                                        id="aws_bucket_name" type="text" name="xcloner_aws_bucket_name" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_bucket_name" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_bucket_name") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_prefix"><?php echo __( "S3 Prefix", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_prefix"><?php echo __("S3 Prefix", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("S3 Prefix, use / ending to define a folder", 'xcloner-backup-and-restore') ?>"
                                        id="aws_prefix" type="text" name="xcloner_aws_prefix" class="validate"
-                                       value="<?php echo get_option( "xcloner_aws_prefix" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_aws_prefix") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="aws_cleanup_days"><?php echo __( "S3 Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="aws_cleanup_days"><?php echo __("S3 Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="aws_cleanup_days" type="text" name="xcloner_aws_cleanup_days"
-                                       class="validate" value="<?php echo get_option( "xcloner_aws_cleanup_days" ) ?>">
+                                       class="validate" value="<?php echo get_option("xcloner_aws_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="aws"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="aws"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="aws"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -418,12 +418,12 @@ 
                 <!-- DROPBOX STORAGE-->
                 <li id="dropbox">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Dropbox Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Dropbox Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_dropbox_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_dropbox_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_dropbox_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -438,20 +438,20 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "App secret".' ), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>" ) ?>
+									<?php echo sprintf(__('Visit %s and get your "App secret".'), "<a href='https://www.dropbox.com/developers/apps' target='_blank'>https://www.dropbox.com/developers/apps</a>") ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_access_token"><?php echo __( "Dropbox Access Token", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_access_token"><?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox Access Token", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox Access Token", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_access_token" type="text" name="xcloner_dropbox_access_token"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_access_token" ) ?>"
+                                       value="<?php echo get_option("xcloner_dropbox_access_token") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -459,50 +459,50 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_app_secret"><?php echo __( "Dropbox App Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_app_secret"><?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox App Secret", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox App Secret", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_app_secret" type="text" name="xcloner_dropbox_app_secret"
-                                       class="validate" value="<?php echo get_option( "xcloner_dropbox_app_secret" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_dropbox_app_secret") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_prefix"><?php echo __( "Dropbox Prefix", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_prefix"><?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Dropbox Prefix", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Dropbox Prefix", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_prefix" type="text" name="xcloner_dropbox_prefix" class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_prefix" ) ?>">
+                                       value="<?php echo get_option("xcloner_dropbox_prefix") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="dropbox_cleanup_days"><?php echo __( "Dropbox Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="dropbox_cleanup_days"><?php echo __("Dropbox Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="dropbox_cleanup_days" type="text" name="xcloner_dropbox_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_dropbox_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_dropbox_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="dropbox"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="dropbox"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="dropbox"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -514,12 +514,12 @@ 
                 <!-- AZURE STORAGE-->
                 <li id="azure">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Azure Blob Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Azure Blob Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_azure_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_azure_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_azure_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -534,19 +534,19 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your "Api Key".', 'xcloner-backup-and-restore' ), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>' ) ?>
+									<?php echo sprintf(__('Visit %s and get your "Api Key".', 'xcloner-backup-and-restore'), '<a href="https://azure.microsoft.com/en-us/services/storage/blobs/" target="_blank">https://azure.microsoft.com/en-us/services/storage/blobs/</a>') ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_account_name"><?php echo __( "Azure Account Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_account_name"><?php echo __("Azure Account Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Account Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Account Name", 'xcloner-backup-and-restore') ?>"
                                        id="azure_account_name" type="text" name="xcloner_azure_account_name"
-                                       class="validate" value="<?php echo get_option( "xcloner_azure_account_name" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_azure_account_name") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -554,49 +554,49 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_api_key"><?php echo __( "Azure Api Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_api_key"><?php echo __("Azure Api Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Api Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Api Key", 'xcloner-backup-and-restore') ?>"
                                        id="azure_api_key" type="text" name="xcloner_azure_api_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_api_key" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_azure_api_key") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_container"><?php echo __( "Azure Container", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_container"><?php echo __("Azure Container", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Azure Container", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Azure Container", 'xcloner-backup-and-restore') ?>"
                                        id="azure_container" type="text" name="xcloner_azure_container" class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_container" ) ?>">
+                                       value="<?php echo get_option("xcloner_azure_container") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="azure_cleanup_days"><?php echo __( "Azure Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="azure_cleanup_days"><?php echo __("Azure Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="azure_cleanup_days" type="text" name="xcloner_azure_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_azure_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_azure_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="azure"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="azure"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="azure"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -608,12 +608,12 @@ 
                 <!-- BACKBLAZE STORAGE-->
                 <li id="backblaze">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Backblaze Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("Backblaze Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_backblaze_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_backblaze_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_backblaze_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -628,20 +628,20 @@ 
                             </div>
                             <div class=" col s12 m6">
                                 <p>
-									<?php echo sprintf( __( 'Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore' ), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>' ) ?>
+									<?php echo sprintf(__('Visit %s and get your Account Id and  Application Key.', 'xcloner-backup-and-restore'), '<a href="https://secure.backblaze.com/b2_buckets.htm" target="_blank">https://secure.backblaze.com/b2_buckets.htm</a>') ?>
                                 </p>
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_account_id"><?php echo __( "Backblaze Account Id", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_account_id"><?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Account Id", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Account Id", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_account_id" type="text" name="xcloner_backblaze_account_id"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_account_id" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_account_id") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
@@ -649,53 +649,53 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_application_key"><?php echo __( "Backblaze Application Key", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_application_key"><?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Application Key", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Application Key", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_application_key" type="text"
                                        name="xcloner_backblaze_application_key" class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_application_key" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_application_key") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_bucket_name"><?php echo __( "Backblaze Bucket Name", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_bucket_name"><?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "Backblaze Bucket Name", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("Backblaze Bucket Name", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_bucket_name" type="text" name="xcloner_backblaze_bucket_name"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_bucket_name" ) ?>"
+                                       value="<?php echo get_option("xcloner_backblaze_bucket_name") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="backblaze_cleanup_days"><?php echo __( "Backblaze Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="backblaze_cleanup_days"><?php echo __("Backblaze Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="backblaze_cleanup_days" type="text" name="xcloner_backblaze_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_backblaze_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_backblaze_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="backblaze"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="backblaze"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="backblaze"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -707,12 +707,12 @@ 
                 <!-- WEBDAV STORAGE-->
                 <li id="webdav">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "WebDAV Storage", 'xcloner-backup-and-restore' ) ?>
+                        <i class="material-icons">computer</i><?php echo __("WebDAV Storage", 'xcloner-backup-and-restore') ?>
                         <div class="switch right">
                             <label>
                                 Off
                                 <input type="checkbox" name="xcloner_webdav_enable" class="status"
-                                       value="1" <?php if ( get_option( "xcloner_webdav_enable" ) )
+                                       value="1" <?php if (get_option("xcloner_webdav_enable"))
 									echo "checked" ?> \>
                                 <span class="lever"></span>
                                 On
@@ -734,74 +734,74 @@ 
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_url"><?php echo __( "WebDAV Base Url", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_url"><?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Base Url", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Base Url", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_url" type="text" name="xcloner_webdav_url" class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_url" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_webdav_url") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_username"><?php echo __( "WebDAV Username", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_username"><?php echo __("WebDAV Username", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Username", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Username", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_username" type="text" name="xcloner_webdav_username" class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_username" ) ?>" autocomplete="off">
+                                       value="<?php echo get_option("xcloner_webdav_username") ?>" autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_password"><?php echo __( "WebDAV Password", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_password"><?php echo __("WebDAV Password", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Password", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Password", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_password" type="password" name="xcloner_webdav_password"
-                                       class="validate" value="<?php echo get_option( "xcloner_webdav_password" ) ?>"
+                                       class="validate" value="<?php echo get_option("xcloner_webdav_password") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_target_folder"><?php echo __( "WebDAV Target Folder", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_target_folder"><?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "WebDAV Target Folder", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("WebDAV Target Folder", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_target_folder" type="text" name="xcloner_webdav_target_folder"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_target_folder" ) ?>"
+                                       value="<?php echo get_option("xcloner_webdav_target_folder") ?>"
                                        autocomplete="off">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s12 m3 label">
-                                <label for="webdav_cleanup_days"><?php echo __( "WebDAV Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                <label for="webdav_cleanup_days"><?php echo __("WebDAV Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                             </div>
                             <div class=" col s12 m6">
-                                <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                        id="webdav_cleanup_days" type="text" name="xcloner_webdav_cleanup_days"
                                        class="validate"
-                                       value="<?php echo get_option( "xcloner_webdav_cleanup_days" ) ?>">
+                                       value="<?php echo get_option("xcloner_webdav_cleanup_days") ?>">
                             </div>
                         </div>
 
                         <div class="row">
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                        value="webdav"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                        value="webdav"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">save</i>
                                 </button>
                             </div>
                             <div class="col s6 m4">
                                 <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                         id="action" value="webdav"
-                                        onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                        onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                     <i class="material-icons right">import_export</i>
                                 </button>
                             </div>
@@ -813,13 +813,13 @@ 
                 <!-- Google DRIVE STORAGE-->
                 <li id="gdrive">
                     <div class="collapsible-header">
-                        <i class="material-icons">computer</i><?php echo __( "Google Drive Storage", 'xcloner-backup-and-restore' ) ?>
-						<?php if ( $gdrive_construct ): ?>
+                        <i class="material-icons">computer</i><?php echo __("Google Drive Storage", 'xcloner-backup-and-restore') ?>
+						<?php if ($gdrive_construct): ?>
                             <div class="switch right">
                                 <label>
                                     Off
                                     <input type="checkbox" name="xcloner_gdrive_enable" class="status"
-                                           value="1" <?php if ( get_option( "xcloner_gdrive_enable" ) )
+                                           value="1" <?php if (get_option("xcloner_gdrive_enable"))
 										echo "checked" ?> \>
                                     <span class="lever"></span>
                                     On
@@ -829,7 +829,7 @@ 
                     </div>
                     <div class="collapsible-body">
 
-						<?php if ( $gdrive_construct ) : ?>
+						<?php if ($gdrive_construct) : ?>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
@@ -837,11 +837,11 @@ 
                                 </div>
                                 <div class=" col s12 m9">
                                     <p>
-										<?php echo sprintf( __( 'Visit %s to create a new application and get your Client ID and Client Secret.', 'xcloner-backup-and-restore' ), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>' ) ?>
+										<?php echo sprintf(__('Visit %s to create a new application and get your Client ID and Client Secret.', 'xcloner-backup-and-restore'), '<a href="https://console.developers.google.com" target="_blank">https://console.developers.google.com</a>') ?>
                                         <a href="https://youtu.be/YXUVPUVgG8k" target="_blank"
                                            class="btn-floating tooltipped btn-small" data-position="right"
                                            data-delay="50" data-html="true"
-                                           data-tooltip="<?php echo sprintf( __( 'Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s', 'xcloner-backup-and-restore' ), "<br />https://youtu.be/YXUVPUVgG8k" ) ?>"
+                                           data-tooltip="<?php echo sprintf(__('Click here to view a short video explaining how to create the Client ID and Client Secret as well as connecting XCloner with the Google Drive API %s', 'xcloner-backup-and-restore'), "<br />https://youtu.be/YXUVPUVgG8k") ?>"
                                            data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i
                                                     class="material-icons">help_outline</i></a>
                                     </p>
@@ -850,25 +850,25 @@ 
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_client_id"><?php echo __( "Client ID", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_client_id"><?php echo __("Client ID", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Google Client ID", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Google Client ID", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_client_id" type="text" name="xcloner_gdrive_client_id"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_client_id" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_client_id") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_client_secret"><?php echo __( "Client Secret", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_client_secret"><?php echo __("Client Secret", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Google Client Secret", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Google Client Secret", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_client_secret" type="text" name="xcloner_gdrive_client_secret"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_client_secret" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_client_secret") ?>">
                                 </div>
                             </div>
 
@@ -880,72 +880,72 @@ 
                                 <div class=" col s12 m6">
                                     <a class="btn" target="_blank" id="gdrive_authorization_click"
                                        onclick="jQuery('#authentification_code').show()"
-                                       href="<?php echo $gdrive_auth_url ?>"><?php echo sprintf( __( 'Authorize Google Drive', 'xcloner-backup-and-restore' ) ) ?></a>
+                                       href="<?php echo $gdrive_auth_url ?>"><?php echo sprintf(__('Authorize Google Drive', 'xcloner-backup-and-restore')) ?></a>
                                     <input type="text" name="authentification_code" id="authentification_code"
-                                           placeholder="<?php echo __( "Paste Authorization Code Here", "xcloner-backup-and-restore" ) ?>">
+                                           placeholder="<?php echo __("Paste Authorization Code Here", "xcloner-backup-and-restore") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_target_folder"><?php echo __( "Folder ID or Root Path", 'xcloner-backup-and-restore' ) ?>
+                                    <label for="gdrive_target_folder"><?php echo __("Folder ID or Root Path", 'xcloner-backup-and-restore') ?>
                                         <a class="btn-floating tooltipped btn-small" data-position="right"
                                            data-delay="50" data-html="true" \
-                                           data-tooltip="<?php echo __( 'Folder ID can be found by right clicking on the folder name and selecting \'Get shareable link\' menu, format https://drive.google.com/open?id={FOLDER_ID}<br />
-									If you supply a folder name, it has to exists in the drive root and start with / , example /backups.xcloner.com/', 'xcloner-backup-and-restore' ) ?>"
+                                           data-tooltip="<?php echo __('Folder ID can be found by right clicking on the folder name and selecting \'Get shareable link\' menu, format https://drive.google.com/open?id={FOLDER_ID}<br />
+									If you supply a folder name, it has to exists in the drive root and start with / , example /backups.xcloner.com/', 'xcloner-backup-and-restore') ?>"
                                            data-tooltip-id="92c95730-94e9-7b59-bd52-14adc30d5e3e"><i
                                                     class="material-icons">help_outline</i></a>
                                     </label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "Target Folder ID or Root Path", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("Target Folder ID or Root Path", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_target_folder" type="text" name="xcloner_gdrive_target_folder"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_target_folder" ) ?>"
+                                           value="<?php echo get_option("xcloner_gdrive_target_folder") ?>"
                                            autocomplete="off">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_cleanup_days"><?php echo __( "Google Drive Cleanup (days)", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_cleanup_days"><?php echo __("Google Drive Cleanup (days)", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6">
-                                    <input placeholder="<?php echo __( "how many days to keep the backups for", 'xcloner-backup-and-restore' ) ?>"
+                                    <input placeholder="<?php echo __("how many days to keep the backups for", 'xcloner-backup-and-restore') ?>"
                                            id="gdrive_cleanup_days" type="text" name="xcloner_gdrive_cleanup_days"
                                            class="validate"
-                                           value="<?php echo get_option( "xcloner_gdrive_cleanup_days" ) ?>">
+                                           value="<?php echo get_option("xcloner_gdrive_cleanup_days") ?>">
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s12 m3 label">
-                                    <label for="gdrive_empty_trash"><?php echo __( "Automatically Empty Trash?", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash"><?php echo __("Automatically Empty Trash?", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                                 <div class=" col s12 m6 input-field inline">
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="0"
-                                           id="gdrive_empty_trash_off" <?php if ( ! get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_off" <?php if (!get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_off"><?php echo __( "Disabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_off"><?php echo __("Disabled", 'xcloner-backup-and-restore') ?></label>
 
                                     <input name="xcloner_gdrive_empty_trash" type="radio" value="1"
-                                           id="gdrive_empty_trash_on" <?php if ( get_option( "xcloner_gdrive_empty_trash", 0 ) )
+                                           id="gdrive_empty_trash_on" <?php if (get_option("xcloner_gdrive_empty_trash", 0))
 										echo "checked" ?> />
-                                    <label for="gdrive_empty_trash_on"><?php echo __( "Enabled", 'xcloner-backup-and-restore' ) ?></label>
+                                    <label for="gdrive_empty_trash_on"><?php echo __("Enabled", 'xcloner-backup-and-restore') ?></label>
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="col s6 m4">
                                     <button class="btn waves-effect waves-light" type="submit" name="action" id="action"
-                                            value="gdrive"><?php echo __( "Save Settings", 'xcloner-backup-and-restore' ) ?>
+                                            value="gdrive"><?php echo __("Save Settings", 'xcloner-backup-and-restore') ?>
                                         <i class="material-icons right">save</i>
                                     </button>
                                 </div>
                                 <div class="col s6 m4">
                                     <button class="btn waves-effect waves-light orange" type="submit" name="action"
                                             id="action" value="gdrive"
-                                            onclick="jQuery('#connection_check').val('1')"><?php echo __( "Verify", 'xcloner-backup-and-restore' ) ?>
+                                            onclick="jQuery('#connection_check').val('1')"><?php echo __("Verify", 'xcloner-backup-and-restore') ?>
                                         <i class="material-icons right">import_export</i>
                                     </button>
                                 </div>
@@ -956,26 +956,26 @@ 
                                 <div class=" col s12">
                                     <div class="center">
 										<?php
-										$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=xcloner-google-drive' ), 'install-plugin_xcloner-google-drive' );
+										$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=xcloner-google-drive'), 'install-plugin_xcloner-google-drive');
 										?>
-                                        <h6><?php echo __( "This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated." ) ?></h6>
-                                        <h6><?php echo __( "PHP 5.5 minimum version is required." ) ?></h6>
+                                        <h6><?php echo __("This storage option requires the XCloner-Google-Drive Wordpress Plugin to be installed and activated.") ?></h6>
+                                        <h6><?php echo __("PHP 5.5 minimum version is required.") ?></h6>
                                         <br/>
                                         <a class="install-now btn" data-slug="xcloner-google-drive"
                                            href="<?php echo $url; ?>"
                                            aria-label="Install XCloner Google Drive 1.0.0 now"
                                            data-name="XCloner Google Drive 1.0.0">
-											<?php echo sprintf( __( 'Install Now', 'xcloner-backup-and-restore' ) ) ?>
+											<?php echo sprintf(__('Install Now', 'xcloner-backup-and-restore')) ?>
                                         </a>
 
-                                        <a href="<?php echo admin_url( "plugin-install.php" ) ?>?tab=plugin-information&amp;plugin=xcloner-google-drive&amp;TB_iframe=true&amp;width=772&amp;height=499"
+                                        <a href="<?php echo admin_url("plugin-install.php") ?>?tab=plugin-information&amp;plugin=xcloner-google-drive&amp;TB_iframe=true&amp;width=772&amp;height=499"
                                            class="btn thickbox open-plugin-details-modal"
                                            aria-label="More information about Theme Check 20160523.1"
                                            data-title="Theme Check 20160523.1">
                                             <!--
 											<a class="btn" href="https://github.com/ovidiul/XCloner-Google-Drive/archive/master.zip">
 											-->
-											<?php echo sprintf( __( 'More Details', 'xcloner-backup-and-restore' ) ) ?>
+											<?php echo sprintf(__('More Details', 'xcloner-backup-and-restore')) ?>
                                         </a>
                                     </div>
                                 </div>