pradosoft / prado

framework/I18N/core/MessageSource.php

Doc Comments +5 added lines

@@ -252,6 +252,7 @@ 
 	/**
 	 * Set the culture for this message source.
 	 * @param string culture name
+	 * @param string $culture
 	 */
 	public function setCulture($culture)
 	{
@@ -270,6 +271,7 @@ 
 	/**
 	 * Get the last modified unix-time for this particular catalogue+variant.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return int last modified in unix-time format.
 	 */
 	protected function getLastModified($source)
@@ -281,6 +283,7 @@ 
 	 * Load the message for a particular catalogue+variant.
 	 * This methods needs to implemented by subclasses.
 	 * @param string catalogue+variant.
+	 * @param string $variant
 	 * @return array of translation messages. 
 	 */
 	protected function &loadData($variant)
@@ -301,6 +304,7 @@ 
 	/**
 	 * Determine if the source is valid.
 	 * @param string catalogue+variant
+	 * @param string $source
 	 * @return boolean true if valid, false otherwise. 
 	 */
 	protected function isValidSource($source)
@@ -312,6 +316,7 @@ 
 	 * Get all the variants of a particular catalogue.
 	 * This method must be implemented by subclasses.
 	 * @param string catalogue name
+	 * @param string $catalogue
 	 * @return array list of all variants for this catalogue. 
 	 */	
 	protected function getCatalogueList($catalogue)

Indentation +8 added lines, -8 removed lines

@@ -110,15 +110,15 @@
 	/**
 	 * Factory method to instantiate a new MessageSource depending on the
 	 * source type. The allowed source types are 'XLIFF', 'gettext' and
-     * 'Database'. The source parameter depends on the source type. 
-     * For 'gettext' and 'XLIFF', 'source' should point to the directory 
-     * where the messages are stored. 
-     * For 'Database', 'source' must be a valid connection id.
-     * If one of the deprecated types 'MySQL' or 'SQLite' is used, 
-     * 'source' must contain a valid  DSN.
+	 * 'Database'. The source parameter depends on the source type. 
+	 * For 'gettext' and 'XLIFF', 'source' should point to the directory 
+	 * where the messages are stored. 
+	 * For 'Database', 'source' must be a valid connection id.
+	 * If one of the deprecated types 'MySQL' or 'SQLite' is used, 
+	 * 'source' must contain a valid  DSN.
 	 *
- 	 * Custom message source are possible by supplying the a filename parameter
- 	 * in the factory method.
+	 * Custom message source are possible by supplying the a filename parameter
+	 * in the factory method.
 	 * 
 	 * @param string the message source type.
 	 * @param string the location of the resource or the ConnectionID.

Spacing +20 added lines, -20 removed lines

@@ -20,12 +20,12 @@ 
  /**
   * Get the IMessageSource interface.
   */
-require_once(dirname(__FILE__).'/IMessageSource.php');
+require_once(dirname(__FILE__) . '/IMessageSource.php');
 
 /**
  * Get the MessageCache class file.
  */
-require_once(dirname(__FILE__).'/MessageCache.php');
+require_once(dirname(__FILE__) . '/MessageCache.php');
 
 /**
  * Abstract MessageSource class.
@@ -126,25 +126,25 @@ 
 	 * @return MessageSource a new message source of the specified type. 
 	 * @throws InvalidMessageSourceTypeException
 	 */
-	static function &factory($type, $source='.', $filename='')
+	static function &factory($type, $source = '.', $filename = '')
 	{
-		$types = array('XLIFF','gettext','Database','MySQL','SQLite');
+		$types = array('XLIFF', 'gettext', 'Database', 'MySQL', 'SQLite');
 		
-		if(empty($filename) && !in_array($type, $types))
-			throw new Exception('Invalid type "'.$type.'", valid types are '.
+		if (empty($filename) && !in_array($type, $types))
+			throw new Exception('Invalid type "' . $type . '", valid types are ' .
 				implode(', ', $types));
 		
-		$class = 'MessageSource_'.$type;
+		$class = 'MessageSource_' . $type;
 		
-		if(empty($filename))
-			$filename = dirname(__FILE__).'/'.$class.'.php';
+		if (empty($filename))
+			$filename = dirname(__FILE__) . '/' . $class . '.php';
 						
-		if(is_file($filename) == false)
+		if (is_file($filename) == false)
 			throw new Exception("File $filename not found");
 						
 		include_once $filename;
         
-		$obj =  new $class($source);
+		$obj = new $class($source);
 		
 		return $obj;
 	}
@@ -168,39 +168,39 @@ 
 	 * @return boolean true if loaded, false otherwise.	 
 	 * @see read()
 	 */
-	function load($catalogue='messages')
+	function load($catalogue = 'messages')
 	{
 		$variants = $this->getCatalogueList($catalogue);
 		
 		$this->messages = array();
 		
-		foreach($variants as $variant)
+		foreach ($variants as $variant)
 		{
 			$source = $this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if ($this->isValidSource($source) == false) continue;
 
 			$loadData = true;
 			
-			if($this->cache)
+			if ($this->cache)
 			{
 				$data = $this->cache->get($variant, 
 					$this->culture, $this->getLastModified($source));
 				
-				if(is_array($data))
+				if (is_array($data))
 				{
 					$this->messages[$variant] = $data;
 					$loadData = false;
 				}
 				unset($data);
 			}
-			if($loadData)
+			if ($loadData)
 			{
 				$data = &$this->loadData($source);
-				if(is_array($data))
+				if (is_array($data))
 				{
 					$this->messages[$variant] = $data;
-					if($this->cache)
+					if ($this->cache)
 						$this->cache->save($data, $variant, $this->culture);
 				}	
 				unset($data);
@@ -245,7 +245,7 @@ 
 	 */	
 	public function append($message)
 	{
-		if(!in_array($message, $this->untranslated))
+		if (!in_array($message, $this->untranslated))
 			$this->untranslated[] = $message;
 	}
 	

Braces +18 added lines, -11 removed lines

@@ -130,17 +130,20 @@ 
 	{
 		$types = array('XLIFF','gettext','Database','MySQL','SQLite');
 		
-		if(empty($filename) && !in_array($type, $types))
-			throw new Exception('Invalid type "'.$type.'", valid types are '.
+		if(empty($filename) && !in_array($type, $types)) {
+					throw new Exception('Invalid type "'.$type.'", valid types are '.
 				implode(', ', $types));
+		}
 		
 		$class = 'MessageSource_'.$type;
 		
-		if(empty($filename))
-			$filename = dirname(__FILE__).'/'.$class.'.php';
+		if(empty($filename)) {
+					$filename = dirname(__FILE__).'/'.$class.'.php';
+		}
 						
-		if(is_file($filename) == false)
-			throw new Exception("File $filename not found");
+		if(is_file($filename) == false) {
+					throw new Exception("File $filename not found");
+		}
 						
 		include_once $filename;
         
@@ -178,7 +181,9 @@ 
 		{
 			$source = $this->getSource($variant);
 			
-			if($this->isValidSource($source) == false) continue;
+			if($this->isValidSource($source) == false) {
+				continue;
+			}
 
 			$loadData = true;
 			
@@ -200,8 +205,9 @@ 
 				if(is_array($data))
 				{
 					$this->messages[$variant] = $data;
-					if($this->cache)
-						$this->cache->save($data, $variant, $this->culture);
+					if($this->cache) {
+											$this->cache->save($data, $variant, $this->culture);
+					}
 				}	
 				unset($data);
 			}
@@ -245,8 +251,9 @@ 
 	 */	
 	public function append($message)
 	{
-		if(!in_array($message, $this->untranslated))
-			$this->untranslated[] = $message;
+		if(!in_array($message, $this->untranslated)) {
+					$this->untranslated[] = $message;
+		}
 	}
 	
 	/**

framework/I18N/core/MessageSource_Database.php

Doc Comments +2 added lines, -1 removed lines

@@ -60,6 +60,7 @@ 
 	/**
 	 * Creates the DB connection.
 	 * @param string the module ID for TDataSourceConfig
+	 * @param string $connectionID
 	 * @return TDbConnection the created DB connection
 	 * @throws TConfigurationException if module ID is invalid or empty
 	 */
@@ -185,7 +186,7 @@ 
 
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise.
+	 * @return integer true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{

Spacing +69 added lines, -69 removed lines

@@ -17,7 +17,7 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * MessageSource_Database class.
@@ -30,7 +30,7 @@ 
  */
 class MessageSource_Database extends MessageSource
 {
-	private $_connID='';
+	private $_connID = '';
 	private $_conn;
 
 	/**
@@ -41,7 +41,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->_connID= (string)$source;
+		$this->_connID = (string) $source;
 	}
 
 	/**
@@ -49,9 +49,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn===null)
+		if ($this->_conn === null)
 		{
-			$this->_conn=$this->createDbConnection($this->_connID);
+			$this->_conn = $this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
 		}
 		return $this->_conn;
@@ -65,13 +65,13 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID!=='')
+		if ($connectionID !== '')
 		{
-			$conn=Prado::getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
+			$conn = Prado::getApplication()->getModule($connectionID);
+			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');
@@ -85,19 +85,19 @@ 
 	 */
 	protected function &loadData($variant)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'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');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		$dataReader=$command->query();
+		$command->bindParameter(':variant', $variant, PDO::PARAM_STR);
+		$dataReader = $command->query();
 
 		$result = array();
 
 		foreach ($dataReader as $row)
-			$result[$row['source']] = array($row['target'],$row['id'],$row['comments']);
+			$result[$row['source']] = array($row['target'], $row['id'], $row['comments']);
 
 		return $result;
 	}
@@ -110,10 +110,10 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT date_modified FROM catalogue WHERE name = :source');
-		$command->bindParameter(':source',$source,PDO::PARAM_STR);
-		$result=$command->queryScalar();
+		$command->bindParameter(':source', $source, PDO::PARAM_STR);
+		$result = $command->queryScalar();
 		return $result ? $result : 0;
 	}
 
@@ -126,10 +126,10 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT COUNT(*) FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		return $command->queryScalar()==1;
+		$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);
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . '.' . $variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -161,24 +161,24 @@ 
 	 * @param string catalogue
 	 * @return array catalogue details, array($cat_id, $variant, $count).
 	 */
-	private function getCatalogueDetails($catalogue='messages')
+	private function getCatalogueDetails($catalogue = 'messages')
 	{
-		if(empty($catalogue))
+		if (empty($catalogue))
 			$catalogue = 'messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant = $catalogue . '.' . $this->culture;
 
-		$command=$this->getDBConnection()->createCommand(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT cat_id FROM catalogue WHERE name = :variant');
-		$command->bindParameter(':variant',$variant,PDO::PARAM_STR);
-		$cat_id=$command->queryScalar();
+		$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(
+		$command = $this->getDBConnection()->createCommand(
 			'SELECT COUNT(msg_id) FROM trans_unit WHERE cat_id = :catid ');
-		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
-		$count=$command->queryScalar();
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$count = $command->queryScalar();
 
 		return array($cat_id, $variant, $count);
 	}
@@ -190,13 +190,13 @@ 
 	private function updateCatalogueTime($cat_id, $variant)
 	{
 		$time = time();
-		$command=$this->getDBConnection()->createCommand(
+		$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);
-		$result=$command->execute();
+		$command->bindParameter(':moddate', $time, PDO::PARAM_INT);
+		$command->bindParameter(':catid', $cat_id, PDO::PARAM_INT);
+		$result = $command->execute();
 
-		if(!empty($this->cache))
+		if (!empty($this->cache))
 			$this->cache->clean($variant, $this->culture);
 
 		return $result;
@@ -209,37 +209,37 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if (count($messages) <= 0) return false;
 
 		$details = $this->getCatalogueDetails($catalogue);
 
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
-		if($cat_id <= 0) return false;
+		if ($cat_id <= 0) return false;
 		$inserted = 0;
 
 		$time = time();
 
-		$command=$this->getDBConnection()->createCommand(
+		$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);
-		foreach($messages as $message)
+		$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;
 			$count++; $inserted++;
 			$command->execute();
 		}
-		if($inserted > 0)
+		if ($inserted > 0)
 			$this->updateCatalogueTime($cat_id, $variant);
 
 		return $inserted > 0;
@@ -251,20 +251,20 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
-		$command=$this->getDBConnection()->createCommand(
+		$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;
+		return ($command->execute() == 1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 
 	}
 
@@ -276,25 +276,25 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
 		$time = time();
-		$command=$this->getDBConnection()->createCommand(
+		$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;
+		return ($command->execute() == 1) ? $this->updateCatalogueTime($cat_id, $variant) : false;
 	}
 
 	/**
@@ -303,15 +303,15 @@ 
 	 */
 	function catalogues()
 	{
-		$command=$this->getDBConnection()->createCommand( 'SELECT name FROM catalogue ORDER BY name');
-		$dataReader=$command->query();
+		$command = $this->getDBConnection()->createCommand('SELECT name FROM catalogue ORDER BY name');
+		$dataReader = $command->query();
 
 		$result = array();
 
 		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;
 		}

Braces +49 added lines, -31 removed lines

@@ -68,13 +68,14 @@ 
 		if($connectionID!=='')
 		{
 			$conn=Prado::getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
-				return $conn->getDbConnection();
-			else
-				throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+			if($conn instanceof TDataSourceConfig) {
+							return $conn->getDbConnection();
+			} else {
+							throw new TConfigurationException('messagesource_connectionid_invalid',$connectionID);
+			}
+		} else {
+					throw new TConfigurationException('messagesource_connectionid_required');
 		}
-		else
-			throw new TConfigurationException('messagesource_connectionid_required');
 	}
 
 	/**
@@ -96,8 +97,9 @@ 
 
 		$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;
 	}
@@ -163,8 +165,9 @@ 
 	 */
 	private function getCatalogueDetails($catalogue='messages')
 	{
-		if(empty($catalogue))
-			$catalogue = 'messages';
+		if(empty($catalogue)) {
+					$catalogue = 'messages';
+		}
 
 		$variant = $catalogue.'.'.$this->culture;
 
@@ -173,7 +176,9 @@ 
 		$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 ');
@@ -196,8 +201,9 @@ 
 		$command->bindParameter(':catid',$cat_id,PDO::PARAM_INT);
 		$result=$command->execute();
 
-		if(!empty($this->cache))
-			$this->cache->clean($variant, $this->culture);
+		if(!empty($this->cache)) {
+					$this->cache->clean($variant, $this->culture);
+		}
 
 		return $result;
 	}
@@ -213,16 +219,21 @@ 
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if(count($messages) <= 0) {
+			return false;
+		}
 
 		$details = $this->getCatalogueDetails($catalogue);
 
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 
-		if($cat_id <= 0) return false;
+		if($cat_id <= 0) {
+			return false;
+		}
 		$inserted = 0;
 
 		$time = time();
@@ -235,12 +246,15 @@ 
 		$command->bindParameter(':dateadded',$time,PDO::PARAM_INT);
 		foreach($messages as $message)
 		{
-			if (empty($message)) continue;
+			if (empty($message)) {
+				continue;
+			}
 			$count++; $inserted++;
 			$command->execute();
 		}
-		if($inserted > 0)
-			$this->updateCatalogueTime($cat_id, $variant);
+		if($inserted > 0) {
+					$this->updateCatalogueTime($cat_id, $variant);
+		}
 
 		return $inserted > 0;
 	}
@@ -254,10 +268,11 @@ 
 	function delete($message, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($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');
@@ -279,10 +294,11 @@ 
 	function update($text, $target, $comments, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 
 		$time = time();
 		$command=$this->getDBConnection()->createCommand(
@@ -311,7 +327,9 @@ 
 		foreach ($dataReader as $row)
 		{
 			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			if(!isset($details[1])) {
+				$details[1] = null;
+			}
 
 			$result[] = $details;
 		}

framework/I18N/core/MessageSource_gettext.php

Doc Comments +6 added lines

@@ -200,6 +200,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param string $MOFile
+	 */
 	private function getPOFile($MOFile)
 	{
 		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
@@ -422,6 +425,9 @@ 
 		return $catalogue;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Spacing +76 added lines, -76 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the Gettext class.
  */
-require_once(dirname(__FILE__).'/Gettext/TGettext.php');
+require_once(dirname(__FILE__) . '/Gettext/TGettext.php');
 
 /**
  * MessageSource_gettext class.
@@ -61,7 +61,7 @@ 
 
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 
@@ -72,13 +72,13 @@ 
 	 */
 	protected function &loadData($filename)
 	{
-		$mo = TGettext::factory('MO',$filename);
+		$mo = TGettext::factory('MO', $filename);
 		$mo->load();
 		$result = $mo->toArray();
 
 		$results = array();
-		$count=0;
-		foreach($result['strings'] as $source => $target)
+		$count = 0;
+		foreach ($result['strings'] as $source => $target)
 		{
 			$results[$source][] = $target; //target
 			$results[$source][] = $count++; //id
@@ -105,7 +105,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source.'/'.$variant;
+		return $this->source . '/' . $variant;
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		if(is_file($source))
+		if (is_file($source))
 			return filemtime($source);
 		else
 			return 0;
@@ -129,24 +129,24 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants = explode('_', $this->culture);
+		$source = $catalogue . $this->dataExt;
 
 		$catalogues = array($source);
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.
-								$variant.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . $this->dataSeparator .
+								$variant . $this->dataExt;
 			}
 		}
 		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		return $catalogues;
 	}
 
@@ -160,17 +160,17 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 		$catalogues = array();
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
 		}
 		return array_reverse($catalogues);
@@ -184,17 +184,17 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue='messages')
+	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
 			$po = $this->getPOFile($file);
-			if(is_file($file) || is_file($po))
+			if (is_file($file) || is_file($po))
 				return array($variant, $file, $po);
 		}
 		return false;
@@ -202,8 +202,8 @@ 
 
 	private function getPOFile($MOFile)
 	{
-		$filebase = substr($MOFile, 0, strlen($MOFile)-strlen($this->dataExt));
-		return $filebase.$this->poExt;
+		$filebase = substr($MOFile, 0, strlen($MOFile) - strlen($this->dataExt));
+		return $filebase . $this->poExt;
 	}
 
 	/**
@@ -213,51 +213,51 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if (count($messages) <= 0) return false;
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
 
 		//set the strings as untranslated.
 		$strings = array();
-		foreach($messages as $message)
+		foreach ($messages as $message)
 			$strings[$message] = '';
 
 		//load the PO
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
 		$existing = count($result['strings']);
 
 		//add to strings to the existing message list
-		$result['strings'] = array_merge($result['strings'],$strings);
+		$result['strings'] = array_merge($result['strings'], $strings);
 
 		$new = count($result['strings']);
 
-		if($new > $existing)
+		if ($new > $existing)
 		{
 			//change the date 2004-12-25 12:26
 			$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 
 			$po->fromArray($result);
 			$mo = $po->toMO();
-			if($po->save() && $mo->save($MOFile))
+			if ($po->save() && $mo->save($MOFile))
 			{
-				if(!empty($this->cache))
+				if (!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
 			}
@@ -273,35 +273,35 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
 
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
-		foreach($result['strings'] as $string => $value)
+		foreach ($result['strings'] as $string => $value)
 		{
-			if($string == $message)
+			if ($string == $message)
 			{
 				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 				unset($result['strings'][$string]);
 
 				$po->fromArray($result);
 				$mo = $po->toMO();
-				if($po->save() && $mo->save($MOFile))
+				if ($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
+					if (!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
 				}
@@ -321,27 +321,27 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
+		if ($variants)
 			list($variant, $MOFile, $POFile) = $variants;
 		else
 			return false;
 
-		if(is_writable($MOFile) == false)
+		if (is_writable($MOFile) == false)
 			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
+		if (is_writable($POFile) == false)
 			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
 
 
-		$po = TGettext::factory('PO',$POFile);
+		$po = TGettext::factory('PO', $POFile);
 		$po->load();
 		$result = $po->toArray();
 
-		foreach($result['strings'] as $string => $value)
+		foreach ($result['strings'] as $string => $value)
 		{
-			if($string == $text)
+			if ($string == $text)
 			{
 				$result['strings'][$string] = $target;
 				$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
@@ -349,9 +349,9 @@ 
 				$po->fromArray($result);
 				$mo = $po->toMO();
 
-				if($po->save() && $mo->save($MOFile))
+				if ($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
+					if (!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
 				}
@@ -379,36 +379,36 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 
 		$catalogue = array();
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir.'/'.$file)
-				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file))
+			if (is_dir($dir . '/' . $file)
+				&& preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file))
 			{
 
 				$catalogue = array_merge($catalogue,
-								$this->getCatalogues($dir.'/'.$file, $file));
+								$this->getCatalogues($dir . '/' . $file, $file));
 			}
 
-			$pos = strpos($file,$this->dataExt);
+			$pos = strpos($file, $this->dataExt);
 
-			if($pos >0
-				&& substr($file,-1*strlen($this->dataExt)) == $this->dataExt)
+			if ($pos > 0
+				&& substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
+				$name = substr($file, 0, $pos);
+				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
-				if(is_int($dot))
+				if (is_int($dot))
 				{
-					$culture = substr($name, $dot+1,strlen($name));
-					$cat = substr($name,0,$dot);
+					$culture = substr($name, $dot + 1, strlen($name));
+					$cat = substr($name, 0, $dot);
 				}
 				$details[0] = $cat;
 				$details[1] = $culture;
@@ -424,7 +424,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		$variants = $this->getCatalogueList($catalogue);
@@ -433,21 +433,21 @@ 
 		$po_file = $this->getPOFile($mo_file);
 
 		$dir = dirname($mo_file);
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 		{
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 			throw new TException("Unable to create directory $dir");
 
-		$po = TGettext::factory('PO',$po_file);
+		$po = TGettext::factory('PO', $po_file);
 		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
 		$result['strings'] = array();
 
 		$po->fromArray($result);
 		$mo = $po->toMO();
-		if($po->save() && $mo->save($mo_file))
+		if ($po->save() && $mo->save($mo_file))
 			return array($variant, $mo_file, $po_file);
 		else
 			throw new TException("Unable to create file $po_file and $mo_file");

Braces +70 added lines, -51 removed lines

@@ -116,10 +116,11 @@ 
 	 */
 	protected function getLastModified($source)
 	{
-		if(is_file($source))
-			return filemtime($source);
-		else
-			return 0;
+		if(is_file($source)) {
+					return filemtime($source);
+		} else {
+					return 0;
+		}
 	}
 
 	/**
@@ -194,8 +195,9 @@ 
 		{
 			$file = $this->getSource($variant);
 			$po = $this->getPOFile($file);
-			if(is_file($file) || is_file($po))
-				return array($variant, $file, $po);
+			if(is_file($file) || is_file($po)) {
+							return array($variant, $file, $po);
+			}
 		}
 		return false;
 	}
@@ -217,24 +219,30 @@ 
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if(count($messages) <= 0) {
+			return false;
+		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
-		else
-			list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+		if($variants) {
+					list($variant, $MOFile, $POFile) = $variants;
+		} else {
+					list($variant, $MOFile, $POFile) = $this->createMessageTemplate($catalogue);
+		}
 
-		if(is_writable($MOFile) == false)
-			throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
-			throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
+		if(is_writable($MOFile) == false) {
+					throw new TIOException("Unable to save to file {$MOFile}, file must be writable.");
+		}
+		if(is_writable($POFile) == false) {
+					throw new TIOException("Unable to save to file {$POFile}, file must be writable.");
+		}
 
 		//set the strings as untranslated.
 		$strings = array();
-		foreach($messages as $message)
-			$strings[$message] = '';
+		foreach($messages as $message) {
+					$strings[$message] = '';
+		}
 
 		//load the PO
 		$po = TGettext::factory('PO',$POFile);
@@ -257,12 +265,13 @@ 
 			$mo = $po->toMO();
 			if($po->save() && $mo->save($MOFile))
 			{
-				if(!empty($this->cache))
-					$this->cache->clean($variant, $this->culture);
+				if(!empty($this->cache)) {
+									$this->cache->clean($variant, $this->culture);
+				}
 				return true;
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 		return false;
 	}
@@ -276,15 +285,18 @@ 
 	function delete($message, $catalogue='messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
-		else
-			return false;
+		if($variants) {
+					list($variant, $MOFile, $POFile) = $variants;
+		} else {
+					return false;
+		}
 
-		if(is_writable($MOFile) == false)
-			throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
-			throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
+		if(is_writable($MOFile) == false) {
+					throw new TIOException("Unable to modify file {$MOFile}, file must be writable.");
+		}
+		if(is_writable($POFile) == false) {
+					throw new TIOException("Unable to modify file {$POFile}, file must be writable.");
+		}
 
 		$po = TGettext::factory('PO',$POFile);
 		$po->load();
@@ -301,12 +313,13 @@ 
 				$mo = $po->toMO();
 				if($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
-						$this->cache->clean($variant, $this->culture);
+					if(!empty($this->cache)) {
+											$this->cache->clean($variant, $this->culture);
+					}
 					return true;
+				} else {
+									return false;
 				}
-				else
-					return false;
 			}
 		}
 
@@ -324,15 +337,18 @@ 
 	function update($text, $target, $comments, $catalogue='messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants)
-			list($variant, $MOFile, $POFile) = $variants;
-		else
-			return false;
+		if($variants) {
+					list($variant, $MOFile, $POFile) = $variants;
+		} else {
+					return false;
+		}
 
-		if(is_writable($MOFile) == false)
-			throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
-		if(is_writable($POFile) == false)
-			throw new TIOException("Unable to update file {$POFile}, file must be writable.");
+		if(is_writable($MOFile) == false) {
+					throw new TIOException("Unable to update file {$MOFile}, file must be writable.");
+		}
+		if(is_writable($POFile) == false) {
+					throw new TIOException("Unable to update file {$POFile}, file must be writable.");
+		}
 
 
 		$po = TGettext::factory('PO',$POFile);
@@ -351,12 +367,13 @@ 
 
 				if($po->save() && $mo->save($MOFile))
 				{
-					if(!empty($this->cache))
-						$this->cache->clean($variant, $this->culture);
+					if(!empty($this->cache)) {
+											$this->cache->clean($variant, $this->culture);
+					}
 					return true;
+				} else {
+									return false;
 				}
-				else
-					return false;
 			}
 		}
 
@@ -438,8 +455,9 @@ 
 			@mkdir($dir);
 			@chmod($dir,PRADO_CHMOD);
 		}
-		if(!is_dir($dir))
-			throw new TException("Unable to create directory $dir");
+		if(!is_dir($dir)) {
+					throw new TException("Unable to create directory $dir");
+		}
 
 		$po = TGettext::factory('PO',$po_file);
 		$result['meta']['PO-Revision-Date'] = @date('Y-m-d H:i:s');
@@ -447,10 +465,11 @@ 
 
 		$po->fromArray($result);
 		$mo = $po->toMO();
-		if($po->save() && $mo->save($mo_file))
-			return array($variant, $mo_file, $po_file);
-		else
-			throw new TException("Unable to create file $po_file and $mo_file");
+		if($po->save() && $mo->save($mo_file)) {
+					return array($variant, $mo_file, $po_file);
+		} else {
+					throw new TException("Unable to create file $po_file and $mo_file");
+		}
 	}
 }
 

framework/I18N/core/MessageSource_MySQL.php

Doc Comments +4 added lines, -1 removed lines

@@ -61,6 +61,7 @@ 
 	 * Constructor.
 	 * Create a new message source using MySQL.
 	 * @param string MySQL datasource, in PEAR's DB DSN format.
+	 * @param string $source
 	 * @see MessageSource::factory();
 	 */
 	function __construct($source)
@@ -271,7 +272,9 @@ 
 
 	/**
 	 * Update the catalogue last modified time.
-	 * @return boolean true if updated, false otherwise.
+	 * @param integer $cat_id
+	 * @param string $variant
+	 * @return resource true if updated, false otherwise.
 	 */
 	private function updateCatalogueTime($cat_id, $variant)
 	{

Indentation +36 added lines, -36 removed lines

@@ -92,43 +92,43 @@
 		*/
 		$dsninfo = $this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
-        else
-        {
+	 	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
+			$dbhost = ':' . $dsninfo['socket'];
+		else
+		{
 			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
-        }
-        $user = $dsninfo['username'];
-        $pw = $dsninfo['password'];
-
-        $connect_function = 'mysql_connect';
-
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
-        else
-            $conn = false;
-
-        if (empty($conn))
-        {
-        	throw new Exception('Error in connecting to '.$dsninfo);
-        }
-
-        if ($dsninfo['database'])
-        {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
-        							$dsninfo);
-        }
-        else
-        	throw new Exception('Please provide a database for message'.
-        						' translation.');
-       return $conn;
+			if (!empty($dsninfo['port']))
+				$dbhost .= ':' . $dsninfo['port'];
+		}
+		$user = $dsninfo['username'];
+		$pw = $dsninfo['password'];
+
+		$connect_function = 'mysql_connect';
+
+		if ($dbhost && $user && $pw)
+			$conn = @$connect_function($dbhost, $user, $pw);
+		elseif ($dbhost && $user)
+			$conn = @$connect_function($dbhost, $user);
+		elseif ($dbhost)
+			$conn = @$connect_function($dbhost);
+		else
+			$conn = false;
+
+		if (empty($conn))
+		{
+			throw new Exception('Error in connecting to '.$dsninfo);
+		}
+
+		if ($dsninfo['database'])
+		{
+			if (!@mysql_select_db($dsninfo['database'], $conn))
+				throw new Exception('Error in connecting database, dns:'.
+									$dsninfo);
+		}
+		else
+			throw new Exception('Please provide a database for message'.
+								' translation.');
+	   return $conn;
 	}
 
 	/**

Spacing +38 added lines, -38 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the I18N utility file, contains the DSN parser.
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 /**
  * MessageSource_MySQL class.
@@ -65,7 +65,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 		$this->dns = parseDSN($this->source);
 		$this->db = $this->connect();
 	}
@@ -116,17 +116,17 @@ 
 
         if (empty($conn))
         {
-        	throw new Exception('Error in connecting to '.$dsninfo);
+        	throw new Exception('Error in connecting to ' . $dsninfo);
         }
 
         if ($dsninfo['database'])
         {
         	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
+        		throw new Exception('Error in connecting database, dns:' .
         							$dsninfo);
         }
         else
-        	throw new Exception('Please provide a database for message'.
+        	throw new Exception('Please provide a database for message' .
         						' translation.');
        return $conn;
 	}
@@ -157,11 +157,11 @@ 
 					AND c.name = '{$variant}'
 				ORDER BY id ASC";
 
-		$rs = mysql_query($statement,$this->db);
+		$rs = mysql_query($statement, $this->db);
 
 		$result = array();
 
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		while ($row = mysql_fetch_array($rs, MYSQL_NUM))
 		{
 			$source = $row[1];
 			$result[$source][] = $row[2]; //target
@@ -186,7 +186,7 @@ 
 			"SELECT date_modified FROM catalogue WHERE name = '{$source}'",
 			$this->db);
 
-		$result = $rs ? (int)mysql_result($rs,0) : 0;
+		$result = $rs ? (int) mysql_result($rs, 0) : 0;
 
 		return $result;
 	}
@@ -199,13 +199,13 @@ 
 	 */
 	protected function isValidSource($variant)
 	{
-		$variant = mysql_real_escape_string ($variant);
+		$variant = mysql_real_escape_string($variant);
 
 		$rs = mysql_query(
 			"SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'",
 			$this->db);
 
-		$row = mysql_fetch_array($rs,MYSQL_NUM);
+		$row = mysql_fetch_array($rs, MYSQL_NUM);
 
 		$result = $row && $row[0] == '1';
 
@@ -219,18 +219,18 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 
 		$catalogues = array($catalogue);
 
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . '.' . $variant;
 			}
 		}
 		return array_reverse($catalogues);
@@ -241,22 +241,22 @@ 
 	 * @param string catalogue
 	 * @return array catalogue details, array($cat_id, $variant, $count).
 	 */
-	private function getCatalogueDetails($catalogue='messages')
+	private function getCatalogueDetails($catalogue = 'messages')
 	{
-		if(empty($catalogue))
+		if (empty($catalogue))
 			$catalogue = 'messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant = $catalogue . '.' . $this->culture;
 
 		$name = mysql_real_escape_string($this->getSource($variant));
 
 		$rs = mysql_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $this->db);
 
-		if(mysql_num_rows($rs) != 1)
+		if (mysql_num_rows($rs) != 1)
 			return false;
 
-		$cat_id = (int)mysql_result($rs,0);
+		$cat_id = (int) mysql_result($rs, 0);
 
 		//first get the catalogue ID
 		$rs = mysql_query(
@@ -264,7 +264,7 @@ 
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $this->db);
 
-		$count = (int)mysql_result($rs,0);
+		$count = (int) mysql_result($rs, 0);
 
 		return array($cat_id, $variant, $count);
 	}
@@ -281,7 +281,7 @@ 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $this->db);
 
-		if(!empty($this->cache))
+		if (!empty($this->cache))
 			$this->cache->clean($variant, $this->culture);
 
 		return $result;
@@ -294,25 +294,25 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if (count($messages) <= 0) return false;
 
 		$details = $this->getCatalogueDetails($catalogue);
 
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 
-		if($cat_id <= 0) return false;
+		if ($cat_id <= 0) return false;
 		$inserted = 0;
 
 		$time = time();
 
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$count++; $inserted++;
 			$message = mysql_real_escape_string($message);
@@ -321,7 +321,7 @@ 
 				({$cat_id}, {$count},'{$message}',$time)";
 			mysql_query($statement, $this->db);
 		}
-		if($inserted > 0)
+		if ($inserted > 0)
 			$this->updateCatalogueTime($cat_id, $variant);
 
 		return $inserted > 0;
@@ -333,10 +333,10 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -349,7 +349,7 @@ 
 
 		mysql_query($statement, $this->db);
 
-		if(mysql_affected_rows($this->db) == 1)
+		if (mysql_affected_rows($this->db) == 1)
 			$deleted = $this->updateCatalogueTime($cat_id, $variant);
 
 		return $deleted;
@@ -364,10 +364,10 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -388,7 +388,7 @@ 
 		$updated = false;
 
 		mysql_query($statement, $this->db);
-		if(mysql_affected_rows($this->db) == 1)
+		if (mysql_affected_rows($this->db) == 1)
 			$updated = $this->updateCatalogueTime($cat_id, $variant);
 
 		return $updated;
@@ -403,10 +403,10 @@ 
 		$statement = 'SELECT name FROM catalogue ORDER BY name';
 		$rs = mysql_query($statement, $this->db);
 		$result = array();
-		while($row = mysql_fetch_array($rs,MYSQL_NUM))
+		while ($row = mysql_fetch_array($rs, MYSQL_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;
 		}

Braces +63 added lines, -45 removed lines

@@ -92,27 +92,29 @@ 
 		*/
 		$dsninfo = $this->dns;
 
-     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix')
-            $dbhost = ':' . $dsninfo['socket'];
-        else
+     	if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix') {
+     	            $dbhost = ':' . $dsninfo['socket'];
+     	} else
         {
 			$dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
-            if (!empty($dsninfo['port']))
-                $dbhost .= ':' . $dsninfo['port'];
+            if (!empty($dsninfo['port'])) {
+                            $dbhost .= ':' . $dsninfo['port'];
+            }
         }
         $user = $dsninfo['username'];
         $pw = $dsninfo['password'];
 
         $connect_function = 'mysql_connect';
 
-        if ($dbhost && $user && $pw)
-            $conn = @$connect_function($dbhost, $user, $pw);
-        elseif ($dbhost && $user)
-            $conn = @$connect_function($dbhost, $user);
-        elseif ($dbhost)
-            $conn = @$connect_function($dbhost);
-        else
-            $conn = false;
+        if ($dbhost && $user && $pw) {
+                    $conn = @$connect_function($dbhost, $user, $pw);
+        } elseif ($dbhost && $user) {
+                    $conn = @$connect_function($dbhost, $user);
+        } elseif ($dbhost) {
+                    $conn = @$connect_function($dbhost);
+        } else {
+                    $conn = false;
+        }
 
         if (empty($conn))
         {
@@ -121,13 +123,14 @@ 
 
         if ($dsninfo['database'])
         {
-        	if (!@mysql_select_db($dsninfo['database'], $conn))
-        		throw new Exception('Error in connecting database, dns:'.
+        	if (!@mysql_select_db($dsninfo['database'], $conn)) {
+        	        		throw new Exception('Error in connecting database, dns:'.
         							$dsninfo);
-        }
-        else
-        	throw new Exception('Please provide a database for message'.
+        	}
+        } else {
+                	throw new Exception('Please provide a database for message'.
         						' translation.');
+        }
        return $conn;
 	}
 
@@ -243,8 +246,9 @@ 
 	 */
 	private function getCatalogueDetails($catalogue='messages')
 	{
-		if(empty($catalogue))
-			$catalogue = 'messages';
+		if(empty($catalogue)) {
+					$catalogue = 'messages';
+		}
 
 		$variant = $catalogue.'.'.$this->culture;
 
@@ -253,8 +257,9 @@ 
 		$rs = mysql_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $this->db);
 
-		if(mysql_num_rows($rs) != 1)
-			return false;
+		if(mysql_num_rows($rs) != 1) {
+					return false;
+		}
 
 		$cat_id = (int)mysql_result($rs,0);
 
@@ -281,8 +286,9 @@ 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $this->db);
 
-		if(!empty($this->cache))
-			$this->cache->clean($variant, $this->culture);
+		if(!empty($this->cache)) {
+					$this->cache->clean($variant, $this->culture);
+		}
 
 		return $result;
 	}
@@ -298,16 +304,21 @@ 
 	{
 		$messages = $this->untranslated;
 
-		if(count($messages) <= 0) return false;
+		if(count($messages) <= 0) {
+			return false;
+		}
 
 		$details = $this->getCatalogueDetails($catalogue);
 
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 
-		if($cat_id <= 0) return false;
+		if($cat_id <= 0) {
+			return false;
+		}
 		$inserted = 0;
 
 		$time = time();
@@ -321,8 +332,9 @@ 
 				({$cat_id}, {$count},'{$message}',$time)";
 			mysql_query($statement, $this->db);
 		}
-		if($inserted > 0)
-			$this->updateCatalogueTime($cat_id, $variant);
+		if($inserted > 0) {
+					$this->updateCatalogueTime($cat_id, $variant);
+		}
 
 		return $inserted > 0;
 	}
@@ -336,10 +348,11 @@ 
 	function delete($message, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 
 		$text = mysql_real_escape_string($message);
 
@@ -349,8 +362,9 @@ 
 
 		mysql_query($statement, $this->db);
 
-		if(mysql_affected_rows($this->db) == 1)
-			$deleted = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db) == 1) {
+					$deleted = $this->updateCatalogueTime($cat_id, $variant);
+		}
 
 		return $deleted;
 
@@ -367,10 +381,11 @@ 
 	function update($text, $target, $comments, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 
 		$comments = mysql_real_escape_string($comments);
 		$target = mysql_real_escape_string($target);
@@ -388,8 +403,9 @@ 
 		$updated = false;
 
 		mysql_query($statement, $this->db);
-		if(mysql_affected_rows($this->db) == 1)
-			$updated = $this->updateCatalogueTime($cat_id, $variant);
+		if(mysql_affected_rows($this->db) == 1) {
+					$updated = $this->updateCatalogueTime($cat_id, $variant);
+		}
 
 		return $updated;
 	}
@@ -406,7 +422,9 @@ 
 		while($row = mysql_fetch_array($rs,MYSQL_NUM))
 		{
 			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			if(!isset($details[1])) {
+				$details[1] = null;
+			}
 
 			$result[] = $details;
 		}

framework/I18N/core/MessageSource_SQLite.php

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)
 	{

Spacing +34 added lines, -34 removed lines

@@ -20,12 +20,12 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * Get the I18N utility file, contains the DSN parser.
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 /**
  * MessageSource_SQLite class.
@@ -54,7 +54,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$dsn = parseDSN((string)$source);
+		$dsn = parseDSN((string) $source);
 		$this->source = $dsn['database'];
 	}
 	
@@ -80,7 +80,7 @@ 
 			
 		$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
@@ -109,7 +109,7 @@ 
 			"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);		
 	
@@ -129,7 +129,7 @@ 
 		$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);
 
 		$variant = null;
 				
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{						
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.'.'.$variant;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . '.' . $variant;
 			}
 		}
 		return array_reverse($catalogues);	
@@ -164,12 +164,12 @@ 
 	 * @param string catalogue
 	 * @return array catalogue details, array($cat_id, $variant, $count). 
 	 */
-	private function getCatalogueDetails($catalogue='messages')
+	private function getCatalogueDetails($catalogue = 'messages')
 	{
-		if(empty($catalogue))
+		if (empty($catalogue))
 			$catalogue = 'messages';
 
-		$variant = $catalogue.'.'.$this->culture;
+		$variant = $catalogue . '.' . $this->culture;
 		
 		$name = sqlite_escape_string($this->getSource($variant));	
 			
@@ -178,10 +178,10 @@ 
 		$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(
@@ -189,7 +189,7 @@ 
 				FROM trans_unit
 				WHERE cat_id = {$cat_id}", $db);
 
-		$count = (int)sqlite_fetch_single($rs);
+		$count = (int) sqlite_fetch_single($rs);
 
 		sqlite_close($db);	
 		
@@ -208,7 +208,7 @@ 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $db);
 
-		if(!empty($this->cache))		
+		if (!empty($this->cache))		
 			$this->cache->clean($variant, $this->culture);	
 		
 		return $result;
@@ -221,37 +221,37 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	function save($catalogue='messages')
+	function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
 		
-		if(count($messages) <= 0) return false;				
+		if (count($messages) <= 0) return false;				
 		
 		$details = $this->getCatalogueDetails($catalogue);	
 		
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
 		
-		if($cat_id <= 0) return false;
+		if ($cat_id <= 0) return false;
 		$inserted = 0;
 		
 		$db = sqlite_open($this->source);
 		$time = time();
 
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$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))
+			if (sqlite_query($statement, $db))
 			{
 				$count++; $inserted++;			
 			}
 		}
-		if($inserted > 0)
+		if ($inserted > 0)
 			$this->updateCatalogueTime($cat_id, $variant, $db);
 	
 		sqlite_close($db);	
@@ -267,10 +267,10 @@ 
 	 * @param string the catalogue of the translation.
 	 * @return boolean true if translation was updated, false otherwise. 
 	 */	
-	function update($text, $target, $comments, $catalogue='messages')
+	function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -292,7 +292,7 @@ 
 		
 		$updated = false;
 		
-		if(sqlite_query($statement, $db))
+		if (sqlite_query($statement, $db))
 			$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
 		
 		sqlite_close($db);			
@@ -306,10 +306,10 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise. 
 	 */
-	function delete($message, $catalogue='messages')
+	function delete($message, $catalogue = 'messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
+		if ($details)
 			list($cat_id, $variant, $count) = $details;
 		else
 			return false;
@@ -321,7 +321,7 @@ 
 						cat_id = {$cat_id} AND source = '{$message}'";
 		$deleted = false;
 				
-		if(sqlite_query($statement, $db))
+		if (sqlite_query($statement, $db))
 			$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);		
 			
 		sqlite_close($db);	
@@ -339,10 +339,10 @@ 
 		$statement = 'SELECT name FROM catalogue ORDER BY name';
 		$rs = sqlite_query($statement, $db);
 		$result = array();
-		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
+		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;
 		}

Braces +42 added lines, -27 removed lines

@@ -166,8 +166,9 @@ 
 	 */
 	private function getCatalogueDetails($catalogue='messages')
 	{
-		if(empty($catalogue))
-			$catalogue = 'messages';
+		if(empty($catalogue)) {
+					$catalogue = 'messages';
+		}
 
 		$variant = $catalogue.'.'.$this->culture;
 		
@@ -178,8 +179,9 @@ 
 		$rs = sqlite_query("SELECT cat_id
 					FROM catalogue WHERE name = '{$name}'", $db);
 		
-		if(sqlite_num_rows($rs) != 1)
-			return false;
+		if(sqlite_num_rows($rs) != 1) {
+					return false;
+		}
 		
 		$cat_id = (int)sqlite_fetch_single($rs);
 		
@@ -208,8 +210,9 @@ 
 							SET date_modified = {$time}
 							WHERE cat_id = {$cat_id}", $db);
 
-		if(!empty($this->cache))		
-			$this->cache->clean($variant, $this->culture);	
+		if(!empty($this->cache)) {
+					$this->cache->clean($variant, $this->culture);
+		}
 		
 		return $result;
 	}
@@ -225,16 +228,21 @@ 
 	{
 		$messages = $this->untranslated;
 		
-		if(count($messages) <= 0) return false;				
+		if(count($messages) <= 0) {
+			return false;
+		}
 		
 		$details = $this->getCatalogueDetails($catalogue);	
 		
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 		
-		if($cat_id <= 0) return false;
+		if($cat_id <= 0) {
+			return false;
+		}
 		$inserted = 0;
 		
 		$db = sqlite_open($this->source);
@@ -251,8 +259,9 @@ 
 				$count++; $inserted++;			
 			}
 		}
-		if($inserted > 0)
-			$this->updateCatalogueTime($cat_id, $variant, $db);
+		if($inserted > 0) {
+					$this->updateCatalogueTime($cat_id, $variant, $db);
+		}
 	
 		sqlite_close($db);	
 		
@@ -270,10 +279,11 @@ 
 	function update($text, $target, $comments, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 		
 		$comments = sqlite_escape_string($comments);
 		$target = sqlite_escape_string($target);
@@ -292,8 +302,9 @@ 
 		
 		$updated = false;
 		
-		if(sqlite_query($statement, $db))
-			$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
+		if(sqlite_query($statement, $db)) {
+					$updated = $this->updateCatalogueTime($cat_id, $variant, $db);
+		}
 		
 		sqlite_close($db);			
 				
@@ -309,10 +320,11 @@ 
 	function delete($message, $catalogue='messages')
 	{
 		$details = $this->getCatalogueDetails($catalogue);
-		if($details)
-			list($cat_id, $variant, $count) = $details;
-		else
-			return false;
+		if($details) {
+					list($cat_id, $variant, $count) = $details;
+		} else {
+					return false;
+		}
 			
 		$db = sqlite_open($this->source);
 		$text = sqlite_escape_string($message);
@@ -321,8 +333,9 @@ 
 						cat_id = {$cat_id} AND source = '{$message}'";
 		$deleted = false;
 				
-		if(sqlite_query($statement, $db))
-			$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);		
+		if(sqlite_query($statement, $db)) {
+					$deleted = $this->updateCatalogueTime($cat_id, $variant, $db);
+		}
 			
 		sqlite_close($db);	
 				
@@ -342,7 +355,9 @@ 
 		while($row = sqlite_fetch_array($rs,SQLITE_NUM))
 		{
 			$details = explode('.',$row[0]);
-			if(!isset($details[1])) $details[1] = null;
+			if(!isset($details[1])) {
+				$details[1] = null;
+			}
 			
 			$result[] = $details;
 		}

framework/I18N/core/MessageSource_XLIFF.php

Doc Comments +3 added lines

@@ -486,6 +486,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $catalogue
+	 */
 	protected function createMessageTemplate($catalogue)
 	{
 		if($catalogue === null) {

Indentation +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
 
 		//find the body element
 		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {

Spacing +74 added lines, -74 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the MessageSource class file.
  */
-require_once(dirname(__FILE__).'/MessageSource.php');
+require_once(dirname(__FILE__) . '/MessageSource.php');
 
 /**
  * MessageSource_XLIFF class.
@@ -58,7 +58,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source = (string) $source;
 	}
 
 	/**
@@ -69,7 +69,7 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if (false === ($XML = simplexml_load_file($filename))) {
 			return false;
 		}
 
@@ -77,12 +77,12 @@ 
 
 		$translations = array();
 
-		foreach($translationUnit as $unit)
+		foreach ($translationUnit as $unit)
 		{
-			$source = (string)$unit->source;
-			$translations[$source][] = (string)$unit->target;
-			$translations[$source][] = (string)$unit['id'];
-			$translations[$source][] = (string)$unit->note;
+			$source = (string) $unit->source;
+			$translations[$source][] = (string) $unit->target;
+			$translations[$source][] = (string) $unit['id'];
+			$translations[$source][] = (string) $unit->note;
 		}
 
 		return $translations;
@@ -107,7 +107,7 @@ 
 	 */
 	protected function getSource($variant)
 	{
-		return $this->source.'/'.$variant;
+		return $this->source . '/' . $variant;
 	}
 
 	/**
@@ -127,25 +127,25 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
+		$variants = explode('_', $this->culture);
+		$source = $catalogue . $this->dataExt;
 		$catalogues = array($source);
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $catalogue.$this->dataSeparator.$variant.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $catalogue . $this->dataSeparator . $variant . $this->dataExt;
 			}
 		}
 
 		$byDir = $this->getCatalogueByDir($catalogue);
-		$catalogues = array_merge($byDir,array_reverse($catalogues));
+		$catalogues = array_merge($byDir, array_reverse($catalogues));
 		$files = array();
 
-		foreach($catalogues as $file)
+		foreach ($catalogues as $file)
 		{
 			$files[] = $file;
 			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
@@ -163,16 +163,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
+		$variants = explode('_', $this->culture);
 		$catalogues = array();
 		$variant = null;
 
-		for($i = 0, $k = count($variants); $i < $k; ++$i)
+		for ($i = 0, $k = count($variants); $i < $k; ++$i)
 		{
-			if(isset($variants[$i]{0}))
+			if (isset($variants[$i]{0}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant .= ($variant) ? '_' . $variants[$i] : $variants[$i];
+				$catalogues[] = $variant . '/' . $catalogue . $this->dataExt;
 			}
 		}
 
@@ -196,32 +196,32 @@ 
 	 * E.g. array('messages','en_AU')
 	 * @return array list of catalogues
 	 */
-	protected function getCatalogues($dir=null,$variant=null)
+	protected function getCatalogues($dir = null, $variant = null)
 	{
-		$dir = $dir?$dir:$this->source;
+		$dir = $dir ? $dir : $this->source;
 		$files = scandir($dir);
 		$catalogue = array();
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file)) {
+			if (is_dir($dir . '/' . $file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
 				$catalogue = array_merge(
 					$catalogue,
-					$this->getCatalogues($dir.'/'.$file, $file)
+					$this->getCatalogues($dir . '/' . $file, $file)
 				);
 			}
 
-			$pos = strpos($file,$this->dataExt);
-			if($pos >0 && substr($file, -1*strlen($this->dataExt)) == $this->dataExt)
+			$pos = strpos($file, $this->dataExt);
+			if ($pos > 0 && substr($file, -1 * strlen($this->dataExt)) == $this->dataExt)
 			{
-				$name = substr($file,0,$pos);
-				$dot = strrpos($name,$this->dataSeparator);
+				$name = substr($file, 0, $pos);
+				$dot = strrpos($name, $this->dataSeparator);
 				$culture = $variant;
 				$cat = $name;
 
-				if(is_int($dot))
+				if (is_int($dot))
 				{
-					$culture = substr($name, $dot+1, strlen($name));
+					$culture = substr($name, $dot + 1, strlen($name));
 					$cat = substr($name, 0, $dot);
 				}
 
@@ -242,16 +242,16 @@ 
 	 * @see update()
 	 * @see delete()
 	 */
-	private function getVariants($catalogue='messages')
+	private function getVariants($catalogue = 'messages')
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 
-		foreach($this->getCatalogueList($catalogue) as $variant)
+		foreach ($this->getCatalogueList($catalogue) as $variant)
 		{
 			$file = $this->getSource($variant);
-			if(is_file($file)) {
+			if (is_file($file)) {
 				return array($variant, $file);
 			}
 		}
@@ -265,22 +265,22 @@ 
 	 * @param string the catalogue to add to
 	 * @return boolean true if saved successfuly, false otherwise.
 	 */
-	public function save($catalogue='messages')
+	public function save($catalogue = 'messages')
 	{
 		$messages = $this->untranslated;
-		if(count($messages) <= 0) {
+		if (count($messages) <= 0) {
 			return false;
 		}
 
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			list($variant, $filename) = $this->createMessageTemplate($catalogue);
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to save to file {$filename}, file must be writable.");
 		}
 
@@ -293,17 +293,17 @@ 
     	$body = $xpath->query('//body')->item(0);
 
 		$lastNodes = $xpath->query('//trans-unit[last()]');
-		if(($last=$lastNodes->item(0))!==null) {
-			$count = (int)$last->getAttribute('id');
+		if (($last = $lastNodes->item(0)) !== null) {
+			$count = (int) $last->getAttribute('id');
 		} else {
 			$count = 0;
 		}
 
 		//for each message add it to the XML file using DOM
-		foreach($messages as $message)
+		foreach ($messages as $message)
 		{
 			$unit = $dom->createElement('trans-unit');
-			$unit->setAttribute('id',++$count);
+			$unit->setAttribute('id', ++$count);
 
 			$source = $dom->createElement('source');
 			$source->appendChild($dom->createCDATASection($message));
@@ -328,7 +328,7 @@ 
 
 		//save it and clear the cache for this variant
 		$dom->save($filename);
-		if(!empty($this->cache)) {
+		if (!empty($this->cache)) {
 			$this->cache->clean($variant, $this->culture);
 		}
 
@@ -343,17 +343,17 @@ 
 	 * @param string the catalogue to save to.
 	 * @return boolean true if translation was updated, false otherwise.
 	 */
-	public function update($text, $target, $comments, $catalogue='messages')
+	public function update($text, $target, $comments, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
 
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to update file {$filename}, file must be writable.");
 		}
 
@@ -365,7 +365,7 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			$found = false;
 			$targetted = false;
@@ -373,25 +373,25 @@ 
 
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
 					$found = true;
 				}
 
 				//found source, get the target and notes
-				if($found)
+				if ($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if ($node->nodeName == 'target')
 					{
 						$node->nodeValue = $target;
 						$targetted = true;
 					}
 
 					//set the notes
-					if(!empty($comments) && $node->nodeName == 'note')
+					if (!empty($comments) && $node->nodeName == 'note')
 					{
 						$node->nodeValue = $comments;
 						$commented = true;
@@ -400,17 +400,17 @@ 
 			}
 
 			//append a target
-			if($found && !$targetted) {
-				$unit->appendChild($dom->createElement('target',$target));
+			if ($found && !$targetted) {
+				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
-			if($found && !$commented && !empty($comments)) {
-				$unit->appendChild($dom->createElement('note',$comments));
+			if ($found && !$commented && !empty($comments)) {
+				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
-			if($found) {
+			if ($found) {
 				break;
 			}
 		}
@@ -418,9 +418,9 @@ 
 		$fileNode = $xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-		if($dom->save($filename) >0)
+		if ($dom->save($filename) > 0)
 		{
-			if(!empty($this->cache)) {
+			if (!empty($this->cache)) {
 				$this->cache->clean($variant, $this->culture);
 			}
 
@@ -436,16 +436,16 @@ 
 	 * @param string the catalogue to delete from.
 	 * @return boolean true if deleted, false otherwise.
 	 */
-	public function delete($message, $catalogue='messages')
+	public function delete($message, $catalogue = 'messages')
 	{
 		$variants = $this->getVariants($catalogue);
-		if($variants) {
+		if ($variants) {
 			list($variant, $filename) = $variants;
 		} else {
 			return false;
 		}
 
-		if(is_writable($filename) == false) {
+		if (is_writable($filename) == false) {
 			throw new TIOException("Unable to modify file {$filename}, file must be writable.");
 		}
 
@@ -457,22 +457,22 @@ 
 		$units = $xpath->query('//trans-unit');
 
 		//for each of the existin units
-		foreach($units as $unit)
+		foreach ($units as $unit)
 		{
 			//in each unit, need to find the source, target and comment nodes
 			//it will assume that the source is before the target.
-			foreach($unit->childNodes as $node)
+			foreach ($unit->childNodes as $node)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
+				if ($node->nodeName == 'source' && $node->firstChild->wholeText == $message)
 				{
 					//we found it, remove and save the xml file.
 					$unit->parentNode->removeChild($unit);
 					$fileNode = $xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
-						if(!empty($this->cache)) {
+					if (false !== $dom->save($filename)) {
+						if (!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
 						return true;
@@ -488,7 +488,7 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
+		if ($catalogue === null) {
 			$catalogue = 'messages';
 		}
 		
@@ -497,12 +497,12 @@ 
 		$file = $this->getSource($variant);
 		$dir = dirname($file);
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 
-		if(!is_dir($dir)) {
+		if (!is_dir($dir)) {
 			throw new TException("Unable to create directory $dir");
 		}
 		

framework/I18N/core/NumberFormat.php

Doc Comments +3 added lines, -1 removed lines

@@ -86,6 +86,7 @@ 
 	 * a CultureInfo or NumberFormatInfo instance will instantiated a instance
 	 * for that particular culture.
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
+	 * @param string $formatInfo
 	 * @return NumberFormat
 	 */
 	function __construct($formatInfo=null)
@@ -232,7 +233,7 @@ 
 
 	/**
 	 * Format the decimal places.
-	 * @param string the decimal number in string form.
+	 * @param string string decimal number in string form.
 	 * @return string formatted decimal places.
 	 */
 	protected function formatDecimal($string)
@@ -280,6 +281,7 @@ 
 	 * Set the pattern to format against. The default patterns
 	 * are retrieved from the NumberFormatInfo instance.
 	 * @param string the requested patterns.
+	 * @param string $pattern
 	 * @return string a number format pattern.
 	 */
 	protected function setPattern($pattern)

Indentation +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 
 	/**
 	 * The DateTimeFormatInfo, containing culture specific patterns and names.
- 	 * @var DateTimeFormatInfo
+	 * @var DateTimeFormatInfo
 	 */
 	protected $formatInfo;
 
@@ -116,7 +116,7 @@ 
 	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
 	{
 		$oldLocale=setLocale(LC_NUMERIC, '0');
-	    setlocale(LC_NUMERIC, 'C');
+		setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 

Spacing +44 added lines, -44 removed lines

@@ -20,13 +20,13 @@ 
 /**
  * Get the NumberFormatInfo class file.
  */
-require_once(dirname(__FILE__).'/NumberFormatInfo.php');
+require_once(dirname(__FILE__) . '/NumberFormatInfo.php');
 
 
 /**
  * Get the encoding utilities
  */
-require_once(dirname(__FILE__).'/util.php');
+require_once(dirname(__FILE__) . '/util.php');
 
 
 /**
@@ -88,13 +88,13 @@ 
 	 * @param mixed either null, a CultureInfo, a NumberFormatInfo, or string
 	 * @return NumberFormat
 	 */
-	function __construct($formatInfo=null)
+	function __construct($formatInfo = null)
 	{
-		if($formatInfo === null)
+		if ($formatInfo === null)
 			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
-		else if($formatInfo instanceof CultureInfo)
+		else if ($formatInfo instanceof CultureInfo)
 			$this->formatInfo = $formatInfo->NumberFormat;
-		else if($formatInfo instanceof NumberFormatInfo)
+		else if ($formatInfo instanceof NumberFormatInfo)
 			$this->formatInfo = $formatInfo;
 		else
 			$this->formatInfo =
@@ -113,44 +113,44 @@ 
 	 * "USD" represents the US Dollar and "EUR" represents the Euro currency.
 	 * @return string formatted number string
 	 */
-	function format($number, $pattern='d', $currency='USD', $charset='UTF-8')
+	function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
 	{
-		$oldLocale=setLocale(LC_NUMERIC, '0');
+		$oldLocale = setLocale(LC_NUMERIC, '0');
 	    setlocale(LC_NUMERIC, 'C');
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
+		if (strtolower($pattern) == 'p')
 			$number = $number * 100;
 
-		$string = (string)$number;
+		$string = (string) $number;
 
 		$decimal = $this->formatDecimal($string);
 		$integer = $this->formatInteger(abs($number));
 
-		if(strlen($decimal)>0)
-			$result = $integer.$decimal;
+		if (strlen($decimal) > 0)
+			$result = $integer . $decimal;
 		else
 			$result = $integer;
 
 		//get the suffix
-		if($number >= 0)
+		if ($number >= 0)
 			$suffix = $this->formatInfo->PositivePattern;
-		else if($number < 0)
+		else if ($number < 0)
 			$suffix = $this->formatInfo->NegativePattern;
 		else
-			$suffix = array("","");
+			$suffix = array("", "");
 
 		//append and prepend suffix
-		$result = $suffix[0].$result.$suffix[1];
+		$result = $suffix[0] . $result . $suffix[1];
 
 		//replace currency sign
 		$symbol = @$this->formatInfo->getCurrencySymbol($currency);
-		if($symbol === null) {
+		if ($symbol === null) {
 			$symbol = $currency;
 		}
 
-		$result = str_replace('¤',$symbol, $result);
+		$result = str_replace('¤', $symbol, $result);
 
 		setlocale(LC_NUMERIC, $oldLocale);
 
@@ -164,20 +164,20 @@ 
 	 */
 	protected function formatInteger($string)
 	{
-		$string = (string)$string;
+		$string = (string) $string;
 
 		$decimalDigits = $this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
-		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string),$decimalDigits);
+		if (is_int($decimalDigits) && $decimalDigits > 0)
+			$string = (string) round(floatval($string), $decimalDigits);
 		$dp = strpos($string, '.');
-		if(is_int($dp))
+		if (is_int($dp))
 			$string = substr($string, 0, $dp);
 		$integer = '';
 
 		$digitSize = $this->formatInfo->getDigitSize();
 
-		$string = str_pad($string, $digitSize, '0',STR_PAD_LEFT);
+		$string = str_pad($string, $digitSize, '0', STR_PAD_LEFT);
 
 		$len = strlen($string);
 
@@ -189,24 +189,24 @@ 
 		$multiGroup = is_int($groupSize[1]);
 		$count = 0;
 
-		if(is_int($groupSize[0]))
+		if (is_int($groupSize[0]))
 		{
 			//now for the integer groupings
-			for($i=0; $i<$len; $i++)
+			for ($i = 0; $i < $len; $i++)
 			{
-				$char = $string{$len-$i-1};
+				$char = $string{$len - $i - 1};
 
-				if($multiGroup && $count == 0)
+				if ($multiGroup && $count == 0)
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if ($i != 0 && $i % $groupSize[0] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
 				}
-				else if($multiGroup && $count >= 1)
+				else if ($multiGroup && $count >= 1)
 				{
-					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
+					if ($i != 0 && ($i - $groupSize[0]) % $groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
@@ -214,7 +214,7 @@ 
 				}
 				else
 				{
-					if($i != 0 && $i%$groupSize[0] == 0)
+					if ($i != 0 && $i % $groupSize[0] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
@@ -245,33 +245,33 @@ 
 
 		//do the correct rounding here
 		//$string = round(floatval($string), $decimalDigits);
-		if(is_int($dp))
+		if (is_int($dp))
 		{
-			if($decimalDigits == -1)
+			if ($decimalDigits == -1)
 			{
-				$decimal = substr($string, $dp+1);
+				$decimal = substr($string, $dp + 1);
 			}
-			else if(is_int($decimalDigits))
+			else if (is_int($decimalDigits))
 			{
-				$float = round((float)$string, $decimalDigits);
-				if(strpos((string)$float, '.') === false)
+				$float = round((float) $string, $decimalDigits);
+				if (strpos((string) $float, '.') === false)
 				{
-					$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal = str_pad($decimal, $decimalDigits, '0');
 				}
 				else
 				{
-					$decimal = substr($float, strpos($float,'.')+1);
-					if(strlen($decimal)<$decimalDigits)
-						$decimal = str_pad($decimal,$decimalDigits,'0');
+					$decimal = substr($float, strpos($float, '.') + 1);
+					if (strlen($decimal) < $decimalDigits)
+						$decimal = str_pad($decimal, $decimalDigits, '0');
 				}
 			}
 			else
 				return $decimal;
 
-			return $decimalSeparator.$decimal;
+			return $decimalSeparator . $decimal;
 		}
 		else if ($decimalDigits > 0)
-			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
+			return $decimalSeparator . str_pad($decimal, $decimalDigits, '0');
 
 		return $decimal;
 	}
@@ -284,7 +284,7 @@ 
 	 */
 	protected function setPattern($pattern)
 	{
-		switch($pattern)
+		switch ($pattern)
 		{
 			case 'c':
 			case 'C':

Braces +43 added lines, -40 removed lines

@@ -90,15 +90,16 @@ 
 	 */
 	function __construct($formatInfo=null)
 	{
-		if($formatInfo === null)
-			$this->formatInfo = NumberFormatInfo::getInvariantInfo();
-		else if($formatInfo instanceof CultureInfo)
-			$this->formatInfo = $formatInfo->NumberFormat;
-		else if($formatInfo instanceof NumberFormatInfo)
-			$this->formatInfo = $formatInfo;
-		else
-			$this->formatInfo =
+		if($formatInfo === null) {
+					$this->formatInfo = NumberFormatInfo::getInvariantInfo();
+		} else if($formatInfo instanceof CultureInfo) {
+					$this->formatInfo = $formatInfo->NumberFormat;
+		} else if($formatInfo instanceof NumberFormatInfo) {
+					$this->formatInfo = $formatInfo;
+		} else {
+					$this->formatInfo =
 				NumberFormatInfo::getInstance($formatInfo);
+		}
 	}
 
 	/**
@@ -120,26 +121,29 @@ 
 
 		$this->setPattern($pattern);
 
-		if(strtolower($pattern) == 'p')
-			$number = $number * 100;
+		if(strtolower($pattern) == 'p') {
+					$number = $number * 100;
+		}
 
 		$string = (string)$number;
 
 		$decimal = $this->formatDecimal($string);
 		$integer = $this->formatInteger(abs($number));
 
-		if(strlen($decimal)>0)
-			$result = $integer.$decimal;
-		else
-			$result = $integer;
+		if(strlen($decimal)>0) {
+					$result = $integer.$decimal;
+		} else {
+					$result = $integer;
+		}
 
 		//get the suffix
-		if($number >= 0)
-			$suffix = $this->formatInfo->PositivePattern;
-		else if($number < 0)
-			$suffix = $this->formatInfo->NegativePattern;
-		else
-			$suffix = array("","");
+		if($number >= 0) {
+					$suffix = $this->formatInfo->PositivePattern;
+		} else if($number < 0) {
+					$suffix = $this->formatInfo->NegativePattern;
+		} else {
+					$suffix = array("","");
+		}
 
 		//append and prepend suffix
 		$result = $suffix[0].$result.$suffix[1];
@@ -168,11 +172,13 @@ 
 
 		$decimalDigits = $this->formatInfo->DecimalDigits;
 		//if not decimal digits, assume 0 decimal points.
-		if(is_int($decimalDigits) && $decimalDigits > 0)
-			$string = (string)round(floatval($string),$decimalDigits);
+		if(is_int($decimalDigits) && $decimalDigits > 0) {
+					$string = (string)round(floatval($string),$decimalDigits);
+		}
 		$dp = strpos($string, '.');
-		if(is_int($dp))
-			$string = substr($string, 0, $dp);
+		if(is_int($dp)) {
+					$string = substr($string, 0, $dp);
+		}
 		$integer = '';
 
 		$digitSize = $this->formatInfo->getDigitSize();
@@ -203,16 +209,14 @@ 
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else if($multiGroup && $count >= 1)
+				} else if($multiGroup && $count >= 1)
 				{
 					if($i != 0 && ($i-$groupSize[0])%$groupSize[1] == 0)
 					{
 						$integer = $groupSeparator . $integer;
 						$count++;
 					}
-				}
-				else
+				} else
 				{
 					if($i != 0 && $i%$groupSize[0] == 0)
 					{
@@ -223,9 +227,9 @@ 
 
 				$integer = $char . $integer;
 			}
+		} else {
+					$integer = $string;
 		}
-		else
-			$integer = $string;
 
 		return $integer;
 	}
@@ -250,28 +254,27 @@ 
 			if($decimalDigits == -1)
 			{
 				$decimal = substr($string, $dp+1);
-			}
-			else if(is_int($decimalDigits))
+			} else if(is_int($decimalDigits))
 			{
 				$float = round((float)$string, $decimalDigits);
 				if(strpos((string)$float, '.') === false)
 				{
 					$decimal = str_pad($decimal,$decimalDigits,'0');
-				}
-				else
+				} else
 				{
 					$decimal = substr($float, strpos($float,'.')+1);
-					if(strlen($decimal)<$decimalDigits)
-						$decimal = str_pad($decimal,$decimalDigits,'0');
+					if(strlen($decimal)<$decimalDigits) {
+											$decimal = str_pad($decimal,$decimalDigits,'0');
+					}
 				}
+			} else {
+							return $decimal;
 			}
-			else
-				return $decimal;
 
 			return $decimalSeparator.$decimal;
+		} else if ($decimalDigits > 0) {
+					return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
 		}
-		else if ($decimalDigits > 0)
-			return $decimalSeparator.str_pad($decimal,$decimalDigits,'0');
 
 		return $decimal;
 	}

framework/I18N/core/NumberFormatInfo.php

Doc Comments +1 added lines

@@ -170,6 +170,7 @@
      * @param int the number formatting type, it should be
      * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
      * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+     * @param integer $type
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      * @see getCurrencyInstance();

Indentation +368 added lines, -368 removed lines

@@ -122,7 +122,7 @@ 
 	/**
 	 * Set the pattern for a specific number pattern. The validate patterns
 	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
@@ -152,94 +152,94 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-    public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
-    {
-        static $invariant;
+	public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
+	{
+		static $invariant;
 		if($invariant === null)
-        {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->NumberFormat;
-            $invariant->setPattern($type);
-        }
+		{
+			$culture = CultureInfo::getInvariantCulture();
+			$invariant = $culture->NumberFormat;
+			$invariant->setPattern($type);
+		}
 		return $invariant;
-    }
-
-    /**
-     * Returns the NumberFormatInfo associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @param int the number formatting type, it should be
-     * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
-     * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     * @see getCurrencyInstance();
-     * @see getPercentageInstance();
-     * @see getScientificInstance();
-     */
-    public static function getInstance($culture=null,
-    								   $type=NumberFormatInfo::DECIMAL)
-    {
+	}
+
+	/**
+	 * Returns the NumberFormatInfo associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @param int the number formatting type, it should be
+	 * NumberFormatInfo::DECIMAL, NumberFormatInfo::CURRENCY,
+	 * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 * @see getCurrencyInstance();
+	 * @see getPercentageInstance();
+	 * @see getScientificInstance();
+	 */
+	public static function getInstance($culture=null,
+									   $type=NumberFormatInfo::DECIMAL)
+	{
    		if ($culture instanceof CultureInfo)
    		{
-            $formatInfo = $culture->NumberFormat;
-            $formatInfo->setPattern($type);
-            return $formatInfo;
+			$formatInfo = $culture->NumberFormat;
+			$formatInfo->setPattern($type);
+			return $formatInfo;
    		}
-       	else if(is_string($culture))
-       	{
-       		$cultureInfo = new CultureInfo($culture);
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-       	else
-       	{
-            $cultureInfo = new CultureInfo();
-       		$formatInfo = $cultureInfo->NumberFormat;
-       		$formatInfo->setPattern($type);
-       		return $formatInfo;
-       	}
-    }
-
-    /**
-     * Returns the currency format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getCurrencyInstance($culture=null)
-    {
-        return self::getInstance($culture, self::CURRENCY);
-    }
-
-    /**
-     * Returns the percentage format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getPercentageInstance($culture=null)
-    {
-        return self::getInstance($culture, self::PERCENTAGE);
-    }
-
-    /**
-     * Returns the scientific format info associated with the specified culture.
-     * @param CultureInfo the culture that gets the NumberFormat property.
-     * @return NumberFormatInfo NumberFormatInfo for the specified
-     * culture.
-     */
-    public static function getScientificInstance($culture=null)
-    {
-        return self::getInstance($culture, self::SCIENTIFIC);
-    }
-
-    /**
-     * Parse the given pattern and return a list of known properties.
-     * @param string a number pattern.
-     * @return array list of pattern properties.
-     */
-    protected function parsePattern($pattern)
+	   	else if(is_string($culture))
+	   	{
+	   		$cultureInfo = new CultureInfo($culture);
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	   	else
+	   	{
+			$cultureInfo = new CultureInfo();
+	   		$formatInfo = $cultureInfo->NumberFormat;
+	   		$formatInfo->setPattern($type);
+	   		return $formatInfo;
+	   	}
+	}
+
+	/**
+	 * Returns the currency format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getCurrencyInstance($culture=null)
+	{
+		return self::getInstance($culture, self::CURRENCY);
+	}
+
+	/**
+	 * Returns the percentage format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getPercentageInstance($culture=null)
+	{
+		return self::getInstance($culture, self::PERCENTAGE);
+	}
+
+	/**
+	 * Returns the scientific format info associated with the specified culture.
+	 * @param CultureInfo the culture that gets the NumberFormat property.
+	 * @return NumberFormatInfo NumberFormatInfo for the specified
+	 * culture.
+	 */
+	public static function getScientificInstance($culture=null)
+	{
+		return self::getInstance($culture, self::SCIENTIFIC);
+	}
+
+	/**
+	 * Parse the given pattern and return a list of known properties.
+	 * @param string a number pattern.
+	 * @return array list of pattern properties.
+	 */
+	protected function parsePattern($pattern)
 	{
 		$pattern = explode(';',$pattern);
 
@@ -355,296 +355,296 @@ 
 	}
 
 
-    /**
-     * Indicates the number of decimal places.
-     * @return int number of decimal places.
-     */
-    function getDecimalDigits()
-    {
-    	return $this->pattern['decimalPoints'];
-    }
-
-    /**
-     * Set the number of decimal places.
-     * @param int number of decimal places.
-     */
-    function setDecimalDigits($value)
-    {
-    	return $this->pattern['decimalPoints'] = $value;
-    }
-
-    function getDigitSize()
-    {
-    	return $this->pattern['digitSize'];
-    }
-
-    function setDigitSize($value)
-    {
-    	$this->pattern['digitSize'] = $value;
-    }
-
-    /**
-     * Gets the string to use as the decimal separator.
-     * @return string decimal separator.
-     */
-    function getDecimalSeparator()
-    {
-    	return $this->data['NumberElements'][0];
-    }
-
-    /**
-     * Set the string to use as the decimal separator.
-     * @param string the decimal point
-     */
-    function setDecimalSeparator($value)
-    {
-    	return $this->data['NumberElements'][0] = $value;
-    }
-
-    /**
-     * Gets the string that separates groups of digits to the left
-     * of the decimal in currency values.
-     * @param parameter
-     * @return string currency group separator.
-     */
-    function getGroupSeparator()
-    {
-    	return $this->data['NumberElements'][1];
-    }
-
-    /**
-     * Set the string to use as the group separator.
-     * @param string the group separator.
-     */
-    function setGroupSeparator($value)
-    {
-    	return $this->data['NumberElements'][1] = $value;
-    }
-
-    /**
-     * Gets the number of digits in each group to the left of the decimal
-     * There can be two grouping sizes, this fucntion
-     * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 will be false.
-     * @return array grouping size(s).
-     */
-    function getGroupSizes()
-    {
-    	$group1 = $this->pattern['groupSize1'];
-    	$group2 = $this->pattern['groupSize2'];
-
-    	return array($group1, $group2);
-    }
-
-    /**
-     * Set the number of digits in each group to the left of the decimal.
-     * There can be two grouping sizes, the value should
-     * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
-     * group2 should be false.
-     * @param array grouping size(s).
-     */
-    function setGroupSizes($groupSize)
-    {
+	/**
+	 * Indicates the number of decimal places.
+	 * @return int number of decimal places.
+	 */
+	function getDecimalDigits()
+	{
+		return $this->pattern['decimalPoints'];
+	}
+
+	/**
+	 * Set the number of decimal places.
+	 * @param int number of decimal places.
+	 */
+	function setDecimalDigits($value)
+	{
+		return $this->pattern['decimalPoints'] = $value;
+	}
+
+	function getDigitSize()
+	{
+		return $this->pattern['digitSize'];
+	}
+
+	function setDigitSize($value)
+	{
+		$this->pattern['digitSize'] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the decimal separator.
+	 * @return string decimal separator.
+	 */
+	function getDecimalSeparator()
+	{
+		return $this->data['NumberElements'][0];
+	}
+
+	/**
+	 * Set the string to use as the decimal separator.
+	 * @param string the decimal point
+	 */
+	function setDecimalSeparator($value)
+	{
+		return $this->data['NumberElements'][0] = $value;
+	}
+
+	/**
+	 * Gets the string that separates groups of digits to the left
+	 * of the decimal in currency values.
+	 * @param parameter
+	 * @return string currency group separator.
+	 */
+	function getGroupSeparator()
+	{
+		return $this->data['NumberElements'][1];
+	}
+
+	/**
+	 * Set the string to use as the group separator.
+	 * @param string the group separator.
+	 */
+	function setGroupSeparator($value)
+	{
+		return $this->data['NumberElements'][1] = $value;
+	}
+
+	/**
+	 * Gets the number of digits in each group to the left of the decimal
+	 * There can be two grouping sizes, this fucntion
+	 * returns <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 will be false.
+	 * @return array grouping size(s).
+	 */
+	function getGroupSizes()
+	{
+		$group1 = $this->pattern['groupSize1'];
+		$group2 = $this->pattern['groupSize2'];
+
+		return array($group1, $group2);
+	}
+
+	/**
+	 * Set the number of digits in each group to the left of the decimal.
+	 * There can be two grouping sizes, the value should
+	 * be an <b>array(group1, group2)</b>, if there is only 1 grouping size,
+	 * group2 should be false.
+	 * @param array grouping size(s).
+	 */
+	function setGroupSizes($groupSize)
+	{
    		$this->pattern['groupSize1'] = $groupSize[0];
    		$this->pattern['groupSize2'] = $groupSize[1];
-    }
-
-    /**
-     * Gets the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary negative pattern.
-     */
-    function getNegativePattern()
-    {
-    	$prefix = $this->pattern['negPref'];
-    	$postfix = $this->pattern['negPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for negative values.
-     * The negative pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary negative pattern.
-     */
-    function setNegativePattern($pattern)
-    {
-    	$this->pattern['negPref'] = $pattern[0];
-    	$this->pattern['negPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix.
-     * This function returns <b>array(prefix, postfix)</b>.
-     * @return arary positive pattern.
-     */
-    function getPositivePattern()
-    {
-    	$prefix = $this->pattern['posPref'];
-    	$postfix = $this->pattern['posPost'];
-    	return array($prefix, $postfix);
-    }
-
-    /**
-     * Set the format pattern for positive values.
-     * The positive pattern is composed of a prefix, and postfix in the form
-     * <b>array(prefix, postfix)</b>.
-     * @param arary positive pattern.
-     */
-    function setPositivePattern($pattern)
-    {
-    	$this->pattern['posPref'] = $pattern[0];
-    	$this->pattern['posPost'] = $pattern[1];
-    }
-
-    /**
-     * Gets the string to use as the currency symbol.
-     * @return string currency symbol.
-     */
-    function getCurrencySymbol($currency='USD')
-    {
-    	if(isset($this->pattern['symbol']))
+	}
+
+	/**
+	 * Gets the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary negative pattern.
+	 */
+	function getNegativePattern()
+	{
+		$prefix = $this->pattern['negPref'];
+		$postfix = $this->pattern['negPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for negative values.
+	 * The negative pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary negative pattern.
+	 */
+	function setNegativePattern($pattern)
+	{
+		$this->pattern['negPref'] = $pattern[0];
+		$this->pattern['negPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix.
+	 * This function returns <b>array(prefix, postfix)</b>.
+	 * @return arary positive pattern.
+	 */
+	function getPositivePattern()
+	{
+		$prefix = $this->pattern['posPref'];
+		$postfix = $this->pattern['posPost'];
+		return array($prefix, $postfix);
+	}
+
+	/**
+	 * Set the format pattern for positive values.
+	 * The positive pattern is composed of a prefix, and postfix in the form
+	 * <b>array(prefix, postfix)</b>.
+	 * @param arary positive pattern.
+	 */
+	function setPositivePattern($pattern)
+	{
+		$this->pattern['posPref'] = $pattern[0];
+		$this->pattern['posPost'] = $pattern[1];
+	}
+
+	/**
+	 * Gets the string to use as the currency symbol.
+	 * @return string currency symbol.
+	 */
+	function getCurrencySymbol($currency='USD')
+	{
+		if(isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
-    	else
-    		return $this->data['Currencies'][$currency][0];
-    }
-
-
-    /**
-     * Set the string to use as the currency symbol.
-     * @param string currency symbol.
-     */
-    function setCurrencySymbol($symbol)
-    {
-    	$this->pattern['symbol'] = $symbol;
-    }
-
-    /**
-     * Gets the string that represents negative infinity.
-     * @return string negative infinity.
-     */
-    function getNegativeInfinitySymbol()
-    {
+		else
+			return $this->data['Currencies'][$currency][0];
+	}
+
+
+	/**
+	 * Set the string to use as the currency symbol.
+	 * @param string currency symbol.
+	 */
+	function setCurrencySymbol($symbol)
+	{
+		$this->pattern['symbol'] = $symbol;
+	}
+
+	/**
+	 * Gets the string that represents negative infinity.
+	 * @return string negative infinity.
+	 */
+	function getNegativeInfinitySymbol()
+	{
 		return $this->pattern['negInfty'];
-    }
-
-    /**
-     * Set the string that represents negative infinity.
-     * @param string negative infinity.
-     */
-    function setNegativeInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents negative infinity.
+	 * @param string negative infinity.
+	 */
+	function setNegativeInfinitySymbol($value)
+	{
 		$this->pattern['negInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that represents positive infinity.
-     * @return string positive infinity.
-     */
-    function getPositiveInfinitySymbol()
-    {
+	}
+
+	/**
+	 * Gets the string that represents positive infinity.
+	 * @return string positive infinity.
+	 */
+	function getPositiveInfinitySymbol()
+	{
 		return $this->pattern['posInfty'];
-    }
-
-    /**
-     * Set the string that represents positive infinity.
-     * @param string positive infinity.
-     */
-    function setPositiveInfinitySymbol($value)
-    {
+	}
+
+	/**
+	 * Set the string that represents positive infinity.
+	 * @param string positive infinity.
+	 */
+	function setPositiveInfinitySymbol($value)
+	{
 		$this->pattern['posInfty'] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is negative.
-     * @return string negative sign.
-     */
-    function getNegativeSign()
-    {
-    	return $this->data['NumberElements'][6];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is negative.
-     * @param string negative sign.
-     */
-    function setNegativeSign($value)
-    {
-    	$this->data['NumberElements'][6] = $value;
-    }
-
-    /**
-     * Gets the string that denotes that the associated number is positive.
-     * @return string positive sign.
-     */
-    function getPositiveSign()
-    {
-    	return $this->data['NumberElements'][11];
-    }
-
-    /**
-     * Set the string that denotes that the associated number is positive.
-     * @param string positive sign.
-     */
-    function setPositiveSign($value)
-    {
-    	$this->data['NumberElements'][11] = $value;
-    }
-
-    /**
-     * Gets the string that represents the IEEE NaN (not a number) value.
-     * @return string NaN symbol.
-     */
-    function getNaNSymbol()
-    {
-    	return $this->data['NumberElements'][10];
-    }
-
-    /**
-     * Set the string that represents the IEEE NaN (not a number) value.
-     * @param string NaN symbol.
-     */
-    function setNaNSymbol($value)
-    {
-    	$this->data['NumberElements'][10] = $value;
-    }
-
-    /**
-     * Gets the string to use as the percent symbol.
-     * @return string percent symbol.
-     */
-    function getPercentSymbol()
-    {
-    	return $this->data['NumberElements'][3];
-    }
-
-    /**
-     * Set the string to use as the percent symbol.
-     * @param string percent symbol.
-     */
-    function setPercentSymbol($value)
-    {
-    	$this->data['NumberElements'][3] = $value;
-    }
-
-    /**
-     * Gets the string to use as the per mille symbol.
-     * @return string percent symbol.
-     */
-    function getPerMilleSymbol()
-    {
-    	return $this->data['NumberElements'][8];
-    }
-
-    /**
-     * Set the string to use as the per mille symbol.
-     * @param string percent symbol.
-     */
-    function setPerMilleSymbol($value)
-    {
-    	$this->data['NumberElements'][8] = $value;
-    }
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is negative.
+	 * @return string negative sign.
+	 */
+	function getNegativeSign()
+	{
+		return $this->data['NumberElements'][6];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is negative.
+	 * @param string negative sign.
+	 */
+	function setNegativeSign($value)
+	{
+		$this->data['NumberElements'][6] = $value;
+	}
+
+	/**
+	 * Gets the string that denotes that the associated number is positive.
+	 * @return string positive sign.
+	 */
+	function getPositiveSign()
+	{
+		return $this->data['NumberElements'][11];
+	}
+
+	/**
+	 * Set the string that denotes that the associated number is positive.
+	 * @param string positive sign.
+	 */
+	function setPositiveSign($value)
+	{
+		$this->data['NumberElements'][11] = $value;
+	}
+
+	/**
+	 * Gets the string that represents the IEEE NaN (not a number) value.
+	 * @return string NaN symbol.
+	 */
+	function getNaNSymbol()
+	{
+		return $this->data['NumberElements'][10];
+	}
+
+	/**
+	 * Set the string that represents the IEEE NaN (not a number) value.
+	 * @param string NaN symbol.
+	 */
+	function setNaNSymbol($value)
+	{
+		$this->data['NumberElements'][10] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the percent symbol.
+	 * @return string percent symbol.
+	 */
+	function getPercentSymbol()
+	{
+		return $this->data['NumberElements'][3];
+	}
+
+	/**
+	 * Set the string to use as the percent symbol.
+	 * @param string percent symbol.
+	 */
+	function setPercentSymbol($value)
+	{
+		$this->data['NumberElements'][3] = $value;
+	}
+
+	/**
+	 * Gets the string to use as the per mille symbol.
+	 * @return string percent symbol.
+	 */
+	function getPerMilleSymbol()
+	{
+		return $this->data['NumberElements'][8];
+	}
+
+	/**
+	 * Set the string to use as the per mille symbol.
+	 * @param string percent symbol.
+	 */
+	function setPerMilleSymbol($value)
+	{
+		$this->data['NumberElements'][8] = $value;
+	}
 }
 

Spacing +46 added lines, -46 removed lines

@@ -20,7 +20,7 @@ 
 /**
  * Get the CultureInfo class file.
  */
-require_once(dirname(__FILE__).'/CultureInfo.php');
+require_once(dirname(__FILE__) . '/CultureInfo.php');
 
 /**
  * NumberFormatInfo class
@@ -78,11 +78,11 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
+		$getProperty = 'get' . $name;
+		if (in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
-			throw new Exception('Property '.$name.' does not exists.');
+			throw new Exception('Property ' . $name . ' does not exists.');
 	}
 
 	/**
@@ -91,11 +91,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
+		$setProperty = 'set' . $name;
+		if (in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
-			throw new Exception('Property '.$name.' can not be set.');
+			throw new Exception('Property ' . $name . ' can not be set.');
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 	 * @param array ICU data for date time formatting.
 	 * @see getInstance()
 	 */
-	public function __construct($data=array(), $type=NumberFormatInfo::DECIMAL)
+	public function __construct($data = array(), $type = NumberFormatInfo::DECIMAL)
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
+		if (empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
 		$this->data = $data;
@@ -125,20 +125,20 @@ 
      * NumberFormatInfo::PERCENTAGE, or NumberFormatInfo::SCIENTIFIC
 	 * @param int pattern type.
 	 */
-	public function setPattern($type=NumberFormatInfo::DECIMAL)
+	public function setPattern($type = NumberFormatInfo::DECIMAL)
 	{
-		if(is_int($type))
+		if (is_int($type))
 			$this->pattern =
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
 			$this->pattern = $this->parsePattern($type);
 
 		$this->pattern['negInfty'] =
-			$this->data['NumberElements'][6].
+			$this->data['NumberElements'][6] .
 			$this->data['NumberElements'][9];
 
 		$this->pattern['posInfty'] =
-			$this->data['NumberElements'][11].
+			$this->data['NumberElements'][11] .
 			$this->data['NumberElements'][9];
 	}
 
@@ -152,10 +152,10 @@ 
 	 * (invariant).
 	 * @return NumberFormatInfo default NumberFormatInfo.
 	 */
-    public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
+    public static function getInvariantInfo($type = NumberFormatInfo::DECIMAL)
     {
         static $invariant;
-		if($invariant === null)
+		if ($invariant === null)
         {
             $culture = CultureInfo::getInvariantCulture();
             $invariant = $culture->NumberFormat;
@@ -176,8 +176,8 @@ 
      * @see getPercentageInstance();
      * @see getScientificInstance();
      */
-    public static function getInstance($culture=null,
-    								   $type=NumberFormatInfo::DECIMAL)
+    public static function getInstance($culture = null,
+    								   $type = NumberFormatInfo::DECIMAL)
     {
    		if ($culture instanceof CultureInfo)
    		{
@@ -185,7 +185,7 @@ 
             $formatInfo->setPattern($type);
             return $formatInfo;
    		}
-       	else if(is_string($culture))
+       	else if (is_string($culture))
        	{
        		$cultureInfo = new CultureInfo($culture);
        		$formatInfo = $cultureInfo->NumberFormat;
@@ -207,7 +207,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getCurrencyInstance($culture=null)
+    public static function getCurrencyInstance($culture = null)
     {
         return self::getInstance($culture, self::CURRENCY);
     }
@@ -218,7 +218,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getPercentageInstance($culture=null)
+    public static function getPercentageInstance($culture = null)
     {
         return self::getInstance($culture, self::PERCENTAGE);
     }
@@ -229,7 +229,7 @@ 
      * @return NumberFormatInfo NumberFormatInfo for the specified
      * culture.
      */
-    public static function getScientificInstance($culture=null)
+    public static function getScientificInstance($culture = null)
     {
         return self::getInstance($culture, self::SCIENTIFIC);
     }
@@ -241,10 +241,10 @@ 
      */
     protected function parsePattern($pattern)
 	{
-		$pattern = explode(';',$pattern);
+		$pattern = explode(';', $pattern);
 
 		$negative = null;
-		if(count($pattern) > 1)
+		if (count($pattern) > 1)
 			$negative = $pattern[1];
 		$pattern = $pattern[0];
 
@@ -254,13 +254,13 @@ 
 		$hash = '#';
 
 		//find the first group point, and decimal point
-		$groupPos1 = strrpos($pattern,$comma);
-		$decimalPos = strrpos($pattern,$dot);
+		$groupPos1 = strrpos($pattern, $comma);
+		$decimalPos = strrpos($pattern, $dot);
 
 		$groupPos2 = false;
 		$groupSize1 = false;
 		$groupSize2 = false;
-		$decimalPoints = is_int($decimalPos)?-1:false;
+		$decimalPoints = is_int($decimalPos) ?-1 : false;
 
 		$info['negPref'] = $this->data['NumberElements'][6];
 		$info['negPost'] = '';
@@ -269,7 +269,7 @@ 
 		$info['positive'] = $pattern;
 
 		//find the negative prefix and postfix
-		if($negative)
+		if ($negative)
 		{
 			$prefixPostfix = $this->getPrePostfix($negative);
 			$info['negPref'] = $prefixPostfix[0];
@@ -282,24 +282,24 @@ 
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
-		if(is_int($groupPos1))
+		if (is_int($groupPos1))
 		{
 			//get the second group
-			$groupPos2 = strrpos(substr($pattern,0,$groupPos1),$comma);
+			$groupPos2 = strrpos(substr($pattern, 0, $groupPos1), $comma);
 
 			//get the number of decimal digits
-			if(is_int($decimalPos))
+			if (is_int($decimalPos))
 			{
-				$groupSize1 = $decimalPos - $groupPos1-1;
+				$groupSize1 = $decimalPos - $groupPos1 - 1;
 
 			}
 			else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
-				for($i=strlen($pattern)-1; $i>=0; $i--)
+				for ($i = strlen($pattern) - 1; $i >= 0; $i--)
 				{
-					if($pattern{$i} == $digit || $pattern{$i}==$hash)
+					if ($pattern{$i} == $digit || $pattern{$i} == $hash)
 					{
 						$groupSize1 = $i - $groupPos1;
 						break;
@@ -308,16 +308,16 @@ 
 			}
 
 			//get the second group size
-			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+			if (is_int($groupPos2))
+				$groupSize2 = $groupPos1 - $groupPos2 - 1;
 		}
 
-		if(is_int($decimalPos))
+		if (is_int($decimalPos))
 		{
-			for($i=strlen($pattern)-1; $i>=0; $i--)
+			for ($i = strlen($pattern) - 1; $i >= 0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
-				if($pattern{$i} == $digit)
+				if ($pattern{$i} == $dot) break;
+				if ($pattern{$i} == $digit)
 				{
 					$decimalPoints = $i - $decimalPos;
 					break;
@@ -325,12 +325,12 @@ 
 			}
 		}
 
-		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$decimalPos);
+		if (is_int($decimalPos))
+			$digitPattern = substr($pattern, 0, $decimalPos);
 		else
-			$digitPattern  = $pattern;
+			$digitPattern = $pattern;
 
-		$digitPattern  = preg_replace('/[^0]/','',$digitPattern);
+		$digitPattern = preg_replace('/[^0]/', '', $digitPattern);
 
 		$info['groupPos1'] = $groupPos1;
 		$info['groupSize1'] = $groupSize1;
@@ -351,7 +351,7 @@ 
 	{
 		$regexp = '/[#,\.0]+/';
 		$result = preg_split($regexp, $pattern);
-		return array($result[0],$result[1]);
+		return array($result[0], $result[1]);
 	}
 
 
@@ -503,9 +503,9 @@ 
      * Gets the string to use as the currency symbol.
      * @return string currency symbol.
      */
-    function getCurrencySymbol($currency='USD')
+    function getCurrencySymbol($currency = 'USD')
     {
-    	if(isset($this->pattern['symbol']))
+    	if (isset($this->pattern['symbol']))
 			return $this->pattern['symbol'];
     	else
     		return $this->data['Currencies'][$currency][0];

Braces +40 added lines, -33 removed lines

@@ -79,10 +79,11 @@ 
 	public function __get($name)
 	{
 		$getProperty = 'get'.$name;
-		if(in_array($getProperty, $this->properties))
-			return $this->$getProperty();
-		else
-			throw new Exception('Property '.$name.' does not exists.');
+		if(in_array($getProperty, $this->properties)) {
+					return $this->$getProperty();
+		} else {
+					throw new Exception('Property '.$name.' does not exists.');
+		}
 	}
 
 	/**
@@ -92,10 +93,11 @@ 
 	public function __set($name, $value)
 	{
 		$setProperty = 'set'.$name;
-		if(in_array($setProperty, $this->properties))
-			$this->$setProperty($value);
-		else
-			throw new Exception('Property '.$name.' can not be set.');
+		if(in_array($setProperty, $this->properties)) {
+					$this->$setProperty($value);
+		} else {
+					throw new Exception('Property '.$name.' can not be set.');
+		}
 	}
 
 	/**
@@ -111,8 +113,9 @@ 
 	{
 		$this->properties = get_class_methods($this);
 
-		if(empty($data))
-			throw new Exception('Please provide the ICU data to initialize.');
+		if(empty($data)) {
+					throw new Exception('Please provide the ICU data to initialize.');
+		}
 
 		$this->data = $data;
 
@@ -127,11 +130,12 @@ 
 	 */
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
 	{
-		if(is_int($type))
-			$this->pattern =
+		if(is_int($type)) {
+					$this->pattern =
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
-		else
-			$this->pattern = $this->parsePattern($type);
+		} else {
+					$this->pattern = $this->parsePattern($type);
+		}
 
 		$this->pattern['negInfty'] =
 			$this->data['NumberElements'][6].
@@ -184,15 +188,13 @@ 
             $formatInfo = $culture->NumberFormat;
             $formatInfo->setPattern($type);
             return $formatInfo;
-   		}
-       	else if(is_string($culture))
+   		} else if(is_string($culture))
        	{
        		$cultureInfo = new CultureInfo($culture);
        		$formatInfo = $cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
-       	}
-       	else
+       	} else
        	{
             $cultureInfo = new CultureInfo();
        		$formatInfo = $cultureInfo->NumberFormat;
@@ -244,8 +246,9 @@ 
 		$pattern = explode(';',$pattern);
 
 		$negative = null;
-		if(count($pattern) > 1)
-			$negative = $pattern[1];
+		if(count($pattern) > 1) {
+					$negative = $pattern[1];
+		}
 		$pattern = $pattern[0];
 
 		$comma = ',';
@@ -292,8 +295,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1-1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.
@@ -308,15 +310,18 @@ 
 			}
 
 			//get the second group size
-			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+			if(is_int($groupPos2)) {
+							$groupSize2 = $groupPos1 - $groupPos2-1;
+			}
 		}
 
 		if(is_int($decimalPos))
 		{
 			for($i=strlen($pattern)-1; $i>=0; $i--)
 			{
-				if($pattern{$i} == $dot) break;
+				if($pattern{$i} == $dot) {
+					break;
+				}
 				if($pattern{$i} == $digit)
 				{
 					$decimalPoints = $i - $decimalPos;
@@ -325,10 +330,11 @@ 
 			}
 		}
 
-		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$decimalPos);
-		else
-			$digitPattern  = $pattern;
+		if(is_int($decimalPos)) {
+					$digitPattern = substr($pattern,0,$decimalPos);
+		} else {
+					$digitPattern  = $pattern;
+		}
 
 		$digitPattern  = preg_replace('/[^0]/','',$digitPattern);
 
@@ -505,10 +511,11 @@ 
      */
     function getCurrencySymbol($currency='USD')
     {
-    	if(isset($this->pattern['symbol']))
-			return $this->pattern['symbol'];
-    	else
-    		return $this->data['Currencies'][$currency][0];
+    	if(isset($this->pattern['symbol'])) {
+    				return $this->pattern['symbol'];
+    	} else {
+    	    		return $this->data['Currencies'][$currency][0];
+    	}
     }
 
 

framework/I18N/core/TCache_Lite.php

Doc Comments +2 added lines

@@ -485,6 +485,8 @@
     /**
     *
     * @access private
+    * @param string $id
+    * @param string $data
     */
     function _memoryCacheAdd($id, $data)
     {

Indentation +570 added lines, -570 removed lines

@@ -46,582 +46,582 @@
 class TCache_Lite
 {
 
-    // --- Private properties ---
-
-    /**
-    * Directory where to put the cache files
-    * (make sure to add a trailing slash)
-    *
-    * @var string $_cacheDir
-    */
-    protected $_cacheDir = '/tmp/';
-
-    /**
-    * Enable / disable caching
-    *
-    * (can be very usefull for the debug of cached scripts)
-    *
-    * @var boolean $_caching
-    */
-    protected $_caching = true;
-
-    /**
-    * Cache lifetime (in seconds)
-    *
-    * @var int $_lifeTime
-    */
-    protected $_lifeTime = 3600;
-
-    /**
-    * Enable / disable fileLocking
-    *
-    * (can avoid cache corruption under bad circumstances)
-    *
-    * @var boolean $_fileLocking
-    */
-    protected $_fileLocking = true;
-
-    /**
-    * Timestamp of the last valid cache
-    *
-    * @var int $_refreshTime
-    */
-    protected $_refreshTime;
-
-    /**
-    * File name (with path)
-    *
-    * @var string $_file
-    */
-    protected $_file;
-
-    /**
-    * Enable / disable write control (the cache is read just after writing
-    * to detect corrupt entries)
-    *
-    * Enable write control will lightly slow the cache writing but not the
-    * cache reading. Write control can detect some corrupt cache files but
-    * maybe it's not a perfect control
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_writeControl = true;
-
-    /**
-    * Enable / disable read control
-    *
-    * If enabled, a control key is embeded in cache file and this key is
-    * compared with the one calculated after the reading.
-    *
-    * @var boolean $_writeControl
-    */
-    protected $_readControl = true;
-
-    /**
-    * Type of read control (only if read control is enabled)
-    *
-    * Available values are :
-    * 'md5' for a md5 hash control (best but slowest)
-    * 'crc32' for a crc32 hash control (lightly less safe but faster,
-    * better choice)
-    * 'strlen' for a length only test (fastest)
-    *
-    * @var boolean $_readControlType
-    */
-    protected $_readControlType = 'crc32';
-
-    /**
-    * Current cache id
-    *
-    * @var string $_id
-    */
-    protected $_id;
-
-    /**
-    * Current cache group
-    *
-    * @var string $_group
-    */
-    protected $_group;
-
-    /**
-    * Enable / Disable "Memory Caching"
-    *
-    * NB : There is no lifetime for memory caching !
-    *
-    * @var boolean $_memoryCaching
-    */
-    protected $_memoryCaching = false;
-
-    /**
-    * Enable / Disable "Only Memory Caching"
-    * (be carefull, memory caching is "beta quality")
-    *
-    * @var boolean $_onlyMemoryCaching
-    */
-    protected $_onlyMemoryCaching = false;
-
-    /**
-    * Memory caching array
-    *
-    * @var array $_memoryCachingArray
-    */
-    protected $_memoryCachingArray = array();
-
-    /**
-    * Memory caching counter
-    *
-    * @var int $memoryCachingCounter
-    */
-    protected $_memoryCachingCounter = 0;
-
-    /**
-    * Memory caching limit
-    *
-    * @var int $memoryCachingLimit
-    */
-    protected $_memoryCachingLimit = 1000;
-
-    /**
-    * File Name protection
-    *
-    * if set to true, you can use any cache id or group name
-    * if set to false, it can be faster but cache ids and group names
-    * will be used directly in cache file names so be carefull with
-    * special characters...
-    *
-    * @var boolean $fileNameProtection
-    */
-    protected $_fileNameProtection = true;
-
-    /**
-    * Enable / disable automatic serialization
-    *
-    * it can be used to save directly datas which aren't strings
-    * (but it's slower)
-    *
-    * @var boolean $_serialize
-    */
-    protected $_automaticSerialization = false;
-
-    // --- Public methods ---
-
-    /**
-    * Constructor
-    *
-    * $options is an assoc. Available options are :
-    * $options = array(
-    * 'cacheDir' => directory where to put the cache files (string),
-    * 'caching' => enable / disable caching (boolean),
-    * 'lifeTime' => cache lifetime in seconds (int),
-    * 'fileLocking' => enable / disable fileLocking (boolean),
-    * 'writeControl' => enable / disable write control (boolean),
-    * 'readControl' => enable / disable read control (boolean),
-    * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
-    * 'memoryCaching' => enable / disable memory caching (boolean),
-    * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
-    * 'memoryCachingLimit' => max nbr of records in memory caching (int),
-    * 'fileNameProtection' => enable / disable file name protection (boolean),
-    * 'automaticSerialization' => enable / disable serialization (boolean)
-    * );
-    *
-    * @param array $options options
-    * @access public
-    */
-    function TCache_Lite($options = array(null))
-    {
-        $availableOptions = array(	'automaticSerialization',
-        							'fileNameProtection',
-        							'memoryCaching',
-        							'onlyMemoryCaching',
-        							'memoryCachingLimit',
-        							'cacheDir',
-        							'caching',
-        							'lifeTime',
-        							'fileLocking',
-        							'writeControl',
-        							'readControl',
-        							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
-            }
-        }
-        $this->_refreshTime = time() - $this->_lifeTime;
+	// --- Private properties ---
+
+	/**
+	 * Directory where to put the cache files
+	 * (make sure to add a trailing slash)
+	 *
+	 * @var string $_cacheDir
+	 */
+	protected $_cacheDir = '/tmp/';
+
+	/**
+	 * Enable / disable caching
+	 *
+	 * (can be very usefull for the debug of cached scripts)
+	 *
+	 * @var boolean $_caching
+	 */
+	protected $_caching = true;
+
+	/**
+	 * Cache lifetime (in seconds)
+	 *
+	 * @var int $_lifeTime
+	 */
+	protected $_lifeTime = 3600;
+
+	/**
+	 * Enable / disable fileLocking
+	 *
+	 * (can avoid cache corruption under bad circumstances)
+	 *
+	 * @var boolean $_fileLocking
+	 */
+	protected $_fileLocking = true;
+
+	/**
+	 * Timestamp of the last valid cache
+	 *
+	 * @var int $_refreshTime
+	 */
+	protected $_refreshTime;
+
+	/**
+	 * File name (with path)
+	 *
+	 * @var string $_file
+	 */
+	protected $_file;
+
+	/**
+	 * Enable / disable write control (the cache is read just after writing
+	 * to detect corrupt entries)
+	 *
+	 * Enable write control will lightly slow the cache writing but not the
+	 * cache reading. Write control can detect some corrupt cache files but
+	 * maybe it's not a perfect control
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_writeControl = true;
+
+	/**
+	 * Enable / disable read control
+	 *
+	 * If enabled, a control key is embeded in cache file and this key is
+	 * compared with the one calculated after the reading.
+	 *
+	 * @var boolean $_writeControl
+	 */
+	protected $_readControl = true;
+
+	/**
+	 * Type of read control (only if read control is enabled)
+	 *
+	 * Available values are :
+	 * 'md5' for a md5 hash control (best but slowest)
+	 * 'crc32' for a crc32 hash control (lightly less safe but faster,
+	 * better choice)
+	 * 'strlen' for a length only test (fastest)
+	 *
+	 * @var boolean $_readControlType
+	 */
+	protected $_readControlType = 'crc32';
+
+	/**
+	 * Current cache id
+	 *
+	 * @var string $_id
+	 */
+	protected $_id;
+
+	/**
+	 * Current cache group
+	 *
+	 * @var string $_group
+	 */
+	protected $_group;
+
+	/**
+	 * Enable / Disable "Memory Caching"
+	 *
+	 * NB : There is no lifetime for memory caching !
+	 *
+	 * @var boolean $_memoryCaching
+	 */
+	protected $_memoryCaching = false;
+
+	/**
+	 * Enable / Disable "Only Memory Caching"
+	 * (be carefull, memory caching is "beta quality")
+	 *
+	 * @var boolean $_onlyMemoryCaching
+	 */
+	protected $_onlyMemoryCaching = false;
+
+	/**
+	 * Memory caching array
+	 *
+	 * @var array $_memoryCachingArray
+	 */
+	protected $_memoryCachingArray = array();
+
+	/**
+	 * Memory caching counter
+	 *
+	 * @var int $memoryCachingCounter
+	 */
+	protected $_memoryCachingCounter = 0;
+
+	/**
+	 * Memory caching limit
+	 *
+	 * @var int $memoryCachingLimit
+	 */
+	protected $_memoryCachingLimit = 1000;
+
+	/**
+	 * File Name protection
+	 *
+	 * if set to true, you can use any cache id or group name
+	 * if set to false, it can be faster but cache ids and group names
+	 * will be used directly in cache file names so be carefull with
+	 * special characters...
+	 *
+	 * @var boolean $fileNameProtection
+	 */
+	protected $_fileNameProtection = true;
+
+	/**
+	 * Enable / disable automatic serialization
+	 *
+	 * it can be used to save directly datas which aren't strings
+	 * (but it's slower)
+	 *
+	 * @var boolean $_serialize
+	 */
+	protected $_automaticSerialization = false;
+
+	// --- Public methods ---
+
+	/**
+	 * Constructor
+	 *
+	 * $options is an assoc. Available options are :
+	 * $options = array(
+	 * 'cacheDir' => directory where to put the cache files (string),
+	 * 'caching' => enable / disable caching (boolean),
+	 * 'lifeTime' => cache lifetime in seconds (int),
+	 * 'fileLocking' => enable / disable fileLocking (boolean),
+	 * 'writeControl' => enable / disable write control (boolean),
+	 * 'readControl' => enable / disable read control (boolean),
+	 * 'readControlType' => type of read control 'crc32', 'md5', 'strlen',
+	 * 'memoryCaching' => enable / disable memory caching (boolean),
+	 * 'onlyMemoryCaching' => enable / disable only memory caching (boolean),
+	 * 'memoryCachingLimit' => max nbr of records in memory caching (int),
+	 * 'fileNameProtection' => enable / disable file name protection (boolean),
+	 * 'automaticSerialization' => enable / disable serialization (boolean)
+	 * );
+	 *
+	 * @param array $options options
+	 * @access public
+	 */
+	function TCache_Lite($options = array(null))
+	{
+		$availableOptions = array(	'automaticSerialization',
+									'fileNameProtection',
+									'memoryCaching',
+									'onlyMemoryCaching',
+									'memoryCachingLimit',
+									'cacheDir',
+									'caching',
+									'lifeTime',
+									'fileLocking',
+									'writeControl',
+									'readControl',
+									'readControlType');
+		foreach($options as $key => $value) {
+			if(in_array($key, $availableOptions)) {
+				$property = '_'.$key;
+				$this->$property = $value;
+			}
+		}
+		$this->_refreshTime = time() - $this->_lifeTime;
+	}
+
+	/**
+	 * Test if a cache is available and (if yes) return it
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @param boolean $doNotTestCacheValidity if set to true, the cache
+	 * validity won't be tested
+	 * @return string data of the cache (or false if no cache available)
+	 * @access public
+	 */
+	function get($id, $group = 'default', $doNotTestCacheValidity = false)
+	{
+		$this->_id = $id;
+		$this->_group = $group;
+		$data = false;
+		if ($this->_caching) {
+			$this->_setFileName($id, $group);
+			if ($this->_memoryCaching) {
+				if (isset($this->_memoryCachingArray[$this->_file])) {
+					if ($this->_automaticSerialization) {
+						return unserialize(
+									$this->_memoryCachingArray[$this->_file]);
+					} else {
+						return $this->_memoryCachingArray[$this->_file];
+					}
+				} else {
+					if ($this->_onlyMemoryCaching) {
+						return false;
+					}
+				}
+			}
+			if ($doNotTestCacheValidity) {
+				if (file_exists($this->_file)) {
+					$data = $this->_read();
+				}
+			} else {
+				if (@filemtime($this->_file) > $this->_refreshTime) {
+					$data = $this->_read();
+				}
+			}
+			if (($data) and ($this->_memoryCaching)) {
+				$this->_memoryCacheAdd($this->_file, $data);
+			}
+			if ($this->_automaticSerialization && is_string($data)) {
+				$data = unserialize($data);
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Save some data in a cache file
+	 *
+	 * @param string $data data to put in cache (can be another type than strings
+	 * if automaticSerialization is on)
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function save($data, $id = null, $group = 'default')
+	{
+		if ($this->_caching) {
+			if ($this->_automaticSerialization) {
+				$data = serialize($data);
+			}
+			if (isset($id)) {
+				$this->_setFileName($id, $group);
+			}
+			if ($this->_memoryCaching) {
+				$this->_memoryCacheAdd($this->_file, $data);
+				if ($this->_onlyMemoryCaching) {
+					return true;
+				}
+			}
+			if ($this->_writeControl) {
+				if (!$this->_writeAndControl($data)) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				} else {
+					return true;
+				}
+			} else {
+				return $this->_write($data);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a cache file
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function remove($id, $group = 'default')
+	{
+		$this->_setFileName($id, $group);
+		if (!@unlink($this->_file)) {
+			$this->raiseError('TCache_Lite : Unable to remove cache !', -3);
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Clean the cache
+	 *
+	 * if no group is specified all cache files will be destroyed
+	 * else only cache files of the specified group will be destroyed
+	 *
+	 * @param string $group name of the cache group
+	 * @return boolean true if no problem
+	 * @access public
+	 */
+	function clean($group = false)
+	{
+		if ($this->_fileNameProtection) {
+			$motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+		} else {
+			$motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+		}
+		if ($this->_memoryCaching) {
+			while (list($key, $value) = each($this->_memoryCaching)) {
+				if (strpos($key, $motif, 0)) {
+					unset($this->_memoryCaching[$key]);
+					$this->_memoryCachingCounter =
+							$this->_memoryCachingCounter - 1;
+				}
+			}
+			if ($this->_onlyMemoryCaching) {
+				return true;
+			}
+		}
+		if (!($dh = opendir($this->_cacheDir))) {
+			$this->raiseError('TCache_Lite : Unable to open cache directory !');
+			return false;
+		}
+		while ($file = readdir($dh)) {
+			if (($file != '.') && ($file != '..')) {
+				$file = $this->_cacheDir . $file;
+				if (is_file($file)) {
+					if (strpos($file, $motif, 0)) {
+						if (!@unlink($file)) {
+			 $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
+							return false;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+		/**
+		 * Set a new life time
+		 *
+		 * @param int $newLifeTime new life time (in seconds)
+		 * @access public
+		 */
+	function setLifeTime($newLifeTime)
+	{
+		$this->_lifeTime = $newLifeTime;
+		$this->_refreshTime = time() - $newLifeTime;
+	}
+
+	/**
+	 *
+	 * @access public
+	 */
+	function saveMemoryCachingState($id, $group = 'default')
+	{
+		if ($this->_caching) {
+			$array = array(
+				'counter' => $this->_memoryCachingCounter,
+				'array' => $this->_memoryCachingState
+			);
+			$data = serialize($array);
+			$this->save($data, $id, $group);
+		}
 	}
 
-    /**
-    * Test if a cache is available and (if yes) return it
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @param boolean $doNotTestCacheValidity if set to true, the cache
-    * validity won't be tested
-    * @return string data of the cache (or false if no cache available)
-    * @access public
-    */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
-    {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
-            $this->_setFileName($id, $group);
-            if ($this->_memoryCaching) {
-                if (isset($this->_memoryCachingArray[$this->_file])) {
-                    if ($this->_automaticSerialization) {
-                        return unserialize(
-                        			$this->_memoryCachingArray[$this->_file]);
-                    } else {
-                        return $this->_memoryCachingArray[$this->_file];
-                    }
-                } else {
-                    if ($this->_onlyMemoryCaching) {
-                        return false;
-                    }
-                }
-            }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
-                }
-            } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
-                }
-            }
-            if (($data) and ($this->_memoryCaching)) {
-                $this->_memoryCacheAdd($this->_file, $data);
-            }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
-            }
-            return $data;
-        }
-        return false;
-    }
-
-    /**
-    * Save some data in a cache file
-    *
-    * @param string $data data to put in cache (can be another type than strings
-    * if automaticSerialization is on)
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function save($data, $id = null, $group = 'default')
-    {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
-            }
-            if (isset($id)) {
-                $this->_setFileName($id, $group);
-            }
-            if ($this->_memoryCaching) {
-                $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
-                    return true;
-                }
-            }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                } else {
-                    return true;
-                }
-            } else {
-                return $this->_write($data);
-            }
-        }
-        return false;
-    }
-
-    /**
-    * Remove a cache file
-    *
-    * @param string $id cache id
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function remove($id, $group = 'default')
-    {
-        $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
-            $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-    * Clean the cache
-    *
-    * if no group is specified all cache files will be destroyed
-    * else only cache files of the specified group will be destroyed
-    *
-    * @param string $group name of the cache group
-    * @return boolean true if no problem
-    * @access public
-    */
-    function clean($group = false)
-    {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
-        } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
-        }
-        if ($this->_memoryCaching) {
-            while (list($key, $value) = each($this->_memoryCaching)) {
-                if (strpos($key, $motif, 0)) {
-                    unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
-                    		$this->_memoryCachingCounter - 1;
-                }
-            }
-            if ($this->_onlyMemoryCaching) {
-                return true;
-            }
-        }
-        if (!($dh = opendir($this->_cacheDir))) {
-            $this->raiseError('TCache_Lite : Unable to open cache directory !');
-            return false;
-        }
-        while ($file = readdir($dh)) {
-            if (($file != '.') && ($file != '..')) {
-                $file = $this->_cacheDir . $file;
-                if (is_file($file)) {
-                    if (strpos($file, $motif, 0)) {
-                        if (!@unlink($file)) {
-             $this->raiseError('Cache_Lite : Unable to remove cache !', -3);
-                            return false;
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-	    /**
-    * Set a new life time
-    *
-    * @param int $newLifeTime new life time (in seconds)
-    * @access public
-    */
-    function setLifeTime($newLifeTime)
-    {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function saveMemoryCachingState($id, $group = 'default')
-    {
-        if ($this->_caching) {
-            $array = array(
-                'counter' => $this->_memoryCachingCounter,
-                'array' => $this->_memoryCachingState
-            );
-            $data = serialize($array);
-            $this->save($data, $id, $group);
-        }
-    }
-
-    /**
-    *
-    * @access public
-    */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
-    {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
-            {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
-            }
-        }
-    }
-
-    /**
-    * Return the cache last modification time
-    *
-    * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
-    *
-    * @return int last modification time
-    */
-    function lastModified() {
-        return filemtime($this->cache->_file);
-    }
-
-    /**
-    * Trigger a PEAR error
-    *
-    * To improve performances, the PEAR.php file is included dynamically.
-    * The file is so included only when an error is triggered. So, in most
-    * cases, the file isn't included and perfs are much better.
-    *
-    * @param string $msg error message
-    * @param int $code error code
-    * @access public
-    */
-    function raiseError($msg, $code)
-    {
-       throw new Exception($msg);
-    }
-
-    // --- Private methods ---
-
-    /**
-    *
-    * @access private
-    */
-    function _memoryCacheAdd($id, $data)
-    {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
-            unset($this->_memoryCachingArray[$key]);
-        } else {
-            $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
-        }
-    }
-
-    /**
-    * Make a file name (with path)
-    *
-    * @param string $id cache id
-    * @param string $group name of the group
-    * @access private
-    */
-    function _setFileName($id, $group)
-    {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
-            						.md5($id));
-        } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
-        }
-    }
-
-    function getCacheFile()
-    {
-    	return $this->_file;
-    }
-
-    /**
-    * Read the cache file and return the content
-    *
-    * @return string content of the cache file
-    * @access private
-    */
-    function _read()
-    {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
-        	// because the filesize can be cached by PHP itself...
-            clearstatcache();
-            $length = @filesize($this->_file);
+	/**
+	 *
+	 * @access public
+	 */
+	function getMemoryCachingState($id, $group = 'default',
+									$doNotTestCacheValidity = false)
+	{
+		if ($this->_caching) {
+			if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+			{
+				$array = unserialize($data);
+				$this->_memoryCachingCounter = $array['counter'];
+				$this->_memoryCachingArray = $array['array'];
+			}
+		}
+	}
+
+	/**
+	 * Return the cache last modification time
+	 *
+	 * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY !
+	 *
+	 * @return int last modification time
+	 */
+	function lastModified() {
+		return filemtime($this->cache->_file);
+	}
+
+	/**
+	 * Trigger a PEAR error
+	 *
+	 * To improve performances, the PEAR.php file is included dynamically.
+	 * The file is so included only when an error is triggered. So, in most
+	 * cases, the file isn't included and perfs are much better.
+	 *
+	 * @param string $msg error message
+	 * @param int $code error code
+	 * @access public
+	 */
+	function raiseError($msg, $code)
+	{
+	   throw new Exception($msg);
+	}
+
+	// --- Private methods ---
+
+	/**
+	 *
+	 * @access private
+	 */
+	function _memoryCacheAdd($id, $data)
+	{
+		$this->_memoryCachingArray[$this->_file] = $data;
+		if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
+			list($key, $value) = each($this->_memoryCachingArray);
+			unset($this->_memoryCachingArray[$key]);
+		} else {
+			$this->_memoryCachingCounter = $this->_memoryCachingCounter + 1;
+		}
+	}
+
+	/**
+	 * Make a file name (with path)
+	 *
+	 * @param string $id cache id
+	 * @param string $group name of the group
+	 * @access private
+	 */
+	function _setFileName($id, $group)
+	{
+		if ($this->_fileNameProtection) {
+			$this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+									.md5($id));
+		} else {
+			$this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+		}
+	}
+
+	function getCacheFile()
+	{
+		return $this->_file;
+	}
+
+	/**
+	 * Read the cache file and return the content
+	 *
+	 * @return string content of the cache file
+	 * @access private
+	 */
+	function _read()
+	{
+		$fp = @fopen($this->_file, "rb");
+		if ($this->_fileLocking) @flock($fp, LOCK_SH);
+		if ($fp) {
+			// because the filesize can be cached by PHP itself...
+			clearstatcache();
+			$length = @filesize($this->_file);
 			if(version_compare(PHP_VERSION, '5.3.0', 'lt'))
 			{
-	            $mqr = get_magic_quotes_runtime();
-    	        set_magic_quotes_runtime(0);
+				$mqr = get_magic_quotes_runtime();
+				set_magic_quotes_runtime(0);
+			}
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
 			}
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            $data = @fread($fp, $length);
+			$data = @fread($fp, $length);
 			if(isset($mqr))
-	            set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            if ($this->_readControl) {
-                $hashData = $this->_hash($data, $this->_readControlType);
-                if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
-                    return false;
-                }
-            }
-            return $data;
-        }
-        $this->raiseError('Cache_Lite : Unable to read cache !', -2);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if ok
-    * @access private
-    */
-    function _write($data)
-    {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
-                @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-            }
-            $len = strlen($data);
-            @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
-            @fclose($fp);
-            return true;
-        }
-        $this->raiseError('Cache_Lite : Unable to write cache !', -1);
-        return false;
-    }
-
-    /**
-    * Write the given data in the cache file and control it just after to avoid
-    * corrupted cache entries
-    *
-    * @param string $data data to put in cache
-    * @return boolean true if the test is ok
-    * @access private
-    */
-    function _writeAndControl($data)
-    {
-        $this->_write($data);
-        $dataRead = $this->_read($data);
-        return ($dataRead==$data);
-    }
-
-    /**
-    * Make a control key with the string containing datas
-    *
-    * @param string $data data
-    * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
-    * @return string control key
-    * @access private
-    */
-    function _hash($data, $controlType)
-    {
-        switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
-        }
-    }
+				set_magic_quotes_runtime($mqr);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			if ($this->_readControl) {
+				$hashData = $this->_hash($data, $this->_readControlType);
+				if ($hashData != $hashControl) {
+					@touch($this->_file, time() - 2*abs($this->_lifeTime));
+					return false;
+				}
+			}
+			return $data;
+		}
+		$this->raiseError('Cache_Lite : Unable to read cache !', -2);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if ok
+	 * @access private
+	 */
+	function _write($data)
+	{
+		$fp = @fopen($this->_file, "wb");
+		if ($fp) {
+			if ($this->_fileLocking) @flock($fp, LOCK_EX);
+			if ($this->_readControl) {
+				@fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+			}
+			$len = strlen($data);
+			@fwrite($fp, $data, $len);
+			if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			@fclose($fp);
+			return true;
+		}
+		$this->raiseError('Cache_Lite : Unable to write cache !', -1);
+		return false;
+	}
+
+	/**
+	 * Write the given data in the cache file and control it just after to avoid
+	 * corrupted cache entries
+	 *
+	 * @param string $data data to put in cache
+	 * @return boolean true if the test is ok
+	 * @access private
+	 */
+	function _writeAndControl($data)
+	{
+		$this->_write($data);
+		$dataRead = $this->_read($data);
+		return ($dataRead==$data);
+	}
+
+	/**
+	 * Make a control key with the string containing datas
+	 *
+	 * @param string $data data
+	 * @param string $controlType type of control 'md5', 'crc32' or 'strlen'
+	 * @return string control key
+	 * @access private
+	 */
+	function _hash($data, $controlType)
+	{
+		switch ($controlType) {
+		case 'md5':
+			return md5($data);
+		case 'crc32':
+			return sprintf('% 32d', crc32($data));
+		case 'strlen':
+			return sprintf('% 32d', strlen($data));
+		default:
+			$this->raiseError('Unknown controlType ! '.
+			'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+		}
+	}
 
 }
 

Switch Indentation +9 added lines, -9 removed lines

@@ -611,15 +611,15 @@
     function _hash($data, $controlType)
     {
         switch ($controlType) {
-        case 'md5':
-            return md5($data);
-        case 'crc32':
-            return sprintf('% 32d', crc32($data));
-        case 'strlen':
-            return sprintf('% 32d', strlen($data));
-        default:
-            $this->raiseError('Unknown controlType ! '.
-            '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
+        	case 'md5':
+            	return md5($data);
+        	case 'crc32':
+            	return sprintf('% 32d', crc32($data));
+        	case 'strlen':
+            	return sprintf('% 32d', strlen($data));
+        	default:
+            	$this->raiseError('Unknown controlType ! '.
+            	'(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }
 

Spacing +14 added lines, -14 removed lines

@@ -230,7 +230,7 @@ 
     */
     function TCache_Lite($options = array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions = array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -242,9 +242,9 @@ 
         							'writeControl',
         							'readControl',
         							'readControlType');
-        foreach($options as $key => $value) {
-            if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
+        foreach ($options as $key => $value) {
+            if (in_array($key, $availableOptions)) {
+                $property = '_' . $key;
                 $this->$property = $value;
             }
         }
@@ -329,7 +329,7 @@ 
             }
             if ($this->_writeControl) {
                 if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -372,9 +372,9 @@ 
     function clean($group = false)
     {
         if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+            $motif = ($group) ? 'cache_' . md5($group) . '_' : 'cache_';
         } else {
-            $motif = ($group) ? 'cache_'.$group.'_' : 'cache_';
+            $motif = ($group) ? 'cache_' . $group . '_' : 'cache_';
         }
         if ($this->_memoryCaching) {
             while (list($key, $value) = each($this->_memoryCaching)) {
@@ -507,10 +507,10 @@ 
     function _setFileName($id, $group)
     {
         if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+            $this->_file = ($this->_cacheDir . 'cache_' . md5($group) . '_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file = $this->_cacheDir . 'cache_' . $group . '_' . $id;
         }
     }
 
@@ -533,7 +533,7 @@ 
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
             $length = @filesize($this->_file);
-			if(version_compare(PHP_VERSION, '5.3.0', 'lt'))
+			if (version_compare(PHP_VERSION, '5.3.0', 'lt'))
 			{
 	            $mqr = get_magic_quotes_runtime();
     	        set_magic_quotes_runtime(0);
@@ -543,14 +543,14 @@ 
                 $length = $length - 32;
             }
             $data = @fread($fp, $length);
-			if(isset($mqr))
+			if (isset($mqr))
 	            set_magic_quotes_runtime($mqr);
             if ($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
             if ($this->_readControl) {
                 $hashData = $this->_hash($data, $this->_readControlType);
                 if ($hashData != $hashControl) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -597,7 +597,7 @@ 
     {
         $this->_write($data);
         $dataRead = $this->_read($data);
-        return ($dataRead==$data);
+        return ($dataRead == $data);
     }
 
     /**
@@ -618,7 +618,7 @@ 
         case 'strlen':
             return sprintf('% 32d', strlen($data));
         default:
-            $this->raiseError('Unknown controlType ! '.
+            $this->raiseError('Unknown controlType ! ' .
             '(available values are only \'md5\', \'crc32\', \'strlen\')', -5);
         }
     }

Braces +15 added lines, -6 removed lines

@@ -528,7 +528,9 @@ 
     function _read()
     {
         $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
+        if ($this->_fileLocking) {
+        	@flock($fp, LOCK_SH);
+        }
         if ($fp) {
         	// because the filesize can be cached by PHP itself...
             clearstatcache();
@@ -543,9 +545,12 @@ 
                 $length = $length - 32;
             }
             $data = @fread($fp, $length);
-			if(isset($mqr))
-	            set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+			if(isset($mqr)) {
+				            set_magic_quotes_runtime($mqr);
+			}
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             if ($this->_readControl) {
                 $hashData = $this->_hash($data, $this->_readControlType);
@@ -571,13 +576,17 @@ 
     {
         $fp = @fopen($this->_file, "wb");
         if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_EX);
+            }
             if ($this->_readControl) {
                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
             }
             $len = strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if ($this->_fileLocking) {
+            	@flock($fp, LOCK_UN);
+            }
             @fclose($fp);
             return true;
         }