ovidiul / XCloner-Wordpress

restore/xcloner_restore.php

Doc Comments +9 added lines, -5 removed lines

@@ -656,7 +656,7 @@ 
 	 * Update Wordpress url in wp-config.php method
 	 * @param $wp_path
 	 * @param $url
-	 * @param $mysqli
+	 * @param mysqli $mysqli
 	 * @return bool
 	 * @throws Exception
 	 */
@@ -786,7 +786,7 @@ 
 	 * Get backup hash method
 	 *
 	 * @param $backup_file
-	 * @return bool
+	 * @return false|string
 	 */
 	private function get_hash_from_backup($backup_file)
 	{
@@ -1009,7 +1009,7 @@ 
 	/**
 	 * Return bytes from human readable value
 	 *
-	 * @param $val
+	 * @param string $val
 	 * @return int
 	 *
 	 */
@@ -1093,7 +1093,7 @@ 
 	 * Sort_by method
 	 *
 	 * @param $array
-	 * @param $field
+	 * @param string $field
 	 * @param string $direction
 	 * @return bool
 	 */
@@ -1102,6 +1102,10 @@ 
 		$direction = strtolower($direction);
 
 		usort($array,
+
+			/**
+			 * @param string $b
+			 */
 			function($a, $b) use($field, $direction){
 
 				$a = $a[$field];
@@ -1167,7 +1171,7 @@ 
 	 * Serialize fix methods below for mysql query lines
 	 *
 	 * @param $query
-	 * @return string|string[]|null
+	 * @return string
 	 */
 	 
 	function do_serialized_fix($query)

Spacing +33 added lines, -33 removed lines

@@ -169,12 +169,12 @@ 
 	 * @return mixed|string
 	 */
 	private function friendly_error_type($type) {
-		static $levels=null;
-		if ($levels===null) {
-			$levels=[];
+		static $levels = null;
+		if ($levels === null) {
+			$levels = [];
 			foreach (get_defined_constants() as $key=>$value) {
-				if (strpos($key,'E_')!==0) {continue;}
-					$levels[$value]= $key; //substr($key,2);
+				if (strpos($key, 'E_') !== 0) {continue; }
+					$levels[$value] = $key; //substr($key,2);
 			}
 		}
 		return (isset($levels[$type]) ? $levels[$type] : "Error #{$type}");
@@ -224,43 +224,43 @@ 
 	 */
 	public function write_file_action()
 	{
-		if(isset($_POST['file']))
+		if (isset($_POST['file']))
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
+			if (!$_POST['start'])
 				$fp = fopen($target_file, "wb+");
 			else
 				$fp = fopen($target_file, "ab+");	
 			
-			if(!$fp)
+			if (!$fp)
 				throw new Exception("Unable to open $target_file file for writing");
 			
 			fseek($fp, $_POST['start']);
 			
-			if(isset($_FILES['blob']))
+			if (isset($_FILES['blob']))
 			{
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using FILES blob', filesize($_FILES['blob']['tmp_name']), $target_file, $_POST['start']));
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
 
 				try {
 					unlink($_FILES['blob']['tmp_name']);
-				}catch(Exception $e){
+				}catch (Exception $e) {
 
 				}
 
-			}elseif(isset($_POST['blob'])){
+			}elseif (isset($_POST['blob'])) {
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
+				if (!$bytes_written = fwrite($fp, $blob))
 					throw new Exception("Unable to write data to file $target_file");
-			}else{
+			} else {
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -281,20 +281,20 @@ 
 	 * @return mysqli
 	 * @throws Exception
 	 */
-	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db )
+	public function mysql_connect($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db)
 	{
 		$this->logger->info(sprintf('Connecting to mysql database %s with %s@%s', $remote_mysql_db, $remote_mysql_user, $remote_mysql_host));
 
 		$mysqli = new mysqli($remote_mysql_host, $remote_mysql_user, $remote_mysql_pass, $remote_mysql_db);
 
 		if ($mysqli->connect_error) {
-			throw new Exception('Connect Error (' . $mysqli->connect_errno . ') '
+			throw new Exception('Connect Error ('.$mysqli->connect_errno.') '
 				. $mysqli->connect_error);
 		}
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
+		if (isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
 			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
 		else
 			$mysqli->query("SET NAMES utf8;");
@@ -1015,8 +1015,8 @@ 
 	 */
 	private function return_bytes($val) {
 		$numeric_val = (int)trim($val);
-		$last = strtolower($val[strlen($val)-1]);
-		switch($last) {
+		$last = strtolower($val[strlen($val) - 1]);
+		switch ($last) {
 			// The 'G' modifier is available since PHP 5.1.0
 			case 'g':
 				$numeric_val *= 1024;
@@ -1097,7 +1097,7 @@ 
 	 * @param string $direction
 	 * @return bool
 	 */
-	private function sort_by( &$array, $field, $direction = 'asc')
+	private function sort_by(&$array, $field, $direction = 'asc')
 	{
 		$direction = strtolower($direction);
 
@@ -1112,18 +1112,18 @@ 
 					return 0;
 				}
 
-				if($direction == 'desc') {
-					if($a > $b) {
+				if ($direction == 'desc') {
+					if ($a > $b) {
 						return -1;
 					}
-					else{
+					else {
 						return 1;
 					}
-				}else {
-					if($a < $b) {
+				} else {
+					if ($a < $b) {
 						return -1;
 					}
-					else{
+					else {
 						return 1;
 					}
 				}
@@ -1217,14 +1217,14 @@ 
 	 */
 	private function has_serialized($s)
 	{
-		if(
-			stristr($s, '{' ) !== false &&
-			stristr($s, '}' ) !== false &&
-			stristr($s, ';' ) !== false &&
-			stristr($s, ':' ) !== false
-			){
+		if (
+			stristr($s, '{') !== false &&
+			stristr($s, '}') !== false &&
+			stristr($s, ';') !== false &&
+			stristr($s, ':') !== false
+			) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 

Braces +112 added lines, -88 removed lines

@@ -45,8 +45,7 @@ 
 {
 	
 	require_once($file);
-}
-elseif (file_exists("vendor.phar") and extension_loaded('phar'))
+} elseif (file_exists("vendor.phar") and extension_loaded('phar'))
 {
 	require_once(__DIR__.DS."vendor.phar");
 } else {	
@@ -87,7 +86,7 @@ 
 try {
 	$return = $xcloner_restore->init();
 	$xcloner_restore->send_response(200, $return);
-}catch (Exception $e) {
+} catch (Exception $e) {
 	$xcloner_restore->send_response(417, $e->getMessage());
 }
 
@@ -228,13 +227,15 @@ 
 		{
 			$target_file = filter_input(INPUT_POST, 'file', FILTER_SANITIZE_STRING);
 			
-			if(!$_POST['start'])
-				$fp = fopen($target_file, "wb+");
-			else
-				$fp = fopen($target_file, "ab+");	
+			if(!$_POST['start']) {
+							$fp = fopen($target_file, "wb+");
+			} else {
+							$fp = fopen($target_file, "ab+");
+			}
 			
-			if(!$fp)
-				throw new Exception("Unable to open $target_file file for writing");
+			if(!$fp) {
+							throw new Exception("Unable to open $target_file file for writing");
+			}
 			
 			fseek($fp, $_POST['start']);
 			
@@ -244,23 +245,25 @@ 
 				
 				$blob = file_get_contents($_FILES['blob']['tmp_name']);
 				
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
 
 				try {
 					unlink($_FILES['blob']['tmp_name']);
-				}catch(Exception $e){
+				} catch(Exception $e){
 
 				}
 
-			}elseif(isset($_POST['blob'])){
+			} elseif(isset($_POST['blob'])){
 				$this->logger->debug(sprintf('Writing %s bytes to file %s starting position %s using POST blob', strlen($_POST['blob']), $target_file, $_POST['start']));
 				
 				$blob = $_POST['blob'];
 
-				if(!$bytes_written = fwrite($fp, $blob))
-					throw new Exception("Unable to write data to file $target_file");
-			}else{
+				if(!$bytes_written = fwrite($fp, $blob)) {
+									throw new Exception("Unable to write data to file $target_file");
+				}
+			} else{
 				throw new Exception("Upload failed, did not receive any binary data");
 			}
 			
@@ -294,10 +297,11 @@ 
 		
 		$mysqli->query("SET sql_mode='';");
 		$mysqli->query("SET foreign_key_checks = 0;");
-		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file'])
-			$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
-		else
-			$mysqli->query("SET NAMES utf8;");
+		if(isset($_REQUEST['charset_of_file']) and $_REQUEST['charset_of_file']) {
+					$mysqli->query("SET NAMES ".$_REQUEST['charset_of_file']."");
+		} else {
+					$mysqli->query("SET NAMES utf8;");
+		}
 			
 		return $mysqli;	
 	}
@@ -327,8 +331,9 @@ 
 		
 		$mysql_backup_file = $remote_path.DS.$mysqldump_file;
 		
-		if (!file_exists($mysql_backup_file))
-			throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
+		if (!file_exists($mysql_backup_file)) {
+					throw new Exception(sprintf("Mysql backup file %s does not exists", $mysql_backup_file));
+		}
 		
 		
 		/*if(defined('XCLONER_PLUGIN_ACCESS') && XCLONER_PLUGIN_ACCESS)
@@ -360,16 +365,18 @@ 
 			// process the line read.
 									
 				//check if line is comment
-				if (substr($line, 0, 1) == "#")
-					continue;
+				if (substr($line, 0, 1) == "#") {
+									continue;
+				}
 				
 				//check if line is empty	
-				if ($line == "\n" or trim($line) == "")
-					continue;
+				if ($line == "\n" or trim($line) == "") {
+									continue;
+				}
 					
-				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n")
-					$query .= $line;
-				else {
+				if (substr($line, strlen($line) - 2, strlen($line)) == ";\n") {
+									$query .= $line;
+				} else {
 					$query .= $line;
 					continue;
 				}
@@ -493,7 +500,7 @@ 
 			$tar->open($this->backup_storage_dir.DS.$backup_file, $start);
 		
 			$data = $tar->contents($this->process_files_limit_list);
-		}catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$return['error'] = true;
 			$return['message'] = $e->getMessage();
@@ -528,8 +535,9 @@ 
 				
 				++$return['part'];
 			
-				if ($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if ($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}	
@@ -670,19 +678,22 @@ 
 		{
 			$config = file_get_contents($wp_config);
 			preg_match("/.*table_prefix.*=.*'(.*)'/i", $config, $matches);
-			if (isset($matches[1]))
-				$table_prefix = $matches[1];
-			else
-				throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			if (isset($matches[1])) {
+							$table_prefix = $matches[1];
+			} else {
+							throw new Exception("Could not load wordpress table prefix from wp-config.php file.");
+			}
+		} else {
+					throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 		}
-		else
-			throw new Exception("Could not update the SITEURL and HOME, wp-config.php file not found");
 			
-		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'"))
-			throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='home'")) {
+					throw new Exception(sprintf("Could not update the HOME option, error: %s\n", $mysqli->error));
+		}
 		
-		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'"))
-			throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		if (!$mysqli->query("update ".$table_prefix."options set option_value='".($url)."' where option_name='siteurl'")) {
+					throw new Exception(sprintf("Could not update the SITEURL option, error: %s\n", $mysqli->error));
+		}
 		
 		return true;
 	}
@@ -720,8 +731,9 @@ 
 		
 		$this->logger->info(sprintf('Updating wp-config.php file with the new mysql details'));
 		
-		if (!file_put_contents($wp_config, $content))
-			throw new Exception("Could not write updated config data to ".$wp_config);
+		if (!file_put_contents($wp_config, $content)) {
+					throw new Exception("Could not write updated config data to ".$wp_config);
+		}
 		
 		chmod($wp_config, $file_perms);
 		
@@ -766,10 +778,11 @@ 
 							$mysqldump_list[$file['path']]['size'] = $file['size'];
 							$mysqldump_list[$file['path']]['timestamp'] = date("d M,Y H:i", $file['timestamp']);
 							
-							if ($hash and $hash == $matches[1])
-								$mysqldump_list[$file['path']]['selected'] = "selected";
-							else
-								$mysqldump_list[$file['path']]['selected'] = "";	
+							if ($hash and $hash == $matches[1]) {
+															$mysqldump_list[$file['path']]['selected'] = "selected";
+							} else {
+															$mysqldump_list[$file['path']]['selected'] = "";
+							}
 						}
 					}
 				}
@@ -790,13 +803,15 @@ 
 	 */
 	private function get_hash_from_backup($backup_file)
 	{
-		if (!$backup_file)
-			return false;
+		if (!$backup_file) {
+					return false;
+		}
 			
 		$result = preg_match("/-(\w*)./", substr($backup_file, strlen($backup_file) - 10, strlen($backup_file)), $matches);
 		
-		if ($result and isset($matches[1]))
-			return ($matches[1]);
+		if ($result and isset($matches[1])) {
+					return ($matches[1]);
+		}
 		
 		return false;
 	}
@@ -821,10 +836,11 @@ 
 			if (isset($file_info['extension']) and $file_info['extension'] == "csv")
 			{
 				$lines = explode(PHP_EOL, $this->filesystem->read($file_info['path']));
-				foreach ($lines as $line)
-					if ($line)
+				foreach ($lines as $line) {
+									if ($line)
 					{
 						$data = str_getcsv($line);
+				}
 						if (is_array($data)) {
 							$parents[$data[0]] = $file_info['path'];
 							$file_info['childs'][] = $data;
@@ -834,20 +850,22 @@ 
 						
 			}
 			
-			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions))
-				$backup_files[$file_info['path']] = $file_info;
+			if ($file_info['type'] == 'file' and isset($file_info['extension']) and in_array($file_info['extension'], $this->backup_archive_extensions)) {
+							$backup_files[$file_info['path']] = $file_info;
+			}
 		}
 		
 		$new_list = array();
 		
 		foreach ($backup_files as $key=>$file_info)
 		{
-			if (isset($parents[$file_info['path']]))
-				$backup_files[$key]['parent'] = $parents[$file_info['path']];
-			else {
+			if (isset($parents[$file_info['path']])) {
+							$backup_files[$key]['parent'] = $parents[$file_info['path']];
+			} else {
 				
-				if ($local_backup_file and ($file_info['basename'] == $local_backup_file))
-					$file_info['selected'] = 'selected';
+				if ($local_backup_file and ($file_info['basename'] == $local_backup_file)) {
+									$file_info['selected'] = 'selected';
+				}
 				
 				$this->logger->info(sprintf('Found %s backup file', $file_info['path']));
 					
@@ -894,8 +912,9 @@ 
 		$backup_archive = new Tar();
 		if ($this->is_multipart($backup_file))
 		{
-			if (!$return['part'])
-				$return['processed'] += $this->filesystem->getSize($backup_file);
+			if (!$return['part']) {
+							$return['processed'] += $this->filesystem->getSize($backup_file);
+			}
 				
 			$backup_parts = $this->get_multipart_files($backup_file);
 			$backup_file = $backup_parts[$return['part']];	
@@ -915,10 +934,11 @@ 
 			}
 		}
 		
-		if (isset($data['start']))
-		//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
+		if (isset($data['start'])) {
+				//if(isset($data['start']) and $data['start'] <= $this->filesystem->getSize($backup_file))
 		{
 			$return['finished'] = 0;
+		}
 			$return['start'] = $data['start'];
 		} else {
 			
@@ -930,14 +950,16 @@ 
 				
 				++$return['part'];
 			
-				if ($return['part'] < sizeof($backup_parts))	
-					$return['finished'] = 0;
+				if ($return['part'] < sizeof($backup_parts)) {
+									$return['finished'] = 0;
+				}
 				
 			}
 		}
 		
-		if ($return['finished'])
-			$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		if ($return['finished']) {
+					$this->logger->info(sprintf('Done extracting %s', $source_backup_file));
+		}
 		
 		$return['backup_file'] = $backup_file;
 		
@@ -969,8 +991,7 @@ 
 			$return['remote_mysql_user'] 	= $wpdb->dbuser;
 			$return['remote_mysql_pass'] 	= $wpdb->dbpassword;
 			$return['remote_mysql_db'] = $wpdb->dbname;
-		}
-		else {
+		} else {
 			$return['dir'] = ($pathinfo['dirname']).DS.$suffix;
 			$return['restore_script_url'] = str_replace($pathinfo['basename'], "", $restore_script_url).$suffix;
 		}	
@@ -989,11 +1010,13 @@ 
 	{
 		//check if i can write
 		$tmp_file = md5(time());
-		if (!file_put_contents($tmp_file, "++"))
-			throw new Exception("Could not write to new host");
+		if (!file_put_contents($tmp_file, "++")) {
+					throw new Exception("Could not write to new host");
+		}
 		
-		if (!unlink($tmp_file))
-			throw new Exception("Could not delete temporary file from new host");
+		if (!unlink($tmp_file)) {
+					throw new Exception("Could not delete temporary file from new host");
+		}
 		
 		$max_upload      = $this->return_bytes((ini_get('upload_max_filesize')));
 		$max_post        = $this->return_bytes((ini_get('post_max_size')));
@@ -1037,8 +1060,9 @@ 
 	 */
 	public function is_multipart($backup_name)
 	{
-		if (stristr($backup_name, "-multipart"))
-			return true;
+		if (stristr($backup_name, "-multipart")) {
+					return true;
+		}
 		
 		return false;	
 	}
@@ -1056,8 +1080,9 @@ 
 		if ($this->is_multipart($backup_name))
 		{
 			$backup_parts = $this->get_multipart_files($backup_name);
-			foreach ($backup_parts as $part_file)
-				$backup_size += $this->filesystem->getSize($part_file);
+			foreach ($backup_parts as $part_file) {
+							$backup_size += $this->filesystem->getSize($part_file);
+			}
 		}
 		
 		return $backup_size;
@@ -1115,15 +1140,13 @@ 
 				if($direction == 'desc') {
 					if($a > $b) {
 						return -1;
-					}
-					else{
+					} else{
 						return 1;
 					}
-				}else {
+				} else {
 					if($a < $b) {
 						return -1;
-					}
-					else{
+					} else{
 						return 1;
 					}
 				}
@@ -1153,7 +1176,7 @@ 
 		{
 			$return['statusText'] = $response['message'];
 			$return['error'] = true;
-		}elseif ($status != 200 and $status != 418)
+		} elseif ($status != 200 and $status != 418)
 		{
 			$return['error'] = true;
 			$return['message'] = $response;
@@ -1177,8 +1200,9 @@ 
 		return preg_replace_callback('!s:(\d+):([\\\\]?"[\\\\]?"|[\\\\]?"((.*?)[^\\\\])[\\\\]?");!', function($m) {
 				  $data = "";
 				  	
-				  if (!isset($m[3]))
-					$m[3] = "";
+				  if (!isset($m[3])) {
+				  					$m[3] = "";
+				  }
 					
 					$data = 's:'.strlen(($m[3])).':\"'.($m[3]).'\";';
 				  //return $this->unescape_quotes($data);
@@ -1224,7 +1248,7 @@ 
 			stristr($s, ':' ) !== false
 			){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 

includes/class-xcloner-encryption.php

Indentation +362 added lines, -362 removed lines

@@ -10,373 +10,373 @@
 
 class Xcloner_Encryption
 {
-    const FILE_ENCRYPTION_BLOCKS = 1024 * 1024;
-    const FILE_ENCRYPTION_SUFFIX = ".encrypted";
-    const FILE_DECRYPTION_SUFFIX = ".decrypted";
-
-    private $xcloner_settings;
-    private $logger;
-    private $verification = false;
-
-    public function __construct(Xcloner $xcloner_container)
-    {
-        $this->xcloner_container = $xcloner_container;
-        if (method_exists($xcloner_container, 'get_xcloner_settings')) {
-            $this->xcloner_settings = $xcloner_container->get_xcloner_settings();
-        } else {
-            $this->xcloner_settings = "";
-        }
-
-        if (method_exists($xcloner_container, 'get_xcloner_logger')) {
-            $this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
-        } else {
-            $this->logger = "";
-        }
-    }
-
-    /**
-     * Returns the backup encryption key
-     *
-     * @return SECURE_AUTH_SALT|null
-     */
-    public function get_backup_encryption_key()
-    {
-        if (is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_encryption_key();
-        }
-
-        return "";
-
-    }
-
-    /**
-     * Check if provided filename has encrypted suffix
-     *
-     * @param $filename
-     * @return bool
-     */
-    public function is_encrypted_file($filename) {
-        $fp = fopen($this->get_xcloner_path().$filename, 'r');
-        $encryption_length = fread($fp, 16);
-        fclose($fp);
-        if (is_numeric($encryption_length)) {
-            return true;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Returns the filename with encrypted suffix
-     *
-     * @param string $filename
-     * @return string
-     */
-    public function get_encrypted_target_backup_file_name($filename) {
-
-        return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename).self::FILE_ENCRYPTION_SUFFIX;
-    }
-
-    /**
-     * Returns the filename without encrypted suffix
-     *
-     * @param string $filename
-     * @return string
-     */
-    public function get_decrypted_target_backup_file_name($filename) {
-
-        return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename).self::FILE_DECRYPTION_SUFFIX;
-    }
-
-    /**
-     * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
-     *
-     * @param string $source Path to file that should be encrypted
-     * @param string $dest   File name where the encryped file should be written to.
-     * @param string $key    The key used for the encryption
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param integer $iv   The IV key to use.
-     * @param bool $verification   Weather we should we try to verify the decryption.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-    */
-    public function encrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $verification = true, $recursive = false)
-    {
-        if (is_object($this->logger)) {
-            $this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if (!$key) {
-            $key = self::get_backup_encryption_key();
-        }
-        $key_digest = openssl_digest($key, "md5", true);
-
-        $keep_local = 1;
-        if (!$dest) {
-            $dest = $this->get_encrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if (!$iv || !$start) {
-            //$iv = openssl_random_pseudo_bytes(16);
-            $iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
-        }
-
-        if (!$start) {
-            $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
-        } else {
-            $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
-        }
-
-        if ($fpOut) {
-
-            // Put the initialization vector to the beginning of the file
-            if (!$start) {
-                fwrite($fpOut, $iv);
-            }
-
-            if (file_exists($this->get_xcloner_path().$source) &&
-                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
-
-                fseek($fpIn, (int)$start);
-
-                if (!feof($fpIn)) {
-
-                    $plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
-                    $ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-                    //$iv = openssl_random_pseudo_bytes(16);
-
-                    fwrite($fpOut, $ciphertext);
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut);
-
-                    if (!feof($fpIn)) {
-                        fclose($fpIn);
-                        //echo "\n NEW:".$key.md5($iv);
-                        //self::encryptFile($source, $dest, $key, $start, $iv);
-                        if ($recursive) {
-                            $this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
-                        } else {
-
-                            if (($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                        }
-                    }
-
-                }
-            } else {
-                if (is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for encryption.');
-                }
-                throw new \Exception("Unable to read source file for encryption.");
-            }
-        } else {
-            if (is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for encryption.');
-            }
-            throw new \Exception("Unable to write destination file for encryption.");
-        }
-
-        if ($verification) {
-            $this->verify_encrypted_file($dest);
-        }
-
-        //we replace the original backup with the encrypted one
-        if (!$keep_local && copy($this->get_xcloner_path().$dest,
-             $this->get_xcloner_path().$source)) {
-            unlink($this->get_xcloner_path().$dest);
-        }
-
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    /**
-     * @param string $file
-     */
-    public function verify_encrypted_file($file) {
-        if (is_object($this->logger)) {
-            $this->logger->info(sprintf('Verifying encrypted file %s', $file));
-        }
-
-        $this->verification = true;
-        $this->decrypt_file($file);
-        $this->verification = false;
-    }
-
-    /**
-     * Dencrypt the passed file and saves the result in a new file, removing the
-     * last 4 characters from file name.
-     *
-     * @param string $source Path to file that should be decrypted
-     * @param string $dest   File name where the decryped file should be written to.
-     * @param string $key    The key used for the decryption (must be the same as for encryption)
-     * @param int $start   Start position for reading when doing incremental mode.
-     * @param integer $iv   The IV key to use.
-     * @return string|false  Returns the file name that has been created or FALSE if an error occured
-     */
-    public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
-    {
-        if (is_object($this->logger)) {
-            $this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
-        }
-
-        //$key = substr(sha1($key, true), 0, 16);
-        if (!$key) {
-            $key = self::get_backup_encryption_key();
-        }
-
-        $key_digest = openssl_digest($key, "md5", true);
-
-        $keep_local = 1;
-        if (!$dest) {
-            $dest = $this->get_decrypted_target_backup_file_name($source);
-            $keep_local = 0;
-        }
-
-        if (!$start) {
-            if ($this->verification) {
-                $fpOut = fopen("php://stdout", 'w');
-            } else {
-                $fpOut = fopen($this->get_xcloner_path().$dest, 'w');
-            }
-        } else {
-            if ($this->verification) {
-                $fpOut = fopen("php://stdout", 'a');
-            } else {
-                $fpOut = fopen($this->get_xcloner_path().$dest, 'a');
-            }
-        }
-
-        if ($fpOut) {
-            if (file_exists($this->get_xcloner_path().$source) &&
-                $fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
-
-                $encryption_length = (int)fread($fpIn, 16);
-                if (!$encryption_length) {
-                    $encryption_length = self::FILE_ENCRYPTION_BLOCKS;
-                }
-
-                fseek($fpIn, (int)$start);
-
-                // Get the initialzation vector from the beginning of the file
-                if (!$iv) {
-                    $iv = fread($fpIn, 16);
-                }
-
-                if (!feof($fpIn)) {
-
-                    // we have to read one block more for decrypting than for encrypting
-                    $ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
-                    $plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
-
-                    if (!$plaintext) {
-                        unlink($this->get_xcloner_path().$dest);
-                        if (is_object($this->logger)) {
-                            $this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
-                        }
-                        throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
-                    }
-
-                    // Use the first 16 bytes of the ciphertext as the next initialization vector
-                    $iv = substr($ciphertext, 0, 16);
-
-                    if (!$this->verification) {
-                        fwrite($fpOut, $plaintext);
-                    }
-
-                    $start = ftell($fpIn);
-
-                    fclose($fpOut);
-
-                    if (!feof($fpIn)) {
-                        fclose($fpIn);
-                        if ($this->verification || $recursive) {
-                            $ciphertext = "";
-                            $plaintext = "";
-                            $this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
-                        } else {
-                            if (($iv) != base64_decode(base64_encode($iv)))
-                            {
-                                throw new \Exception('Could not encode IV for transport');
-                            }
-
-                            return array(
-                                "start" => $start,
-                                "encryption_length" => $encryption_length,
-                                "iv" => base64_encode($iv),
-                                "target_file" => $dest,
-                                "finished" => 0
-                            );
-                    }
-                    }
-
-                }
-            } else {
-                if (is_object($this->logger)) {
-                    $this->logger->error('Unable to read source file for decryption');
-                }
-                throw new \Exception("Unable to read source file for decryption");
-            }
-        } else {
-            if (is_object($this->logger)) {
-                $this->logger->error('Unable to write destination file for decryption');
-            }
-            throw new \Exception("Unable to write destination file for decryption");
-        }
-
-        //we replace the original backup with the encrypted one
-        if (!$keep_local && !$this->verification && copy($this->get_xcloner_path().$dest,
-            $this->get_xcloner_path().$source)) {
-            unlink($this->get_xcloner_path().$dest);
-        }
-
-        return array("target_file" => $dest, "finished" => 1);
-    }
-
-    public function get_xcloner_path() {
-        if (is_object($this->xcloner_settings)) {
-            return $this->xcloner_settings->get_xcloner_store_path().DS;
-        }
-
-        return null;
-    }
+	const FILE_ENCRYPTION_BLOCKS = 1024 * 1024;
+	const FILE_ENCRYPTION_SUFFIX = ".encrypted";
+	const FILE_DECRYPTION_SUFFIX = ".decrypted";
+
+	private $xcloner_settings;
+	private $logger;
+	private $verification = false;
+
+	public function __construct(Xcloner $xcloner_container)
+	{
+		$this->xcloner_container = $xcloner_container;
+		if (method_exists($xcloner_container, 'get_xcloner_settings')) {
+			$this->xcloner_settings = $xcloner_container->get_xcloner_settings();
+		} else {
+			$this->xcloner_settings = "";
+		}
+
+		if (method_exists($xcloner_container, 'get_xcloner_logger')) {
+			$this->logger = $xcloner_container->get_xcloner_logger()->withName("xcloner_encryption");
+		} else {
+			$this->logger = "";
+		}
+	}
+
+	/**
+	 * Returns the backup encryption key
+	 *
+	 * @return SECURE_AUTH_SALT|null
+	 */
+	public function get_backup_encryption_key()
+	{
+		if (is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_encryption_key();
+		}
+
+		return "";
+
+	}
+
+	/**
+	 * Check if provided filename has encrypted suffix
+	 *
+	 * @param $filename
+	 * @return bool
+	 */
+	public function is_encrypted_file($filename) {
+		$fp = fopen($this->get_xcloner_path().$filename, 'r');
+		$encryption_length = fread($fp, 16);
+		fclose($fp);
+		if (is_numeric($encryption_length)) {
+			return true;
+		}
+
+		return false;
+
+	}
+
+	/**
+	 * Returns the filename with encrypted suffix
+	 *
+	 * @param string $filename
+	 * @return string
+	 */
+	public function get_encrypted_target_backup_file_name($filename) {
+
+		return str_replace(self::FILE_DECRYPTION_SUFFIX, "", $filename).self::FILE_ENCRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Returns the filename without encrypted suffix
+	 *
+	 * @param string $filename
+	 * @return string
+	 */
+	public function get_decrypted_target_backup_file_name($filename) {
+
+		return str_replace(self::FILE_ENCRYPTION_SUFFIX, "", $filename).self::FILE_DECRYPTION_SUFFIX;
+	}
+
+	/**
+	 * Encrypt the passed file and saves the result in a new file with ".enc" as suffix.
+	 *
+	 * @param string $source Path to file that should be encrypted
+	 * @param string $dest   File name where the encryped file should be written to.
+	 * @param string $key    The key used for the encryption
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param integer $iv   The IV key to use.
+	 * @param bool $verification   Weather we should we try to verify the decryption.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function encrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $verification = true, $recursive = false)
+	{
+		if (is_object($this->logger)) {
+			$this->logger->info(sprintf('Encrypting file %s at position %d IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if (!$key) {
+			$key = self::get_backup_encryption_key();
+		}
+		$key_digest = openssl_digest($key, "md5", true);
+
+		$keep_local = 1;
+		if (!$dest) {
+			$dest = $this->get_encrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if (!$iv || !$start) {
+			//$iv = openssl_random_pseudo_bytes(16);
+			$iv = str_pad(self::FILE_ENCRYPTION_BLOCKS, 16, "0000000000000000", STR_PAD_LEFT);
+		}
+
+		if (!$start) {
+			$fpOut = fopen($this->get_xcloner_path().$dest, 'w');
+		} else {
+			$fpOut = fopen($this->get_xcloner_path().$dest, 'a');
+		}
+
+		if ($fpOut) {
+
+			// Put the initialization vector to the beginning of the file
+			if (!$start) {
+				fwrite($fpOut, $iv);
+			}
+
+			if (file_exists($this->get_xcloner_path().$source) &&
+				$fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
+
+				fseek($fpIn, (int)$start);
+
+				if (!feof($fpIn)) {
+
+					$plaintext = fread($fpIn, 16 * self::FILE_ENCRYPTION_BLOCKS);
+					$ciphertext = openssl_encrypt($plaintext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+					//$iv = openssl_random_pseudo_bytes(16);
+
+					fwrite($fpOut, $ciphertext);
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut);
+
+					if (!feof($fpIn)) {
+						fclose($fpIn);
+						//echo "\n NEW:".$key.md5($iv);
+						//self::encryptFile($source, $dest, $key, $start, $iv);
+						if ($recursive) {
+							$this->encrypt_file($source, $dest, $key, $start, ($iv), $verification, $recursive);
+						} else {
+
+							if (($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+						}
+					}
+
+				}
+			} else {
+				if (is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for encryption.');
+				}
+				throw new \Exception("Unable to read source file for encryption.");
+			}
+		} else {
+			if (is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for encryption.');
+			}
+			throw new \Exception("Unable to write destination file for encryption.");
+		}
+
+		if ($verification) {
+			$this->verify_encrypted_file($dest);
+		}
+
+		//we replace the original backup with the encrypted one
+		if (!$keep_local && copy($this->get_xcloner_path().$dest,
+			 $this->get_xcloner_path().$source)) {
+			unlink($this->get_xcloner_path().$dest);
+		}
+
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	/**
+	 * @param string $file
+	 */
+	public function verify_encrypted_file($file) {
+		if (is_object($this->logger)) {
+			$this->logger->info(sprintf('Verifying encrypted file %s', $file));
+		}
+
+		$this->verification = true;
+		$this->decrypt_file($file);
+		$this->verification = false;
+	}
+
+	/**
+	 * Dencrypt the passed file and saves the result in a new file, removing the
+	 * last 4 characters from file name.
+	 *
+	 * @param string $source Path to file that should be decrypted
+	 * @param string $dest   File name where the decryped file should be written to.
+	 * @param string $key    The key used for the decryption (must be the same as for encryption)
+	 * @param int $start   Start position for reading when doing incremental mode.
+	 * @param integer $iv   The IV key to use.
+	 * @return string|false  Returns the file name that has been created or FALSE if an error occured
+	 */
+	public function decrypt_file($source, $dest = "", $key = "", $start = 0, $iv = 0, $recursive = false)
+	{
+		if (is_object($this->logger)) {
+			$this->logger->info(sprintf('Decrypting file %s at position %d with IV %s', $source, $start, base64_encode($iv)));
+		}
+
+		//$key = substr(sha1($key, true), 0, 16);
+		if (!$key) {
+			$key = self::get_backup_encryption_key();
+		}
+
+		$key_digest = openssl_digest($key, "md5", true);
+
+		$keep_local = 1;
+		if (!$dest) {
+			$dest = $this->get_decrypted_target_backup_file_name($source);
+			$keep_local = 0;
+		}
+
+		if (!$start) {
+			if ($this->verification) {
+				$fpOut = fopen("php://stdout", 'w');
+			} else {
+				$fpOut = fopen($this->get_xcloner_path().$dest, 'w');
+			}
+		} else {
+			if ($this->verification) {
+				$fpOut = fopen("php://stdout", 'a');
+			} else {
+				$fpOut = fopen($this->get_xcloner_path().$dest, 'a');
+			}
+		}
+
+		if ($fpOut) {
+			if (file_exists($this->get_xcloner_path().$source) &&
+				$fpIn = fopen($this->get_xcloner_path().$source, 'rb')) {
+
+				$encryption_length = (int)fread($fpIn, 16);
+				if (!$encryption_length) {
+					$encryption_length = self::FILE_ENCRYPTION_BLOCKS;
+				}
+
+				fseek($fpIn, (int)$start);
+
+				// Get the initialzation vector from the beginning of the file
+				if (!$iv) {
+					$iv = fread($fpIn, 16);
+				}
+
+				if (!feof($fpIn)) {
+
+					// we have to read one block more for decrypting than for encrypting
+					$ciphertext = fread($fpIn, 16 * ($encryption_length + 1));
+					$plaintext = openssl_decrypt($ciphertext, 'AES-128-CBC', $key_digest, OPENSSL_RAW_DATA, $iv);
+
+					if (!$plaintext) {
+						unlink($this->get_xcloner_path().$dest);
+						if (is_object($this->logger)) {
+							$this->logger->error('Backup decryption failed, please check your provided Encryption Key.');
+						}
+						throw new \Exception("Backup decryption failed, please check your provided Encryption Key.");
+					}
+
+					// Use the first 16 bytes of the ciphertext as the next initialization vector
+					$iv = substr($ciphertext, 0, 16);
+
+					if (!$this->verification) {
+						fwrite($fpOut, $plaintext);
+					}
+
+					$start = ftell($fpIn);
+
+					fclose($fpOut);
+
+					if (!feof($fpIn)) {
+						fclose($fpIn);
+						if ($this->verification || $recursive) {
+							$ciphertext = "";
+							$plaintext = "";
+							$this->decrypt_file($source, $dest, $key, $start, $iv, $recursive);
+						} else {
+							if (($iv) != base64_decode(base64_encode($iv)))
+							{
+								throw new \Exception('Could not encode IV for transport');
+							}
+
+							return array(
+								"start" => $start,
+								"encryption_length" => $encryption_length,
+								"iv" => base64_encode($iv),
+								"target_file" => $dest,
+								"finished" => 0
+							);
+					}
+					}
+
+				}
+			} else {
+				if (is_object($this->logger)) {
+					$this->logger->error('Unable to read source file for decryption');
+				}
+				throw new \Exception("Unable to read source file for decryption");
+			}
+		} else {
+			if (is_object($this->logger)) {
+				$this->logger->error('Unable to write destination file for decryption');
+			}
+			throw new \Exception("Unable to write destination file for decryption");
+		}
+
+		//we replace the original backup with the encrypted one
+		if (!$keep_local && !$this->verification && copy($this->get_xcloner_path().$dest,
+			$this->get_xcloner_path().$source)) {
+			unlink($this->get_xcloner_path().$dest);
+		}
+
+		return array("target_file" => $dest, "finished" => 1);
+	}
+
+	public function get_xcloner_path() {
+		if (is_object($this->xcloner_settings)) {
+			return $this->xcloner_settings->get_xcloner_store_path().DS;
+		}
+
+		return null;
+	}
 
 }
 
 
 try {
 
-    if (isset($argv[1])) {
-
-        class Xcloner {
-            public function __construct()
-            {
-            }
-        }
-        $xcloner_encryption = new Xcloner_Encryption(new Xcloner());
-
-        if ($argv[1] == "-e") {
-            $xcloner_encryption->encrypt_file($argv[2], $argv[2].".enc", $argv[4], '', '', '', true);
-        } elseif ($argv[1] == "-d") {
-            $xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
-        }
-    }
+	if (isset($argv[1])) {
+
+		class Xcloner {
+			public function __construct()
+			{
+			}
+		}
+		$xcloner_encryption = new Xcloner_Encryption(new Xcloner());
+
+		if ($argv[1] == "-e") {
+			$xcloner_encryption->encrypt_file($argv[2], $argv[2].".enc", $argv[4], '', '', '', true);
+		} elseif ($argv[1] == "-d") {
+			$xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
+		}
+	}
 }catch (\Exception $e) {
-    echo "CAUGHT: ".$e->getMessage();
+	echo "CAUGHT: ".$e->getMessage();
 }

Braces +1 added lines, -1 removed lines

@@ -377,6 +377,6 @@
             $xcloner_encryption->decrypt_file($argv[2], $argv[2].".dec", $argv[4], '', '', true);
         }
     }
-}catch (\Exception $e) {
+} catch (\Exception $e) {
     echo "CAUGHT: ".$e->getMessage();
 }