pradosoft / prado

framework/I18N/core/MessageFormat.php

Spacing +23 added lines, -23 removed lines

@@ -63,25 +63,25 @@ 
 	 * A list of loaded message catalogues.
 	 * @var array 
 	 */
-	protected $catagloues = array();
+	protected $catagloues=array();
 	
 	/**
 	 * The translation messages.
 	 * @var array 
 	 */
-	protected $messages = array();
+	protected $messages=array();
 	
 	/**
 	 * A list of untranslated messages.
 	 * @var array 
 	 */
-	protected $untranslated = array();
+	protected $untranslated=array();
 	
 	/**
 	 * The prefix and suffix to append to untranslated messages.
 	 * @var array 
 	 */
-	protected $postscript = array('','');
+	protected $postscript=array('', '');
 	
 	/**
 	 * Set the default catalogue.
@@ -93,7 +93,7 @@ 
 	 * Output encoding charset
 	 * @var string
 	 */
-	protected $charset = 'UTF-8'; 
+	protected $charset='UTF-8'; 
 
 	/**
 	 * Constructor.
@@ -104,7 +104,7 @@ 
 	 */
 	function __construct(IMessageSource $source, $charset='UTF-8')
 	{
-		$this->source = $source;	
+		$this->source=$source;	
 		$this->setCharset($charset);
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -135,13 +135,13 @@ 
 	 */
 	protected function loadCatalogue($catalogue)
 	{
-		if(in_array($catalogue,$this->catagloues))
+		if(in_array($catalogue, $this->catagloues))
 			return;
 			
 		if($this->source->load($catalogue))
 		{
-			$this->messages[$catalogue] = $this->source->read();
-			$this->catagloues[] = $catalogue;						
+			$this->messages[$catalogue]=$this->source->read();
+			$this->catagloues[]=$catalogue;						
 		}
 	}
 
@@ -158,14 +158,14 @@ 
 	 * catalogue.
 	 * @return string translated string.
 	 */
-	public function format($string,$args=array(), $catalogue=null, $charset=null) 
+	public function format($string, $args=array(), $catalogue=null, $charset=null) 
 	{
-		if(empty($charset)) $charset = $this->getCharset();
+		if(empty($charset)) $charset=$this->getCharset();
 		
 		//force args as UTF-8
 		foreach($args as $k => $v)
-			$args[$k] = I18N_toUTF8($v, $charset);
-		$s = $this->formatString(I18N_toUTF8($string, $charset),$args,$catalogue);
+			$args[$k]=I18N_toUTF8($v, $charset);
+		$s=$this->formatString(I18N_toUTF8($string, $charset), $args, $catalogue);
 		return I18N_toEncoding($s, $charset);
 	}
 
@@ -182,15 +182,15 @@ 
 		if(empty($catalogue))
 		{
 			if(empty($this->Catalogue))
-				$catalogue = 'messages';
+				$catalogue='messages';
 			else 
-				$catalogue = $this->Catalogue;
+				$catalogue=$this->Catalogue;
 		}
 				
 		$this->loadCatalogue($catalogue);
 		
 		if(empty($args))
-			$args = array();		
+			$args=array();		
 		
 		foreach($this->messages[$catalogue] as $variant)
 		{
@@ -198,14 +198,14 @@ 
 			foreach($variant as $source => $result)
 			{ 
 				// we found it, so return the target translation
-				if($source == $string)
+				if($source==$string)
 				{
 					//check if it contains only strings.
 					if(is_string($result))
-						$target = $result;
+						$target=$result;
 					else
 					{
-						$target = $result[0];
+						$target=$result[0];
 					}
 					//found, but untranslated
 					if(empty($target))
@@ -245,10 +245,10 @@ 
 	 */
 	function setUntranslatedPS($postscript)
 	{
-		if(is_array($postscript) && count($postscript)>=2)
+		if(is_array($postscript) && count($postscript) >= 2)
 		{
-			$this->postscript[0] = $postscript[0];
-			$this->postscript[1] = $postscript[1];
+			$this->postscript[0]=$postscript[0];
+			$this->postscript[1]=$postscript[1];
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
 						return 	$this->postscript[0].
 								strtr($string, $args).
 								$this->postscript[1];		
-					}
-					else
+					} else
 						return strtr($target, $args);
 				}
 			}

Doc Comments +1 added lines

@@ -111,6 +111,7 @@
 	/** 
 	 * Sets the charset for message output.
 	 * @param string charset, default is UTF-8
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{

framework/I18N/core/MessageSource_Database.php

Spacing +50 added lines, -50 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->_connID= (string)$source;
+		$this->_connID=(string) $source;
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
-				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+				throw new TConfigurationException('messagesource_connectionid_invalid', $connectionID);
 		}
 		else
 			throw new TConfigurationException('messagesource_connectionid_required');
@@ -91,13 +91,13 @@ 
 				WHERE c.cat_id =  t.cat_id
 					AND c.name = :variant
 				ORDER BY id ASC');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+		foreach($dataReader as $row)
+			$result[$row['source']]=array($row['target'], $row['id'], $row['comments']);
 
 		return $result;
 	}
@@ -112,7 +112,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT date_modified FROM catalogue WHERE name = :source');
-		$command->bindParameter(':source',$source,PDO::PARAM_STR);
+		$command->bindParameter(':source', $source, PDO::PARAM_STR);
 		$result=$command->queryScalar();
 		return $result ? $result : 0;
 	}
@@ -128,7 +128,7 @@ 
 	{
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(*) FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		return $command->queryScalar()==1;
 	}
 
@@ -139,18 +139,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);
@@ -164,20 +164,20 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT cat_id FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
 		$cat_id=$command->queryScalar();
 
-		if ($cat_id===null) return false;
+		if($cat_id===null) return false;
 
 		$command=$this->getDBConnection()->createCommand(
 			'SELECT COUNT(msg_id) FROM trans_unit WHERE cat_id = :catid ');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$count=$command->queryScalar();
 
 		return array($cat_id, $variant, $count);
@@ -189,11 +189,11 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE catalogue SET date_modified = :moddate WHERE cat_id = :catid');
-		$command->bindParameter(':moddate',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
+		$command->bindParameter(':moddate', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
 		$result=$command->execute();
 
 		if(!empty($this->cache))
@@ -211,31 +211,31 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 
 		if(count($messages) <= 0) return false;
 
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 
 		if($cat_id <= 0) return false;
-		$inserted = 0;
+		$inserted=0;
 
-		$time = time();
+		$time=time();
 
 		$command=$this->getDBConnection()->createCommand(
 			'INSERT INTO trans_unit (cat_id,id,source,date_added) VALUES (:catid,:id,:source,:dateadded)');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':id',$count,PDO::PARAM_INT);
-		$command->bindParameter(':source',$message,PDO::PARAM_STR);
-		$command->bindParameter(':dateadded',$time,PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':id', $count, PDO::PARAM_INT);
+		$command->bindParameter(':source', $message, PDO::PARAM_STR);
+		$command->bindParameter(':dateadded', $time, PDO::PARAM_INT);
 		foreach($messages as $message)
 		{
-			if (empty($message)) continue;
+			if(empty($message)) continue;
 			$count++; $inserted++;
 			$command->execute();
 		}
@@ -253,16 +253,16 @@ 
 	 */
 	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;
 
 		$command=$this->getDBConnection()->createCommand(
 			'DELETE FROM trans_unit WHERE cat_id = :catid AND source = :message');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':message',$message,PDO::PARAM_STR);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':message', $message, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 
@@ -278,21 +278,21 @@ 
 	 */
 	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;
 
-		$time = time();
+		$time=time();
 		$command=$this->getDBConnection()->createCommand(
 			'UPDATE trans_unit SET target = :target, comments = :comments, date_modified = :datemod
 					WHERE cat_id = :catid AND source = :source');
-		$command->bindParameter(':target',$target,PDO::PARAM_STR);
-		$command->bindParameter(':comments',$comments,PDO::PARAM_STR);
-		$command->bindParameter(':datemod',$time,PDO::PARAM_INT);
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$command->bindParameter(':source',$text,PDO::PARAM_STR);
+		$command->bindParameter(':target', $target, PDO::PARAM_STR);
+		$command->bindParameter(':comments', $comments, PDO::PARAM_STR);
+		$command->bindParameter(':datemod', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$command->bindParameter(':source', $text, PDO::PARAM_STR);
 
 		return ($command->execute()==1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 	}
@@ -303,17 +303,17 @@ 
 	 */
 	function catalogues()
 	{
-		$command=$this->getDBConnection()->createCommand( 'SELECT name FROM catalogue ORDER BY name');
+		$command=$this->getDBConnection()->createCommand('SELECT name FROM catalogue ORDER BY name');
 		$dataReader=$command->query();
 
-		$result = array();
+		$result=array();
 
-		foreach ($dataReader as $row)
+		foreach($dataReader as $row)
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details=explode('.', $row[0]);
+			if(!isset($details[1])) $details[1]=null;
 
-			$result[] = $details;
+			$result[]=$details;
 		}
 
 		return $result;

Doc Comments +3 added lines, -1 removed lines

@@ -67,7 +67,8 @@ 
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
-	 * @return TDbConnection the created DB connection
+	 * @param string $connectionID
+	 * @return \Prado\Data\TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
 	protected function createDbConnection($connectionID)
@@ -192,6 +193,7 @@ 
 
 	/**
 	 * Update the catalogue last modified time.
+	 * @param string $variant
 	 * @return boolean true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('messagesource_connectionid_required');
 	}
 

framework/I18N/core/util.php

Spacing +56 added lines, -56 removed lines

@@ -39,11 +39,11 @@ 
 	 */
     function parseDSN($dsn)
     {
-        if (is_array($dsn)) {
+        if(is_array($dsn)) {
             return $dsn;
         }
 
-        $parsed = array(
+        $parsed=array(
             'phptype'  => false,
             'dbsyntax' => false,
             'username' => false,
@@ -56,94 +56,94 @@ 
         );
 
         // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
+        if(($pos=strpos($dsn, '://'))!==false) {
+            $str=substr($dsn, 0, $pos);
+            $dsn=substr($dsn, $pos + 3);
         } else {
-            $str = $dsn;
-            $dsn = null;
+            $str=$dsn;
+            $dsn=null;
         }
 
         // Get phptype and dbsyntax
         // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+        if(preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+            $parsed['phptype']=$arr[1];
+            $parsed['dbsyntax']=(empty($arr[2])) ? $arr[1] : $arr[2];
         } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
+            $parsed['phptype']=$str;
+            $parsed['dbsyntax']=$str;
         }
 
-        if (empty($dsn)) {
+        if(empty($dsn)) {
             return $parsed;
         }
 
         // Get (if found): username and password
         // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
+        if(($at=strrpos($dsn, '@'))!==false) {
+            $str=substr($dsn, 0, $at);
+            $dsn=substr($dsn, $at + 1);
+            if(($pos=strpos($str, ':'))!==false) {
+                $parsed['username']=rawurldecode(substr($str, 0, $pos));
+                $parsed['password']=rawurldecode(substr($str, $pos + 1));
             } else {
-                $parsed['username'] = rawurldecode($str);
+                $parsed['username']=rawurldecode($str);
             }
         }
 
         // Find protocol and hostspec
 
         // $dsn => proto(proto_opts)/database
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            $proto       = $match[1];
-            $proto_opts  = (!empty($match[2])) ? $match[2] : false;
-            $dsn         = $match[3];
+        if(preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+            $proto=$match[1];
+            $proto_opts=(!empty($match[2])) ? $match[2] : false;
+            $dsn=$match[3];
 
         // $dsn => protocol+hostspec/database (old format)
         } else {
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
+            if(strpos($dsn, '+')!==false) {
+                list($proto, $dsn)=explode('+', $dsn, 2);
             }
-            if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
+            if(strpos($dsn, '/')!==false) {
+                list($proto_opts, $dsn)=explode('/', $dsn, 2);
             } else {
-                $proto_opts = $dsn;
-                $dsn = null;
+                $proto_opts=$dsn;
+                $dsn=null;
             }
         }
 
         // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if ($parsed['protocol'] == 'tcp') {
-            if (strpos($proto_opts, ':') !== false) {
-                list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
+        $parsed['protocol']=(!empty($proto)) ? $proto : 'tcp';
+        $proto_opts=rawurldecode($proto_opts);
+        if($parsed['protocol']=='tcp') {
+            if(strpos($proto_opts, ':')!==false) {
+                list($parsed['hostspec'], $parsed['port'])=explode(':', $proto_opts);
             } else {
-                $parsed['hostspec'] = $proto_opts;
+                $parsed['hostspec']=$proto_opts;
             }
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
+        } elseif($parsed['protocol']=='unix') {
+            $parsed['socket']=$proto_opts;
         }
 
         // Get dabase if any
         // $dsn => database
-        if (!empty($dsn)) {
+        if(!empty($dsn)) {
             // /database
-            if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = $dsn;
+            if(($pos=strpos($dsn, '?'))===false) {
+                $parsed['database']=$dsn;
             // /database?param1=value1&param2=value2
             } else {
-                $parsed['database'] = substr($dsn, 0, $pos);
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
+                $parsed['database']=substr($dsn, 0, $pos);
+                $dsn=substr($dsn, $pos + 1);
+                if(strpos($dsn, '&')!==false) {
+                    $opts=explode('&', $dsn);
                 } else { // database?param1=value1
-                    $opts = array($dsn);
+                    $opts=array($dsn);
                 }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) { // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
+                foreach($opts as $opt) {
+                    list($key, $value)=explode('=', $opt);
+                    if(!isset($parsed[$key])) { // don't allow params overwrite
+                        $parsed[$key]=rawurldecode($value);
                     }
                 }
             }
@@ -161,10 +161,10 @@ 
 	 */
 	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
+			$s=iconv($from, 'UTF-8', $string); //to UTF-8
+			return $s!==false ? $s : $string; //it could return false
 		}
 		return $string;
 	}
@@ -177,10 +177,10 @@ 
 	 */
 	function I18N_toEncoding($string, $to)
 	{
-		if($to != 'UTF-8')
+		if($to!='UTF-8')
 		{
-			$s = iconv('UTF-8', $to, $string);
-			return $s !== false ? $s : $string;
+			$s=iconv('UTF-8', $to, $string);
+			return $s!==false ? $s : $string;
 		}
 		return $string;
 	} 

Indentation +115 added lines, -115 removed lines

@@ -22,7 +22,7 @@ 
 	/**
 	 * For a given DSN (database connection string), return some information
 	 * about the DSN. This function comes from PEAR's DB package.
-  	 *
+	 *
 	 * LICENSE: This source file is subject to version 3.0 of the PHP license
 	 * that is available through the world-wide-web at the following URI:
 	 * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
@@ -38,120 +38,120 @@ 
 	 * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
 	 * @link       http://pear.php.net/package/DB
 	 */
-    function parseDSN($dsn)
-    {
-        if (is_array($dsn)) {
-            return $dsn;
-        }
-
-        $parsed = array(
-            'phptype'  => false,
-            'dbsyntax' => false,
-            'username' => false,
-            'password' => false,
-            'protocol' => false,
-            'hostspec' => false,
-            'port'     => false,
-            'socket'   => false,
-            'database' => false
-        );
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        } else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
-        } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (empty($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            } else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        // $dsn => proto(proto_opts)/database
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            $proto       = $match[1];
-            $proto_opts  = (!empty($match[2])) ? $match[2] : false;
-            $dsn         = $match[3];
-
-        // $dsn => protocol+hostspec/database (old format)
-        } else {
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            } else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if ($parsed['protocol'] == 'tcp') {
-            if (strpos($proto_opts, ':') !== false) {
-                list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
-            } else {
-                $parsed['hostspec'] = $proto_opts;
-            }
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if (!empty($dsn)) {
-            // /database
-            if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = $dsn;
-            // /database?param1=value1&param2=value2
-            } else {
-                $parsed['database'] = substr($dsn, 0, $pos);
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                } else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) { // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
+	function parseDSN($dsn)
+	{
+		if (is_array($dsn)) {
+			return $dsn;
+		}
+
+		$parsed = array(
+			'phptype'  => false,
+			'dbsyntax' => false,
+			'username' => false,
+			'password' => false,
+			'protocol' => false,
+			'hostspec' => false,
+			'port'     => false,
+			'socket'   => false,
+			'database' => false
+		);
+
+		// Find phptype and dbsyntax
+		if (($pos = strpos($dsn, '://')) !== false) {
+			$str = substr($dsn, 0, $pos);
+			$dsn = substr($dsn, $pos + 3);
+		} else {
+			$str = $dsn;
+			$dsn = null;
+		}
+
+		// Get phptype and dbsyntax
+		// $str => phptype(dbsyntax)
+		if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+			$parsed['phptype']  = $arr[1];
+			$parsed['dbsyntax'] = (empty($arr[2])) ? $arr[1] : $arr[2];
+		} else {
+			$parsed['phptype']  = $str;
+			$parsed['dbsyntax'] = $str;
+		}
+
+		if (empty($dsn)) {
+			return $parsed;
+		}
+
+		// Get (if found): username and password
+		// $dsn => username:password@protocol+hostspec/database
+		if (($at = strrpos($dsn,'@')) !== false) {
+			$str = substr($dsn, 0, $at);
+			$dsn = substr($dsn, $at + 1);
+			if (($pos = strpos($str, ':')) !== false) {
+				$parsed['username'] = rawurldecode(substr($str, 0, $pos));
+				$parsed['password'] = rawurldecode(substr($str, $pos + 1));
+			} else {
+				$parsed['username'] = rawurldecode($str);
+			}
+		}
+
+		// Find protocol and hostspec
+
+		// $dsn => proto(proto_opts)/database
+		if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+			$proto       = $match[1];
+			$proto_opts  = (!empty($match[2])) ? $match[2] : false;
+			$dsn         = $match[3];
+
+		// $dsn => protocol+hostspec/database (old format)
+		} else {
+			if (strpos($dsn, '+') !== false) {
+				list($proto, $dsn) = explode('+', $dsn, 2);
+			}
+			if (strpos($dsn, '/') !== false) {
+				list($proto_opts, $dsn) = explode('/', $dsn, 2);
+			} else {
+				$proto_opts = $dsn;
+				$dsn = null;
+			}
+		}
+
+		// process the different protocol options
+		$parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+		$proto_opts = rawurldecode($proto_opts);
+		if ($parsed['protocol'] == 'tcp') {
+			if (strpos($proto_opts, ':') !== false) {
+				list($parsed['hostspec'], $parsed['port']) = explode(':', $proto_opts);
+			} else {
+				$parsed['hostspec'] = $proto_opts;
+			}
+		} elseif ($parsed['protocol'] == 'unix') {
+			$parsed['socket'] = $proto_opts;
+		}
+
+		// Get dabase if any
+		// $dsn => database
+		if (!empty($dsn)) {
+			// /database
+			if (($pos = strpos($dsn, '?')) === false) {
+				$parsed['database'] = $dsn;
+			// /database?param1=value1&param2=value2
+			} else {
+				$parsed['database'] = substr($dsn, 0, $pos);
+				$dsn = substr($dsn, $pos + 1);
+				if (strpos($dsn, '&') !== false) {
+					$opts = explode('&', $dsn);
+				} else { // database?param1=value1
+					$opts = array($dsn);
+				}
+				foreach ($opts as $opt) {
+					list($key, $value) = explode('=', $opt);
+					if (!isset($parsed[$key])) { // don't allow params overwrite
+						$parsed[$key] = rawurldecode($value);
+					}
+				}
+			}
+		}
+
+		return $parsed;
+	}
     
    
 	/**

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