pradosoft / prado

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 +6 added lines, -8 removed lines

@@ -233,8 +233,9 @@ 
 
 		//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);
@@ -260,8 +261,7 @@ 
 				if(!empty($this->cache))
 					$this->cache->clean($variant, $this->culture);
 				return true;
-			}
-			else
+			} else
 				return false;
 		}
 		return false;
@@ -304,8 +304,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}
@@ -354,8 +353,7 @@ 
 					if(!empty($this->cache))
 						$this->cache->clean($variant, $this->culture);
 					return true;
-				}
-				else
+				} else
 					return false;
 			}
 		}

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

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/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 +3 added lines, -6 removed lines

@@ -184,15 +184,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;
@@ -292,8 +290,7 @@ 
 			{
 				$groupSize1 = $decimalPos - $groupPos1-1;
 
-			}
-			else
+			} else
 			{
 				//no decimal point, so traverse from the back
 				//to find the groupsize 1.

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

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);
         }
     }
 

Indentation +567 added lines, -567 removed lines

@@ -46,575 +46,575 @@
 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);
-        }
-    }
-
-    /**
-    *
-    * @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 ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
-            }
-            $data = @fread($fp, $length);
-            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);
-        }
-    }
+	/**
+	 * 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);
+			if ($this->_readControl) {
+				$hashControl = @fread($fp, 32);
+				$length = $length - 32;
+			}
+			$data = @fread($fp, $length);
+			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);
+		}
+	}
 
 }
 

Spacing +12 added lines, -12 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;
         }
     }
 
@@ -543,7 +543,7 @@ 
             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;
                 }
             }
@@ -590,7 +590,7 @@ 
     {
         $this->_write($data);
         $dataRead = $this->_read($data);
-        return ($dataRead==$data);
+        return ($dataRead == $data);
     }
 
     /**
@@ -611,7 +611,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);
         }
     }

framework/I18N/core/util.php

Doc Comments +2 added lines, -1 removed lines

@@ -29,6 +29,7 @@ 
 	 * send a note to license@php.net so we can mail you a copy immediately.
 	 *
 	 * @param string DSN format, similar to PEAR's DB
+	 * @param string $dsn
 	 * @return array DSN information. 
 	 * @author     Stig Bakken <ssb@php.net>
 	 * @author     Tomas V.V.Cox <cox@idecnet.com>
@@ -172,7 +173,7 @@ 
 	/** 
 	 * Convert UTF-8 strings to a different encoding. NB. The result
 	 * may not have been encoded if iconv fails.
-	 * @param string the UTF-8 string for conversion
+	 * @param string string UTF-8 string for conversion
 	 * @return string encoded string.
 	 */
 	function I18N_toEncoding($string, $to)

Indentation +104 added lines, -104 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 
         // Get (if found): username and password
         // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
+        if (($at = strrpos($dsn, '@')) !== false) {
             $str = substr($dsn, 0, $at);
             $dsn = substr($dsn, $at + 1);
             if (($pos = strpos($str, ':')) !== false) {
@@ -161,9 +161,9 @@ 
 	 */
 	function I18N_toUTF8($string, $from)
 	{
-		if($from != 'UTF-8')
+		if ($from != 'UTF-8')
 		{
-			$s = iconv($from,'UTF-8',$string); //to UTF-8
+			$s = iconv($from, 'UTF-8', $string); //to UTF-8
 			return $s !== false ? $s : $string; //it could return false
 		}
 		return $string;
@@ -177,7 +177,7 @@ 
 	 */
 	function I18N_toEncoding($string, $to)
 	{
-		if($to != 'UTF-8')
+		if ($to != 'UTF-8')
 		{
 			$s = iconv('UTF-8', $to, $string);
 			return $s !== false ? $s : $string;

framework/interfaces.php

Doc Comments +18 added lines

@@ -23,6 +23,7 @@ 
 	/**
 	 * Initializes the module.
 	 * @param TXmlElement the configuration for the module
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -31,6 +32,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the module
+	 * @return void
 	 */
 	public function setID($id);
 }
@@ -49,6 +51,7 @@ 
 	/**
 	 * Initializes the service.
 	 * @param TXmlElement the configuration for the service
+	 * @return void
 	 */
 	public function init($config);
 	/**
@@ -57,6 +60,7 @@ 
 	public function getID();
 	/**
 	 * @param string ID of the service
+	 * @return void
 	 */
 	public function setID($id);
 	/**
@@ -65,10 +69,12 @@ 
 	public function getEnabled();
 	/**
 	 * @param boolean whether the service is enabled
+	 * @return void
 	 */
 	public function setEnabled($value);
 	/**
 	 * Runs the service.
+	 * @return void
 	 */
 	public function run();
 }
@@ -87,6 +93,7 @@ 
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @return void
 	 */
 	public function write($str);
 	/**
@@ -113,6 +120,7 @@ 
 	public function getName();
 	/**
 	 * @param string username
+	 * @return void
 	 */
 	public function setName($value);
 	/**
@@ -121,6 +129,8 @@ 
 	public function getIsGuest();
 	/**
 	 * @param boolean if the user is a guest
+	 * @param boolean $value
+	 * @return void
 	 */
 	public function setIsGuest($value);
 	/**
@@ -167,6 +177,7 @@ 
 	/**
 	 * Saves state into a persistent storage.
 	 * @param mixed the state to be saved
+	 * @return void
 	 */
 	public function save($state);
 }
@@ -208,6 +219,7 @@ 
 	 * @param mixed the value to be cached
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
+	 * @param string $id
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
 	public function add($id,$value,$expire=0,$dependency=null);
@@ -259,6 +271,7 @@ 
 	/**
 	 * Renders the component to end-users.
 	 * @param ITextWriter writer for the rendering purpose
+	 * @return void
 	 */
 	public function render($writer);
 }
@@ -276,6 +289,7 @@ 
 {
 	/**
 	 * Performs databinding.
+	 * @return void
 	 */
 	public function dataBind();
 }
@@ -301,6 +315,7 @@ 
 	public function getStyle();
 	/**
 	 * Removes all styles associated with the object
+	 * @return void
 	 */
 	public function clearStyle();
 }
@@ -339,6 +354,7 @@ 
 	 * appropriate event(s) (e.g. OnClick, OnCommand) indicating the component
 	 * is responsible for the callback event.
 	 * @param TCallbackEventParameter the parameter associated with the callback event
+	 * @return void
 	 */
 	public function raiseCallbackEvent($eventArgument);
 }
@@ -362,6 +378,8 @@ 
 
 	/**
 	 * @param mixed the data to be bound to this object
+	 * @param TActiveRecord $value
+	 * @return void
 	 */
 	public function setData($value);
 }

Spacing +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function set($id,$value,$expire=0,$dependency=null);
+	public function set($id, $value, $expire = 0, $dependency = null);
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.
 	 * Nothing will be done if the cache already contains the key.
@@ -210,7 +210,7 @@ 
 	 * @param ICacheDependency dependency of the cached item. If the dependency changes, the item is labelled invalid.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	public function add($id,$value,$expire=0,$dependency=null);
+	public function add($id, $value, $expire = 0, $dependency = null);
 	/**
 	 * Deletes a value with the specified key from cache
 	 * @param string the key of the value to be deleted

framework/IO/TTarFileExtractor.php

Doc Comments +9 added lines

@@ -224,6 +224,9 @@ 
       return $v_block;
     }
 
+    /**
+     * @param double $p_len
+     */
     private function _jumpBlock($p_len=null)
     {
       if (is_resource($this->_file)) {
@@ -317,6 +320,12 @@ 
       return true;
     }
 
+    /**
+     * @param string $p_path
+     * @param string $p_mode
+     * @param integer $p_file_list
+     * @param string $p_remove_path
+     */
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {

Indentation +510 added lines, -510 removed lines

@@ -35,537 +35,537 @@
  */
 class TTarFileExtractor
 {
-    /**
-    * @var string Name of the Tar
-    */
-    private $_tarname='';
-
-    /**
-    * @var file descriptor
-    */
-    private $_file=0;
-
-    /**
-    * @var string Local Tar name of a remote Tar (http:// or ftp://)
-    */
-    private $_temp_tarname='';
-
-    /**
-    * Archive_Tar Class constructor. This flavour of the constructor only
-    * declare a new Archive_Tar object, identifying it by the name of the
-    * tar file.
-    *
-    * @param    string  $p_tarname  The name of the tar archive to create
-    * @access public
-    */
-    public function __construct($p_tarname)
-    {
-        $this->_tarname = $p_tarname;
-    }
-
-    public function __destruct()
-    {
-        $this->_close();
-        // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
-            @unlink($this->_temp_tarname);
-    }
-
-    public function extract($p_path='')
-    {
-        return $this->extractModify($p_path, '');
-    }
-
-    /**
-    * This method extract all the content of the archive in the directory
-    * indicated by $p_path. When relevant the memorized path of the
-    * files/dir can be modified by removing the $p_remove_path path at the
-    * beginning of the file/dir path.
-    * While extracting a file, if the directory path does not exists it is
-    * created.
-    * While extracting a file, if the file already exists it is replaced
-    * without looking for last modification date.
-    * While extracting a file, if the file already exists and is write
-    * protected, the extraction is aborted.
-    * While extracting a file, if a directory with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a directory, if a file with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a file/directory if the destination directory exist
-    * and is write protected, or does not exist but can not be created,
-    * the extraction is aborted.
-    * If after extraction an extracted file does not show the correct
-    * stored file size, the extraction is aborted.
-    * When the extraction is aborted, a PEAR error text is set and false
-    * is returned. However the result can be a partial extraction that may
-    * need to be manually cleaned.
-    *
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return boolean               true on success, false on error.
-    * @access public
-    */
-    protected function extractModify($p_path, $p_remove_path)
-    {
-        $v_result = true;
-        $v_list_detail = array();
-
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
-			                                "complete", 0, $p_remove_path);
-            $this->_close();
-        }
-
-        return $v_result;
-    }
-
-    protected function _error($p_message)
-    {
+	/**
+	 * @var string Name of the Tar
+	 */
+	private $_tarname='';
+
+	/**
+	 * @var file descriptor
+	 */
+	private $_file=0;
+
+	/**
+	 * @var string Local Tar name of a remote Tar (http:// or ftp://)
+	 */
+	private $_temp_tarname='';
+
+	/**
+	 * Archive_Tar Class constructor. This flavour of the constructor only
+	 * declare a new Archive_Tar object, identifying it by the name of the
+	 * tar file.
+	 *
+	 * @param    string  $p_tarname  The name of the tar archive to create
+	 * @access public
+	 */
+	public function __construct($p_tarname)
+	{
+		$this->_tarname = $p_tarname;
+	}
+
+	public function __destruct()
+	{
+		$this->_close();
+		// ----- Look for a local copy to delete
+		if ($this->_temp_tarname != '')
+			@unlink($this->_temp_tarname);
+	}
+
+	public function extract($p_path='')
+	{
+		return $this->extractModify($p_path, '');
+	}
+
+	/**
+	 * This method extract all the content of the archive in the directory
+	 * indicated by $p_path. When relevant the memorized path of the
+	 * files/dir can be modified by removing the $p_remove_path path at the
+	 * beginning of the file/dir path.
+	 * While extracting a file, if the directory path does not exists it is
+	 * created.
+	 * While extracting a file, if the file already exists it is replaced
+	 * without looking for last modification date.
+	 * While extracting a file, if the file already exists and is write
+	 * protected, the extraction is aborted.
+	 * While extracting a file, if a directory with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a directory, if a file with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a file/directory if the destination directory exist
+	 * and is write protected, or does not exist but can not be created,
+	 * the extraction is aborted.
+	 * If after extraction an extracted file does not show the correct
+	 * stored file size, the extraction is aborted.
+	 * When the extraction is aborted, a PEAR error text is set and false
+	 * is returned. However the result can be a partial extraction that may
+	 * need to be manually cleaned.
+	 *
+	 * @param string $p_path         The path of the directory where the
+	 *                               files/dir need to by extracted.
+	 * @param string $p_remove_path  Part of the memorized path that can be
+	 *                               removed if present at the beginning of
+	 *                               the file/dir path.
+	 * @return boolean               true on success, false on error.
+	 * @access public
+	 */
+	protected function extractModify($p_path, $p_remove_path)
+	{
+		$v_result = true;
+		$v_list_detail = array();
+
+		if ($v_result = $this->_openRead()) {
+			$v_result = $this->_extractList($p_path, $v_list_detail,
+											"complete", 0, $p_remove_path);
+			$this->_close();
+		}
+
+		return $v_result;
+	}
+
+	protected function _error($p_message)
+	{
 		throw new Exception($p_message);
-    }
-
-    private function _isArchive($p_filename=null)
-    {
-        if ($p_filename == null) {
-            $p_filename = $this->_tarname;
-        }
-        clearstatcache();
-        return @is_file($p_filename);
-    }
-
-    private function _openRead()
-    {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
-
-          // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-                $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-                $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
-              @fclose($v_file_from);
-              @fclose($v_file_to);
-          }
-
-          // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
-
-        } else
-          // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+	}
+
+	private function _isArchive($p_filename=null)
+	{
+		if ($p_filename == null) {
+			$p_filename = $this->_tarname;
+		}
+		clearstatcache();
+		return @is_file($p_filename);
+	}
+
+	private function _openRead()
+	{
+		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+
+		  // ----- Look if a local copy need to be done
+		  if ($this->_temp_tarname == '') {
+			  $this->_temp_tarname = uniqid('tar').'.tmp';
+			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+				$this->_error('Unable to open in read mode \''
+							  .$this->_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+				$this->_error('Unable to open in write mode \''
+							  .$this->_temp_tarname.'\'');
+				$this->_temp_tarname = '';
+				return false;
+			  }
+			  while ($v_data = @fread($v_file_from, 1024))
+				  @fwrite($v_file_to, $v_data);
+			  @fclose($v_file_from);
+			  @fclose($v_file_to);
+		  }
+
+		  // ----- File to open if the local copy
+		  $v_filename = $this->_temp_tarname;
+
+		} else
+		  // ----- File to open if the normal Tar file
+		  $v_filename = $this->_tarname;
 
 		$this->_file = @fopen($v_filename, "rb");
 
-        if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
-            return false;
-        }
+		if ($this->_file == 0) {
+			$this->_error('Unable to open in read mode \''.$v_filename.'\'');
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    private function _close()
-    {
-        //if (isset($this->_file)) {
-        if (is_resource($this->_file))
+	private function _close()
+	{
+		//if (isset($this->_file)) {
+		if (is_resource($this->_file))
 		{
-               @fclose($this->_file);
-            $this->_file = 0;
-        }
-
-        // ----- Look if a local copy need to be erase
-        // Note that it might be interesting to keep the url for a time : ToDo
-        if ($this->_temp_tarname != '') {
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        }
-
-        return true;
-    }
-
-    private function _cleanFile()
-    {
-        $this->_close();
-
-        // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
-            // ----- Remove the local copy but not the remote tarname
-            @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
-        } else {
-            // ----- Remove the local tarname file
-            @unlink($this->_tarname);
-        }
-        $this->_tarname = '';
-
-        return true;
-    }
-
-    private function _readBlock()
-    {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-              $v_block = @fread($this->_file, 512);
-      }
-      return $v_block;
-    }
-
-    private function _jumpBlock($p_len=null)
-    {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
-
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
-      }
-      return true;
-    }
-
-    private function _readHeader($v_binary_data, &$v_header)
-    {
-        if (strlen($v_binary_data)==0) {
-            $v_header['filename'] = '';
-            return true;
-        }
-
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
-            return false;
-        }
-
-        // ----- Calculate the checksum
-        $v_checksum = 0;
-        // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
-
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
-		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
+			   @fclose($this->_file);
+			$this->_file = 0;
+		}
+
+		// ----- Look if a local copy need to be erase
+		// Note that it might be interesting to keep the url for a time : ToDo
+		if ($this->_temp_tarname != '') {
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		}
+
+		return true;
+	}
+
+	private function _cleanFile()
+	{
+		$this->_close();
+
+		// ----- Look for a local copy
+		if ($this->_temp_tarname != '') {
+			// ----- Remove the local copy but not the remote tarname
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		} else {
+			// ----- Remove the local tarname file
+			@unlink($this->_tarname);
+		}
+		$this->_tarname = '';
+
+		return true;
+	}
+
+	private function _readBlock()
+	{
+	  $v_block = null;
+	  if (is_resource($this->_file)) {
+			  $v_block = @fread($this->_file, 512);
+	  }
+	  return $v_block;
+	}
+
+	private function _jumpBlock($p_len=null)
+	{
+	  if (is_resource($this->_file)) {
+		  if ($p_len === null)
+			  $p_len = 1;
+
+			  @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+	  }
+	  return true;
+	}
+
+	private function _readHeader($v_binary_data, &$v_header)
+	{
+		if (strlen($v_binary_data)==0) {
+			$v_header['filename'] = '';
+			return true;
+		}
+
+		if (strlen($v_binary_data) != 512) {
+			$v_header['filename'] = '';
+			$this->_error('Invalid block size : '.strlen($v_binary_data));
+			return false;
+		}
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i=0; $i<148; $i++)
+			$v_checksum+=ord(substr($v_binary_data,$i,1));
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i=148; $i<156; $i++)
+			$v_checksum += ord(' ');
+		// ..... Last part of the header
+		for ($i=156; $i<512; $i++)
+		   $v_checksum+=ord(substr($v_binary_data,$i,1));
+
+		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
+						 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
 						 ."a32uname/a32gname/a8devmajor/a8devminor",
 						 $v_binary_data);
 
-        // ----- Extract the checksum
-        $v_header['checksum'] = OctDec(trim($v_data['checksum']));
-        if ($v_header['checksum'] != $v_checksum) {
-            $v_header['filename'] = '';
+		// ----- Extract the checksum
+		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
+		if ($v_header['checksum'] != $v_checksum) {
+			$v_header['filename'] = '';
 
-            // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-                return true;
+			// ----- Look for last block (empty block)
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+				return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
+			$this->_error('Invalid checksum for file "'.$v_data['filename']
+						  .'" : '.$v_checksum.' calculated, '
 						  .$v_header['checksum'].' expected');
-            return false;
-        }
-
-        // ----- Extract the properties
-        $v_header['filename'] = trim($v_data['filename']);
-        $v_header['mode'] = OctDec(trim($v_data['mode']));
-        $v_header['uid'] = OctDec(trim($v_data['uid']));
-        $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
-        $v_header['mtime'] = OctDec(trim($v_data['mtime']));
-        if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
-        }
-        return true;
-    }
-
-    private function _readLongHeader(&$v_header)
-    {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-
-      // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      $v_header['filename'] = $v_filename;
-
-      return true;
-    }
-
-    protected function _extractList($p_path, &$p_list_detail, $p_mode,
-	                      $p_file_list, $p_remove_path)
-    {
-    $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
-    }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
-
-    switch ($p_mode) {
-      case "complete" :
-        $v_extract_all = true;
-        $v_listing = false;
-      break;
-      case "partial" :
-          $v_extract_all = false;
-          $v_listing = false;
-      break;
-      case "list" :
-          $v_extract_all = false;
-          $v_listing = true;
-      break;
-      default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
-        return false;
-    }
-
-    clearstatcache();
-
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
-    {
-      $v_extract_file = false;
-      $v_extraction_stopped = 0;
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
-
-      if ($v_header['filename'] == '') {
-        continue;
-      }
-
-      // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
-      }
-
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
-        // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
-
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
-          // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
-            // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-				    == $p_file_list[$i])) {
-              $v_extract_file = true;
-              break;
-            }
-          }
-
-          // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = true;
-            break;
-          }
-        }
-      } else {
-        $v_extract_file = true;
-      }
-
-      // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
-      {
-        if (($p_remove_path != '')
-            && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
-		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
-
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
-        }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists as a directory');
-            return false;
-          }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
-			              .' already exists as a file');
-            return false;
-          }
-          if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists and is write protected');
-            return false;
-          }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
-            // To be completed : An error or silent no replace ?
-          }
-        }
-
-        // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+			return false;
+		}
+
+		// ----- Extract the properties
+		$v_header['filename'] = trim($v_data['filename']);
+		$v_header['mode'] = OctDec(trim($v_data['mode']));
+		$v_header['uid'] = OctDec(trim($v_data['uid']));
+		$v_header['gid'] = OctDec(trim($v_data['gid']));
+		$v_header['size'] = OctDec(trim($v_data['size']));
+		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
+		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+		  $v_header['size'] = 0;
+		}
+		return true;
+	}
+
+	private function _readLongHeader(&$v_header)
+	{
+	  $v_filename = '';
+	  $n = floor($v_header['size']/512);
+	  for ($i=0; $i<$n; $i++) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+	  if (($v_header['size'] % 512) != 0) {
+		$v_content = $this->_readBlock();
+		$v_filename .= $v_content;
+	  }
+
+	  // ----- Read the next header
+	  $v_binary_data = $this->_readBlock();
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  $v_header['filename'] = $v_filename;
+
+	  return true;
+	}
+
+	protected function _extractList($p_path, &$p_list_detail, $p_mode,
+						  $p_file_list, $p_remove_path)
+	{
+	$v_result=true;
+	$v_nb = 0;
+	$v_extract_all = true;
+	$v_listing = false;
+
+	$p_path = $this->_translateWinPath($p_path, false);
+	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
+	  $p_path = "./".$p_path;
+	}
+	$p_remove_path = $this->_translateWinPath($p_remove_path);
+
+	// ----- Look for path to remove format (should end by /)
+	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
+	  $p_remove_path .= '/';
+	$p_remove_path_size = strlen($p_remove_path);
+
+	switch ($p_mode) {
+	  case "complete" :
+		$v_extract_all = true;
+		$v_listing = false;
+	  break;
+	  case "partial" :
+		  $v_extract_all = false;
+		  $v_listing = false;
+	  break;
+	  case "list" :
+		  $v_extract_all = false;
+		  $v_listing = true;
+	  break;
+	  default :
+		$this->_error('Invalid extract mode ('.$p_mode.')');
+		return false;
+	}
+
+	clearstatcache();
+
+	while (strlen($v_binary_data = $this->_readBlock()) != 0)
+	{
+	  $v_extract_file = false;
+	  $v_extraction_stopped = 0;
+
+	  if (!$this->_readHeader($v_binary_data, $v_header))
+		return false;
+
+	  if ($v_header['filename'] == '') {
+		continue;
+	  }
+
+	  // ----- Look for long filename
+	  if ($v_header['typeflag'] == 'L') {
+		if (!$this->_readLongHeader($v_header))
+		  return false;
+	  }
+
+	  if ((!$v_extract_all) && (is_array($p_file_list))) {
+		// ----- By default no unzip if the file is not found
+		$v_extract_file = false;
+
+		for ($i=0; $i<sizeof($p_file_list); $i++) {
+		  // ----- Look if it is a directory
+		  if (substr($p_file_list[$i], -1) == '/') {
+			// ----- Look if the directory is in the filename path
+			if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+				&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+					== $p_file_list[$i])) {
+			  $v_extract_file = true;
+			  break;
+			}
+		  }
+
+		  // ----- It is a file, so compare the file names
+		  elseif ($p_file_list[$i] == $v_header['filename']) {
+			$v_extract_file = true;
+			break;
+		  }
+		}
+	  } else {
+		$v_extract_file = true;
+	  }
+
+	  // ----- Look if this file need to be extracted
+	  if (($v_extract_file) && (!$v_listing))
+	  {
+		if (($p_remove_path != '')
+			&& (substr($v_header['filename'], 0, $p_remove_path_size)
+				== $p_remove_path))
+		  $v_header['filename'] = substr($v_header['filename'],
+										 $p_remove_path_size);
+		if (($p_path != './') && ($p_path != '/')) {
+		  while (substr($p_path, -1) == '/')
+			$p_path = substr($p_path, 0, strlen($p_path)-1);
+
+		  if (substr($v_header['filename'], 0, 1) == '/')
+			  $v_header['filename'] = $p_path.$v_header['filename'];
+		  else
+			$v_header['filename'] = $p_path.'/'.$v_header['filename'];
+		}
+		if (file_exists($v_header['filename'])) {
+		  if (   (@is_dir($v_header['filename']))
+			  && ($v_header['typeflag'] == '')) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists as a directory');
+			return false;
+		  }
+		  if (   ($this->_isArchive($v_header['filename']))
+			  && ($v_header['typeflag'] == "5")) {
+			$this->_error('Directory '.$v_header['filename']
+						  .' already exists as a file');
+			return false;
+		  }
+		  if (!is_writeable($v_header['filename'])) {
+			$this->_error('File '.$v_header['filename']
+						  .' already exists and is write protected');
+			return false;
+		  }
+		  if (filemtime($v_header['filename']) > $v_header['mtime']) {
+			// To be completed : An error or silent no replace ?
+		  }
+		}
+
+		// ----- Check the directory availability and create it if necessary
+		elseif (($v_result
+				 = $this->_dirCheck(($v_header['typeflag'] == "5"
+									?$v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
-            return false;
-        }
-
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
-                    $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
-                    return false;
-                }
-                chmod($v_header['filename'], PRADO_CHMOD);
-            }
-          } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
-				                .'} in write binary mode');
-                  return false;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
-                      fwrite($v_dest_file, $v_content, 512);
-                  }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
-              fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-            }
-
-            @fclose($v_dest_file);
-
-            // ----- Change the file mode, mtime
-            @touch($v_header['filename'], $v_header['mtime']);
-            // To be completed
-            //chmod($v_header[filename], DecOct($v_header[mode]));
-          }
-
-          // ----- Check the file size
-          clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
-			                .' does not have the correct file size \''
+			$this->_error('Unable to create path for '.$v_header['filename']);
+			return false;
+		}
+
+		if ($v_extract_file) {
+		  if ($v_header['typeflag'] == "5") {
+			if (!@file_exists($v_header['filename'])) {
+				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
+					$this->_error('Unable to create directory {'
+								  .$v_header['filename'].'}');
+					return false;
+				}
+				chmod($v_header['filename'], PRADO_CHMOD);
+			}
+		  } else {
+			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+				  $this->_error('Error while opening {'.$v_header['filename']
+								.'} in write binary mode');
+				  return false;
+			  } else {
+				  $n = floor($v_header['size']/512);
+				  for ($i=0; $i<$n; $i++) {
+					  $v_content = $this->_readBlock();
+					  fwrite($v_dest_file, $v_content, 512);
+				  }
+			if (($v_header['size'] % 512) != 0) {
+			  $v_content = $this->_readBlock();
+			  fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+			}
+
+			@fclose($v_dest_file);
+
+			// ----- Change the file mode, mtime
+			@touch($v_header['filename'], $v_header['mtime']);
+			// To be completed
+			//chmod($v_header[filename], DecOct($v_header[mode]));
+		  }
+
+		  // ----- Check the file size
+		  clearstatcache();
+		  if (filesize($v_header['filename']) != $v_header['size']) {
+			  $this->_error('Extracted file '.$v_header['filename']
+							.' does not have the correct file size \''
 							.filesize($v_header['filename'])
 							.'\' ('.$v_header['size']
 							.' expected). Archive may be corrupted.');
-              return false;
-          }
-          }
-        } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-        }
-      } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-      }
-
-      /* TBC : Seems to be unused ...
+			  return false;
+		  }
+		  }
+		} else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+		}
+	  } else {
+		  $this->_jumpBlock(ceil(($v_header['size']/512)));
+	  }
+
+	  /* TBC : Seems to be unused ...
       if ($this->_compress)
         $v_end_of_file = @gzeof($this->_file);
       else
         $v_end_of_file = @feof($this->_file);
         */
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-        // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
-
-        $p_list_detail[$v_nb++] = $v_header;
-      }
-    }
-
-        return true;
-    }
-
-    /**
-     * Check if a directory exists and create it (including parent
-     * dirs) if not.
-     *
-     * @param string $p_dir directory to check
-     *
-     * @return bool true if the directory exists or was created
-     */
-    protected function _dirCheck($p_dir)
-    {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
-            return true;
-
-        $p_parent_dir = dirname($p_dir);
-
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
-
-        if (!@mkdir($p_dir, PRADO_CHMOD)) {
-            $this->_error("Unable to create directory '$p_dir'");
-            return false;
-        }
-        chmod($p_dir,PRADO_CHMOD);
-
-        return true;
-    }
-
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
-    {
-      if (substr(PHP_OS, 0, 3) == 'WIN') {
-          // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
-          }
-          // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
-          }
-      }
-      return $p_path;
-    }
+	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+		// ----- Log extracted files
+		if (($v_file_dir = dirname($v_header['filename']))
+			== $v_header['filename'])
+		  $v_file_dir = '';
+		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
+		  $v_file_dir = '/';
+
+		$p_list_detail[$v_nb++] = $v_header;
+	  }
+	}
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory exists and create it (including parent
+	 * dirs) if not.
+	 *
+	 * @param string $p_dir directory to check
+	 *
+	 * @return bool true if the directory exists or was created
+	 */
+	protected function _dirCheck($p_dir)
+	{
+		if ((@is_dir($p_dir)) || ($p_dir == ''))
+			return true;
+
+		$p_parent_dir = dirname($p_dir);
+
+		if (($p_parent_dir != $p_dir) &&
+			($p_parent_dir != '') &&
+			(!$this->_dirCheck($p_parent_dir)))
+			 return false;
+
+		if (!@mkdir($p_dir, PRADO_CHMOD)) {
+			$this->_error("Unable to create directory '$p_dir'");
+			return false;
+		}
+		chmod($p_dir,PRADO_CHMOD);
+
+		return true;
+	}
+
+	protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+	{
+	  if (substr(PHP_OS, 0, 3) == 'WIN') {
+		  // ----- Look for potential disk letter
+		  if (   ($p_remove_disk_letter)
+			  && (($v_position = strpos($p_path, ':')) != false)) {
+			  $p_path = substr($p_path, $v_position+1);
+		  }
+		  // ----- Change potential windows directory separator
+		  if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+			  $p_path = strtr($p_path, '\\', '/');
+		  }
+	  }
+	  return $p_path;
+	}
 }

Spacing +50 added lines, -50 removed lines

@@ -38,17 +38,17 @@ 
     /**
     * @var string Name of the Tar
     */
-    private $_tarname='';
+    private $_tarname = '';
 
     /**
     * @var file descriptor
     */
-    private $_file=0;
+    private $_file = 0;
 
     /**
     * @var string Local Tar name of a remote Tar (http:// or ftp://)
     */
-    private $_temp_tarname='';
+    private $_temp_tarname = '';
 
     /**
     * Archive_Tar Class constructor. This flavour of the constructor only
@@ -71,7 +71,7 @@ 
             @unlink($this->_temp_tarname);
     }
 
-    public function extract($p_path='')
+    public function extract($p_path = '')
     {
         return $this->extractModify($p_path, '');
     }
@@ -127,7 +127,7 @@ 
 		throw new Exception($p_message);
     }
 
-    private function _isArchive($p_filename=null)
+    private function _isArchive($p_filename = null)
     {
         if ($p_filename == null) {
             $p_filename = $this->_tarname;
@@ -142,16 +142,16 @@ 
 
           // ----- Look if a local copy need to be done
           if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
+              $this->_temp_tarname = uniqid('tar') . '.tmp';
               if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
                 $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
+				              .$this->_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
               if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
                 $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
+				              .$this->_temp_tarname . '\'');
                 $this->_temp_tarname = '';
                 return false;
               }
@@ -171,7 +171,7 @@ 
 		$this->_file = @fopen($v_filename, "rb");
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+            $this->_error('Unable to open in read mode \'' . $v_filename . '\'');
             return false;
         }
 
@@ -224,41 +224,41 @@ 
       return $v_block;
     }
 
-    private function _jumpBlock($p_len=null)
+    private function _jumpBlock($p_len = null)
     {
       if (is_resource($this->_file)) {
           if ($p_len === null)
               $p_len = 1;
 
-              @fseek($this->_file, @ftell($this->_file)+($p_len*512));
+              @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
       }
       return true;
     }
 
     private function _readHeader($v_binary_data, &$v_header)
     {
-        if (strlen($v_binary_data)==0) {
+        if (strlen($v_binary_data) == 0) {
             $v_header['filename'] = '';
             return true;
         }
 
         if (strlen($v_binary_data) != 512) {
             $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
+            $this->_error('Invalid block size : ' . strlen($v_binary_data));
             return false;
         }
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 0; $i < 148; $i++)
+            $v_checksum += ord(substr($v_binary_data, $i, 1));
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++)
             $v_checksum += ord(' ');
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i = 156; $i < 512; $i++)
+           $v_checksum += ord(substr($v_binary_data, $i, 1));
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -274,9 +274,9 @@ 
             if (($v_checksum == 256) && ($v_header['checksum'] == 0))
                 return true;
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
-						  .$v_header['checksum'].' expected');
+            $this->_error('Invalid checksum for file "' . $v_data['filename']
+			              .'" : ' . $v_checksum . ' calculated, '
+						  .$v_header['checksum'] . ' expected');
             return false;
         }
 
@@ -296,8 +296,8 @@ 
     private function _readLongHeader(&$v_header)
     {
       $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
+      $n = floor($v_header['size'] / 512);
+      for ($i = 0; $i < $n; $i++) {
         $v_content = $this->_readBlock();
         $v_filename .= $v_content;
       }
@@ -320,7 +320,7 @@ 
     protected function _extractList($p_path, &$p_list_detail, $p_mode,
 	                      $p_file_list, $p_remove_path)
     {
-    $v_result=true;
+    $v_result = true;
     $v_nb = 0;
     $v_extract_all = true;
     $v_listing = false;
@@ -328,7 +328,7 @@ 
     $p_path = $this->_translateWinPath($p_path, false);
     if ($p_path == '' || (substr($p_path, 0, 1) != '/'
 	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
+      $p_path = "./" . $p_path;
     }
     $p_remove_path = $this->_translateWinPath($p_remove_path);
 
@@ -351,7 +351,7 @@ 
           $v_listing = true;
       break;
       default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
+        $this->_error('Invalid extract mode (' . $p_mode . ')');
         return false;
     }
 
@@ -379,7 +379,7 @@ 
         // ----- By default no unzip if the file is not found
         $v_extract_file = false;
 
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
+        for ($i = 0; $i < sizeof($p_file_list); $i++) {
           // ----- Look if it is a directory
           if (substr($p_file_list[$i], -1) == '/') {
             // ----- Look if the directory is in the filename path
@@ -411,28 +411,28 @@ 
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
           while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+            $p_path = substr($p_path, 0, strlen($p_path) - 1);
 
           if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
+              $v_header['filename'] = $p_path . $v_header['filename'];
           else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
+            $v_header['filename'] = $p_path . '/' . $v_header['filename'];
         }
         if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
+          if ((@is_dir($v_header['filename']))
 		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists as a directory');
             return false;
           }
-          if (   ($this->_isArchive($v_header['filename']))
+          if (($this->_isArchive($v_header['filename']))
 		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
+            $this->_error('Directory ' . $v_header['filename']
 			              .' already exists as a file');
             return false;
           }
           if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
+            $this->_error('File ' . $v_header['filename']
 			              .' already exists and is write protected');
             return false;
           }
@@ -444,9 +444,9 @@ 
         // ----- Check the directory availability and create it if necessary
         elseif (($v_result
 		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
+				                    ? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
+            $this->_error('Unable to create path for ' . $v_header['filename']);
             return false;
         }
 
@@ -455,19 +455,19 @@ 
             if (!@file_exists($v_header['filename'])) {
                 if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
                     $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
+					              .$v_header['filename'] . '}');
                     return false;
                 }
                 chmod($v_header['filename'], PRADO_CHMOD);
             }
           } else {
               if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
+                  $this->_error('Error while opening {' . $v_header['filename']
 				                .'} in write binary mode');
                   return false;
               } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
+                  $n = floor($v_header['size'] / 512);
+                  for ($i = 0; $i < $n; $i++) {
                       $v_content = $this->_readBlock();
                       fwrite($v_dest_file, $v_content, 512);
                   }
@@ -487,19 +487,19 @@ 
           // ----- Check the file size
           clearstatcache();
           if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
+              $this->_error('Extracted file ' . $v_header['filename']
 			                .' does not have the correct file size \''
 							.filesize($v_header['filename'])
-							.'\' ('.$v_header['size']
+							.'\' (' . $v_header['size']
 							.' expected). Archive may be corrupted.');
               return false;
           }
           }
         } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
         }
       } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
+          $this->_jumpBlock(ceil(($v_header['size'] / 512)));
       }
 
       /* TBC : Seems to be unused ...
@@ -548,21 +548,21 @@ 
             $this->_error("Unable to create directory '$p_dir'");
             return false;
         }
-        chmod($p_dir,PRADO_CHMOD);
+        chmod($p_dir, PRADO_CHMOD);
 
         return true;
     }
 
-    protected function _translateWinPath($p_path, $p_remove_disk_letter=true)
+    protected function _translateWinPath($p_path, $p_remove_disk_letter = true)
     {
       if (substr(PHP_OS, 0, 3) == 'WIN') {
           // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
+          if (($p_remove_disk_letter)
 		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
+              $p_path = substr($p_path, $v_position + 1);
           }
           // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
               $p_path = strtr($p_path, '\\', '/');
           }
       }

Braces +15 added lines, -10 removed lines

@@ -155,8 +155,9 @@ 
                 $this->_temp_tarname = '';
                 return false;
               }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
+              while ($v_data = @fread($v_file_from, 1024)) {
+                                @fwrite($v_file_to, $v_data);
+              }
               @fclose($v_file_from);
               @fclose($v_file_to);
           }
@@ -251,14 +252,17 @@ 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=0; $i<148; $i++) {
+                    $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
+        for ($i=148; $i<156; $i++) {
+                    $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        for ($i=156; $i<512; $i++) {
+                   $v_checksum+=ord(substr($v_binary_data,$i,1));
+        }
 
         $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -410,8 +414,9 @@ 
           $v_header['filename'] = substr($v_header['filename'],
 		                                 $p_remove_path_size);
         if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
+          while (substr($p_path, -1) == '/') {
+                      $p_path = substr($p_path, 0, strlen($p_path)-1);
+          }
 
           if (substr($v_header['filename'], 0, 1) == '/')
               $v_header['filename'] = $p_path.$v_header['filename'];

framework/IO/TTextWriter.php

Doc Comments +1 added lines

@@ -38,6 +38,7 @@
 	/**
 	 * Writes a string.
 	 * @param string string to be written
+	 * @param string $str
 	 */
 	public function write($str)
 	{

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  */
 class TTextWriter extends TComponent implements ITextWriter
 {
-	private $_str='';
+	private $_str = '';
 
 	/**
 	 * Flushes the content that has been written.
@@ -30,8 +30,8 @@ 
 	 */
 	public function flush()
 	{
-		$str=$this->_str;
-		$this->_str='';
+		$str = $this->_str;
+		$this->_str = '';
 		return $str;
 	}
 
@@ -41,7 +41,7 @@ 
 	 */
 	public function write($str)
 	{
-		$this->_str.=$str;
+		$this->_str .= $str;
 	}
 
 	/**
@@ -49,9 +49,9 @@ 
 	 * @param string content to be written
 	 * @see write
 	 */
-	public function writeLine($str='')
+	public function writeLine($str = '')
 	{
-		$this->write($str."\n");
+		$this->write($str . "\n");
 	}
 }