pradosoft / prado

framework/I18N/core/MessageCache.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
  */
 use Exception;
 
-require_once(dirname(__FILE__) . '/TCache_Lite.php');
+require_once(dirname(__FILE__).'/TCache_Lite.php');
 
 /**
  * Cache the translation table into the file system.
@@ -41,15 +41,15 @@ 
 	 */
 	public function __construct($cacheDir)
 	{
-		$cacheDir = $cacheDir . '/';
+		$cacheDir = $cacheDir.'/';
 
-		if(!is_dir($cacheDir))
+		if (!is_dir($cacheDir))
 			throw new Exception(
-				'The cache directory ' . $cacheDir . ' does not exists.' .
+				'The cache directory '.$cacheDir.' does not exists.'.
 				'The cache directory must be writable by the server.');
-		if(!is_writable($cacheDir))
+		if (!is_writable($cacheDir))
 			throw new Exception(
-				'The cache directory ' . $cacheDir . ' must be writable ' .
+				'The cache directory '.$cacheDir.' must be writable '.
 				'by the server.');
 
 		$options = [
@@ -76,7 +76,7 @@ 
 	 */
 	public function setLifeTime($time)
 	{
-		$this->lifetime = (int)$time;
+		$this->lifetime = (int) $time;
 	}
 
 	/**
@@ -86,7 +86,7 @@ 
 	 */
 	protected function getID($catalogue, $culture)
 	{
-		return $catalogue . ':' . $culture;
+		return $catalogue.':'.$culture;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	protected function getGroup($catalogue, $culture)
 	{
-		return $catalogue . ':' . get_class($this);
+		return $catalogue.':'.get_class($this);
 	}
 
 	/**
@@ -117,13 +117,13 @@ 
 
 		$cache = $this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
+		if (is_file($cache) == false)
 			return false;
 
 
-		$lastmodified = (int)$lastmodified;
+		$lastmodified = (int) $lastmodified;
 
-		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
+		if ($lastmodified <= 0 || $lastmodified > filemtime($cache))
 			return false;
 
 		//echo '@@ Cache hit: "'.$ID.'" : "'.$group.'"';

Braces +12 added lines, -8 removed lines

@@ -43,14 +43,16 @@ 
 	{
 		$cacheDir = $cacheDir . '/';
 
-		if(!is_dir($cacheDir))
-			throw new Exception(
+		if(!is_dir($cacheDir)) {
+					throw new Exception(
 				'The cache directory ' . $cacheDir . ' does not exists.' .
 				'The cache directory must be writable by the server.');
-		if(!is_writable($cacheDir))
-			throw new Exception(
+		}
+		if(!is_writable($cacheDir)) {
+					throw new Exception(
 				'The cache directory ' . $cacheDir . ' must be writable ' .
 				'by the server.');
+		}
 
 		$options = [
 			'cacheDir' => $cacheDir,
@@ -117,14 +119,16 @@ 
 
 		$cache = $this->cache->getCacheFile();
 
-		if(is_file($cache) == false)
-			return false;
+		if(is_file($cache) == false) {
+					return false;
+		}
 
 
 		$lastmodified = (int)$lastmodified;
 
-		if($lastmodified <= 0 || $lastmodified > filemtime($cache))
-			return false;
+		if($lastmodified <= 0 || $lastmodified > filemtime($cache)) {
+					return false;
+		}
 
 		//echo '@@ Cache hit: "'.$ID.'" : "'.$group.'"';
 		//echo "<br>\n";

framework/I18N/core/MessageSource_PHP.php

Spacing +44 added lines, -44 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($php = include($filename))) {
+		if (false === ($php = include($filename))) {
 			return false;
 		}
 
@@ -74,12 +74,12 @@ 
 
 		$translations = [];
 
-		foreach($translationUnit as $k => $unit)
+		foreach ($translationUnit as $k => $unit)
 		{
-			$source = (string)$unit['source'];
-			$translations[$source][] = (string)$unit['target'];
-			$translations[$source][] = (string)$k;
-			$translations[$source][] = array_key_exists('note', $unit) ? (string)$unit['note'] : '';
+			$source = (string) $unit['source'];
+			$translations[$source][] = (string) $unit['target'];
+			$translations[$source][] = (string) $k;
+			$translations[$source][] = array_key_exists('note', $unit) ? (string) $unit['note'] : '';
 		}
 
 		return $translations;
@@ -104,7 +104,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -125,16 +125,16 @@ 
 	protected function getCatalogueList($catalogue)
 	{
 		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
+		$source = $catalogue.$this->dataExt;
 		$catalogues = [$source];
 		$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}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
+				$variant .= ($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
 			}
 		}
 
@@ -155,12 +155,12 @@ 
 		$catalogues = [];
 		$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}))
+			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;
 			}
 		}
 
@@ -186,28 +186,28 @@ 
 	 */
 	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 		$catalogue = [];
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+			if (is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
-					$this->getCatalogues($dir . '/' . $file, $file)
+					$this->getCatalogues($dir.'/'.$file, $file)
 				);
 			}
 
 			$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;
 
-				if(is_int($dot))
+				if (is_int($dot))
 				{
 					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
@@ -232,14 +232,14 @@ 
 	 */
 	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
-			if(is_file($file)) {
+			if (is_file($file)) {
 				return [$variant, $file];
 			}
 		}
@@ -251,10 +251,10 @@ 
 		$php['info']['date'] = @date('Y-m-d\TH:i:s\Z');
 
 		//save it and clear the cache for this variant
-		if(false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';'))
+		if (false === file_put_contents($filename, "<?php\nreturn ".var_export($php, true).';'))
 			return false;
 
-		if(!empty($this->cache))
+		if (!empty($this->cache))
 			$this->cache->clean($variant, $this->culture);
 
 		return true;
@@ -270,19 +270,19 @@ 
 	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if(count($messages) <= 0) {
+		if (count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -290,7 +290,7 @@ 
 		$php = include($filename);
 
 		//for each message add it to the XML file using DOM
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$php['trans-unit'][] = [
 				'source' => $message,
@@ -313,13 +313,13 @@ 
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -327,12 +327,12 @@ 
 		$php = include($filename);
 
 		//for each of the existin units
-		foreach($php['trans-unit'] as $k => $unit)
+		foreach ($php['trans-unit'] as $k => $unit)
 		{
-			if($unit['source'] == $text)
+			if ($unit['source'] == $text)
 			{
 				$php['trans-unit'][$k]['target'] = $target;
-				if(!empty($comments))
+				if (!empty($comments))
 					$php['trans-unit'][$k]['note'] = $comments;
 
 				break;
@@ -351,13 +351,13 @@ 
 	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -365,9 +365,9 @@ 
 		$php = include($filename);
 
 		//for each of the existin units
-		foreach($php['trans-unit'] as $k => $unit)
+		foreach ($php['trans-unit'] as $k => $unit)
 		{
-			if($unit['source'] == $message)
+			if ($unit['source'] == $message)
 			{
 				unset($php['trans-unit'][$k]);
 				return $this->internalSaveFile($php, $filename, $variant);
@@ -379,7 +379,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		
@@ -388,12 +388,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			@mkdir($dir);
 			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}
 		

Braces +9 added lines, -6 removed lines

@@ -251,11 +251,13 @@ 
 		$php['info']['date'] = @date('Y-m-d\TH:i:s\Z');
 
 		//save it and clear the cache for this variant
-		if(false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';'))
-			return false;
+		if(false === file_put_contents($filename, "<?php\nreturn " . var_export($php, true) . ';')) {
+					return false;
+		}
 
-		if(!empty($this->cache))
-			$this->cache->clean($variant, $this->culture);
+		if(!empty($this->cache)) {
+					$this->cache->clean($variant, $this->culture);
+		}
 
 		return true;
 	}
@@ -332,8 +334,9 @@ 
 			if($unit['source'] == $text)
 			{
 				$php['trans-unit'][$k]['target'] = $target;
-				if(!empty($comments))
-					$php['trans-unit'][$k]['note'] = $comments;
+				if(!empty($comments)) {
+									$php['trans-unit'][$k]['note'] = $comments;
+				}
 
 				break;
 			}

framework/I18N/core/util.php

Spacing +2 added lines, -2 removed lines

@@ -162,7 +162,7 @@ 
 	 */
 	function I18N_toUTF8($string, $from)
 	{
-		if($from != 'UTF-8')
+		if ($from != 'UTF-8')
 		{
 			$s = iconv($from, 'UTF-8', $string); //to UTF-8
 			return $s !== false ? $s : $string; //it could return false
@@ -178,7 +178,7 @@ 
 	 */
 	function I18N_toEncoding($string, $to)
 	{
-		if($to != 'UTF-8')
+		if ($to != 'UTF-8')
 		{
 			$s = iconv('UTF-8', $to, $string);
 			return $s !== false ? $s : $string;

framework/I18N/core/NumberFormatInfo.php

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
  */
 use Exception;
 
-require_once(dirname(__FILE__) . '/CultureInfo.php');
+require_once(dirname(__FILE__).'/CultureInfo.php');
 
 /**
  * NumberFormatInfo class
@@ -80,11 +80,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get' . $name;
-		if(in_array($getProperty, $this->properties))
+		$getProperty = 'get'.$name;
+		if (in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property ' . $name . ' does not exists.');
+			throw new Exception('Property '.$name.' does not exists.');
 	}
 
 	/**
@@ -93,11 +93,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set' . $name;
-		if(in_array($setProperty, $this->properties))
+		$setProperty = 'set'.$name;
+		if (in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property ' . $name . ' can not be set.');
+			throw new Exception('Property '.$name.' can not be set.');
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
+		if (empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
 		$this->data = $data;
@@ -129,18 +129,18 @@ 
 	 */
 	public function setPattern($type = NumberFormatInfo::DECIMAL)
 	{
-		if(is_int($type))
+		if (is_int($type))
 			$this->pattern =
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
 			$this->pattern = $this->parsePattern($type);
 
 		$this->pattern['negInfty'] =
-			$this->data['NumberElements'][6] .
+			$this->data['NumberElements'][6].
 			$this->data['NumberElements'][9];
 
 		$this->pattern['posInfty'] =
-			$this->data['NumberElements'][11] .
+			$this->data['NumberElements'][11].
 			$this->data['NumberElements'][9];
 	}
 
@@ -157,7 +157,7 @@ 
 	public static function getInvariantInfo($type = NumberFormatInfo::DECIMAL)
 	{
 		static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
 		{
 			$culture = CultureInfo::getInvariantCulture();
 			$invariant = $culture->NumberFormat;
@@ -187,7 +187,7 @@ 
 			$formatInfo->setPattern($type);
 			return $formatInfo;
 		}
-		   elseif(is_string($culture))
+		   elseif (is_string($culture))
 		   {
 			   $cultureInfo = new CultureInfo($culture);
 			   $formatInfo = $cultureInfo->NumberFormat;
@@ -246,7 +246,7 @@ 
 		$pattern = explode(';', $pattern);
 
 		$negative = null;
-		if(count($pattern) > 1)
+		if (count($pattern) > 1)
 			$negative = $pattern[1];
 		$pattern = $pattern[0];
 
@@ -262,7 +262,7 @@ 
 		$groupPos2 = false;
 		$groupSize1 = false;
 		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$decimalPoints = is_int($decimalPos) ?-1 : false;
 
 		$info['negPref'] = $this->data['NumberElements'][6];
 		$info['negPost'] = '';
@@ -271,7 +271,7 @@ 
 		$info['positive'] = $pattern;
 
 		//find the negative prefix and postfix
-		if($negative)
+		if ($negative)
 		{
 			$prefixPostfix = $this->getPrePostfix($negative);
 			$info['negPref'] = $prefixPostfix[0];
@@ -284,13 +284,13 @@ 
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
-		if(is_int($groupPos1))
+		if (is_int($groupPos1))
 		{
 			//get the second group
 			$groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
-			if(is_int($decimalPos))
+			if (is_int($decimalPos))
 			{
 				$groupSize1 = $decimalPos - $groupPos1 - 1;
 
@@ -299,9 +299,9 @@ 
 			{
 				//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;
 						break;
@@ -310,16 +310,16 @@ 
 			}
 
 			//get the second group size
-			if(is_int($groupPos2))
+			if (is_int($groupPos2))
 				$groupSize2 = $groupPos1 - $groupPos2 - 1;
 		}
 
-		if(is_int($decimalPos))
+		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;
 					break;
@@ -327,7 +327,7 @@ 
 			}
 		}
 
-		if(is_int($decimalPos))
+		if (is_int($decimalPos))
 			$digitPattern = substr($pattern, 0, $decimalPos);
 		else
 			$digitPattern = $pattern;
@@ -353,7 +353,7 @@ 
 	{
 		$regexp = '/[#,\.0]+/';
 		$result = preg_split($regexp, $pattern);
-		return [$result[0],$result[1]];
+		return [$result[0], $result[1]];
 	}
 
 
@@ -507,7 +507,7 @@ 
 	 */
 	public function getCurrencySymbol($currency = 'USD')
 	{
-		if(isset($this->pattern['symbol']))
+		if (isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
 		else
 			return $this->data['Currencies'][$currency][0];

Braces +40 added lines, -33 removed lines

@@ -81,10 +81,11 @@ 
 	public function __get($name)
 	{
 		$getProperty = 'get' . $name;
-		if(in_array($getProperty, $this->properties))
-			return $this->$getProperty();
-		else
-			throw new Exception('Property ' . $name . ' does not exists.');
+		if(in_array($getProperty, $this->properties)) {
+					return $this->$getProperty();
+		} else {
+					throw new Exception('Property ' . $name . ' does not exists.');
+		}
 	}
 
 	/**
@@ -94,10 +95,11 @@ 
 	public function __set($name, $value)
 	{
 		$setProperty = 'set' . $name;
-		if(in_array($setProperty, $this->properties))
-			$this->$setProperty($value);
-		else
-			throw new Exception('Property ' . $name . ' can not be set.');
+		if(in_array($setProperty, $this->properties)) {
+					$this->$setProperty($value);
+		} else {
+					throw new Exception('Property ' . $name . ' can not be set.');
+		}
 	}
 
 	/**
@@ -113,8 +115,9 @@ 
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
-			throw new Exception('Please provide the ICU data to initialize.');
+		if(empty($data)) {
+					throw new Exception('Please provide the ICU data to initialize.');
+		}
 
 		$this->data = $data;
 
@@ -129,11 +132,12 @@ 
 	 */
 	public function setPattern($type = NumberFormatInfo::DECIMAL)
 	{
-		if(is_int($type))
-			$this->pattern =
+		if(is_int($type)) {
+					$this->pattern =
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
-		else
-			$this->pattern = $this->parsePattern($type);
+		} else {
+					$this->pattern = $this->parsePattern($type);
+		}
 
 		$this->pattern['negInfty'] =
 			$this->data['NumberElements'][6] .
@@ -186,15 +190,13 @@ 
 			$formatInfo = $culture->NumberFormat;
 			$formatInfo->setPattern($type);
 			return $formatInfo;
-		}
-		   elseif(is_string($culture))
+		} elseif(is_string($culture))
 		   {
 			   $cultureInfo = new CultureInfo($culture);
 			   $formatInfo = $cultureInfo->NumberFormat;
 			   $formatInfo->setPattern($type);
 			   return $formatInfo;
-		   }
-		   else
+		   } else
 		   {
 			$cultureInfo = new CultureInfo();
 			   $formatInfo = $cultureInfo->NumberFormat;
@@ -246,8 +248,9 @@ 
 		$pattern = explode(';', $pattern);
 
 		$negative = null;
-		if(count($pattern) > 1)
-			$negative = $pattern[1];
+		if(count($pattern) > 1) {
+					$negative = $pattern[1];
+		}
 		$pattern = $pattern[0];
 
 		$comma = ',';
@@ -294,8 +297,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1 - 1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
@@ -310,15 +312,18 @@ 
 			}
 
 			//get the second group size
-			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2 - 1;
+			if(is_int($groupPos2)) {
+							$groupSize2 = $groupPos1 - $groupPos2 - 1;
+			}
 		}
 
 		if(is_int($decimalPos))
 		{
 			for($i = strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
+				if($pattern{$i} == $dot) {
+					break;
+				}
 				if($pattern{$i} == $digit)
 				{
 					$decimalPoints = $i - $decimalPos;
@@ -327,10 +332,11 @@ 
 			}
 		}
 
-		if(is_int($decimalPos))
-			$digitPattern = substr($pattern, 0, $decimalPos);
-		else
-			$digitPattern = $pattern;
+		if(is_int($decimalPos)) {
+					$digitPattern = substr($pattern, 0, $decimalPos);
+		} else {
+					$digitPattern = $pattern;
+		}
 
 		$digitPattern = preg_replace('/[^0]/', '', $digitPattern);
 
@@ -507,10 +513,11 @@ 
 	 */
 	public function getCurrencySymbol($currency = 'USD')
 	{
-		if(isset($this->pattern['symbol']))
-			return $this->pattern['symbol'];
-		else
-			return $this->data['Currencies'][$currency][0];
+		if(isset($this->pattern['symbol'])) {
+					return $this->pattern['symbol'];
+		} else {
+					return $this->data['Currencies'][$currency][0];
+		}
 	}
 
 

framework/I18N/core/MessageSource_XLIFF.php

Spacing +57 added lines, -57 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if (false === ($XML = simplexml_load_file($filename))) {
 			return false;
 		}
 
@@ -77,12 +77,12 @@ 
 
 		$translations = [];
 
-		foreach($translationUnit as $unit)
+		foreach ($translationUnit as $unit)
 		{
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+			$source = (string) $unit->source;
+			$translations[$source][] = (string) $unit->target;
+			$translations[$source][] = (string) $unit['id'];
+			$translations[$source][] = (string) $unit->note;
 		}
 
 		return $translations;
@@ -107,7 +107,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source . '/' . $variant;
+		return $this->source.'/'.$variant;
 	}
 
 	/**
@@ -128,16 +128,16 @@ 
 	protected function getCatalogueList($catalogue)
 	{
 		$variants = explode('_', $this->culture);
-		$source = $catalogue . $this->dataExt;
+		$source = $catalogue.$this->dataExt;
 		$catalogues = [$source];
 		$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}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_' . $variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
+				$variant .= ($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
 			}
 		}
 
@@ -145,7 +145,7 @@ 
 		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		$files = [];
 
-		foreach($catalogues as $file)
+		foreach ($catalogues as $file)
 		{
 			$files[] = $file;
 			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
@@ -167,12 +167,12 @@ 
 		$catalogues = [];
 		$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}))
+			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;
 			}
 		}
 
@@ -198,28 +198,28 @@ 
 	 */
 	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 		$catalogue = [];
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+			if (is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
-					$this->getCatalogues($dir . '/' . $file, $file)
+					$this->getCatalogues($dir.'/'.$file, $file)
 				);
 			}
 
 			$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;
 
-				if(is_int($dot))
+				if (is_int($dot))
 				{
 					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
@@ -244,14 +244,14 @@ 
 	 */
 	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
-			if(is_file($file)) {
+			if (is_file($file)) {
 				return [$variant, $file];
 			}
 		}
@@ -268,19 +268,19 @@ 
 	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if(count($messages) <= 0) {
+		if (count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -293,14 +293,14 @@ 
 		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
-		if(($last = $lastNodes->item(0)) !== null) {
-			$count = (int)$last->getAttribute('id');
+		if (($last = $lastNodes->item(0)) !== null) {
+			$count = (int) $last->getAttribute('id');
 		} else {
 			$count = 0;
 		}
 
 		//for each message add it to the XML file using DOM
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$unit = $dom->createElement('trans-unit');
 			$unit->setAttribute('id', ++$count);
@@ -328,7 +328,7 @@ 
 
 		//save it and clear the cache for this variant
 		$dom->save($filename);
-		if(!empty($this->cache)) {
+		if (!empty($this->cache)) {
 			$this->cache->clean($variant, $this->culture);
 		}
 
@@ -347,13 +347,13 @@ 
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -365,7 +365,7 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			$found = false;
 			$targetted = false;
@@ -373,25 +373,25 @@ 
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
 					$found = true;
 				}
 
 				//found source, get the target and notes
-				if($found)
+				if ($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if ($node->nodeName == 'target')
 					{
 						$node->nodeValue = $target;
 						$targetted = true;
 					}
 
 					//set the notes
-					if(!empty($comments) && $node->nodeName == 'note')
+					if (!empty($comments) && $node->nodeName == 'note')
 					{
 						$node->nodeValue = $comments;
 						$commented = true;
@@ -400,17 +400,17 @@ 
 			}
 
 			//append a target
-			if($found && !$targetted) {
+			if ($found && !$targetted) {
 				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
-			if($found && !$commented && !empty($comments)) {
+			if ($found && !$commented && !empty($comments)) {
 				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
-			if($found) {
+			if ($found) {
 				break;
 			}
 		}
@@ -418,9 +418,9 @@ 
 		$fileNode = $xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-		if($dom->save($filename) > 0)
+		if ($dom->save($filename) > 0)
 		{
-			if(!empty($this->cache)) {
+			if (!empty($this->cache)) {
 				$this->cache->clean($variant, $this->culture);
 			}
 
@@ -439,13 +439,13 @@ 
 	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -457,22 +457,22 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
 				{
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
 					$fileNode = $xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
-						if(!empty($this->cache)) {
+					if (false !== $dom->save($filename)) {
+						if (!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
 						return true;
@@ -488,7 +488,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		
@@ -497,12 +497,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			@mkdir($dir);
 			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}