pradosoft / prado

framework/I18N/core/IMessageSource.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * @param string a catalogue to load
 	 * @return boolean true if loaded, false otherwise.
 	 */
-	function load($catalogue = 'messages');	
+	function load($catalogue='messages');	
 	
 	/**
 	 * Get the translation table. This includes all the loaded sections.

framework/I18N/core/NumberFormat.php

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

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

framework/I18N/core/HTTPNegotiator.php

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;

framework/I18N/core/MessageSource_gettext.php

Spacing +94 added lines, -94 removed lines

@@ -45,23 +45,23 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.mo';
+	protected $dataExt='.mo';
 
 	/**
 	 * PO data filename extension
 	 * @var string
 	 */
-	protected $poExt = '.po';
+	protected $poExt='.po';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 
@@ -72,17 +72,17 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO',$filename);
+		$mo=TGettext::factory('MO', $filename);
 		$mo->load();
-		$result = $mo->toArray();
+		$result=$mo->toArray();
 
-		$results = array();
+		$results=array();
 		$count=0;
 		foreach($result['strings'] as $source => $target)
 		{
-			$results[$source][] = $target; //target
-			$results[$source][] = $count++; //id
-			$results[$source][] = ''; //comments
+			$results[$source][]=$target; //target
+			$results[$source][]=$count++; //id
+			$results[$source][]=''; //comments
 		}
 		return $results;
 	}
@@ -129,24 +129,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants=explode('_', $this->culture);
+		$source=$catalogue.$this->dataExt;
 
-		$catalogues = array($source);
+		$catalogues=array($source);
 
-		$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.$this->dataSeparator.
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.$this->dataSeparator.
 								$variant.$this->dataExt;
 			}
 		}
-		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -160,17 +160,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$catalogues = array();
+		$variants=explode('_', $this->culture);
+		$catalogues=array();
 
-		$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[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -186,14 +186,14 @@ 
 	 */
 	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
-			$po = $this->getPOFile($file);
+			$file=$this->getSource($variant);
+			$po=$this->getPOFile($file);
 			if(is_file($file) || is_file($po))
 				return array($variant, $file, $po);
 		}
@@ -202,7 +202,7 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
+		$filebase=substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
 		return $filebase.$this->poExt;
 	}
 
@@ -215,46 +215,46 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
-			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+			list($variant, $MOFile, $POFile)=$this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
-		$strings = array();
+		$strings=array();
 		foreach($messages as $message)
-			$strings[$message] = '';
+			$strings[$message]='';
 
 		//load the PO
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
-		$existing = count($result['strings']);
+		$existing=count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'],$strings);
+		$result['strings']=array_merge($result['strings'], $strings);
 
-		$new = count($result['strings']);
+		$new=count($result['strings']);
 
 		if($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
-			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+			$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
-			$mo = $po->toMO();
+			$mo=$po->toMO();
 			if($po->save() && $mo->save($MOFile))
 			{
 				if(!empty($this->cache))
@@ -275,30 +275,30 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if($string==$message)
 			{
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 				if($po->save() && $mo->save($MOFile))
 				{
 					if(!empty($this->cache))
@@ -323,31 +323,31 @@ 
 	 */
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
+			list($variant, $MOFile, $POFile)=$variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if(is_writable($MOFile)==false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if(is_writable($POFile)==false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO',$POFile);
+		$po=TGettext::factory('PO', $POFile);
 		$po->load();
-		$result = $po->toArray();
+		$result=$po->toArray();
 
 		foreach($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if($string==$text)
 			{
-				$result['strings'][$string] = $target;
-				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
+				$result['strings'][$string]=$target;
+				$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
 
 				$po->fromArray($result);
-				$mo = $po->toMO();
+				$mo=$po->toMO();
 
 				if($po->save() && $mo->save($MOFile))
 				{
@@ -379,42 +379,42 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir=null, $variant=null)
 	{
-		$dir = $dir?$dir:$this->source;
-		$files = scandir($dir);
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
 
-		$catalogue = array();
+		$catalogue=array();
 
 		foreach($files as $file)
 		{
 			if(is_dir($dir.'/'.$file)
-				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file))
+				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
-				$catalogue = array_merge($catalogue,
+				$catalogue=array_merge($catalogue,
 								$this->getCatalogues($dir.'/'.$file, $file));
 			}
 
-			$pos = strpos($file,$this->dataExt);
+			$pos=strpos($file, $this->dataExt);
 
-			if($pos >0
-				&& substr($file,-1*strlen($this->dataExt)) == $this->dataExt)
+			if($pos > 0
+				&& substr($file, -1 * strlen($this->dataExt))==$this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 				if(is_int($dot))
 				{
-					$culture = substr($name, $dot+1,strlen($name));
-					$cat = substr($name,0,$dot);
+					$culture=substr($name, $dot + 1, strlen($name));
+					$cat=substr($name, 0, $dot);
 				}
-				$details[0] = $cat;
-				$details[1] = $culture;
+				$details[0]=$cat;
+				$details[1]=$culture;
 
 
-				$catalogue[] = $details;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -424,29 +424,29 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$mo_file = $this->getSource($variant);
-		$po_file = $this->getPOFile($mo_file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$mo_file=$this->getSource($variant);
+		$po_file=$this->getPOFile($mo_file);
 
-		$dir = dirname($mo_file);
+		$dir=dirname($mo_file);
 		if(!is_dir($dir))
 		{
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 		if(!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO',$po_file);
-		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
-		$result['strings'] = array();
+		$po=TGettext::factory('PO', $po_file);
+		$result['meta']['PO-Revision-Date']=@date('Y-m-d H:i:s');
+		$result['strings']=array();
 
 		$po->fromArray($result);
-		$mo = $po->toMO();
+		$mo=$po->toMO();
 		if($po->save() && $mo->save($mo_file))
 			return array($variant, $mo_file, $po_file);
 		else

framework/I18N/core/NumberFormatInfo.php

Spacing +95 added lines, -95 removed lines

@@ -52,24 +52,24 @@ 
 	 * ICU number formatting data.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * The number pattern.
 	 * @var array
 	 */
-	protected $pattern = array();
+	protected $pattern=array();
 
-	const DECIMAL = 0;
-	const CURRENCY = 1;
-	const PERCENTAGE = 2;
-	const SCIENTIFIC = 3;
+	const DECIMAL=0;
+	const CURRENCY=1;
+	const PERCENTAGE=2;
+	const SCIENTIFIC=3;
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -78,7 +78,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -91,7 +91,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -109,12 +109,12 @@ 
 	 */
 	public function __construct($data=array(), $type=NumberFormatInfo::DECIMAL)
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
-		$this->data = $data;
+		$this->data=$data;
 
 		$this->setPattern($type);
 	}
@@ -128,16 +128,16 @@ 
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
 	{
 		if(is_int($type))
-			$this->pattern =
+			$this->pattern=
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
-			$this->pattern = $this->parsePattern($type);
+			$this->pattern=$this->parsePattern($type);
 
-		$this->pattern['negInfty'] =
+		$this->pattern['negInfty']=
 			$this->data['NumberElements'][6].
 			$this->data['NumberElements'][9];
 
-		$this->pattern['posInfty'] =
+		$this->pattern['posInfty']=
 			$this->data['NumberElements'][11].
 			$this->data['NumberElements'][9];
 	}
@@ -155,10 +155,10 @@ 
     public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
     {
         static $invariant;
-		if($invariant === null)
+		if($invariant===null)
         {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->NumberFormat;
+            $culture=CultureInfo::getInvariantCulture();
+            $invariant=$culture->NumberFormat;
             $invariant->setPattern($type);
         }
 		return $invariant;
@@ -179,23 +179,23 @@ 
     public static function getInstance($culture=null,
     								   $type=NumberFormatInfo::DECIMAL)
     {
-   		if ($culture instanceof CultureInfo)
+   		if($culture instanceof CultureInfo)
    		{
-            $formatInfo = $culture->NumberFormat;
+            $formatInfo=$culture->NumberFormat;
             $formatInfo->setPattern($type);
             return $formatInfo;
    		}
        	else if(is_string($culture))
        	{
-       		$cultureInfo = new CultureInfo($culture);
-       		$formatInfo = $cultureInfo->NumberFormat;
+       		$cultureInfo=new CultureInfo($culture);
+       		$formatInfo=$cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
        	}
        	else
        	{
-            $cultureInfo = new CultureInfo();
-       		$formatInfo = $cultureInfo->NumberFormat;
+            $cultureInfo=new CultureInfo();
+       		$formatInfo=$cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
        	}
@@ -241,67 +241,67 @@ 
      */
     protected function parsePattern($pattern)
 	{
-		$pattern = explode(';',$pattern);
+		$pattern=explode(';', $pattern);
 
-		$negative = null;
+		$negative=null;
 		if(count($pattern) > 1)
-			$negative = $pattern[1];
-		$pattern = $pattern[0];
+			$negative=$pattern[1];
+		$pattern=$pattern[0];
 
-		$comma = ',';
-		$dot = '.';
-		$digit = '0';
-		$hash = '#';
+		$comma=',';
+		$dot='.';
+		$digit='0';
+		$hash='#';
 
 		//find the first group point, and decimal point
-		$groupPos1 = strrpos($pattern,$comma);
-		$decimalPos = strrpos($pattern,$dot);
+		$groupPos1=strrpos($pattern, $comma);
+		$decimalPos=strrpos($pattern, $dot);
 
-		$groupPos2 = false;
-		$groupSize1 = false;
-		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$groupPos2=false;
+		$groupSize1=false;
+		$groupSize2=false;
+		$decimalPoints=is_int($decimalPos) ?-1 : false;
 
-		$info['negPref'] = $this->data['NumberElements'][6];
-		$info['negPost'] = '';
+		$info['negPref']=$this->data['NumberElements'][6];
+		$info['negPost']='';
 
-		$info['negative'] = $negative;
-		$info['positive'] = $pattern;
+		$info['negative']=$negative;
+		$info['positive']=$pattern;
 
 		//find the negative prefix and postfix
 		if($negative)
 		{
-			$prefixPostfix = $this->getPrePostfix($negative);
-			$info['negPref'] = $prefixPostfix[0];
-			$info['negPost'] = $prefixPostfix[1];
+			$prefixPostfix=$this->getPrePostfix($negative);
+			$info['negPref']=$prefixPostfix[0];
+			$info['negPost']=$prefixPostfix[1];
 		}
 
-		$posfix = $this->getPrePostfix($pattern);
-		$info['posPref'] = $posfix[0];
-		$info['posPost'] = $posfix[1];
+		$posfix=$this->getPrePostfix($pattern);
+		$info['posPref']=$posfix[0];
+		$info['posPost']=$posfix[1];
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
 		if(is_int($groupPos1))
 		{
 			//get the second group
-			$groupPos2 = strrpos(substr($pattern,0,$groupPos1),$comma);
+			$groupPos2=strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
 			if(is_int($decimalPos))
 			{
-				$groupSize1 = $decimalPos - $groupPos1-1;
+				$groupSize1=$decimalPos - $groupPos1 - 1;
 
 			}
 			else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
-				for($i=strlen($pattern)-1; $i>=0; $i--)
+				for($i=strlen($pattern) - 1; $i >= 0; $i--)
 				{
-					if($pattern{$i} == $digit || $pattern{$i}==$hash)
+					if($pattern{$i}==$digit || $pattern{$i}==$hash)
 					{
-						$groupSize1 = $i - $groupPos1;
+						$groupSize1=$i - $groupPos1;
 						break;
 					}
 				}
@@ -309,36 +309,36 @@ 
 
 			//get the second group size
 			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+				$groupSize2=$groupPos1 - $groupPos2 - 1;
 		}
 
 		if(is_int($decimalPos))
 		{
-			for($i=strlen($pattern)-1; $i>=0; $i--)
+			for($i=strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
-				if($pattern{$i} == $digit)
+				if($pattern{$i}==$dot) break;
+				if($pattern{$i}==$digit)
 				{
-					$decimalPoints = $i - $decimalPos;
+					$decimalPoints=$i - $decimalPos;
 					break;
 				}
 			}
 		}
 
 		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$decimalPos);
+			$digitPattern=substr($pattern, 0, $decimalPos);
 		else
-			$digitPattern  = $pattern;
+			$digitPattern=$pattern;
 
-		$digitPattern  = preg_replace('/[^0]/','',$digitPattern);
+		$digitPattern=preg_replace('/[^0]/', '', $digitPattern);
 
-		$info['groupPos1'] = $groupPos1;
-		$info['groupSize1'] = $groupSize1;
-		$info['groupPos2'] = $groupPos2;
-		$info['groupSize2'] = $groupSize2;
-		$info['decimalPos'] = $decimalPos;
-		$info['decimalPoints'] = $decimalPoints;
-		$info['digitSize'] = strlen($digitPattern);
+		$info['groupPos1']=$groupPos1;
+		$info['groupSize1']=$groupSize1;
+		$info['groupPos2']=$groupPos2;
+		$info['groupSize2']=$groupSize2;
+		$info['decimalPos']=$decimalPos;
+		$info['decimalPoints']=$decimalPoints;
+		$info['digitSize']=strlen($digitPattern);
 		return $info;
 	}
 
@@ -349,9 +349,9 @@ 
 	 */
 	protected function getPrePostfix($pattern)
 	{
-		$regexp = '/[#,\.0]+/';
-		$result = preg_split($regexp, $pattern);
-		return array($result[0],$result[1]);
+		$regexp='/[#,\.0]+/';
+		$result=preg_split($regexp, $pattern);
+		return array($result[0], $result[1]);
 	}
 
 
@@ -370,7 +370,7 @@ 
      */
     function setDecimalDigits($value)
     {
-    	return $this->pattern['decimalPoints'] = $value;
+    	return $this->pattern['decimalPoints']=$value;
     }
 
     function getDigitSize()
@@ -380,7 +380,7 @@ 
 
     function setDigitSize($value)
     {
-    	$this->pattern['digitSize'] = $value;
+    	$this->pattern['digitSize']=$value;
     }
 
     /**
@@ -398,7 +398,7 @@ 
      */
     function setDecimalSeparator($value)
     {
-    	return $this->data['NumberElements'][0] = $value;
+    	return $this->data['NumberElements'][0]=$value;
     }
 
     /**
@@ -418,7 +418,7 @@ 
      */
     function setGroupSeparator($value)
     {
-    	return $this->data['NumberElements'][1] = $value;
+    	return $this->data['NumberElements'][1]=$value;
     }
 
     /**
@@ -430,8 +430,8 @@ 
      */
     function getGroupSizes()
     {
-    	$group1 = $this->pattern['groupSize1'];
-    	$group2 = $this->pattern['groupSize2'];
+    	$group1=$this->pattern['groupSize1'];
+    	$group2=$this->pattern['groupSize2'];
 
     	return array($group1, $group2);
     }
@@ -445,8 +445,8 @@ 
      */
     function setGroupSizes($groupSize)
     {
-   		$this->pattern['groupSize1'] = $groupSize[0];
-   		$this->pattern['groupSize2'] = $groupSize[1];
+   		$this->pattern['groupSize1']=$groupSize[0];
+   		$this->pattern['groupSize2']=$groupSize[1];
     }
 
     /**
@@ -457,8 +457,8 @@ 
      */
     function getNegativePattern()
     {
-    	$prefix = $this->pattern['negPref'];
-    	$postfix = $this->pattern['negPost'];
+    	$prefix=$this->pattern['negPref'];
+    	$postfix=$this->pattern['negPost'];
     	return array($prefix, $postfix);
     }
 
@@ -470,8 +470,8 @@ 
      */
     function setNegativePattern($pattern)
     {
-    	$this->pattern['negPref'] = $pattern[0];
-    	$this->pattern['negPost'] = $pattern[1];
+    	$this->pattern['negPref']=$pattern[0];
+    	$this->pattern['negPost']=$pattern[1];
     }
 
     /**
@@ -482,8 +482,8 @@ 
      */
     function getPositivePattern()
     {
-    	$prefix = $this->pattern['posPref'];
-    	$postfix = $this->pattern['posPost'];
+    	$prefix=$this->pattern['posPref'];
+    	$postfix=$this->pattern['posPost'];
     	return array($prefix, $postfix);
     }
 
@@ -495,8 +495,8 @@ 
      */
     function setPositivePattern($pattern)
     {
-    	$this->pattern['posPref'] = $pattern[0];
-    	$this->pattern['posPost'] = $pattern[1];
+    	$this->pattern['posPref']=$pattern[0];
+    	$this->pattern['posPost']=$pattern[1];
     }
 
     /**
@@ -518,7 +518,7 @@ 
      */
     function setCurrencySymbol($symbol)
     {
-    	$this->pattern['symbol'] = $symbol;
+    	$this->pattern['symbol']=$symbol;
     }
 
     /**
@@ -536,7 +536,7 @@ 
      */
     function setNegativeInfinitySymbol($value)
     {
-		$this->pattern['negInfty'] = $value;
+		$this->pattern['negInfty']=$value;
     }
 
     /**
@@ -554,7 +554,7 @@ 
      */
     function setPositiveInfinitySymbol($value)
     {
-		$this->pattern['posInfty'] = $value;
+		$this->pattern['posInfty']=$value;
     }
 
     /**
@@ -572,7 +572,7 @@ 
      */
     function setNegativeSign($value)
     {
-    	$this->data['NumberElements'][6] = $value;
+    	$this->data['NumberElements'][6]=$value;
     }
 
     /**
@@ -590,7 +590,7 @@ 
      */
     function setPositiveSign($value)
     {
-    	$this->data['NumberElements'][11] = $value;
+    	$this->data['NumberElements'][11]=$value;
     }
 
     /**
@@ -608,7 +608,7 @@ 
      */
     function setNaNSymbol($value)
     {
-    	$this->data['NumberElements'][10] = $value;
+    	$this->data['NumberElements'][10]=$value;
     }
 
     /**
@@ -626,7 +626,7 @@ 
      */
     function setPercentSymbol($value)
     {
-    	$this->data['NumberElements'][3] = $value;
+    	$this->data['NumberElements'][3]=$value;
     }
 
     /**
@@ -644,7 +644,7 @@ 
      */
     function setPerMilleSymbol($value)
     {
-    	$this->data['NumberElements'][8] = $value;
+    	$this->data['NumberElements'][8]=$value;
     }
 }
 

framework/I18N/core/CultureInfo.php

Spacing +91 added lines, -91 removed lines

@@ -51,13 +51,13 @@ 
 	 * ICU data filename extension.
 	 * @var string
 	 */
-	private $dataFileExt = '.dat';
+	private $dataFileExt='.dat';
 
 	/**
 	 * The ICU data array.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * The current culture.
@@ -75,7 +75,7 @@ 
 	 * A list of ICU date files loaded.
 	 * @var array
 	 */
-	private $dataFiles = array();
+	private $dataFiles=array();
 
 	/**
 	 * The current date time format info.
@@ -93,28 +93,28 @@ 
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * Culture type, all.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const ALL = 0;
+	const ALL=0;
 
 	/**
 	 * Culture type, neutral.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const NEUTRAL = 1;
+	const NEUTRAL=1;
 
 	/**
 	 * Culture type, specific.
 	 * @see getCultures()
 	 * @var int
 	 */
-	const SPECIFIC = 2;
+	const SPECIFIC=2;
 
 	/**
 	 * Display the culture name.
@@ -134,7 +134,7 @@ 
 	 */
 	function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -147,7 +147,7 @@ 
 	 */
 	function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -165,13 +165,13 @@ 
 	 */
 	function __construct($culture='en')
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($culture))
-			$culture = 'en';
+			$culture='en';
 
-		$this->dataDir = $this->dataDir();
-		$this->dataFileExt = $this->fileExt();
+		$this->dataDir=$this->dataDir();
+		$this->dataFileExt=$this->fileExt();
 
 		$this->setCulture($culture);
 
@@ -204,9 +204,9 @@ 
 	*/
 	public static function getInstance($culture)
 	{
-		static $instances = array();
+		static $instances=array();
 		if(!isset($instances[$culture]))
-			$instances[$culture] = new CultureInfo($culture);
+			$instances[$culture]=new CultureInfo($culture);
 		return $instances[$culture];
 	}
 
@@ -233,11 +233,11 @@ 
 	{
 		if(!empty($culture))
 		{
-			if (!preg_match('/^[_\\w]+$/', $culture))
-				throw new Exception('Invalid culture supplied: ' . $culture);
+			if(!preg_match('/^[_\\w]+$/', $culture))
+				throw new Exception('Invalid culture supplied: '.$culture);
 		}
 
-		$this->culture = $culture;
+		$this->culture=$culture;
 	}
 
 	/**
@@ -246,30 +246,30 @@ 
 	 */
 	protected function loadCultureData($culture)
 	{
-		$file_parts = explode('_',$culture);
-		$current_part = $file_parts[0];
+		$file_parts=explode('_', $culture);
+		$current_part=$file_parts[0];
 
-		$files = array($current_part);
+		$files=array($current_part);
 
-		for($i = 1, $k = count($file_parts); $i < $k; ++$i)
+		for($i=1, $k=count($file_parts); $i < $k; ++$i)
 		{
-			$current_part .= '_'.$file_parts[$i];
-			$files[] = $current_part;
+			$current_part.='_'.$file_parts[$i];
+			$files[]=$current_part;
 		}
 
 		foreach($files as $file)
 		{
-			$filename = $this->dataDir.$file.$this->dataFileExt;
+			$filename=$this->dataDir.$file.$this->dataFileExt;
 
-			if(is_file($filename) == false)
+			if(is_file($filename)==false)
 				throw new Exception('Data file for "'.$file.'" was not found.');
 
-			if(in_array($filename, $this->dataFiles) === false)
+			if(in_array($filename, $this->dataFiles)===false)
 			{
 				array_unshift($this->dataFiles, $file);
 
-				$data = &$this->getData($filename);
-				$this->data[$file] = &$data;
+				$data=&$this->getData($filename);
+				$this->data[$file]=&$data;
 
 				if(isset($data['__ALIAS']))
 					$this->loadCultureData($data['__ALIAS'][0]);
@@ -287,13 +287,13 @@ 
 	 */
 	protected function &getData($filename)
 	{
-		static $data = array();
-		static $files = array();
+		static $data=array();
+		static $files=array();
 
 		if(!in_array($filename, $files))
 		{
-			$data[$filename] = unserialize(file_get_contents($filename));
-			$files[] = $filename;
+			$data[$filename]=unserialize(file_get_contents($filename));
+			$files[]=$filename;
 		}
 
 		return $data[$filename];
@@ -315,15 +315,15 @@ 
 	 */
 	protected function findInfo($path='/', $merge=false)
 	{
-		$result = array();
+		$result=array();
 		foreach($this->dataFiles as $section)
 		{
-			$info = $this->searchArray($this->data[$section], $path);
+			$info=$this->searchArray($this->data[$section], $path);
 
 			if($info)
 			{
 				if($merge)
-					$result = array_merge($info,$result);
+					$result=array_merge($info, $result);
 				else
 					return $info;
 			}
@@ -342,16 +342,16 @@ 
 	 */
 	private function searchArray($info, $path='/')
 	{
-		$index = explode('/',$path);
+		$index=explode('/', $path);
 
-		$array = $info;
+		$array=$info;
 
-		for($i = 0, $k = count($index); $i < $k; ++$i)
+		for($i=0, $k=count($index); $i < $k; ++$i)
 		{
-			$value = $index[$i];
-			if($i < $k-1 && isset($array[$value]))
-				$array = $array[$value];
-			else if ($i == $k-1 && isset($array[$value]))
+			$value=$index[$i];
+			if($i < $k - 1 && isset($array[$value]))
+				$array=$array[$value];
+			else if($i==$k - 1 && isset($array[$value]))
 				return $array[$value];
 		}
 	}
@@ -373,10 +373,10 @@ 
 	 */
 	function getDateTimeFormat()
 	{
-		if($this->dateTimeFormat === null)
+		if($this->dateTimeFormat===null)
 		{
-			$calendar = $this->getCalendar();
-			$info = $this->findInfo("calendar/{$calendar}", true);
+			$calendar=$this->getCalendar();
+			$info=$this->findInfo("calendar/{$calendar}", true);
 			$this->setDateTimeFormat(new DateTimeFormatInfo($info));
 		}
 
@@ -389,7 +389,7 @@ 
 	 */
 	function setDateTimeFormat($dateTimeFormat)
 	{
-		$this->dateTimeFormat = $dateTimeFormat;
+		$this->dateTimeFormat=$dateTimeFormat;
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getCalendar()
 	{
-		$info = $this->findInfo('calendar/default');
+		$info=$this->findInfo('calendar/default');
 		return $info[0];
 	}
 
@@ -410,10 +410,10 @@ 
 	 */
 	function getNativeName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$language = $this->findInfo("Languages/{$lang}");
-		$region = $this->findInfo("Countries/{$reg}");
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$language=$this->findInfo("Languages/{$lang}");
+		$region=$this->findInfo("Countries/{$reg}");
 		if($region)
 			return $language[0].' ('.$region[0].')';
 		else
@@ -428,15 +428,15 @@ 
 	 */
 	function getEnglishName()
 	{
-		$lang = substr($this->culture,0,2);
-		$reg = substr($this->culture,3,2);
-		$culture = $this->getInvariantCulture();
+		$lang=substr($this->culture, 0, 2);
+		$reg=substr($this->culture, 3, 2);
+		$culture=$this->getInvariantCulture();
 
-		$language = $culture->findInfo("Languages/{$lang}");
-		if(count($language) == 0)
+		$language=$culture->findInfo("Languages/{$lang}");
+		if(count($language)==0)
 			return $this->culture;
 
-		$region = $culture->findInfo("Countries/{$reg}");
+		$region=$culture->findInfo("Countries/{$reg}");
 		if($region)
 			return $language[0].' ('.$region[0].')';
 		else
@@ -453,8 +453,8 @@ 
 	static function getInvariantCulture()
 	{
 		static $invariant;
-		if($invariant === null)
-			$invariant = new CultureInfo();
+		if($invariant===null)
+			$invariant=new CultureInfo();
 		return $invariant;
 	}
 
@@ -466,7 +466,7 @@ 
 	 */
 	function getIsNeutralCulture()
 	{
-		return strlen($this->culture) == 2;
+		return strlen($this->culture)==2;
 	}
 
 	/**
@@ -476,12 +476,12 @@ 
 	 */
 	function getNumberFormat()
 	{
-		if($this->numberFormat === null)
+		if($this->numberFormat===null)
 		{
-			$elements = $this->findInfo('NumberElements');
-			$patterns = $this->findInfo('NumberPatterns');
-			$currencies = $this->getCurrencies();
-			$data = array(	'NumberElements'=>$elements,
+			$elements=$this->findInfo('NumberElements');
+			$patterns=$this->findInfo('NumberPatterns');
+			$currencies=$this->getCurrencies();
+			$data=array('NumberElements'=>$elements,
 							'NumberPatterns'=>$patterns,
 							'Currencies' => $currencies);
 
@@ -496,7 +496,7 @@ 
 	 */
 	function setNumberFormat($numberFormat)
 	{
-		$this->numberFormat = $numberFormat;
+		$this->numberFormat=$numberFormat;
 	}
 
 	/**
@@ -506,10 +506,10 @@ 
 	 */
 	function getParent()
 	{
-		if(strlen($this->culture) == 2)
+		if(strlen($this->culture)==2)
 			return $this->getInvariantCulture();
 
-		$lang = substr($this->culture,0,2);
+		$lang=substr($this->culture, 0, 2);
 			return new CultureInfo($lang);
 	}
 
@@ -524,24 +524,24 @@ 
 	 */
 	static function getCultures($type=CultureInfo::ALL)
 	{
-		$dataDir = CultureInfo::dataDir();
-		$dataExt = CultureInfo::fileExt();
-		$dir = dir($dataDir);
+		$dataDir=CultureInfo::dataDir();
+		$dataExt=CultureInfo::fileExt();
+		$dir=dir($dataDir);
 
-		$neutral = array();
-		$specific = array();
+		$neutral=array();
+		$specific=array();
 
-		while (false !== ($entry = $dir->read()))
+		while(false!==($entry=$dir->read()))
 		{
 			if(is_file($dataDir.$entry)
-				&& substr($entry,-4) == $dataExt
-				&& $entry != 'root'.$dataExt)
+				&& substr($entry, -4)==$dataExt
+				&& $entry!='root'.$dataExt)
 			{
-				$culture = substr($entry,0,-4);
-				if(strlen($culture) == 2)
-					$neutral[] = $culture;
+				$culture=substr($entry, 0, -4);
+				if(strlen($culture)==2)
+					$neutral[]=$culture;
 				else
-					$specific[] = $culture;
+					$specific[]=$culture;
 			}
 		}
 		$dir->close();
@@ -549,7 +549,7 @@ 
 		switch($type)
 		{
 			case CultureInfo::ALL :
-				$all = 	array_merge($neutral, $specific);
+				$all=array_merge($neutral, $specific);
 				sort($all);
 				return $all;
 				break;
@@ -571,12 +571,12 @@ 
 	 */
 	private function simplify($array)
 	{
-		for($i = 0, $k = count($array); $i<$k; ++$i)
+		for($i=0, $k=count($array); $i < $k; ++$i)
 		{
-			$key = key($array);
+			$key=key($array);
 			if(is_array($array[$key])
-				&& count($array[$key]) == 1)
-				$array[$key] = $array[$key][0];
+				&& count($array[$key])==1)
+				$array[$key]=$array[$key][0];
 			next($array);
 		}
 		return $array;
@@ -588,7 +588,7 @@ 
 	 */
 	function getCountries()
 	{
-		return $this->simplify($this->findInfo('Countries',true));
+		return $this->simplify($this->findInfo('Countries', true));
 	}
 
 	/**
@@ -597,7 +597,7 @@ 
 	 */
 	function getCurrencies()
 	{
-		return $this->findInfo('Currencies',true);
+		return $this->findInfo('Currencies', true);
 	}
 
 	/**
@@ -606,7 +606,7 @@ 
 	 */
 	function getLanguages()
 	{
-		return $this->simplify($this->findInfo('Languages',true));
+		return $this->simplify($this->findInfo('Languages', true));
 	}
 
 	/**
@@ -615,7 +615,7 @@ 
 	 */
 	function getScripts()
 	{
-		return $this->simplify($this->findInfo('Scripts',true));
+		return $this->simplify($this->findInfo('Scripts', true));
 	}
 
 	/**
@@ -624,7 +624,7 @@ 
 	 */
 	function getTimeZones()
 	{
-		return $this->simplify($this->findInfo('zoneStrings',true));
+		return $this->simplify($this->findInfo('zoneStrings', true));
 	}
 }
 

framework/I18N/Translation.php

Spacing +10 added lines, -10 removed lines

@@ -43,9 +43,9 @@ 
 		//initialized the default class wide formatter
 		if(!isset(self::$formatters[$catalogue]))
 		{
-			$app = Prado::getApplication()->getGlobalization();
-			$config = $app->getTranslationConfiguration();
-			$source = MessageSource::factory($config['type'],
+			$app=Prado::getApplication()->getGlobalization();
+			$config=$app->getTranslationConfiguration();
+			$source=MessageSource::factory($config['type'],
 											$config['source'],
 											$config['filename']);
 
@@ -54,11 +54,11 @@ 
 			if(TPropertyValue::ensureBoolean($config['cache']))
 				$source->setCache(new MessageCache($config['cache']));
 
-			self::$formatters[$catalogue] = new MessageFormat($source, $app->getCharset());
+			self::$formatters[$catalogue]=new MessageFormat($source, $app->getCharset());
 
 			//mark untranslated text
 			if($ps=$config['marker'])
-				self::$formatters[$catalogue]->setUntranslatedPS(array($ps,$ps));
+				self::$formatters[$catalogue]->setUntranslatedPS(array($ps, $ps));
 
 			//save the message on end request
 			// Do it only once !
@@ -86,21 +86,21 @@ 
 	 */
 	public static function saveMessages()
 	{
-		static $onceonly = true;
+		static $onceonly=true;
 
 		if($onceonly)
 		{
-			foreach (self::$formatters as $catalogue=>$formatter)
+			foreach(self::$formatters as $catalogue=>$formatter)
 			{
-				$app = Prado::getApplication()->getGlobalization();
-				$config = $app->getTranslationConfiguration();
+				$app=Prado::getApplication()->getGlobalization();
+				$config=$app->getTranslationConfiguration();
 				if(isset($config['autosave']))
 				{
 					$formatter->getSource()->setCulture($app->getCulture());
 					$formatter->getSource()->save($catalogue);
 				}
 			}
-			$onceonly = false;
+			$onceonly=false;
 		}
 	}
 }