pradosoft / prado

framework/Collections/TList.php

Braces +10 added lines, -20 removed lines

@@ -155,11 +155,9 @@ 
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -180,11 +178,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -210,11 +206,9 @@ 
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -268,8 +262,7 @@ 
 			$this->insertAt($index, $item);
 
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -292,8 +285,7 @@ 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -319,8 +311,7 @@ 
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -336,8 +327,7 @@ 
 		{
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 

Doc Comments +4 added lines, -2 removed lines

@@ -81,6 +81,7 @@ 
 
 	/**
 	 * @param boolean whether this list is read-only or not
+	 * @param boolean $value
 	 */
 	protected function setReadOnly($value)
 	{
@@ -90,7 +91,7 @@ 
 	/**
 	 * Returns an iterator for traversing the items in the list.
 	 * This method is required by the interface \IteratorAggregate.
-	 * @return Iterator an iterator for traversing the items in the list.
+	 * @return \ArrayIterator an iterator for traversing the items in the list.
 	 */
 	public function getIterator()
 	{
@@ -283,7 +284,7 @@ 
 	 * Finds the base item.  If found, the item is inserted after it.
 	 * @param mixed the base item which comes before the second parameter when added to the list
 	 * @param mixed the item
-	 * @return int the index where the item is inserted
+	 * @return double the index where the item is inserted
 	 * @throws TInvalidDataValueException if the base item is not within this list
 	 * @throws TInvalidOperationException if the list is read-only
 	 * @since 3.2a
@@ -334,6 +335,7 @@ 
 	 * Merges iterable data into the map.
 	 * New data will be appended to the end of the existing data.
 	 * @param mixed the data to be merged with, must be an array or object implementing Traversable
+	 * @param \Prado\Web\UI\WebControls\TDataGridColumnCollection|null $data
 	 * @throws TInvalidDataTypeException If data is neither an array nor an iterator.
 	 */
 	public function mergeWith($data)

Spacing +29 added lines, -29 removed lines

@@ -64,7 +64,7 @@ 
 	 * @param boolean whether the list is read-only
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data=null,$readOnly=false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		if($data!==null)
 			$this->copyFrom($data);
@@ -94,7 +94,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->_d );
+		return new \ArrayIterator($this->_d);
 	}
 
 	/**
@@ -124,10 +124,10 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if($index>=0 && $index<$this->_c)
+		if($index >= 0 && $index < $this->_c)
 			return $this->_d[$index];
 		else
-			throw new TInvalidDataValueException('list_index_invalid',$index);
+			throw new TInvalidDataValueException('list_index_invalid', $index);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 */
 	public function add($item)
 	{
-		$this->insertAt($this->_c,$item);
-		return $this->_c-1;
+		$this->insertAt($this->_c, $item);
+		return $this->_c - 1;
 	}
 
 	/**
@@ -151,22 +151,22 @@ 
 	 * @throws TInvalidDataValueException If the index specified exceeds the bound
 	 * @throws TInvalidOperationException if the list is read-only
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(!$this->_r)
 		{
 			if($index===$this->_c)
 				$this->_d[$this->_c++]=$item;
-			else if($index>=0 && $index<$this->_c)
+			else if($index >= 0 && $index < $this->_c)
 			{
-				array_splice($this->_d,$index,0,array($item));
+				array_splice($this->_d, $index, 0, array($item));
 				$this->_c++;
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index=$this->indexOf($item))>=0)
+			if(($index=$this->indexOf($item)) >= 0)
 			{
 				$this->removeAt($index);
 				return $index;
@@ -191,7 +191,7 @@ 
 				throw new TInvalidDataValueException('list_item_inexistent');
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -205,7 +205,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if($index>=0 && $index<$this->_c)
+			if($index >= 0 && $index < $this->_c)
 			{
 				$this->_c--;
 				if($index===$this->_c)
@@ -213,15 +213,15 @@ 
 				else
 				{
 					$item=$this->_d[$index];
-					array_splice($this->_d,$index,1);
+					array_splice($this->_d, $index, 1);
 					return $item;
 				}
 			}
 			else
-				throw new TInvalidDataValueException('list_index_invalid',$index);
+				throw new TInvalidDataValueException('list_index_invalid', $index);
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 */
 	public function clear()
 	{
-		for($i=$this->_c-1;$i>=0;--$i)
+		for($i=$this->_c - 1; $i >= 0; --$i)
 			$this->removeAt($i);
 	}
 
@@ -240,7 +240,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return $this->indexOf($item)>=0;
+		return $this->indexOf($item) >= 0;
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function indexOf($item)
 	{
-		if(($index=array_search($item,$this->_d,true))===false)
+		if(($index=array_search($item, $this->_d, true))===false)
 			return -1;
 		else
 			return $index;
@@ -268,7 +268,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index, $item);
@@ -276,7 +276,7 @@ 
 			return $index;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -292,7 +292,7 @@ 
 	{
 		if(!$this->_r)
 		{
-			if(($index = $this->indexOf($baseitem)) == -1)
+			if(($index=$this->indexOf($baseitem))==-1)
 				throw new TInvalidDataValueException('list_item_inexistent');
 
 			$this->insertAt($index + 1, $item);
@@ -300,7 +300,7 @@ 
 			return $index + 1;
 		}
 		else
-			throw new TInvalidOperationException('list_readonly',get_class($this));
+			throw new TInvalidOperationException('list_readonly', get_class($this));
 	}
 
 	/**
@@ -321,7 +321,7 @@ 
 	{
 		if(is_array($data) || ($data instanceof \Traversable))
 		{
-			if($this->_c>0)
+			if($this->_c > 0)
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
@@ -355,7 +355,7 @@ 
 	 */
 	public function offsetExists($offset)
 	{
-		return ($offset>=0 && $offset<$this->_c);
+		return ($offset >= 0 && $offset < $this->_c);
 	}
 
 	/**
@@ -376,14 +376,14 @@ 
 	 * @param integer the offset to set item
 	 * @param mixed the item value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
 		if($offset===null || $offset===$this->_c)
-			$this->insertAt($this->_c,$item);
+			$this->insertAt($this->_c, $item);
 		else
 		{
 			$this->removeAt($offset);
-			$this->insertAt($offset,$item);
+			$this->insertAt($offset, $item);
 		}
 	}
 

framework/Collections/TListItemCollection.php

Spacing +14 added lines, -14 removed lines

@@ -38,10 +38,10 @@ 
 	public function createListItem($index=-1)
 	{
 		$item=$this->createNewListItem();
-		if($index<0)
+		if($index < 0)
 			$this->add($item);
 		else
-			$this->insertAt($index,$item);
+			$this->insertAt($index, $item);
 		return $item;
 	}
 
@@ -50,7 +50,7 @@ 
 	 */
 	protected function createNewListItem($text=null)
 	{
-		$item =  new TListItem;
+		$item=new TListItem;
 		if($text!==null)
 			$item->setText($text);
 		return $item;
@@ -63,13 +63,13 @@ 
 	 * @param TListItem the item to be inserted.
 	 * @throws TInvalidDataTypeException if the item being inserted is neither a string nor TListItem
 	 */
-	public function insertAt($index,$item)
+	public function insertAt($index, $item)
 	{
 		if(is_string($item))
-			$item = $this->createNewListItem($item);
+			$item=$this->createNewListItem($item);
 		if(!($item instanceof TListItem))
-			throw new TInvalidDataTypeException('listitemcollection_item_invalid',get_class($this));
-		parent::insertAt($index,$item);
+			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
+		parent::insertAt($index, $item);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByValue($value,$includeDisabled=true)
+	public function findIndexByValue($value, $includeDisabled=true)
 	{
 		$value=TPropertyValue::ensureString($value);
 		$index=0;
@@ -97,7 +97,7 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByText($text,$includeDisabled=true)
+	public function findIndexByText($text, $includeDisabled=true)
 	{
 		$text=TPropertyValue::ensureString($text);
 		$index=0;
@@ -116,9 +116,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByValue($value,$includeDisabled=true)
+	public function findItemByValue($value, $includeDisabled=true)
 	{
-		if(($index=$this->findIndexByValue($value,$includeDisabled))>=0)
+		if(($index=$this->findIndexByValue($value, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -130,9 +130,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByText($text,$includeDisabled=true)
+	public function findItemByText($text, $includeDisabled=true)
 	{
-		if(($index=$this->findIndexByText($text,$includeDisabled))>=0)
+		if(($index=$this->findIndexByText($text, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -157,6 +157,6 @@ 
 	 */
 	public function saveState()
 	{
-		return ($this->getCount()>0) ? $this->toArray() : null;
+		return ($this->getCount() > 0) ? $this->toArray() : null;
 	}
 }

framework/TApplicationComponent.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
 	 * @return string URL to the asset path.
 	 */
-	public function publishAsset($assetPath,$className=null)
+	public function publishAsset($assetPath, $className=null)
 	{
 		if($className===null)
 			$className=get_class($this);

Doc Comments +5 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 	}
 
 	/**
-	 * @return THttpRequest the current user request
+	 * @return Web\THttpRequest the current user request
 	 */
 	public function getRequest()
 	{
@@ -59,7 +59,7 @@ 
 	}
 
 	/**
-	 * @return THttpResponse the response
+	 * @return Web\THttpResponse the response
 	 */
 	public function getResponse()
 	{
@@ -67,7 +67,7 @@ 
 	}
 
 	/**
-	 * @return THttpSession user session
+	 * @return Web\THttpSession user session
 	 */
 	public function getSession()
 	{
@@ -94,6 +94,7 @@ 
 	 *
 	 * @param string path of the asset that is relative to the directory containing the specified class file.
 	 * @param string name of the class whose containing directory will be prepend to the asset path. If null, it means get_class($this).
+	 * @param string $assetPath
 	 * @return string URL to the asset path.
 	 */
 	public function publishAsset($assetPath,$className=null)
@@ -108,6 +109,7 @@ 
 	/**
 	 * Publishes a file or directory and returns its URL.
 	 * @param string absolute path of the file or directory to be published
+	 * @param string $fullPath
 	 * @return string URL to the published file or directory
 	 */
 	public function publishFilePath($fullPath, $checkTimestamp=false)

framework/Security/IUserManager.php

Spacing +1 added lines, -1 removed lines

@@ -51,6 +51,6 @@
 	 * @param string password
 	 * @return boolean true if validation is successful, false otherwise.
 	 */
-	public function validateUser($username,$password);
+	public function validateUser($username, $password);
 }
 

Doc Comments +3 added lines

@@ -37,6 +37,7 @@ 
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information
+	 * @param \Prado\Web\THttpCookie $cookie
 	 * @return TUser the user instance generated based on the cookie auth data, null if the cookie does not have valid auth data.
 	 * @since 3.1.1
 	 */
@@ -44,7 +45,9 @@ 
 	/**
 	 * Saves user auth data into a cookie.
 	 * @param THttpCookie the cookie to receive the user auth data.
+	 * @param \Prado\Web\THttpCookie $cookie
 	 * @since 3.1.1
+	 * @return void
 	 */
 	public function saveUserToCookie($cookie);
 	/**

framework/I18N/TTranslateParameter.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 	 * To trim or not to trim the contents.
 	 * @var boolean
 	 */
-	protected $trim = true;
+	protected $trim=true;
 
 
 	/**
@@ -70,7 +70,7 @@ 
 	 */
 	public function setKey($value)
 	{
-		$this->key = $value;
+		$this->key=$value;
 	}
 
 	/**
@@ -79,7 +79,7 @@ 
 	 */
 	public function setTrim($value)
 	{
-		$this->trim = TPropertyValue::ensureBoolean($value);
+		$this->trim=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,10 +106,10 @@ 
 	 */
 	public function getParameter()
 	{
-		$value = $this->getValue();
+		$value=$this->getValue();
 		if(strlen($value) > 0)
 			return $value;
-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
+		$htmlWriter=Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());
 		$this->renderControl($htmlWriter);
 		return $this->getTrim() ?
 			trim($htmlWriter->flush()) : $htmlWriter->flush();

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/MessageSource_SQLite.php

Spacing +70 added lines, -70 removed lines

@@ -54,8 +54,8 @@ 
 	 */
 	function __construct($source)
 	{
-		$dsn = parseDSN((string)$source);
-		$this->source = $dsn['database'];
+		$dsn=parseDSN((string) $source);
+		$this->source=$dsn['database'];
 	}
 	
 	/**
@@ -66,26 +66,26 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$variant = sqlite_escape_string($variant);
+		$variant=sqlite_escape_string($variant);
 		
-		$statement = 
+		$statement= 
 			"SELECT t.id, t.source, t.target, t.comments
 				FROM trans_unit t, catalogue c
  				WHERE c.cat_id =  t.cat_id
 					AND c.name = '{$variant}' 
 				ORDER BY id ASC";
 	
-		$db = sqlite_open($this->source);
-		$rs = sqlite_query($statement, $db);
+		$db=sqlite_open($this->source);
+		$rs=sqlite_query($statement, $db);
 			
-		$result = array();
+		$result=array();
 		
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		while($row=sqlite_fetch_array($rs, SQLITE_NUM))
 		{
-			$source = $row[1];
-			$result[$source][] = $row[2]; //target
-			$result[$source][] = $row[0]; //id
-			$result[$source][] = $row[3]; //comments
+			$source=$row[1];
+			$result[$source][]=$row[2]; //target
+			$result[$source][]=$row[0]; //id
+			$result[$source][]=$row[3]; //comments
 		}
 
 		sqlite_close($db);
@@ -101,15 +101,15 @@ 
 	 */	
 	protected function getLastModified($source)
 	{
-		$source = sqlite_escape_string($source);
+		$source=sqlite_escape_string($source);
 
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$rs = sqlite_query(
+		$rs=sqlite_query(
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$db);
 			
-		$result = $rs ? (int)sqlite_fetch_single($rs) : 0;
+		$result=$rs ? (int) sqlite_fetch_single($rs) : 0;
 		
 		sqlite_close($db);		
 	
@@ -124,12 +124,12 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$variant = sqlite_escape_string($variant);
-		$db = sqlite_open($this->source);
-		$rs = sqlite_query(
+		$variant=sqlite_escape_string($variant);
+		$db=sqlite_open($this->source);
+		$rs=sqlite_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$db);
-		$result = $rs && (int)sqlite_fetch_single($rs);	
+		$result=$rs && (int) sqlite_fetch_single($rs);	
 		sqlite_close($db);
 
 		return $result;
@@ -142,18 +142,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants=explode('_', $this->culture);
 		
-		$catalogues = array($catalogue);
+		$catalogues=array($catalogue);
 
-		$variant = null;
+		$variant=null;
 				
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for($i=0, $k=count($variants); $i < $k; ++$i)
 		{						
 			if(isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$catalogue.'.'.$variant;
 			}
 		}
 		return array_reverse($catalogues);	
@@ -167,29 +167,29 @@ 
 	private function getCatalogueDetails($catalogue='messages')
 	{
 		if(empty($catalogue))
-			$catalogue = 'messages';
+			$catalogue='messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant=$catalogue.'.'.$this->culture;
 		
-		$name = sqlite_escape_string($this->getSource($variant));	
+		$name=sqlite_escape_string($this->getSource($variant));	
 			
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$rs = sqlite_query("SELECT cat_id
+		$rs=sqlite_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $db);
 		
-		if(sqlite_num_rows($rs) != 1)
+		if(sqlite_num_rows($rs)!=1)
 			return false;
 		
-		$cat_id = (int)sqlite_fetch_single($rs);
+		$cat_id=(int) sqlite_fetch_single($rs);
 		
 		//first get the catalogue ID
-		$rs = sqlite_query(
+		$rs=sqlite_query(
 			"SELECT count(msg_id)
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $db);
 
-		$count = (int)sqlite_fetch_single($rs);
+		$count=(int) sqlite_fetch_single($rs);
 
 		sqlite_close($db);	
 		
@@ -202,9 +202,9 @@ 
 	 */
 	private function updateCatalogueTime($cat_id, $variant, $db)
 	{
-		$time = time();
+		$time=time();
 		
-		$result = sqlite_query("UPDATE catalogue 
+		$result=sqlite_query("UPDATE catalogue 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $db);
 
@@ -223,27 +223,27 @@ 
 	 */
 	function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 		
 		if(count($messages) <= 0) return false;				
 		
-		$details = $this->getCatalogueDetails($catalogue);	
+		$details=$this->getCatalogueDetails($catalogue);	
 		
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 		
 		if($cat_id <= 0) return false;
-		$inserted = 0;
+		$inserted=0;
 		
-		$db = sqlite_open($this->source);
-		$time = time();
+		$db=sqlite_open($this->source);
+		$time=time();
 
 		foreach($messages as $message)
 		{
-			$message = sqlite_escape_string($message);
-			$statement = "INSERT INTO trans_unit
+			$message=sqlite_escape_string($message);
+			$statement="INSERT INTO trans_unit
 				(cat_id,id,source,date_added) VALUES
 				({$cat_id}, {$count},'{$message}',$time)";
 			if(sqlite_query($statement, $db))
@@ -269,31 +269,31 @@ 
 	 */	
 	function update($text, $target, $comments, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 		
-		$comments = sqlite_escape_string($comments);
-		$target = sqlite_escape_string($target);
-		$text = sqlite_escape_string($text);
+		$comments=sqlite_escape_string($comments);
+		$target=sqlite_escape_string($target);
+		$text=sqlite_escape_string($text);
 		
-		$time = time();
+		$time=time();
 		
-		$db = sqlite_open($this->source);
+		$db=sqlite_open($this->source);
 		
-		$statement = "UPDATE trans_unit SET
+		$statement="UPDATE trans_unit SET
 						target = '{$target}',
 						comments = '{$comments}',
 						date_modified = '{$time}'
 					WHERE cat_id = {$cat_id} 
 						AND source = '{$text}'";
 		
-		$updated = false;
+		$updated=false;
 		
 		if(sqlite_query($statement, $db))
-			$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
+			$updated=$this->updateCatalogueTime($cat_id, $variant, $db);
 		
 		sqlite_close($db);			
 				
@@ -308,21 +308,21 @@ 
 	 */
 	function delete($message, $catalogue='messages')
 	{
-		$details = $this->getCatalogueDetails($catalogue);
+		$details=$this->getCatalogueDetails($catalogue);
 		if($details)
-			list($cat_id, $variant, $count) = $details;
+			list($cat_id, $variant, $count)=$details;
 		else
 			return false;
 			
-		$db = sqlite_open($this->source);
-		$text = sqlite_escape_string($message);
+		$db=sqlite_open($this->source);
+		$text=sqlite_escape_string($message);
 		
-		$statement = "DELETE FROM trans_unit WHERE
+		$statement="DELETE FROM trans_unit WHERE
 						cat_id = {$cat_id} AND source = '{$message}'";
-		$deleted = false;
+		$deleted=false;
 				
 		if(sqlite_query($statement, $db))
-			$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);		
+			$deleted=$this->updateCatalogueTime($cat_id, $variant, $db);		
 			
 		sqlite_close($db);	
 				
@@ -335,16 +335,16 @@ 
 	 */
 	function catalogues()
 	{
-		$db = sqlite_open($this->source);
-		$statement = 'SELECT name FROM catalogue ORDER BY name';
-		$rs = sqlite_query($statement, $db);
-		$result = array();
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		$db=sqlite_open($this->source);
+		$statement='SELECT name FROM catalogue ORDER BY name';
+		$rs=sqlite_query($statement, $db);
+		$result=array();
+		while($row=sqlite_fetch_array($rs, SQLITE_NUM))
 		{
-			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			$details=explode('.', $row[0]);
+			if(!isset($details[1])) $details[1]=null;
 			
-			$result[] = $details;
+			$result[]=$details;
 		}
 		sqlite_close($db);
 		return $result;

Doc Comments +3 added lines, -1 removed lines

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