xpressengine / xe-core

classes/file/FileHandler.class.php

Spacing +130 added lines, -130 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	function getRealPath($source)
 	{
-		if(strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
+		if (strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
 		{
-			return _XE_PATH_ . substr($source, 2);
+			return _XE_PATH_.substr($source, 2);
 		}
 
 		return $source;
@@ -40,7 +40,7 @@ 
 	{
 		$source_dir = self::getRealPath($source_dir);
 		$target_dir = self::getRealPath($target_dir);
-		if(!is_dir($source_dir))
+		if (!is_dir($source_dir))
 		{
 			return FALSE;
 		}
@@ -48,44 +48,44 @@ 
 		// generate when no target exists
 		self::makeDir($target_dir);
 
-		if(substr($source_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($source_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$source_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		if(substr($target_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($target_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$target_dir .= DIRECTORY_SEPARATOR;
 		}
 
 		$oDir = dir($source_dir);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file{0} == '.')
+			if ($file{0} == '.')
 			{
 				continue;
 			}
 
-			if($filter && preg_match($filter, $file))
+			if ($filter && preg_match($filter, $file))
 			{
 				continue;
 			}
 
-			if(is_dir($source_dir . $file))
+			if (is_dir($source_dir.$file))
 			{
-				self::copyDir($source_dir . $file, $target_dir . $file, $type);
+				self::copyDir($source_dir.$file, $target_dir.$file, $type);
 			}
 			else
 			{
-				if($type == 'force')
+				if ($type == 'force')
 				{
-					@unlink($target_dir . $file);
+					@unlink($target_dir.$file);
 				}
 				else
 				{
-					if(!file_exists($target_dir . $file))
+					if (!file_exists($target_dir.$file))
 					{
-						@copy($source_dir . $file, $target_dir . $file);
+						@copy($source_dir.$file, $target_dir.$file);
 					}
 				}
 			}
@@ -110,12 +110,12 @@ 
 
 		self::makeDir($target_dir);
 
-		if($force == 'Y')
+		if ($force == 'Y')
 		{
-			@unlink($target_dir . DIRECTORY_SEPARATOR . $target);
+			@unlink($target_dir.DIRECTORY_SEPARATOR.$target);
 		}
 
-		@copy($source, $target_dir . DIRECTORY_SEPARATOR . $target);
+		@copy($source, $target_dir.DIRECTORY_SEPARATOR.$target);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	function readFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
+		if (($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
 		{
 			return;
 		}
@@ -149,12 +149,12 @@ 
 		self::makeDir($pathinfo['dirname']);
 
 		$flags = 0;
-		if(strtolower($mode) == 'a')
+		if (strtolower($mode) == 'a')
 		{
 			$flags = FILE_APPEND;
 		}
 
-		@file_put_contents($filename, $buff, $flags|LOCK_EX);
+		@file_put_contents($filename, $buff, $flags | LOCK_EX);
 		@chmod($filename, 0644);
 	}
 
@@ -192,7 +192,7 @@ 
 	 */
 	function moveFile($source, $target)
 	{
-		if(($source = self::exists($source)) !== FALSE)
+		if (($source = self::exists($source)) !== FALSE)
 		{
 			self::removeFile($target);
 			return self::rename($source, $target);
@@ -230,35 +230,35 @@ 
 		$path = self::getRealPath($path);
 		$output = array();
 
-		if(substr($path, -1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			$path .= '/';
 		}
 
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			return $output;
 		}
 
 		$files = scandir($path);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if($file{0} == '.' || ($filter && !preg_match($filter, $file)))
+			if ($file{0} == '.' || ($filter && !preg_match($filter, $file)))
 			{
 				continue;
 			}
 
-			if($to_lower)
+			if ($to_lower)
 			{
 				$file = strtolower($file);
 			}
 
-			if($filter)
+			if ($filter)
 			{
 				$file = preg_replace($filter, '$1', $file);
 			}
 
-			if($concat_prefix)
+			if ($concat_prefix)
 			{
 				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
 			}
@@ -279,12 +279,12 @@ 
 	 */
 	function makeDir($path_string)
 	{
-		if(self::exists($path_string) !== FALSE)
+		if (self::exists($path_string) !== FALSE)
 		{
 			return TRUE;
 		}
 
-		if(!ini_get('safe_mode'))
+		if (!ini_get('safe_mode'))
 		{
 			@mkdir($path_string, 0755, TRUE);
 			@chmod($path_string, 0755);
@@ -295,35 +295,35 @@ 
 			static $oFtp = NULL;
 
 			$ftp_info = Context::getFTPInfo();
-			if($oFtp == NULL)
+			if ($oFtp == NULL)
 			{
-				if(!Context::isFTPRegisted())
+				if (!Context::isFTPRegisted())
 				{
 					return;
 				}
 
-				require_once(_XE_PATH_ . 'libs/ftp.class.php');
+				require_once(_XE_PATH_.'libs/ftp.class.php');
 				$oFtp = new ftp();
-				if(!$ftp_info->ftp_host)
+				if (!$ftp_info->ftp_host)
 				{
 					$ftp_info->ftp_host = "127.0.0.1";
 				}
-				if(!$ftp_info->ftp_port)
+				if (!$ftp_info->ftp_port)
 				{
 					$ftp_info->ftp_port = 21;
 				}
-				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+				if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 				{
 					return;
 				}
-				if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$oFtp->ftp_quit();
 					return;
 				}
 			}
 
-			if(!($ftp_path = $ftp_info->ftp_root_path))
+			if (!($ftp_path = $ftp_info->ftp_root_path))
 			{
 				$ftp_path = DIRECTORY_SEPARATOR;
 			}
@@ -332,19 +332,19 @@ 
 			$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
 
 			$path = _XE_PATH_;
-			for($i = 0, $c = count($path_list); $i < $c; $i++)
+			for ($i = 0, $c = count($path_list); $i < $c; $i++)
 			{
-				if(!$path_list[$i])
+				if (!$path_list[$i])
 				{
 					continue;
 				}
 
-				$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				if(!is_dir($path))
+				$path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				$ftp_path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				if (!is_dir($path))
 				{
 					$oFtp->ftp_mkdir($ftp_path);
-					$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
+					$oFtp->ftp_site("CHMOD 777 ".$ftp_path);
 				}
 			}
 		}
@@ -360,23 +360,23 @@ 
 	 */
 	function removeDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(self::isDir($path))
+		if (self::isDir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeDir($target);
 				}
@@ -401,22 +401,22 @@ 
 	 */
 	function removeBlankDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
 		$files = array_diff(scandir($path), array('..', '.'));
 
-		if(count($files) < 1)
+		if (count($files) < 1)
 		{
 			rmdir($path);
 			return;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+			if (($target = self::isDir($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 			{
 				continue;
 			}
@@ -435,23 +435,23 @@ 
 	 */
 	function removeFilesInDir($path)
 	{
-		if(($path = self::getRealPath($path)) === FALSE)
+		if (($path = self::getRealPath($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(is_dir($path))
+		if (is_dir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeFilesInDir($target);
 				}
@@ -463,7 +463,7 @@ 
 		}
 		else
 		{
-			if(self::exists($path)) unlink($path);
+			if (self::exists($path)) unlink($path);
 		}
 
 	}
@@ -477,22 +477,22 @@ 
 	 */
 	function filesize($size)
 	{
-		if(!$size)
+		if (!$size)
 		{
 			return '0Byte';
 		}
 
-		if($size === 1)
+		if ($size === 1)
 		{
 			return '1Byte';
 		}
 
-		if($size < 1024)
+		if ($size < 1024)
 		{
-			return $size . 'Bytes';
+			return $size.'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if ($size >= 1024 && $size < 1024 * 1024)
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
@@ -517,7 +517,7 @@ 
 	 */
 	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$url = $IDN->encode($url);
 
@@ -527,7 +527,7 @@ 
 			require_once('HTTP/Request.php');
 
 			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"])
+			if ($parsed_url["host"])
 			{
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
@@ -537,13 +537,13 @@ 
 			{
 				$oRequest = new HTTP_Request($url);
 
-				if(count($request_config) && method_exists($oRequest, 'setConfig'))
+				if (count($request_config) && method_exists($oRequest, 'setConfig'))
 				{
-					foreach($request_config as $key=>$val)
+					foreach ($request_config as $key=>$val)
 					{
-						if($key === 'observers')
+						if ($key === 'observers')
 						{
-							foreach($val as $observer)
+							foreach ($val as $observer)
 							{
 								$oRequest->attach($observer);
 							}
@@ -554,57 +554,57 @@ 
 						}
 					}
 				}
-				if(method_exists($oRequest, 'setConfig'))
+				if (method_exists($oRequest, 'setConfig'))
 				{
-					if(extension_loaded('curl'))
+					if (extension_loaded('curl'))
 					{
 						$oRequest->setConfig('adapter', 'curl');
 					}
-					elseif(version_compare(PHP_VERSION, '5.6', '<'))
+					elseif (version_compare(PHP_VERSION, '5.6', '<'))
 					{
 						$oRequest->setConfig('ssl_verify_host', false);
 					}
-					if(file_exists(_XE_PATH_ . 'libs/cacert/cacert.pem'))
+					if (file_exists(_XE_PATH_.'libs/cacert/cacert.pem'))
 					{
-						$oRequest->setConfig('ssl_cafile', _XE_PATH_ . 'libs/cacert/cacert.pem');
+						$oRequest->setConfig('ssl_cafile', _XE_PATH_.'libs/cacert/cacert.pem');
 					}
 				}
 
-				if(count($headers) > 0)
+				if (count($headers) > 0)
 				{
-					foreach($headers as $key => $val)
+					foreach ($headers as $key => $val)
 					{
 						$oRequest->addHeader($key, $val);
 					}
 				}
-				if($cookies[$host])
+				if ($cookies[$host])
 				{
-					foreach($cookies[$host] as $key => $val)
+					foreach ($cookies[$host] as $key => $val)
 					{
 						$oRequest->addCookie($key, $val);
 					}
 				}
-				if(count($post_data) > 0)
+				if (count($post_data) > 0)
 				{
-					foreach($post_data as $key => $val)
+					foreach ($post_data as $key => $val)
 					{
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
+				if (!$content_type)
 					$oRequest->addHeader('Content-Type', 'text/html');
 				else
 					$oRequest->addHeader('Content-Type', $content_type);
 				$oRequest->setMethod($method);
-				if($body)
+				if ($body)
 					$oRequest->setBody($body);
 			}
 			
-			if(method_exists($oRequest, 'setConfig'))
+			if (method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
 			}
-			elseif(property_exists($oRequest, '_timeout'))
+			elseif (property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -614,25 +614,25 @@ 
 			$code = $oRequest->getResponseCode();
 			$header = $oRequest->getResponseHeader();
 			$response = $oRequest->getResponseBody();
-			if($c = $oRequest->getResponseCookies())
+			if ($c = $oRequest->getResponseCookies())
 			{
-				foreach($c as $k => $v)
+				foreach ($c as $k => $v)
 				{
 					$cookies[$host][$v['name']] = $v['value'];
 				}
 			}
 
-			if($code > 300 && $code < 399 && $header['location'])
+			if ($code > 300 && $code < 399 && $header['location'])
 			{
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
+			if ($code != 200)
 			{
 				return;
 			}
 
-			if(isset($request_config['store_body']) && !$request_config['store_body'])
+			if (isset($request_config['store_body']) && !$request_config['store_body'])
 			{
 				return TRUE;
 			}
@@ -641,7 +641,7 @@ 
 				return $response;
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return NULL;
 		}
@@ -673,7 +673,7 @@ 
 		{
 			$result = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers, $cookies, $post_data, $request_config);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return FALSE;
 		}
@@ -690,7 +690,7 @@ 
 	function returnBytes($val)
 	{
 		$unit = strtoupper(substr($val, -1));
-		$val = (float)$val;
+		$val = (float) $val;
 
 		switch ($unit)
 		{
@@ -713,13 +713,13 @@ 
 		$K64 = 65536;
 		$TWEAKFACTOR = 2.0;
 		$channels = $imageInfo['channels'];
-		if(!$channels)
+		if (!$channels)
 		{
 			$channels = 6; //for png
 		}
-		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR);
+		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64) * $TWEAKFACTOR);
 		$availableMemory = self::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-		if($availableMemory < $memoryNeeded)
+		if ($availableMemory < $memoryNeeded)
 		{
 			return FALSE;
 		}
@@ -746,30 +746,30 @@ 
 		}
 
 		$target_file = self::getRealPath($target_file);
-		if(!$resize_width)
+		if (!$resize_width)
 		{
 			$resize_width = 100;
 		}
 
-		if(!$resize_height)
+		if (!$resize_height)
 		{
 			$resize_height = $resize_width;
 		}
 
 		// retrieve source image's information
 		$imageInfo = getimagesize($source_file);
-		if(!self::checkMemoryLoadImage($imageInfo))
+		if (!self::checkMemoryLoadImage($imageInfo))
 		{
 			return FALSE;
 		}
 
 		list($width, $height, $type, $attrs) = $imageInfo;
-		if($width < 1 || $height < 1)
+		if ($width < 1 || $height < 1)
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case '1' :
 				$type = 'gif';
@@ -787,7 +787,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -798,7 +798,7 @@ 
 		$height_per = ($resize_height > 0 && $height >= $resize_height) ? $resize_height / $height : 1;
 
 		$per = NULL;
-		if($thumbnail_type == 'ratio')
+		if ($thumbnail_type == 'ratio')
 		{
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
@@ -811,16 +811,16 @@ 
 
 		// create temporary image with target size
 		$thumb = NULL;
-		if(function_exists('imagecreateTRUEcolor'))
+		if (function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
 		}
-		else if(function_exists('imagecreate'))
+		else if (function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
 
-		if(!$thumb)
+		if (!$thumb)
 		{
 			return FALSE;
 		}
@@ -829,37 +829,37 @@ 
 
 		// create temporary image having original type
 		$source = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case 'gif' :
-				if(function_exists('imagecreatefromgif'))
+				if (function_exists('imagecreatefromgif'))
 				{
 					$source = @imagecreatefromgif($source_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagecreatefromjpeg'))
+				if (function_exists('imagecreatefromjpeg'))
 				{
 					$source = @imagecreatefromjpeg($source_file);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagecreatefrompng'))
+				if (function_exists('imagecreatefrompng'))
 				{
 					$source = @imagecreatefrompng($source_file);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagecreatefromwbmp'))
+				if (function_exists('imagecreatefromwbmp'))
 				{
 					$source = @imagecreatefromwbmp($source_file);
 				}
 				break;
 		}
 
-		if(!$source)
+		if (!$source)
 		{
 			imagedestroy($thumb);
 			return FALSE;
@@ -871,13 +871,13 @@ 
 
 		$x = 0;
 		$y = 0;
-		if($thumbnail_type == 'crop')
+		if ($thumbnail_type == 'crop')
 		{
 			$x = (int) ($resize_width / 2 - $new_width / 2);
 			$y = (int) ($resize_height / 2 - $new_height / 2);
 		}
 
-		if(function_exists('imagecopyresampled'))
+		if (function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -891,30 +891,30 @@ 
 
 		// write into the file
 		$output = NULL;
-		switch($target_type)
+		switch ($target_type)
 		{
 			case 'gif' :
-				if(function_exists('imagegif'))
+				if (function_exists('imagegif'))
 				{
 					$output = imagegif($thumb, $target_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagejpeg'))
+				if (function_exists('imagejpeg'))
 				{
 					$output = imagejpeg($thumb, $target_file, 100);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagepng'))
+				if (function_exists('imagepng'))
 				{
 					$output = imagepng($thumb, $target_file, 9);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagewbmp'))
+				if (function_exists('imagewbmp'))
 				{
 					$output = imagewbmp($thumb, $target_file, 100);
 				}
@@ -924,7 +924,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -942,12 +942,12 @@ 
 	 */
 	function readIniFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE)
+		if (($filename = self::exists($filename)) === FALSE)
 		{
 			return FALSE;
 		}
 		$arr = parse_ini_file($filename, TRUE);
-		if(is_array($arr) && count($arr) > 0)
+		if (is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
 		}
@@ -973,7 +973,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -990,19 +990,19 @@ 
 	function _makeIniBuff($arr)
 	{
 		$return = array();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			// section
-			if(is_array($val))
+			if (is_array($val))
 			{
 				$return[] = sprintf("[%s]", $key);
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
 			}
-			else if(is_object($val))
+			else if (is_object($val))
 			{
 				continue;
 			}
@@ -1077,15 +1077,15 @@ 
 	function isWritableDir($path)
 	{
 		$path = self::getRealPath($path);
-		if(is_dir($path)==FALSE)
+		if (is_dir($path) == FALSE)
 		{
 			return FALSE;
 		}
 
-		$checkFile = $path . '/_CheckWritableDir';
+		$checkFile = $path.'/_CheckWritableDir';
 
 		$fp = fopen($checkFile, 'w');
-		if(!is_resource($fp))
+		if (!is_resource($fp))
 		{
 			return FALSE;
 		}

Braces +30 added lines, -45 removed lines

@@ -74,14 +74,12 @@ 
 			if(is_dir($source_dir . $file))
 			{
 				self::copyDir($source_dir . $file, $target_dir . $file, $type);
-			}
-			else
+			} else
 			{
 				if($type == 'force')
 				{
 					@unlink($target_dir . $file);
-				}
-				else
+				} else
 				{
 					if(!file_exists($target_dir . $file))
 					{
@@ -379,15 +377,13 @@ 
 				if(is_dir($target))
 				{
 					self::removeDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
 			rmdir($path);
-		}
-		else
+		} else
 		{
 			unlink($path);
 		}
@@ -454,16 +450,16 @@ 
 				if(is_dir($target))
 				{
 					self::removeFilesInDir($target);
-				}
-				else
+				} else
 				{
 					unlink($target);
 				}
 			}
-		}
-		else
+		} else
 		{
-			if(self::exists($path)) unlink($path);
+			if(self::exists($path)) {
+				unlink($path);
+			}
 		}
 
 	}
@@ -532,8 +528,7 @@ 
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
 				$oRequest->addPostData('arg', serialize(array('Destination' => $url, 'method' => $method, 'body' => $body, 'content_type' => $content_type, "headers" => $headers, "post_data" => $post_data)));
-			}
-			else
+			} else
 			{
 				$oRequest = new HTTP_Request($url);
 
@@ -547,8 +542,7 @@ 
 							{
 								$oRequest->attach($observer);
 							}
-						}
-						else
+						} else
 						{
 							$oRequest->setConfig($key, $val);
 						}
@@ -559,8 +553,7 @@ 
 					if(extension_loaded('curl'))
 					{
 						$oRequest->setConfig('adapter', 'curl');
-					}
-					elseif(version_compare(PHP_VERSION, '5.6', '<'))
+					} elseif(version_compare(PHP_VERSION, '5.6', '<'))
 					{
 						$oRequest->setConfig('ssl_verify_host', false);
 					}
@@ -591,20 +584,21 @@ 
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
-					$oRequest->addHeader('Content-Type', 'text/html');
-				else
-					$oRequest->addHeader('Content-Type', $content_type);
+				if(!$content_type) {
+									$oRequest->addHeader('Content-Type', 'text/html');
+				} else {
+									$oRequest->addHeader('Content-Type', $content_type);
+				}
 				$oRequest->setMethod($method);
-				if($body)
-					$oRequest->setBody($body);
+				if($body) {
+									$oRequest->setBody($body);
+				}
 			}
 			
 			if(method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
-			}
-			elseif(property_exists($oRequest, '_timeout'))
+			} elseif(property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -635,13 +629,11 @@ 
 			if(isset($request_config['store_body']) && !$request_config['store_body'])
 			{
 				return TRUE;
-			}
-			else
+			} else
 			{
 				return $response;
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return NULL;
 		}
@@ -672,8 +664,7 @@ 
 		try
 		{
 			$result = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers, $cookies, $post_data, $request_config);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return FALSE;
 		}
@@ -803,8 +794,7 @@ 
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
 			$resize_height = $height * $per;
-		}
-		else
+		} else
 		{
 			$per = ($width_per < $height_per) ? $height_per : $width_per;
 		}
@@ -814,8 +804,7 @@ 
 		if(function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
-		}
-		else if(function_exists('imagecreate'))
+		} else if(function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
@@ -880,8 +869,7 @@ 
 		if(function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
-		}
-		else
+		} else
 		{
 			imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -950,8 +938,7 @@ 
 		if(is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -1001,12 +988,10 @@ 
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
-			}
-			else if(is_object($val))
+			} else if(is_object($val))
 			{
 				continue;
-			}
-			else
+			} else
 			{
 				$return[] = sprintf("%s=\"%s\"", $key, $val);
 			}