ovidiul / XCloner-Wordpress

includes/class-xcloner-api.php

Braces +28 added lines, -20 removed lines

@@ -137,7 +137,7 @@ 
 		try {
 			$this->xcloner_database->init($data);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -312,7 +312,7 @@ 
 		try {
 			$return = $this->archive_system->start_incremental_backup($this->form_params['backup_params'],
 				$this->form_params['extra'], $init);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			$return = array();
 			$return['error'] = true;
 			$return['status'] = 500;
@@ -339,7 +339,7 @@ 
 					$additional['lines_total'] = $return['extra']['lines_total'];
 					$this->archive_system->send_notification($to, $from, $subject, $return['extra']['backup_parent'],
 						$this->form_params, "", $additional);
-				}catch (Exception $e) {
+				} catch (Exception $e) {
 					$this->logger->error($e->getMessage());
 				}
 			}
@@ -522,7 +522,7 @@ 
 
 		try {
 			$files = $this->xcloner_file_system->list_directory($folder);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			print $e->getMessage();
 			$this->logger->error($e->getMessage());
@@ -586,7 +586,7 @@ 
 		if ($database == "#") {
 			try {
 				$return = $this->xcloner_database->get_all_databases();
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -618,7 +618,7 @@ 
 
 			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -848,7 +848,7 @@ 
 			$this->logger->info($iv);
 			$return = array_merge($return,
 				$this->xcloner_encryption->encrypt_file($backup_file, "", "", $start, base64_decode($iv)));
-		}catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$return['error_message'] = $e->getMessage();
@@ -905,7 +905,7 @@ 
 		try {
 			$return = array_merge($return,
 				$this->xcloner_encryption->decrypt_file($backup_file, "", $decryption_key, $start, base64_decode($iv)));
-		}catch (\Exception $e) {
+		} catch (\Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 		}
@@ -1009,7 +1009,8 @@ 
                                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                                     <i class="material-icons">enhanced_encryption</i>
                                                 </a>
-                                            <?php else: ?>
+                                            <?php else {
+	: ?>
                                                 <a href="#<?php echo $child[0] ?>" class="list-backup-content"
                                                    title="<?php echo __('List Backup Content',
 													   'xcloner-backup-and-restore') ?>"><i
@@ -1028,7 +1029,9 @@ 
                                                         class="material-icons">file_upload</i></a>
                                         <?php endif ?>
                                     </li>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             </ul>
                         <?php endif; ?>
                 <?php
@@ -1036,11 +1039,12 @@ 
 				ob_end_clean();
 				?>
                     <?php ob_start(); ?>
-                        <?php if (isset($file_info['timestamp']))
+                        <?php if (isset($file_info['timestamp'])) {
 							echo date("Y-m-d H:i", $file_info['timestamp'])
 						?>
                     <?php
 						$return['data'][$i][] = ob_get_contents();
+}
 						ob_end_clean();
 						?>
 
@@ -1065,15 +1069,17 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if (isset($file_info['childs']) and sizeof($file_info['childs']))
-								$basename = $file_info['childs'][0][0];
+							if (isset($file_info['childs']) and sizeof($file_info['childs'])) {
+															$basename = $file_info['childs'][0][0];
+							}
 							?>
                             <?php if ($this->xcloner_encryption->is_encrypted_file($basename)) :?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="backup-decryption"
                                    title="<?php echo __('Backup Decryption', 'xcloner-backup-and-restore') ?>">
                                     <i class="material-icons">enhanced_encryption</i>
                                 </a>
-                            <?php else: ?>
+                            <?php else {
+	: ?>
                                 <a href="#<?php echo $file_info['basename'] ?>" class="list-backup-content"
                                     title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore') ?>"><i
                                     class="material-icons">folder_open</i></a>
@@ -1083,7 +1089,9 @@ 
                                     <i class="material-icons">no_encryption</i>
                                 </a>
                             <?php endif?>
-                        <?php endif; ?>
+                        <?php endif;
+}
+?>
 
                         <a href="#<?php echo $file_info['basename'] ?>" class="delete"
                            title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore') ?>">
@@ -1137,7 +1145,7 @@ 
 			$tar->open($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file, $start);
 
 			$data = $tar->contents(get_option('xcloner_files_to_process_per_request'));
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
 			$this->send_response($return, 0);
@@ -1200,7 +1208,7 @@ 
 					"copy_backup_remote_to_local"
 				), array($backup_file, $storage_type));
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1239,7 +1247,7 @@ 
 					"upload_backup_to_storage"
 				), array($backup_file, $storage_type));
 			}
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1335,7 +1343,7 @@ 
 
 		try {
 			unlink($tmp_file);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			//We are not interested in the error here
 		}
 
@@ -1430,7 +1438,7 @@ 
 			$xcloner_file_transfer->set_target($target_url);
 			$return['start'] = $xcloner_file_transfer->transfer_file($file, $start, $hash);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$return = array();
 			$return['error'] = true;

includes/class-xcloner-settings.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 				try {
 					mkdir($path);
 					chmod($path, 0777);
-				}catch(Exception $e){
+				}catch (Exception $e) {
 					//silent catch
 				}
 			}

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 				try {
 					mkdir($path);
 					chmod($path, 0777);
-				}catch(Exception $e){
+				} catch(Exception $e){
 					//silent catch
 				}
 			}

includes/class-xcloner-file-system.php

Braces +9 added lines, -7 removed lines

@@ -102,7 +102,7 @@ 
             $this->storage_filesystem_append = new Filesystem($this->storage_adapter, new Config([
                 'disable_asserts' => true,
             ]));
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error("Filesystem Initialization Error: ".$e->getMessage());
         }
 
@@ -510,7 +510,7 @@ 
 
         try {
             rmdir($this->xcloner_settings->get_xcloner_tmp_path());
-        }catch (Exception $e) {
+        } catch (Exception $e) {
             //silent continue
         }
 
@@ -649,7 +649,7 @@ 
                 }
             }
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -676,7 +676,7 @@ 
 
             $this->tmp_filesystem->delete($tmp_file);
 
-        }catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->logger->error($e->getMessage());
 
@@ -714,9 +714,11 @@ 
         foreach ($_backup_files_list as $file) {
             //processing rule folder capacity
             if ($this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit') &&
-                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit')))    //bytes
+                $_storage_size >= ($set_storage_limit = 1024 * 1024 * $this->xcloner_settings->get_xcloner_option('xcloner_cleanup_capacity_limit'))) {
+            	//bytes
             {
                 $this->storage_filesystem->delete($file['path']);
+            }
                 $_storage_size -= $file['size'];
                 $this->logger->info("Deleting backup ".$file['path']." matching rule", array(
                     "STORAGE SIZE LIMIT",
@@ -983,7 +985,7 @@ 
 		if ($file['type'] == "dir") {
 			try {
 				$this->tmp_filesystem_append->write($this->get_temp_dir_handler(), $file['path']."\n");
-			}catch (Exception $e) {
+			} catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 		}
@@ -1009,7 +1011,7 @@ 
 
 			$this->tmp_filesystem_append->write($this->get_included_files_handler(), $line);
 
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 
 			$this->logger->error($e->getMessage());
 		}

Indentation +823 added lines, -823 removed lines

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

includes/class-xcloner.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 
         $property = str_replace("get_", "", $property);
 
-        if(property_exists($this, $property)){
+        if (property_exists($this, $property)) {
             return $this->$property;
         }
     }

Indentation +23 added lines, -23 removed lines

@@ -114,13 +114,13 @@ 
 
 	}
 
-    /**
-     * Retrieve the version number of the plugin.
-     *
-     * @since     1.0.0
-     * @return    string    The version number of the plugin.
-     */
-    /*public function get_version() {
+	/**
+	 * Retrieve the version number of the plugin.
+	 *
+	 * @since     1.0.0
+	 * @return    string    The version number of the plugin.
+	 */
+	/*public function get_version() {
         return $this->version;
     }
 
@@ -179,14 +179,14 @@ 
 		return $this->xcloner_encryption;
 	}*/
 
-    public function __call($property, $args) {
+	public function __call($property, $args) {
 
-        $property = str_replace("get_", "", $property);
+		$property = str_replace("get_", "", $property);
 
-        if(property_exists($this, $property)){
-            return $this->$property;
-        }
-    }
+		if(property_exists($this, $property)){
+			return $this->$property;
+		}
+	}
 
 	public function check_dependencies() {
 
@@ -546,9 +546,9 @@ 
 		{
 			$logger->error($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}elseif ($error['type'] and $logger)
-        {
-            $logger->debug($this->friendly_error_type($error['type']).": ".var_export($error, true));
-        }
+		{
+			$logger->debug($this->friendly_error_type($error['type']).": ".var_export($error, true));
+		}
 
 	}
 
@@ -564,10 +564,10 @@ 
 		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 
-    /**
-     * @method get_xcloner_settings()
-     * @throws Exception
-     */
+	/**
+	 * @method get_xcloner_settings()
+	 * @throws Exception
+	 */
 	private function define_ajax_hooks()
 	{
 		//adding the pre-update hook
@@ -634,9 +634,9 @@ 
 			settings_errors('xcloner_error_message');
 		}
 
-    /**
-     * @method get_xcloner_scheduler()
-     */
+	/**
+	 * @method get_xcloner_scheduler()
+	 */
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals

Braces +2 added lines, -2 removed lines

@@ -515,7 +515,7 @@ 
 
 		try {
 			$this->xcloner_scheduler->xcloner_scheduler_callback(0, $schedule);
-		}catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->get_xcloner_logger()->error($e->getMessage());
 		}
 
@@ -545,7 +545,7 @@ 
 		if ($error['type'] and $error['type'] === E_ERROR and $logger)
 		{
 			$logger->error($this->friendly_error_type($error['type']).": ".var_export($error, true));
-		}elseif ($error['type'] and $logger)
+		} elseif ($error['type'] and $logger)
         {
             $logger->debug($this->friendly_error_type($error['type']).": ".var_export($error, true));
         }

includes/class-xcloner-archive.php

Indentation +10 added lines, -10 removed lines

@@ -63,10 +63,10 @@ 
 	 */
 	private $processed_size_bytes = 0;
 
-    /**
-     * The backup name encryption suffix
-     * @var string
-     */
+	/**
+	 * The backup name encryption suffix
+	 * @var string
+	 */
 	private $encrypt_suffix = "-enc";
 
 	/**
@@ -150,8 +150,8 @@ 
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 
 		if($encrypt_prefix) {
-		    $this->archive_name .= $this->encrypt_suffix;
-        }
+			$this->archive_name .= $this->encrypt_suffix;
+		}
 
 		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);
@@ -366,10 +366,10 @@ 
 		if (isset($extra_params['backup_archive_name'])) {
 			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
 		} else {
-		    $encrypt = false;
-            if(isset($backup_params['backup_encrypt']) && $backup_params['backup_encrypt']) {
-                $encrypt = true;
-            }
+			$encrypt = false;
+			if(isset($backup_params['backup_encrypt']) && $backup_params['backup_encrypt']) {
+				$encrypt = true;
+			}
 			$this->set_archive_name($backup_params['backup_name'], 0, $encrypt);
 		}
 

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
 
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 
-		if($encrypt_prefix) {
+		if ($encrypt_prefix) {
 		    $this->archive_name .= $this->encrypt_suffix;
         }
 
@@ -367,7 +367,7 @@ 
 			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
 		} else {
 		    $encrypt = false;
-            if(isset($backup_params['backup_encrypt']) && $backup_params['backup_encrypt']) {
+            if (isset($backup_params['backup_encrypt']) && $backup_params['backup_encrypt']) {
                 $encrypt = true;
             }
 			$this->set_archive_name($backup_params['backup_name'], 0, $encrypt);

includes/class-xcloner-remote-storage.php

Indentation +648 added lines, -648 removed lines

@@ -54,775 +54,775 @@
 class Xcloner_Remote_Storage
 {
 
-    private $gdrive_app_name = "XCloner Backup and Restore";
-
-    private $storage_fields = array(
-        "option_prefix" => "xcloner_",
-        "ftp" => array(
-            "text" => "FTP",
-            "ftp_enable" => "int",
-            "ftp_hostname" => "string",
-            "ftp_port" => "int",
-            "ftp_username" => "string",
-            "ftp_password" => "raw",
-            "ftp_path" => "path",
-            "ftp_transfer_mode" => "int",
-            "ftp_ssl_mode" => "int",
-            "ftp_timeout" => "int",
-            "ftp_cleanup_days" => "float",
-        ),
-        "sftp" => array(
-            "text" => "SFTP",
-            "sftp_enable" => "int",
-            "sftp_hostname" => "string",
-            "sftp_port" => "int",
-            "sftp_username" => "string",
-            "sftp_password" => "raw",
-            "sftp_path" => "path",
-            "sftp_private_key" => "raw",
-            "sftp_timeout" => "int",
-            "sftp_cleanup_days" => "float",
-        ),
-        "aws" => array(
-            "text" => "S3",
-            "aws_enable" => "int",
-            "aws_key" => "string",
-            "aws_secret" => "raw",
-            "aws_endpoint" => "string",
-            "aws_region" => "string",
-            "aws_bucket_name" => "string",
-            "aws_prefix" => "string",
-            "aws_cleanup_days" => "float",
-        ),
-        "dropbox" => array(
-            "text" => "Dropbox",
-            "dropbox_enable" => "int",
-            "dropbox_access_token" => "string",
-            "dropbox_app_secret" => "raw",
-            "dropbox_prefix" => "string",
-            "dropbox_cleanup_days" => "float",
-        ),
-        "azure" => array(
-            "text" => "Azure BLOB",
-            "azure_enable" => "int",
-            "azure_account_name" => "string",
-            "azure_api_key" => "string",
-            "azure_container" => "string",
-            "azure_cleanup_days" => "float",
-        ),
-        "backblaze" => array(
-            "text" => "Backblaze",
-            "backblaze_enable" => "int",
-            "backblaze_account_id" => "string",
-            "backblaze_application_key" => "string",
-            "backblaze_bucket_name" => "string",
-            "backblaze_cleanup_days" => "float",
-        ),
-
-        "webdav" => array(
-            "text" => "WebDAV",
-            "webdav_enable" => "int",
-            "webdav_url" => "string",
-            "webdav_username" => "string",
-            "webdav_password" => "raw",
-            "webdav_target_folder" => "string",
-            "webdav_cleanup_days" => "float",
-        ),
-
-        "gdrive" => array(
-            "text" => "Google Drive",
-            "gdrive_enable" => "int",
-            "gdrive_access_code" => "string",
-            "gdrive_client_id" => "string",
-            "gdrive_client_secret" => "raw",
-            "gdrive_target_folder" => "string",
-            "gdrive_cleanup_days" => "float",
-            "gdrive_empty_trash" => "int",
-        ),
-    );
-
-    private $aws_regions = array(
-        'us-east-1' => 'US East (N. Virginia)',
-        'us-east-2' => 'US East (Ohio)',
-        'us-west-1' => 'US West (N. California)',
-        'us-west-2' => 'US West (Oregon)',
-        'ca-central-1' => 'Canada (Central)',
-        'eu-west-1' => 'EU (Ireland)',
-        'eu-central-1' => 'EU (Frankfurt)',
-        'eu-west-2' => 'EU (London)',
-        'ap-northeast-1' => 'Asia Pacific (Tokyo)',
-        'ap-northeast-2' => 'Asia Pacific (Seoul)',
-        'ap-southeast-1' => 'Asia Pacific (Singapore)',
-        'ap-southeast-2' => 'Asia Pacific (Sydney)',
-        'ap-south-1' => 'Asia Pacific (Mumbai)',
-        'sa-east-1' => 'South America (São Paulo)'
-    );
-
-    private $xcloner_sanitization;
-    private $xcloner_file_system;
-    private $logger;
-    private $xcloner;
-
-    /**
-     * Xcloner_Remote_Storage constructor.
-     * @param Xcloner $xcloner_container
-     */
-    public function __construct(Xcloner $xcloner_container)
-    {
-        $this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
-        $this->xcloner_file_system = $xcloner_container->get_xcloner_filesystem();
-        $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
-        $this->xcloner = $xcloner_container;
-
-        foreach ($this->storage_fields as $main_key => $array) {
-
-            if (is_array($array)) {
-                foreach ($array as $key => $type) {
-
-                    if ($type == "raw") {
-                        add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-                            function ($value) {
-
-                                return $this->simple_crypt($value, 'e');
-
-                            }, 10, 1);
-
-                        add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
-
-                            return $this->simple_crypt($value, 'd');
-
-                        }, 10, 1);
-                    }
-
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Encrypts and Decrypt a string based on openssl lib
-     *
-     * @param $string
-     * @param string $action
-     * @return string
-     */
-    private function simple_crypt($string, $action = 'e')
-    {
-        // you may change these values to your own
-        $secret_key = NONCE_KEY;
-        $secret_iv = NONCE_SALT;
-
-        if (!$string) {
-            //we do no encryption for empty data
-            return $string;
-        }
-
-        $output = $string;
-        $encrypt_method = "AES-256-CBC";
-        $key = hash('sha256', $secret_key);
-        $iv = substr(hash('sha256', $secret_iv), 0, 16);
-
-        if ($action == 'e' && function_exists('openssl_encrypt')) {
-            $output = base64_encode(openssl_encrypt($string, $encrypt_method, $key, 0, $iv));
-        } else {
-            if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
-                $decrypt = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
-                if ($decrypt) {
-                    //we check if decrypt was succesful
-                    $output = $decrypt;
-                }
-            }
-        }
-
-        return $output;
-    }
-
-    private function get_xcloner_container()
-    {
-        return $this->xcloner;
-    }
-
-    public function get_available_storages()
-    {
-        $return = array();
-        foreach ($this->storage_fields as $storage => $data) {
-            $check_field = $this->storage_fields["option_prefix"] . $storage . "_enable";
-            if (get_option($check_field)) {
-                $return[$storage] = $data['text'];
-            }
-        }
-
-        return $return;
-    }
-
-    public function save($action = "ftp")
-    {
-        if (!$action) {
-            return false;
-        }
-
-        $storage = $this->xcloner_sanitization->sanitize_input_as_string($action);
-        $this->logger->debug(sprintf("Saving the remote storage %s options", strtoupper($action)));
-
-        if (is_array($this->storage_fields[$storage])) {
-            foreach ($this->storage_fields[$storage] as $field => $validation) {
-                $check_field = $this->storage_fields["option_prefix"] . $field;
-                $sanitize_method = "sanitize_input_as_" . $validation;
-
-                if (!isset($_POST[$check_field])) {
-                    $_POST[$check_field] = 0;
-                }
-
-                if (!method_exists($this->xcloner_sanitization, $sanitize_method)) {
-                    $sanitize_method = "sanitize_input_as_string";
-                }
-
-                $sanitized_value = $this->xcloner_sanitization->$sanitize_method(stripslashes($_POST[$check_field]));
-                update_option($check_field, $sanitized_value);
-            }
-
-            $this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success",
-                $this->storage_fields[$action]['text']);
-        }
-
-    }
-
-    public function check($action = "ftp")
-    {
-        try {
-            $this->verify_filesystem($action);
-            $this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success",
-                $this->storage_fields[$action]['text']);
-            $this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));
-        } catch (Exception $e) {
-            $this->xcloner->trigger_message("%s connection error: " . $e->getMessage(), "error",
-                $this->storage_fields[$action]['text']);
-        }
-    }
-
-    /**
-     * @param string $storage_type
-     */
-    public function verify_filesystem($storage_type)
-    {
-        $method = "get_" . $storage_type . "_filesystem";
-
-        $this->logger->info(sprintf("Checking validity of the remote storage %s filesystem",
-            strtoupper($storage_type)));
-
-        if (!method_exists($this, $method)) {
-            return false;
-        }
-
-        list($adapter, $filesystem) = $this->$method();
-
-        $test_file = substr(".xcloner_" . md5(time()), 0, 15);
-
-        if ($storage_type == "gdrive") {
-            if (!is_array($filesystem->listContents())) {
-                throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
-            }
-            $this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));
-
-            return true;
-        }
-
-        //testing write access
-        if (!$filesystem->write($test_file, "data")) {
-            throw new Exception(__("Could not write data", 'xcloner-backup-and-restore'));
-        }
-        $this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));
-
-        //testing read access
-        if (!$filesystem->has($test_file)) {
-            throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
-        }
-        $this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));
-
-        //delete test file
-        if (!$filesystem->delete($test_file)) {
-            throw new Exception(__("Could not delete data", 'xcloner-backup-and-restore'));
-        }
-        $this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));
-
-        return true;
-    }
-
-    public function upload_backup_to_storage($file, $storage)
-    {
-        if (!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+	private $gdrive_app_name = "XCloner Backup and Restore";
+
+	private $storage_fields = array(
+		"option_prefix" => "xcloner_",
+		"ftp" => array(
+			"text" => "FTP",
+			"ftp_enable" => "int",
+			"ftp_hostname" => "string",
+			"ftp_port" => "int",
+			"ftp_username" => "string",
+			"ftp_password" => "raw",
+			"ftp_path" => "path",
+			"ftp_transfer_mode" => "int",
+			"ftp_ssl_mode" => "int",
+			"ftp_timeout" => "int",
+			"ftp_cleanup_days" => "float",
+		),
+		"sftp" => array(
+			"text" => "SFTP",
+			"sftp_enable" => "int",
+			"sftp_hostname" => "string",
+			"sftp_port" => "int",
+			"sftp_username" => "string",
+			"sftp_password" => "raw",
+			"sftp_path" => "path",
+			"sftp_private_key" => "raw",
+			"sftp_timeout" => "int",
+			"sftp_cleanup_days" => "float",
+		),
+		"aws" => array(
+			"text" => "S3",
+			"aws_enable" => "int",
+			"aws_key" => "string",
+			"aws_secret" => "raw",
+			"aws_endpoint" => "string",
+			"aws_region" => "string",
+			"aws_bucket_name" => "string",
+			"aws_prefix" => "string",
+			"aws_cleanup_days" => "float",
+		),
+		"dropbox" => array(
+			"text" => "Dropbox",
+			"dropbox_enable" => "int",
+			"dropbox_access_token" => "string",
+			"dropbox_app_secret" => "raw",
+			"dropbox_prefix" => "string",
+			"dropbox_cleanup_days" => "float",
+		),
+		"azure" => array(
+			"text" => "Azure BLOB",
+			"azure_enable" => "int",
+			"azure_account_name" => "string",
+			"azure_api_key" => "string",
+			"azure_container" => "string",
+			"azure_cleanup_days" => "float",
+		),
+		"backblaze" => array(
+			"text" => "Backblaze",
+			"backblaze_enable" => "int",
+			"backblaze_account_id" => "string",
+			"backblaze_application_key" => "string",
+			"backblaze_bucket_name" => "string",
+			"backblaze_cleanup_days" => "float",
+		),
+
+		"webdav" => array(
+			"text" => "WebDAV",
+			"webdav_enable" => "int",
+			"webdav_url" => "string",
+			"webdav_username" => "string",
+			"webdav_password" => "raw",
+			"webdav_target_folder" => "string",
+			"webdav_cleanup_days" => "float",
+		),
+
+		"gdrive" => array(
+			"text" => "Google Drive",
+			"gdrive_enable" => "int",
+			"gdrive_access_code" => "string",
+			"gdrive_client_id" => "string",
+			"gdrive_client_secret" => "raw",
+			"gdrive_target_folder" => "string",
+			"gdrive_cleanup_days" => "float",
+			"gdrive_empty_trash" => "int",
+		),
+	);
+
+	private $aws_regions = array(
+		'us-east-1' => 'US East (N. Virginia)',
+		'us-east-2' => 'US East (Ohio)',
+		'us-west-1' => 'US West (N. California)',
+		'us-west-2' => 'US West (Oregon)',
+		'ca-central-1' => 'Canada (Central)',
+		'eu-west-1' => 'EU (Ireland)',
+		'eu-central-1' => 'EU (Frankfurt)',
+		'eu-west-2' => 'EU (London)',
+		'ap-northeast-1' => 'Asia Pacific (Tokyo)',
+		'ap-northeast-2' => 'Asia Pacific (Seoul)',
+		'ap-southeast-1' => 'Asia Pacific (Singapore)',
+		'ap-southeast-2' => 'Asia Pacific (Sydney)',
+		'ap-south-1' => 'Asia Pacific (Mumbai)',
+		'sa-east-1' => 'South America (São Paulo)'
+	);
+
+	private $xcloner_sanitization;
+	private $xcloner_file_system;
+	private $logger;
+	private $xcloner;
+
+	/**
+	 * Xcloner_Remote_Storage constructor.
+	 * @param Xcloner $xcloner_container
+	 */
+	public function __construct(Xcloner $xcloner_container)
+	{
+		$this->xcloner_sanitization = $xcloner_container->get_xcloner_sanitization();
+		$this->xcloner_file_system = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
+		$this->xcloner = $xcloner_container;
+
+		foreach ($this->storage_fields as $main_key => $array) {
+
+			if (is_array($array)) {
+				foreach ($array as $key => $type) {
+
+					if ($type == "raw") {
+						add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
+							function ($value) {
+
+								return $this->simple_crypt($value, 'e');
+
+							}, 10, 1);
+
+						add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+
+							return $this->simple_crypt($value, 'd');
+
+						}, 10, 1);
+					}
+
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Encrypts and Decrypt a string based on openssl lib
+	 *
+	 * @param $string
+	 * @param string $action
+	 * @return string
+	 */
+	private function simple_crypt($string, $action = 'e')
+	{
+		// you may change these values to your own
+		$secret_key = NONCE_KEY;
+		$secret_iv = NONCE_SALT;
+
+		if (!$string) {
+			//we do no encryption for empty data
+			return $string;
+		}
+
+		$output = $string;
+		$encrypt_method = "AES-256-CBC";
+		$key = hash('sha256', $secret_key);
+		$iv = substr(hash('sha256', $secret_iv), 0, 16);
+
+		if ($action == 'e' && function_exists('openssl_encrypt')) {
+			$output = base64_encode(openssl_encrypt($string, $encrypt_method, $key, 0, $iv));
+		} else {
+			if ($action == 'd' && function_exists('openssl_decrypt') && base64_decode($string)) {
+				$decrypt = openssl_decrypt(base64_decode($string), $encrypt_method, $key, 0, $iv);
+				if ($decrypt) {
+					//we check if decrypt was succesful
+					$output = $decrypt;
+				}
+			}
+		}
+
+		return $output;
+	}
+
+	private function get_xcloner_container()
+	{
+		return $this->xcloner;
+	}
+
+	public function get_available_storages()
+	{
+		$return = array();
+		foreach ($this->storage_fields as $storage => $data) {
+			$check_field = $this->storage_fields["option_prefix"] . $storage . "_enable";
+			if (get_option($check_field)) {
+				$return[$storage] = $data['text'];
+			}
+		}
+
+		return $return;
+	}
+
+	public function save($action = "ftp")
+	{
+		if (!$action) {
+			return false;
+		}
+
+		$storage = $this->xcloner_sanitization->sanitize_input_as_string($action);
+		$this->logger->debug(sprintf("Saving the remote storage %s options", strtoupper($action)));
+
+		if (is_array($this->storage_fields[$storage])) {
+			foreach ($this->storage_fields[$storage] as $field => $validation) {
+				$check_field = $this->storage_fields["option_prefix"] . $field;
+				$sanitize_method = "sanitize_input_as_" . $validation;
+
+				if (!isset($_POST[$check_field])) {
+					$_POST[$check_field] = 0;
+				}
+
+				if (!method_exists($this->xcloner_sanitization, $sanitize_method)) {
+					$sanitize_method = "sanitize_input_as_string";
+				}
+
+				$sanitized_value = $this->xcloner_sanitization->$sanitize_method(stripslashes($_POST[$check_field]));
+				update_option($check_field, $sanitized_value);
+			}
+
+			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success",
+				$this->storage_fields[$action]['text']);
+		}
+
+	}
+
+	public function check($action = "ftp")
+	{
+		try {
+			$this->verify_filesystem($action);
+			$this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success",
+				$this->storage_fields[$action]['text']);
+			$this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));
+		} catch (Exception $e) {
+			$this->xcloner->trigger_message("%s connection error: " . $e->getMessage(), "error",
+				$this->storage_fields[$action]['text']);
+		}
+	}
+
+	/**
+	 * @param string $storage_type
+	 */
+	public function verify_filesystem($storage_type)
+	{
+		$method = "get_" . $storage_type . "_filesystem";
+
+		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem",
+			strtoupper($storage_type)));
+
+		if (!method_exists($this, $method)) {
+			return false;
+		}
+
+		list($adapter, $filesystem) = $this->$method();
+
+		$test_file = substr(".xcloner_" . md5(time()), 0, 15);
+
+		if ($storage_type == "gdrive") {
+			if (!is_array($filesystem->listContents())) {
+				throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
+			}
+			$this->logger->debug(sprintf("I can list data from remote storage %s", strtoupper($storage_type)));
+
+			return true;
+		}
+
+		//testing write access
+		if (!$filesystem->write($test_file, "data")) {
+			throw new Exception(__("Could not write data", 'xcloner-backup-and-restore'));
+		}
+		$this->logger->debug(sprintf("I can write data to remote storage %s", strtoupper($storage_type)));
+
+		//testing read access
+		if (!$filesystem->has($test_file)) {
+			throw new Exception(__("Could not read data", 'xcloner-backup-and-restore'));
+		}
+		$this->logger->debug(sprintf("I can read data to remote storage %s", strtoupper($storage_type)));
+
+		//delete test file
+		if (!$filesystem->delete($test_file)) {
+			throw new Exception(__("Could not delete data", 'xcloner-backup-and-restore'));
+		}
+		$this->logger->debug(sprintf("I can delete data to remote storage %s", strtoupper($storage_type)));
+
+		return true;
+	}
+
+	public function upload_backup_to_storage($file, $storage)
+	{
+		if (!$this->xcloner_file_system->get_storage_filesystem()->has($file)) {
+			$this->logger->info(sprintf("File not found %s in local storage", $file));
+
+			return false;
+		}
+
+		$method = "get_" . $storage . "_filesystem";
+
+		if (!method_exists($this, $method)) {
+			return false;
+		}
+
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
+
+		//doing remote storage cleaning here
+		$this->clean_remote_storage($storage, $remote_storage_filesystem);
+
+		$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $file, strtoupper($storage)),
+			array(""));
+
+		/*if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
+        {
             $this->logger->info(sprintf("File not found %s in local storage", $file));
-
             return false;
-        }
-
-        $method = "get_" . $storage . "_filesystem";
-
-        if (!method_exists($this, $method)) {
-            return false;
-        }
+        }*/
 
-        list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
+		$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($file);
 
-        //doing remote storage cleaning here
-        $this->clean_remote_storage($storage, $remote_storage_filesystem);
+		if (!$remote_storage_filesystem->writeStream($file, $backup_file_stream)) {
+			$this->logger->info(sprintf("Could not transfer file %s", $file));
 
-        $this->logger->info(sprintf("Transferring backup %s to remote storage %s", $file, strtoupper($storage)),
-            array(""));
+			return false;
+		}
 
-        /*if(!$this->xcloner_file_system->get_storage_filesystem()->has($file))
-        {
-            $this->logger->info(sprintf("File not found %s in local storage", $file));
-            return false;
-        }*/
+		if ($this->xcloner_file_system->is_multipart($file)) {
+			$parts = $this->xcloner_file_system->get_multipart_files($file);
+			if (is_array($parts)) {
+				foreach ($parts as $part_file) {
+					$this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file,
+						strtoupper($storage)), array(""));
 
-        $backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($file);
+					$backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
+					if (!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream)) {
+						return false;
+					}
+				}
+			}
+		}
 
-        if (!$remote_storage_filesystem->writeStream($file, $backup_file_stream)) {
-            $this->logger->info(sprintf("Could not transfer file %s", $file));
+		$this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
 
-            return false;
-        }
+		return true;
 
-        if ($this->xcloner_file_system->is_multipart($file)) {
-            $parts = $this->xcloner_file_system->get_multipart_files($file);
-            if (is_array($parts)) {
-                foreach ($parts as $part_file) {
-                    $this->logger->info(sprintf("Transferring backup %s to remote storage %s", $part_file,
-                        strtoupper($storage)), array(""));
+	}
 
-                    $backup_file_stream = $this->xcloner_file_system->get_storage_filesystem()->readStream($part_file);
-                    if (!$remote_storage_filesystem->writeStream($part_file, $backup_file_stream)) {
-                        return false;
-                    }
-                }
-            }
-        }
+	public function copy_backup_remote_to_local($file, $storage)
+	{
+		$method = "get_" . $storage . "_filesystem";
 
-        $this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
+		$target_filename = $file;
 
-        return true;
+		if (!method_exists($this, $method)) {
+			return false;
+		}
 
-    }
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
-    public function copy_backup_remote_to_local($file, $storage)
-    {
-        $method = "get_" . $storage . "_filesystem";
+		if (!$remote_storage_filesystem->has($file)) {
+			$this->logger->info(sprintf("File not found %s in remote storage %s", $file, strtoupper($storage)));
 
-        $target_filename = $file;
+			return false;
+		}
 
-        if (!method_exists($this, $method)) {
-            return false;
-        }
+		if ($storage == "gdrive") {
+			$metadata = $remote_storage_filesystem->getMetadata($file);
+			$target_filename = $metadata['filename'] . "." . $metadata['extension'];
+		}
 
-        list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
+		$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $file,
+			strtoupper($storage)), array(""));
 
-        if (!$remote_storage_filesystem->has($file)) {
-            $this->logger->info(sprintf("File not found %s in remote storage %s", $file, strtoupper($storage)));
+		$backup_file_stream = $remote_storage_filesystem->readStream($file);
 
-            return false;
-        }
+		if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($target_filename, $backup_file_stream)) {
+			$this->logger->info(sprintf("Could not transfer file %s", $file));
 
-        if ($storage == "gdrive") {
-            $metadata = $remote_storage_filesystem->getMetadata($file);
-            $target_filename = $metadata['filename'] . "." . $metadata['extension'];
-        }
+			return false;
+		}
 
-        $this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $file,
-            strtoupper($storage)), array(""));
+		if ($this->xcloner_file_system->is_multipart($target_filename)) {
+			$parts = $this->xcloner_file_system->get_multipart_files($file, $storage);
+			if (is_array($parts)) {
+				foreach ($parts as $part_file) {
+					$this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $part_file,
+						strtoupper($storage)), array(""));
 
-        $backup_file_stream = $remote_storage_filesystem->readStream($file);
+					$backup_file_stream = $remote_storage_filesystem->readStream($part_file);
+					if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file,
+						$backup_file_stream)) {
+						return false;
+					}
+				}
+			}
+		}
 
-        if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($target_filename, $backup_file_stream)) {
-            $this->logger->info(sprintf("Could not transfer file %s", $file));
+		$this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
 
-            return false;
-        }
+		return true;
 
-        if ($this->xcloner_file_system->is_multipart($target_filename)) {
-            $parts = $this->xcloner_file_system->get_multipart_files($file, $storage);
-            if (is_array($parts)) {
-                foreach ($parts as $part_file) {
-                    $this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $part_file,
-                        strtoupper($storage)), array(""));
-
-                    $backup_file_stream = $remote_storage_filesystem->readStream($part_file);
-                    if (!$this->xcloner_file_system->get_storage_filesystem()->writeStream($part_file,
-                        $backup_file_stream)) {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        $this->logger->info(sprintf("Upload done, disconnecting from remote storage %s", strtoupper($storage)));
-
-        return true;
+	}
 
-    }
-
-    public function clean_remote_storage($storage, $remote_storage_filesystem)
-    {
-        $check_field = $this->storage_fields["option_prefix"] . $storage . "_cleanup_days";
-        if ($expire_days = get_option($check_field)) {
-            $this->logger->info(sprintf("Doing %s remote storage cleanup for %s days limit", strtoupper($storage),
-                $expire_days));
-            $files = $remote_storage_filesystem->listContents();
+	public function clean_remote_storage($storage, $remote_storage_filesystem)
+	{
+		$check_field = $this->storage_fields["option_prefix"] . $storage . "_cleanup_days";
+		if ($expire_days = get_option($check_field)) {
+			$this->logger->info(sprintf("Doing %s remote storage cleanup for %s days limit", strtoupper($storage),
+				$expire_days));
+			$files = $remote_storage_filesystem->listContents();
 
-            $current_timestamp = strtotime("-" . $expire_days . " days");
+			$current_timestamp = strtotime("-" . $expire_days . " days");
 
-            if (is_array($files)) {
-                foreach ($files as $file) {
-                    $file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
+			if (is_array($files)) {
+				foreach ($files as $file) {
+					$file['timestamp'] = $remote_storage_filesystem->getTimestamp($file['path']);
 
-                    if ($current_timestamp >= $file['timestamp']) {
-                        $remote_storage_filesystem->delete($file['path']);
-                        $this->logger->info("Deleting remote file " . $file['path'] . " matching rule", array(
-                            "RETENTION LIMIT TIMESTAMP",
-                            $file['timestamp'] . " =< " . $expire_days
-                        ));
-                    }
+					if ($current_timestamp >= $file['timestamp']) {
+						$remote_storage_filesystem->delete($file['path']);
+						$this->logger->info("Deleting remote file " . $file['path'] . " matching rule", array(
+							"RETENTION LIMIT TIMESTAMP",
+							$file['timestamp'] . " =< " . $expire_days
+						));
+					}
 
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
 
-    public function get_azure_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the AZURE BLOB remote storage connection"), array(""));
+	public function get_azure_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the AZURE BLOB remote storage connection"), array(""));
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("AZURE BLOB requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("AZURE BLOB requires PHP 5.6 to be installed!");
+		}
 
-        if (!class_exists('XmlWriter')) {
-            throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
-        }
+		if (!class_exists('XmlWriter')) {
+			throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
+		}
 
-        $endpoint = sprintf(
-            'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
-            get_option("xcloner_azure_account_name"),
-            get_option("xcloner_azure_api_key")
-        );
+		$endpoint = sprintf(
+			'DefaultEndpointsProtocol=https;AccountName=%s;AccountKey=%s',
+			get_option("xcloner_azure_account_name"),
+			get_option("xcloner_azure_api_key")
+		);
 
-        $blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
+		$blobRestProxy = ServicesBuilder::getInstance()->createBlobService($endpoint);
 
-        $adapter = new AzureAdapter($blobRestProxy, get_option("xcloner_azure_container"));
+		$adapter = new AzureAdapter($blobRestProxy, get_option("xcloner_azure_container"));
 
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_dropbox_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the DROPBOX remote storage connection"), array(""));
+	public function get_dropbox_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the DROPBOX remote storage connection"), array(""));
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("DROPBOX requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("DROPBOX requires PHP 5.6 to be installed!");
+		}
 
-        $client = new DropboxClient(get_option("xcloner_dropbox_access_token"));
-        $adapter = new DropboxAdapter($client, get_option("xcloner_dropbox_prefix"));
+		$client = new DropboxClient(get_option("xcloner_dropbox_access_token"));
+		$adapter = new DropboxAdapter($client, get_option("xcloner_dropbox_prefix"));
 
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_aws_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the S3 remote storage connection"), array(""));
+	public function get_aws_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the S3 remote storage connection"), array(""));
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("S3 class requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("S3 class requires PHP 5.6 to be installed!");
+		}
 
-        if (!class_exists('XmlWriter')) {
-            throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
-        }
+		if (!class_exists('XmlWriter')) {
+			throw new Exception("AZURE BLOB requires libxml PHP module to be installed with XmlWriter class enabled!");
+		}
 
 
-        $credentials = array(
-            'credentials' => array(
-                'key' => get_option("xcloner_aws_key"),
-                'secret' => get_option("xcloner_aws_secret")
-            ),
-            'region' => get_option("xcloner_aws_region"),
-            'version' => 'latest',
-        );
+		$credentials = array(
+			'credentials' => array(
+				'key' => get_option("xcloner_aws_key"),
+				'secret' => get_option("xcloner_aws_secret")
+			),
+			'region' => get_option("xcloner_aws_region"),
+			'version' => 'latest',
+		);
 
-        if (get_option('xcloner_aws_endpoint') != "" && !get_option("xcloner_aws_region")) {
+		if (get_option('xcloner_aws_endpoint') != "" && !get_option("xcloner_aws_region")) {
 
-            $credentials['endpoint'] = get_option('xcloner_aws_endpoint');
-            #$credentials['use_path_style_endpoint'] = true;
-            #$credentials['bucket_endpoint'] = false;
+			$credentials['endpoint'] = get_option('xcloner_aws_endpoint');
+			#$credentials['use_path_style_endpoint'] = true;
+			#$credentials['bucket_endpoint'] = false;
 
 
-        }
+		}
 
-        $client = new S3Client($credentials);
+		$client = new S3Client($credentials);
 
-        $adapter = new AwsS3Adapter($client, get_option("xcloner_aws_bucket_name"), get_option("xcloner_aws_prefix"));
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$adapter = new AwsS3Adapter($client, get_option("xcloner_aws_bucket_name"), get_option("xcloner_aws_prefix"));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_backblaze_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the BACKBLAZE remote storage connection"), array(""));
+	public function get_backblaze_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the BACKBLAZE remote storage connection"), array(""));
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("BACKBLAZE API requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("BACKBLAZE API requires PHP 5.6 to be installed!");
+		}
 
 
-        $client = new B2Client(get_option("xcloner_backblaze_account_id"),
-            get_option("xcloner_backblaze_application_key"));
-        $adapter = new BackblazeAdapter($client, get_option("xcloner_backblaze_bucket_name"));
+		$client = new B2Client(get_option("xcloner_backblaze_account_id"),
+			get_option("xcloner_backblaze_application_key"));
+		$adapter = new BackblazeAdapter($client, get_option("xcloner_backblaze_bucket_name"));
 
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_webdav_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the WEBDAV remote storage connection"), array(""));
+	public function get_webdav_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the WEBDAV remote storage connection"), array(""));
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("WEBDAV API requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("WEBDAV API requires PHP 5.6 to be installed!");
+		}
 
-        $settings = array(
-            'baseUri' => get_option("xcloner_webdav_url"),
-            'userName' => get_option("xcloner_webdav_username"),
-            'password' => get_option("xcloner_webdav_password"),
-            //'proxy' => 'locahost:8888',
-        );
+		$settings = array(
+			'baseUri' => get_option("xcloner_webdav_url"),
+			'userName' => get_option("xcloner_webdav_username"),
+			'password' => get_option("xcloner_webdav_password"),
+			//'proxy' => 'locahost:8888',
+		);
 
 
-        $client = new SabreClient($settings);
-        $adapter = new WebDAVAdapter($client, get_option("xcloner_webdav_target_folder"));
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$client = new SabreClient($settings);
+		$adapter = new WebDAVAdapter($client, get_option("xcloner_webdav_target_folder"));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
 
-    public function gdrive_construct()
-    {
+	public function gdrive_construct()
+	{
 
-        //if((function_exists("is_plugin_active") && !is_plugin_active("xcloner-google-drive/xcloner-google-drive.php")) || !file_exists(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php"))
-        if (!class_exists('Google_Client')) {
-            return false;
-        }
+		//if((function_exists("is_plugin_active") && !is_plugin_active("xcloner-google-drive/xcloner-google-drive.php")) || !file_exists(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php"))
+		if (!class_exists('Google_Client')) {
+			return false;
+		}
 
-        //require_once(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php");
+		//require_once(__DIR__ . "/../../xcloner-google-drive/vendor/autoload.php");
 
-        $client = new \Google_Client();
-        $client->setApplicationName($this->gdrive_app_name);
-        $client->setClientId(get_option("xcloner_gdrive_client_id"));
-        $client->setClientSecret(get_option("xcloner_gdrive_client_secret"));
+		$client = new \Google_Client();
+		$client->setApplicationName($this->gdrive_app_name);
+		$client->setClientId(get_option("xcloner_gdrive_client_id"));
+		$client->setClientSecret(get_option("xcloner_gdrive_client_secret"));
 
-        //$redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page&action=set_gdrive_code";
-        $redirect_uri = "urn:ietf:wg:oauth:2.0:oob";
+		//$redirect_uri = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page&action=set_gdrive_code";
+		$redirect_uri = "urn:ietf:wg:oauth:2.0:oob";
 
-        $client->setRedirectUri($redirect_uri); //urn:ietf:wg:oauth:2.0:oob
-        $client->addScope("https://www.googleapis.com/auth/drive");
-        $client->setAccessType('offline');
+		$client->setRedirectUri($redirect_uri); //urn:ietf:wg:oauth:2.0:oob
+		$client->addScope("https://www.googleapis.com/auth/drive");
+		$client->setAccessType('offline');
 
-        return $client;
-    }
+		return $client;
+	}
 
-    public function get_gdrive_auth_url()
-    {
-        $client = $this->gdrive_construct();
+	public function get_gdrive_auth_url()
+	{
+		$client = $this->gdrive_construct();
 
-        if (!$client) {
-            return false;
-        }
+		if (!$client) {
+			return false;
+		}
 
-        return $authUrl = $client->createAuthUrl();
-    }
+		return $authUrl = $client->createAuthUrl();
+	}
 
-    public function set_access_token($code)
-    {
-        $client = $this->gdrive_construct();
+	public function set_access_token($code)
+	{
+		$client = $this->gdrive_construct();
 
-        if (!$client) {
-            $error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
-            $this->logger->error($error_msg);
+		if (!$client) {
+			$error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
+			$this->logger->error($error_msg);
 
-            return false;
-        }
+			return false;
+		}
 
-        $token = $client->fetchAccessTokenWithAuthCode($code);
-        $client->setAccessToken($token);
+		$token = $client->fetchAccessTokenWithAuthCode($code);
+		$client->setAccessToken($token);
 
-        update_option("xcloner_gdrive_access_token", $token['access_token']);
-        update_option("xcloner_gdrive_refresh_token", $token['refresh_token']);
+		update_option("xcloner_gdrive_access_token", $token['access_token']);
+		update_option("xcloner_gdrive_refresh_token", $token['refresh_token']);
 
-        $redirect_url = ('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?page=xcloner_remote_storage_page#gdrive");
+		$redirect_url = ('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?page=xcloner_remote_storage_page#gdrive");
 
-        ?>
+		?>
         <script>
             window.location = '<?php echo $redirect_url?>';
         </script>
         <?php
 
-    }
+	}
 
-    /*
+	/*
      * php composer.phar remove nao-pon/flysystem-google-drive
      *
      */
-    public function get_gdrive_filesystem()
-    {
+	public function get_gdrive_filesystem()
+	{
 
-        if (version_compare(phpversion(), '5.6.0', '<')) {
-            throw new Exception("Google Drive API requires PHP 5.6 to be installed!");
-        }
+		if (version_compare(phpversion(), '5.6.0', '<')) {
+			throw new Exception("Google Drive API requires PHP 5.6 to be installed!");
+		}
 
-        $this->logger->info(sprintf("Creating the Google Drive remote storage connection"), array(""));
+		$this->logger->info(sprintf("Creating the Google Drive remote storage connection"), array(""));
 
-        $client = $this->gdrive_construct();
+		$client = $this->gdrive_construct();
 
-        if (!$client) {
-            $error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
-            $this->logger->error($error_msg);
-            throw new Exception($error_msg);
-        }
+		if (!$client) {
+			$error_msg = "Could not initialize the Google Drive Class, please check that the xcloner-google-drive plugin is enabled...";
+			$this->logger->error($error_msg);
+			throw new Exception($error_msg);
+		}
 
-        $client->refreshToken(get_option("xcloner_gdrive_refresh_token"));
+		$client->refreshToken(get_option("xcloner_gdrive_refresh_token"));
 
-        $service = new \Google_Service_Drive($client);
+		$service = new \Google_Service_Drive($client);
 
-        if (get_option("xcloner_gdrive_empty_trash", 0)) {
-            $this->logger->info(sprintf("Doing a Google Drive emptyTrash call"), array(""));
-            $service->files->emptyTrash();
-        }
+		if (get_option("xcloner_gdrive_empty_trash", 0)) {
+			$this->logger->info(sprintf("Doing a Google Drive emptyTrash call"), array(""));
+			$service->files->emptyTrash();
+		}
 
-        $parent = 'root';
-        $dir = basename(get_option("xcloner_gdrive_target_folder"));
+		$parent = 'root';
+		$dir = basename(get_option("xcloner_gdrive_target_folder"));
 
-        $folderID = get_option("xcloner_gdrive_target_folder");
+		$folderID = get_option("xcloner_gdrive_target_folder");
 
-        $tmp = parse_url($folderID);
+		$tmp = parse_url($folderID);
 
-        if (isset($tmp['query'])) {
-            $folderID = str_replace("id=", "", $tmp['query']);
-        }
+		if (isset($tmp['query'])) {
+			$folderID = str_replace("id=", "", $tmp['query']);
+		}
 
-        if (stristr($folderID, "/")) {
-            $query = sprintf('mimeType = \'application/vnd.google-apps.folder\' and \'%s\' in parents and name contains \'%s\'',
-                $parent, $dir);
-            $response = $service->files->listFiles([
-                'pageSize' => 1,
-                'q' => $query
-            ]);
+		if (stristr($folderID, "/")) {
+			$query = sprintf('mimeType = \'application/vnd.google-apps.folder\' and \'%s\' in parents and name contains \'%s\'',
+				$parent, $dir);
+			$response = $service->files->listFiles([
+				'pageSize' => 1,
+				'q' => $query
+			]);
 
-            if (sizeof($response)) {
-                foreach ($response as $obj) {
-                    $folderID = $obj->getId();
-                }
-            } else {
-                $this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s",
-                    'xcloner-backup-and-restore'), $folderID), "error");
-            }
-        }
+			if (sizeof($response)) {
+				foreach ($response as $obj) {
+					$folderID = $obj->getId();
+				}
+			} else {
+				$this->xcloner->trigger_message(sprintf(__("Could not find folder ID by name %s",
+					'xcloner-backup-and-restore'), $folderID), "error");
+			}
+		}
 
-        $this->logger->info(sprintf("Using target folder with ID %s on the remote storage", $folderID));
+		$this->logger->info(sprintf("Using target folder with ID %s on the remote storage", $folderID));
 
-        if (class_exists('XCloner_Google_Drive_Adapter')) {
-            $adapter = new XCloner_Google_Drive_Adapter($service, $folderID);
-        } else {
-            $adapter = new \Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter($service, $folderID);
-        }
+		if (class_exists('XCloner_Google_Drive_Adapter')) {
+			$adapter = new XCloner_Google_Drive_Adapter($service, $folderID);
+		} else {
+			$adapter = new \Hypweb\Flysystem\GoogleDrive\GoogleDriveAdapter($service, $folderID);
+		}
 
-        $filesystem = new \League\Flysystem\Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$filesystem = new \League\Flysystem\Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_ftp_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the FTP remote storage connection"), array(""));
+	public function get_ftp_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the FTP remote storage connection"), array(""));
 
-        $adapter = new Adapter([
-            'host' => get_option("xcloner_ftp_hostname"),
-            'username' => get_option("xcloner_ftp_username"),
-            'password' => get_option("xcloner_ftp_password"),
+		$adapter = new Adapter([
+			'host' => get_option("xcloner_ftp_hostname"),
+			'username' => get_option("xcloner_ftp_username"),
+			'password' => get_option("xcloner_ftp_password"),
 
-            /** optional config settings */
-            'port' => get_option("xcloner_ftp_port", 21),
-            'root' => get_option("xcloner_ftp_path"),
-            'passive' => get_option("xcloner_ftp_transfer_mode"),
-            'ssl' => get_option("xcloner_ftp_ssl_mode"),
-            'timeout' => get_option("xcloner_ftp_timeout", 30),
-        ]);
+			/** optional config settings */
+			'port' => get_option("xcloner_ftp_port", 21),
+			'root' => get_option("xcloner_ftp_path"),
+			'passive' => get_option("xcloner_ftp_transfer_mode"),
+			'ssl' => get_option("xcloner_ftp_ssl_mode"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
+		]);
 
-        $adapter->connect();
+		$adapter->connect();
 
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
 
-        return array($adapter, $filesystem);
-    }
+		return array($adapter, $filesystem);
+	}
 
-    public function get_sftp_filesystem()
-    {
-        $this->logger->info(sprintf("Creating the SFTP remote storage connection"), array(""));
+	public function get_sftp_filesystem()
+	{
+		$this->logger->info(sprintf("Creating the SFTP remote storage connection"), array(""));
 
-        $adapter = new SftpAdapter([
-            'host' => get_option("xcloner_sftp_hostname"),
-            'username' => get_option("xcloner_sftp_username"),
-            'password' => get_option("xcloner_sftp_password"),
+		$adapter = new SftpAdapter([
+			'host' => get_option("xcloner_sftp_hostname"),
+			'username' => get_option("xcloner_sftp_username"),
+			'password' => get_option("xcloner_sftp_password"),
 
-            /** optional config settings */
-            'port' => get_option("xcloner_sftp_port", 22),
-            'root' => (get_option("xcloner_sftp_path")?get_option("xcloner_sftp_path"):'./'),
-            'privateKey' => get_option("xcloner_sftp_private_key"),
-            'timeout' => get_option("xcloner_ftp_timeout", 30),
-        ]);
-
-        $adapter->connect();
-
-        $filesystem = new Filesystem($adapter, new Config([
-            'disable_asserts' => true,
-        ]));
-
-        return array($adapter, $filesystem);
-    }
-
-    public function change_storage_status($field, $value)
-    {
-        $field = $this->xcloner_sanitization->sanitize_input_as_string($field);
-        $value = $this->xcloner_sanitization->sanitize_input_as_int($value);
-
-        return update_option($field, $value);
-    }
-
-    public function get_aws_regions()
-    {
-        return $this->aws_regions;
-    }
+			/** optional config settings */
+			'port' => get_option("xcloner_sftp_port", 22),
+			'root' => (get_option("xcloner_sftp_path")?get_option("xcloner_sftp_path"):'./'),
+			'privateKey' => get_option("xcloner_sftp_private_key"),
+			'timeout' => get_option("xcloner_ftp_timeout", 30),
+		]);
+
+		$adapter->connect();
+
+		$filesystem = new Filesystem($adapter, new Config([
+			'disable_asserts' => true,
+		]));
+
+		return array($adapter, $filesystem);
+	}
+
+	public function change_storage_status($field, $value)
+	{
+		$field = $this->xcloner_sanitization->sanitize_input_as_string($field);
+		$value = $this->xcloner_sanitization->sanitize_input_as_int($value);
+
+		return update_option($field, $value);
+	}
+
+	public function get_aws_regions()
+	{
+		return $this->aws_regions;
+	}
 
 }

Spacing +19 added lines, -19 removed lines

@@ -180,14 +180,14 @@ 
                 foreach ($array as $key => $type) {
 
                     if ($type == "raw") {
-                        add_filter("pre_update_option_" . $this->storage_fields['option_prefix'] . $key,
-                            function ($value) {
+                        add_filter("pre_update_option_".$this->storage_fields['option_prefix'].$key,
+                            function($value) {
 
                                 return $this->simple_crypt($value, 'e');
 
                             }, 10, 1);
 
-                        add_filter("option_" . $this->storage_fields['option_prefix'] . $key, function ($value) {
+                        add_filter("option_".$this->storage_fields['option_prefix'].$key, function($value) {
 
                             return $this->simple_crypt($value, 'd');
 
@@ -247,7 +247,7 @@ 
     {
         $return = array();
         foreach ($this->storage_fields as $storage => $data) {
-            $check_field = $this->storage_fields["option_prefix"] . $storage . "_enable";
+            $check_field = $this->storage_fields["option_prefix"].$storage."_enable";
             if (get_option($check_field)) {
                 $return[$storage] = $data['text'];
             }
@@ -267,8 +267,8 @@ 
 
         if (is_array($this->storage_fields[$storage])) {
             foreach ($this->storage_fields[$storage] as $field => $validation) {
-                $check_field = $this->storage_fields["option_prefix"] . $field;
-                $sanitize_method = "sanitize_input_as_" . $validation;
+                $check_field = $this->storage_fields["option_prefix"].$field;
+                $sanitize_method = "sanitize_input_as_".$validation;
 
                 if (!isset($_POST[$check_field])) {
                     $_POST[$check_field] = 0;
@@ -295,8 +295,8 @@ 
             $this->xcloner->trigger_message(__("%s connection is valid.", 'xcloner-backup-and-restore'), "success",
                 $this->storage_fields[$action]['text']);
             $this->logger->debug(sprintf("Connection to remote storage %s is valid", strtoupper($action)));
-        } catch (Exception $e) {
-            $this->xcloner->trigger_message("%s connection error: " . $e->getMessage(), "error",
+        }catch (Exception $e) {
+            $this->xcloner->trigger_message("%s connection error: ".$e->getMessage(), "error",
                 $this->storage_fields[$action]['text']);
         }
     }
@@ -306,7 +306,7 @@ 
      */
     public function verify_filesystem($storage_type)
     {
-        $method = "get_" . $storage_type . "_filesystem";
+        $method = "get_".$storage_type."_filesystem";
 
         $this->logger->info(sprintf("Checking validity of the remote storage %s filesystem",
             strtoupper($storage_type)));
@@ -317,7 +317,7 @@ 
 
         list($adapter, $filesystem) = $this->$method();
 
-        $test_file = substr(".xcloner_" . md5(time()), 0, 15);
+        $test_file = substr(".xcloner_".md5(time()), 0, 15);
 
         if ($storage_type == "gdrive") {
             if (!is_array($filesystem->listContents())) {
@@ -357,7 +357,7 @@ 
             return false;
         }
 
-        $method = "get_" . $storage . "_filesystem";
+        $method = "get_".$storage."_filesystem";
 
         if (!method_exists($this, $method)) {
             return false;
@@ -408,7 +408,7 @@ 
 
     public function copy_backup_remote_to_local($file, $storage)
     {
-        $method = "get_" . $storage . "_filesystem";
+        $method = "get_".$storage."_filesystem";
 
         $target_filename = $file;
 
@@ -426,7 +426,7 @@ 
 
         if ($storage == "gdrive") {
             $metadata = $remote_storage_filesystem->getMetadata($file);
-            $target_filename = $metadata['filename'] . "." . $metadata['extension'];
+            $target_filename = $metadata['filename'].".".$metadata['extension'];
         }
 
         $this->logger->info(sprintf("Transferring backup %s to local storage from %s storage", $file,
@@ -464,13 +464,13 @@ 
 
     public function clean_remote_storage($storage, $remote_storage_filesystem)
     {
-        $check_field = $this->storage_fields["option_prefix"] . $storage . "_cleanup_days";
+        $check_field = $this->storage_fields["option_prefix"].$storage."_cleanup_days";
         if ($expire_days = get_option($check_field)) {
             $this->logger->info(sprintf("Doing %s remote storage cleanup for %s days limit", strtoupper($storage),
                 $expire_days));
             $files = $remote_storage_filesystem->listContents();
 
-            $current_timestamp = strtotime("-" . $expire_days . " days");
+            $current_timestamp = strtotime("-".$expire_days." days");
 
             if (is_array($files)) {
                 foreach ($files as $file) {
@@ -478,9 +478,9 @@ 
 
                     if ($current_timestamp >= $file['timestamp']) {
                         $remote_storage_filesystem->delete($file['path']);
-                        $this->logger->info("Deleting remote file " . $file['path'] . " matching rule", array(
+                        $this->logger->info("Deleting remote file ".$file['path']." matching rule", array(
                             "RETENTION LIMIT TIMESTAMP",
-                            $file['timestamp'] . " =< " . $expire_days
+                            $file['timestamp']." =< ".$expire_days
                         ));
                     }
 
@@ -676,7 +676,7 @@ 
         update_option("xcloner_gdrive_access_token", $token['access_token']);
         update_option("xcloner_gdrive_refresh_token", $token['refresh_token']);
 
-        $redirect_url = ('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?page=xcloner_remote_storage_page#gdrive");
+        $redirect_url = ('http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']."?page=xcloner_remote_storage_page#gdrive");
 
         ?>
         <script>
@@ -798,7 +798,7 @@ 
 
             /** optional config settings */
             'port' => get_option("xcloner_sftp_port", 22),
-            'root' => (get_option("xcloner_sftp_path")?get_option("xcloner_sftp_path"):'./'),
+            'root' => (get_option("xcloner_sftp_path") ?get_option("xcloner_sftp_path") : './'),
             'privateKey' => get_option("xcloner_sftp_private_key"),
             'timeout' => get_option("xcloner_ftp_timeout", 30),
         ]);