pradosoft / prado

framework/Wsat/pages/layout/TWsatLayout.php

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 
 		private function validateSecurity()
 		{
-				if ($this->Session["wsat_password"] !== $this->getService()->getPassword())
+				if($this->Session["wsat_password"] !== $this->getService()->getPassword())
 				{
-						if (!$this->getPage() instanceof TWsatLogin)
+						if(!$this->getPage() instanceof TWsatLogin)
 						{
 								$url = $this->Service->constructUrl('TWsatLogin');
 								$this->Response->redirect($url);

framework/Wsat/pages/TWsatLogin.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 		public function login()
 		{
-				if ($this->IsValid)
+				if($this->IsValid)
 				{
 						$this->Session["wsat_password"] = $this->getService()->getPassword();
 						$url = $this->Service->constructUrl('TWsatHome');

framework/Wsat/TWsatService.php

Spacing +2 added lines, -2 removed lines

@@ -48,10 +48,10 @@
 
 		public function init($config)
 		{
-				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
+				if($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
 						throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
 
-				if (empty($this->_pass))
+				if(empty($this->_pass))
 						throw new TConfigurationException("You need to specify the Password attribute.");
 
 				$this->setDefaultPage("TWsatHome");

framework/Wsat/TWsatARGenerator.php

Braces +9 added lines, -5 removed lines

@@ -107,9 +107,11 @@ 
 								];
 								continue;
 						}
-						foreach ($fks as $fk_data)//1-M relationships
+						foreach ($fks as $fk_data) {
+							//1-M relationships
 						{
 								$owner_table = $fk_data["table"];
+						}
 								$slave_table = $table_name;
 								$fk_prop = key($fk_data["keys"]);
 
@@ -141,8 +143,9 @@ 
 				else
 				{
 						$properties = [];
-						foreach ($tableInfo->getColumns() as $field => $metadata)
-								$properties[] = $this->generateProperty($field, $metadata);
+						foreach ($tableInfo->getColumns() as $field => $metadata) {
+														$properties[] = $this->generateProperty($field, $metadata);
+						}
 						$toString = $this->_buildSmartToString($tableInfo);
 				}
 
@@ -179,8 +182,9 @@ 
 						return "";
 
 				$code = "\tpublic static \$RELATIONS = array (";
-				foreach ($this->_relations[$tablename] as $rel_data)
-						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				foreach ($this->_relations[$tablename] as $rel_data) {
+										$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				}
 
 				$code = substr($code, 0, -1);
 				$code .= "\n\t);";

Spacing +13 added lines, -13 removed lines

@@ -65,13 +65,13 @@ 
 
 		public function generateAll()
 		{
-				foreach ($this->getAllTableNames() as $tableName)
+				foreach($this->getAllTableNames() as $tableName)
 				{
 						$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-						if (!empty($this->_relations))
+						if(!empty($this->_relations))
 						{
 								// Cancel generation of M-M relationships middle table
-								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+								if(count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
 										continue;
 						}
 						$this->_commonGenerate($tableName, $tableInfo);
@@ -81,13 +81,13 @@ 
 		public function buildRelations()
 		{
 				$this->_relations = [];
-				foreach ($this->getAllTableNames() as $table_name)
+				foreach($this->getAllTableNames() as $table_name)
 				{
 						$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
 						$pks = $tableInfo->getPrimaryKeys();
 						$fks = $tableInfo->getForeignKeys();
 
-						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						if(count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
 						{
 								$table_name_mm = $fks[0]["table"];
 								$table_name_mm2 = $fks[1]["table"];
@@ -107,7 +107,7 @@ 
 								];
 								continue;
 						}
-						foreach ($fks as $fk_data)//1-M relationships
+						foreach($fks as $fk_data)//1-M relationships
 						{
 								$owner_table = $fk_data["table"];
 								$slave_table = $table_name;
@@ -136,12 +136,12 @@ 
 
 		private function _commonGenerate($tableName, $tableInfo)
 		{
-				if (count($tableInfo->getColumns()) === 0)
+				if(count($tableInfo->getColumns()) === 0)
 						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
 				else
 				{
 						$properties = [];
-						foreach ($tableInfo->getColumns() as $field => $metadata)
+						foreach($tableInfo->getColumns() as $field => $metadata)
 								$properties[] = $this->generateProperty($field, $metadata);
 						$toString = $this->_buildSmartToString($tableInfo);
 				}
@@ -175,11 +175,11 @@ 
 
 		private function _renderRelations($tablename)
 		{
-				if (!isset($this->_relations[$tablename]))
+				if(!isset($this->_relations[$tablename]))
 						return "";
 
 				$code = "\tpublic static \$RELATIONS = array (";
-				foreach ($this->_relations[$tablename] as $rel_data)
+				foreach($this->_relations[$tablename] as $rel_data)
 						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
 
 				$code = substr($code, 0, -1);
@@ -193,11 +193,11 @@ 
 				$property = "throw new THttpException(500, 'Not implemented yet.');";
 				try
 				{
-						foreach ($tableInfo->getColumns() as $column)
+						foreach($tableInfo->getColumns() as $column)
 						{
-								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
+								if(isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
 										$property = str_replace($this->uqChars, "", $column->ColumnName);
-								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								elseif($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
 								{
 										$property = str_replace($this->uqChars, "", $column->ColumnName);
 										break;

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -238,7 +238,7 @@
 
 $toString
 }
-EOD;
+eod;
 		}
 
 // </editor-fold>

framework/IO/TTarFileExtractor.php

Braces +15 added lines, -10 removed lines

@@ -157,8 +157,9 @@ 
 				$this->_temp_tarname = '';
 				return false;
 			  }
-			  while ($v_data = @fread($v_file_from, 1024))
-				  @fwrite($v_file_to, $v_data);
+			  while ($v_data = @fread($v_file_from, 1024)) {
+			  				  @fwrite($v_file_to, $v_data);
+			  }
 			  @fclose($v_file_from);
 			  @fclose($v_file_to);
 		  }
@@ -253,14 +254,17 @@ 
 		// ----- Calculate the checksum
 		$v_checksum = 0;
 		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++)
-			$v_checksum += ord(substr($v_binary_data, $i, 1));
+		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++)
-			$v_checksum += ord(' ');
+		for ($i = 148; $i < 156; $i++) {
+					$v_checksum += ord(' ');
+		}
 		// ..... Last part of the header
-		for ($i = 156; $i < 512; $i++)
-		   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		for ($i = 156; $i < 512; $i++) {
+				   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		}
 
 		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 						 . "a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -412,8 +416,9 @@ 
 		  $v_header['filename'] = substr($v_header['filename'],
 										 $p_remove_path_size);
 		if (($p_path != './') && ($p_path != '/')) {
-		  while (substr($p_path, -1) == '/')
-			$p_path = substr($p_path, 0, strlen($p_path) - 1);
+		  while (substr($p_path, -1) == '/') {
+		  			$p_path = substr($p_path, 0, strlen($p_path) - 1);
+		  }
 
 		  if (substr($v_header['filename'], 0, 1) == '/')
 			  $v_header['filename'] = $p_path . $v_header['filename'];

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/TBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 	{
 		$this->_owner = $owner;
 		foreach($this->events() as $event => $handler)
-			$owner->attachEventHandler($event, [$this,$handler]);
+			$owner->attachEventHandler($event, [$this, $handler]);
 	}
 
 	/**
@@ -58,7 +58,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event => $handler)
-			$owner->detachEventHandler($event, [$this,$handler]);
+			$owner->detachEventHandler($event, [$this, $handler]);
 		$this->_owner = null;
 	}
 

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
 	public function attach($owner)
 	{
 		$this->_owner = $owner;
-		foreach($this->events() as $event => $handler)
-			$owner->attachEventHandler($event, [$this,$handler]);
+		foreach($this->events() as $event => $handler) {
+					$owner->attachEventHandler($event, [$this,$handler]);
+		}
 	}
 
 	/**
@@ -57,8 +58,9 @@ 
 	 */
 	public function detach($owner)
 	{
-		foreach($this->events() as $event => $handler)
-			$owner->detachEventHandler($event, [$this,$handler]);
+		foreach($this->events() as $event => $handler) {
+					$owner->detachEventHandler($event, [$this,$handler]);
+		}
 		$this->_owner = null;
 	}
 

framework/Util/TCallChain.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function addCall($method, $args)
 	{
-		$this->add([$method,$args]);
+		$this->add([$method, $args]);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	{
 		$args = func_get_args();
 		if($this->getCount() === 0)
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 
 		if(!$this->_iterator)
 		{
@@ -144,7 +144,7 @@ 
 	public function __dycall($method, $args)
 	{
 		if($this->_method == $method)
-			return call_user_func_array([$this,'call'], $args);
+			return call_user_func_array([$this, 'call'], $args);
 		return null;
 	}
 }
\ No newline at end of file

framework/Util/TLogRouter.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
 				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
-		$this->getApplication()->attachEventHandler('OnEndRequest', [$this,'collectLogs']);
+		$this->getApplication()->attachEventHandler('OnEndRequest', [$this, 'collectLogs']);
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 			{
 				foreach($config['routes'] as $route)
 				{
-					$properties = isset($route['properties'])?$route['properties']:[];
+					$properties = isset($route['properties']) ? $route['properties'] : [];
 					if(!isset($route['class']))
 						throw new TConfigurationException('logrouter_routeclass_required');
 					$route = Prado::createComponent($route['class']);

Braces +12 added lines, -12 removed lines

@@ -72,15 +72,13 @@ 
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
-				}
-				else
+				} else
 				{
 					$dom = new TXmlDocument;
 					$dom->loadFromFile($this->_configFile);
 					$this->loadConfig($dom);
 				}
-			}
-			else
+			} else
 				throw new TConfigurationException('logrouter_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -106,14 +104,14 @@ 
 					$route = Prado::createComponent($route['class']);
 					if(!($route instanceof TLogRoute))
 						throw new TConfigurationException('logrouter_routetype_invalid');
-					foreach($properties as $name => $value)
-						$route->setSubproperty($name, $value);
+					foreach($properties as $name => $value) {
+											$route->setSubproperty($name, $value);
+					}
 					$this->_routes[] = $route;
 					$route->init($route);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('route') as $routeConfig)
 			{
@@ -123,8 +121,9 @@ 
 				$route = Prado::createComponent($class);
 				if(!($route instanceof TLogRoute))
 					throw new TConfigurationException('logrouter_routetype_invalid');
-				foreach($properties as $name => $value)
-					$route->setSubproperty($name, $value);
+				foreach($properties as $name => $value) {
+									$route->setSubproperty($name, $value);
+				}
 				$this->_routes[] = $route;
 				$route->init($routeConfig);
 			}
@@ -172,7 +171,8 @@ 
 	public function collectLogs($param)
 	{
 		$logger = Prado::getLogger();
-		foreach($this->_routes as $route)
-			$route->collectLogs($logger);
+		foreach($this->_routes as $route) {
+					$route->collectLogs($logger);
+		}
 	}
 }
\ No newline at end of file

framework/Util/TDataFieldAccessor.php

Braces +9 added lines, -10 removed lines

@@ -63,11 +63,11 @@ 
 					return $data[$field];
 
 				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-					$tmp = $tmp[$f];
+				foreach (explode(".", $field) as $f) {
+									$tmp = $tmp[$f];
+				}
 				return $tmp;
-			}
-			elseif(is_object($data))
+			} elseif(is_object($data))
 			{
 				if(strpos($field, '.') === false)  // simple field
 				{
@@ -75,17 +75,16 @@ 
 						return call_user_func([$data,'get' . $field]);
 					else
 						return $data->{$field};
-				}
-				else // field in the format of xxx.yyy.zzz
+				} else // field in the format of xxx.yyy.zzz
 				{
 					$object = $data;
-					foreach(explode('.', $field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f) {
+											$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					}
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}

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());
 		}