pradosoft / prado

framework/Data/Common/Sqlite/TSqliteMetaData.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
-			}
-			else
+			} else
 				$info['ColumnSize']=intval($match[1]);
 			$info['DbType'] = substr($type,0,$pos);
 		}

framework/Util/TSimpleDateFormatter.php

Braces +4 added lines, -8 removed lines

@@ -225,8 +225,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -262,8 +261,7 @@ 
 						$year = $iYear + 2000;
 				}
 				$year = (int)$year;
-			}
-			elseif($token=='MM' || $token=='M')
+			} elseif($token=='MM' || $token=='M')
 			{
 				$month=$this->getInteger($value,$i_val,
 									$this->length($token),2);
@@ -273,8 +271,7 @@ 
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token=='dd' || $token=='d')
+			} elseif ($token=='dd' || $token=='d')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
@@ -284,8 +281,7 @@ 
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
 				if($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -310,8 +309,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -322,8 +320,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user=Prado::createComponent($this->_userClass,$this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 

framework/I18N/core/DateFormat.php

Braces +4 added lines, -8 removed lines

@@ -134,12 +134,10 @@ 
 			{
 				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
 				$tokens[$i] =  str_replace('``````','\'',$sub);
-			}
-			else if($pattern == '``````')
+			} else if($pattern == '``````')
 			{
 				$tokens[$i] = '\'';
-			}
-			else
+			} else
 			{
 				$function = $this->getFunctionName($pattern);
 				if($function != null)
@@ -149,8 +147,7 @@ 
 					{
 						$rs = $this->$fName($date, $pattern);
 						$tokens[$i] = $rs;
-					}
-					else
+					} else
 						throw new
 						Exception('function '.$function.' not found.');
 				}
@@ -285,8 +282,7 @@ 
 			if($char==null || $pattern{$i} == $char || $text)
 			{
 				$token .= $pattern{$i};
-			}
-			else
+			} else
 			{
 				$tokens[] = str_replace("","'",$token);
 				$token = $pattern{$i};

framework/I18N/core/DateTimeFormatInfo.php

Braces +1 added lines, -2 removed lines

@@ -175,8 +175,7 @@
        	{
        		$cultureInfo = CultureInfo::getInstance($culture);
        		return $cultureInfo->getDateTimeFormat();
-       	}
-       	else
+       	} else
        	{
 			$cultureInfo = CultureInfo::getInvariantCulture();
             return $cultureInfo->getDateTimeFormat();

framework/I18N/core/NumberFormatInfo.php

Braces +3 added lines, -6 removed lines

@@ -184,15 +184,13 @@ 
             $formatInfo = $culture->NumberFormat;
             $formatInfo->setPattern($type);
             return $formatInfo;
-   		}
-       	else if(is_string($culture))
+   		} else if(is_string($culture))
        	{
        		$cultureInfo = new CultureInfo($culture);
        		$formatInfo = $cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
-       	}
-       	else
+       	} else
        	{
             $cultureInfo = new CultureInfo();
        		$formatInfo = $cultureInfo->NumberFormat;
@@ -292,8 +290,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1-1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.

framework/I18N/core/NumberFormat.php

Braces +7 added lines, -14 removed lines

@@ -203,16 +203,14 @@ 
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else if($multiGroup && $count >= 1)
+				} else if($multiGroup && $count >= 1)
 				{
 					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else
+				} else
 				{
 					if($i != 0 && $i%$groupSize[0] == 0)
 					{
@@ -223,8 +221,7 @@ 
 
 				$integer = $char . $integer;
 			}
-		}
-		else
+		} else
 			$integer = $string;
 
 		return $integer;
@@ -250,27 +247,23 @@ 
 			if($decimalDigits == -1)
 			{
 				$decimal = substr($string, $dp+1);
-			}
-			else if(is_int($decimalDigits))
+			} else if(is_int($decimalDigits))
 			{
 				$float = round((float)$string, $decimalDigits);
 				if(strpos((string)$float, '.') === false)
 				{
 					$decimal = str_pad($decimal,$decimalDigits,'0');
-				}
-				else
+				} else
 				{
 					$decimal = substr($float, strpos($float,'.')+1);
 					if(strlen($decimal)<$decimalDigits)
 						$decimal = str_pad($decimal,$decimalDigits,'0');
 				}
-			}
-			else
+			} else
 				return $decimal;
 
 			return $decimalSeparator.$decimal;
-		}
-		else if ($decimalDigits > 0)
+		} else if ($decimalDigits > 0)
 			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
 
 		return $decimal;

framework/I18N/core/HTTPNegotiator.php

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
                     // i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
-				}
-				else
+				} else
 				{
 					for($i = 0, $k = count($codes); $i<$k; ++$i)
 					{