pradosoft / prado

framework/I18N/TChoiceFormat.php

Indentation +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
  */
 
  /**
- * Get the ChoiceFormat class.
- */
+  * Get the ChoiceFormat class.
+  */
 Prado::using('System.I18N.core.ChoiceFormat');
 Prado::using('System.I18N.TTranslate');
 

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -99,10 +99,10 @@ 
 	 */
 	protected function translateText($text, $subs)
 	{
-		$text = parent::translateText($text, $subs);
-		$choice = new ChoiceFormat();
-		$value = $this->getValue();
-		$string = $choice->format($text, $value);
+		$text=parent::translateText($text, $subs);
+		$choice=new ChoiceFormat();
+		$value=$this->getValue();
+		$string=$choice->format($text, $value);
 		if($string)
 			return strtr($string, array('{Value}'=> $value));
 	}

framework/I18N/core/DateFormat.php

Indentation +20 added lines, -20 removed lines

@@ -79,7 +79,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -308,8 +308,8 @@ 
 
 	/**
 	 * Get the year.
- 	 * "yy" will return the last two digits of year.
- 	 * "yyyy" will return the full integer year.
+	 * "yy" will return the last two digits of year.
+	 * "yyyy" will return the full integer year.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string year
@@ -330,10 +330,10 @@ 
 
 	/**
 	 * Get the month.
- 	 * "M" will return integer 1 through 12
- 	 * "MM" will return the narrow month name, e.g. "J"
- 	 * "MMM" will return the abrreviated month name, e.g. "Jan"
- 	 * "MMMM" will return the month name, e.g. "January"
+	 * "M" will return integer 1 through 12
+	 * "MM" will return the narrow month name, e.g. "J"
+	 * "MMM" will return the abrreviated month name, e.g. "Jan"
+	 * "MMMM" will return the month name, e.g. "January"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string month name
@@ -361,10 +361,10 @@ 
 
 	/**
 	 * Get the day of the week.
- 	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
- 	 * "EE" will return the narrow day of the week, e.g. "M"
- 	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
- 	 * "EEEE" will return the day of the week, e.g. "Monday"
+	 * "E" will return integer 0 (for Sunday) through 6 (for Saturday).
+	 * "EE" will return the narrow day of the week, e.g. "M"
+	 * "EEE" will return the abrreviated day of the week, e.g. "Mon"
+	 * "EEEE" will return the day of the week, e.g. "Monday"
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the week.
@@ -394,7 +394,7 @@ 
 
 	/**
 	 * Get the day of the month.
- 	 * "d" for non-padding, "dd" will always return 2 characters.
+	 * "d" for non-padding, "dd" will always return 2 characters.
 	 * @param array getdate format.
 	 * @param string a pattern.
 	 * @return string day of the month
@@ -581,14 +581,14 @@ 
 	protected function getDayInMonth($date, $pattern='FF')
 	{
 		switch ($pattern) {
-		    case 'F':
-		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    case 'FF':
-		      return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
-		      break;
-		    default:
-		      throw new Exception('The pattern for day in month is "F" or "FF".');
+			case 'F':
+			  return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			case 'FF':
+			  return @date('d', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
+			  break;
+			default:
+			  throw new Exception('The pattern for day in month is "F" or "FF".');
 		}
 	}
 

Doc Comments +4 added lines

@@ -87,6 +87,7 @@ 
 	 * Initialize a new DateFormat.
 	 * @param mixed either, null, a CultureInfo instance,
 	 * a DateTimeFormatInfo instance, or a locale.
+	 * @param string $formatInfo
 	 * @return DateFormat instance
 	 */
 	function __construct($formatInfo=null)
@@ -106,6 +107,7 @@ 
 	/**
 	 * Format a date according to the pattern.
 	 * @param mixed the time as integer or string in strtotime format.
+	 * @param string $time
 	 * @return string formatted date time.
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
@@ -179,6 +181,7 @@ 
 	 * DateTimeFormatInfo::formatDateTime
 	 * See the tutorial documentation for futher details on the patterns.
 	 * @param mixed a pattern.
+	 * @param string $pattern
 	 * @return string a pattern.
 	 * @see DateTimeFormatInfo::formatDateTime()
 	 */
@@ -269,6 +272,7 @@ 
 	 * Any substrings, starting and ending with a single quote (')
 	 * will be treated as a single token.
 	 * @param string pattern.
+	 * @param string $pattern
 	 * @return array string tokens in an array.
 	 */
 	protected function getTokens($pattern)

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

Spacing +82 added lines, -82 removed lines

@@ -51,7 +51,7 @@ 
 	 * A list of tokens and their function call.
 	 * @var array
 	 */
-	protected $tokens = array(
+	protected $tokens=array(
 			'G'=>'Era',
 			'y'=>'Year',
 			'M'=>'Month',
@@ -75,7 +75,7 @@ 
 	 * A list of methods, to be used by the token function calls.
 	 * @var array
 	 */
-	protected $methods = array();
+	protected $methods=array();
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
@@ -91,16 +91,16 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = DateTimeFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=DateTimeFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->DateTimeFormat;
+			$this->formatInfo=$formatInfo->DateTimeFormat;
 		else if($formatInfo instanceof DateTimeFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo = DateTimeFormatInfo::getInstance($formatInfo);
+			$this->formatInfo=DateTimeFormatInfo::getInstance($formatInfo);
 
-		$this->methods = get_class_methods($this);
+		$this->methods=get_class_methods($this);
 	}
 
 	/**
@@ -110,45 +110,45 @@ 
 	 */
 	public function format($time, $pattern='F', $charset='UTF-8')
 	{
-		if (is_numeric($time)) //assumes unix epoch
-			$time = floatval($time);
+		if(is_numeric($time)) //assumes unix epoch
+			$time=floatval($time);
 		else if(is_string($time))
-			$time = @strtotime($time);
+			$time=@strtotime($time);
 
-		if($pattern === null)
-			$pattern = 'F';
+		if($pattern===null)
+			$pattern='F';
 
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 
-		$date = $s->getDate($time);
+		$date=$s->getDate($time);
 
-		$pattern = $this->getPattern($pattern);
+		$pattern=$this->getPattern($pattern);
 
-		$tokens = $this->getTokens($pattern);
+		$tokens=$this->getTokens($pattern);
 
-		for($i = 0, $k = count($tokens); $i<$k; ++$i)
+		for($i=0, $k=count($tokens); $i < $k; ++$i)
 		{
-			$pattern = $tokens[$i];
-			if($pattern{0} == "'"
-				&& $pattern{strlen($pattern)-1} == "'")
+			$pattern=$tokens[$i];
+			if($pattern{0}=="'"
+				&& $pattern{strlen($pattern) - 1}=="'")
 			{
-				$sub = preg_replace('/(^\')|(\'$)/','',$pattern);
-				$tokens[$i] =  str_replace('``````','\'',$sub);
+				$sub=preg_replace('/(^\')|(\'$)/', '', $pattern);
+				$tokens[$i]=str_replace('``````', '\'', $sub);
 			}
-			else if($pattern == '``````')
+			else if($pattern=='``````')
 			{
-				$tokens[$i] = '\'';
+				$tokens[$i]='\'';
 			}
 			else
 			{
-				$function = $this->getFunctionName($pattern);
-				if($function != null)
+				$function=$this->getFunctionName($pattern);
+				if($function!=null)
 				{
-					$fName = 'get'.$function;
+					$fName='get'.$function;
 					if(in_array($fName, $this->methods))
 					{
-						$rs = $this->$fName($date, $pattern);
-						$tokens[$i] = $rs;
+						$rs=$this->$fName($date, $pattern);
+						$tokens[$i]=$rs;
 					}
 					else
 						throw new
@@ -157,7 +157,7 @@ 
 			}			
 		}
 
-		return I18N_toEncoding(implode('',$tokens), $charset);
+		return I18N_toEncoding(implode('', $tokens), $charset);
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 	 */
 	protected function getPattern($pattern)
 	{
-		if(is_array($pattern) && count($pattern) == 2)
+		if(is_array($pattern) && count($pattern)==2)
 		{
 			return $this->formatInfo->formatDateTime(
 							$this->getPattern($pattern[0]),
@@ -273,36 +273,36 @@ 
 	 */
 	protected function getTokens($pattern)
 	{
-		$char = null;
-		$tokens = array();
-		$token = null;
+		$char=null;
+		$tokens=array();
+		$token=null;
 
-		$text = false;
-		$pattern = preg_replace("/''/", '``````', $pattern);
+		$text=false;
+		$pattern=preg_replace("/''/", '``````', $pattern);
 
-		for($i = 0; $i < strlen($pattern); $i++)
+		for($i=0; $i < strlen($pattern); $i++)
 		{
-			if($char==null || $pattern{$i} == $char || $text)
+			if($char==null || $pattern{$i}==$char || $text)
 			{
-				$token .= $pattern{$i};
+				$token.=$pattern{$i};
 			}
 			else
 			{
-				$tokens[] = str_replace("","'",$token);
-				$token = $pattern{$i};
+				$tokens[]=str_replace("", "'", $token);
+				$token=$pattern{$i};
 			}
 
-			if($pattern{$i} == "'" && $text == false)
-				$text = true;
-			else if($text && $pattern{$i} == "'" && $char == "'")
-				$text = true;
-			else if($text && $char != "'" && $pattern{$i} == "'")
-				$text = false;
+			if($pattern{$i}=="'" && $text==false)
+				$text=true;
+			else if($text && $pattern{$i}=="'" && $char=="'")
+				$text=true;
+			else if($text && $char!="'" && $pattern{$i}=="'")
+				$text=false;
 
-			$char = $pattern{$i};
+			$char=$pattern{$i};
 
 		}
-		$tokens[] = $token;
+		$tokens[]=$token;
 		return $tokens;
 	}
 
@@ -316,11 +316,11 @@ 
 	 */
 	protected function getYear($date, $pattern='yyyy')
 	{
-		$year = $date['year'];
+		$year=$date['year'];
 		switch($pattern)
 		{
 			case 'yy':
-				return substr($year,2);
+				return substr($year, 2);
 			case 'yyyy':
 				return $year;
 			default:
@@ -340,19 +340,19 @@ 
 	 */
 	protected function getMonth($date, $pattern='M')
 	{
-		$month = $date['mon'];
+		$month=$date['mon'];
 
 		switch($pattern)
 		{
 			case 'M':
 				return $month;
 			case 'MM':
-				return str_pad($month, 2,'0',STR_PAD_LEFT);
+				return str_pad($month, 2, '0', STR_PAD_LEFT);
 			case 'MMM':
-				return $this->formatInfo->AbbreviatedMonthNames[$month-1];
+				return $this->formatInfo->AbbreviatedMonthNames[$month - 1];
 				break;
 			case 'MMMM':
-				return $this->formatInfo->MonthNames[$month-1];
+				return $this->formatInfo->MonthNames[$month - 1];
 			default:
 				throw new Exception('The pattern for month '.
 						'is "M", "MM", "MMM", or "MMMM".');
@@ -371,7 +371,7 @@ 
 	 */
 	protected function getDayInWeek($date, $pattern='EEEE')
 	{
-		$day = $date['wday'];
+		$day=$date['wday'];
 
 		switch($pattern)
 		{
@@ -401,14 +401,14 @@ 
 	 */
 	protected function getDay($date, $pattern='d')
 	{
-		$day = $date['mday'];
+		$day=$date['mday'];
 
 		switch($pattern)
 		{
 			case 'd':
 				return $day;
 			case 'dd':
-				return str_pad($day, 2,'0',STR_PAD_LEFT);
+				return str_pad($day, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for day of '.
 						'the month is "d" or "dd".');
@@ -426,10 +426,10 @@ 
 	protected function getEra($date, $pattern='G')
 	{
 
-		if($pattern != 'G')
+		if($pattern!='G')
 			throw new Exception('The pattern for era is "G".');
 
-		$year = $date['year'];
+		$year=$date['year'];
 		if($year > 0)
 			return $this->formatInfo->getEra(1);
 		else
@@ -445,14 +445,14 @@ 
 	 */
 	protected function getHour24($date, $pattern='H')
 	{
-		$hour = $date['hours'];
+		$hour=$date['hours'];
 
 		switch($pattern)
 		{
 			case 'H':
 				return $hour;
 			case 'HH':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -467,11 +467,11 @@ 
 	 */
 	protected function getAMPM($date, $pattern='a')
 	{
-		if($pattern != 'a')
+		if($pattern!='a')
 			throw new Exception('The pattern for AM/PM marker is "a".');
 
-		$hour = $date['hours'];
-		$ampm = (int)($hour/12);
+		$hour=$date['hours'];
+		$ampm=(int) ($hour / 12);
 		return $this->formatInfo->AMPMMarkers[$ampm];
 	}
 
@@ -484,15 +484,15 @@ 
 	 */
 	protected function getHour12($date, $pattern='h')
 	{
-		$hour = $date['hours'];
-		$hour = ($hour==12|$hour==0)?12:($hour)%12;
+		$hour=$date['hours'];
+		$hour=($hour==12 | $hour==0) ? 12 : ($hour) % 12;
 
 		switch($pattern)
 		{
 			case 'h':
 				return $hour;
 			case 'hh':
-				return str_pad($hour, 2,'0',STR_PAD_LEFT);
+				return str_pad($hour, 2, '0', STR_PAD_LEFT);
 			default:
 				throw new Exception('The pattern for 24 hour '.
 						'format is "H" or "HH".');
@@ -508,14 +508,14 @@ 
 	 */
 	protected function getMinutes($date, $pattern='m')
 	{
-		$minutes = $date['minutes'];
+		$minutes=$date['minutes'];
 
 		switch($pattern)
 		{
 			case 'm':
 				return $minutes;
 			case 'mm':
-				return str_pad($minutes, 2,'0',STR_PAD_LEFT);
+				return str_pad($minutes, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for minutes is "m" or "mm".');
 		}
@@ -530,14 +530,14 @@ 
 	 */
 	protected function getSeconds($date, $pattern='s')
 	{
-		$seconds = $date['seconds'];
+		$seconds=$date['seconds'];
 
 		switch($pattern)
 		{
 			case 's':
 				return $seconds;
 			case 'ss':
-				return str_pad($seconds, 2,'0',STR_PAD_LEFT);
+				return str_pad($seconds, 2, '0', STR_PAD_LEFT);
 			default:
 			throw new Exception('The pattern for seconds is "s" or "ss".');
 		}
@@ -552,7 +552,7 @@ 
 	 */
 	protected function getTimeZone($date, $pattern='z')
 	{
-		if($pattern != 'z')
+		if($pattern!='z')
 			throw new Exception('The pattern for time zone is "z".');
 
 		return @date('T', @mktime($date['hours'], $date['minutes'], $date['seconds'], $date['mon'], $date['mday'], $date['year']));
@@ -566,7 +566,7 @@ 
 	 */
 	protected function getDayInYear($date, $pattern='D')
 	{
-		if($pattern != 'D')
+		if($pattern!='D')
 			throw new Exception('The pattern for day in year is "D".');
 
 		return $date['yday'];
@@ -580,7 +580,7 @@ 
 	 */
 	protected function getDayInMonth($date, $pattern='FF')
 	{
-		switch ($pattern) {
+		switch($pattern) {
 		    case 'F':
 		      return @date('j', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
 		      break;
@@ -600,7 +600,7 @@ 
 	 */
 	protected function getWeekInYear($date, $pattern='w')
 	{
-		if($pattern != 'w')
+		if($pattern!='w')
 			throw new Exception('The pattern for week in year is "w".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year']));
@@ -613,7 +613,7 @@ 
 	 */
 	protected function getWeekInMonth($date, $pattern='W')
 	{
-		if($pattern != 'W')
+		if($pattern!='W')
 			throw new Exception('The pattern for week in month is "W".');
 
 		return @date('W', @mktime(0, 0, 0, $date['mon'], $date['mday'], $date['year'])) - date('W', mktime(0, 0, 0, $date['mon'], 1, $date['year']));
@@ -627,10 +627,10 @@ 
 	 */
 	protected function getHourInDay($date, $pattern='k')
 	{
-		if($pattern != 'k')
+		if($pattern!='k')
 			throw new Exception('The pattern for hour in day is "k".');
 
-		return $date['hours']+1;
+		return $date['hours'] + 1;
 	}
 
 	/**
@@ -641,10 +641,10 @@ 
 	 */
 	protected function getHourInAMPM($date, $pattern='K')
 	{
-		if($pattern != 'K')
+		if($pattern!='K')
 			throw new Exception('The pattern for hour in AM/PM is "K".');
 
-		return ($date['hours']+1)%12;
+		return ($date['hours'] + 1) % 12;
 	}
 
 }

framework/I18N/core/NumberFormat.php

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

Doc Comments +4 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 	 * a CultureInfo or NumberFormatInfo instance will instantiated a instance
 	 * for that particular culture.
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
+	 * @param string $formatInfo
 	 * @return NumberFormat
 	 */
 	function __construct($formatInfo=null)
@@ -111,6 +112,7 @@ 
 	 * 3 decimal places.
 	 * @param string 3-letter ISO 4217 code. For example, the code
 	 * "USD" represents the US Dollar and "EUR" represents the Euro currency.
+	 * @param string $number
 	 * @return string formatted number string
 	 */
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
@@ -232,7 +234,7 @@ 
 
 	/**
 	 * Format the decimal places.
-	 * @param string the decimal number in string form.
+	 * @param string string decimal number in string form.
 	 * @return string formatted decimal places.
 	 */
 	protected function formatDecimal($string)
@@ -280,6 +282,7 @@ 
 	 * Set the pattern to format against. The default patterns
 	 * are retrieved from the NumberFormatInfo instance.
 	 * @param string the requested patterns.
+	 * @param string $pattern
 	 * @return string a number format pattern.
 	 */
 	protected function setPattern($pattern)

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;

Spacing +60 added lines, -60 removed lines

@@ -90,14 +90,14 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
+		if($formatInfo===null)
+			$this->formatInfo=NumberFormatInfo::getInvariantInfo();
 		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->NumberFormat;
+			$this->formatInfo=$formatInfo->NumberFormat;
 		else if($formatInfo instanceof NumberFormatInfo)
-			$this->formatInfo = $formatInfo;
+			$this->formatInfo=$formatInfo;
 		else
-			$this->formatInfo =
+			$this->formatInfo=
 				NumberFormatInfo::getInstance($formatInfo);
 	}
 
@@ -120,37 +120,37 @@ 
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
-			$number = $number * 100;
+		if(strtolower($pattern)=='p')
+			$number=$number * 100;
 
-		$string = (string)$number;
+		$string=(string) $number;
 
-		$decimal = $this->formatDecimal($string);
-		$integer = $this->formatInteger(abs($number));
+		$decimal=$this->formatDecimal($string);
+		$integer=$this->formatInteger(abs($number));
 
-		if(strlen($decimal)>0)
-			$result = $integer.$decimal;
+		if(strlen($decimal) > 0)
+			$result=$integer.$decimal;
 		else
-			$result = $integer;
+			$result=$integer;
 
 		//get the suffix
 		if($number >= 0)
-			$suffix = $this->formatInfo->PositivePattern;
+			$suffix=$this->formatInfo->PositivePattern;
 		else if($number < 0)
-			$suffix = $this->formatInfo->NegativePattern;
+			$suffix=$this->formatInfo->NegativePattern;
 		else
-			$suffix = array("","");
+			$suffix=array("", "");
 
 		//append and prepend suffix
-		$result = $suffix[0].$result.$suffix[1];
+		$result=$suffix[0].$result.$suffix[1];
 
 		//replace currency sign
-		$symbol = @$this->formatInfo->getCurrencySymbol($currency);
-		if($symbol === null) {
-			$symbol = $currency;
+		$symbol=@$this->formatInfo->getCurrencySymbol($currency);
+		if($symbol===null) {
+			$symbol=$currency;
 		}
 
-		$result = str_replace('¤',$symbol, $result);
+		$result=str_replace('¤', $symbol, $result);
 
 		setlocale(LC_NUMERIC, $oldLocale);
 
@@ -164,68 +164,68 @@ 
 	 */
 	protected function formatInteger($string)
 	{
-		$string = (string)$string;
+		$string=(string) $string;
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
 		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string),$decimalDigits);
-		$dp = strpos($string, '.');
+			$string=(string) round(floatval($string), $decimalDigits);
+		$dp=strpos($string, '.');
 		if(is_int($dp))
-			$string = substr($string, 0, $dp);
-		$integer = '';
+			$string=substr($string, 0, $dp);
+		$integer='';
 
-		$digitSize = $this->formatInfo->getDigitSize();
+		$digitSize=$this->formatInfo->getDigitSize();
 
-		$string = str_pad($string, $digitSize, '0',STR_PAD_LEFT);
+		$string=str_pad($string, $digitSize, '0', STR_PAD_LEFT);
 
-		$len = strlen($string);
+		$len=strlen($string);
 
-		$groupSeparator = $this->formatInfo->GroupSeparator;
-		$groupSize = $this->formatInfo->GroupSizes;
+		$groupSeparator=$this->formatInfo->GroupSeparator;
+		$groupSize=$this->formatInfo->GroupSizes;
 
 
-		$firstGroup = true;
-		$multiGroup = is_int($groupSize[1]);
-		$count = 0;
+		$firstGroup=true;
+		$multiGroup=is_int($groupSize[1]);
+		$count=0;
 
 		if(is_int($groupSize[0]))
 		{
 			//now for the integer groupings
-			for($i=0; $i<$len; $i++)
+			for($i=0; $i < $len; $i++)
 			{
-				$char = $string{$len-$i-1};
+				$char=$string{$len - $i - 1};
 
-				if($multiGroup && $count == 0)
+				if($multiGroup && $count==0)
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else if($multiGroup && $count >= 1)
 				{
-					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
+					if($i!=0 && ($i - $groupSize[0]) % $groupSize[1]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 				else
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if($i!=0 && $i % $groupSize[0]==0)
 					{
-						$integer = $groupSeparator . $integer;
+						$integer=$groupSeparator.$integer;
 						$count++;
 					}
 				}
 
-				$integer = $char . $integer;
+				$integer=$char.$integer;
 			}
 		}
 		else
-			$integer = $string;
+			$integer=$string;
 
 		return $integer;
 	}
@@ -237,32 +237,32 @@ 
 	 */
 	protected function formatDecimal($string)
 	{
-		$dp = strpos($string, '.');
-		$decimal = '';
+		$dp=strpos($string, '.');
+		$decimal='';
 
-		$decimalDigits = $this->formatInfo->DecimalDigits;
-		$decimalSeparator = $this->formatInfo->DecimalSeparator;
+		$decimalDigits=$this->formatInfo->DecimalDigits;
+		$decimalSeparator=$this->formatInfo->DecimalSeparator;
 
 		//do the correct rounding here
 		//$string = round(floatval($string), $decimalDigits);
 		if(is_int($dp))
 		{
-			if($decimalDigits == -1)
+			if($decimalDigits==-1)
 			{
-				$decimal = substr($string, $dp+1);
+				$decimal=substr($string, $dp + 1);
 			}
 			else if(is_int($decimalDigits))
 			{
-				$float = round((float)$string, $decimalDigits);
-				if(strpos((string)$float, '.') === false)
+				$float=round((float) $string, $decimalDigits);
+				if(strpos((string) $float, '.')===false)
 				{
-					$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 				else
 				{
-					$decimal = substr($float, strpos($float,'.')+1);
-					if(strlen($decimal)<$decimalDigits)
-						$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal=substr($float, strpos($float, '.') + 1);
+					if(strlen($decimal) < $decimalDigits)
+						$decimal=str_pad($decimal, $decimalDigits, '0');
 				}
 			}
 			else
@@ -270,8 +270,8 @@ 
 
 			return $decimalSeparator.$decimal;
 		}
-		else if ($decimalDigits > 0)
-			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
+		else if($decimalDigits > 0)
+			return $decimalSeparator.str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;
 	}

framework/I18N/core/HTTPNegotiator.php

Indentation +14 added lines, -14 removed lines

@@ -58,7 +58,7 @@ 
 		$this->languages = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
-            return $this->languages;
+			return $this->languages;
 
 		//$basedir = CultureInfo::dataDir();
 		//$ext = CultureInfo::fileExt();
@@ -66,18 +66,18 @@ 
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
-            // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+			// Cut off any q-value that might come after a semi-colon
+			if ($pos = strpos($lang, ';'))
+				$lang = trim(substr($lang, 0, $pos));
 
 			if (strstr($lang, '-'))
 			{
 				$codes = explode('-',$lang);
 				if($codes[0] == 'i')
 				{
-                    // Language not listed in ISO 639 that are not variants
-                    // of any listed language, which can be registerd with the
-                    // i-prefix, such as i-cherokee
+					// Language not listed in ISO 639 that are not variants
+					// of any listed language, which can be registerd with the
+					// i-prefix, such as i-cherokee
 					if(count($codes)>1)
 						$lang = $codes[1];
 				}
@@ -91,13 +91,13 @@ 
 							$lang .= '_'.strtoupper($codes[$i]);
 					}
 				}
-            }
+			}
 
 
 
 			if($info->validCulture($lang))
 				$this->languages[] = $lang;
-        }
+		}
 
 		return $this->languages;
 	}
@@ -108,20 +108,20 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+		if($this->charsets !== null) {
 			return $this->charsets;
 		}
 
 		$this->charsets = array();
 
 		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
-            return $this->charsets;
+			return $this->charsets;
 
 		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
-        }
+			if (!empty($charset))
+				$this->charsets[] = preg_replace('/;.*/', '', $charset);
+		}
 
 		return $this->charsets;
 	}

Spacing +22 added lines, -22 removed lines

@@ -51,44 +51,44 @@ 
 	 */
 	function getLanguages()
 	{
-		if($this->languages !== null) {
+		if($this->languages!==null) {
 			return $this->languages;
 		}
 
-		$this->languages = array();
+		$this->languages=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
             return $this->languages;
 
 		//$basedir = CultureInfo::dataDir();
 		//$ext = CultureInfo::fileExt();
-		$info = new CultureInfo();
+		$info=new CultureInfo();
 
 		foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang)
 		{
             // Cut off any q-value that might come after a semi-colon
-            if ($pos = strpos($lang, ';'))
-                $lang = trim(substr($lang, 0, $pos));
+            if($pos=strpos($lang, ';'))
+                $lang=trim(substr($lang, 0, $pos));
 
-			if (strstr($lang, '-'))
+			if(strstr($lang, '-'))
 			{
-				$codes = explode('-',$lang);
-				if($codes[0] == 'i')
+				$codes=explode('-', $lang);
+				if($codes[0]=='i')
 				{
                     // Language not listed in ISO 639 that are not variants
                     // of any listed language, which can be registerd with the
                     // i-prefix, such as i-cherokee
-					if(count($codes)>1)
-						$lang = $codes[1];
+					if(count($codes) > 1)
+						$lang=$codes[1];
 				}
 				else
 				{
-					for($i = 0, $k = count($codes); $i<$k; ++$i)
+					for($i=0, $k=count($codes); $i < $k; ++$i)
 					{
-						if($i == 0)
-							$lang = strtolower($codes[0]);
+						if($i==0)
+							$lang=strtolower($codes[0]);
 						else
-							$lang .= '_'.strtoupper($codes[$i]);
+							$lang.='_'.strtoupper($codes[$i]);
 					}
 				}
             }
@@ -96,7 +96,7 @@ 
 
 
 			if($info->validCulture($lang))
-				$this->languages[] = $lang;
+				$this->languages[]=$lang;
         }
 
 		return $this->languages;
@@ -108,19 +108,19 @@ 
 	 */
 	function getCharsets()
 	{
-        if($this->charsets !== null) {
+        if($this->charsets!==null) {
 			return $this->charsets;
 		}
 
-		$this->charsets = array();
+		$this->charsets=array();
 
-		if (!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
+		if(!isset($_SERVER['HTTP_ACCEPT_CHARSET']))
             return $this->charsets;
 
-		foreach (explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
+		foreach(explode(',', $_SERVER['HTTP_ACCEPT_CHARSET']) as $charset)
 		{
-            if (!empty($charset))
-                $this->charsets[] = preg_replace('/;.*/', '', $charset);
+            if(!empty($charset))
+                $this->charsets[]=preg_replace('/;.*/', '', $charset);
         }
 
 		return $this->charsets;

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

framework/I18N/core/MessageSource_MySQL.php

Indentation +36 added lines, -36 removed lines

@@ -92,43 +92,43 @@
 		*/
 		$dsninfo = $this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
-        else
-        {
+	 	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
+			$dbhost = ':' . $dsninfo['socket'];
+		else
+		{
 			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
-        }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
-
-        $connect_function = 'mysql_connect';
-
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
-        else
-            $conn = false;
-
-        if (empty($conn))
-        {
-        	throw new Exception('Error in connecting to '.$dsninfo);
-        }
-
-        if ($dsninfo['database'])
-        {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
-        							$dsninfo);
-        }
-        else
-        	throw new Exception('Please provide a database for message'.
-        						' translation.');
-       return $conn;
+			if (!empty($dsninfo['port']))
+				$dbhost .= ':' . $dsninfo['port'];
+		}
+		$user = $dsninfo['username'];
+		$pw = $dsninfo['password'];
+
+		$connect_function = 'mysql_connect';
+
+		if ($dbhost && $user && $pw)
+			$conn = @$connect_function($dbhost, $user, $pw);
+		elseif ($dbhost && $user)
+			$conn = @$connect_function($dbhost, $user);
+		elseif ($dbhost)
+			$conn = @$connect_function($dbhost);
+		else
+			$conn = false;
+
+		if (empty($conn))
+		{
+			throw new Exception('Error in connecting to '.$dsninfo);
+		}
+
+		if ($dsninfo['database'])
+		{
+			if (!@mysql_select_db($dsninfo['database'], $conn))
+				throw new Exception('Error in connecting database, dns:'.
+									$dsninfo);
+		}
+		else
+			throw new Exception('Please provide a database for message'.
+								' translation.');
+	   return $conn;
 	}
 
 	/**

Doc Comments +3 added lines, -1 removed lines

@@ -271,7 +271,9 @@
 
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise.
+	 * @param integer $cat_id
+	 * @param string $variant
+	 * @return resource true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         	if (!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
+        } else
         	throw new Exception('Please provide a database for message'.
         						' translation.');
        return $conn;

Spacing +85 added lines, -85 removed lines

@@ -65,9 +65,9 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
-		$this->dns = parseDSN($this->source);
-		$this->db = $this->connect();
+		$this->source=(string) $source;
+		$this->dns=parseDSN($this->source);
+		$this->db=$this->connect();
 	}
 
 	/**
@@ -90,38 +90,38 @@ 
 		if($conn!==null)
 			return $conn;
 		*/
-		$dsninfo = $this->dns;
+		$dsninfo=$this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
+     	if(isset($dsninfo['protocol']) && $dsninfo['protocol']=='unix')
+            $dbhost=':'.$dsninfo['socket'];
         else
         {
-			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
+			$dbhost=$dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
+            if(!empty($dsninfo['port']))
+                $dbhost.=':'.$dsninfo['port'];
         }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
+        $user=$dsninfo['username'];
+        $pw=$dsninfo['password'];
 
-        $connect_function = 'mysql_connect';
+        $connect_function='mysql_connect';
 
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
+        if($dbhost && $user && $pw)
+            $conn=@$connect_function($dbhost, $user, $pw);
+        elseif($dbhost && $user)
+            $conn=@$connect_function($dbhost, $user);
+        elseif($dbhost)
+            $conn=@$connect_function($dbhost);
         else
-            $conn = false;
+            $conn=false;
 
-        if (empty($conn))
+        if(empty($conn))
         {
         	throw new Exception('Error in connecting to '.$dsninfo);
         }
 
-        if ($dsninfo['database'])
+        if($dsninfo['database'])
         {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
+        	if(!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
         }
@@ -148,25 +148,25 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$variant = mysql_real_escape_string($variant);
+		$variant=mysql_real_escape_string($variant);
 
-		$statement =
+		$statement=
 			"SELECT t.id, t.source, t.target, t.comments
 				FROM trans_unit t, catalogue c
  				WHERE c.cat_id =  t.cat_id
 					AND c.name = '{$variant}'
 				ORDER BY id ASC";
 
-		$rs = mysql_query($statement,$this->db);
+		$rs=mysql_query($statement, $this->db);
 
-		$result = array();
+		$result=array();
 
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		while($row=mysql_fetch_array($rs, MYSQL_NUM))
 		{
-			$source = $row[1];
-			$result[$source][] = $row[2]; //target
-			$result[$source][] = $row[0]; //id
-			$result[$source][] = $row[3]; //comments
+			$source=$row[1];
+			$result[$source][]=$row[2]; //target
+			$result[$source][]=$row[0]; //id
+			$result[$source][]=$row[3]; //comments
 		}
 
 		return $result;
@@ -180,13 +180,13 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		$source = mysql_real_escape_string($source);
+		$source=mysql_real_escape_string($source);
 
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$this->db);
 
-		$result = $rs ? (int)mysql_result($rs,0) : 0;
+		$result=$rs ? (int) mysql_result($rs, 0) : 0;
 
 		return $result;
 	}
@@ -199,15 +199,15 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$variant = mysql_real_escape_string ($variant);
+		$variant=mysql_real_escape_string($variant);
 
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$this->db);
 
-		$row = mysql_fetch_array($rs,MYSQL_NUM);
+		$row=mysql_fetch_array($rs, MYSQL_NUM);
 
-		$result = $row && $row[0] == '1';
+		$result=$row && $row[0]=='1';
 
 		return $result;
 	}
@@ -219,18 +219,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants=explode('_', $this->culture);
 
-		$catalogues = array($catalogue);
+		$catalogues=array($catalogue);
 
-		$variant = null;
+		$variant=null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.'.'.$variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -244,27 +244,27 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 
-		$name = mysql_real_escape_string($this->getSource($variant));
+		$name=mysql_real_escape_string($this->getSource($variant));
 
-		$rs = mysql_query("SELECT cat_id
+		$rs=mysql_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $this->db);
 
-		if(mysql_num_rows($rs) != 1)
+		if(mysql_num_rows($rs)!=1)
 			return false;
 
-		$cat_id = (int)mysql_result($rs,0);
+		$cat_id=(int) mysql_result($rs, 0);
 
 		//first get the catalogue ID
-		$rs = mysql_query(
+		$rs=mysql_query(
 			"SELECT count(msg_id)
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $this->db);
 
-		$count = (int)mysql_result($rs,0);
+		$count=(int) mysql_result($rs, 0);
 
 		return array($cat_id, $variant, $count);
 	}
@@ -275,9 +275,9 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{
-		$time = time();
+		$time=time();
 
-		$result = mysql_query("UPDATE catalogue
+		$result=mysql_query("UPDATE catalogue
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $this->db);
 
@@ -296,27 +296,27 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		if($cat_id <= 0) return false;
-		$inserted = 0;
+		$inserted=0;
 
-		$time = time();
+		$time=time();
 
 		foreach($messages as $message)
 		{
 			$count++; $inserted++;
-			$message = mysql_real_escape_string($message);
-			$statement = "INSERT INTO trans_unit
+			$message=mysql_real_escape_string($message);
+			$statement="INSERT INTO trans_unit
 				(cat_id,id,source,date_added) VALUES
 				({$cat_id}, {$count},'{$message}',$time)";
 			mysql_query($statement, $this->db);
@@ -335,22 +335,22 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
-		$text = mysql_real_escape_string($message);
+		$text=mysql_real_escape_string($message);
 
-		$statement = "DELETE FROM trans_unit WHERE
+		$statement="DELETE FROM trans_unit WHERE
 						cat_id = {$cat_id} AND source = '{$message}'";
-		$deleted = false;
+		$deleted=false;
 
 		mysql_query($statement, $this->db);
 
-		if(mysql_affected_rows($this->db) == 1)
-			$deleted = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db)==1)
+			$deleted=$this->updateCatalogueTime($cat_id, $variant);
 
 		return $deleted;
 
@@ -366,30 +366,30 @@ 
 	 */
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
-		$comments = mysql_real_escape_string($comments);
-		$target = mysql_real_escape_string($target);
-		$text = mysql_real_escape_string($text);
+		$comments=mysql_real_escape_string($comments);
+		$target=mysql_real_escape_string($target);
+		$text=mysql_real_escape_string($text);
 
-		$time = time();
+		$time=time();
 
-		$statement = "UPDATE trans_unit SET
+		$statement="UPDATE trans_unit SET
 						target = '{$target}',
 						comments = '{$comments}',
 						date_modified = '{$time}'
 					WHERE cat_id = {$cat_id}
 						AND source = '{$text}'";
 
-		$updated = false;
+		$updated=false;
 
 		mysql_query($statement, $this->db);
-		if(mysql_affected_rows($this->db) == 1)
-			$updated = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db)==1)
+			$updated=$this->updateCatalogueTime($cat_id, $variant);
 
 		return $updated;
 	}
@@ -400,15 +400,15 @@ 
 	 */
 	function catalogues()
 	{
-		$statement = 'SELECT name FROM catalogue ORDER BY name';
-		$rs = mysql_query($statement, $this->db);
-		$result = array();
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		$statement='SELECT name FROM catalogue ORDER BY name';
+		$rs=mysql_query($statement, $this->db);
+		$result=array();
+		while($row=mysql_fetch_array($rs, MYSQL_NUM))
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details=explode('.', $row[0]);
+			if(!isset($details[1])) $details[1]=null;
 
-			$result[] = $details;
+			$result[]=$details;
 		}
 		return $result;
 	}

framework/Util/TDataFieldAccessor.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 				$tmp = $data;
 				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+					$tmp = $tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))

Spacing +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return mixed value at the specified field
 	 * @throws TInvalidDataValueException if field or data is invalid
 	 */
-	public static function getDataFieldValue($data,$field)
+	public static function getDataFieldValue($data, $field)
 	{
 		try
 		{
@@ -57,33 +57,33 @@ 
 				if(isset($data[$field]))
 					return $data[$field];
 
-				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+				$tmp=$data;
+				foreach(explode(".", $field) as $f)
+				    $tmp=$tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))
 			{
-				if(strpos($field,'.')===false)  // simple field
+				if(strpos($field, '.')===false)  // simple field
 				{
 					if(method_exists($data, 'get'.$field))
-						return call_user_func(array($data,'get'.$field));
+						return call_user_func(array($data, 'get'.$field));
 					else
 						return $data->{$field};
 				}
 				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)
 		{
-			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
+			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}
-		throw new TInvalidDataValueException('datafieldaccessor_data_invalid',$field);
+		throw new TInvalidDataValueException('datafieldaccessor_data_invalid', $field);
 	}
 }

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/Caching/TMemCache.php

Indentation +62 added lines, -62 removed lines

@@ -104,30 +104,30 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
-    /**
-     * @var integer number of buckets to create for this server which in turn control its
-     * probability of it being selected. The probability is relative to the total weight
-     * of all servers.
-     */
-    private $_weight = 1;
+	private $_persistence = true;
+	/**
+	 * @var integer number of buckets to create for this server which in turn control its
+	 * probability of it being selected. The probability is relative to the total weight
+	 * of all servers.
+	 */
+	private $_weight = 1;
 
-    private $_timeout = 360;
+	private $_timeout = 360;
 
-    private $_retryInterval = 15;
+	private $_retryInterval = 15;
 	/**
-	* @var integer Controls the minimum value length before attempting to compress automatically.
-	*/
-    private $_threshold=0;
+	 * @var integer Controls the minimum value length before attempting to compress automatically.
+	 */
+	private $_threshold=0;
 
 	/**
-	* @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
-	*/
-    private $_minSavings=0.0;
+	 * @var float Specifies the minimum amount of savings to actually store the value compressed. The supplied value must be between 0 and 1. Default value is 0.2 giving a minimum 20% compression savings.
+	 */
+	private $_minSavings=0.0;
 
-    private $_status = true;
+	private $_status = true;
 
-    private $_failureCallback = null;
+	private $_failureCallback = null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -171,63 +171,63 @@ 
 		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
-        {
-            foreach($this->_servers as $server)
-            {
-                Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
-            }
-        }
-        else
-        {
-            Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
-        }
+		{
+			foreach($this->_servers as $server)
+			{
+				Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
+				if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
+					$server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
+					throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+			}
+		}
+		else
+		{
+			Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
+			if($this->_cache->addServer($this->_host,$this->_port)===false)
+				throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+		}
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+			$this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
 
-    /**
+	/**
 	 * Loads configuration from an XML element
 	 * @param TXmlElement configuration node
 	 * @throws TConfigurationException if log route class or type is not specified
 	 */
 	private function loadConfig($xml)
 	{
-	    if($xml instanceof TXmlElement)
+		if($xml instanceof TXmlElement)
 		{
-    		foreach($xml->getElementsByTagName('server') as $serverConfig)
-    		{
-    			$properties=$serverConfig->getAttributes();
-    			if(($host=$properties->remove('Host'))===null)
-    				throw new TConfigurationException('memcache_serverhost_required');
-    			if(($port=$properties->remove('Port'))===null)
-        			throw new TConfigurationException('memcache_serverport_required');
-        		if(!is_numeric($port))
-        		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
-        		    'Weight'=>'memcache_serverweight_invalid',
-        		    'Timeout'=>'memcache_servertimeout_invalid',
-        		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
-        		);
-        		foreach($checks as $property=>$exception)
-        		{
-        		    $value=$properties->remove($property);
-        		    if($value!==null && is_numeric($value))
-        		        $server[$property]=$value;
-        		    else if($value!==null)
-        		        throw new TConfigurationException($exception);
-        		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
-    			$this->_servers[]=$server;
-    		}
-	    }
+			foreach($xml->getElementsByTagName('server') as $serverConfig)
+			{
+				$properties=$serverConfig->getAttributes();
+				if(($host=$properties->remove('Host'))===null)
+					throw new TConfigurationException('memcache_serverhost_required');
+				if(($port=$properties->remove('Port'))===null)
+					throw new TConfigurationException('memcache_serverport_required');
+				if(!is_numeric($port))
+					throw new TConfigurationException('memcache_serverport_invalid');
+				$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
+				$checks = array(
+					'Weight'=>'memcache_serverweight_invalid',
+					'Timeout'=>'memcache_servertimeout_invalid',
+					'RetryInterval'=>'memcach_serverretryinterval_invalid'
+				);
+				foreach($checks as $property=>$exception)
+				{
+					$value=$properties->remove($property);
+					if($value!==null && is_numeric($value))
+						$server[$property]=$value;
+					else if($value!==null)
+						throw new TConfigurationException($exception);
+				}
+				$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+				$this->_servers[]=$server;
+			}
+		}
 	}
 
 	/**

Spacing +22 added lines, -22 removed lines

@@ -104,17 +104,17 @@ 
 	/**
 	 * @var boolean controls the use of a persistent connection. Default to true.
 	 */
-    private $_persistence = true;
+    private $_persistence=true;
     /**
      * @var integer number of buckets to create for this server which in turn control its
      * probability of it being selected. The probability is relative to the total weight
      * of all servers.
      */
-    private $_weight = 1;
+    private $_weight=1;
 
-    private $_timeout = 360;
+    private $_timeout=360;
 
-    private $_retryInterval = 15;
+    private $_retryInterval=15;
 	/**
 	* @var integer Controls the minimum value length before attempting to compress automatically.
 	*/
@@ -125,9 +125,9 @@ 
 	*/
     private $_minSavings=0.0;
 
-    private $_status = true;
+    private $_status=true;
 
-    private $_failureCallback = null;
+    private $_failureCallback=null;
 
 	/**
 	 * @var boolean whether to use memcached or memcache as the underlying caching extension.
@@ -168,26 +168,26 @@ 
 		if(!extension_loaded('memcached') && $this->_useMemcached)
 			throw new TConfigurationException('memcached_extension_required');
 		
-		$this->_cache = $this->_useMemcached ? new Memcached : new Memcache;
+		$this->_cache=$this->_useMemcached ? new Memcached : new Memcache;
 		$this->loadConfig($config);
 		if(count($this->_servers))
         {
             foreach($this->_servers as $server)
             {
                 Prado::trace('Adding server '.$server['Host'].' from serverlist', 'System.Caching.TMemCache');
-                if($this->_cache->addServer($server['Host'],$server['Port'],$server['Persistent'],
-                    $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
-                    throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
+                if($this->_cache->addServer($server['Host'], $server['Port'], $server['Persistent'],
+                    $server['Weight'], $server['Timeout'], $server['RetryInterval'])===false)
+                    throw new TConfigurationException('memcache_connection_failed', $server['Host'], $server['Port']);
             }
         }
         else
         {
             Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
-            if($this->_cache->addServer($this->_host,$this->_port)===false)
-                throw new TConfigurationException('memcache_connection_failed',$this->_host,$this->_port);
+            if($this->_cache->addServer($this->_host, $this->_port)===false)
+                throw new TConfigurationException('memcache_connection_failed', $this->_host, $this->_port);
         }
 		if($this->_threshold!==0)
-            $this->_cache->setCompressThreshold($this->_threshold,$this->_minSavings);
+            $this->_cache->setCompressThreshold($this->_threshold, $this->_minSavings);
 		$this->_initialized=true;
 		parent::init($config);
 	}
@@ -210,8 +210,8 @@ 
         			throw new TConfigurationException('memcache_serverport_required');
         		if(!is_numeric($port))
         		    throw new TConfigurationException('memcache_serverport_invalid');
-        		$server = array('Host'=>$host,'Port'=>$port,'Weight'=>1,'Timeout'=>1800,'RetryInterval'=>15,'Persistent'=>true);
-        		$checks = array(
+        		$server=array('Host'=>$host, 'Port'=>$port, 'Weight'=>1, 'Timeout'=>1800, 'RetryInterval'=>15, 'Persistent'=>true);
+        		$checks=array(
         		    'Weight'=>'memcache_serverweight_invalid',
         		    'Timeout'=>'memcache_servertimeout_invalid',
         		    'RetryInterval'=>'memcach_serverretryinterval_invalid'
@@ -224,7 +224,7 @@ 
         		    else if($value!==null)
         		        throw new TConfigurationException($exception);
         		}
-        		$server['Persistent']= TPropertyValue::ensureBoolean($properties->remove('Persistent'));
+        		$server['Persistent']=TPropertyValue::ensureBoolean($properties->remove('Persistent'));
     			$this->_servers[]=$server;
     		}
 	    }
@@ -350,12 +350,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			return $this->_cache->set($key,$value,$expire);
+			return $this->_cache->set($key, $value, $expire);
 		} else {
-			return $this->_cache->set($key,$value,0,$expire);
+			return $this->_cache->set($key, $value, 0, $expire);
 		}
 	}
 
@@ -368,12 +368,12 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if($this->_useMemcached) {
-			$this->_cache->add($key,$value,$expire);
+			$this->_cache->add($key, $value, $expire);
 		} else {
-			return $this->_cache->add($key,$value,0,$expire);
+			return $this->_cache->add($key, $value, 0, $expire);
 		}
 	}
 

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
         	if (!@mysql_select_db($dsninfo['database'], $conn))
         		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
+        } else
         	throw new Exception('Please provide a database for message'.
         						' translation.');
        return $conn;

framework/Web/Services/TFeedService.php

Indentation +3 added lines, -3 removed lines

@@ -139,9 +139,9 @@
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
-		    //$this->getResponse()->setContentType('application/rss+xml');
-		    $this->getResponse()->setContentType($feed->getContentType());
-		    $this->getResponse()->write($content);
+			//$this->getResponse()->setContentType('application/rss+xml');
+			$this->getResponse()->setContentType($feed->getContentType());
+			$this->getResponse()->write($content);
 		}
 		else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);

Spacing +10 added lines, -10 removed lines

@@ -77,7 +77,7 @@ 
 			if(is_array($config))
 			{
 				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+					$this->_feeds[$id]=$feed;
 			}
 		}
 		else
@@ -110,20 +110,20 @@ 
 		if(isset($this->_feeds[$id]))
 		{
 			$feedConfig=$this->_feeds[$id];
-			$properties = array();
-			$feed = null;
+			$properties=array();
+			$feed=null;
 			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
 				if(isset($feedConfig['class']))
 				{
 					$feed=Prado::createComponent($feedConfig['class']);
 					if($service instanceof IFeedContentProvider)
-						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
+						$properties=isset($feedConfig['properties']) ? $feedConfig['properties'] : array();
 					else
-						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
+						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);
+					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
 			else
 			{
@@ -132,15 +132,15 @@ 
 				{
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
+						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
-					throw new TConfigurationException('feedservice_class_required',$id);
+					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
 			foreach($properties as $name=>$value)
-				$feed->setSubproperty($name,$value);
+				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 
 			$content=$feed->getFeedContent();
@@ -149,6 +149,6 @@ 
 		    $this->getResponse()->write($content);
 		}
 		else
-			throw new THttpException(404,'feedservice_feed_unknown',$id);
+			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
\ No newline at end of file

Braces +5 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
 				foreach($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
@@ -121,11 +120,9 @@ 
 						$properties=isset($feedConfig['properties'])?$feedConfig['properties']:array();
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('jsonservice_class_required',$id);
-			}
-			else
+			} else
 			{
 				$properties=$feedConfig->getAttributes();
 				if(($class=$properties->remove('class'))!==null)
@@ -133,8 +130,7 @@ 
 					$feed=Prado::createComponent($class);
 					if(!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid',$id);
-				}
-				else
+				} else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
 
@@ -147,8 +143,7 @@ 
 		    //$this->getResponse()->setContentType('application/rss+xml');
 		    $this->getResponse()->setContentType($feed->getContentType());
 		    $this->getResponse()->write($content);
-		}
-		else
+		} else
 			throw new THttpException(404,'feedservice_feed_unknown',$id);
 	}
 }
\ No newline at end of file

framework/Web/UI/TCachePageStatePersister.php

Indentation +4 added lines, -4 removed lines

@@ -144,15 +144,15 @@
 	 */
 	public function getKeyPrefix()
 	{
-	    return $this->_prefix;
+		return $this->_prefix;
 	}
 
 	/**
-     * @param string prefix of cache variable name to avoid conflict with other cache data
-     */
+	 * @param string prefix of cache variable name to avoid conflict with other cache data
+	 */
 	public function setKeyPrefix($value)
 	{
-	    $this->_prefix=$value;
+		$this->_prefix=$value;
 	}
 
 	/**

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 			if($cache===null || !($cache instanceof ICache))
 			{
 				if($this->_cacheModuleID!=='')
-					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid',$this->_cacheModuleID);
+					throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid', $this->_cacheModuleID);
 				else
 					throw new TConfigurationException('cachepagestatepersister_cache_required');
 			}
@@ -133,7 +133,7 @@ 
 	 */
 	public function setCacheTimeout($value)
 	{
-		if(($value=TPropertyValue::ensureInteger($value))>=0)
+		if(($value=TPropertyValue::ensureInteger($value)) >= 0)
 			$this->_timeout=$value;
 		else
 			throw new TInvalidDataValueException('cachepagestatepersister_timeout_invalid');
@@ -173,10 +173,10 @@ 
 	 */
 	public function save($data)
 	{
-		$timestamp=(string)microtime(true);
+		$timestamp=(string) microtime(true);
 		$key=$this->calculateKey($timestamp);
-		$this->getCache()->add($key,$data,$this->_timeout);
-		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page,$timestamp));
+		$this->getCache()->add($key, $data, $this->_timeout);
+		$this->_page->setClientState(TPageStateFormatter::serialize($this->_page, $timestamp));
 	}
 
 	/**
@@ -186,13 +186,13 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp=TPageStateFormatter::unserialize($this->_page,$this->_page->getRequestClientState()))!==null)
+		if(($timestamp=TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState()))!==null)
 		{
 			$key=$this->calculateKey($timestamp);
 			if(($data=$this->getCache()->get($key))!==false)
 				return $data;
 		}
-		throw new THttpException(400,'cachepagestatepersister_pagestate_corrupted');
+		throw new THttpException(400, 'cachepagestatepersister_pagestate_corrupted');
 	}
 }