ovidiul / XCloner-Wordpress

uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }

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

admin/partials/xcloner_console_page.php

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-$xcloner_settings 	= $this->get_xcloner_container()->get_xcloner_settings();
-$logger				= $this->get_xcloner_container()->get_xcloner_logger();
-$logger_content 	= $logger->getLastDebugLines();
+$xcloner_settings = $this->get_xcloner_container()->get_xcloner_settings();
+$logger = $this->get_xcloner_container()->get_xcloner_logger();
+$logger_content = $logger->getLastDebugLines();
 ?>
 <div class="col s12 ">
 	<div>
@@ -10,12 +10,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>
@@ -28,6 +28,6 @@ 
 				}, 2000);*/
 			})
 		</script>
-		<?php endif;?>
+		<?php endif; ?>
 	</div>
 </div>

includes/class-xcloner-loader.php

Spacing +19 added lines, -19 removed lines

@@ -58,19 +58,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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, 'xcloner_display'));
+			add_submenu_page('xcloner_init_page', __('XCloner Dashboard', 'xcloner-backup-and-restore'), __('Dashboard', 'xcloner-backup-and-restore'), 'manage_options', 'xcloner_init_page', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, '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', array($this->xcloner_container, 'xcloner_display'));
 		}
 	
 	}
@@ -86,8 +86,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);
 	}
 
 	/**
@@ -100,8 +100,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);
 	}
 
 	/**
@@ -118,7 +118,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,
@@ -139,12 +139,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']);
 		}
 
 	}

includes/class-xcloner-sanitization.php

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 
 class Xcloner_Sanitization {
 	
-	public function __construct(){}
+	public function __construct() {}
 	
 	public function sanitize_input_as_int($option)
 	{
@@ -24,14 +24,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;
 		}
 		

includes/class-xcloner-requirements.php

Spacing +28 added lines, -28 removed lines

@@ -3,8 +3,8 @@ 
 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;
 	private $xcloner_container;
@@ -22,19 +22,19 @@ 
 	
 	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;	
@@ -48,9 +48,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;
@@ -59,31 +59,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);
@@ -92,16 +92,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);
@@ -110,16 +110,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);
@@ -140,9 +140,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;	
 	}
@@ -156,14 +156,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];
 	  }
 	}
 }

public/class-xcloner-public.php

Spacing +5 added lines, -5 removed lines

@@ -47,10 +47,10 @@ 
 	 * @param      string    $plugin_name       The name of the plugin.
 	 * @param      string    $version    The version of this plugin.
 	 */
-	public function __construct( Xcloner $xcloner_container ) {
+	public function __construct(Xcloner $xcloner_container) {
 
-		$this->plugin_name 			= $xcloner_container->get_plugin_name();
-		$this->version				= $xcloner_container->get_version();
+		$this->plugin_name = $xcloner_container->get_plugin_name();
+		$this->version = $xcloner_container->get_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);
 
 	}
 

admin/partials/xcloner_manage_backups_page.php

Spacing +53 added lines, -53 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-$xcloner_file_system 		= $this->get_xcloner_container()->get_xcloner_filesystem();
-$xcloner_sanitization 		= $this->get_xcloner_container()->get_xcloner_sanitization();
-$xcloner_remote_storage 	= $this->get_xcloner_container()->get_xcloner_remote_storage();
-$storage_selection 			= "";
+$xcloner_file_system = $this->get_xcloner_container()->get_xcloner_filesystem();
+$xcloner_sanitization = $this->get_xcloner_container()->get_xcloner_sanitization();
+$xcloner_remote_storage = $this->get_xcloner_container()->get_xcloner_remote_storage();
+$storage_selection = "";
 
-if(isset($_GET['storage_selection']) and $_GET['storage_selection'])
+if (isset($_GET['storage_selection']) and $_GET['storage_selection'])
 {
 	$storage_selection = $xcloner_sanitization->sanitize_input_as_string($_GET['storage_selection']);
 }
@@ -21,18 +21,18 @@ 
 	<div class="col s12 m6 l9">
 		<h1><?= esc_html(get_admin_page_title()); ?></h1>
 	</div>	
-	<?php if(sizeof($available_storages)):?>
+	<?php if (sizeof($available_storages)):?>
 		<div class="col s12 m6 l3 remote-storage-selection">
 				<select name="storage_selection" id="storage_selection" class="validate" required >
 					
-					<?php if($storage_selection):?>
+					<?php if ($storage_selection):?>
 						<option value="" selected><?php echo __('Change To Local Storage...', 'xcloner-backup-and-restore') ?></option>
 					<?php else: ?>
 						<option value="" selected><?php echo __('Change To Remote Storage...', 'xcloner-backup-and-restore') ?></option>
-					<?php endif;?>
+					<?php endif; ?>
 						
-					<?php foreach($available_storages as $storage=>$text):?>
-						<option value="<?php echo $storage?>"<?php if($storage == $storage_selection) echo "selected"?>><?php echo $text?></option>
+					<?php foreach ($available_storages as $storage=>$text):?>
+						<option value="<?php echo $storage?>"<?php if ($storage == $storage_selection) echo "selected"?>><?php echo $text?></option>
 					<?php endforeach?>
 				</select>
 	<?php endif?>
@@ -47,10 +47,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>
@@ -60,20 +60,20 @@ 
       
 <?php 
 $i = 0;
-foreach($backup_list as $file_info):?>
+foreach ($backup_list as $file_info):?>
 <?php 
-	if($storage_selection == "gdrive")
+	if ($storage_selection == "gdrive")
 		$file_info['path'] = $file_info['filename'].".".$file_info['extension'];
 	$file_exists_on_local_storage = true;
 	
-	if($storage_selection)
+	if ($storage_selection)
 	{
-		if(!$xcloner_file_system->get_storage_filesystem()->has($file_info['path']))
+		if (!$xcloner_file_system->get_storage_filesystem()->has($file_info['path']))
 			$file_exists_on_local_storage = false;
 	}
 
 ?>
-<?php if(!isset($file_info['parent'])):?>	
+<?php if (!isset($file_info['parent'])):?>	
 	
 	<tr>
 		<td class="checkbox">
@@ -84,55 +84,55 @@ 
 		</td>
 		<td>
 			<span class=""><?php echo $file_info['path']?></span>
-			<?php if(!$file_exists_on_local_storage): ?>
-				<a href="#" title="<?php echo __("File does not exists on local storage","xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
+			<?php if (!$file_exists_on_local_storage): ?>
+				<a href="#" title="<?php echo __("File does not exists on local storage", "xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
 			<?php endif?>
 			<?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):?>
 				<li>
 					<?php echo $child[0]?> (<?php echo size_format($child[2])?>) 
 					<?php
 					$child_exists_on_local_storage = true;
-					if($storage_selection)
+					if ($storage_selection)
 					{
-						if(!$xcloner_file_system->get_storage_filesystem()->has($child[0]))
+						if (!$xcloner_file_system->get_storage_filesystem()->has($child[0]))
 							$child_exists_on_local_storage = false;
 					}
 					?>
-					<?php if(!$child_exists_on_local_storage): ?>
-						<a href="#" title="<?php echo __("File does not exists on local storage","xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
+					<?php if (!$child_exists_on_local_storage): ?>
+						<a href="#" title="<?php echo __("File does not exists on local storage", "xcloner-backup-and-restore")?>"><i class="material-icons backup_warning">warning</i></a>
 					<?php endif?>
-					<?php if(!$storage_selection) :?>
-						<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> 
-					<?php elseif($storage_selection != "gdrive" && !$xcloner_file_system->get_storage_filesystem()->has($child[0])): ?>
-						<a href="#<?php echo $child[0]?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage','xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
+					<?php if (!$storage_selection) :?>
+						<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> 
+					<?php elseif ($storage_selection != "gdrive" && !$xcloner_file_system->get_storage_filesystem()->has($child[0])): ?>
+						<a href="#<?php echo $child[0]?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage', 'xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
 					<?php endif?>
 				</li>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</ul>
-			<?php endif;?>
+			<?php endif; ?>
 		</td>
-		<td><?php if(isset($file_info['timestamp'])) echo date("d M, Y H:i", $file_info['timestamp'])?></td>
+		<td><?php if (isset($file_info['timestamp'])) echo date("d M, Y H:i", $file_info['timestamp'])?></td>
 		<td><?php echo size_format($file_info['size'])?></td>
 		<td>
-			<?php if(!$storage_selection):?>
-				<a href="#<?php echo $file_info['basename'];?>" class="download" title="<?php echo __('Download Backup','xcloner-backup-and-restore')?>"><i class="material-icons">file_download</i></a>
+			<?php if (!$storage_selection):?>
+				<a href="#<?php echo $file_info['basename']; ?>" 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['basename']?>" class="cloud-upload" title="<?php echo __('Send Backup To Remote Storage','xcloner-backup-and-restore')?>"><i class="material-icons">cloud_upload</i></a>
+				<?php if (sizeof($available_storages)):?>
+					<a href="#<?php echo $file_info['basename']?>" 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['basename']?>" class="list-backup-content" title="<?php echo __('List Backup Content','xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
-			 <?php endif;?>
+				<a href="#<?php echo $file_info['basename']?>" class="list-backup-content" title="<?php echo __('List Backup Content', 'xcloner-backup-and-restore')?>"><i class="material-icons">folder_open</i></a>
+			 <?php endif; ?>
 			 	
-			<a href="#<?php echo $file_info['basename']?>" class="delete" title="<?php echo __('Delete Backup','xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
-			<?php if($storage_selection and !$file_exists_on_local_storage):?>
-				<a href="#<?php echo $file_info['basename'];?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage','xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
+			<a href="#<?php echo $file_info['basename']?>" class="delete" title="<?php echo __('Delete Backup', 'xcloner-backup-and-restore')?>"><i class="material-icons">delete</i></a>
+			<?php if ($storage_selection and !$file_exists_on_local_storage):?>
+				<a href="#<?php echo $file_info['basename']; ?>" class="copy-remote-to-local" title="<?php echo __('Push Backup To Local Storage', 'xcloner-backup-and-restore')?>"><i class="material-icons">file_upload</i></a>
 			<?php endif?>	
 			
 		</td>
@@ -145,12 +145,12 @@ 
 	</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">
@@ -163,14 +163,14 @@ 
 <!-- Local Transfer Modal-->
 <div id="local_storage_upload_modal" class="modal">
 	<div class="modal-content">
-		<h4><?php echo sprintf(__("Transfer Remote Backup To Local Storage",'xcloner-backup-and-restore'), "")?></h4>
+		<h4><?php echo sprintf(__("Transfer Remote Backup To Local Storage", 'xcloner-backup-and-restore'), "")?></h4>
 		<h5 class="backup-name"></h5>
 		
 		<div class="row status">
 			<div class="progress">
 				<div class="indeterminate"></div>
 			</div>
-			<?php echo __("Uploading backup to the local storage filesystem...",'xcloner-backup-and-restore')?> <span class="status-text"></span>
+			<?php echo __("Uploading backup to the local storage filesystem...", 'xcloner-backup-and-restore')?> <span class="status-text"></span>
 		</div>
 	</div>	
 </div>
@@ -180,17 +180,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>
@@ -201,7 +201,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>

includes/class-xcloner-archive.php

Spacing +89 added lines, -89 removed lines

@@ -8,11 +8,11 @@ 
 	/*
 	 * bytes
 	 */ 
-	private $file_size_per_request_limit	= 52428800 ; //50MB = 52428800; 1MB = 1048576
-	private $files_to_process_per_request 	= 250; //block of 512 bytes
-	private $compression_level 				= 0; //0-9 , 0 uncompressed
+	private $file_size_per_request_limit	= 52428800; //50MB = 52428800; 1MB = 1048576
+	private $files_to_process_per_request = 250; //block of 512 bytes
+	private $compression_level = 0; //0-9 , 0 uncompressed
 	private $xcloner_split_backup_limit		= 2048; //2048MB
-	private $processed_size_bytes			= 0 ;
+	private $processed_size_bytes = 0;
 	
 	private $archive_name;
 	private $backup_archive;
@@ -22,25 +22,25 @@ 
 	
 	public function __construct(Xcloner $xcloner_container, $archive_name = "")
 	{
-		$this->filesystem 		= $xcloner_container->get_xcloner_filesystem();
-		$this->logger 			= $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
+		$this->filesystem = $xcloner_container->get_xcloner_filesystem();
+		$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_archive");
 		$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
 		
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
-			$this->file_size_per_request_limit = $value*1024*1024; //MB
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_size_limit_per_request'))
+			$this->file_size_per_request_limit = $value * 1024 * 1024; //MB
 			
-		if($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
+		if ($value = $this->xcloner_settings->get_xcloner_option('xcloner_files_to_process_per_request'))
 			$this->files_to_process_per_request = $value;
 		
-		if($value = get_option('xcloner_backup_compression_level'))
+		if ($value = get_option('xcloner_backup_compression_level'))
 			$this->compression_level = $value;
 		
-		if($value = get_option('xcloner_split_backup_limit'))
+		if ($value = get_option('xcloner_split_backup_limit'))
 			$this->xcloner_split_backup_limit = $value;
 		
-		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024*1024; //transform to bytes
+		$this->xcloner_split_backup_limit = $this->xcloner_split_backup_limit * 1024 * 1024; //transform to bytes
 			
-		if(isset($archive_name) && $archive_name)
+		if (isset($archive_name) && $archive_name)
 		{
 			$this->set_archive_name($archive_name);
 		}
@@ -68,23 +68,23 @@ 
 		
 		$this->archive_name = $this->filesystem->process_backup_name($name);
 		
-		if($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start())
+		if ($diff_timestamp_start = $this->filesystem->get_diff_timestamp_start())
 		{
 			//$this->archive_name = $this->archive_name."-diff-".date("Y-m-d_H-i",$diff_timestamp_start);
 			$new_name = $this->archive_name;
 			
-			if(!stristr($new_name, "-diff"))
-				$new_name = $this->archive_name . "-diff".date("Y-m-d_H-i",$diff_timestamp_start);
+			if (!stristr($new_name, "-diff"))
+				$new_name = $this->archive_name."-diff".date("Y-m-d_H-i", $diff_timestamp_start);
 			
 			$this->archive_name = $new_name;
 			
 		}
 		
-		if(isset($part) and $part)
+		if (isset($part) and $part)
 		{
-			$new_name =  preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
-			if(!stristr($new_name, "-part"))
-				$new_name = $this->archive_name . "-part".$part;
+			$new_name = preg_replace('/-part(\d*)/', "-part".$part, $this->archive_name);
+			if (!stristr($new_name, "-part"))
+				$new_name = $this->archive_name."-part".$part;
 			
 			$this->archive_name = $new_name;	
 		}
@@ -109,7 +109,7 @@ 
 	 */ 
 	public function get_archive_name_multipart()
 	{
-		$new_name =  preg_replace('/-part(\d*)/', "", $this->archive_name);
+		$new_name = preg_replace('/-part(\d*)/', "", $this->archive_name);
 		return $new_name."-multipart".$this->xcloner_settings->get_backup_extension_name(".csv");
 	}
 	
@@ -131,7 +131,7 @@ 
 	public function send_notification_error($to, $from, $subject, $backup_name, $params, $error_message)
 	{
 		
-		$body  = $error_message; 
+		$body = $error_message; 
 		
 		$this->logger->info(sprintf("Sending backup error notification to %s", $to));
 		
@@ -139,10 +139,10 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8');
 		
-		if($admin_email and $from )
+		if ($admin_email and $from)
 			$headers[] = 'From: '.$from.' <'.$admin_email.'>';
 
-		$return = wp_mail( $to, $subject, $body, $headers );
+		$return = wp_mail($to, $subject, $body, $headers);
 		
 		return $return;
 	}
@@ -152,29 +152,29 @@ 
 	 * Send backup archive notfication by E-Mail
 	 * 
 	 */ 
-	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message="", $additional = array())
+	public function send_notification($to, $from, $subject, $backup_name, $params, $error_message = "", $additional = array())
 	{
-		if(!$from)
+		if (!$from)
 		{
 			$from = "XCloner Backup";
 		}
 			
-		if(($error_message))
+		if (($error_message))
 		{
 			return $this->send_notification_error($to, $from, $subject, $backup_name, $params, $error_message);
 		}
 		
 		$params = (array)$params;
 		
-		if(!$subject)
+		if (!$subject)
 		{
-			$subject = sprintf(__("New backup generated %s") ,$backup_name);
+			$subject = sprintf(__("New backup generated %s"), $backup_name);
 		}
 			
 		$body = sprintf(__("Generated Backup Size: %s"), size_format($this->filesystem->get_backup_size($backup_name)));
 		$body .= "<br /><br />";
 		
-		if(isset($additional['lines_total']))
+		if (isset($additional['lines_total']))
 		{
 			$body .= sprintf(__("Total files added: %s"), $additional['lines_total']);
 			$body .= "<br /><br />";
@@ -182,27 +182,27 @@ 
 		
 		$backup_parts = $this->filesystem->get_multipart_files($backup_name);
 		
-		if(!$backups_counter = sizeof($backup_parts))
+		if (!$backups_counter = sizeof($backup_parts))
 			$backups_counter = 1;
 		
 		$body .= sprintf(__("Backup Parts: %s"), $backups_counter);
 		$body .= "<br />";
 		
-		if(sizeof($backup_parts))
+		if (sizeof($backup_parts))
 		{
-			$body .= implode("<br />",$backup_parts);
+			$body .= implode("<br />", $backup_parts);
 			$body .= "<br />";
 		}
 		
-		$body.= "<br />";
+		$body .= "<br />";
 		
-		if(isset($params['backup_params']->backup_comments))
+		if (isset($params['backup_params']->backup_comments))
 		{
 			$body .= __("Backup Comments: ").$params['backup_params']->backup_comments;
 			$body .= "<br /><br />";
 		}
 		
-		if($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
+		if ($this->xcloner_settings->get_xcloner_option('xcloner_enable_log'))
 			$body .= __("Latest 50 Log Lines: ")."<br />".implode("<br />\n", $this->logger->getLastDebugLines(50));
 		
 		$attachments = $this->filesystem->get_backup_attachments();
@@ -212,7 +212,7 @@ 
 		$tar = new Tar();
 		$tar->create($attachments_archive);
 			
-		foreach($attachments as $key => $file)
+		foreach ($attachments as $key => $file)
 		{
 			$tar->addFile($file, basename($file));
 		}
@@ -224,7 +224,7 @@ 
 		
 		$headers = array('Content-Type: text/html; charset=UTF-8', 'From: '.$from.' <'.$admin_email.'>');
 		
-		$return = wp_mail( $to, $subject, $body, $headers, array($attachments_archive) );
+		$return = wp_mail($to, $subject, $body, $headers, array($attachments_archive));
 	
 		return $return;
 	}
@@ -238,17 +238,17 @@ 
 	{
 		$return = array();
 		
-		if(!isset($extra_params['backup_part']))
+		if (!isset($extra_params['backup_part']))
 			$extra_params['backup_part'] = 0;
 		
 		$return['extra']['backup_part'] = $extra_params['backup_part'];
 					
-		if(isset( $extra_params['backup_archive_name']))
+		if (isset($extra_params['backup_archive_name']))
 			$this->set_archive_name($extra_params['backup_archive_name'], $return['extra']['backup_part']);
 		else
 			$this->set_archive_name($backup_params['backup_name']);
 			
-		if(!$this->get_archive_name())
+		if (!$this->get_archive_name())
 			$this->set_archive_name();
 		
 		$this->backup_archive = new Tar();
@@ -256,7 +256,7 @@ 
 		
 		$archive_info = $this->filesystem->get_storage_path_file_info($this->get_archive_name_with_extension());
 		
-		if($init)
+		if ($init)
 		{
 			$this->logger->info(sprintf(__("Initializing the backup archive %s"), $this->get_archive_name()));
 		
@@ -264,7 +264,7 @@ 
 			
 			$return['extra']['backup_init'] = 1;
 			
-		}else{
+		} else {
 			$this->logger->info(sprintf(__("Opening for append the backup archive %s"), $this->get_archive_name()));
 			
 			$this->backup_archive->openForAppend($archive_info->getPath().DS.$archive_info->getFilename());
@@ -276,13 +276,13 @@ 
 		$return['extra']['backup_archive_name'] = $this->get_archive_name();
 		$return['extra']['backup_archive_name_full'] = $this->get_archive_name_with_extension();
 		
-		if(!isset($extra_params['start_at_line']))
+		if (!isset($extra_params['start_at_line']))
 			$extra_params['start_at_line'] = 0;
 		
-		if(!isset($extra_params['start_at_byte']))
+		if (!isset($extra_params['start_at_byte']))
 			$extra_params['start_at_byte'] = 0;
 		
-		if(!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
+		if (!$this->filesystem->get_tmp_filesystem()->has($this->filesystem->get_included_files_handler()))
 		{
 			$this->logger->error(sprintf("Missing the includes file handler %s, aborting...", $this->filesystem->get_included_files_handler()));
 			
@@ -296,14 +296,14 @@ 
 		
 		$file->seek(PHP_INT_MAX);
 
-		$return['extra']['lines_total'] = ($file->key()-1);
+		$return['extra']['lines_total'] = ($file->key() - 1);
 		
 		//we skip the first CSV line with headers 
-		if(!$extra_params['start_at_line'])
+		if (!$extra_params['start_at_line'])
 		{
 			$file->seek(1);
-		}else{
-			$file->seek($extra_params['start_at_line']+1);
+		} else {
+			$file->seek($extra_params['start_at_line'] + 1);
 		}
 		
 		$this->processed_size_bytes = 0;
@@ -314,7 +314,7 @@ 
 		
 		$byte_limit = 0;
 		
-		while(!$file->eof() and $counter<=$this->files_to_process_per_request)
+		while (!$file->eof() and $counter <= $this->files_to_process_per_request)
 		{
 			$current_line_str = $file->current();
 			
@@ -324,15 +324,15 @@ 
 			
 			$start_filesystem = "start_filesystem";
 			
-			if(isset($line[4])){
+			if (isset($line[4])) {
 				$start_filesystem = $line[4];
 			}
 			
 			//$adapter = $this->filesystem->get_adapter($start_filesystem);
 			
-			if(!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
+			if (!$relative_path || !$this->filesystem->get_filesystem($start_filesystem)->has($relative_path))
 			{
-				if($relative_path != "")
+				if ($relative_path != "")
 				{
 					$this->logger->error(sprintf("Could not add file %b to backup archive, file not found", $relative_path));
 				}
@@ -344,37 +344,37 @@ 
 			
 			$file_info = $this->filesystem->get_filesystem($start_filesystem)->getMetadata($relative_path);
 			
-			if(!isset($file_info['size']))
+			if (!isset($file_info['size']))
 				$file_info['size'] = 0;
 			
-			if($start_filesystem == "tmp_filesystem")
+			if ($start_filesystem == "tmp_filesystem")
 			{	
 				$file_info['archive_prefix_path'] = $this->xcloner_settings->get_xcloner_tmp_path_suffix();
 			}
 			
-			$byte_limit = (int)$this->file_size_per_request_limit/512;
+			$byte_limit = (int)$this->file_size_per_request_limit / 512;
 			
 			$append = 0;
 			
-			if($file_info['size'] > $byte_limit*512 or $start_byte)
+			if ($file_info['size'] > $byte_limit * 512 or $start_byte)
 				$append = 1;
 						
-			if(!isset($return['extra']['backup_size']))
-				$return['extra']['backup_size'] =0;
+			if (!isset($return['extra']['backup_size']))
+				$return['extra']['backup_size'] = 0;
 			
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
 			$estimated_new_size = $return['extra']['backup_size'] + $file_info['size'];
 			
 			//we create a new backup part if we reach the Split Achive Limit
-			if($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte))
+			if ($this->xcloner_split_backup_limit and ($estimated_new_size > $this->xcloner_split_backup_limit) and (!$start_byte))
 			{
-				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ",$this->xcloner_split_backup_limit, $estimated_new_size));
+				$this->logger->info(sprintf("Backup size limit %s bytes reached, file add estimate %s, attempt to create a new archive ", $this->xcloner_split_backup_limit, $estimated_new_size));
 				list($archive_info, $return['extra']['backup_part']) = $this->create_new_backup_part($return['extra']['backup_part']);
 				
-				if($file_info['size'] > $this->xcloner_split_backup_limit)
+				if ($file_info['size'] > $this->xcloner_split_backup_limit)
 				{
-					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file",$file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
+					$this->logger->info(sprintf("Excluding %s file as it's size(%s) is bigger than the backup split limit of %s and it won't fit a single backup file", $file_info['path'], $file_info['size'], $this->xcloner_split_backup_limit));
 					$extra_params['start_at_line']++;
 				}
 				
@@ -386,7 +386,7 @@ 
 				return $return;
 			}
 			
-			list($bytes_wrote, $last_position) = $this->add_file_to_archive( $file_info, $start_byte, $byte_limit, $append, $start_filesystem);
+			list($bytes_wrote, $last_position) = $this->add_file_to_archive($file_info, $start_byte, $byte_limit, $append, $start_filesystem);
 			$this->processed_size_bytes += $bytes_wrote;
 			
 			//echo" - processed ".$this->processed_size_bytes." bytes ".$this->file_size_per_request_limit." last_position:".$last_position." \n";
@@ -394,17 +394,17 @@ 
 			$return['extra']['processed_file_size'] = $file_info['size'];
 			$return['extra']['backup_size'] = $archive_info->getSize();
 			
-			if($last_position>0){	
+			if ($last_position > 0) {	
 				$start_byte = $last_position;
 			}
-			else{	
+			else {	
 				$extra_params['start_at_line']++;
 				$file->next();
 				$start_byte = 0;
 				$counter++;
 			}
 			
-			if($this->processed_size_bytes >= $this->file_size_per_request_limit)
+			if ($this->processed_size_bytes >= $this->file_size_per_request_limit)
 			{
 				clearstatcache();
 				$return['extra']['backup_size'] = $archive_info->getSize();
@@ -417,7 +417,7 @@ 
 			}
 		}
 		
-		if(!$file->eof())
+		if (!$file->eof())
 		{
 			clearstatcache();
 			$return['extra']['backup_size'] = $archive_info->getSize();
@@ -434,12 +434,12 @@ 
 		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.", $this->get_archive_name_with_extension()));
 		$this->backup_archive->close();
 				
-		if($return['extra']['backup_part'])
+		if ($return['extra']['backup_part'])
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 		
-		$return['extra']['start_at_line'] = $extra_params['start_at_line']-1;
+		$return['extra']['start_at_line'] = $extra_params['start_at_line'] - 1;
 		
-		if(isset($file_info))
+		if (isset($file_info))
 		{
 			$return['extra']['processed_file'] = $file_info['path'];
 			$return['extra']['processed_file_size'] = $file_info['size'];
@@ -481,20 +481,20 @@ 
 		$this->logger->info(sprintf("Closing the backup archive %s with 2*512 zero bytes blocks.", $this->get_archive_name_with_extension()));
 		$this->backup_archive->close();		
 		
-		if(!$part)
+		if (!$part)
 		{
 			$old_name = $this->get_archive_name_with_extension();
 			$this->set_archive_name($this->get_archive_name(), ++$part);
 			$this->rename_archive($old_name, $this->get_archive_name_with_extension());
 			
-			if($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart()))
+			if ($this->filesystem->get_storage_filesystem()->has($this->get_archive_name_multipart()))
 				$this->filesystem->get_storage_filesystem()->delete($this->get_archive_name_multipart());
 				
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 			
-		}else
+		} else
 		{
-			$this->logger->info(sprintf("Creating new multipart info file %s",$this->get_archive_name_with_extension()));
+			$this->logger->info(sprintf("Creating new multipart info file %s", $this->get_archive_name_with_extension()));
 			$this->write_multipart_file($this->get_archive_name_with_extension());
 		}
 				
@@ -522,10 +522,10 @@ 
 		$start_adapter = $this->filesystem->get_adapter($filesystem);
 		$start_filesystem = $this->filesystem->get_adapter($filesystem);
 		
-		if(!$file_info['path'])
+		if (!$file_info['path'])
 			return;
 		
-		if(isset($file_info['archive_prefix_path']))	
+		if (isset($file_info['archive_prefix_path']))	
 			$file_info['target_path'] = $file_info['archive_prefix_path']."/".$file_info['path'];
 		else
 			$file_info['target_path'] = $file_info['path'];
@@ -534,36 +534,36 @@ 
 		
 		//$start_adapter = $this->filesystem->get_start_adapter();
 
-		if(!$append){
+		if (!$append) {
 			$bytes_wrote = $file_info['size'];
 			$this->logger->info(sprintf("Adding %s bytes of file %s to archive %s ", $bytes_wrote, $file_info['target_path'], $this->get_archive_name_with_extension()));
 			$this->backup_archive->addFile($start_adapter->applyPathPrefix($file_info['path']), $file_info['target_path']);
 		}
-		else{	
+		else {	
 			$tmp_file = md5($file_info['path']);
 			
 			//we isolate file to tmp if we are at byte 0, the starting point of file reading
-			if(!$start_at_byte)
+			if (!$start_at_byte)
 			{
 				$this->logger->info(sprintf("Copying %s file to tmp filesystem file %s to prevent reading changes", $file_info['path'], $tmp_file));
 				$file_stream = $start_filesystem->readStream($file_info['path']);
 				
-				if(is_resource($file_stream['stream']))
+				if (is_resource($file_stream['stream']))
 					$this->filesystem->get_tmp_filesystem()->writeStream($tmp_file, $file_stream['stream']);
 			}
 			
-			if($this->filesystem->get_tmp_filesystem()->has($tmp_file))
+			if ($this->filesystem->get_tmp_filesystem()->has($tmp_file))
 			{
 				$is_tmp = 1;
 				$last_position = $this->backup_archive->appendFileData($this->filesystem->get_tmp_filesystem_adapter()->applyPathPrefix($tmp_file), $file_info['target_path'], $start_at_byte, $byte_limit);
 			}
-			else{
+			else {
 				$is_tmp = 0;
 				$last_position = $this->backup_archive->appendFileData($start_adapter->applyPathPrefix($file_info['path']), $file_info['target_path'], $start_at_byte, $byte_limit);
 			}
 				
 			
-			if($last_position == -1)
+			if ($last_position == -1)
 			{
 				$bytes_wrote = $file_info['size'] - $start_at_byte;
 			}
@@ -573,18 +573,18 @@ 
 			}
 			
 			
-			if($is_tmp)
+			if ($is_tmp)
 			{
 				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of tmp file %s (%s) to archive %s ", $bytes_wrote, $start_at_byte, $tmp_file, $file_info['target_path'], $this->get_archive_name()));
 			}
-			else{
+			else {
 				$this->logger->info(sprintf("Appended %s bytes, starting position %s, of original file %s to archive %s ", $bytes_wrote, $start_at_byte, $file_info['target_path'], $tmp_file, $this->get_archive_name()));
 			}
 			
 			//we delete here the isolated tmp file
-			if($last_position == -1)
+			if ($last_position == -1)
 			{
-				if($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
+				if ($this->filesystem->get_tmp_filesystem_adapter()->has($tmp_file))
 				{
 					$this->logger->info(sprintf("Deleting %s from the tmp filesystem", $tmp_file));
 					$this->filesystem->get_tmp_filesystem_adapter()->delete($tmp_file);