pradosoft / prado

framework/I18N/core/MessageCache.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime = (int) $time;
 	}
 
 	/**
@@ -121,7 +121,7 @@ 
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified = (int) $lastmodified;
 
 		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;

framework/I18N/core/MessageSource_PHP.php

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -76,10 +76,10 @@ 
 
 		foreach($translationUnit as $k => $unit)
 		{
-			$source = (string)$unit['source'];
-			$translations[$source][] = (string)$unit['target'];
-			$translations[$source][] = (string)$k;
-			$translations[$source][] = array_key_exists('note', $unit) ? (string)$unit['note'] : '';
+			$source = (string) $unit['source'];
+			$translations[$source][] = (string) $unit['target'];
+			$translations[$source][] = (string) $k;
+			$translations[$source][] = array_key_exists('note', $unit) ? (string) $unit['note'] : '';
 		}
 
 		return $translations;
@@ -133,7 +133,7 @@ 
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
 			}
 		}
@@ -159,7 +159,7 @@ 
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
 				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
 		}
@@ -186,7 +186,7 @@ 
 	 */
 	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 		$catalogue = [];
 

framework/I18N/core/TCache_Lite.php

Spacing +46 added lines, -46 removed lines

@@ -233,7 +233,7 @@ 
 	 */
 	public function __construct($options = [null])
 	{
-		$availableOptions = [	'automaticSerialization',
+		$availableOptions = ['automaticSerialization',
 									'fileNameProtection',
 									'memoryCaching',
 									'onlyMemoryCaching',
@@ -269,35 +269,35 @@ 
 		$this->_id = $id;
 		$this->_group = $group;
 		$data = false;
-		if ($this->_caching) {
+		if($this->_caching) {
 			$this->_setFileName($id, $group);
-			if ($this->_memoryCaching) {
-				if (isset($this->_memoryCachingArray[$this->_file])) {
-					if ($this->_automaticSerialization) {
+			if($this->_memoryCaching) {
+				if(isset($this->_memoryCachingArray[$this->_file])) {
+					if($this->_automaticSerialization) {
 						return unserialize(
 									$this->_memoryCachingArray[$this->_file]);
 					} else {
 						return $this->_memoryCachingArray[$this->_file];
 					}
 				} else {
-					if ($this->_onlyMemoryCaching) {
+					if($this->_onlyMemoryCaching) {
 						return false;
 					}
 				}
 			}
-			if ($doNotTestCacheValidity) {
-				if (file_exists($this->_file)) {
+			if($doNotTestCacheValidity) {
+				if(file_exists($this->_file)) {
 					$data = $this->_read();
 				}
 			} else {
-				if (@filemtime($this->_file) > $this->_refreshTime) {
+				if(@filemtime($this->_file) > $this->_refreshTime) {
 					$data = $this->_read();
 				}
 			}
-			if (($data) and ($this->_memoryCaching)) {
+			if(($data) and ($this->_memoryCaching)) {
 				$this->_memoryCacheAdd($this->_file, $data);
 			}
-			if ($this->_automaticSerialization && is_string($data)) {
+			if($this->_automaticSerialization && is_string($data)) {
 				$data = unserialize($data);
 			}
 			return $data;
@@ -317,21 +317,21 @@ 
 	 */
 	public function save($data, $id = null, $group = 'default')
 	{
-		if ($this->_caching) {
-			if ($this->_automaticSerialization) {
+		if($this->_caching) {
+			if($this->_automaticSerialization) {
 				$data = serialize($data);
 			}
-			if (isset($id)) {
+			if(isset($id)) {
 				$this->_setFileName($id, $group);
 			}
-			if ($this->_memoryCaching) {
+			if($this->_memoryCaching) {
 				$this->_memoryCacheAdd($this->_file, $data);
-				if ($this->_onlyMemoryCaching) {
+				if($this->_onlyMemoryCaching) {
 					return true;
 				}
 			}
-			if ($this->_writeControl) {
-				if (!$this->_writeAndControl($data)) {
+			if($this->_writeControl) {
+				if(!$this->_writeAndControl($data)) {
 					@touch($this->_file, time() - 2 * abs($this->_lifeTime));
 					return false;
 				} else {
@@ -355,7 +355,7 @@ 
 	public function remove($id, $group = 'default')
 	{
 		$this->_setFileName($id, $group);
-		if (!@unlink($this->_file)) {
+		if(!@unlink($this->_file)) {
 			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
 			return false;
 		}
@@ -374,33 +374,33 @@ 
 	 */
 	public function clean($group = false)
 	{
-		if ($this->_fileNameProtection) {
+		if($this->_fileNameProtection) {
 			$motif = ($group) ? 'cache_' . md5($group) . '_' : 'cache_';
 		} else {
 			$motif = ($group) ? 'cache_' . $group . '_' : 'cache_';
 		}
-		if ($this->_memoryCaching) {
-			while (list($key, $value) = each($this->_memoryCaching)) {
-				if (strpos($key, $motif, 0)) {
+		if($this->_memoryCaching) {
+			while(list($key, $value) = each($this->_memoryCaching)) {
+				if(strpos($key, $motif, 0)) {
 					unset($this->_memoryCaching[$key]);
 					$this->_memoryCachingCounter =
 							$this->_memoryCachingCounter - 1;
 				}
 			}
-			if ($this->_onlyMemoryCaching) {
+			if($this->_onlyMemoryCaching) {
 				return true;
 			}
 		}
-		if (!($dh = opendir($this->_cacheDir))) {
+		if(!($dh = opendir($this->_cacheDir))) {
 			$this->raiseError('TCache_Lite : Unable to open cache directory !');
 			return false;
 		}
-		while ($file = readdir($dh)) {
-			if (($file != '.') && ($file != '..')) {
+		while($file = readdir($dh)) {
+			if(($file != '.') && ($file != '..')) {
 				$file = $this->_cacheDir . $file;
-				if (is_file($file)) {
-					if (strpos($file, $motif, 0)) {
-						if (!@unlink($file)) {
+				if(is_file($file)) {
+					if(strpos($file, $motif, 0)) {
+						if(!@unlink($file)) {
 			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
 							return false;
 						}
@@ -429,7 +429,7 @@ 
 	 */
 	public function saveMemoryCachingState($id, $group = 'default')
 	{
-		if ($this->_caching) {
+		if($this->_caching) {
 			$array = [
 				'counter' => $this->_memoryCachingCounter,
 				'array' => $this->_memoryCachingState
@@ -446,8 +446,8 @@ 
 	public function getMemoryCachingState($id, $group = 'default',
 									$doNotTestCacheValidity = false)
 	{
-		if ($this->_caching) {
-			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+		if($this->_caching) {
+			if($data = $this->get($id, $group, $doNotTestCacheValidity))
 			{
 				$array = unserialize($data);
 				$this->_memoryCachingCounter = $array['counter'];
@@ -492,7 +492,7 @@ 
 	public function _memoryCacheAdd($id, $data)
 	{
 		$this->_memoryCachingArray[$this->_file] = $data;
-		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+		if($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
 			list($key, $value) = each($this->_memoryCachingArray);
 			unset($this->_memoryCachingArray[$key]);
 		} else {
@@ -509,7 +509,7 @@ 
 	 */
 	public function _setFileName($id, $group)
 	{
-		if ($this->_fileNameProtection) {
+		if($this->_fileNameProtection) {
 			$this->_file = ($this->_cacheDir . 'cache_' . md5($group) . '_'
 									. md5($id));
 		} else {
@@ -531,21 +531,21 @@ 
 	public function _read()
 	{
 		$fp = @fopen($this->_file, "rb");
-		if ($this->_fileLocking) @flock($fp, LOCK_SH);
-		if ($fp) {
+		if($this->_fileLocking) @flock($fp, LOCK_SH);
+		if($fp) {
 			// because the filesize can be cached by PHP itself...
 			clearstatcache();
 			$length = @filesize($this->_file);
-			if ($this->_readControl) {
+			if($this->_readControl) {
 				$hashControl = @fread($fp, 32);
 				$length = $length - 32;
 			}
 			$data = @fread($fp, $length);
-			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			if($this->_fileLocking) @flock($fp, LOCK_UN);
 			@fclose($fp);
-			if ($this->_readControl) {
+			if($this->_readControl) {
 				$hashData = $this->_hash($data, $this->_readControlType);
-				if ($hashData != $hashControl) {
+				if($hashData != $hashControl) {
 					@touch($this->_file, time() - 2 * abs($this->_lifeTime));
 					return false;
 				}
@@ -566,14 +566,14 @@ 
 	public function _write($data)
 	{
 		$fp = @fopen($this->_file, "wb");
-		if ($fp) {
-			if ($this->_fileLocking) @flock($fp, LOCK_EX);
-			if ($this->_readControl) {
+		if($fp) {
+			if($this->_fileLocking) @flock($fp, LOCK_EX);
+			if($this->_readControl) {
 				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
 			}
 			$len = strlen($data);
 			@fwrite($fp, $data, $len);
-			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			if($this->_fileLocking) @flock($fp, LOCK_UN);
 			@fclose($fp);
 			return true;
 		}
@@ -606,7 +606,7 @@ 
 	 */
 	public function _hash($data, $controlType)
 	{
-		switch ($controlType) {
+		switch($controlType) {
 		case 'md5':
 			return md5($data);
 		case 'crc32':

framework/I18N/core/MessageSource.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 	 */
 	public static function &factory($type, $source = '.', $filename = '')
 	{
-		$types = ['XLIFF','PHP','gettext','Database'];
+		$types = ['XLIFF', 'PHP', 'gettext', 'Database'];
 
 		if(empty($filename) && !in_array($type, $types))
 			throw new Exception('Invalid type "' . $type . '", valid types are ' .

framework/I18N/core/CultureInfo.php

Spacing +4 added lines, -4 removed lines

@@ -237,7 +237,7 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
+			if(!preg_match('/^[_\\w]+$/', $culture))
 				throw new Exception('Invalid culture supplied: ' . $culture);
 		}
 
@@ -355,7 +355,7 @@ 
 			$value = $index[$i];
 			if($i < $k - 1 && isset($array[$value]))
 				$array = $array[$value];
-			elseif ($i == $k - 1 && isset($array[$value]))
+			elseif($i == $k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -485,7 +485,7 @@ 
 			$elements = $this->findInfo('NumberElements');
 			$patterns = $this->findInfo('NumberPatterns');
 			$currencies = $this->getCurrencies();
-			$data = [	'NumberElements' => $elements,
+			$data = ['NumberElements' => $elements,
 							'NumberPatterns' => $patterns,
 							'Currencies' => $currencies];
 
@@ -535,7 +535,7 @@ 
 		$neutral = [];
 		$specific = [];
 
-		while (false !== ($entry = $dir->read()))
+		while(false !== ($entry = $dir->read()))
 		{
 			if(is_file($dataDir . $entry)
 				&& substr($entry, -4) == $dataExt

framework/I18N/TTranslate.php

Spacing +1 added lines, -1 removed lines

@@ -246,7 +246,7 @@
 		$catalogue = $this->getCatalogue();
 		if(empty($catalogue) && isset($config['catalogue']))
 			$catalogue = $config['catalogue'];
-		if (empty($catalogue)) $catalogue = 'messages';
+		if(empty($catalogue)) $catalogue = 'messages';
 		Translation::init($catalogue);
 
 		$key = $this->getKey();

framework/I18N/TGlobalization.php

Spacing +2 added lines, -2 removed lines

@@ -82,11 +82,11 @@
 		if($config !== null)
 		{
 			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-				$translation = isset($config['translate'])?$config['translate']:null;
+				$translation = isset($config['translate']) ? $config['translate'] : null;
 			else
 			{
 				$t = $config->getElementByTagName('translation');
-				$translation = ($t)?$t->getAttributes():null;
+				$translation = ($t) ? $t->getAttributes() : null;
 			}
 			if($translation)
 				$this->setTranslationConfiguration($translation);

framework/IO/TTarFileExtractor.php

Spacing +68 added lines, -68 removed lines

@@ -69,7 +69,7 @@ 
 	{
 		$this->_close();
 		// ----- Look for a local copy to delete
-		if ($this->_temp_tarname != '')
+		if($this->_temp_tarname != '')
 			@unlink($this->_temp_tarname);
 	}
 
@@ -115,7 +115,7 @@ 
 		$v_result = true;
 		$v_list_detail = [];
 
-		if ($v_result = $this->_openRead()) {
+		if($v_result = $this->_openRead()) {
 			$v_result = $this->_extractList($p_path, $v_list_detail,
 											"complete", 0, $p_remove_path);
 			$this->_close();
@@ -131,7 +131,7 @@ 
 
 	private function _isArchive($p_filename = null)
 	{
-		if ($p_filename == null) {
+		if($p_filename == null) {
 			$p_filename = $this->_tarname;
 		}
 		clearstatcache();
@@ -140,24 +140,24 @@ 
 
 	private function _openRead()
 	{
-		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+		if(strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
 
 		  // ----- Look if a local copy need to be done
-		  if ($this->_temp_tarname == '') {
+		  if($this->_temp_tarname == '') {
 			  $this->_temp_tarname = uniqid('tar') . '.tmp';
-			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+			  if(!$v_file_from = @fopen($this->_tarname, 'rb')) {
 				$this->_error('Unable to open in read mode \''
 							  . $this->_tarname . '\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
-			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+			  if(!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
 				$this->_error('Unable to open in write mode \''
 							  . $this->_temp_tarname . '\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
-			  while ($v_data = @fread($v_file_from, 1024))
+			  while($v_data = @fread($v_file_from, 1024))
 				  @fwrite($v_file_to, $v_data);
 			  @fclose($v_file_from);
 			  @fclose($v_file_to);
@@ -172,7 +172,7 @@ 
 
 		$this->_file = @fopen($v_filename, "rb");
 
-		if ($this->_file == 0) {
+		if($this->_file == 0) {
 			$this->_error('Unable to open in read mode \'' . $v_filename . '\'');
 			return false;
 		}
@@ -183,7 +183,7 @@ 
 	private function _close()
 	{
 		//if (isset($this->_file)) {
-		if (is_resource($this->_file))
+		if(is_resource($this->_file))
 		{
 			   @fclose($this->_file);
 			$this->_file = 0;
@@ -191,7 +191,7 @@ 
 
 		// ----- Look if a local copy need to be erase
 		// Note that it might be interesting to keep the url for a time : ToDo
-		if ($this->_temp_tarname != '') {
+		if($this->_temp_tarname != '') {
 			@unlink($this->_temp_tarname);
 			$this->_temp_tarname = '';
 		}
@@ -204,7 +204,7 @@ 
 		$this->_close();
 
 		// ----- Look for a local copy
-		if ($this->_temp_tarname != '') {
+		if($this->_temp_tarname != '') {
 			// ----- Remove the local copy but not the remote tarname
 			@unlink($this->_temp_tarname);
 			$this->_temp_tarname = '';
@@ -220,7 +220,7 @@ 
 	private function _readBlock()
 	{
 	  $v_block = null;
-	  if (is_resource($this->_file)) {
+	  if(is_resource($this->_file)) {
 			  $v_block = @fread($this->_file, 512);
 	  }
 	  return $v_block;
@@ -228,8 +228,8 @@ 
 
 	private function _jumpBlock($p_len = null)
 	{
-	  if (is_resource($this->_file)) {
-		  if ($p_len === null)
+	  if(is_resource($this->_file)) {
+		  if($p_len === null)
 			  $p_len = 1;
 
 			  @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
@@ -239,12 +239,12 @@ 
 
 	private function _readHeader($v_binary_data, &$v_header)
 	{
-		if (strlen($v_binary_data) == 0) {
+		if(strlen($v_binary_data) == 0) {
 			$v_header['filename'] = '';
 			return true;
 		}
 
-		if (strlen($v_binary_data) != 512) {
+		if(strlen($v_binary_data) != 512) {
 			$v_header['filename'] = '';
 			$this->_error('Invalid block size : ' . strlen($v_binary_data));
 			return false;
@@ -253,13 +253,13 @@ 
 		// ----- Calculate the checksum
 		$v_checksum = 0;
 		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++)
+		for($i = 0; $i < 148; $i++)
 			$v_checksum += ord(substr($v_binary_data, $i, 1));
 		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++)
+		for($i = 148; $i < 156; $i++)
 			$v_checksum += ord(' ');
 		// ..... Last part of the header
-		for ($i = 156; $i < 512; $i++)
+		for($i = 156; $i < 512; $i++)
 		   $v_checksum += ord(substr($v_binary_data, $i, 1));
 
 		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
@@ -269,11 +269,11 @@ 
 
 		// ----- Extract the checksum
 		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
-		if ($v_header['checksum'] != $v_checksum) {
+		if($v_header['checksum'] != $v_checksum) {
 			$v_header['filename'] = '';
 
 			// ----- Look for last block (empty block)
-			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+			if(($v_checksum == 256) && ($v_header['checksum'] == 0))
 				return true;
 
 			$this->_error('Invalid checksum for file "' . $v_data['filename']
@@ -289,7 +289,7 @@ 
 		$v_header['gid'] = OctDec(trim($v_data['gid']));
 		$v_header['size'] = OctDec(trim($v_data['size']));
 		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
-		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+		if(($v_header['typeflag'] = $v_data['typeflag']) == "5") {
 		  $v_header['size'] = 0;
 		}
 		return true;
@@ -299,11 +299,11 @@ 
 	{
 	  $v_filename = '';
 	  $n = floor($v_header['size'] / 512);
-	  for ($i = 0; $i < $n; $i++) {
+	  for($i = 0; $i < $n; $i++) {
 		$v_content = $this->_readBlock();
 		$v_filename .= $v_content;
 	  }
-	  if (($v_header['size'] % 512) != 0) {
+	  if(($v_header['size'] % 512) != 0) {
 		$v_content = $this->_readBlock();
 		$v_filename .= $v_content;
 	  }
@@ -311,7 +311,7 @@ 
 	  // ----- Read the next header
 	  $v_binary_data = $this->_readBlock();
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
+	  if(!$this->_readHeader($v_binary_data, $v_header))
 		return false;
 
 	  $v_header['filename'] = $v_filename;
@@ -328,18 +328,18 @@ 
 	$v_listing = false;
 
 	$p_path = $this->_translateWinPath($p_path, false);
-	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+	if($p_path == '' || (substr($p_path, 0, 1) != '/'
 		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
 	  $p_path = "./" . $p_path;
 	}
 	$p_remove_path = $this->_translateWinPath($p_remove_path);
 
 	// ----- Look for path to remove format (should end by /)
-	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
+	if(($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
 	  $p_remove_path .= '/';
 	$p_remove_path_size = strlen($p_remove_path);
 
-	switch ($p_mode) {
+	switch($p_mode) {
 	  case "complete" :
 		$v_extract_all = true;
 		$v_listing = false;
@@ -359,33 +359,33 @@ 
 
 	clearstatcache();
 
-	while (strlen($v_binary_data = $this->_readBlock()) != 0)
+	while(strlen($v_binary_data = $this->_readBlock()) != 0)
 	{
 	  $v_extract_file = false;
 	  $v_extraction_stopped = 0;
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
+	  if(!$this->_readHeader($v_binary_data, $v_header))
 		return false;
 
-	  if ($v_header['filename'] == '') {
+	  if($v_header['filename'] == '') {
 		continue;
 	  }
 
 	  // ----- Look for long filename
-	  if ($v_header['typeflag'] == 'L') {
-		if (!$this->_readLongHeader($v_header))
+	  if($v_header['typeflag'] == 'L') {
+		if(!$this->_readLongHeader($v_header))
 		  return false;
 	  }
 
-	  if ((!$v_extract_all) && (is_array($p_file_list))) {
+	  if((!$v_extract_all) && (is_array($p_file_list))) {
 		// ----- By default no unzip if the file is not found
 		$v_extract_file = false;
 
-		for ($i = 0; $i < count($p_file_list); $i++) {
+		for($i = 0; $i < count($p_file_list); $i++) {
 		  // ----- Look if it is a directory
-		  if (substr($p_file_list[$i], -1) == '/') {
+		  if(substr($p_file_list[$i], -1) == '/') {
 			// ----- Look if the directory is in the filename path
-			if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+			if((strlen($v_header['filename']) > strlen($p_file_list[$i]))
 				&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
 					== $p_file_list[$i])) {
 			  $v_extract_file = true;
@@ -394,7 +394,7 @@ 
 		  }
 
 		  // ----- It is a file, so compare the file names
-		  elseif ($p_file_list[$i] == $v_header['filename']) {
+		  elseif($p_file_list[$i] == $v_header['filename']) {
 			$v_extract_file = true;
 			break;
 		  }
@@ -404,58 +404,58 @@ 
 	  }
 
 	  // ----- Look if this file need to be extracted
-	  if (($v_extract_file) && (!$v_listing))
+	  if(($v_extract_file) && (!$v_listing))
 	  {
-		if (($p_remove_path != '')
+		if(($p_remove_path != '')
 			&& (substr($v_header['filename'], 0, $p_remove_path_size)
 				== $p_remove_path))
 		  $v_header['filename'] = substr($v_header['filename'],
 										 $p_remove_path_size);
-		if (($p_path != './') && ($p_path != '/')) {
-		  while (substr($p_path, -1) == '/')
+		if(($p_path != './') && ($p_path != '/')) {
+		  while(substr($p_path, -1) == '/')
 			$p_path = substr($p_path, 0, strlen($p_path) - 1);
 
-		  if (substr($v_header['filename'], 0, 1) == '/')
+		  if(substr($v_header['filename'], 0, 1) == '/')
 			  $v_header['filename'] = $p_path . $v_header['filename'];
 		  else
 			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
 		}
-		if (file_exists($v_header['filename'])) {
-		  if ((@is_dir($v_header['filename']))
+		if(file_exists($v_header['filename'])) {
+		  if((@is_dir($v_header['filename']))
 			  && ($v_header['typeflag'] == '')) {
 			$this->_error('File ' . $v_header['filename']
 						  . ' already exists as a directory');
 			return false;
 		  }
-		  if (($this->_isArchive($v_header['filename']))
+		  if(($this->_isArchive($v_header['filename']))
 			  && ($v_header['typeflag'] == "5")) {
 			$this->_error('Directory ' . $v_header['filename']
 						  . ' already exists as a file');
 			return false;
 		  }
-		  if (!is_writable($v_header['filename'])) {
+		  if(!is_writable($v_header['filename'])) {
 			$this->_error('File ' . $v_header['filename']
 						  . ' already exists and is write protected');
 			return false;
 		  }
-		  if (filemtime($v_header['filename']) > $v_header['mtime']) {
+		  if(filemtime($v_header['filename']) > $v_header['mtime']) {
 			// To be completed : An error or silent no replace ?
 		  }
 		}
 
 		// ----- Check the directory availability and create it if necessary
-		elseif (($v_result
+		elseif(($v_result
 				 = $this->_dirCheck(($v_header['typeflag'] == "5"
-									?$v_header['filename']
+									? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
 			$this->_error('Unable to create path for ' . $v_header['filename']);
 			return false;
 		}
 
-		if ($v_extract_file) {
-		  if ($v_header['typeflag'] == "5") {
-			if (!@file_exists($v_header['filename'])) {
-				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
+		if($v_extract_file) {
+		  if($v_header['typeflag'] == "5") {
+			if(!@file_exists($v_header['filename'])) {
+				if(!@mkdir($v_header['filename'], PRADO_CHMOD)) {
 					$this->_error('Unable to create directory {'
 								  . $v_header['filename'] . '}');
 					return false;
@@ -463,17 +463,17 @@ 
 				chmod($v_header['filename'], PRADO_CHMOD);
 			}
 		  } else {
-			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+			  if(($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
 				  $this->_error('Error while opening {' . $v_header['filename']
 								. '} in write binary mode');
 				  return false;
 			  } else {
 				  $n = floor($v_header['size'] / 512);
-				  for ($i = 0; $i < $n; $i++) {
+				  for($i = 0; $i < $n; $i++) {
 					  $v_content = $this->_readBlock();
 					  fwrite($v_dest_file, $v_content, 512);
 				  }
-			if (($v_header['size'] % 512) != 0) {
+			if(($v_header['size'] % 512) != 0) {
 			  $v_content = $this->_readBlock();
 			  fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
 			}
@@ -488,7 +488,7 @@ 
 
 		  // ----- Check the file size
 		  clearstatcache();
-		  if (filesize($v_header['filename']) != $v_header['size']) {
+		  if(filesize($v_header['filename']) != $v_header['size']) {
 			  $this->_error('Extracted file ' . $v_header['filename']
 							. ' does not have the correct file size \''
 							. filesize($v_header['filename'])
@@ -511,12 +511,12 @@ 
 		$v_end_of_file = @feof($this->_file);
 		*/
 
-	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+	  if($v_listing || $v_extract_file || $v_extraction_stopped) {
 		// ----- Log extracted files
-		if (($v_file_dir = dirname($v_header['filename']))
+		if(($v_file_dir = dirname($v_header['filename']))
 			== $v_header['filename'])
 		  $v_file_dir = '';
-		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
+		if((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
 		  $v_file_dir = '/';
 
 		$p_list_detail[$v_nb++] = $v_header;
@@ -536,17 +536,17 @@ 
 	 */
 	protected function _dirCheck($p_dir)
 	{
-		if ((@is_dir($p_dir)) || ($p_dir == ''))
+		if((@is_dir($p_dir)) || ($p_dir == ''))
 			return true;
 
 		$p_parent_dir = dirname($p_dir);
 
-		if (($p_parent_dir != $p_dir) &&
+		if(($p_parent_dir != $p_dir) &&
 			($p_parent_dir != '') &&
 			(!$this->_dirCheck($p_parent_dir)))
 			 return false;
 
-		if (!@mkdir($p_dir, PRADO_CHMOD)) {
+		if(!@mkdir($p_dir, PRADO_CHMOD)) {
 			$this->_error("Unable to create directory '$p_dir'");
 			return false;
 		}
@@ -557,14 +557,14 @@ 
 
 	protected function _translateWinPath($p_path, $p_remove_disk_letter = true)
 	{
-	  if (substr(PHP_OS, 0, 3) == 'WIN') {
+	  if(substr(PHP_OS, 0, 3) == 'WIN') {
 		  // ----- Look for potential disk letter
-		  if (($p_remove_disk_letter)
+		  if(($p_remove_disk_letter)
 			  && (($v_position = strpos($p_path, ':')) != false)) {
 			  $p_path = substr($p_path, $v_position + 1);
 		  }
 		  // ----- Change potential windows directory separator
-		  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+		  if((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
 			  $p_path = strtr($p_path, '\\', '/');
 		  }
 	  }

framework/Util/TDataFieldAccessor.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 					return $data[$field];
 
 				$tmp = $data;
-				foreach (explode(".", $field) as $f)
+				foreach(explode(".", $field) as $f)
 					$tmp = $tmp[$f];
 				return $tmp;
 			}
@@ -72,7 +72,7 @@ 
 				if(strpos($field, '.') === false)  // simple field
 				{
 					if(method_exists($data, 'get' . $field))
-						return call_user_func([$data,'get' . $field]);
+						return call_user_func([$data, 'get' . $field]);
 					else
 						return $data->{$field};
 				}
@@ -85,7 +85,7 @@ 
 				}
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}