pradosoft / prado

framework/Web/UI/WebControls/TBaseValidator.php

Braces +2 added lines, -4 removed lines

@@ -518,16 +518,14 @@
 				{
 					$this->setIsValid(true);
 					$this->onValidationSuccess();
-				}
-				else
+				} else
 				{
 					if($target)
 						$target->setIsValid(false);
 					$this->setIsValid(false);
 					$this->onValidationError();
 				}
-			}
-			else
+			} else
 			{
 				$this->evaluateIsValid();
 				$this->setIsValid(true);

framework/Web/UI/TTemplateControl.php

Braces +6 added lines, -12 removed lines

@@ -69,8 +69,7 @@ 
 			if(!isset(self::$_template[$class]))
 				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
-		}
-		else
+		} else
 			return $this->_localTemplate;
 	}
 
@@ -205,8 +204,7 @@ 
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc,$content);
-		}
-		else
+		} else
 			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
 	}
 
@@ -232,8 +230,7 @@ 
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
 				$master->injectContent($id,$content);
-		}
-		else if(!empty($this->_contents))
+		} else if(!empty($this->_contents))
 			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
 		parent::initRecursive($namingContainer);
 	}
@@ -261,8 +258,7 @@ 
                                                 $control->Checked = (boolean) $arObj->{$key};
                                         elseif ($control instanceof TDatePicker)
                                                 $control->Date = $arObj->{$key};
-                                }
-                                else
+                                } else
                                 {
                                         foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
@@ -284,8 +280,7 @@ 
                                         }
                                         break;
                                 }
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;
@@ -315,8 +310,7 @@ 
                                         $arObj->{$key} = $control->Checked;
                                 elseif ($control instanceof TDatePicker)
                                         $arObj->{$key} = $control->Date;
-                        } 
-                        catch (Exception $ex)
+                        } catch (Exception $ex)
                         {
                                 if ($throwExceptions)
                                         throw $ex;

framework/Util/TDataFieldAccessor.php

Braces +3 added lines, -6 removed lines

@@ -61,8 +61,7 @@ 
 				foreach (explode(".", $field) as $f)
 				    $tmp = $tmp[$f];
 				return $tmp;
-			}
-			else if(is_object($data))
+			} else if(is_object($data))
 			{
 				if(strpos($field,'.')===false)  // simple field
 				{
@@ -70,8 +69,7 @@ 
 						return call_user_func(array($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)
@@ -79,8 +77,7 @@ 
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
 		}

framework/Util/TParameterModule.php

Braces +6 added lines, -12 removed lines

@@ -71,14 +71,12 @@ 
 					$configFile->loadFromFile($this->_paramFile);
 					$cache->set($cacheKey,$configFile,0,new TFileCacheDependency($this->_paramFile));
 				}
-			}
-			else
+			} else
 			{
 				if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 				{
 					$configFile = include $this->_paramFile;
-				}
-				else
+				} else
 				{
 					$configFile=new TXmlDocument;
 					$configFile->loadFromFile($this->_paramFile);
@@ -105,14 +103,12 @@ 
 				{
 					$properties = isset($parameter['properties'])?$parameter['properties']:array();
 					$parameters[$id]=array($parameter['class'],$properties);
-				}
-				else
+				} else
 				{
 					$parameters[$id] = $parameter;
 				}
 			}
-		}
-		else if($config instanceof TXmlElement)
+		} else if($config instanceof TXmlElement)
 		{
 			foreach($config->getElementsByTagName('parameter') as $node)
 			{
@@ -125,8 +121,7 @@ 
 						$parameters[$id]=$node;
 					else
 						$parameters[$id]=$value;
-				}
-				else
+				} else
 					$parameters[$id]=array($type,$properties->toArray());
 			}
 		}
@@ -140,8 +135,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$appParams->add($id,$component);
-			}
-			else
+			} else
 				$appParams->add($id,$parameter);
 		}
 	}

framework/IO/TTarFileExtractor.php

Braces +6 added lines, -4 removed lines

@@ -155,8 +155,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);
           }
@@ -410,8 +411,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'];

framework/Data/Common/Oracle/TOracleMetaData.php

Braces +3 added lines, -6 removed lines

@@ -203,11 +203,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
@@ -349,8 +347,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql=<<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects

framework/Data/Common/Mysql/TMysqlMetaData.php

Braces +2 added lines, -4 removed lines

@@ -154,8 +154,7 @@ 
 					$info['NumericPrecision'] = intval($pscale[1]);
 					if(count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
-				}
-				else
+				} else
 					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
@@ -254,8 +253,7 @@ 
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName===null?$tableName:$schemaName.'.'.$tableName;
 			throw new TDbException('dbcommon_invalid_table_name',$table,$e->getMessage());

framework/Data/ActiveRecord/TActiveRecord.php

Braces +7 added lines, -14 removed lines

@@ -425,14 +425,12 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		else if($this->_recordState===self::STATE_LOADED)
+		} else if($this->_recordState===self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
 			if($param->getIsValid() && $gateway->update($this))
 				return true;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -455,8 +453,7 @@ 
 				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -723,8 +720,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -743,8 +739,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this,$property,$relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -827,8 +822,7 @@ 
 		{
 			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
 			return $this->getRelationHandler($property, $args);
-		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
+		} else if($findOne=strncasecmp($method,'findby',6)===0)
 			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
 		else if(strncasecmp($method,'findallby',9)===0)
 			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
@@ -894,8 +888,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();

framework/Data/TDbCommand.php

Braces +6 added lines, -12 removed lines

@@ -109,8 +109,7 @@ 
 			try
 			{
 				$this->_statement=$this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed',$e->getMessage(),$this->getText());
 			}
@@ -186,11 +185,9 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
-			}
-			else
+			} else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -223,8 +220,7 @@ 
 			else
 				$this->_statement=$this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -250,8 +246,7 @@ 
 			$result=$this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}
@@ -279,8 +274,7 @@ 
 				return stream_get_contents($result);
 			else
 				return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed',$e->getMessage(),$this->getDebugStatementText());
 		}