ovidiul / XCloner-Wordpress

includes/class-xcloner-activator.php

Spacing +22 added lines, -22 removed lines

@@ -35,22 +35,22 @@ 
 	
 		global $wpdb;
 		
-		if(version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
+		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 ) );
+			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;
 		
-		if($installed_ver != $xcloner_db_version)
+		if ($installed_ver != $xcloner_db_version)
 		{
-			$table_name = $wpdb->prefix . "xcloner_scheduler";
+			$table_name = $wpdb->prefix."xcloner_scheduler";
 		 
-			$xcloner_schedule_sql="CREATE TABLE IF NOT EXISTS `".$table_name."` (
+			$xcloner_schedule_sql = "CREATE TABLE IF NOT EXISTS `".$table_name."` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
 				  `name` varchar(255) NOT NULL,
 				  `recurrence` varchar(10) NOT NULL,
@@ -63,49 +63,49 @@ 
 				  PRIMARY KEY (`id`)
 				) ".$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'))
+		if (!get_option('xcloner_backup_compression_level'))
 			update_option('xcloner_backup_compression_level', 0);
 		
-		if(!get_option('xcloner_enable_log'))
+		if (!get_option('xcloner_enable_log'))
 			update_option('xcloner_enable_log', 1);
 			
-		if(!get_option('xcloner_enable_mysql_backup'))
+		if (!get_option('xcloner_enable_mysql_backup'))
 			update_option('xcloner_enable_mysql_backup', 1);
 		
-		if(!get_option('xcloner_system_settings_page'))
+		if (!get_option('xcloner_system_settings_page'))
 			update_option('xcloner_system_settings_page', 100);
 			
-		if(!get_option('xcloner_files_to_process_per_request'))
+		if (!get_option('xcloner_files_to_process_per_request'))
 			update_option('xcloner_files_to_process_per_request', 250);
 
-		if(!get_option('xcloner_database_records_per_request'))
+		if (!get_option('xcloner_database_records_per_request'))
 			update_option('xcloner_database_records_per_request', 10000);
 
-		if(!get_option('xcloner_exclude_files_larger_than_mb'))
+		if (!get_option('xcloner_exclude_files_larger_than_mb'))
 			update_option('xcloner_exclude_files_larger_than_mb', 0);
 		
-		if(!get_option('xcloner_split_backup_limit'))
+		if (!get_option('xcloner_split_backup_limit'))
 			update_option('xcloner_split_backup_limit', 2048);
 			
-		if(!get_option('xcloner_size_limit_per_request'))
+		if (!get_option('xcloner_size_limit_per_request'))
 			update_option('xcloner_size_limit_per_request', 50);
 			
-		if(!get_option('xcloner_cleanup_retention_limit_days'))
+		if (!get_option('xcloner_cleanup_retention_limit_days'))
 			update_option('xcloner_cleanup_retention_limit_days', 60);
 			
-		if(!get_option('xcloner_cleanup_retention_limit_archives'))
+		if (!get_option('xcloner_cleanup_retention_limit_archives'))
 			update_option('xcloner_cleanup_retention_limit_archives', 100);
 			
-		if(!get_option('xcloner_directories_to_scan_per_request'))
+		if (!get_option('xcloner_directories_to_scan_per_request'))
 			update_option('xcloner_directories_to_scan_per_request', 25);
 			
-		if(!get_option('xcloner_regex_exclude'))
+		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(.*)$");
 
 	}

Braces +39 added lines, -26 removed lines

@@ -69,44 +69,57 @@
 			update_option( "xcloner_db_version", $xcloner_db_version );
 		}
 	
-		if(!get_option('xcloner_backup_compression_level'))
-			update_option('xcloner_backup_compression_level', 0);
+		if(!get_option('xcloner_backup_compression_level')) {
+					update_option('xcloner_backup_compression_level', 0);
+		}
 		
-		if(!get_option('xcloner_enable_log'))
-			update_option('xcloner_enable_log', 1);
+		if(!get_option('xcloner_enable_log')) {
+					update_option('xcloner_enable_log', 1);
+		}
 			
-		if(!get_option('xcloner_enable_mysql_backup'))
-			update_option('xcloner_enable_mysql_backup', 1);
+		if(!get_option('xcloner_enable_mysql_backup')) {
+					update_option('xcloner_enable_mysql_backup', 1);
+		}
 		
-		if(!get_option('xcloner_system_settings_page'))
-			update_option('xcloner_system_settings_page', 100);
+		if(!get_option('xcloner_system_settings_page')) {
+					update_option('xcloner_system_settings_page', 100);
+		}
 			
-		if(!get_option('xcloner_files_to_process_per_request'))
-			update_option('xcloner_files_to_process_per_request', 250);
+		if(!get_option('xcloner_files_to_process_per_request')) {
+					update_option('xcloner_files_to_process_per_request', 250);
+		}
 
-		if(!get_option('xcloner_database_records_per_request'))
-			update_option('xcloner_database_records_per_request', 10000);
+		if(!get_option('xcloner_database_records_per_request')) {
+					update_option('xcloner_database_records_per_request', 10000);
+		}
 
-		if(!get_option('xcloner_exclude_files_larger_than_mb'))
-			update_option('xcloner_exclude_files_larger_than_mb', 0);
+		if(!get_option('xcloner_exclude_files_larger_than_mb')) {
+					update_option('xcloner_exclude_files_larger_than_mb', 0);
+		}
 		
-		if(!get_option('xcloner_split_backup_limit'))
-			update_option('xcloner_split_backup_limit', 2048);
+		if(!get_option('xcloner_split_backup_limit')) {
+					update_option('xcloner_split_backup_limit', 2048);
+		}
 			
-		if(!get_option('xcloner_size_limit_per_request'))
-			update_option('xcloner_size_limit_per_request', 50);
+		if(!get_option('xcloner_size_limit_per_request')) {
+					update_option('xcloner_size_limit_per_request', 50);
+		}
 			
-		if(!get_option('xcloner_cleanup_retention_limit_days'))
-			update_option('xcloner_cleanup_retention_limit_days', 60);
+		if(!get_option('xcloner_cleanup_retention_limit_days')) {
+					update_option('xcloner_cleanup_retention_limit_days', 60);
+		}
 			
-		if(!get_option('xcloner_cleanup_retention_limit_archives'))
-			update_option('xcloner_cleanup_retention_limit_archives', 100);
+		if(!get_option('xcloner_cleanup_retention_limit_archives')) {
+					update_option('xcloner_cleanup_retention_limit_archives', 100);
+		}
 			
-		if(!get_option('xcloner_directories_to_scan_per_request'))
-			update_option('xcloner_directories_to_scan_per_request', 25);
+		if(!get_option('xcloner_directories_to_scan_per_request')) {
+					update_option('xcloner_directories_to_scan_per_request', 25);
+		}
 			
-		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(.*)$");
+		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(.*)$");
+		}
 
 	}
 	

includes/class-xcloner-settings.php

Indentation +250 added lines, -250 removed lines

@@ -194,348 +194,348 @@ 
 	
 	public function settings_init()
 	{
-	    global $wpdb;
-	    $this->xcloner_sanitization = new Xcloner_Sanitization();
+		global $wpdb;
+		$this->xcloner_sanitization = new Xcloner_Sanitization();
 	    
-	    //ADDING MISSING OPTIONS
-	    if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
+		//ADDING MISSING OPTIONS
+		if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
 			add_option( 'xcloner_mysql_settings_page' );
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
 			add_option( 'xcloner_cron_settings_page' );
 		} // end if
 	    
-	    if( false == get_option( 'xcloner_system_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_system_settings_page' ) ) {  
 			add_option( 'xcloner_system_settings_page' );
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
+		if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
 			add_option( 'xcloner_cleanup_settings_page' );
 		} // end if
 	 
 	    
-	    //ADDING SETTING SECTIONS
-	    //GENERAL section
-	    add_settings_section(
-	        'xcloner_general_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_settings_page'
-	    );
-	    //MYSQL section
-	    add_settings_section(
-	        'xcloner_mysql_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_mysql_settings_page'
-	    );
+		//ADDING SETTING SECTIONS
+		//GENERAL section
+		add_settings_section(
+			'xcloner_general_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_settings_page'
+		);
+		//MYSQL section
+		add_settings_section(
+			'xcloner_mysql_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_mysql_settings_page'
+		);
 	    
-	    //SYSTEM section
-	    add_settings_section(
-	        'xcloner_system_settings_group',
-	        __('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_system_settings_page'
-	    );
+		//SYSTEM section
+		add_settings_section(
+			'xcloner_system_settings_group',
+			__('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_system_settings_page'
+		);
 	    
-	    //CLEANUP section
-	    add_settings_section(
-	        'xcloner_cleanup_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cleanup_settings_page'
-	    );
+		//CLEANUP section
+		add_settings_section(
+			'xcloner_cleanup_settings_group',
+			__(' '),
+			array($this, 'xcloner_settings_section_cb'),
+			'xcloner_cleanup_settings_page'
+		);
 	    
 		
 		//CRON section
-	    add_settings_section(
-	        'xcloner_cron_settings_group',
-	        __(' '),
-	        array($this, 'xcloner_settings_section_cb'),
-	        'xcloner_cron_settings_page'
-	    );
+		add_settings_section(
+			'xcloner_cron_settings_group',
+			__(' '),
+			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($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'),
-	        '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'), 
-	         0,
-	         9
-	         )
-	    );
+		add_settings_field(
+			'xcloner_backup_compression_level',
+		   __('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'), 
+			 0,
+			 9
+			 )
+		);
 	    
-	    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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_start_path',
+		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'),
+			'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'),
 				$this->get_xcloner_start_path(),
 				//'disabled'
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_store_path',
+		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'),
+			'xcloner_settings_page',
+			'xcloner_general_settings_group',
+			array('xcloner_store_path',
 				__('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_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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_enable_log',
+		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'),
+			'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())
 				)
 		);	
 		
 		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'),
-	        'xcloner_settings_page',
-	        'xcloner_general_settings_group',
-	        array('xcloner_regex_exclude',
+		add_settings_field(
+			'xcloner_regex_exclude',
+			__('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'),
 				//$this->get_xcloner_store_path(), 
 				//'disabled'
 				)
-	    );
+		);
 	 
 		//REGISTERING THE 'MYSQL SECTION' FIELDS
 		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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_enable_mysql_backup',
+		add_settings_field(
+			'xcloner_enable_mysql_backup',
+			__('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')
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('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'),
+			'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())
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_hostname',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_hostname',
 				__('Wordpress mysql hostname','xcloner-backup-and-restore'),
 				$this->get_db_hostname(),
 				'disabled'
 				)
-	    );
+		);
 
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_username',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_username',
 				__('Wordpress mysql username','xcloner-backup-and-restore'),
 				$this->get_db_username(),
 				'disabled'
 				)
-	    );
+		);
 	    
-	    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'),
-	        'xcloner_mysql_settings_page',
-	        'xcloner_mysql_settings_group',
-	        array('xcloner_mysql_database',
+		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'),
+			'xcloner_mysql_settings_page',
+			'xcloner_mysql_settings_group',
+			array('xcloner_mysql_database',
 				__('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($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'),
-	        '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'), 
-	         0,
-	         1024
-	         )
-	    );
+		//REGISTERING THE 'SYSTEM SECTION' FIELDS
+		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'),
+			'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'), 
+			 0,
+			 1024
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_files_to_process_per_request',
+		   __('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'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         1000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_directories_to_scan_per_request',
+		   __('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'), 
+			 0,
+			 1000
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         0,
-	         100000
-	         )
-	    );
+		add_settings_field(
+			'xcloner_database_records_per_request',
+		   __('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'), 
+			 0,
+			 100000
+			 )
+		);
 	    
 		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'),
-	        '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 -1 to include all. Range 0-1000 MB','xcloner-backup-and-restore'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_exclude_files_larger_than_mb',
+		   __('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 -1 to include all. Range 0-1000 MB','xcloner-backup-and-restore'), 
+			 )
+		);
 	    
 		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'),
-	        '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'), 
-	         )
-	    );
+		add_settings_field(
+			'xcloner_split_backup_limit',
+		   __('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'), 
+			 )
+		);
 	    
-	    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'),
-	        'xcloner_system_settings_page',
-	        'xcloner_system_settings_group',
-	        array('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'),
+			'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())
 				)
-	    );
+		);
 		
 		//REGISTERING THE 'CLEANUP SECTION' FIELDS
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_days',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_days',
+			__('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')
 			)
-	    );
+		);
 	    
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_retention_limit_archives',
+		add_settings_field(
+			'xcloner_cleanup_retention_limit_archives',
+			__('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')
 			)
-	    );
+		);
 	    
 		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'),
-	        'xcloner_cleanup_settings_page',
-	        'xcloner_cleanup_settings_group',
-	        array('xcloner_cleanup_capacity_limit',
+		add_settings_field(
+			'xcloner_cleanup_capacity_limit',
+			__('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')
 			)
-	    );
+		);
 		
 		//REGISTERING THE 'CRON SECTION' FIELDS
 		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'),
-	        'xcloner_cron_settings_page',
-	        'xcloner_cron_settings_group',
-	        array('xcloner_cron_frequency',
+		add_settings_field(
+			'xcloner_cron_frequency',
+			__('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')
 			)
-	    );
+		);
 	}
 	 
 	
@@ -548,7 +548,7 @@ 
 	// section content cb
 	public function xcloner_settings_section_cb()
 	{
-	    //echo '<p>WPOrg Section Introduction.</p>';
+		//echo '<p>WPOrg Section Introduction.</p>';
 	}
 	 
 	// text field content cb
@@ -563,8 +563,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
 	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
@@ -590,8 +590,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
 	          <textarea class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
@@ -633,8 +633,8 @@ 
 		
 		if(!$value)
 			$value = get_option($fieldname);
-	    // output the field
-	    ?>
+		// output the field
+		?>
 	    <div class="row">
 	        <div class="input-field col s10 m5 l3">
 	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">

Braces +80 added lines, -56 removed lines

@@ -8,26 +8,29 @@ 
 	
 	public function __construct($hash = "")
 	{
-		if(isset($hash))
-			$this->set_hash($hash);
+		if(isset($hash)) {
+					$this->set_hash($hash);
+		}
 	}
 	
 	public function get_logger_filename($include_hash = 0)
 	{
-		if($include_hash)
-			$filename = sprintf($this->logger_file_hash, $this->get_hash()); 
-		else
-			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
+		if($include_hash) {
+					$filename = sprintf($this->logger_file_hash, $this->get_hash());
+		} else {
+					$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
+		}
 		
 		return $filename;
 	}
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
-			$path = realpath(ABSPATH);
-		else
-			$path = get_option('xcloner_start_path');
+		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path'))) {
+					$path = realpath(ABSPATH);
+		} else {
+					$path = get_option('xcloner_start_path');
+		}
 		
 		return $path;
 	}
@@ -41,10 +44,11 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path')))
-			$path = realpath(XCLONER_STORAGE_PATH);
-		else
-			$path = get_option('xcloner_store_path');
+		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path'))) {
+					$path = realpath(XCLONER_STORAGE_PATH);
+		} else {
+					$path = get_option('xcloner_store_path');
+		}
 		
 		return $path;
 	}
@@ -64,16 +68,18 @@ 
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
-			$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root')) {
+					$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
+		}
 		
 		return $path;
 	}
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
-			return true;
+		if(get_option('xcloner_enable_mysql_backup')) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -82,10 +88,11 @@ 
 	{
 		if(!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
-				$ext = ".tgz";
-			else
-				$ext = ".tar";
+			if(get_option('xcloner_backup_compression_level')) {
+							$ext = ".tgz";
+			} else {
+							$ext = ".tar";
+			}
 		}	
 		return ($this->get_hash()).$ext;	
 	}
@@ -111,8 +118,9 @@ 
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
-			$hash = "-".$hash;
+		if(substr($hash, 0, 1) != "-" and strlen($hash)) {
+					$hash = "-".$hash;
+		}
 			
 		$this->hash = substr( $hash, 0, 6);
 		
@@ -132,8 +140,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
-			$data = $wpdb->dbhost;
+		if(!$data = get_option('xcloner_mysql_hostname')) {
+					$data = $wpdb->dbhost;
+		}
 		
 		return $data;
 	}
@@ -142,8 +151,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
-			$data = $wpdb->dbuser;
+		if(!$data = get_option('xcloner_mysql_username')) {
+					$data = $wpdb->dbuser;
+		}
 		
 		return $data;
 	}
@@ -152,8 +162,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
-			$data = $wpdb->dbpassword;
+		if(!$data = get_option('xcloner_mysql_password')) {
+					$data = $wpdb->dbpassword;
+		}
 		
 		return $data;
 	}
@@ -162,8 +173,9 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
-			$data = $wpdb->dbname;
+		if(!$data = get_option('xcloner_mysql_database')) {
+					$data = $wpdb->dbname;
+		}
 		
 		return $data;
 	}
@@ -186,8 +198,9 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
-			$hash = substr($hash, 0, $strlen);
+		if($strlen) {
+					$hash = substr($hash, 0, $strlen);
+		}
 			
 		return $hash;
 	}
@@ -554,15 +567,18 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -581,15 +597,18 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -624,15 +643,18 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
-			$params[3] = 0;
-		if(!isset($params['2']))
-			$params[2] = 0;	
+		if(!isset($params['3'])) {
+					$params[3] = 0;
+		}
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
-			$value = get_option($fieldname);
+		if(!$value) {
+					$value = get_option($fieldname);
+		}
 	    // output the field
 	    ?>
 	    <div class="row">
@@ -650,8 +672,9 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
-			$params[4] = 0;
+		if(!isset($params['4'])) {
+					$params[4] = 0;
+		}
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -672,8 +695,9 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
-			$params[2] = 0;
+		if(!isset($params['2'])) {
+					$params[2] = 0;
+		}
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
 	?>

Doc Comments +3 added lines

@@ -175,6 +175,9 @@
 		return $wpdb->prefix;
 	}
 	
+	/**
+	 * @param string $option
+	 */
 	public function get_xcloner_option($option)
 	{
 		$data = get_option($option);

Spacing +86 added lines, -86 removed lines

@@ -4,18 +4,18 @@ 
 {
 	private $logger_file = "xcloner_main_%s.log";
 	private $logger_file_hash = "xcloner%s.log";
-	private $hash ;
+	private $hash;
 	private $xcloner_sanitization;
 	
 	public function __construct($hash = "")
 	{
-		if(isset($hash))
+		if (isset($hash))
 			$this->set_hash($hash);
 	}
 	
 	public function get_logger_filename($include_hash = 0)
 	{
-		if($include_hash)
+		if ($include_hash)
 			$filename = sprintf($this->logger_file_hash, $this->get_hash()); 
 		else
 			$filename = sprintf($this->logger_file, $this->get_server_unique_hash(5));
@@ -25,7 +25,7 @@ 
 	
 	public function get_xcloner_start_path()
 	{
-		if(!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
+		if (!get_option('xcloner_start_path') or !is_dir(get_option('xcloner_start_path')))
 			$path = realpath(ABSPATH);
 		else
 			$path = get_option('xcloner_start_path');
@@ -42,7 +42,7 @@ 
 	
 	public function get_xcloner_store_path()
 	{
-		if(!get_option('xcloner_store_path')  or !is_dir(get_option('xcloner_store_path')))
+		if (!get_option('xcloner_store_path') or !is_dir(get_option('xcloner_store_path')))
 			$path = realpath(XCLONER_STORAGE_PATH);
 		else
 			$path = get_option('xcloner_store_path');
@@ -59,13 +59,13 @@ 
 	public function get_xcloner_tmp_path()
 	{
 		$path = sys_get_temp_dir().DS.".".$this->get_xcloner_tmp_path_suffix();
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			@mkdir($path);
 			@chmod($path, 0777);
 		}
 		
-		if(!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
+		if (!is_dir($path) or !is_writeable($path) or get_option('xcloner_force_tmp_path_site_root'))
 			$path = $this->get_xcloner_store_path().DS.".".$this->get_xcloner_tmp_path_suffix();
 		
 		return $path;
@@ -73,7 +73,7 @@ 
 	
 	public function get_enable_mysql_backup()
 	{
-		if(get_option('xcloner_enable_mysql_backup'))
+		if (get_option('xcloner_enable_mysql_backup'))
 			return true;
 		
 		return false;	
@@ -81,9 +81,9 @@ 
 	
 	public function get_backup_extension_name($ext = "")
 	{
-		if(!$ext)
+		if (!$ext)
 		{
-			if(get_option('xcloner_backup_compression_level'))
+			if (get_option('xcloner_backup_compression_level'))
 				$ext = ".tgz";
 			else
 				$ext = ".tar";
@@ -93,7 +93,7 @@ 
 	
 	public function get_hash()
 	{
-		if(!$this->hash){
+		if (!$this->hash) {
 			$this->set_hash("-".$this->get_server_unique_hash(5));
 		}
 		
@@ -105,17 +105,17 @@ 
 	{
 		$hash = "-".md5(rand());
 		
-		$this->set_hash(substr( $hash, 0, 6));
+		$this->set_hash(substr($hash, 0, 6));
 		
 		return $hash;
 	}
 	
 	public function set_hash($hash = "")
 	{
-		if(substr($hash, 0, 1) != "-" and strlen($hash))
+		if (substr($hash, 0, 1) != "-" and strlen($hash))
 			$hash = "-".$hash;
 			
-		$this->hash = substr( $hash, 0, 6);
+		$this->hash = substr($hash, 0, 6);
 		
 		return $this;
 	}
@@ -124,7 +124,7 @@ 
 	{
 		$data = parse_url(get_site_url());
 			
-		$backup_name = "backup_[domain]".(isset($data['port'])?":".$data['port']:"")."-[time]-".($this->get_enable_mysql_backup()?"sql":"nosql");
+		$backup_name = "backup_[domain]".(isset($data['port']) ? ":".$data['port'] : "")."-[time]-".($this->get_enable_mysql_backup() ? "sql" : "nosql");
 		
 		return $backup_name;
 	}
@@ -133,7 +133,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_hostname'))
+		if (!$data = get_option('xcloner_mysql_hostname'))
 			$data = $wpdb->dbhost;
 		
 		return $data;
@@ -143,7 +143,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_username'))
+		if (!$data = get_option('xcloner_mysql_username'))
 			$data = $wpdb->dbuser;
 		
 		return $data;
@@ -153,7 +153,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_password'))
+		if (!$data = get_option('xcloner_mysql_password'))
 			$data = $wpdb->dbpassword;
 		
 		return $data;
@@ -163,7 +163,7 @@ 
 	{
 		global $wpdb;
 		
-		if(!$data = get_option('xcloner_mysql_database'))
+		if (!$data = get_option('xcloner_mysql_database'))
 			$data = $wpdb->dbname;
 		
 		return $data;
@@ -187,7 +187,7 @@ 
 	{
 		$hash = md5(get_home_url().__DIR__);
 		
-		if($strlen)
+		if ($strlen)
 			$hash = substr($hash, 0, $strlen);
 			
 		return $hash;
@@ -199,20 +199,20 @@ 
 	    $this->xcloner_sanitization = new Xcloner_Sanitization();
 	    
 	    //ADDING MISSING OPTIONS
-	    if( false == get_option( 'xcloner_mysql_settings_page' ) ) {  
-			add_option( 'xcloner_mysql_settings_page' );
+	    if (false == get_option('xcloner_mysql_settings_page')) {  
+			add_option('xcloner_mysql_settings_page');
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cron_settings_page' ) ) {  
-			add_option( 'xcloner_cron_settings_page' );
+	    if (false == get_option('xcloner_cron_settings_page')) {  
+			add_option('xcloner_cron_settings_page');
 		} // end if
 	    
-	    if( false == get_option( 'xcloner_system_settings_page' ) ) {  
-			add_option( 'xcloner_system_settings_page' );
+	    if (false == get_option('xcloner_system_settings_page')) {  
+			add_option('xcloner_system_settings_page');
 		} // end if
 		
-	    if( false == get_option( 'xcloner_cleanup_settings_page' ) ) {  
-			add_option( 'xcloner_cleanup_settings_page' );
+	    if (false == get_option('xcloner_cleanup_settings_page')) {  
+			add_option('xcloner_cleanup_settings_page');
 		} // end if
 	 
 	    
@@ -235,7 +235,7 @@ 
 	    //SYSTEM section
 	    add_settings_section(
 	        'xcloner_system_settings_group',
-	        __('These are advanced options recommended for developers!','xcloner-backup-and-restore'),
+	        __('These are advanced options recommended for developers!', 'xcloner-backup-and-restore'),
 	        array($this, 'xcloner_settings_section_cb'),
 	        'xcloner_system_settings_page'
 	    );
@@ -263,12 +263,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -277,12 +277,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -291,12 +291,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -305,24 +305,24 @@ 
 	    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'),
+	        __('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_regex_exclude', array($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_regex_exclude',
-	        __('Regex Exclude Files','xcloner-backup-and-restore'),
+	        __('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'
 				)
@@ -332,36 +332,36 @@ 
 		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'),
+	        __('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');
 	    add_settings_field(
 	        'xcloner_backup_only_wp_tables',
-	        __('Backup only WP tables','xcloner-backup-and-restore'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_raw"));
 	    add_settings_field(
 	        'xcloner_mysql_hostname',
-	        __('Mysql Hostname','xcloner-backup-and-restore'),
+	        __('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'
 				)
@@ -370,12 +370,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -384,12 +384,12 @@ 
 	    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'),
+	        __('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'
 				)
@@ -399,12 +399,12 @@ 
 	    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'),
+	       __('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
 	         )
@@ -413,12 +413,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -427,12 +427,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -441,12 +441,12 @@ 
 		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'),
+	       __('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
 	         )
@@ -455,36 +455,36 @@ 
 		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'),
+	       __('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 -1 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 -1 to include all. Range 0-1000 MB', 'xcloner-backup-and-restore'), 
 	         )
 	    );
 	    
 		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'),
+	       __('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');
 	    add_settings_field(
 	        'xcloner_force_tmp_path_site_root',
-	        __('Force Temporary Path Within XCloner Storage','xcloner-backup-and-restore'),
+	        __('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())
 				)
 	    );
 		
@@ -492,36 +492,36 @@ 
 		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'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_retention_limit_archives',
-	        __('Cleanup by Quantity','xcloner-backup-and-restore'),
+	        __('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($this->xcloner_sanitization, "sanitize_input_as_int"));
 	    add_settings_field(
 	        'xcloner_cleanup_capacity_limit',
-	        __('Cleanup by Capacity(MB)','xcloner-backup-and-restore'),
+	        __('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')
 			)
 	    );
 		
@@ -529,7 +529,7 @@ 
 		register_setting('xcloner_cron_settings_group', 'xcloner_cron_frequency');
 	    add_settings_field(
 	        'xcloner_cron_frequency',
-	        __('Cron frequency','xcloner-backup-and-restore'),
+	        __('Cron frequency', 'xcloner-backup-and-restore'),
 	        array($this, 'do_form_text_field'),
 	        'xcloner_cron_settings_page',
 	        'xcloner_cron_settings_group',
@@ -555,20 +555,20 @@ 
 	// text field content cb
 	public function do_form_text_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
-	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <input class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="left" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -582,20 +582,20 @@ 
 	// textarea field content cb
 	public function do_form_textarea_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m10 l8">
-	          <textarea class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
+	          <textarea class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="text" class="validate" value=""><?php echo isset($value) ? esc_attr($value) : ''; ?></textarea>
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="center" data-html="true" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -625,20 +625,20 @@ 
 	// number field content cb
 	public function do_form_number_field($params)
 	{
-		if(!isset($params['3']))
+		if (!isset($params['3']))
 			$params[3] = 0;
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;	
 			
 		list($fieldname, $label, $value, $disabled) = $params;
 		
-		if(!$value)
+		if (!$value)
 			$value = get_option($fieldname);
 	    // output the field
 	    ?>
 	    <div class="row">
 	        <div class="input-field col s10 m5 l3">
-	          <input class="validate" <?php echo ($disabled)?"disabled":""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
+	          <input class="validate" <?php echo ($disabled) ? "disabled" : ""?> name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" type="number" class="validate" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>">
 	        </div>
 	        <div class="col s2 m2 ">
 				<a class="btn-floating tooltipped btn-small" data-position="center" data-delay="50" data-tooltip="<?php echo $label?>" data-tooltip-id=""><i class="material-icons">help_outline</i></a>
@@ -651,7 +651,7 @@ 
 	
 	public function do_form_range_field($params)
 	{
-		if(!isset($params['4']))
+		if (!isset($params['4']))
 			$params[4] = 0;
 			
 		list($fieldname, $label, $range_start, $range_end, $disabled) = $params;
@@ -660,7 +660,7 @@ 
 		<div class="row">
 	        <div class="input-field col s10 m10 l8">
 				<p class="range-field">
-			      <input <?php echo ($disabled)?"disabled":""?> type="range" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" min="<?php echo $range_start?>" max="<?php echo $range_end?>" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>" />
+			      <input <?php echo ($disabled) ? "disabled" : ""?> type="range" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" min="<?php echo $range_start?>" max="<?php echo $range_end?>" value="<?php echo isset($value) ? esc_attr($value) : ''; ?>" />
 			    </p>
 			</div>
 			<div class="col s2 m2 ">
@@ -673,7 +673,7 @@ 
 	
 	public function do_form_switch_field($params)
 	{
-		if(!isset($params['2']))
+		if (!isset($params['2']))
 			$params[2] = 0;
 		list($fieldname, $label, $disabled) = $params;
 		$value = get_option($fieldname);
@@ -683,7 +683,7 @@ 
 			<div class="switch">
 				<label>
 				  Off
-				  <input <?php echo ($disabled)?"disabled":""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
+				  <input <?php echo ($disabled) ? "disabled" : ""?> type="checkbox" name="<?php echo $fieldname?>" id="<?php echo $fieldname?>" value="1" <?php echo ($value) ? 'checked="checked"' : ''; ?>">
 				  <span class="lever"></span>
 				  On
 				</label>

includes/class-xcloner.php

Indentation +16 added lines, -16 removed lines

@@ -247,7 +247,7 @@ 
 		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
-        //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
+		//   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
 
 	}
 
@@ -281,8 +281,8 @@ 
 	
 	private function define_plugin_settings(){
 		/**
-		* register wporg_settings_init to the admin_init action hook
-		*/
+		 * register wporg_settings_init to the admin_init action hook
+		 */
 		$settings = new Xcloner_Settings();
 		add_action('admin_init', array($settings, 'settings_init'));
 	}
@@ -316,15 +316,15 @@ 
 	}
 	
 	function friendly_error_type($type) {
-	    static $levels=null;
-	    if ($levels===null) {
-	        $levels=[];
-	        foreach (get_defined_constants() as $key=>$value) {
-	            if (strpos($key,'E_')!==0) {continue;}
+		static $levels=null;
+		if ($levels===null) {
+			$levels=[];
+			foreach (get_defined_constants() as $key=>$value) {
+				if (strpos($key,'E_')!==0) {continue;}
 					$levels[$value]= $key; //substr($key,2);
-	        }
-	    }
-	    return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
+			}
+		}
+		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
 	}
 		
 	private function define_ajax_hooks()
@@ -355,20 +355,20 @@ 
 			add_action( 'admin_notices', array($this, 'xcloner_error_admin_notices' ));
 		
 		//if (is_admin()) {
-            add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
-        }
+			add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
+		}
 		
 	}
 	
 	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>';
 		}
         
-        return $links;
-    }
+		return $links;
+	}
 	
 	public function xcloner_error_admin_notices() {
 			settings_errors( 'xcloner_error_message' );

Spacing +60 added lines, -60 removed lines

@@ -88,15 +88,15 @@ 
 		
 	}
 	
-	public function check_dependencies(){
+	public function check_dependencies() {
 		
 		$backup_storage_path = realpath(__DIR__.DS."..".DS."..".DS."..").DS."backups".DS;
 		
 		define("XCLONER_STORAGE_PATH", realpath($backup_storage_path));
 
-		if(!is_dir($backup_storage_path))
+		if (!is_dir($backup_storage_path))
 		{
-			if(!@mkdir($backup_storage_path))
+			if (!@mkdir($backup_storage_path))
 			{
 				$status = "error";
 				$message = sprintf(__("Unable to create the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -104,7 +104,7 @@ 
 				return;
 			}
 		}	
-		if(!is_writable($backup_storage_path))
+		if (!is_writable($backup_storage_path))
 		{
 			$status = "error";
 			$message = sprintf(__("Unable to write to the Backup Storage Location Folder %s . Please fix this before starting the backup process."), $backup_storage_path);
@@ -118,15 +118,15 @@ 
 	public function trigger_message($message, $status = "error", $message_param1 = "", $message_param2 = "", $message_param3 = "")
 	{
 			$message = sprintf(__($message), $message_param1, $message_param2, $message_param3);
-			add_action( 'xcloner_admin_notices', array($this,"trigger_message_notice"), 10, 2);
-			do_action( 'xcloner_admin_notices', $message, $status);
+			add_action('xcloner_admin_notices', array($this, "trigger_message_notice"), 10, 2);
+			do_action('xcloner_admin_notices', $message, $status);
 	}
 	
 	public function trigger_message_notice($message, $status = "success")
 	{
 		?>
 		<div class="notice notice-<?php echo $status?> is-dismissible">
-	        <p><?php _e( $message, 'xcloner-backup-and-restore' ); ?></p>
+	        <p><?php _e($message, 'xcloner-backup-and-restore'); ?></p>
 	    </div>
 		<?php
 	}
@@ -153,79 +153,79 @@ 
 		 * 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 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();
 
@@ -244,7 +244,7 @@ 
 
 		$plugin_i18n = new Xcloner_i18n();
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 		
 		//wp_localize_script( 'ajax-script', 'my_ajax_object',
         //   array( 'ajax_url' => admin_url( 'admin-ajax.php' ) ) );
@@ -260,11 +260,11 @@ 
 	 */
 	private function define_admin_hooks() {
 	
-		$plugin_admin = new Xcloner_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Xcloner_Admin($this->get_plugin_name(), $this->get_version());
 		$this->plugin_admin = $plugin_admin;
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 		
 	}
 	
@@ -273,13 +273,13 @@ 
 	 * 
 	 * @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
 		*/
@@ -296,10 +296,10 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Xcloner_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Xcloner_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 	}
 	
@@ -308,20 +308,20 @@ 
 		$logger = new XCloner_Logger("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}");
@@ -332,27 +332,27 @@ 
 		//$plugin_public = new Xcloner_Public( $this->get_plugin_name(), $this->get_version() );
 		//$this->loader->add_action( 'wp_ajax_get_database_tables_action', $plugin_public, array('Xcloner_Api','get_database_tables_action') );
 		
-		if(is_admin())
+		if (is_admin())
 		{
 			$xcloner_api = new Xcloner_Api();
 
-			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( 'admin_notices', array($this, 'xcloner_error_admin_notices' ));
+			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('admin_notices', array($this, 'xcloner_error_admin_notices'));
 		
 		//if (is_admin()) {
             add_filter('plugin_action_links', array($this, 'add_plugin_action_links'), 10, 2);
@@ -361,7 +361,7 @@ 
 	}
 	
 	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>';
@@ -371,13 +371,13 @@ 
     }
 	
 	public function xcloner_error_admin_notices() {
-			settings_errors( 'xcloner_error_message' );
+			settings_errors('xcloner_error_message');
 		}
 	
 	public function define_cron_hooks()
 	{
 		//registering new schedule intervals
-		add_filter( 'cron_schedules', array($this, 'add_new_intervals'));
+		add_filter('cron_schedules', array($this, 'add_new_intervals'));
 			
 		
 		$xcloner_scheduler = new Xcloner_Scheduler();
@@ -451,7 +451,7 @@ 
 	
 	public function display($page)
 	{
-		$plugin_admin = new Xcloner_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Xcloner_Admin($this->get_plugin_name(), $this->get_version());
 		$this->plugin_admin = $plugin_admin;
 		
 		call_user_func_array(array($this->plugin_admin, $page), array());

includes/class-xcloner-requirements.php

Indentation +4 added lines, -4 removed lines

@@ -147,14 +147,14 @@
 	  $unit_list = array('B', 'KB', 'MB', 'GB', 'PB');
 	
 	  if ($bytes == 0) {
-	    return $bytes . ' ' . $unit_list[0];
+		return $bytes . ' ' . $unit_list[0];
 	  }
 	
 	  $unit_count = count($unit_list);
 	  for ($i = $unit_count - 1; $i >= 0; $i--) {
-	    $power = $i * 10;
-	    if (($bytes >> $power) >= 1)
-	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+		$power = $i * 10;
+		if (($bytes >> $power) >= 1)
+		  return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
 	  }
 	}
 }

Braces +49 added lines, -34 removed lines

@@ -13,20 +13,25 @@ 
 	
 	public function check_backup_ready_status()
 	{
-		if(!$this->check_min_php_version(1))
-			return false;
+		if(!$this->check_min_php_version(1)) {
+					return false;
+		}
 		
-		if(!$this->check_safe_mode(1))
-			return false;
+		if(!$this->check_safe_mode(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_start_path(1))
-			return false;
+		if(!$this->check_xcloner_start_path(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_store_path(1))
-			return false;
+		if(!$this->check_xcloner_store_path(1)) {
+					return false;
+		}
 		
-		if(!$this->check_xcloner_tmp_path(1))
-			return false;
+		if(!$this->check_xcloner_tmp_path(1)) {
+					return false;
+		}
 			
 		return true;	
 	}
@@ -41,10 +46,11 @@ 
 		
 		if($return_bool == 1)
 		{
-			if(version_compare(phpversion(), $this->min_php_version, '<'))
-				return false;
-			else
-				return true;
+			if(version_compare(phpversion(), $this->min_php_version, '<')) {
+							return false;
+			} else {
+							return true;
+			}
 		}
 		
 		return phpversion();
@@ -56,14 +62,16 @@ 
 		
 		if($return_bool)
 		{
-			if( ini_get('safe_mode') )
-				return false;
-			else
-				return true;
+			if( ini_get('safe_mode') ) {
+							return false;
+			} else {
+							return true;
+			}
 		}
 		
-		if( ini_get('safe_mode') )
-			$safe_mode = "On";
+		if( ini_get('safe_mode') ) {
+					$safe_mode = "On";
+		}
 			
 		return $safe_mode;
 	}
@@ -74,8 +82,9 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 				
 			return is_readable($path);
 		}
@@ -89,11 +98,13 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 			
-			if(!is_writeable($path))	
-				@chmod($path, 0777);
+			if(!is_writeable($path)) {
+							@chmod($path, 0777);
+			}
 					
 			return is_writeable($path);
 		}
@@ -107,11 +118,13 @@ 
 		
 		if($return_bool)
 		{
-			if(!file_exists($path))
-				return false;
+			if(!file_exists($path)) {
+							return false;
+			}
 			
-			if(!is_writeable($path))	
-				@chmod($path, 0777);
+			if(!is_writeable($path)) {
+							@chmod($path, 0777);
+			}
 				
 			return is_writeable($path);
 		}
@@ -133,8 +146,9 @@ 
 	{
 		$open_basedir =  ini_get('open_basedir');
 		
-		if(!$open_basedir)
-			$open_basedir = "none";
+		if(!$open_basedir) {
+					$open_basedir = "none";
+		}
 		return $open_basedir;	
 	}
 	
@@ -153,8 +167,9 @@ 
 	  $unit_count = count($unit_list);
 	  for ($i = $unit_count - 1; $i >= 0; $i--) {
 	    $power = $i * 10;
-	    if (($bytes >> $power) >= 1)
-	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+	    if (($bytes >> $power) >= 1) {
+	    	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+	    }
 	  }
 	}
 }

Spacing +29 added lines, -29 removed lines

@@ -3,31 +3,31 @@ 
 class XCloner_Requirements
 {
 	
-	var $min_php_version 	= "5.4.0";
-	var $safe_mode			= "Off";
+	var $min_php_version = "5.4.0";
+	var $safe_mode = "Off";
 	
 	private $xcloner_settings;
 	
 	public function __construct()
 	{
-		$this->xcloner_settings 		= new Xcloner_Settings();
+		$this->xcloner_settings = new Xcloner_Settings();
 	}
 	
 	public function check_backup_ready_status()
 	{
-		if(!$this->check_min_php_version(1))
+		if (!$this->check_min_php_version(1))
 			return false;
 		
-		if(!$this->check_safe_mode(1))
+		if (!$this->check_safe_mode(1))
 			return false;
 		
-		if(!$this->check_xcloner_start_path(1))
+		if (!$this->check_xcloner_start_path(1))
 			return false;
 		
-		if(!$this->check_xcloner_store_path(1))
+		if (!$this->check_xcloner_store_path(1))
 			return false;
 		
-		if(!$this->check_xcloner_tmp_path(1))
+		if (!$this->check_xcloner_tmp_path(1))
 			return false;
 			
 		return true;	
@@ -41,9 +41,9 @@ 
 	public function check_min_php_version($return_bool = 0)
 	{
 		
-		if($return_bool == 1)
+		if ($return_bool == 1)
 		{
-			if(version_compare(phpversion(), $this->min_php_version, '<'))
+			if (version_compare(phpversion(), $this->min_php_version, '<'))
 				return false;
 			else
 				return true;
@@ -52,31 +52,31 @@ 
 		return phpversion();
 	}
 	
-	public function check_safe_mode($return_bool=0)
+	public function check_safe_mode($return_bool = 0)
 	{
 		$safe_mode = "Off";
 		
-		if($return_bool)
+		if ($return_bool)
 		{
-			if( ini_get('safe_mode') )
+			if (ini_get('safe_mode'))
 				return false;
 			else
 				return true;
 		}
 		
-		if( ini_get('safe_mode') )
+		if (ini_get('safe_mode'))
 			$safe_mode = "On";
 			
 		return $safe_mode;
 	}
 	
-	public function check_xcloner_start_path($return_bool=0)
+	public function check_xcloner_start_path($return_bool = 0)
 	{
 		$path = $this->xcloner_settings->get_xcloner_start_path();
 		
-		if($return_bool)
+		if ($return_bool)
 		{
-			if(!file_exists($path))
+			if (!file_exists($path))
 				return false;
 				
 			return is_readable($path);
@@ -85,16 +85,16 @@ 
 		return $path;
 	}
 	
-	public function check_xcloner_tmp_path($return_bool=0)
+	public function check_xcloner_tmp_path($return_bool = 0)
 	{
 		$path = $this->xcloner_settings->get_xcloner_tmp_path();
 		
-		if($return_bool)
+		if ($return_bool)
 		{
-			if(!file_exists($path))
+			if (!file_exists($path))
 				return false;
 			
-			if(!is_writeable($path))	
+			if (!is_writeable($path))	
 				@chmod($path, 0777);
 					
 			return is_writeable($path);
@@ -103,16 +103,16 @@ 
 		return $path;
 	}
 	
-	public function check_xcloner_store_path($return_bool=0)
+	public function check_xcloner_store_path($return_bool = 0)
 	{
 		$path = $this->xcloner_settings->get_xcloner_store_path();
 		
-		if($return_bool)
+		if ($return_bool)
 		{
-			if(!file_exists($path))
+			if (!file_exists($path))
 				return false;
 			
-			if(!is_writeable($path))	
+			if (!is_writeable($path))	
 				@chmod($path, 0777);
 				
 			return is_writeable($path);
@@ -133,9 +133,9 @@ 
 	
 	public function get_open_basedir()
 	{
-		$open_basedir =  ini_get('open_basedir');
+		$open_basedir = ini_get('open_basedir');
 		
-		if(!$open_basedir)
+		if (!$open_basedir)
 			$open_basedir = "none";
 		return $open_basedir;	
 	}
@@ -149,14 +149,14 @@ 
 	  $unit_list = array('B', 'KB', 'MB', 'GB', 'PB');
 	
 	  if ($bytes == 0) {
-	    return $bytes . ' ' . $unit_list[0];
+	    return $bytes.' '.$unit_list[0];
 	  }
 	
 	  $unit_count = count($unit_list);
 	  for ($i = $unit_count - 1; $i >= 0; $i--) {
 	    $power = $i * 10;
 	    if (($bytes >> $power) >= 1)
-	      return round($bytes / (1 << $power), $decimals) . ' ' . $unit_list[$i];
+	      return round($bytes / (1 << $power), $decimals).' '.$unit_list[$i];
 	  }
 	}
 }

includes/class-xcloner-deactivator.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	 * @since    1.0.0
 	 */
 	public static function deactivate() {
-		if(class_exists('Xcloner_Scheduler'))
+		if (class_exists('Xcloner_Scheduler'))
 		{
 			$xcloner_scheduler = new Xcloner_Scheduler();
 			$xcloner_scheduler->deactivate_wp_cron_hooks();

includes/class-xcloner-i18n.php

Spacing +1 added lines, -1 removed lines

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

xcloner.php

Indentation +3 added lines, -3 removed lines

@@ -99,9 +99,9 @@
 function xcloner_display()
 {	
 	// check user capabilities
-    if (!current_user_can('manage_options')) {
-        return;
-    }
+	if (!current_user_can('manage_options')) {
+		return;
+	}
 
 	$page = sanitize_key($_GET['page']);
 	$plugin = new Xcloner();

Spacing +20 added lines, -20 removed lines

@@ -26,12 +26,12 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
 //i will not load the plugin outside admin or cron
-if(!is_admin() and !defined('DOING_CRON'))
+if (!is_admin() and !defined('DOING_CRON'))
 	return;
 
 define("DS", DIRECTORY_SEPARATOR);
@@ -42,7 +42,7 @@ 
  */
 function activate_xcloner() 
 {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-xcloner-activator.php';
 	Xcloner_Activator::activate();
 }
 
@@ -52,31 +52,31 @@ 
  */
 function deactivate_xcloner() 
 {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-xcloner-deactivator.php';
 	Xcloner_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_xcloner' );
-register_deactivation_hook( __FILE__, 'deactivate_xcloner' );
+register_activation_hook(__FILE__, 'activate_xcloner');
+register_deactivation_hook(__FILE__, 'deactivate_xcloner');
 
-require_once plugin_dir_path( __FILE__ ) . 'includes/class-xcloner-activator.php';	
+require_once plugin_dir_path(__FILE__).'includes/class-xcloner-activator.php';	
 
-if(version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
+if (version_compare(phpversion(), Xcloner_Activator::xcloner_minimum_version, '<'))
 {
 	?>
 	<div class="error notice">
-		<p><?php echo sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s. Plugin is now deactivated."),Xcloner_Activator::xcloner_minimum_version, phpversion())?></p>
+		<p><?php echo sprintf(__("XCloner requires minimum PHP version %s in order to run correctly. We have detected your version as %s. Plugin is now deactivated."), Xcloner_Activator::xcloner_minimum_version, phpversion())?></p>
 	</div>
 	<?php	
-	require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-	deactivate_plugins( plugin_basename( __FILE__ ) );
+	require_once(ABSPATH.'wp-admin/includes/plugin.php');
+	deactivate_plugins(plugin_basename(__FILE__));
 	return;
 }		
 		
-$db_installed_ver = get_option( "xcloner_db_version" );
+$db_installed_ver = get_option("xcloner_db_version");
 $xcloner_db_version = Xcloner_Activator::xcloner_db_version;
 
-if($db_installed_ver != $xcloner_db_version)
+if ($db_installed_ver != $xcloner_db_version)
 {
 	Xcloner_Activator::activate();
 }
@@ -91,9 +91,9 @@ 
 	wp_deregister_script('heartbeat');
 }
 
-if(isset($_GET['page']) and stristr($_GET['page'] ,  "xcloner_"))
+if (isset($_GET['page']) and stristr($_GET['page'], "xcloner_"))
 {
-	add_action( 'init', 'stop_heartbeat', 1 );
+	add_action('init', 'stop_heartbeat', 1);
 }	
 
 function xcloner_display()
@@ -105,7 +105,7 @@ 
 
 	$page = sanitize_key($_GET['page']);
 	$plugin = new Xcloner();
-	if($page)
+	if ($page)
 	{
 		$plugin->display($page);
 	}
@@ -130,12 +130,12 @@ 
 
 }
 
-require_once(plugin_dir_path( __FILE__ )  . '/vendor/autoload.php');
-require plugin_dir_path( __FILE__ ) . 'includes/class-xcloner.php';
+require_once(plugin_dir_path(__FILE__).'/vendor/autoload.php');
+require plugin_dir_path(__FILE__).'includes/class-xcloner.php';
 
-try{
+try {
 	run_xcloner();
-}catch(Exception $e)
+}catch (Exception $e)
 {
 	echo $e->getMessage();
 }

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@ 
 }
 
 //i will not load the plugin outside admin or cron
-if(!is_admin() and !defined('DOING_CRON'))
+if(!is_admin() and !defined('DOING_CRON')) {
 	return;
+}
 
 define("DS", DIRECTORY_SEPARATOR);
 
@@ -135,7 +136,7 @@ 
 
 try{
 	run_xcloner();
-}catch(Exception $e)
+} catch(Exception $e)
 {
 	echo $e->getMessage();
 }

admin/partials/xcloner_console_page.php

Braces +4 added lines, -1 removed lines

@@ -33,7 +33,10 @@
 			<li class="active">
 				<div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger</div>
 				<div class="collapsible-body">
-					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
+					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) {
+	echo implode("<br />\n", $logger_content);
+}
+?></div>
 				</div>
 			</li>
 		</ul>

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-$xcloner_settings 		= new Xcloner_Settings();
-$logger				= new Xcloner_Logger();
+$xcloner_settings = new Xcloner_Settings();
+$logger = new Xcloner_Logger();
 
 
 $xcloner_scheduler = new Xcloner_Scheduler();
@@ -10,7 +10,7 @@ 
 
 $xcloner_file_transfer->set_target("http://thinkovi.com/xcloner/xcloner_restore.php");
 
-$start = 0 ;
+$start = 0;
 ?>
 <div class="col s12 ">
 	<div>
@@ -18,12 +18,12 @@ 
 				<?php echo __('XCloner Debugger Dashboard', 'xcloner-backup-and-restore') ?>
 		</h5>
 		
-		<?php if($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
+		<?php if ($xcloner_settings->get_xcloner_option('xcloner_enable_log')) :?>
 		<ul class="collapsible xcloner-debugger" data-collapsible="accordion">
 			<li class="active">
 				<div class="collapsible-header active"><i class="material-icons">bug_report</i>XCloner Debugger</div>
 				<div class="collapsible-body">
-					<div class="console" id="xcloner-console"><?php if(isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
+					<div class="console" id="xcloner-console"><?php if (isset($logger_content)) echo implode("<br />\n", $logger_content); ?></div>
 				</div>
 			</li>
 		</ul>
@@ -36,6 +36,6 @@ 
 				}, 2000);*/
 			})
 		</script>
-		<?php endif;?>
+		<?php endif; ?>
 	</div>
 </div>

admin/partials/xcloner_manage_backups_page.php

Spacing +25 added lines, -25 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$xcloner_file_system 		= new Xcloner_File_System();
+$xcloner_file_system = new Xcloner_File_System();
 
 $backup_list = $xcloner_file_system->get_backup_archives_list();
 
@@ -19,10 +19,10 @@ 
 				  <label for="select_all">&nbsp;</label>
 				</p> 
 		  </th>
-		  <th data-field="id"><?php echo __("Backup Name",'xcloner-backup-and-restore')?></th>
-		  <th data-field="name"><?php echo __("Created Time",'xcloner-backup-and-restore')?></th>
-		  <th data-field="name"><?php echo __("Size",'xcloner-backup-and-restore')?></th>
-		  <th class="no-sort" data-field="price"><?php echo __("Action",'xcloner-backup-and-restore')?></th>
+		  <th data-field="id"><?php echo __("Backup Name", 'xcloner-backup-and-restore')?></th>
+		  <th data-field="name"><?php echo __("Created Time", 'xcloner-backup-and-restore')?></th>
+		  <th data-field="name"><?php echo __("Size", 'xcloner-backup-and-restore')?></th>
+		  <th class="no-sort" data-field="price"><?php echo __("Action", 'xcloner-backup-and-restore')?></th>
 		  
 	  </tr>
 	</thead>
@@ -32,8 +32,8 @@ 
       
 <?php 
 $i = 0;
-foreach($backup_list as $file_info):?>
-<?php if(!isset($file_info['parent'])):?>	
+foreach ($backup_list as $file_info):?>
+<?php if (!isset($file_info['parent'])):?>	
 	
 	<tr>
 		<td class="checkbox">
@@ -45,31 +45,31 @@ 
 		<td>
 			<?php echo $file_info['path']?>
 			<?php 
-			if(isset($file_info['childs']) and is_array($file_info['childs'])):
+			if (isset($file_info['childs']) and is_array($file_info['childs'])):
 			?>
 			<a href="#" title="expand" class="expand-multipart add"><i class="material-icons">add</i></a>
 			<a href="#" title="collapse" class="expand-multipart remove"><i class="material-icons">remove</i></a>
 			<ul class="multipart">
-			<?php foreach($file_info['childs'] as $child):?>
+			<?php foreach ($file_info['childs'] as $child):?>
 				<?php #$download_file .= "|".$child[0];?>
 				<li>
 					<?php echo $child[0]?> (<?php echo size_format($child[2])?>) 
-					<a href="#<?php echo $child[0];?>" class="download" title="Download Backup"><i class="material-icons">file_download</i></a>
-					<a href="#<?php echo $child[0]?>" class="list-backup-content" title="<?php echo __('List Backup Content','xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a> 
+					<a href="#<?php echo $child[0]; ?>" class="download" title="Download Backup"><i class="material-icons">file_download</i></a>
+					<a href="#<?php echo $child[0]?>" class="list-backup-content" title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a> 
 				</li>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</ul>
-			<?php endif;?>
+			<?php endif; ?>
 		</td>
 		<td><?php echo date("d M, Y H:i", $file_info['timestamp'])?></td>
 		<td><?php echo size_format($file_info['size'])?></td>
 		<td>
-			 <a href="#<?php echo $file_info['path'];?>" class="download" title="<?php echo __('Download Backup','xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
-			 <?php if(sizeof($available_storages)):?>
-				<a href="#<?php echo $file_info['path']?>" class="cloud-upload" title="<?php echo __('Send Backup To Remote Storage','xcloner-backup-and-restore')?>"><i class="material-icons">cloud_upload</i></a>
+			 <a href="#<?php echo $file_info['path']; ?>" class="download" title="<?php echo __('Download Backup', 'xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
+			 <?php if (sizeof($available_storages)):?>
+				<a href="#<?php echo $file_info['path']?>" class="cloud-upload" title="<?php echo __('Send Backup To Remote Storage', 'xcloner-backup-and-restore')?>"><i class="material-icons">cloud_upload</i></a>
 			 <?php endif?>
-			 <a href="#<?php echo $file_info['path']?>" class="list-backup-content" title="<?php echo __('List Backup Content','xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
-			 <a href="#<?php echo $file_info['path']?>" class="delete" title="<?php echo __('Delete Backup','xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
+			 <a href="#<?php echo $file_info['path']?>" class="list-backup-content" title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
+			 <a href="#<?php echo $file_info['path']?>" class="delete" title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
 		</td>
 		
 	</tr>
@@ -80,13 +80,13 @@ 
 	</tbody>
 </table>
 
-<a class="waves-effect waves-light btn delete-all"><i class="material-icons left">delete</i><?php echo __("Delete",'xcloner-backup-and-restore')?></a>
+<a class="waves-effect waves-light btn delete-all"><i class="material-icons left">delete</i><?php echo __("Delete", 'xcloner-backup-and-restore')?></a>
 
 <!-- List Backup Content Modal-->
 
 <div id="backup_cotent_modal" class="modal">
 	<div class="modal-content">
-		<h4><?php echo sprintf(__("Listing Backup Content ",'xcloner-backup-and-restore'), "")?></h4>
+		<h4><?php echo sprintf(__("Listing Backup Content ", 'xcloner-backup-and-restore'), "")?></h4>
 		<h5 class="backup-name"></h5>
 		
 		<div class="progress">
@@ -101,17 +101,17 @@ 
 	<form method="POST" class="remote-storage-form">
 	<input type="hidden" name="file" class="backup_name">	  
 	<div class="modal-content">
-	  <h4><?php echo __("Remote Storage Transfer",'xcloner-backup-and-restore')?></h4>
+	  <h4><?php echo __("Remote Storage Transfer", 'xcloner-backup-and-restore')?></h4>
 	  <p>
-	  <?php if(sizeof($available_storages)):?>
+	  <?php if (sizeof($available_storages)):?>
 			<div class="row">
 				<div class="col s12 label">
-					<label><?php echo sprintf(__('Send %s to remote storage','xcloner-backup-and-restore'), "<span class='backup_name'></span>") ?></label>
+					<label><?php echo sprintf(__('Send %s to remote storage', 'xcloner-backup-and-restore'), "<span class='backup_name'></span>") ?></label>
 				</div>
 				<div class="input-field col s8 m10">
 					<select name="transfer_storage" id="transfer_storage" class="validate" required >
 						<option value="" selected><?php echo __('please select...', 'xcloner-backup-and-restore') ?></option>
-						<?php foreach($available_storages as $storage=>$text):?>
+						<?php foreach ($available_storages as $storage=>$text):?>
 							<option value="<?php echo $storage?>"><?php echo $text?></option>
 						<?php endforeach?>
 						</select>
@@ -122,7 +122,7 @@ 
 				</div>
 			</div>
 			<div class="row status">
-				<?php echo __("Uploading backup to the selected remote storage...",'xcloner-backup-and-restore')?> <span class="status-text"></span>
+				<?php echo __("Uploading backup to the selected remote storage...", 'xcloner-backup-and-restore')?> <span class="status-text"></span>
 				<div class="progress">
 					<div class="indeterminate"></div>
 				</div>