ovidiul / XCloner-Wordpress

includes/class-xcloner.php

Spacing +63 added lines, -63 removed lines

@@ -233,84 +233,84 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-i18n.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-xcloner-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-xcloner-admin.php';
 
 		/**
 		 * The class responsible for debugging XCloner.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-logger.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-logger.php';
 
 		/**
 		 * The class responsible for defining the admin settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-settings.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-settings.php';
 
 		/**
 		 * The class responsible for defining the Remote Storage settings area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-remote-storage.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-remote-storage.php';
 
 		/**
 		 * The class responsible for implementing the database backup methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-database.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-database.php';
 
 		/**
 		 * The class responsible for sanitization of users input.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-sanitization.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-sanitization.php';
 
 		/**
 		 * The class responsible for XCloner system requirements validation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-requirements.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-requirements.php';
 
 		/**
 		 * The class responsible for XCloner backup archive creation.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-archive.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-archive.php';
 
 		/**
 		 * The class responsible for XCloner API requests.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-api.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-api.php';
 
 		/**
 		 * The class responsible for the XCloner File System methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-system.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-system.php';
 
 		/**
 		 * The class responsible for the XCloner File Transfer methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-file-transfer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-file-transfer.php';
 
 		/**
 		 * The class responsible for the XCloner Scheduler methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-scheduler.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-scheduler.php';
 
 		/**
 		 * The class responsible for the XCloner Encryption methods.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-xcloner-encryption.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-xcloner-encryption.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-xcloner-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-xcloner-public.php';
 
 		$this->loader = new Xcloner_Loader($this);
 
@@ -360,31 +360,31 @@ 
 	 * @access    private
 	 *
 	 */
-	private function define_admin_menu(){
+	private function define_admin_menu() {
 
 		add_action('admin_menu', array($this->loader, 'xcloner_backup_add_admin_menu'));
 
 	}
 
-	private function define_plugin_settings(){
+	private function define_plugin_settings() {
 		/**
 		 * register wporg_settings_init to the admin_init action hook
 		 */
 
 		$this->xcloner_settings = new XCloner_Settings($this);
 
-		if(defined('DOING_CRON') || isset($_POST['hash'])){
+		if (defined('DOING_CRON') || isset($_POST['hash'])) {
 
-			if(defined('DOING_CRON') || $_POST['hash'] == "generate_hash"){
+			if (defined('DOING_CRON') || $_POST['hash'] == "generate_hash") {
 				$this->xcloner_settings->generate_new_hash();
-			}else{
+			} else {
 				$this->xcloner_settings->set_hash($_POST['hash']);
 			}
 		}
 
-		if(defined('DOING_CRON') || !isset($_POST['hash']))
+		if (defined('DOING_CRON') || !isset($_POST['hash']))
 		{
-			add_action( 'shutdown', function(){
+			add_action('shutdown', function() {
 				$this->xcloner_filesystem = new Xcloner_File_System($this);
 				$this->xcloner_filesystem->remove_tmp_filesystem();
 			});
@@ -516,20 +516,20 @@ 
 		$logger = new XCloner_Logger($this, "php_system");
 		$error = error_get_last();
 
-		if($error['type'] and $logger)
+		if ($error['type'] and $logger)
 		{
-			$logger->info($this->friendly_error_type ($error['type']).": ".var_export($error, true));
+			$logger->info($this->friendly_error_type($error['type']).": ".var_export($error, true));
 		}
 
 	}
 
 	function friendly_error_type($type) {
-		static $levels=null;
-		if ($levels===null) {
-			$levels=[];
+		static $levels = null;
+		if ($levels === null) {
+			$levels = [];
 			foreach (get_defined_constants() as $key=>$value) {
-				if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+				if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 			}
 		}
 		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -539,56 +539,56 @@ 
 	{
 		//adding the pre-update hook
 
-		if(is_admin() || defined('DOING_CRON'))
+		if (is_admin() || defined('DOING_CRON'))
 		{
-			$this->xcloner_logger 			= new XCloner_Logger($this, "xcloner_api");
-			$this->xcloner_filesystem 		= new Xcloner_File_System($this);
+			$this->xcloner_logger = new XCloner_Logger($this, "xcloner_api");
+			$this->xcloner_filesystem = new Xcloner_File_System($this);
 
 			//$this->xcloner_filesystem->set_diff_timestamp_start (strtotime("-15 days"));
 
-			$this->archive_system 			= new Xcloner_Archive($this);
-			$this->xcloner_database 		= new Xcloner_Database($this);
-			$this->xcloner_scheduler 		= new Xcloner_Scheduler($this);
-			$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this);
+			$this->archive_system = new Xcloner_Archive($this);
+			$this->xcloner_database = new Xcloner_Database($this);
+			$this->xcloner_scheduler = new Xcloner_Scheduler($this);
+			$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this);
 			$this->xcloner_file_transfer 	= new Xcloner_File_Transfer($this);
 			$this->xcloner_encryption    	= new Xcloner_Encryption($this);
 
-			$xcloner_api 					= new Xcloner_Api($this);
-
-			add_action( 'wp_ajax_get_database_tables_action', 	array($xcloner_api,'get_database_tables_action')  );
-			add_action( 'wp_ajax_get_file_system_action', 		array($xcloner_api,'get_file_system_action')  );
-			add_action( 'wp_ajax_scan_filesystem', 				array($xcloner_api,'scan_filesystem')  );
-			add_action( 'wp_ajax_backup_database', 				array($xcloner_api,'backup_database')  );
-			add_action( 'wp_ajax_backup_files'	, 				array($xcloner_api,'backup_files')  );
-			add_action( 'wp_ajax_save_schedule'	, 				array($xcloner_api,'save_schedule')  );
-			add_action( 'wp_ajax_get_schedule_by_id',	 		array($xcloner_api,'get_schedule_by_id')  );
-			add_action( 'wp_ajax_get_scheduler_list',	 		array($xcloner_api,'get_scheduler_list')  );
-			add_action( 'wp_ajax_delete_schedule_by_id'	, 		array($xcloner_api,'delete_schedule_by_id')  );
-			add_action( 'wp_ajax_delete_backup_by_name'	, 		array($xcloner_api,'delete_backup_by_name')  );
-			add_action( 'wp_ajax_download_backup_by_name', 		array($xcloner_api,'download_backup_by_name')  );
-			add_action( 'wp_ajax_remote_storage_save_status', 	array($xcloner_api,'remote_storage_save_status')  );
-			add_action( 'wp_ajax_upload_backup_to_remote', 		array($xcloner_api,'upload_backup_to_remote')  );
-			add_action( 'wp_ajax_list_backup_files'	,			array($xcloner_api,'list_backup_files')  );
-			add_action( 'wp_ajax_restore_upload_backup'	, 		array($xcloner_api,'restore_upload_backup')  );
-			add_action( 'wp_ajax_download_restore_script', 		array($xcloner_api,'download_restore_script')  );
-			add_action( 'wp_ajax_copy_backup_remote_to_local', 	array($xcloner_api,'copy_backup_remote_to_local')  );
-			add_action( 'wp_ajax_restore_backup', 				array($xcloner_api,'restore_backup')  );
-			add_action( 'wp_ajax_backup_encryption', 			array($xcloner_api,'backup_encryption')  );
-			add_action( 'wp_ajax_backup_decryption', 			array($xcloner_api,'backup_decryption')  );
-			add_action( 'wp_ajax_get_manage_backups_list', 		array($xcloner_api,'get_manage_backups_list')  );
-			add_action( 'admin_notices', 						array($this, 'xcloner_error_admin_notices' ));
+			$xcloner_api = new Xcloner_Api($this);
+
+			add_action('wp_ajax_get_database_tables_action', array($xcloner_api, 'get_database_tables_action'));
+			add_action('wp_ajax_get_file_system_action', array($xcloner_api, 'get_file_system_action'));
+			add_action('wp_ajax_scan_filesystem', array($xcloner_api, 'scan_filesystem'));
+			add_action('wp_ajax_backup_database', array($xcloner_api, 'backup_database'));
+			add_action('wp_ajax_backup_files', array($xcloner_api, 'backup_files'));
+			add_action('wp_ajax_save_schedule', array($xcloner_api, 'save_schedule'));
+			add_action('wp_ajax_get_schedule_by_id', array($xcloner_api, 'get_schedule_by_id'));
+			add_action('wp_ajax_get_scheduler_list', array($xcloner_api, 'get_scheduler_list'));
+			add_action('wp_ajax_delete_schedule_by_id', array($xcloner_api, 'delete_schedule_by_id'));
+			add_action('wp_ajax_delete_backup_by_name', array($xcloner_api, 'delete_backup_by_name'));
+			add_action('wp_ajax_download_backup_by_name', array($xcloner_api, 'download_backup_by_name'));
+			add_action('wp_ajax_remote_storage_save_status', array($xcloner_api, 'remote_storage_save_status'));
+			add_action('wp_ajax_upload_backup_to_remote', array($xcloner_api, 'upload_backup_to_remote'));
+			add_action('wp_ajax_list_backup_files', array($xcloner_api, 'list_backup_files'));
+			add_action('wp_ajax_restore_upload_backup', array($xcloner_api, 'restore_upload_backup'));
+			add_action('wp_ajax_download_restore_script', array($xcloner_api, 'download_restore_script'));
+			add_action('wp_ajax_copy_backup_remote_to_local', array($xcloner_api, 'copy_backup_remote_to_local'));
+			add_action('wp_ajax_restore_backup', array($xcloner_api, 'restore_backup'));
+			add_action('wp_ajax_backup_encryption', array($xcloner_api, 'backup_encryption'));
+			add_action('wp_ajax_backup_decryption', array($xcloner_api, 'backup_decryption'));
+			add_action('wp_ajax_get_manage_backups_list', array($xcloner_api, 'get_manage_backups_list'));
+			add_action('admin_notices', array($this, 'xcloner_error_admin_notices'));
 
 		}
 
 		//Do a pre-update backup of targeted files
-		if($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
+		if ($this->get_xcloner_settings()->get_xcloner_option('xcloner_enable_pre_update_backup'))
 		{
 			add_action("pre_auto_update", array($this, "pre_auto_update"), 1, 3);
 		}
 	}
 
 	function add_plugin_action_links($links, $file) {
-		if ($file == plugin_basename(dirname(dirname(__FILE__)) . '/xcloner.php'))
+		if ($file == plugin_basename(dirname(dirname(__FILE__)).'/xcloner.php'))
 		{
 			$links[] = '<a href="admin.php?page=xcloner_settings_page">'.__('Settings', 'xcloner-backup-and-restore').'</a>';
 			$links[] = '<a href="admin.php?page=xcloner_generate_backups_page">'.__('Generate Backup', 'xcloner-backup-and-restore').'</a>';

includes/class-xcloner-activator.php

Spacing +39 added lines, -39 removed lines

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

includes/class-xcloner-i18n.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		load_plugin_textdomain(
 			'xcloner-backup-and-restore',
 			false,
-			dirname(dirname(plugin_basename(__FILE__))) . '/languages/'
+			dirname(dirname(plugin_basename(__FILE__))).'/languages/'
 		);
 
 	}

includes/class-xcloner-database.php

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
 
 			$result = $this->get_var("SELECT count(*) FROM $table;");
 
-			return intval($result) ;// not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
+			return intval($result); // not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
 
 	}
 

includes/class-xcloner-archive.php

Spacing +6 added lines, -6 removed lines

@@ -148,7 +148,7 @@ 
 			$new_name = $this->archive_name;
 
 			if (!stristr($new_name, "-diff")) {
-				$new_name = $this->archive_name . "-diff" . date("Y-m-d_H-i", $diff_timestamp_start);
+				$new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
 			}
 
 			$this->archive_name = $new_name;
@@ -156,9 +156,9 @@ 
 		}
 
 		if (isset($part) and $part) {
-			$new_name = preg_replace('/-part(\d*)/', "-part" . $part, $this->archive_name);
+			$new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
 			if (!stristr($new_name, "-part")) {
-				$new_name = $this->archive_name . "-part" . $part;
+				$new_name = $this->archive_name."-part".$part;
 			}
 
 			$this->archive_name = $new_name;
@@ -187,7 +187,7 @@ 
 	public function get_archive_name_multipart()
 	{
 		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
-		return $new_name . "-multipart" . $this->xcloner_settings->get_backup_extension_name(".csv");
+		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 
 	/*
@@ -197,7 +197,7 @@ 
      */
 	public function get_archive_name_with_extension()
 	{
-		return $this->archive_name . $this->xcloner_settings->get_backup_extension_name();
+		return $this->archive_name.$this->xcloner_settings->get_backup_extension_name();
 	}
 
 	/*
@@ -233,7 +233,7 @@ 
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 
 		if ($admin_email and $from) {
-			$headers[] = 'From: ' . $from . ' <' . $admin_email . '>';
+			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
 		}
 
 		$return = wp_mail($to, $subject, $body, $headers);

includes/class-xcloner-settings.php

Spacing +131 added lines, -131 removed lines

@@ -56,7 +56,7 @@ 
 
 	public function get_xcloner_encryption_key() {
 
-		if(!get_option('xcloner_encryption_key') )
+		if (!get_option('xcloner_encryption_key'))
 		{
 			return $this->randomString(35);
 		}
@@ -72,7 +72,7 @@ 
 	 */
 	private function randomString($length = 6) {
 		$str = "";
-		$characters = array_merge(range('A','Z'), range('a','z'), range('0','9'));
+		$characters = array_merge(range('A', 'Z'), range('a', 'z'), range('0', '9'));
 		$max = count($characters) - 1;
 		for ($i = 0; $i < $length; $i++) {
 			$rand = mt_rand(0, $max);
@@ -213,17 +213,17 @@ 
 	/**
 	 * @param string $option
 	 */
-	public function get_xcloner_option( $option ) {
-		$data = get_option( $option );
+	public function get_xcloner_option($option) {
+		$data = get_option($option);
 
 		return $data;
 	}
 
-	public function get_server_unique_hash( $strlen = 0 ) {
-		$hash = md5( get_home_url() . __DIR__ );
+	public function get_server_unique_hash($strlen = 0) {
+		$hash = md5(get_home_url().__DIR__);
 
-		if ( $strlen ) {
-			$hash = substr( $hash, 0, $strlen );
+		if ($strlen) {
+			$hash = substr($hash, 0, $strlen);
 		}
 
 		return $hash;
@@ -287,287 +287,287 @@ 
 		//CRON section
 		add_settings_section(
 			'xcloner_cron_settings_group',
-			__( ' ' ),
-			array( $this, 'xcloner_settings_section_cb' ),
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
 			'xcloner_cron_settings_page'
 		);
 
 
 		//REGISTERING THE 'GENERAL SECTION' FIELDS
-		register_setting( 'xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_backup_compression_level', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_backup_compression_level',
-			__( 'Backup Compression Level', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Backup Compression Level', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_backup_compression_level',
-				__( 'Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore' ),
+				__('Options between [0-9]. Value 0 means no compression, while 9 is maximum compression affecting cpu load', 'xcloner-backup-and-restore'),
 				0,
 				9
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_start_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_start_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_start_path',
-			__( 'Backup Start Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Start Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_start_path',
-				__( 'Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore' ),
+				__('Base path location from where XCloner can start the Backup.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_store_path', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_store_path', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_absolute_path"
-		) );
+		));
 		add_settings_field(
 			'xcloner_store_path',
-			__( 'Backup Storage Location', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Storage Location', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_store_path',
-				__( 'Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore' ),
+				__('Location where XCloner will store the Backup archives.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_store_path(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_encryption_key', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_encryption_key', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_string"
-		) );
+		));
 		add_settings_field(
 			'xcloner_encryption_key',
-			__( 'Backup Encryption Key', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Backup Encryption Key', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_encryption_key',
-				__( 'Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore' ),
+				__('Backup Encryption Key used to Encrypt/Decrypt backups, you might want to save this somewhere else as well.', 'xcloner-backup-and-restore'),
 				$this->get_xcloner_encryption_key(),
 				//'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_log', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_log', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_log',
-			__( 'Enable XCloner Backup Log', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable XCloner Backup Log', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_log',
-				sprintf( __( 'Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Enable the XCloner Backup log. You will find it stored unde the Backup Storage Location, file %s', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_enable_pre_update_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_pre_update_backup',
-			__( 'Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Generate Backups before Automatic WP Upgrades', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_enable_pre_update_backup',
-				sprintf( __( 'Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore' ), $this->get_logger_filename() )
+				sprintf(__('Attempt to generate a core, plugins, themes or languages files backup before the automatic update of Wordpress core, plugins, themes or languages files.', 'xcloner-backup-and-restore'), $this->get_logger_filename())
 			)
 		);
 
-		register_setting( 'xcloner_general_settings_group', 'xcloner_regex_exclude', array(
+		register_setting('xcloner_general_settings_group', 'xcloner_regex_exclude', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_regex_exclude',
-			__( 'Regex Exclude Files', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_textarea_field' ),
+			__('Regex Exclude Files', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_textarea_field'),
 			'xcloner_settings_page',
 			'xcloner_general_settings_group',
 			array(
 				'xcloner_regex_exclude',
-				__( 'Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore' ),
+				__('Regular expression match to exclude files and folders, example patterns provided below, one pattern per line', 'xcloner-backup-and-restore'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 			)
 		);
 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_enable_mysql_backup', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_enable_mysql_backup',
-			__( 'Enable Mysql Backup', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Enable Mysql Backup', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_enable_mysql_backup',
-				__( 'Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore' )
+				__('Enable Mysql Backup Option. If you don\'t want to backup the database, you can disable this.', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables' );
+		register_setting('xcloner_mysql_settings_group', 'xcloner_backup_only_wp_tables');
 		add_settings_field(
 			'xcloner_backup_only_wp_tables',
-			__( 'Backup only WP tables', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Backup only WP tables', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_backup_only_wp_tables',
-				sprintf( __( 'Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this if you only want to Backup only tables starting with \'%s\' prefix', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_hostname', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_hostname',
-			__( 'Mysql Hostname', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Hostname', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_hostname',
-				__( 'Wordpress mysql hostname', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql hostname', 'xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_username', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_username',
-			__( 'Mysql Username', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Username', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_username',
-				__( 'Wordpress mysql username', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql username', 'xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 			)
 		);
 
-		register_setting( 'xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
+		register_setting('xcloner_mysql_settings_group', 'xcloner_mysql_database', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_raw"
-		) );
+		));
 		add_settings_field(
 			'xcloner_mysql_database',
-			__( 'Mysql Database', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Mysql Database', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_mysql_settings_page',
 			'xcloner_mysql_settings_group',
 			array(
 				'xcloner_mysql_database',
-				__( 'Wordpress mysql database', 'xcloner-backup-and-restore' ),
+				__('Wordpress mysql database', 'xcloner-backup-and-restore'),
 				$this->get_db_database(),
 				'disabled'
 			)
 		);
 
 		//REGISTERING THE 'SYSTEM SECTION' FIELDS
-		register_setting( 'xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_size_limit_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_size_limit_per_request',
-			__( 'Data Size Limit Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Data Size Limit Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_size_limit_per_request',
-				__( 'Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how much file data can XCloner backup in one AJAX request. Range 0-1024 MB', 'xcloner-backup-and-restore'),
 				0,
 				1024
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_files_to_process_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_files_to_process_per_request',
-			__( 'Files To Process Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Files To Process Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_files_to_process_per_request',
-				__( 'Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many files XCloner should process at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_directories_to_scan_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_directories_to_scan_per_request',
-			__( 'Directories To Scan Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Directories To Scan Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_directories_to_scan_per_request',
-				__( 'Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many directories XCloner should scan at one time before doing another AJAX call', 'xcloner-backup-and-restore'),
 				0,
 				1000
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_database_records_per_request', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_database_records_per_request',
-			__( 'Database Records Per Request', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_range_field' ),
+			__('Database Records Per Request', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_range_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_database_records_per_request',
-				__( 'Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore' ),
+				__('Use this option to set how many database table records should be fetched per AJAX request, or set to 0 to fetch all.  Range 0-100000 records', 'xcloner-backup-and-restore'),
 				0,
 				100000
 			)
@@ -585,140 +585,140 @@ 
 	         )
 	    );*/
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_exclude_files_larger_than_mb', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_exclude_files_larger_than_mb',
-			__( 'Exclude files larger than (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Exclude files larger than (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_exclude_files_larger_than_mb',
-				__( 'Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically exclude files larger than a certain size in MB, or set to 0 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
+		register_setting('xcloner_system_settings_group', 'xcloner_split_backup_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_split_backup_limit',
-			__( 'Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Split Backup Archive Limit (MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_split_backup_limit',
-				__( 'Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore' ),
+				__('Use this option to automatically split the backup archive into smaller parts. Range  0-10000 MB', 'xcloner-backup-and-restore'),
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root' );
+		register_setting('xcloner_system_settings_group', 'xcloner_force_tmp_path_site_root');
 		add_settings_field(
 			'xcloner_force_tmp_path_site_root',
-			__( 'Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Force Temporary Path Within XCloner Storage', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_force_tmp_path_site_root',
-				sprintf( __( 'Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this option if you want the XCloner Temporary Path to be within your XCloner Storage Location', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
-		register_setting( 'xcloner_system_settings_group', 'xcloner_disable_email_notification' );
+		register_setting('xcloner_system_settings_group', 'xcloner_disable_email_notification');
 		add_settings_field(
 			'xcloner_disable_email_notification',
-			__( 'Disable Email Notifications', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Disable Email Notifications', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_system_settings_page',
 			'xcloner_system_settings_group',
 			array(
 				'xcloner_disable_email_notification',
-				sprintf( __( 'Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore' ), $this->get_table_prefix() )
+				sprintf(__('Enable this option if you want the XCloner to NOT send email notifications on successful backups', 'xcloner-backup-and-restore'), $this->get_table_prefix())
 			)
 		);
 
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_days', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_days',
-			__( 'Cleanup by Date(days)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Date(days)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_days',
-				__( 'Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of days a backup archive can be kept on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_retention_limit_archives', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_retention_limit_archives',
-			__( 'Cleanup by Quantity', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Quantity', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_retention_limit_archives',
-				__( 'Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Specify the maximum number of backup archives to keep on the server. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_capacity_limit', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_capacity_limit',
-			__( 'Cleanup by Capacity(MB)', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_number_field' ),
+			__('Cleanup by Capacity(MB)', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_number_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_capacity_limit',
-				__( 'Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore' )
+				__('Remove oldest backups if all created backups exceed the configured limit in Megabytes. 0 disables this option', 'xcloner-backup-and-restore')
 			)
 		);
 
-		register_setting( 'xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
+		register_setting('xcloner_cleanup_settings_group', 'xcloner_cleanup_delete_after_remote_transfer', array(
 			$this->xcloner_sanitization,
 			"sanitize_input_as_int"
-		) );
+		));
 		add_settings_field(
 			'xcloner_cleanup_delete_after_remote_transfer',
-			__( 'Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_switch_field' ),
+			__('Delete Backup After Remote Storage Transfer', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_switch_field'),
 			'xcloner_cleanup_settings_page',
 			'xcloner_cleanup_settings_group',
 			array(
 				'xcloner_cleanup_delete_after_remote_transfer',
-				__( 'Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore' )
+				__('Remove backup created automatically from local storage after sending the backup to Remote Storage', 'xcloner-backup-and-restore')
 			)
 		);
 
 		//REGISTERING THE 'CRON SECTION' FIELDS
-		register_setting( 'xcloner_cron_settings_group', 'xcloner_cron_frequency' );
+		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 		add_settings_field(
 			'xcloner_cron_frequency',
-			__( 'Cron frequency', 'xcloner-backup-and-restore' ),
-			array( $this, 'do_form_text_field' ),
+			__('Cron frequency', 'xcloner-backup-and-restore'),
+			array($this, 'do_form_text_field'),
 			'xcloner_cron_settings_page',
 			'xcloner_cron_settings_group',
 			array(
 				'xcloner_cron_frequency',
-				__( 'Cron frequency' )
+				__('Cron frequency')
 			)
 		);
 	}

includes/class-xcloner-api.php

Spacing +73 added lines, -73 removed lines

@@ -90,7 +90,7 @@ 
 		$this->xcloner_remote_storage   = $xcloner_container->get_xcloner_remote_storage();
 
 		if (isset($_POST['API_ID'])) {
-			$this->logger->info("Processing ajax request ID " . substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
+			$this->logger->info("Processing ajax request ID ".substr($this->xcloner_sanitization->sanitize_input_as_string($_POST['API_ID']),
 					0, 15));
 		}
 
@@ -131,13 +131,13 @@ 
 
 
 		$data['recordsPerSession'] = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
-		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . ".database";
-		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "database-sql.sql";
+		$data['TEMP_DBPROCESS_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS.".database";
+		$data['TEMP_DUMP_FILE'] = $this->xcloner_settings->get_xcloner_tmp_path().DS."database-sql.sql";
 
 		try {
 			$this->xcloner_database->init($data);
 
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$this->send_response($e->getMessage());
 			$this->logger->error($e->getMessage());
@@ -223,8 +223,8 @@ 
 		} else {
 
 			$schedule['status'] = 1;
-			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'] .
-				" " . $this->form_params['backup_params']['schedule_start_time']);
+			$schedule['start_at'] = strtotime($this->form_params['backup_params']['schedule_start_date'].
+				" ".$this->form_params['backup_params']['schedule_start_time']);
 
 			if ($schedule['start_at'] <= time()) {
 				$schedule['start_at'] = "";
@@ -249,7 +249,7 @@ 
 
 		if (!isset($_POST['id'])) {
 			$wpdb->insert(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array(
 					'%s',
@@ -258,7 +258,7 @@ 
 			);
 		} else {
 			$wpdb->update(
-				$wpdb->prefix . 'xcloner_scheduler',
+				$wpdb->prefix.'xcloner_scheduler',
 				$schedule,
 				array('id' => $_POST['id']),
 				array(
@@ -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());
 				}
 			}
@@ -437,7 +437,7 @@ 
 		if (isset($params->backup_params)) {
 			foreach ($params->backup_params as $param) {
 				$this->form_params['backup_params'][$param->name] = $this->xcloner_sanitization->sanitize_input_as_string($param->value);
-				$this->logger->debug("Adding form parameter " . $param->name . "." . $param->value . "\n", array(
+				$this->logger->debug("Adding form parameter ".$param->name.".".$param->value."\n", array(
 					'POST',
 					'fields filter'
 				));
@@ -449,7 +449,7 @@ 
 		if (isset($params->table_params)) {
 			foreach ($params->table_params as $param) {
 				$this->form_params['database'][$param->parent][] = $this->xcloner_sanitization->sanitize_input_as_raw($param->id);
-				$this->logger->debug("Adding database filter " . $param->parent . "." . $param->id . "\n", array(
+				$this->logger->debug("Adding database filter ".$param->parent.".".$param->id."\n", array(
 					'POST',
 					'database filter'
 				));
@@ -468,7 +468,7 @@ 
 				if (!in_array($param->parent, $this->form_params['excluded_files'])) {
 					//$this->form_params['excluded_files'][] = $this->xcloner_sanitization->sanitize_input_as_relative_path($param->id);
 					$unique_exclude_files[] = $param->id;
-					$this->logger->debug("Adding file filter " . $param->id . "\n", array(
+					$this->logger->debug("Adding file filter ".$param->id."\n", array(
 						'POST',
 						'exclude files filter'
 					));
@@ -516,13 +516,13 @@ 
 				'text' => $this->xcloner_settings->get_xcloner_start_path(),
 				//'children' => true,
 				'state' => array('selected' => false, 'opened' => true),
-				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-root.png"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-root.png"
 			);
 		}
 
 		try {
 			$files = $this->xcloner_file_system->list_directory($folder);
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			print $e->getMessage();
 			$this->logger->error($e->getMessage());
@@ -543,7 +543,7 @@ 
 			if ($file['type'] == "dir") {
 				$children = true;
 			} else {
-				$text .= " (" . $this->xcloner_requirements->file_format_size($file['size']) . ")";
+				$text .= " (".$this->xcloner_requirements->file_format_size($file['size']).")";
 			}
 
 			if ($this->xcloner_file_system->is_excluded($file)) {
@@ -559,8 +559,8 @@ 
 				//'title' => "test",
 				'children' => $children,
 				'state' => array('selected' => $selected, 'opened' => false, "checkbox_disabled" => $selected),
-				'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/file-icon-" . strtolower(substr($file['type'],
-						0, 1)) . ".png"
+				'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/file-icon-".strtolower(substr($file['type'],
+						0, 1)).".png"
 			);
 		}
 
@@ -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());
 			}
 
@@ -607,10 +607,10 @@ 
 				$data[] = array(
 					'id' => $database['name'],
 					'parent' => '#',
-					'text' => $database['name'] . " (" . (int)$database['num_tables'] . ")",
+					'text' => $database['name']." (".(int)$database['num_tables'].")",
 					'children' => true,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/database-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/database-icon.png"
 				);
 			}
 
@@ -618,7 +618,7 @@ 
 
 			try {
 				$return = $this->xcloner_database->list_tables($database, "", 1);
-			} catch (Exception $e) {
+			}catch (Exception $e) {
 				$this->logger->error($e->getMessage());
 			}
 
@@ -635,12 +635,12 @@ 
 				}
 
 				$data[] = array(
-					'id' => $database . "." . $table['name'],
+					'id' => $database.".".$table['name'],
 					'parent' => $database,
-					'text' => $table['name'] . " (" . (int)$table['records'] . ")",
+					'text' => $table['name']." (".(int)$table['records'].")",
 					'children' => false,
 					'state' => $state,
-					'icon' => plugin_dir_url(dirname(__FILE__)) . "/admin/assets/table-icon.png"
+					'icon' => plugin_dir_url(dirname(__FILE__))."/admin/assets/table-icon.png"
 				);
 			}
 		}
@@ -686,17 +686,17 @@ 
 		$return['data'] = array();
 
 		foreach ($data as $res) {
-			$action = "<a href=\"#" . $res->id . "\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
-					<a href=\"#" . $res->id . "\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
+			$action = "<a href=\"#".$res->id."\" class=\"edit\" title='Edit'> <i class=\"material-icons \">edit</i></a>
+					<a href=\"#" . $res->id."\" class=\"delete\" title='Delete'><i class=\"material-icons  \">delete</i></a>";
 			if ($res->status) {
 				$status = '<i class="material-icons active status">timer</i>';
 			} else {
 				$status = '<i class="material-icons status inactive">timer_off</i>';
 			}
 
-			$next_run_time = wp_next_scheduled('xcloner_scheduler_' . $res->id, array($res->id));
+			$next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 
-			$next_run = date(get_option('date_format') . " " . get_option('time_format'), $next_run_time);
+			$next_run = date(get_option('date_format')." ".get_option('time_format'), $next_run_time);
 
 			$remote_storage = $res->remote_storage;
 
@@ -705,16 +705,16 @@ 
 			}
 
 			if (trim($next_run)) {
-				$date_text = date(get_option('date_format') . " " . get_option('time_format'),
+				$date_text = date(get_option('date_format')." ".get_option('time_format'),
 					$next_run_time + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 
 				if ($next_run_time >= time()) {
-					$next_run = "in " . human_time_diff($next_run_time, time());
+					$next_run = "in ".human_time_diff($next_run_time, time());
 				} else {
 					$next_run = __("executed", 'xcloner-backup-and-restore');
 				}
 
-				$next_run = "<a href='#' title='" . $date_text . "'>" . $next_run . "</a>";
+				$next_run = "<a href='#' title='".$date_text."'>".$next_run."</a>";
 				//$next_run .=" ($date_text)";
 			}
 
@@ -726,11 +726,11 @@ 
 				if ($this->xcloner_file_system->get_storage_filesystem()->has($res->last_backup)) {
 					$metadata = $this->xcloner_file_system->get_storage_filesystem()->getMetadata($res->last_backup);
 					$backup_size = size_format($this->xcloner_file_system->get_backup_size($res->last_backup));
-					$backup_time = date(get_option('date_format') . " " . get_option('time_format'),
+					$backup_time = date(get_option('date_format')." ".get_option('time_format'),
 						$metadata['timestamp'] + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 				}
 
-				$backup_text = "<span title='" . $backup_time . "' class='shorten_string'>" . $res->last_backup . " (" . $backup_size . ")</span>";
+				$backup_text = "<span title='".$backup_time."' class='shorten_string'>".$res->last_backup." (".$backup_size.")</span>";
 			}
 
 			$schedules = wp_get_schedules();
@@ -742,7 +742,7 @@ 
 			$return['data'][] = array(
 				$res->id,
 				$res->name,
-				$res->recurrence,/*$res->start_at,*/
+				$res->recurrence, /*$res->start_at,*/
 				$next_run,
 				$remote_storage,
 				$backup_text,
@@ -808,25 +808,25 @@ 
 			$this->process_params($params);
 			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($this->form_params['extra']['backup_parent']);
 
-			if(isset($this->form_params['extra']['start'])) {
+			if (isset($this->form_params['extra']['start'])) {
 				$start = $this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['start']);
-			}else{
+			} else {
 				$start = 0;
 			}
 
-			if(isset($this->form_params['extra']['iv'])) {
+			if (isset($this->form_params['extra']['iv'])) {
 				$iv = $this->xcloner_sanitization->sanitize_input_as_raw($this->form_params['extra']['iv']);
-			}else{
+			} else {
 				$iv = "";
 			}
 
-			if(isset($this->form_params['extra']['part'])) {
+			if (isset($this->form_params['extra']['part'])) {
 				$return['part'] = (int)$this->xcloner_sanitization->sanitize_input_as_int($this->form_params['extra']['part']);
-			}else{
+			} else {
 				$return['part'] = 0;
 			}
 
-		}else{
+		} else {
 			$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 			$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
 			$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
@@ -841,14 +841,14 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
 		try {
 			$this->logger->info(json_encode($_POST));
 			$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();
@@ -856,7 +856,7 @@ 
 
 		//echo strlen($return['iv']);exit;
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -870,7 +870,7 @@ 
 		}
 
 		if (isset($_POST['data'])) {
-			$return['extra'] = array_merge($this->form_params['extra'],  $return);
+			$return['extra'] = array_merge($this->form_params['extra'], $return);
 		}
 
 		$this->send_response($return, 0);
@@ -889,7 +889,7 @@ 
 		$source_backup_file = $this->xcloner_sanitization->sanitize_input_as_string($_POST['file']);
 		$start = $this->xcloner_sanitization->sanitize_input_as_int($_POST['start']);
 		$iv = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['iv']);
-		$decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']);;
+		$decryption_key = $this->xcloner_sanitization->sanitize_input_as_raw($_POST['decryption_key']); ;
 		$return['part'] = $this->xcloner_sanitization->sanitize_input_as_int($_POST['part']);
 
 		$backup_file = $source_backup_file;
@@ -900,17 +900,17 @@ 
 		}
 
 		$return['processing_file'] = $backup_file;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 
 		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();
 		}
 
-		if($return['finished']) {
+		if ($return['finished']) {
 			if ($this->xcloner_file_system->is_multipart($source_backup_file)) {
 				$return['start'] = 0;
 
@@ -944,7 +944,7 @@ 
 		foreach ($backup_list as $file_info):?>
             <?php
 			if ($storage_selection == "gdrive") {
-				$file_info['path'] = $file_info['filename'] . "." . $file_info['extension'];
+				$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
 			}
 			$file_exists_on_local_storage = true;
 
@@ -1065,10 +1065,10 @@ 
                             <?php endif ?>
                             <?php
 							$basename = $file_info['basename'];
-							if(isset($file_info['childs']) and sizeof($file_info['childs']))
+							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)) :?>
+                            <?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>
@@ -1126,7 +1126,7 @@ 
 			$backup_file = $backup_parts[$return['part']];
 		}
 
-		if($this->xcloner_encryption->is_encrypted_file($backup_file)) {
+		if ($this->xcloner_encryption->is_encrypted_file($backup_file)) {
 			$return['error'] = true;
 			$return['message'] = __("Backup archive is encrypted, please decrypt it first before you can list it's content.", "xcloner-backup-and-restore");
 			$this->send_response($return, 0);
@@ -1134,10 +1134,10 @@ 
 
 		try {
 			$tar = new Tar();
-			$tar->open($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file, $start);
+			$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);
@@ -1145,14 +1145,14 @@ 
 
 		$return['files'] = array();
 		$return['finished'] = 1;
-		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path() . DS . $backup_file);
+		$return['total_size'] = filesize($this->xcloner_settings->get_xcloner_store_path().DS.$backup_file);
 		$i = 0;
 
 		if (isset($data['extracted_files']) and is_array($data['extracted_files'])) {
 			foreach ($data['extracted_files'] as $file) {
 				$return['files'][$i]['path'] = $file->getPath();
 				$return['files'][$i]['size'] = $file->getSize();
-				$return['files'][$i]['mtime'] = date(get_option('date_format') . " " . get_option('time_format'),
+				$return['files'][$i]['mtime'] = date(get_option('date_format')." ".get_option('time_format'),
 					$file->getMtime());
 
 				$i++;
@@ -1200,7 +1200,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 +1239,7 @@ 
 					"upload_backup_to_storage"
 				), array($backup_file, $storage_type));
 			}
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 
 			$return['error'] = 1;
 			$return['message'] = $e->getMessage();
@@ -1301,21 +1301,21 @@ 
         $phar2->setStub($phar2->createDefaultStub('vendor/autoload.php', 'vendor/autoload.php'));
          * */
 
-		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path() . DS . "xcloner-restore.tgz";
+		$tmp_file = $this->xcloner_settings->get_xcloner_tmp_path().DS."xcloner-restore.tgz";
 
 		$tar = new Tar();
 		$tar->create($tmp_file);
 
-		$tar->addFile(dirname(__DIR__) . "/restore/vendor.build.txt", "vendor.phar");
+		$tar->addFile(dirname(__DIR__)."/restore/vendor.build.txt", "vendor.phar");
 		//$tar->addFile(dirname(__DIR__)."/restore/vendor.tgz", "vendor.tgz");
 
 		$files = $xcloner_plugin_filesystem->listContents("vendor/", true);
 		foreach ($files as $file) {
-			$tar->addFile(dirname(__DIR__) . DS . $file['path'], $file['path']);
+			$tar->addFile(dirname(__DIR__).DS.$file['path'], $file['path']);
 		}
 
-		$content = file_get_contents(dirname(__DIR__) . "/restore/xcloner_restore.php");
-		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '" . md5(AUTH_KEY) . "');", $content);
+		$content = file_get_contents(dirname(__DIR__)."/restore/xcloner_restore.php");
+		$content = str_replace("define('AUTH_KEY', '');", "define('AUTH_KEY', '".md5(AUTH_KEY)."');", $content);
 
 		$tar->addData("xcloner_restore.php", $content);
 
@@ -1324,18 +1324,18 @@ 
 		if (file_exists($tmp_file)) {
 			header('Content-Description: File Transfer');
 			header('Content-Type: application/octet-stream');
-			header('Content-Disposition: attachment; filename="' . basename($tmp_file) . '"');
+			header('Content-Disposition: attachment; filename="'.basename($tmp_file).'"');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate');
 			header('Pragma: public');
-			header('Content-Length: ' . filesize($tmp_file));
+			header('Content-Length: '.filesize($tmp_file));
 			readfile($tmp_file);
 
 		}
 
 		try {
             unlink($tmp_file);
-        }catch(Exception $e) {
+        }catch (Exception $e) {
 		    //We are not interested in the error here
         }
 
@@ -1365,9 +1365,9 @@ 
 		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 		header('Cache-Control: private', false);
 		header('Content-Transfer-Encoding: binary');
-		header('Content-Disposition: attachment; filename="' . $metadata['path'] . '";');
+		header('Content-Disposition: attachment; filename="'.$metadata['path'].'";');
 		header('Content-Type: application/octet-stream');
-		header('Content-Length: ' . $metadata['size']);
+		header('Content-Length: '.$metadata['size']);
 
 		ob_end_clean();
 
@@ -1430,12 +1430,12 @@ 
 			$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;
 			$return['status'] = 500;
-			$return['message'] = "CURL communication error with the restore host. " . $e->getMessage();
+			$return['message'] = "CURL communication error with the restore host. ".$e->getMessage();
 			$this->send_response($return, 0);
 
 		}
@@ -1459,7 +1459,7 @@ 
 		$this->check_access();
 
 		define("XCLONER_PLUGIN_ACCESS", 1);
-		include_once(dirname(__DIR__) . DS . "restore" . DS . "xcloner_restore.php");
+		include_once(dirname(__DIR__).DS."restore".DS."xcloner_restore.php");
 
 		return;
 	}

includes/class-xcloner-remote-storage.php

Spacing +67 added lines, -67 removed lines

@@ -166,26 +166,26 @@ 
      * Xcloner_Remote_Storage constructor.
      * @param Xcloner $xcloner_container
      */
-    public function __construct( 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->logger               = $xcloner_container->get_xcloner_logger()->withName("xcloner_remote_storage");
 		$this->xcloner              = $xcloner_container;
 
-		foreach($this->storage_fields as $main_key=>$array){
+		foreach ($this->storage_fields as $main_key=>$array) {
 
-			if(is_array($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) {
+					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) {
+						add_filter("option_".$this->storage_fields['option_prefix'].$key, function($value) {
 
 							return $this->simple_crypt($value, 'd');
 
@@ -205,22 +205,22 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	private function simple_crypt( $string, $action = 'e' ) {
+	private function simple_crypt($string, $action = 'e') {
 		// you may change these values to your own
 		$secret_key = NONCE_KEY;
 		$secret_iv = NONCE_SALT;
 
 		$output = $string;
 		$encrypt_method = "AES-256-CBC";
-		$key = hash( 'sha256', $secret_key );
-		$iv = substr( hash( 'sha256', $secret_iv ), 0, 16 );
+		$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 ) );
+		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) {
+		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;
 			}
@@ -235,121 +235,121 @@ 
 
 	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'];
+		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 ) {
+	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 ) ) );
+		$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 (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 (!isset($_POST[$check_field])) {
+					$_POST[$check_field] = 0;
 				}
 
-				if ( ! method_exists( $this->xcloner_sanitization, $sanitize_method ) ) {
+				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 );
+				$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'] );
+			$this->xcloner->trigger_message(__("%s storage settings saved.", 'xcloner-backup-and-restore'), "success", $this->storage_fields[$action]['text']);
 		}
 
 	}
 
-	public function check( $action = "ftp" ) {
+	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'] );
+			$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";
+	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 ) ) );
+		$this->logger->info(sprintf("Checking validity of the remote storage %s filesystem", strtoupper($storage_type)));
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $adapter, $filesystem ) = $this->$method();
+		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() ) ) {
-				throw new Exception( __( "Could not read data", 'xcloner-backup-and-restore' ) );
+		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 ) ) );
+			$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' ) );
+		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 ) ) );
+		$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' ) );
+		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 ) ) );
+		$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' ) );
+		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 ) ) );
+		$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 ) );
+	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";
+		$method = "get_".$storage."_filesystem";
 
-		if ( ! method_exists( $this, $method ) ) {
+		if (!method_exists($this, $method)) {
 			return false;
 		}
 
-		list( $remote_storage_adapter, $remote_storage_filesystem ) = $this->$method();
+		list($remote_storage_adapter, $remote_storage_filesystem) = $this->$method();
 
 		//doing remote storage cleaning here
-		$this->clean_remote_storage( $storage, $remote_storage_filesystem );
+		$this->clean_remote_storage($storage, $remote_storage_filesystem);
 
-		$this->logger->info( sprintf( "Transferring backup %s to remote storage %s", $file, strtoupper( $storage ) ), array( "" ) );
+		$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))
 		{

includes/class-xcloner-encryption.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 */
 	public function is_encrypted_file($filename) {
 		$fp = fopen($this->get_xcloner_path().$filename, 'r');
-		if($fp) {
+		if ($fp) {
             $encryption_length = fread($fp, 16);
             fclose($fp);
             if (is_numeric($encryption_length)) {