ovidiul / XCloner-Wordpress

includes/class-xcloner-database.php

Spacing +91 added lines, -91 removed lines

@@ -21,12 +21,12 @@ 
  */
 
 
-class XCloner_Database extends wpdb{
+class XCloner_Database extends wpdb {
 
 
-	public  $debug 						= 0;
-	public  $recordsPerSession			= 10000;
-	public  $dbCompatibility			= "";
+	public  $debug = 0;
+	public  $recordsPerSession = 10000;
+	public  $dbCompatibility = "";
 	public  $dbDropSyntax				= 1;
 	public  $countRecords				= 0;
 
@@ -38,22 +38,22 @@ 
 	private   $TEMP_DBPROCESS_FILE = ".database";
 	private   $TEMP_DUMP_FILE = "database-backup.sql";
 	
-	public function __construct($hash="", $wp_user="", $wp_pass="", $wp_db="", $wp_host="")
+	public function __construct($hash = "", $wp_user = "", $wp_pass = "", $wp_db = "", $wp_host = "")
 	{
-		$this->logger 					= new XCloner_Logger("xcloner_database", $hash);
-		$this->xcloner_settings 		= new Xcloner_Settings($hash);
-		$this->fs 						= new Xcloner_File_System($hash);
+		$this->logger = new XCloner_Logger("xcloner_database", $hash);
+		$this->xcloner_settings = new Xcloner_Settings($hash);
+		$this->fs = new Xcloner_File_System($hash);
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
-			$this->recordsPerSession		= $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request'))
+			$this->recordsPerSession = $this->xcloner_settings->get_xcloner_option('xcloner_database_records_per_request');
 		
-		if(!$this->recordsPerSession)
+		if (!$this->recordsPerSession)
 			$this->recordsPerSession = 100;
 		
 		$wp_host 	= $this->xcloner_settings->get_db_hostname();
 		$wp_user 	= $this->xcloner_settings->get_db_username();
 		$wp_pass 	= $this->xcloner_settings->get_db_password();
-		$wp_db 		= $this->xcloner_settings->get_db_database();
+		$wp_db = $this->xcloner_settings->get_db_database();
 
 		parent::__construct($wp_user, $wp_pass, $wp_db, $wp_host);
 		
@@ -68,7 +68,7 @@ 
 	 */
 	public function init($data, $start = 0)
 	{
-		if($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)){
+		if ($start and $this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE)) {
 				$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		}
 		
@@ -87,7 +87,7 @@ 
 				"database_count"=>0,
 		);
 		
-		if(!$this->xcloner_settings->get_enable_mysql_backup())
+		if (!$this->xcloner_settings->get_enable_mysql_backup())
 		{
 			$return['finished'] = 1;
 			return $return;
@@ -97,44 +97,44 @@ 
 		
 		$this->init($params, $init);
 		
-		if($init)
+		if ($init)
 		{
 			$db_count = 0;
 			
-			if(isset($params['#']))
+			if (isset($params['#']))
 			{
-				foreach($params['#'] as $database)
+				foreach ($params['#'] as $database)
 				{
-					if(!isset($params[$database]) or !is_array($params[$database]))
+					if (!isset($params[$database]) or !is_array($params[$database]))
 						$params[$database] = array();
 				}
 				$db_count = -1;
 			}
 			
-			if(isset($params) and is_array($params))
-				foreach($params as $database=>$tables)
+			if (isset($params) and is_array($params))
+				foreach ($params as $database=>$tables)
 				{	
-					if($database != "#")
+					if ($database != "#")
 					{
 						$stats = $this->write_backup_process_list($database, $tables);	
-						$return['stats']['tables_count'] 	+= $stats['tables_count'];
-						$return['stats']['total_records'] 	+= $stats['total_records'];
+						$return['stats']['tables_count'] += $stats['tables_count'];
+						$return['stats']['total_records'] += $stats['total_records'];
 					}
 				}
 
-			if(sizeof($params))
-				$return['stats']['database_count'] = sizeof($params)+$db_count;
+			if (sizeof($params))
+				$return['stats']['database_count'] = sizeof($params) + $db_count;
 			else	
 				$return['stats']['database_count'] = 0;
 				
 			return $return;
 		}
 		
-		if(!isset($extra_params['startAtLine']))
+		if (!isset($extra_params['startAtLine']))
 			$extra_params['startAtLine'] = 0;
-		if(!isset($extra_params['startAtRecord']))
+		if (!isset($extra_params['startAtRecord']))
 			$extra_params['startAtRecord'] = 0;
-		if(!isset($extra_params['dumpfile']))
+		if (!isset($extra_params['dumpfile']))
 			$extra_params['dumpfile'] = "";
 		
 		$return = $this->process_incremental($extra_params['startAtLine'], $extra_params['startAtRecord'], $extra_params['dumpfile']);
@@ -145,13 +145,13 @@ 
 	public function log($message = "")
 	{
 		
-		if($message){
-			$this->logger->info( $message, array(""));
-		}else{	
-			if($this->last_query)
-				$this->logger->debug( $this->last_query, array(""));
-			if($this->last_error)
-				$this->logger->error( $this->last_error, array(""));
+		if ($message) {
+			$this->logger->info($message, array(""));
+		} else {	
+			if ($this->last_query)
+				$this->logger->debug($this->last_query, array(""));
+			if ($this->last_error)
+				$this->logger->error($this->last_error, array(""));
 		}
 		
 		return;
@@ -166,7 +166,7 @@ 
 	*/
 	public function error($message)
 	{
-		$this->logger->error( $message, array(""));
+		$this->logger->error($message, array(""));
 		
 		return;
 	}
@@ -199,7 +199,7 @@ 
 		
 		$query = "show tables in `".$database."`";
 		
-		$res =  $this->get_results($query);
+		$res = $this->get_results($query);
 		$this->log();
 			
 		return count($res);
@@ -222,9 +222,9 @@ 
 		$databases_list[$i]['num_tables'] = $this->get_database_num_tables($this->dbname);
 		$i++;
 		
-		if(is_array($databases))
-		foreach( $databases as $db){
-			if($db->Database != $this->dbname)
+		if (is_array($databases))
+		foreach ($databases as $db) {
+			if ($db->Database != $this->dbname)
 			{
 				$databases_list[$i]['name'] = $db->Database;
 				$databases_list[$i]['num_tables'] = $this->get_database_num_tables($db->Database);
@@ -247,7 +247,7 @@ 
 		$tablesList[0] = array( );
 		$inc = 0;
 
-		if(!$database)
+		if (!$database)
 			$database = $this->dbname;
 		
 		$this->logger->debug(sprintf(("Listing tables in %s database"), $database));
@@ -255,14 +255,14 @@ 
 		$tables = $this->get_results("SHOW TABLES in `".$database."`");
 		$this->log();
 
-		foreach ($tables as $table){
+		foreach ($tables as $table) {
 			
 			$table = array_values((array)$table)[0];
 			
 			$tablesList[$inc]['name'] = $table;
 			$tablesList[$inc]['database'] = $database;
 
-			if($get_num_records)
+			if ($get_num_records)
 			{
 				$records_num_result = $this->get_var("SELECT count(*) FROM `".$database."`.`".$table."`");
 				$this->log();
@@ -272,8 +272,8 @@ 
 			
 			$tablesList[$inc]['excluded'] = 0;
 						
-			if(sizeof($included) and is_array($included))
-				if(!in_array($table, $included) )
+			if (sizeof($included) and is_array($included))
+				if (!in_array($table, $included))
 				{
 					$tablesList[$inc]['excluded'] = 1;
 					$this->log(sprintf(__("Excluding table %s.%s from backup"), $table, $database));
@@ -294,7 +294,7 @@ 
 		
 		$tables = $this->list_tables($dbname, $incl_tables, 1);
 		
-		if($this->dbname != $dbname)
+		if ($this->dbname != $dbname)
 			$dumpfile = $dbname."-backup.sql";
 		else
 			$dumpfile = $this->TEMP_DUMP_FILE;
@@ -303,8 +303,8 @@ 
 		$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
 			
 		// write this to the class and write to $TEMP_DBPROCESS_FILE file as database.table records
-		foreach($tables as $key=>$table) 
-		if($table!= "" and !$tables[$key]['excluded']){
+		foreach ($tables as $key=>$table) 
+		if ($table != "" and !$tables[$key]['excluded']) {
 
 			$line = sprintf("`%s`.`%s`\t%s\t%s\n", $dbname, $tables[$key]['name'], $tables[$key]['records'], $tables[$key]['excluded']);
 			$this->fs->get_tmp_filesystem_append()->write($this->TEMP_DBPROCESS_FILE, $line);
@@ -332,7 +332,7 @@ 
 
 			$result = $this->get_var("SELECT count(*) FROM $table;");
 
-			return intval($result) ;// not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
+			return intval($result); // not max limit on 32 bit systems 2147483647; on 64 bit 999999999999
 
 	}
 
@@ -348,25 +348,25 @@ 
 	 * 		int $dbDropSyntax	- check if the DROP TABLE syntax should be added
 	 * @return array $return
 	 */
-	public function process_incremental($startAtLine= 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility= ""){
+	public function process_incremental($startAtLine = 0, $startAtRecord = 0, $dumpfile = "", $dbCompatibility = "") {
 
 		$count = 0;
 		$return['finished'] = 0;
 		$lines = array();
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
-			$lines = array_filter(explode("\n",$this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+			$lines = array_filter(explode("\n", $this->fs->get_tmp_filesystem()->read($this->TEMP_DBPROCESS_FILE)));
 	
-		foreach ($lines as $buffer){
+		foreach ($lines as $buffer) {
 			
-			if($count == $startAtLine)
+			if ($count == $startAtLine)
 			{
 	
-				$tableInfo =explode("\t", $buffer);
+				$tableInfo = explode("\t", $buffer);
 				
-				if($tableInfo[0] == "###newdump###"){
+				if ($tableInfo[0] == "###newdump###") {
 						// we create a new mysql dump file
-						if($dumpfile != ""){
+						if ($dumpfile != "") {
 								// we finished a previous one and write the footers
 								$return['dumpsize'] = $this->data_footers($dumpfile);
 						}
@@ -380,13 +380,13 @@ 
 						$startAtLine++;
 						$return['new_dump'] = 1;
 						//break;
-				}else{
+				} else {
 						//we export the table
-						if($tableInfo[0] == "###enddump###")
+						if ($tableInfo[0] == "###enddump###")
 							$return['endDump'] = 1;
 	
 						//table is excluded
-						if($tableInfo[2])
+						if ($tableInfo[2])
 							continue;
 							
 						$next = $startAtRecord + $this->recordsPerSession;
@@ -398,28 +398,28 @@ 
 
 						//return something to the browser
 						$return['databaseName'] 	= $databaseName;
-						$return['tableName'] 		= $tableName;
+						$return['tableName'] = $tableName;
 						$return['totalRecords'] 	= $tableInfo[1];
 
 						$processed_records = 0;
 						
-						if(trim($tableName) !=""  and !$tableInfo[2])
+						if (trim($tableName) != "" and !$tableInfo[2])
 							$processed_records = $this->export_table($databaseName, $tableName, $startAtRecord, $this->recordsPerSession, $dumpfile);
 						
-						$return['processedRecords'] = $startAtRecord+$processed_records;
+						$return['processedRecords'] = $startAtRecord + $processed_records;
 						
-						if($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
+						if ($next >= $tableInfo[1]) //we finished loading the records for next sessions, will go to the new record
 						{
-								$startAtLine ++;
+								$startAtLine++;
 								$startAtRecord = 0;
-						}else{
+						} else {
 								$startAtRecord = $startAtRecord + $this->recordsPerSession;
 							}
 
 						//$return['dbCompatibility'] 	= self::$dbCompatibility;
 						
-						$return['startAtLine']		= $startAtLine;
-						$return['startAtRecord']	= $startAtRecord;
+						$return['startAtLine'] = $startAtLine;
+						$return['startAtRecord'] = $startAtRecord;
 						$return['dumpfile']			= $dumpfile;
 						$return['dumpsize']			= $this->fs->get_tmp_filesystem_append()->getSize($dumpfile);
 
@@ -437,15 +437,15 @@ 
 		}
 	
 		//while is finished, lets go home...
-		if($dumpfile != ""){
+		if ($dumpfile != "") {
 			// we finished a previous one and write the footers
 			$return['dumpsize'] = $this->data_footers($dumpfile);
 			$return['dumpfile'] = ($dumpfile);
 		}
 		$return['finished'] = 1;
-		$return['startAtLine']	= $startAtLine;
+		$return['startAtLine'] = $startAtLine;
 		
-		if($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
+		if ($this->fs->get_tmp_filesystem()->has($this->TEMP_DBPROCESS_FILE))
 			$this->fs->get_tmp_filesystem()->delete($this->TEMP_DBPROCESS_FILE);
 		
 		$this->logger->debug(sprintf(("Database backup finished!")));
@@ -474,7 +474,7 @@ 
 		
 		$records = 0;
 		
-		if($start == 0)
+		if ($start == 0)
 			$this->dump_structure($databaseName, $tableName, $dumpfile);
 
 		$start = intval($start);
@@ -482,20 +482,20 @@ 
 		//exporting the table content now
 
 		$query = "SELECT * from `$databaseName`.`$tableName` Limit $start, $limit ;";
-		if($this->use_mysqli)
+		if ($this->use_mysqli)
 		{
 			$result = mysqli_query($this->dbh, $query);
 			$mysql_fetch_function = "mysqli_fetch_array";
 		
-		}else{
+		} else {
 			$result = mysql_query($query, $this->dbh);
 			$mysql_fetch_function = "mysql_fetch_array";
 		}
 		//$result = $this->get_results($query, ARRAY_N);
 		//print_r($result); exit;
 		
-		if($result){
-			while($row = $mysql_fetch_function($result, MYSQLI_ASSOC)){
+		if ($result) {
+			while ($row = $mysql_fetch_function($result, MYSQLI_ASSOC)) {
 					
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, "INSERT INTO `$tableName` VALUES (");
 					$arr = $row;
@@ -506,7 +506,7 @@ 
 						$value = $this->_real_escape($value);
 						$buffer .= "'".$value."', ";
 					}
-					$buffer = rtrim($buffer, ', ') . ");\n";
+					$buffer = rtrim($buffer, ', ').");\n";
 					$this->fs->get_tmp_filesystem_append()->write($dumpfile, $buffer);
 					unset($buffer);
 					
@@ -521,7 +521,7 @@ 
 
 	}
 
-	public function dump_structure($databaseName, $tableName ,$dumpfile)
+	public function dump_structure($databaseName, $tableName, $dumpfile)
 	{
 		$this->log(sprintf(__("Dumping the structure for %s.%s table"), $databaseName, $tableName));
 		
@@ -536,14 +536,14 @@ 
 
 		//$result = mysqli_query($this->dbh,"SHOW CREATE table `$databaseName`.`$tableName`;");
 		$result = $this->get_row("SHOW CREATE table `$databaseName`.`$tableName`;", ARRAY_N);
-		if($result){
+		if ($result) {
 			//$row = mysqli_fetch_row( $result);
 			$line = ($result[1].";\n");
 			$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		}
 
-		$line = ( "\n#\n# End Structure for table `$tableName`\n#\n\n");
-		$line .=("#\n# Dumping data for table `$tableName`\n#\n\n");
+		$line = ("\n#\n# End Structure for table `$tableName`\n#\n\n");
+		$line .= ("#\n# Dumping data for table `$tableName`\n#\n\n");
 		$this->fs->get_tmp_filesystem_append()->write($dumpfile, $line);
 		
 		return;
@@ -566,7 +566,7 @@ 
 
 	}
 
-	public function resetcountRecords(){
+	public function resetcountRecords() {
 		
 		$this->countRecords = 0;
 
@@ -574,7 +574,7 @@ 
 	
 	}
 
-	public function getcountRecords(){
+	public function getcountRecords() {
 		
 		return $this->countRecords;
 		
@@ -591,14 +591,14 @@ 
 		$return .= "# Powered by XCloner Site Backup\n";
 		$return .= "# http://www.xcloner.com\n";
 		$return .= "#\n";
-		$return .= "# Host: " . $_SERVER['HTTP_HOST'] . "\n";
-		$return .= "# Generation Time: " . date("M j, Y \a\\t H:i") . "\n";
-		$return .= "# PHP Version: " . phpversion() . "\n";
-		$return .= "# Database Charset: ". $this->charset . "\n";
+		$return .= "# Host: ".$_SERVER['HTTP_HOST']."\n";
+		$return .= "# Generation Time: ".date("M j, Y \a\\t H:i")."\n";
+		$return .= "# PHP Version: ".phpversion()."\n";
+		$return .= "# Database Charset: ".$this->charset."\n";
 		
 		$results = $this->get_results("SHOW VARIABLES LIKE \"%version%\";", ARRAY_N);
-		if(isset($results)){
-			foreach($results as $result){
+		if (isset($results)) {
+			foreach ($results as $result) {
 
 					$return .= "# MYSQL ".$result[0].": ".$result[1]."\n";
 
@@ -608,13 +608,13 @@ 
 		$results = $this->get_results("SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
 					FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '".$database."';");
 		
-		if(isset($results[0])){
+		if (isset($results[0])) {
 
 			$return .= "# MYSQL DEFAULT_CHARACTER_SET_NAME: ".$results[0]->DEFAULT_CHARACTER_SET_NAME."\n";
 			$return .= "# MYSQL SCHEMA_NAME: ".$results[0]->DEFAULT_COLLATION_NAME."\n";
 		}
 
-		$return .= "#\n# Database : `" . $database . "`\n# --------------------------------------------------------\n\n";
+		$return .= "#\n# Database : `".$database."`\n# --------------------------------------------------------\n\n";
 		
 		$this->log(sprintf(__("Writing %s database dump headers"), $database));
 		

includes/class-xcloner-logger.php

Spacing +16 added lines, -16 removed lines

@@ -4,32 +4,32 @@ 
 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);
-		$logger_path 		= $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
+		$xcloner_settings = new Xcloner_Settings($hash);
+		$logger_path = $xcloner_settings->get_xcloner_store_path().DS.$xcloner_settings->get_logger_filename();
 		$logger_path_tmp 	= "";
 		
-		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 = "";
@@ -40,19 +40,19 @@ 
 		
 		$debug_level = Logger::INFO;
 		
-		if(WP_DEBUG)
+		if (WP_DEBUG)
 			$debug_level = Logger::DEBUG;
 
 	
-		if($logger_path)
+		if ($logger_path)
 		{
 			$stream = new RotatingFileHandler($logger_path, $this->max_logger_files, $debug_level);
 			$this->pushHandler($stream);
 			
-			$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;
@@ -68,7 +68,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');
@@ -78,12 +78,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 = '';

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