ovidiul / XCloner-Wordpress

public/class-xcloner-public.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 	 * @param      string    $plugin_name       The name of the plugin.
 	 * @param      string    $version    The version of this plugin.
 	 */
-	public function __construct( $plugin_name, $version ) {
+	public function __construct($plugin_name, $version) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version = $version;
@@ -73,7 +73,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/xcloner-public.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/xcloner-public.css', array(), $this->version, 'all');
 
 	}
 
@@ -96,7 +96,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/xcloner-public.js', array( 'jquery' ), $this->version, false );
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/xcloner-public.js', array('jquery'), $this->version, false);
 
 	}
 

includes/class-xcloner-sanitization.php

Spacing +4 added lines, -4 removed lines

@@ -22,14 +22,14 @@
 	{
 		$path = filter_var($option, FILTER_SANITIZE_URL);
 		
-		try{
+		try {
 			$option = Util::normalizePath($path);
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			add_settings_error('xcloner_error_message', '', __($e->getMessage()), 'error');
 		}
 		
-		if($path and !is_dir($path)){
-			add_settings_error('xcloner_error_message', '', __(sprintf('Invalid Server Path %s',$option)), 'error');
+		if ($path and !is_dir($path)) {
+			add_settings_error('xcloner_error_message', '', __(sprintf('Invalid Server Path %s', $option)), 'error');
 			return false;
 		}
 		

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		
 		try{
 			$option = Util::normalizePath($path);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			add_settings_error('xcloner_error_message', '', __($e->getMessage()), 'error');
 		}
 		

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

Spacing +29 added lines, -29 removed lines

@@ -3,29 +3,29 @@ 
 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";
 	
 	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;	
@@ -39,9 +39,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;
@@ -50,31 +50,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);
@@ -83,16 +83,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);
@@ -101,16 +101,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);
@@ -131,9 +131,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;	
 	}
@@ -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];
+	      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];
+	    }
 	  }
 	}
 }

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/'
 		);
 
 	}

includes/class-xcloner-logger.php

Spacing +15 added lines, -15 removed lines

@@ -4,31 +4,31 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Handler\RotatingFileHandler;
 
-class Xcloner_Logger extends Logger{
+class Xcloner_Logger extends Logger {
 	
-	private $logger_path ;
+	private $logger_path;
 	private $max_logger_files = 15;
 	private $main_logger_url;
 	
-	public function __construct($logger_name = "xcloner_logger", $hash="")
+	public function __construct($logger_name = "xcloner_logger", $hash = "")
 	{
-		$xcloner_settings 	= new Xcloner_Settings($hash);
+		$xcloner_settings = new Xcloner_Settings($hash);
 		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		
-		if($hash)
+		if ($hash)
 			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
 		
 		
 		$this->logger_path = $logger_path;
 		//$this->logger_path_tmp = $logger_path_tmp;
 		
-		if(!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
+		if (!is_dir($xcloner_settings->get_xcloner_store_path()) or !is_writable($xcloner_settings->get_xcloner_store_path()))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
 		}
 		
-		if(!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if (!$xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 		{
 			$logger_path = "php://stderr";
 			$logger_path_tmp = "";
@@ -39,17 +39,17 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 			$debug_level = Logger::DEBUG;
 
 	
-		if($logger_path)
+		if ($logger_path)
 			$this->pushHandler($stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level));
 			
 		
-		$this->main_logger_url =  $stream->getUrl();
+		$this->main_logger_url = $stream->getUrl();
 		
-		if($hash and $logger_path_tmp)
+		if ($hash and $logger_path_tmp)
 			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
 		
 		return $this;
@@ -65,7 +65,7 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
+		if (!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
 			return false;
 		
 		//$fp = fopen($this->logger_path, 'r');
@@ -75,12 +75,12 @@ 
 		$lastLine = "";
 		
 		// Loop backword until we have our lines or we reach the start
-		while($pos > 0 && count($lines) < $totalLines) {
+		while ($pos > 0 && count($lines) < $totalLines) {
 		
 		$C = fgetc($fp);
-		if($C == "\n") {
+		if ($C == "\n") {
 		  // skip empty lines
-		  if(trim($lastLine) != "") {
+		  if (trim($lastLine) != "") {
 			$lines[] = $lastLine;
 		  }
 		  $lastLine = '';

Braces +15 added lines, -10 removed lines

@@ -15,8 +15,9 @@ 
 		$xcloner_settings 	= new Xcloner_Settings($hash);
 		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		
-		if($hash)
-			$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		if($hash) {
+					$logger_path_tmp = $xcloner_settings->get_xcloner_tmp_path().DS.$xcloner_settings->get_logger_filename(1);
+		}
 		
 		
 		$this->logger_path = $logger_path;
@@ -39,18 +40,21 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
-			$debug_level = Logger::DEBUG;
+		if(WP_DEBUG) {
+					$debug_level = Logger::DEBUG;
+		}
 
 	
-		if($logger_path)
-			$this->pushHandler($stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level));
+		if($logger_path) {
+					$this->pushHandler($stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level));
+		}
 			
 		
 		$this->main_logger_url =  $stream->getUrl();
 		
-		if($hash and $logger_path_tmp)
-			$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		if($hash and $logger_path_tmp) {
+					$this->pushHandler(new StreamHandler($logger_path_tmp, $debug_level));
+		}
 		
 		return $this;
 	}
@@ -65,8 +69,9 @@ 
 		$lines = array();
 		
 		//if(!file_exists($this->logger_path) or !is_readable($this->logger_path))
-		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url))
-			return false;
+		if(!file_exists($this->main_logger_url) or !is_readable($this->main_logger_url)) {
+					return false;
+		}
 		
 		//$fp = fopen($this->logger_path, 'r');
 		$fp = fopen($this->main_logger_url, 'r');

includes/class-xcloner-scheduler.php

Spacing +59 added lines, -59 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Xcloner_Scheduler{
+class Xcloner_Scheduler {
 	
 	private $db;
 	private $scheduler_table = "xcloner_scheduler";
@@ -15,23 +15,23 @@ 
 		global $wpdb;
 		$this->db = $wpdb;
 		
-		$wpdb->show_errors				= false;
+		$wpdb->show_errors = false;
 		
 		$this->xcloner_settings 		= new Xcloner_Settings();
 		
 		$this->scheduler_table 			= $this->db->prefix.$this->scheduler_table;
 	}
 
-	public function get_scheduler_list($return_only_enabled = 0 )
+	public function get_scheduler_list($return_only_enabled = 0)
 	{
 		$list = $this->db->get_results("SELECT * FROM ".$this->scheduler_table);
 		
-		if($return_only_enabled)
+		if ($return_only_enabled)
 		{
-			$new_list= array();
+			$new_list = array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach ($list as $res)
+				if ($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
 					$new_list[] = $res;
@@ -59,7 +59,7 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
+		if (!$data)
 			return false;
 		
 		$params = json_decode($data['params']);
@@ -76,10 +76,10 @@ 
 	
 	public function delete_schedule_by_id($id)
 	{
-		$hook =  'xcloner_scheduler_'.$id;
-		wp_clear_scheduled_hook( $hook, array($id) );
+		$hook = 'xcloner_scheduler_'.$id;
+		wp_clear_scheduled_hook($hook, array($id));
 		
-		$data = $this->db->delete( $this->scheduler_table , array( 'id' => $id ) );
+		$data = $this->db->delete($this->scheduler_table, array('id' => $id));
 		
 		return $data;
 	}
@@ -88,12 +88,12 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
-			$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-			wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+			$timestamp = wp_next_scheduled($hook, array($schedule->id));
+			wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		}
 	}
 	
@@ -101,24 +101,24 @@ 
 	{
 		$list = $this->get_scheduler_list();
 		
-		foreach($list as $schedule)
+		foreach ($list as $schedule)
 		{
-			$hook =  'xcloner_scheduler_'.$schedule->id;
+			$hook = 'xcloner_scheduler_'.$schedule->id;
 			
 			//adding the xcloner_scheduler hook with xcloner_scheduler_callback callback
-			add_action( $hook, array($this, 'xcloner_scheduler_callback'), 10,  1 );
+			add_action($hook, array($this, 'xcloner_scheduler_callback'), 10, 1);
 			
-			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
+			if (!wp_next_scheduled($hook, array($schedule->id)) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+				if ($schedule->recurrence == "single")
+					wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
 				else	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+					wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 					
-			}elseif(!$schedule->status)
+			}elseif (!$schedule->status)
 			{
-				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+				$timestamp = wp_next_scheduled($hook, array($schedule->id));
+				wp_unschedule_event($timestamp, $hook, array($schedule->id));
 			}
 		}
 	
@@ -127,17 +127,17 @@ 
 	public function update_cron_hook($id)
 	{
 		$schedule = $this->get_schedule_by_id_object($id);
-		$hook =  'xcloner_scheduler_'.$schedule->id;
+		$hook = 'xcloner_scheduler_'.$schedule->id;
 		
-		$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
+		$timestamp = wp_next_scheduled($hook, array($schedule->id));
+		wp_unschedule_event($timestamp, $hook, array($schedule->id));
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			else{	
-				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+			if ($schedule->recurrence == "single")
+				wp_schedule_single_event(strtotime($schedule->start_at), $hook, array($schedule->id));
+			else {	
+				wp_schedule_event(strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id));
 			}
 				
 		}
@@ -145,16 +145,16 @@ 
 	
 	public function disable_single_cron($schedule_id)
 	{
-		$hook =  'xcloner_scheduler_'.$schedule_id;
-		$timestamp = wp_next_scheduled( $hook , array($schedule_id) );
-		wp_unschedule_event( $timestamp, $hook, array($schedule_id) );
+		$hook = 'xcloner_scheduler_'.$schedule_id;
+		$timestamp = wp_next_scheduled($hook, array($schedule_id));
+		wp_unschedule_event($timestamp, $hook, array($schedule_id));
 		
 		$schedule['status'] = 0;
 		
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -170,7 +170,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -186,7 +186,7 @@ 
 		$update = $this->db->update( 
 				$this->scheduler_table, 
 				$schedule, 
-				array( 'id' => $schedule_id ), 
+				array('id' => $schedule_id), 
 				array( 
 					'%s', 
 					'%s' 
@@ -201,20 +201,20 @@ 
 		
 		$this->xcloner_settings->generate_new_hash();
 		
-		$this->xcloner_file_system 		= new Xcloner_File_System($this->xcloner_settings->get_hash());
-		$this->xcloner_database 		= new XCloner_Database($this->xcloner_settings->get_hash());
-		$this->archive_system 			= new Xcloner_Archive($this->xcloner_settings->get_hash());
-		$this->logger 					= new XCloner_Logger('xcloner_scheduler', $this->xcloner_settings->get_hash());
-		$this->xcloner_remote_storage 	= new Xcloner_Remote_Storage($this->xcloner_settings->get_hash());
+		$this->xcloner_file_system = new Xcloner_File_System($this->xcloner_settings->get_hash());
+		$this->xcloner_database = new XCloner_Database($this->xcloner_settings->get_hash());
+		$this->archive_system = new Xcloner_Archive($this->xcloner_settings->get_hash());
+		$this->logger = new XCloner_Logger('xcloner_scheduler', $this->xcloner_settings->get_hash());
+		$this->xcloner_remote_storage = new Xcloner_Remote_Storage($this->xcloner_settings->get_hash());
 		
 		//$schedule = $this->get_schedule_by_id($id);
 		
-		if($schedule['recurrence'] == "single")
+		if ($schedule['recurrence'] == "single")
 		{
 			$this->disable_single_cron($schedule['id']);
 		}
 		
-		if(!$schedule)
+		if (!$schedule)
 		{
 			$this->logger->info(sprintf("Could not load schedule with id'%s'", $id), array("CRON"));
 			return;
@@ -229,7 +229,7 @@ 
 		$init = 1;
 		$continue = 1;
 
-		while($continue)
+		while ($continue)
 		{
 			$continue = $this->xcloner_file_system->start_file_recursion($init);
 			
@@ -244,9 +244,9 @@ 
 		$extra = array();
 		$return['finished'] = 0;
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
-			$return  = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
+			$return = $this->xcloner_database->start_database_recursion((array)json_decode($schedule['table_params']), $return, $init);
 			$init = 0;
 		}
 		
@@ -259,7 +259,7 @@ 
 		$return['finished'] = 0;
 		$return['extra'] = array();
 		
-		while(!$return['finished'])
+		while (!$return['finished'])
 		{
 			$return = $this->archive_system->start_incremental_backup((array)$schedule['backup_params'], $return['extra'], $init);
 			$init = 0;
@@ -268,28 +268,28 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
+		if ($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
 				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
-		if($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
+		if ($schedule['remote_storage'] and array_key_exists($schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages()))
 		{
 			$backup_file = $return['extra']['backup_parent'];
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
+			if (method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
 				$return_storage = call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
 		}
 		
 		
-		if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
+		if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification)
 		{	
-			try{
+			try {
 				$from = "XCloner Schedule - ".$schedule['name'];
 				$this->archive_system->send_notification($to, $from, "", $return['extra']['backup_parent'], $schedule);
-			}catch(Exception $e)
+			}catch (Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -304,16 +304,16 @@ 
 	{
 		$schedule = $this->get_schedule_by_id($id);
 		
-		try{
+		try {
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		}catch (Exception $e) {
 			
-			if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
+			if (isset($schedule['backup_params']->email_notification) and $to = $schedule['backup_params']->email_notification)
 			{
 				$from = "XCloner Schedule - ".$schedule['name'];
-				$this->archive_system->send_notification($to, $from, "Scheduled backup error","", "", $e->getMessage());
+				$this->archive_system->send_notification($to, $from, "Scheduled backup error", "", "", $e->getMessage());
 			}
 			
 		}

Braces +23 added lines, -18 removed lines

@@ -30,10 +30,11 @@ 
 		{
 			$new_list= array();
 			
-			foreach($list as $res)
-				if($res->status)
+			foreach($list as $res) {
+							if($res->status)
 				{
 					$res->next_run_time = wp_next_scheduled('xcloner_scheduler_'.$res->id, array($res->id));
+			}
 					$new_list[] = $res;
 				}
 			$list = $new_list;	
@@ -59,8 +60,9 @@ 
 	{
 		$data = $this->db->get_row("SELECT * FROM ".$this->scheduler_table." WHERE id=".$id, ARRAY_A);
 		
-		if(!$data)
-			return false;
+		if(!$data) {
+					return false;
+		}
 		
 		$params = json_decode($data['params']);
 		
@@ -110,12 +112,13 @@ 
 			
 			if ( ! wp_next_scheduled( $hook, array($schedule->id) ) and $schedule->status) {
 				
-				if($schedule->recurrence == "single")
-					wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-				else	
-					wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				if($schedule->recurrence == "single") {
+									wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+				} else {
+									wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
+				}
 					
-			}elseif(!$schedule->status)
+			} elseif(!$schedule->status)
 			{
 				$timestamp = wp_next_scheduled( $hook , array($schedule->id) );
 				wp_unschedule_event( $timestamp, $hook, array($schedule->id) );
@@ -134,9 +137,9 @@ 
 		
 		if ($schedule->status) {
 			
-			if($schedule->recurrence == "single")
-				wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
-			else{	
+			if($schedule->recurrence == "single") {
+							wp_schedule_single_event( strtotime($schedule->start_at), $hook, array($schedule->id));
+			} else{	
 				wp_schedule_event( strtotime($schedule->start_at), $schedule->recurrence, $hook, array($schedule->id) );
 			}
 				
@@ -268,8 +271,9 @@ 
 		
 		//getting the last backup archive file
 		$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension();
-		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension()))
-				$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+		if($this->xcloner_file_system->is_part($this->archive_system->get_archive_name_with_extension())) {
+						$return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart();
+		}
 		
 		$this->update_last_backup($schedule['id'], $return['extra']['backup_parent']);
 		
@@ -279,8 +283,9 @@ 
 			
 			$this->logger->info(sprintf("Transferring backup to remote storage %s", strtoupper($schedule['remote_storage'])), array("CRON"));
 			
-			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage"))
-				$return_storage = call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			if(method_exists($this->xcloner_remote_storage, "upload_backup_to_storage")) {
+							$return_storage = call_user_func_array(array($this->xcloner_remote_storage, "upload_backup_to_storage"), array($backup_file, $schedule['remote_storage']));
+			}
 		}
 		
 		
@@ -289,7 +294,7 @@ 
 			try{
 				$from = "XCloner Schedule - ".$schedule['name'];
 				$this->archive_system->send_notification($to, $from, "", $return['extra']['backup_parent'], $schedule);
-			}catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -308,7 +313,7 @@ 
 
 			$this->__xcloner_scheduler_callback($id, $schedule);
 			
-		}catch(Exception $e){
+		} catch(Exception $e){
 			
 			if(isset($schedule['backup_params']->email_notification) and $to=$schedule['backup_params']->email_notification)
 			{

includes/class-xcloner-loader.php

Spacing +19 added lines, -19 removed lines

@@ -55,19 +55,19 @@ 
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			$hook_suffix = add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		if (function_exists('add_menu_page'))
+			$hook_suffix = add_menu_page(__('Site Backup', 'xcloner-backup-and-restore'), __('Site Backup', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
 
-		if ( function_exists('add_submenu_page') )
+		if (function_exists('add_submenu_page'))
 		{
 			
-			add_submenu_page( 'xcloner_init_page', __('XCloner Dashboard','xcloner-backup-and-restore'), __('Dashboard','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('XCloner Backup Settings','xcloner-backup-and-restore'), __('Settings','xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Remote Storage Settings','xcloner-backup-and-restore'), __('Remote Storage','xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Manage Backups','xcloner-backup-and-restore'), __('Manage Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Scheduled Backups','xcloner-backup-and-restore'), __('Scheduled Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Generate Backups','xcloner-backup-and-restore'), __('Generate Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', 'xcloner_display');
-			add_submenu_page( 'xcloner_init_page', __('Restore Backups','xcloner-backup-and-restore'), __('Restore Backups','xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('XCloner Dashboard', 'xcloner-backup-and-restore'), __('Dashboard', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('XCloner Backup Settings', 'xcloner-backup-and-restore'), __('Settings', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_settings_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Remote Storage Settings', 'xcloner-backup-and-restore'), __('Remote Storage', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_remote_storage_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Manage Backups', 'xcloner-backup-and-restore'), __('Manage Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_manage_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Scheduled Backups', 'xcloner-backup-and-restore'), __('Scheduled Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_scheduled_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Generate Backups', 'xcloner-backup-and-restore'), __('Generate Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_generate_backups_page', 'xcloner_display');
+			add_submenu_page('xcloner_init_page', __('Restore Backups', 'xcloner-backup-and-restore'), __('Restore Backups', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_restore_page', 'xcloner_display');
 		}
 	
 	}
@@ -82,8 +82,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1.
 	 */
-	public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_action($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->actions = $this->add($this->actions, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -96,8 +96,8 @@ 
 	 * @param    int                  $priority         Optional. he priority at which the function should be fired. Default is 10.
 	 * @param    int                  $accepted_args    Optional. The number of arguments that should be passed to the $callback. Default is 1
 	 */
-	public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) {
-		$this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args );
+	public function add_filter($hook, $component, $callback, $priority = 10, $accepted_args = 1) {
+		$this->filters = $this->add($this->filters, $hook, $component, $callback, $priority, $accepted_args);
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @param    int                  $accepted_args    The number of arguments that should be passed to the $callback.
 	 * @return   array                                  The collection of actions and filters registered with WordPress.
 	 */
-	private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) {
+	private function add($hooks, $hook, $component, $callback, $priority, $accepted_args) {
 
 		$hooks[] = array(
 			'hook'          => $hook,
@@ -135,12 +135,12 @@ 
 	 */
 	public function run() {
 
-		foreach ( $this->filters as $hook ) {
-			add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->filters as $hook) {
+			add_filter($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
-		foreach ( $this->actions as $hook ) {
-			add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] );
+		foreach ($this->actions as $hook) {
+			add_action($hook['hook'], array($hook['component'], $hook['callback']), $hook['priority'], $hook['accepted_args']);
 		}
 
 	}

Braces +3 added lines, -2 removed lines

@@ -55,8 +55,9 @@
 	
 	public function xcloner_backup_add_admin_menu()
 	{
-		if ( function_exists('add_menu_page') )
-			$hook_suffix = add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		if ( function_exists('add_menu_page') ) {
+					$hook_suffix = add_menu_page( __('Site Backup','xcloner-backup-and-restore'), __('Site Backup','xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', 'xcloner_display', 'dashicons-backup');
+		}
 
 		if ( function_exists('add_submenu_page') )
 		{