pradosoft / prado

framework/I18N/core/MessageSource_SQLite.php

Spacing +70 added lines, -70 removed lines

@@ -54,8 +54,8 @@ 
 	 */
 	function __construct($source)
 	{
-		$dsn = parseDSN((string)$source);
-		$this->source = $dsn['database'];
+		$dsn=parseDSN((string) $source);
+		$this->source=$dsn['database'];
 	}
 	
 	/**
@@ -66,26 +66,26 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$variant = sqlite_escape_string($variant);
+		$variant=sqlite_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";
 	
-		$db = sqlite_open($this->source);
-		$rs = sqlite_query($statement, $db);
+		$db=sqlite_open($this->source);
+		$rs=sqlite_query($statement, $db);
 			
-		$result = array();
+		$result=array();
 		
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		while($row=sqlite_fetch_array($rs, SQLITE_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
 		}
 
 		sqlite_close($db);
@@ -101,15 +101,15 @@ 
 	 */	
 	protected function getLastModified($source)
 	{
-		$source = sqlite_escape_string($source);
+		$source=sqlite_escape_string($source);
 
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$rs = sqlite_query(
+		$rs=sqlite_query(
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$db);
 			
-		$result = $rs ? (int)sqlite_fetch_single($rs) : 0;
+		$result=$rs ? (int) sqlite_fetch_single($rs) : 0;
 		
 		sqlite_close($db);		
 	
@@ -124,12 +124,12 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$variant = sqlite_escape_string($variant);
-		$db = sqlite_open($this->source);
-		$rs = sqlite_query(
+		$variant=sqlite_escape_string($variant);
+		$db=sqlite_open($this->source);
+		$rs=sqlite_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$db);
-		$result = $rs && (int)sqlite_fetch_single($rs);	
+		$result=$rs && (int) sqlite_fetch_single($rs);	
 		sqlite_close($db);
 
 		return $result;
@@ -142,18 +142,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);	
@@ -167,29 +167,29 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 		
-		$name = sqlite_escape_string($this->getSource($variant));	
+		$name=sqlite_escape_string($this->getSource($variant));	
 			
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$rs = sqlite_query("SELECT cat_id
+		$rs=sqlite_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $db);
 		
-		if(sqlite_num_rows($rs) != 1)
+		if(sqlite_num_rows($rs)!=1)
 			return false;
 		
-		$cat_id = (int)sqlite_fetch_single($rs);
+		$cat_id=(int) sqlite_fetch_single($rs);
 		
 		//first get the catalogue ID
-		$rs = sqlite_query(
+		$rs=sqlite_query(
 			"SELECT count(msg_id)
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $db);
 
-		$count = (int)sqlite_fetch_single($rs);
+		$count=(int) sqlite_fetch_single($rs);
 
 		sqlite_close($db);	
 		
@@ -202,9 +202,9 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant, $db)
 	{
-		$time = time();
+		$time=time();
 		
-		$result = sqlite_query("UPDATE catalogue 
+		$result=sqlite_query("UPDATE catalogue 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $db);
 
@@ -223,27 +223,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;
 		
-		$db = sqlite_open($this->source);
-		$time = time();
+		$db=sqlite_open($this->source);
+		$time=time();
 
 		foreach($messages as $message)
 		{
-			$message = sqlite_escape_string($message);
-			$statement = "INSERT INTO trans_unit
+			$message=sqlite_escape_string($message);
+			$statement="INSERT INTO trans_unit
 				(cat_id,id,source,date_added) VALUES
 				({$cat_id}, {$count},'{$message}',$time)";
 			if(sqlite_query($statement, $db))
@@ -269,31 +269,31 @@ 
 	 */	
 	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 = sqlite_escape_string($comments);
-		$target = sqlite_escape_string($target);
-		$text = sqlite_escape_string($text);
+		$comments=sqlite_escape_string($comments);
+		$target=sqlite_escape_string($target);
+		$text=sqlite_escape_string($text);
 		
-		$time = time();
+		$time=time();
 		
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$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;
 		
 		if(sqlite_query($statement, $db))
-			$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
+			$updated=$this->updateCatalogueTime($cat_id, $variant, $db);
 		
 		sqlite_close($db);			
 				
@@ -308,21 +308,21 @@ 
 	 */
 	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;
 			
-		$db = sqlite_open($this->source);
-		$text = sqlite_escape_string($message);
+		$db=sqlite_open($this->source);
+		$text=sqlite_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;
 				
 		if(sqlite_query($statement, $db))
-			$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);		
+			$deleted=$this->updateCatalogueTime($cat_id, $variant, $db);		
 			
 		sqlite_close($db);	
 				
@@ -335,16 +335,16 @@ 
 	 */
 	function catalogues()
 	{
-		$db = sqlite_open($this->source);
-		$statement = 'SELECT name FROM catalogue ORDER BY name';
-		$rs = sqlite_query($statement, $db);
-		$result = array();
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		$db=sqlite_open($this->source);
+		$statement='SELECT name FROM catalogue ORDER BY name';
+		$rs=sqlite_query($statement, $db);
+		$result=array();
+		while($row=sqlite_fetch_array($rs, SQLITE_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;
 		}
 		sqlite_close($db);
 		return $result;

Doc Comments +3 added lines, -1 removed lines

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

framework/I18N/core/ChoiceFormat.php

Spacing +41 added lines, -41 removed lines

@@ -82,13 +82,13 @@ 
 	 * The pattern to validate a set notation
 	 * @var string
 	 */
-	protected $validate = '/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
+	protected $validate='/[\(\[\{]|[-Inf\d:\s]+|,|[\+Inf\d\s:\?\-=!><%\|&\(\)]+|[\)\]\}]/ms';
 
 	/**
 	 * The pattern to parse the formatting string.
 	 * @var string
 	 */
-	protected $parse = '/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
+	protected $parse='/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
 
 	/**
 	 * The value for positive infinity.
@@ -102,7 +102,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->inf = -log(0);
+		$this->inf=-log(0);
 	}
 
 
@@ -114,7 +114,7 @@ 
 	 */
 	function isValid($number, $set)
 	{
-		$n = preg_match_all($this->validate,$set,$matches,PREG_SET_ORDER);
+		$n=preg_match_all($this->validate, $set, $matches, PREG_SET_ORDER);
 
 		if($n < 3) throw new Exception("Invalid set \"{$set}\"");
 
@@ -123,42 +123,42 @@ 
 			return $this->isValidSetNotation($number, $def[1]);
 		}
 
-		$leftBracket = $matches[0][0];
-		$rightBracket = $matches[$n-1][0];
+		$leftBracket=$matches[0][0];
+		$rightBracket=$matches[$n - 1][0];
 
-		$i = 0;
-		$elements = array();
+		$i=0;
+		$elements=array();
 		foreach($matches as $match)
 		{
-			$string = $match[0];
-			if($i != 0 && $i != $n-1 && $string !== ',')
+			$string=$match[0];
+			if($i!=0 && $i!=$n - 1 && $string!==',')
 			{
-				if($string == '-Inf')
-					$elements[] = -1*$this->inf;
-				else if ($string == '+Inf' || $string == 'Inf')
-					$elements[] = $this->inf;
+				if($string=='-Inf')
+					$elements[]=-1 * $this->inf;
+				else if($string=='+Inf' || $string=='Inf')
+					$elements[]=$this->inf;
 				else
-					$elements[] = floatval($string);
+					$elements[]=floatval($string);
 			}
 			$i++;
 		}
-		$total = count($elements);
-		$number = floatval($number);
+		$total=count($elements);
+		$number=floatval($number);
 
-		if($leftBracket == '{' && $rightBracket == '}')
+		if($leftBracket=='{' && $rightBracket=='}')
 			return in_array($number, $elements);
 
-		$left = false;
-		if($leftBracket == '[')
-			$left = $number >= $elements[0];
-		else if ($leftBracket == '(')
-			$left = $number > $elements[0];
+		$left=false;
+		if($leftBracket=='[')
+			$left=$number >= $elements[0];
+		else if($leftBracket=='(')
+			$left=$number > $elements[0];
 
-		$right = false;
+		$right=false;
 		if($rightBracket==']')
-			$right = $number <= $elements[$total-1];
-		else if($rightBracket == ')')
-			$right = $number < $elements[$total-1];
+			$right=$number <= $elements[$total - 1];
+		else if($rightBracket==')')
+			$right=$number < $elements[$total - 1];
 
 		if($left && $right) return true;
 
@@ -167,7 +167,7 @@ 
 
 	protected function isValidSetNotation($number, $set)
 	{
-		$str = '$result = '.str_replace('n', '$number', $set).';';
+		$str='$result = '.str_replace('n', '$number', $set).';';
 		try
 		{
 			eval($str);
@@ -187,18 +187,18 @@ 
 	 */
 	function parse($string)
 	{
-		$n = preg_match_all($this->parse,$string,$matches, PREG_OFFSET_CAPTURE);
-		$sets = array();
+		$n=preg_match_all($this->parse, $string, $matches, PREG_OFFSET_CAPTURE);
+		$sets=array();
 		foreach($matches[1] as $match)
-			$sets[] = $match[0];
-		$offset = $matches[0];
-		$strings = array();
-		for($i = 0; $i < $n; $i++)
+			$sets[]=$match[0];
+		$offset=$matches[0];
+		$strings=array();
+		for($i=0; $i < $n; $i++)
 		{
-			$len = strlen($offset[$i][0]);
-			$begin = $i == 0? $len : $offset[$i][1] + $len;
-			$end = $i == $n-1 ? strlen($string) : $offset[$i+1][1];
-			$strings[] = substr($string, $begin, $end - $begin);
+			$len=strlen($offset[$i][0]);
+			$begin=$i==0 ? $len : $offset[$i][1] + $len;
+			$end=$i==$n - 1 ? strlen($string) : $offset[$i + 1][1];
+			$strings[]=substr($string, $begin, $end - $begin);
 		}
 		return array($sets, $strings);
 	}
@@ -212,9 +212,9 @@ 
 	 */
 	public function format($string, $number)
 	{
-		list($sets, $strings) = $this->parse($string);
-		$total = count($sets);
-		for($i = 0; $i < $total; $i++)
+		list($sets, $strings)=$this->parse($string);
+		$total=count($sets);
+		for($i=0; $i < $total; $i++)
 		{
 			if($this->isValid($number, $sets[$i]))
 				return $strings[$i];

Doc Comments +5 added lines, -1 removed lines

@@ -165,6 +165,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function isValidSetNotation($number, $set)
 	{
 		$str = '$result = '.str_replace('n', '$number', $set).';';
@@ -206,8 +209,9 @@ 
 	/**
 	 * For the choice string, and a number, find and return the
 	 * string that satisfied the set within the choices.
-	 * @param string the choices string.
+	 * @param string string choices string.
 	 * @param float the number to test.
+	 * @param double $number
 	 * @return string the choosen string.
 	 */
 	public function format($string, $number)

Braces +1 added lines, -2 removed lines

@@ -172,8 +172,7 @@
 		{
 			eval($str);
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			return false;
 		}

framework/I18N/TI18NControl.php

Spacing +7 added lines, -7 removed lines

@@ -41,18 +41,18 @@ 
 	 */
 	public function getCharset()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
+		$app=$this->getApplication()->getGlobalization(false);
 
 		//instance charset
-		$charset = $this->getViewState('Charset','');
+		$charset=$this->getViewState('Charset', '');
 
 		//fall back to globalization charset
 		if(empty($charset))
-			$charset = ($app===null) ? '' : $app->getCharset();
+			$charset=($app===null) ? '' : $app->getCharset();
 
 		//fall back to default charset
 		if(empty($charset))
-			$charset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+			$charset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		return $charset;
 	}
@@ -63,7 +63,7 @@ 
 	 */
 	public function setCharset($value)
 	{
-		$this->setViewState('Charset',$value,'');
+		$this->setViewState('Charset', $value, '');
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 */
 	public function getCulture()
 	{
-		return $this->getViewState('Culture','');
+		return $this->getViewState('Culture', '');
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 */
 	public function setCulture($culture)
 	{
-		$this->setViewState('Culture',$culture,'');
+		$this->setViewState('Culture', $culture, '');
 	}
 }
 

framework/I18N/TChoiceFormat.php

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

Indentation +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 namespace Prado\I18N;
 
  /**
- * Get the ChoiceFormat class.
- */
+  * Get the ChoiceFormat class.
+  */
 use Prado\I18N\core\ChoiceFormat;
 use Prado\Prado;
 

framework/I18N/TTranslate.php

Spacing +29 added lines, -29 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->setViewState('Key',$value,'');
+		$this->setViewState('Key', $value, '');
 	}
 
 	/**
@@ -93,7 +93,7 @@ 
 	 */
 	public function getKey()
 	{
-		return $this->getViewState('Key','');
+		return $this->getViewState('Key', '');
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public function getCatalogue()
 	{
-		return $this->getViewState('Catalogue','');
+		return $this->getViewState('Catalogue', '');
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 */
 	public function setCatalogue($value)
 	{
-		$this->setViewState('Catalogue',$value,'');
+		$this->setViewState('Catalogue', $value, '');
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->setViewState('Trim',TPropertyValue::ensureBoolean($value),true);
+		$this->setViewState('Trim', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function getTrim()
 	{
-		return $this->getViewState('Trim',true);
+		return $this->getViewState('Trim', true);
 	}
 
 	/**
@@ -140,13 +140,13 @@ 
 	 */
 	public function getParameters()
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters;
 		else
 		{
 			$parameters=new TAttributeCollection;
 			$parameters->setCaseSensitive(true);
-			$this->setViewState('Parameters',$parameters,null);
+			$this->setViewState('Parameters', $parameters, null);
 			return $parameters;
 		}
 	}
@@ -156,7 +156,7 @@ 
 	 */
 	public function hasParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->contains($name);
 		else
 			return false;
@@ -167,7 +167,7 @@ 
 	 */
 	public function getParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->itemAt($name);
 		else
 			return null;
@@ -177,9 +177,9 @@ 
 	 * @param string parameter name
 	 * @param string value of the parameter
 	 */
-	public function setParameter($name,$value)
+	public function setParameter($name, $value)
 	{
-		$this->getParameters()->add($name,$value);
+		$this->getParameters()->add($name, $value);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 */
 	public function removeParameter($name)
 	{
-		if($parameters=$this->getViewState('Parameters',null))
+		if($parameters=$this->getViewState('Parameters', null))
 			return $parameters->remove($name);
 		else
 			return null;
@@ -200,25 +200,25 @@ 
 	 */
 	public function render($writer)
 	{
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
-		$subs = array();
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$subs=array();
 		foreach($this->getParameters() as $key => $value)
-			$subs['{'.$key.'}'] = $value;
+			$subs['{'.$key.'}']=$value;
 		foreach($this->getControls() as $control)
 		{
 			if($control instanceof TTranslateParameter)
-				$subs['{'.$control->getKey().'}'] = $control->getParameter();
+				$subs['{'.$control->getKey().'}']=$control->getParameter();
 			elseif($control instanceof TControl)
 				$control->render($htmlWriter);
 			elseif(is_string($control))
 				$htmlWriter->write($control);
 		}
 
-		$text = $this->getText();
+		$text=$this->getText();
 		if(strlen($text)==0)
-			$text = $htmlWriter->flush();
+			$text=$htmlWriter->flush();
 		if($this->getTrim())
-			$text = trim($text);
+			$text=trim($text);
 
 		$writer->write($this->translateText($text, $subs));
 	}
@@ -231,20 +231,20 @@ 
 	 */
 	protected function translateText($text, $subs)
 	{
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 
 		//no translation handler provided
-		if(($config = $app->getTranslationConfiguration())===null)
+		if(($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $subs);
 
-		$catalogue = $this->getCatalogue();
+		$catalogue=$this->getCatalogue();
 		if(empty($catalogue) && isset($config['catalogue']))
-			$catalogue = $config['catalogue'];
-		if (empty($catalogue)) $catalogue='messages';
+			$catalogue=$config['catalogue'];
+		if(empty($catalogue)) $catalogue='messages';
 		Translation::init($catalogue);
 
-		$key = $this->getKey();
-		if(!empty($key)) $text = $key;
+		$key=$this->getKey();
+		if(!empty($key)) $text=$key;
 
 		//translate it
 		return Translation::formatter($catalogue)->format($text,

framework/I18N/TNumberFormat.php

Spacing +25 added lines, -25 removed lines

@@ -77,7 +77,7 @@ 
 	 */
 	public function getPattern()
 	{
-		return $this->getViewState('Pattern','');
+		return $this->getViewState('Pattern', '');
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->setViewState('Pattern',$pattern,'');
+		$this->setViewState('Pattern', $pattern, '');
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getValue()
 	{
-		return $this->getViewState('Value','');
+		return $this->getViewState('Value', '');
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->setViewState('Value',$value,'');
+		$this->setViewState('Value', $value, '');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	public function getDefaultText()
 	{
-		return $this->getViewState('DefaultText','');
+		return $this->getViewState('DefaultText', '');
 	}
 
 	/**
@@ -122,7 +122,7 @@ 
 	 */
 	public function setDefaultText($value)
 	{
-		$this->setViewState('DefaultText',$value,'');
+		$this->setViewState('DefaultText', $value, '');
 	}
 
 	/**
@@ -157,7 +157,7 @@ 
 	 */
 	public function getType()
 	{
-		return $this->getViewState('Type','d');
+		return $this->getViewState('Type', 'd');
 	}
 
 	/**
@@ -168,20 +168,20 @@ 
 	 */
 	public function setType($type)
 	{
-		$type = strtolower($type);
+		$type=strtolower($type);
 
 		switch($type)
 		{
 			case 'decimal':
-				$this->setViewState('Type','d',''); break;
+				$this->setViewState('Type', 'd', ''); break;
 			case 'currency':
-				$this->setViewState('Type','c',''); break;
+				$this->setViewState('Type', 'c', ''); break;
 			case 'percentage':
-				$this->setViewState('Type','p',''); break;
+				$this->setViewState('Type', 'p', ''); break;
 			case 'scientific':
-				$this->setViewState('Type','e',''); break;
+				$this->setViewState('Type', 'e', ''); break;
 			default:
-				throw new TInvalidDataValueException('numberformat_type_invalid',$type);
+				throw new TInvalidDataValueException('numberformat_type_invalid', $type);
 		}
 
 	}
@@ -191,7 +191,7 @@ 
 	 */
 	public function getCurrency()
 	{
-		return $this->getViewState('Currency','USD');
+		return $this->getViewState('Currency', 'USD');
 	}
 
 	/**
@@ -201,7 +201,7 @@ 
 	 */
 	public function setCurrency($currency)
 	{
-		$this->setViewState('Currency', $currency,'');
+		$this->setViewState('Currency', $currency, '');
 	}
 
 	/**
@@ -212,31 +212,31 @@ 
 	 */
 	protected function getFormattedValue()
 	{
-		$value = $this->getValue();
-		$defaultText = $this->getDefaultText();
+		$value=$this->getValue();
+		$defaultText=$this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
 
-		$app = $this->getApplication()->getGlobalization();
+		$app=$this->getApplication()->getGlobalization();
 		//initialized the default class wide formatter
 		if(self::$formatter===null)
-			self::$formatter = new NumberFormat($app->getCulture());
+			self::$formatter=new NumberFormat($app->getCulture());
 
-		$pattern = strlen($this->getPattern()) > 0
+		$pattern=strlen($this->getPattern()) > 0
 						? $this->getPattern() : $this->getType();
 
-		$culture = $this->getCulture();
+		$culture=$this->getCulture();
 		//return the specific cultural formatted number
-		if(!empty($culture) && $app->getCulture() != $culture)
+		if(!empty($culture) && $app->getCulture()!=$culture)
 		{
-			$formatter = new NumberFormat($culture);
-			return $formatter->format($this->getValue(),$pattern,
+			$formatter=new NumberFormat($culture);
+			return $formatter->format($this->getValue(), $pattern,
 									  $this->getCurrency(),
 									  $this->getCharset());
 		}
 
 		//return the application wide culture formatted number.
-		return self::$formatter->format($this->getValue(),$pattern,
+		return self::$formatter->format($this->getValue(), $pattern,
 										$this->getCurrency(),
 										$this->getCharset());
 	}

Indentation +42 added lines, -42 removed lines

@@ -24,48 +24,48 @@
  */
 
 /**
-  * To format numbers in locale sensitive manner use
-  * <code>
-  * <com:TNumberFormat Pattern="0.##" value="2.0" />
-  * </code>
-  *
-  * Numbers can be formatted as currency, percentage, decimal or scientific
-  * numbers by specifying the Type attribute. The known types are
-  * "currency", "percentage", "decimal" and "scientific".
-  *
-  * If someone from US want to see sales figures from a store in
-  * Germany (say using the EURO currency), formatted using the german
-  * currency, you would need to use the attribute Culture="de_DE" to get
-  * the currency right, e.g. 100,00. The decimal and grouping separator is
-  * then also from the de_DE locale. This may lead to some confusion because
-  * people from US know the "," as thousand separator. Therefore a "Currency"
-  * attribute is available, so that the output from the following example
-  * results in 100.00.
-  * <code>
-  * <com:TNumberFormat Type="currency" Culture="en_US" Currency="EUR" Value="100" />
-  * </code>
-  *
-  * Namespace: System.I18N
-  *
-  * Properties
-  * - <b>Value</b>, number,
-  *   <br>Gets or sets the number to format. The tag content is used as Value
-  *   if the Value property is not specified.
-  * - <b>Type</b>, string,
-  *   <br>Gets or sets the formatting type. The valid types are
-  *    'decimal', 'currency', 'percentage' and 'scientific'.
-  * - <b>Currency</b>, string,
-  *   <br>Gets or sets the currency symbol for the currency format.
-  *   The default is 'USD' if the Currency property is not specified.
-  * - <b>Pattern</b>, string,
-  *   <br>Gets or sets the custom number formatting pattern.
-  * - <b>DefaultText</b>, string,
-  * <br>Gets or sets the default text. If Value is not set, DefaultText will be
-  * shown instead of the default currency Value/Pattern.
-  *
-  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\I18N
-  */
+ * To format numbers in locale sensitive manner use
+ * <code>
+ * <com:TNumberFormat Pattern="0.##" value="2.0" />
+ * </code>
+ *
+ * Numbers can be formatted as currency, percentage, decimal or scientific
+ * numbers by specifying the Type attribute. The known types are
+ * "currency", "percentage", "decimal" and "scientific".
+ *
+ * If someone from US want to see sales figures from a store in
+ * Germany (say using the EURO currency), formatted using the german
+ * currency, you would need to use the attribute Culture="de_DE" to get
+ * the currency right, e.g. 100,00. The decimal and grouping separator is
+ * then also from the de_DE locale. This may lead to some confusion because
+ * people from US know the "," as thousand separator. Therefore a "Currency"
+ * attribute is available, so that the output from the following example
+ * results in 100.00.
+ * <code>
+ * <com:TNumberFormat Type="currency" Culture="en_US" Currency="EUR" Value="100" />
+ * </code>
+ *
+ * Namespace: System.I18N
+ *
+ * Properties
+ * - <b>Value</b>, number,
+ *   <br>Gets or sets the number to format. The tag content is used as Value
+ *   if the Value property is not specified.
+ * - <b>Type</b>, string,
+ *   <br>Gets or sets the formatting type. The valid types are
+ *    'decimal', 'currency', 'percentage' and 'scientific'.
+ * - <b>Currency</b>, string,
+ *   <br>Gets or sets the currency symbol for the currency format.
+ *   The default is 'USD' if the Currency property is not specified.
+ * - <b>Pattern</b>, string,
+ *   <br>Gets or sets the custom number formatting pattern.
+ * - <b>DefaultText</b>, string,
+ * <br>Gets or sets the default text. If Value is not set, DefaultText will be
+ * shown instead of the default currency Value/Pattern.
+ *
+ * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @package Prado\I18N
+ */
 class TNumberFormat extends TI18NControl implements \Prado\IDataRenderer
 {
 	/**

framework/Web/UI/ActiveControls/TActiveRadioButton.php

Spacing +10 added lines, -10 removed lines

@@ -87,7 +87,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -104,8 +104,8 @@ 
 	 */
 	public function setChecked($value)
 	{
-		$value = TPropertyValue::ensureBoolean($value);
-		if(parent::getChecked() === $value)
+		$value=TPropertyValue::ensureBoolean($value);
+		if(parent::getChecked()===$value)
 			return;
 
 		parent::setChecked($value);
@@ -127,10 +127,10 @@ 
 	 * Since 3.1.4, the javascript code is not rendered if {@link setAutoPostBack AutoPostBack} is false
 	 *
 	 */
-	protected function renderInputTag($writer,$clientID,$onclick)
+	protected function renderInputTag($writer, $clientID, $onclick)
 	{
-		parent::renderInputTag($writer,$clientID,$onclick);
-		if ($this->getAutoPostBack())
+		parent::renderInputTag($writer, $clientID, $onclick);
+		if($this->getAutoPostBack())
 			$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
 	}
@@ -149,8 +149,8 @@ 
 	 */
 	public function getLabelAttributes()
 	{
-		$attributes = parent::getLabelAttributes();
-		$attributes['id'] = $this->getDefaultLabelID();
+		$attributes=parent::getLabelAttributes();
+		$attributes['id']=$this->getDefaultLabelID();
 		return $attributes;
 	}
 
@@ -160,7 +160,7 @@ 
 	 * @param string radio button id
 	 * @param string label text
 	 */
-	protected function renderLabel($writer,$clientID,$text)
+	protected function renderLabel($writer, $clientID, $text)
 	{
 		$writer->addAttribute('id', $this->getDefaultLabelID());
 		parent::renderLabel($writer, $clientID, $text);
@@ -171,7 +171,7 @@ 
 	 */
 	protected function getDefaultLabelID()
 	{
-		if($attributes=$this->getViewState('LabelAttributes',null))
+		if($attributes=$this->getViewState('LabelAttributes', null))
 			return $this->getLabelAttributes()->itemAt('id');
 		else
 			return $this->getClientID().'_label';

framework/Web/UI/ActiveControls/TActiveTextBox.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -118,7 +118,7 @@ 
 	protected function addAttributesToRender($writer)
 	{
 		parent::addAttributesToRender($writer);
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}

framework/Web/UI/ActiveControls/TActiveHyperLink.php

Spacing +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function setText($value)
 	{
-		if(parent::getText() === $value)
+		if(parent::getText()===$value)
 			return;
 
 		parent::setText($value);
@@ -64,14 +64,14 @@ 
 	 */
 	public function setImageUrl($value)
 	{
-		if(parent::getImageUrl() === $value)
+		if(parent::getImageUrl()===$value)
 			return;
 
 		parent::setImageUrl($value);
-		if($this->getActiveControl()->canUpdateClientSide() && $value !== '')
+		if($this->getActiveControl()->canUpdateClientSide() && $value!=='')
 		{
-			$textWriter = new TTextWriter;
-			$renderer = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
+			$textWriter=new TTextWriter;
+			$renderer=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), $textWriter);
 			$this->createImage($value)->renderControl($renderer);
 			$this->getPage()->getCallbackClient()->update($this, $textWriter->flush());
 		}
@@ -83,14 +83,14 @@ 
 	 */
 	public function setNavigateUrl($value)
 	{
-		if(parent::getNavigateUrl() === $value)
+		if(parent::getNavigateUrl()===$value)
 			return;
 
 		parent::setNavigateUrl($value);
 		if($this->getActiveControl()->canUpdateClientSide())
 		{
 			//replace & with & and urldecode the url (setting the href using javascript is literal)
-			$url = urldecode(str_replace('&', '&', $value));
+			$url=urldecode(str_replace('&', '&', $value));
 			$this->getPage()->getCallbackClient()->setAttribute($this, 'href', $url);
 		}
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function setTarget($value)
 	{
-		if(parent::getTarget() === $value)
+		if(parent::getTarget()===$value)
 			return;
 
 		parent::setTarget($value);