ovidiul / XCloner-Wordpress

includes/class-xcloner-logger.php

Spacing +30 added lines, -30 removed lines

@@ -10,61 +10,61 @@ 
 	private $max_logger_files = 7;
 	private $main_logger_url;
 
-	public function __construct( Xcloner $xcloner_container, $logger_name = "xcloner_logger" ) {
-		if ( ! $xcloner_container->get_xcloner_settings() ) {
-			$xcloner_settings = new Xcloner_Settings( $xcloner_container );
+	public function __construct(Xcloner $xcloner_container, $logger_name = "xcloner_logger") {
+		if (!$xcloner_container->get_xcloner_settings()) {
+			$xcloner_settings = new Xcloner_Settings($xcloner_container);
 		} else {
 			$xcloner_settings = $xcloner_container->get_xcloner_settings();
 		}
 
 		$hash = $xcloner_settings->get_hash();
-		if ( $hash == "-" . $xcloner_settings->get_server_unique_hash( 5 ) ) {
+		if ($hash == "-".$xcloner_settings->get_server_unique_hash(5)) {
 			$hash = "";
 		}
 
-		$logger_path     = $xcloner_settings->get_xcloner_store_path() . DS . $xcloner_settings->get_logger_filename();
+		$logger_path     = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp = "";
 
-		if ( $hash ) {
-			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path() . DS . $xcloner_settings->get_logger_filename( 1 );
+		if ($hash) {
+			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
 		}
 
 		$this->logger_path = $logger_path;
 
-		if ( ! is_dir( $xcloner_settings->get_xcloner_store_path() ) or ! is_writable( $xcloner_settings->get_xcloner_store_path() ) ) {
+		if (!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path())) {
 			$logger_path     = 'php://stderr';
 			$logger_path_tmp = "";
 		}
 
-		if ( ! $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) {
+		if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
 			$logger_path     = 'php://stderr';
 			$logger_path_tmp = "";
 		}
 
 		// create a log channel
-		parent::__construct( $logger_name );
+		parent::__construct($logger_name);
 
 		$debug_level = Logger::INFO;
 
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$debug_level = Logger::DEBUG;
 		}
 
 
-		if ( $logger_path ) {
-			if ( ! $xcloner_settings->get_xcloner_option( 'xcloner_enable_log' ) ) {
-				$stream = new StreamHandler( $logger_path, $debug_level );
+		if ($logger_path) {
+			if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log')) {
+				$stream = new StreamHandler($logger_path, $debug_level);
 			} else {
-				$stream = new RotatingFileHandler( $logger_path, $this->max_logger_files, $debug_level );
+				$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			}
 
-			$this->pushHandler( $stream );
+			$this->pushHandler($stream);
 
 			$this->main_logger_url = $stream->getUrl();
 		}
 
-		if ( $hash and $logger_path_tmp ) {
-			$this->pushHandler( new StreamHandler( $logger_path_tmp, $debug_level ) );
+		if ($hash and $logger_path_tmp) {
+			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
 		}
 
 		//return $this;
@@ -74,35 +74,35 @@ 
 		return $this->main_logger_url;
 	}
 
-	function getLastDebugLines( $totalLines = 200 ) {
+	function getLastDebugLines($totalLines = 200) {
 		$lines = array();
 
-		if ( ! file_exists( $this->main_logger_url ) or ! is_readable( $this->main_logger_url ) ) {
+		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {
 			return false;
 		}
 
-		$fp = fopen( $this->main_logger_url, 'r' );
-		fseek( $fp, - 1, SEEK_END );
-		$pos      = ftell( $fp );
+		$fp = fopen($this->main_logger_url, 'r');
+		fseek($fp, - 1, SEEK_END);
+		$pos      = ftell($fp);
 		$lastLine = "";
 
 		// Loop backword until we have our lines or we reach the start
-		while ( $pos > 0 && count( $lines ) < $totalLines ) {
+		while ($pos > 0 && count($lines) < $totalLines) {
 
-			$C = fgetc( $fp );
-			if ( $C == "\n" ) {
+			$C = fgetc($fp);
+			if ($C == "\n") {
 				// skip empty lines
-				if ( trim( $lastLine ) != "" ) {
+				if (trim($lastLine) != "") {
 					$lines[] = $lastLine;
 				}
 				$lastLine = '';
 			} else {
-				$lastLine = $C . $lastLine;
+				$lastLine = $C.$lastLine;
 			}
-			fseek( $fp, $pos -- );
+			fseek($fp, $pos--);
 		}
 
-		$lines = array_reverse( $lines );
+		$lines = array_reverse($lines);
 
 		return $lines;
 	}

includes/class-xcloner-deactivator.php

Spacing +3 added lines, -3 removed lines

@@ -51,11 +51,11 @@
 
 		global $xcloner_plugin;
 
-		if ( is_a( $xcloner_plugin, 'Xcloner' ) ) {
+		if (is_a($xcloner_plugin, 'Xcloner')) {
 			try {
 				$xcloner_plugin->get_xcloner_filesystem()->cleanup_tmp_directories();
-			} catch ( Exception $e ) {
-				$xcloner_plugin->trigger_message_notice( $e->getMessage() );
+			}catch (Exception $e) {
+				$xcloner_plugin->trigger_message_notice($e->getMessage());
 			}
 
 			$xcloner_scheduler = $xcloner_plugin->get_xcloner_scheduler();

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'];
         }

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,

includes/class-xcloner-activator.php

Indentation +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
 
 		if ( version_compare( phpversion(), Xcloner_Activator::xcloner_minimum_version, '<' ) ) {
 			wp_die( '<p>' . sprintf( __( "XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s" ), Xcloner_Activator::xcloner_minimum_version, phpversion() ) . '</p>', __( "XCloner Activation Error" ), array( 'response'  => 500,
-			                                                                                                                                                                                                                                                       'back_link' => true
+																																																																   'back_link' => true
 			) );
 		}
 
@@ -152,9 +152,9 @@ 
 			update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
 		}
 
-        if ( ! get_option( 'xcloner_regex_exclude' ) ) {
-            update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
-        }
+		if ( ! get_option( 'xcloner_regex_exclude' ) ) {
+			update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
+		}
 
 	}
 

Spacing +39 added lines, -39 removed lines

@@ -61,22 +61,22 @@ 
 
 		global $wpdb;
 
-		if ( version_compare( phpversion(), Xcloner_Activator::xcloner_minimum_version, '<' ) ) {
-			wp_die( '<p>' . sprintf( __( "XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s" ), Xcloner_Activator::xcloner_minimum_version, phpversion() ) . '</p>', __( "XCloner Activation Error" ), array( 'response'  => 500,
+		if (version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<')) {
+			wp_die('<p>'.sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s"), Xcloner_Activator::xcloner_minimum_version, phpversion()).'</p>', __("XCloner Activation Error"), array('response'  => 500,
 			                                                                                                                                                                                                                                                       'back_link' => true
-			) );
+			));
 		}
 
 		$charset_collate = $wpdb->get_charset_collate();
 
-		$installed_ver = get_option( "xcloner_db_version" );
+		$installed_ver = get_option("xcloner_db_version");
 
 		$xcloner_db_version = Xcloner_Activator::xcloner_db_version;
 
-		$xcloner_scheduler_table = $wpdb->prefix . "xcloner_scheduler";
+		$xcloner_scheduler_table = $wpdb->prefix."xcloner_scheduler";
 
-		if ( $installed_ver != $xcloner_db_version ) {
-			$xcloner_schedule_sql = "CREATE TABLE `" . $xcloner_scheduler_table . "` (
+		if ($installed_ver != $xcloner_db_version) {
+			$xcloner_schedule_sql = "CREATE TABLE `".$xcloner_scheduler_table."` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
 				  `name` varchar(255) NOT NULL,
 				  `recurrence` varchar(25) NOT NULL,
@@ -87,73 +87,73 @@ 
 				  `status` int(1) NOT NULL,
 				  `last_backup` varchar(100) DEFAULT NULL,
 				  PRIMARY KEY  (`id`)
-				) " . $charset_collate . ";
+				) " . $charset_collate.";
 				";
 
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-			dbDelta( $xcloner_schedule_sql );
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+			dbDelta($xcloner_schedule_sql);
 
-			update_option( "xcloner_db_version", $xcloner_db_version );
+			update_option("xcloner_db_version", $xcloner_db_version);
 		}
 
-		if ( get_option( 'xcloner_backup_compression_level' ) === false ) {
-			update_option( 'xcloner_backup_compression_level', 0 );
+		if (get_option('xcloner_backup_compression_level') === false) {
+			update_option('xcloner_backup_compression_level', 0);
 		}
 
-		if ( get_option( 'xcloner_enable_log' ) === false ) {
-			update_option( 'xcloner_enable_log', 1 );
+		if (get_option('xcloner_enable_log') === false) {
+			update_option('xcloner_enable_log', 1);
 		}
 
-		if ( get_option( 'xcloner_enable_mysql_backup' ) === false ) {
-			update_option( 'xcloner_enable_mysql_backup', 1 );
+		if (get_option('xcloner_enable_mysql_backup') === false) {
+			update_option('xcloner_enable_mysql_backup', 1);
 		}
 
-		if ( get_option( 'xcloner_system_settings_page' ) === false ) {
-			update_option( 'xcloner_system_settings_page', 100 );
+		if (get_option('xcloner_system_settings_page') === false) {
+			update_option('xcloner_system_settings_page', 100);
 		}
 
-		if ( get_option( 'xcloner_files_to_process_per_request' ) === false ) {
-			update_option( 'xcloner_files_to_process_per_request', 250 );
+		if (get_option('xcloner_files_to_process_per_request') === false) {
+			update_option('xcloner_files_to_process_per_request', 250);
 		}
 
-		if ( get_option( 'xcloner_database_records_per_request' ) === false ) {
-			update_option( 'xcloner_database_records_per_request', 10000 );
+		if (get_option('xcloner_database_records_per_request') === false) {
+			update_option('xcloner_database_records_per_request', 10000);
 		}
 
-		if ( get_option( 'xcloner_exclude_files_larger_than_mb' ) === false ) {
-			update_option( 'xcloner_exclude_files_larger_than_mb', 0 );
+		if (get_option('xcloner_exclude_files_larger_than_mb') === false) {
+			update_option('xcloner_exclude_files_larger_than_mb', 0);
 		}
 
-		if ( get_option( 'xcloner_split_backup_limit' ) === false ) {
-			update_option( 'xcloner_split_backup_limit', 2048 );
+		if (get_option('xcloner_split_backup_limit') === false) {
+			update_option('xcloner_split_backup_limit', 2048);
 		}
 
-		if ( get_option( 'xcloner_size_limit_per_request' ) === false ) {
-			update_option( 'xcloner_size_limit_per_request', 50 );
+		if (get_option('xcloner_size_limit_per_request') === false) {
+			update_option('xcloner_size_limit_per_request', 50);
 		}
 
-		if ( get_option( 'xcloner_cleanup_retention_limit_days' ) === false ) {
-			update_option( 'xcloner_cleanup_retention_limit_days', 60 );
+		if (get_option('xcloner_cleanup_retention_limit_days') === false) {
+			update_option('xcloner_cleanup_retention_limit_days', 60);
 		}
 
-		if ( get_option( 'xcloner_cleanup_retention_limit_archives' ) === false ) {
-			update_option( 'xcloner_cleanup_retention_limit_archives', 100 );
+		if (get_option('xcloner_cleanup_retention_limit_archives') === false) {
+			update_option('xcloner_cleanup_retention_limit_archives', 100);
 		}
 
-		if ( get_option( 'xcloner_directories_to_scan_per_request' ) === false ) {
-			update_option( 'xcloner_directories_to_scan_per_request', 25 );
+		if (get_option('xcloner_directories_to_scan_per_request') === false) {
+			update_option('xcloner_directories_to_scan_per_request', 25);
 		}
 
 		/*if(!get_option('xcloner_diff_backup_recreate_period'))
 			update_option('xcloner_diff_backup_recreate_period', 10);
 			* */
 
-		if ( ! get_option( 'xcloner_regex_exclude' ) ) {
-			update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
+		if (!get_option('xcloner_regex_exclude')) {
+			update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
 		}
 
-        if ( ! get_option( 'xcloner_regex_exclude' ) ) {
-            update_option( 'xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$" . PHP_EOL . "(.*)\.(svn|git)(.*)$" . PHP_EOL . "wp-content\/cache(.*)$" . PHP_EOL . "(.*)error_log$" );
+        if (!get_option('xcloner_regex_exclude')) {
+            update_option('xcloner_regex_exclude', "(wp-content\/updraft|wp-content\/uploads\/wp_all_backup)(.*)$".PHP_EOL."(.*)\.(svn|git)(.*)$".PHP_EOL."wp-content\/cache(.*)$".PHP_EOL."(.*)error_log$");
         }
 
 	}

includes/class-xcloner-scheduler.php

Indentation +49 added lines, -49 removed lines

@@ -171,7 +171,7 @@ 
 	}
 
 	public function update_hash( $schedule_id, $hash ) {
-        $schedule = array();
+		$schedule = array();
 
 		$schedule['hash'] = $hash;
 
@@ -190,7 +190,7 @@ 
 
 	public function update_last_backup( $schedule_id, $last_backup ) {
 
-	    $this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id));
+		$this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id));
 
 		$schedule['last_backup'] = $last_backup;
 
@@ -284,56 +284,56 @@ 
 		}
 		$this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) );
 
-        //getting the last backup archive file
-        $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
+		//getting the last backup archive file
+		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
 		if ( $this->xcloner_file_system->is_part( $this->archive_system->get_archive_name_with_extension() ) ) {
 			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		}
 
 		//Updating schedule last backup archive
-        $this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
+		$this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
 
 		//Encrypting the backup archive
-        $return_encrypted['finished'] = 0;
-        $return_encrypted['start'] = 0;
-        $return_encrypted['iv'] = '';
-        $return_encrypted['target_file'] = '';
-        $part = 0;
-        $backup_parts = array();
-
-        if( $schedule['backup_params']->backup_encrypt){
-            $this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
-
-            $backup_file = $return['extra']['backup_parent'];
-
-            if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) {
-                $backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']);
-                $backup_file = $backup_parts[$part];
-            }
-
-            while ( ! $return_encrypted['finished'] ) {
-                $return_encrypted = $this->xcloner_encryption->encrypt_file(
-                                            $backup_file,
-                                            "",
-                                            "",
-                                            "",
-                                            "",
-                                            true,
-                                            true
-                );
-
-                if($return_encrypted['finished']) {
-                    ++$part;
-
-                    if ($part < sizeof($backup_parts)) {
-                        $return_encrypted['finished'] = 0;
-                        $backup_file = $backup_parts[$part];
-                    }
-                }
-            }
-        }
-
-        //Sending backup to remote storage
+		$return_encrypted['finished'] = 0;
+		$return_encrypted['start'] = 0;
+		$return_encrypted['iv'] = '';
+		$return_encrypted['target_file'] = '';
+		$part = 0;
+		$backup_parts = array();
+
+		if( $schedule['backup_params']->backup_encrypt){
+			$this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
+
+			$backup_file = $return['extra']['backup_parent'];
+
+			if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) {
+				$backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']);
+				$backup_file = $backup_parts[$part];
+			}
+
+			while ( ! $return_encrypted['finished'] ) {
+				$return_encrypted = $this->xcloner_encryption->encrypt_file(
+											$backup_file,
+											"",
+											"",
+											"",
+											"",
+											true,
+											true
+				);
+
+				if($return_encrypted['finished']) {
+					++$part;
+
+					if ($part < sizeof($backup_parts)) {
+						$return_encrypted['finished'] = 0;
+						$backup_file = $backup_parts[$part];
+					}
+				}
+			}
+		}
+
+		//Sending backup to remote storage
 		if ( isset( $schedule['remote_storage'] ) && $schedule['remote_storage'] && array_key_exists( $schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages() ) ) {
 			$backup_file = $return['extra']['backup_parent'];
 
@@ -384,10 +384,10 @@ 
 		}
 
 		try {
-            if( get_option('xcloner_disable_email_notification') ) {
-                //we disable email notifications
-                $schedule['backup_params']->email_notification = "";
-            }
+			if( get_option('xcloner_disable_email_notification') ) {
+				//we disable email notifications
+				$schedule['backup_params']->email_notification = "";
+			}
 			$this->_xcloner_scheduler_callback( $id, $schedule );
 
 		} catch ( Exception $e ) {

Spacing +115 added lines, -115 removed lines

@@ -13,13 +13,13 @@ 
 	private $xcloner_file_system;
 	private $xcloner_encryption;
 
-	private $allowed_schedules = array( "hourly", "twicedaily", "daily", "weekly", "monthly" );
+	private $allowed_schedules = array("hourly", "twicedaily", "daily", "weekly", "monthly");
 
 	/*public function __call($method, $args) {
 		echo "$method is not defined";
 	}*/
 
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 		global $wpdb;
 
 		$this->db          = $wpdb;
@@ -28,26 +28,26 @@ 
 		$this->xcloner_container = $xcloner_container;
 		$this->xcloner_settings  = $this->xcloner_container->get_xcloner_settings();
 
-		$this->scheduler_table = $this->db->prefix . $this->scheduler_table;
+		$this->scheduler_table = $this->db->prefix.$this->scheduler_table;
 	}
 
 	private function get_xcloner_container() {
 		return $this->xcloner_container;
 	}
 
-	private function set_xcloner_container( Xcloner $container ) {
+	private function set_xcloner_container(Xcloner $container) {
 		$this->xcloner_container = $container;
 	}
 
-	public function get_scheduler_list( $return_only_enabled = 0 ) {
-		$list = $this->db->get_results( "SELECT * FROM " . $this->scheduler_table );
+	public function get_scheduler_list($return_only_enabled = 0) {
+		$list = $this->db->get_results("SELECT * FROM ".$this->scheduler_table);
 
-		if ( $return_only_enabled ) {
+		if ($return_only_enabled) {
 			$new_list = array();
 
-			foreach ( $list as $res ) {
-				if ( $res->status ) {
-					$res->next_run_time = wp_next_scheduled( 'xcloner_scheduler_' . $res->id, array( $res->id ) ) + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+			foreach ($list as $res) {
+				if ($res->status) {
+					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id)) + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 					$new_list[]         = $res;
 				}
 			}
@@ -58,40 +58,40 @@ 
 	}
 
 	public function get_next_run_schedule( ) {
-		$list = $this->get_scheduler_list( $return_only_enabled = 1 );
+		$list = $this->get_scheduler_list($return_only_enabled = 1);
 
 		return $list;
 	}
 
-	public function get_schedule_by_id_object( $id ) {
-		$data = $this->db->get_row( "SELECT * FROM " . $this->scheduler_table . " WHERE id=" . $id );
+	public function get_schedule_by_id_object($id) {
+		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id);
 
 		return $data;
 	}
 
-	public function get_schedule_by_id( $id ) {
-		$data = $this->db->get_row( "SELECT * FROM " . $this->scheduler_table . " WHERE id=" . $id, ARRAY_A );
+	public function get_schedule_by_id($id) {
+		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 
-		if ( ! $data ) {
+		if (!$data) {
 			return false;
 		}
 
-		$params = json_decode( $data['params'] );
+		$params = json_decode($data['params']);
 
 		//print_r($params);
 		$data['params']         = "";
 		$data['backup_params']  = $params->backup_params;
-		$data['table_params']   = json_encode( $params->database );
-		$data['excluded_files'] = json_encode( $params->excluded_files );
+		$data['table_params']   = json_encode($params->database);
+		$data['excluded_files'] = json_encode($params->excluded_files);
 
 		return $data;
 	}
 
-	public function delete_schedule_by_id( $id ) {
-		$hook = 'xcloner_scheduler_' . $id;
-		wp_clear_scheduled_hook( $hook, array( $id ) );
+	public function delete_schedule_by_id($id) {
+		$hook = 'xcloner_scheduler_'.$id;
+		wp_clear_scheduled_hook($hook, array($id));
 
-		$data = $this->db->delete( $this->scheduler_table, array( 'id' => $id ) );
+		$data = $this->db->delete($this->scheduler_table, array('id' => $id));
 
 		return $data;
 	}
@@ -99,68 +99,68 @@ 
 	public function deactivate_wp_cron_hooks() {
 		$list = $this->get_scheduler_list();
 
-		foreach ( $list as $schedule ) {
-			$hook = 'xcloner_scheduler_' . $schedule->id;
+		foreach ($list as $schedule) {
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 
-			$timestamp = wp_next_scheduled( $hook, array( $schedule->id ) );
-			wp_unschedule_event( $timestamp, $hook, array( $schedule->id ) );
+			$timestamp = wp_next_scheduled($hook, array($schedule->id));
+			wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		}
 	}
 
 	public function update_wp_cron_hooks() {
 		$list = $this->get_scheduler_list();
 
-		foreach ( $list as $schedule ) {
-			$hook = 'xcloner_scheduler_' . $schedule->id;
+		foreach ($list as $schedule) {
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 
 			//adding the xcloner_scheduler hook with xcloner_scheduler_callback callback
-			add_action( $hook, array( $this, 'xcloner_scheduler_callback' ), 10, 1 );
+			add_action($hook, array($this, 'xcloner_scheduler_callback'), 10, 1);
 
-			if ( ! wp_next_scheduled( $hook, array( $schedule->id ) ) and $schedule->status ) {
+			if (!wp_next_scheduled($hook, array($schedule->id)) and $schedule->status) {
 
-				if ( $schedule->recurrence == "single" ) {
-					wp_schedule_single_event( strtotime( $schedule->start_at ), $hook, array( $schedule->id ) );
+				if ($schedule->recurrence == "single") {
+					wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
 				} else {
-					wp_schedule_event( strtotime( $schedule->start_at ), $schedule->recurrence, $hook, array( $schedule->id ) );
+					wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 				}
 
-			} elseif ( ! $schedule->status ) {
-				$timestamp = wp_next_scheduled( $hook, array( $schedule->id ) );
-				wp_unschedule_event( $timestamp, $hook, array( $schedule->id ) );
+			} elseif (!$schedule->status) {
+				$timestamp = wp_next_scheduled($hook, array($schedule->id));
+				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
 
 	}
 
-	public function update_cron_hook( $id ) {
-		$schedule = $this->get_schedule_by_id_object( $id );
-		$hook     = 'xcloner_scheduler_' . $schedule->id;
+	public function update_cron_hook($id) {
+		$schedule = $this->get_schedule_by_id_object($id);
+		$hook     = 'xcloner_scheduler_'.$schedule->id;
 
-		$timestamp = wp_next_scheduled( $hook, array( $schedule->id ) );
-		wp_unschedule_event( $timestamp, $hook, array( $schedule->id ) );
+		$timestamp = wp_next_scheduled($hook, array($schedule->id));
+		wp_unschedule_event($timestamp, $hook, array($schedule->id));
 
-		if ( $schedule->status ) {
+		if ($schedule->status) {
 
-			if ( $schedule->recurrence == "single" ) {
-				wp_schedule_single_event( strtotime( $schedule->start_at ), $hook, array( $schedule->id ) );
+			if ($schedule->recurrence == "single") {
+				wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
 			} else {
-				wp_schedule_event( strtotime( $schedule->start_at ), $schedule->recurrence, $hook, array( $schedule->id ) );
+				wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 			}
 
 		}
 	}
 
-	public function disable_single_cron( $schedule_id ) {
-		$hook      = 'xcloner_scheduler_' . $schedule_id;
-		$timestamp = wp_next_scheduled( $hook, array( $schedule_id ) );
-		wp_unschedule_event( $timestamp, $hook, array( $schedule_id ) );
+	public function disable_single_cron($schedule_id) {
+		$hook      = 'xcloner_scheduler_'.$schedule_id;
+		$timestamp = wp_next_scheduled($hook, array($schedule_id));
+		wp_unschedule_event($timestamp, $hook, array($schedule_id));
 
 		$schedule['status'] = 0;
 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -170,7 +170,7 @@ 
 		return $update;
 	}
 
-	public function update_hash( $schedule_id, $hash ) {
+	public function update_hash($schedule_id, $hash) {
         $schedule = array();
 
 		$schedule['hash'] = $hash;
@@ -178,7 +178,7 @@ 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -188,7 +188,7 @@ 
 		return $update;
 	}
 
-	public function update_last_backup( $schedule_id, $last_backup ) {
+	public function update_last_backup($schedule_id, $last_backup) {
 
 	    $this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id));
 
@@ -197,7 +197,7 @@ 
 		$update = $this->db->update(
 			$this->scheduler_table,
 			$schedule,
-			array( 'id' => $schedule_id ),
+			array('id' => $schedule_id),
 			array(
 				'%s',
 				'%s'
@@ -207,91 +207,91 @@ 
 		return $update;
 	}
 
-	private function _xcloner_scheduler_callback( $id, $schedule ) {
-		set_time_limit( 0 );
+	private function _xcloner_scheduler_callback($id, $schedule) {
+		set_time_limit(0);
 
 		$xcloner = new XCloner();
 		$xcloner->init();
-		$this->set_xcloner_container( $xcloner );
+		$this->set_xcloner_container($xcloner);
 
 		#$hash = $this->xcloner_settings->get_hash();
 		#$this->get_xcloner_container()->get_xcloner_settings()->set_hash($hash);
 
 		//$this->xcloner_settings 		= $this->get_xcloner_container()->get_xcloner_settings();		
 		$this->xcloner_file_system    = $this->get_xcloner_container()->get_xcloner_filesystem();
-		$this->xcloner_encryption    = $this->get_xcloner_container()->get_xcloner_encryption();
+		$this->xcloner_encryption = $this->get_xcloner_container()->get_xcloner_encryption();
 		$this->xcloner_database       = $this->get_xcloner_container()->get_xcloner_database();
 		$this->archive_system         = $this->get_xcloner_container()->get_archive_system();
-		$this->logger                 = $this->get_xcloner_container()->get_xcloner_logger()->withName( "xcloner_scheduler" );
+		$this->logger                 = $this->get_xcloner_container()->get_xcloner_logger()->withName("xcloner_scheduler");
 		$this->xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
 
-		$this->logger->info( sprintf( "New schedule hash is %s", $this->xcloner_settings->get_hash() ) );
+		$this->logger->info(sprintf("New schedule hash is %s", $this->xcloner_settings->get_hash()));
 
-		if ( isset( $schedule['backup_params']->diff_start_date ) && $schedule['backup_params']->diff_start_date ) {
-			$this->xcloner_file_system->set_diff_timestamp_start( $schedule['backup_params']->diff_start_date );
+		if (isset($schedule['backup_params']->diff_start_date) && $schedule['backup_params']->diff_start_date) {
+			$this->xcloner_file_system->set_diff_timestamp_start($schedule['backup_params']->diff_start_date);
 		}
 
-		if ( $schedule['recurrence'] == "single" ) {
-			$this->disable_single_cron( $schedule['id'] );
+		if ($schedule['recurrence'] == "single") {
+			$this->disable_single_cron($schedule['id']);
 		}
 
-		if ( ! $schedule ) {
-			$this->logger->info( sprintf( "Could not load schedule with id'%s'", $id ), array( "CRON" ) );
+		if (!$schedule) {
+			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 
 			return;
 		}
 
 		//echo $this->get_xcloner_container()->get_xcloner_settings()->get_hash(); exit;
 
-		$this->update_hash( $schedule['id'], $this->xcloner_settings->get_hash() );
+		$this->update_hash($schedule['id'], $this->xcloner_settings->get_hash());
 
-		$this->logger->info( sprintf( "Starting cron schedule '%s'", $schedule['name'] ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting cron schedule '%s'", $schedule['name']), array("CRON"));
 
-		$this->xcloner_file_system->set_excluded_files( json_decode( $schedule['excluded_files'] ) );
+		$this->xcloner_file_system->set_excluded_files(json_decode($schedule['excluded_files']));
 
 		$init     = 1;
 		$continue = 1;
 
-		while ( $continue ) {
-			$continue = $this->xcloner_file_system->start_file_recursion( $init );
+		while ($continue) {
+			$continue = $this->xcloner_file_system->start_file_recursion($init);
 
 			$init = 0;
 		}
 
-		$this->logger->info( sprintf( "File scan finished" ), array( "CRON" ) );
+		$this->logger->info(sprintf("File scan finished"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting the database backup" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting the database backup"), array("CRON"));
 
 		$init               = 1;
 		$return['finished'] = 0;
 
-		while ( ! $return['finished'] ) {
-			$return = $this->xcloner_database->start_database_recursion( (array) json_decode( $schedule['table_params'] ), $return, $init );
+		while (!$return['finished']) {
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init   = 0;
 		}
 
-		$this->logger->info( sprintf( "Database backup done" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Database backup done"), array("CRON"));
 
-		$this->logger->info( sprintf( "Starting file archive process" ), array( "CRON" ) );
+		$this->logger->info(sprintf("Starting file archive process"), array("CRON"));
 
 		$init               = 0;
 		$return['finished'] = 0;
 		$return['extra']    = array();
 
-		while ( ! $return['finished'] ) {
-			$return = $this->archive_system->start_incremental_backup( (array) $schedule['backup_params'], $return['extra'], $init );
+		while (!$return['finished']) {
+			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init   = 0;
 		}
-		$this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) );
+		$this->logger->info(sprintf("File archive process FINISHED."), array("CRON"));
 
         //getting the last backup archive file
         $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if ( $this->xcloner_file_system->is_part( $this->archive_system->get_archive_name_with_extension() ) ) {
+		if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
 			$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		}
 
 		//Updating schedule last backup archive
-        $this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] );
+        $this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 
 		//Encrypting the backup archive
         $return_encrypted['finished'] = 0;
@@ -301,8 +301,8 @@ 
         $part = 0;
         $backup_parts = array();
 
-        if( $schedule['backup_params']->backup_encrypt){
-            $this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) );
+        if ($schedule['backup_params']->backup_encrypt) {
+            $this->logger->info(sprintf("Encrypting backup archive %s.", $return['extra']['backup_parent']), array("CRON"));
 
             $backup_file = $return['extra']['backup_parent'];
 
@@ -311,7 +311,7 @@ 
                 $backup_file = $backup_parts[$part];
             }
 
-            while ( ! $return_encrypted['finished'] ) {
+            while (!$return_encrypted['finished']) {
                 $return_encrypted = $this->xcloner_encryption->encrypt_file(
                                             $backup_file,
                                             "",
@@ -322,7 +322,7 @@ 
                                             true
                 );
 
-                if($return_encrypted['finished']) {
+                if ($return_encrypted['finished']) {
                     ++$part;
 
                     if ($part < sizeof($backup_parts)) {
@@ -334,37 +334,37 @@ 
         }
 
         //Sending backup to remote storage
-		if ( isset( $schedule['remote_storage'] ) && $schedule['remote_storage'] && array_key_exists( $schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages() ) ) {
+		if (isset($schedule['remote_storage']) && $schedule['remote_storage'] && array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages())) {
 			$backup_file = $return['extra']['backup_parent'];
 
-			$this->logger->info( sprintf( "Transferring backup to remote storage %s", strtoupper( $schedule['remote_storage'] ) ), array( "CRON" ) );
+			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 
-			if ( method_exists( $this->xcloner_remote_storage, "upload_backup_to_storage" ) ) {
-				call_user_func_array( array(
+			if (method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+				call_user_func_array(array(
 					$this->xcloner_remote_storage,
 					"upload_backup_to_storage"
-				), array( $backup_file, $schedule['remote_storage'] ) );
+				), array($backup_file, $schedule['remote_storage']));
 			}
 		}
 
 		//Sending email notification
-		if ( isset( $schedule['backup_params']->email_notification ) and $to = $schedule['backup_params']->email_notification ) {
+		if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification) {
 			try {
 				$from                      = "";
 				$additional['lines_total'] = $return['extra']['lines_total'];
-				$subject                   = sprintf( __( "%s - new backup generated %s" ), $schedule['name'], $return['extra']['backup_parent'] );
+				$subject                   = sprintf(__("%s - new backup generated %s"), $schedule['name'], $return['extra']['backup_parent']);
 
-				$this->archive_system->send_notification( $to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional );
+				$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'], $schedule, "", $additional);
 
-			} catch ( Exception $e ) {
-				$this->logger->error( $e->getMessage() );
+			}catch (Exception $e) {
+				$this->logger->error($e->getMessage());
 			}
 		}
 
 		//CHECK IF WE SHOULD DELETE BACKUP AFTER REMOTE TRANSFER IS DONE
-		if ( $schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option( 'xcloner_cleanup_delete_after_remote_transfer' ) ) {
-			$this->logger->info( sprintf( "Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent'] ) );
-			$this->xcloner_file_system->delete_backup_by_name( $return['extra']['backup_parent'] );
+		if ($schedule['remote_storage'] && $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_delete_after_remote_transfer')) {
+			$this->logger->info(sprintf("Deleting %s from local storage matching rule xcloner_cleanup_delete_after_remote_transfer", $return['extra']['backup_parent']));
+			$this->xcloner_file_system->delete_backup_by_name($return['extra']['backup_parent']);
 
 		}
 
@@ -378,28 +378,28 @@ 
 		$this->xcloner_file_system->cleanup_tmp_directories();
 	}
 
-	public function xcloner_scheduler_callback( $id, $schedule = "" ) {
-		if ( $id ) {
-			$schedule = $this->get_schedule_by_id( $id );
+	public function xcloner_scheduler_callback($id, $schedule = "") {
+		if ($id) {
+			$schedule = $this->get_schedule_by_id($id);
 		}
 
 		try {
-            if( get_option('xcloner_disable_email_notification') ) {
+            if (get_option('xcloner_disable_email_notification')) {
                 //we disable email notifications
                 $schedule['backup_params']->email_notification = "";
             }
-			$this->_xcloner_scheduler_callback( $id, $schedule );
+			$this->_xcloner_scheduler_callback($id, $schedule);
 
-		} catch ( Exception $e ) {
+		}catch (Exception $e) {
 
 			//send email to site admin if email notification is not set in the scheduler
-			if ( ! isset( $schedule['backup_params']->email_notification ) || ! $schedule['backup_params']->email_notification ) {
-				$schedule['backup_params']->email_notification = get_option( 'admin_email' );
+			if (!isset($schedule['backup_params']->email_notification) || !$schedule['backup_params']->email_notification) {
+				$schedule['backup_params']->email_notification = get_option('admin_email');
 			}
 
-			if ( isset( $schedule['backup_params']->email_notification ) && $to = $schedule['backup_params']->email_notification ) {
+			if (isset($schedule['backup_params']->email_notification) && $to = $schedule['backup_params']->email_notification) {
 				$from = "";
-				$this->archive_system->send_notification( $to, $from, $schedule['name'] . " - backup error", "", "", $e->getMessage() );
+				$this->archive_system->send_notification($to, $from, $schedule['name']." - backup error", "", "", $e->getMessage());
 			}
 
 		}
@@ -410,14 +410,14 @@ 
 		$schedules     = wp_get_schedules();
 		$new_schedules = array();
 
-		foreach ( $schedules as $key => $row ) {
-			if ( in_array( $key, $this->allowed_schedules ) ) {
-				$new_schedules[ $key ] = $row;
-				$intervals[ $key ]     = $row['interval'];
+		foreach ($schedules as $key => $row) {
+			if (in_array($key, $this->allowed_schedules)) {
+				$new_schedules[$key] = $row;
+				$intervals[$key]     = $row['interval'];
 			}
 		}
 
-		array_multisort( $intervals, SORT_ASC, $new_schedules );
+		array_multisort($intervals, SORT_ASC, $new_schedules);
 
 		return $new_schedules;
 	}

includes/class-xcloner-encryption.php

Indentation +362 added lines, -362 removed lines

@@ -10,373 +10,373 @@
 
 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 "";
-
-    }
-
-    /**
-     * 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 string $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 string $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 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)
-    {
-        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);
-    }
-
-    /**
-     * @param string $file
-     */
-    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 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)
-    {
-        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 "";
+
+	}
+
+	/**
+	 * 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 string $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 string $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 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)
+	{
+		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);
+	}
+
+	/**
+	 * @param string $file
+	 */
+	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 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)
+	{
+		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();
 }

Braces +1 added lines, -1 removed lines

@@ -377,6 +377,6 @@
             $xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
         }
     }
-}catch (\Exception $e) {
+} catch (\Exception $e) {
     echo "CAUGHT: ".$e->getMessage();
 }