pradosoft / prado

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

@@ -43,13 +43,13 @@ 
 	 * Message data filename extension.
 	 * @var string
 	 */
-	protected $dataExt = '.xml';
+	protected $dataExt='.xml';
 
 	/**
 	 * Separator between culture name and source.
 	 * @var string
 	 */
-	protected $dataSeparator = '.';
+	protected $dataSeparator='.';
 
 	/**
 	 * Constructor.
@@ -58,7 +58,7 @@ 
 	 */
 	function __construct($source)
 	{
-		$this->source = (string)$source;
+		$this->source=(string) $source;
 	}
 
 	/**
@@ -69,20 +69,20 @@ 
 	protected function &loadData($filename)
 	{
 		//load it.
-		if(false === ($XML = simplexml_load_file($filename))) {
+		if(false===($XML=simplexml_load_file($filename))) {
 			return false;
 		}
 
-		$translationUnit = $XML->xpath('//trans-unit');
+		$translationUnit=$XML->xpath('//trans-unit');
 
-		$translations = array();
+		$translations=array();
 
 		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;
@@ -127,28 +127,28 @@ 
 	 */
 	protected function getCatalogueList($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$source = $catalogue.$this->dataExt;
-		$catalogues = array($source);
-		$variant = null;
+		$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}))
 			{
-				$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));
-		$files = array();
+		$byDir=$this->getCatalogueByDir($catalogue);
+		$catalogues=array_merge($byDir, array_reverse($catalogues));
+		$files=array();
 
 		foreach($catalogues as $file)
 		{
-			$files[] = $file;
-			$files[] = preg_replace('/\.xml$/', '.xlf', $file);
+			$files[]=$file;
+			$files[]=preg_replace('/\.xml$/', '.xlf', $file);
 		}
 
 		return $files;
@@ -163,16 +163,16 @@ 
 	 */
 	private function getCatalogueByDir($catalogue)
 	{
-		$variants = explode('_',$this->culture);
-		$catalogues = array();
-		$variant = null;
+		$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}))
 			{
-				$variant .= ($variant)?'_'.$variants[$i]:$variants[$i];
-				$catalogues[] = $variant.'/'.$catalogue.$this->dataExt;
+				$variant.=($variant) ? '_'.$variants[$i] : $variants[$i];
+				$catalogues[]=$variant.'/'.$catalogue.$this->dataExt;
 			}
 		}
 
@@ -196,38 +196,38 @@ 
 	 * 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;
-		$files = scandir($dir);
-		$catalogue = array();
+		$dir=$dir ? $dir : $this->source;
+		$files=scandir($dir);
+		$catalogue=array();
 
 		foreach($files as $file)
 		{
-			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/',$file)) {
-				$catalogue = array_merge(
+			if(is_dir($dir.'/'.$file) && preg_match('/^[a-z]{2}(_[A-Z]{2,3})?$/', $file)) {
+				$catalogue=array_merge(
 					$catalogue,
 					$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);
-				$culture = $variant;
-				$cat = $name;
+				$name=substr($file, 0, $pos);
+				$dot=strrpos($name, $this->dataSeparator);
+				$culture=$variant;
+				$cat=$name;
 
 				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;
-				$catalogue[] = $details;
+				$details[0]=$cat;
+				$details[1]=$culture;
+				$catalogue[]=$details;
 			}
 		}
 		sort($catalogue);
@@ -244,13 +244,13 @@ 
 	 */
 	private function getVariants($catalogue='messages')
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 
 		foreach($this->getCatalogueList($catalogue) as $variant)
 		{
-			$file = $this->getSource($variant);
+			$file=$this->getSource($variant);
 			if(is_file($file)) {
 				return array($variant, $file);
 			}
@@ -267,48 +267,48 @@ 
 	 */
 	public function save($catalogue='messages')
 	{
-		$messages = $this->untranslated;
+		$messages=$this->untranslated;
 		if(count($messages) <= 0) {
 			return false;
 		}
 
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $variants;
+			list($variant, $filename)=$variants;
 		} else {
-			list($variant, $filename) = $this->createMessageTemplate($catalogue);
+			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.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = new DOMDocument();
+		$dom=new DOMDocument();
 		$dom->load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-    	$body = $xpath->query('//body')->item(0);
+		$xpath=new DomXPath($dom);
+    	$body=$xpath->query('//body')->item(0);
 
-		$lastNodes = $xpath->query('//trans-unit[last()]');
+		$lastNodes=$xpath->query('//trans-unit[last()]');
 		if(($last=$lastNodes->item(0))!==null) {
-			$count = (int)$last->getAttribute('id');
+			$count=(int) $last->getAttribute('id');
 		} else {
-			$count = 0;
+			$count=0;
 		}
 
 		//for each message add it to the XML file using DOM
 		foreach($messages as $message)
 		{
-			$unit = $dom->createElement('trans-unit');
-			$unit->setAttribute('id',++$count);
+			$unit=$dom->createElement('trans-unit');
+			$unit->setAttribute('id', ++$count);
 
-			$source = $dom->createElement('source');
+			$source=$dom->createElement('source');
 			$source->appendChild($dom->createCDATASection($message));
 
-			$target = $dom->createElement('target');
+			$target=$dom->createElement('target');
 			$target->appendChild($dom->createCDATASection(''));
 
 			$unit->appendChild($dom->createTextNode("\n"));
@@ -323,7 +323,7 @@ 
 		}
 
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$fileNode=$xpath->query('//file')->item(0);
 		$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
 		//save it and clear the cache for this variant
@@ -345,68 +345,68 @@ 
 	 */
 	public function update($text, $target, $comments, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 
 		if($variants) {
-			list($variant, $filename) = $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.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
 		{
-			$found = false;
-			$targetted = false;
-			$commented = false;
+			$found=false;
+			$targetted=false;
+			$commented=false;
 
 			//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)
 			{
 				//source node
-				if($node->nodeName == 'source' && $node->firstChild->wholeText == $text) {
-					$found = true;
+				if($node->nodeName=='source' && $node->firstChild->wholeText==$text) {
+					$found=true;
 				}
 
 				//found source, get the target and notes
 				if($found)
 				{
 					//set the new translated string
-					if($node->nodeName == 'target')
+					if($node->nodeName=='target')
 					{
-						$node->nodeValue = $target;
-						$targetted = true;
+						$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;
+						$node->nodeValue=$comments;
+						$commented=true;
 					}
 				}
 			}
 
 			//append a target
 			if($found && !$targetted) {
-				$unit->appendChild($dom->createElement('target',$target));
+				$unit->appendChild($dom->createElement('target', $target));
 			}
 
 			//append a note
 			if($found && !$commented && !empty($comments)) {
-				$unit->appendChild($dom->createElement('note',$comments));
+				$unit->appendChild($dom->createElement('note', $comments));
 			}
 
 			//finished searching
@@ -415,10 +415,10 @@ 
 			}
 		}
 
-		$fileNode = $xpath->query('//file')->item(0);
+		$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)) {
 				$this->cache->clean($variant, $this->culture);
@@ -438,23 +438,23 @@ 
 	 */
 	public function delete($message, $catalogue='messages')
 	{
-		$variants = $this->getVariants($catalogue);
+		$variants=$this->getVariants($catalogue);
 		if($variants) {
-			list($variant, $filename) = $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.");
 		}
 
 		//create a new dom, import the existing xml
-		$dom = DOMDocument::load($filename);
+		$dom=DOMDocument::load($filename);
 
 		//find the body element
-		$xpath = new DomXPath($dom);
-		$units = $xpath->query('//trans-unit');
+		$xpath=new DomXPath($dom);
+		$units=$xpath->query('//trans-unit');
 
 		//for each of the existin units
 		foreach($units as $unit)
@@ -464,14 +464,14 @@ 
 			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=$xpath->query('//file')->item(0);
 					$fileNode->setAttribute('date', @date('Y-m-d\TH:i:s\Z'));
 
-					if(false !== $dom->save($filename)) {
+					if(false!==$dom->save($filename)) {
 						if(!empty($this->cache)) {
 							$this->cache->clean($variant, $this->culture);
 						}
@@ -488,18 +488,18 @@ 
 
 	protected function createMessageTemplate($catalogue)
 	{
-		if($catalogue === null) {
-			$catalogue = 'messages';
+		if($catalogue===null) {
+			$catalogue='messages';
 		}
 		
-		$variants = $this->getCatalogueList($catalogue);
-		$variant = array_shift($variants);
-		$file = $this->getSource($variant);
-		$dir = dirname($file);
+		$variants=$this->getCatalogueList($catalogue);
+		$variant=array_shift($variants);
+		$file=$this->getSource($variant);
+		$dir=dirname($file);
 
 		if(!is_dir($dir)) {
 			@mkdir($dir);
-			@chmod($dir,PRADO_CHMOD);
+			@chmod($dir, PRADO_CHMOD);
 		}
 
 		if(!is_dir($dir)) {
@@ -514,8 +514,8 @@ 
 
 	protected function getTemplate($catalogue)
 	{
-		$date = @date('c');
-		$xml = <<<EOD
+		$date=@date('c');
+		$xml=<<<EOD
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.0">
  <file source-language="EN" target-language="{$this->culture}" datatype="plaintext" original="$catalogue" date="$date" product-name="$catalogue">

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

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.

Spacing +95 added lines, -95 removed lines

@@ -52,24 +52,24 @@ 
 	 * ICU number formatting data.
 	 * @var array
 	 */
-	private $data = array();
+	private $data=array();
 
 	/**
 	 * A list of properties that are accessable/writable.
 	 * @var array
 	 */
-	protected $properties = array();
+	protected $properties=array();
 
 	/**
 	 * The number pattern.
 	 * @var array
 	 */
-	protected $pattern = array();
+	protected $pattern=array();
 
-	const DECIMAL = 0;
-	const CURRENCY = 1;
-	const PERCENTAGE = 2;
-	const SCIENTIFIC = 3;
+	const DECIMAL=0;
+	const CURRENCY=1;
+	const PERCENTAGE=2;
+	const SCIENTIFIC=3;
 
 	/**
 	 * Allow functions that begins with 'set' to be called directly
@@ -78,7 +78,7 @@ 
 	 */
 	public function __get($name)
 	{
-		$getProperty = 'get'.$name;
+		$getProperty='get'.$name;
 		if(in_array($getProperty, $this->properties))
 			return $this->$getProperty();
 		else
@@ -91,7 +91,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		$setProperty = 'set'.$name;
+		$setProperty='set'.$name;
 		if(in_array($setProperty, $this->properties))
 			$this->$setProperty($value);
 		else
@@ -109,12 +109,12 @@ 
 	 */
 	public function __construct($data=array(), $type=NumberFormatInfo::DECIMAL)
 	{
-		$this->properties = get_class_methods($this);
+		$this->properties=get_class_methods($this);
 
 		if(empty($data))
 			throw new Exception('Please provide the ICU data to initialize.');
 
-		$this->data = $data;
+		$this->data=$data;
 
 		$this->setPattern($type);
 	}
@@ -128,16 +128,16 @@ 
 	public function setPattern($type=NumberFormatInfo::DECIMAL)
 	{
 		if(is_int($type))
-			$this->pattern =
+			$this->pattern=
 				$this->parsePattern($this->data['NumberPatterns'][$type]);
 		else
-			$this->pattern = $this->parsePattern($type);
+			$this->pattern=$this->parsePattern($type);
 
-		$this->pattern['negInfty'] =
+		$this->pattern['negInfty']=
 			$this->data['NumberElements'][6].
 			$this->data['NumberElements'][9];
 
-		$this->pattern['posInfty'] =
+		$this->pattern['posInfty']=
 			$this->data['NumberElements'][11].
 			$this->data['NumberElements'][9];
 	}
@@ -155,10 +155,10 @@ 
     public static function getInvariantInfo($type=NumberFormatInfo::DECIMAL)
     {
         static $invariant;
-		if($invariant === null)
+		if($invariant===null)
         {
-            $culture = CultureInfo::getInvariantCulture();
-            $invariant = $culture->NumberFormat;
+            $culture=CultureInfo::getInvariantCulture();
+            $invariant=$culture->NumberFormat;
             $invariant->setPattern($type);
         }
 		return $invariant;
@@ -179,23 +179,23 @@ 
     public static function getInstance($culture=null,
     								   $type=NumberFormatInfo::DECIMAL)
     {
-   		if ($culture instanceof CultureInfo)
+   		if($culture instanceof CultureInfo)
    		{
-            $formatInfo = $culture->NumberFormat;
+            $formatInfo=$culture->NumberFormat;
             $formatInfo->setPattern($type);
             return $formatInfo;
    		}
        	else if(is_string($culture))
        	{
-       		$cultureInfo = new CultureInfo($culture);
-       		$formatInfo = $cultureInfo->NumberFormat;
+       		$cultureInfo=new CultureInfo($culture);
+       		$formatInfo=$cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
        	}
        	else
        	{
-            $cultureInfo = new CultureInfo();
-       		$formatInfo = $cultureInfo->NumberFormat;
+            $cultureInfo=new CultureInfo();
+       		$formatInfo=$cultureInfo->NumberFormat;
        		$formatInfo->setPattern($type);
        		return $formatInfo;
        	}
@@ -241,67 +241,67 @@ 
      */
     protected function parsePattern($pattern)
 	{
-		$pattern = explode(';',$pattern);
+		$pattern=explode(';', $pattern);
 
-		$negative = null;
+		$negative=null;
 		if(count($pattern) > 1)
-			$negative = $pattern[1];
-		$pattern = $pattern[0];
+			$negative=$pattern[1];
+		$pattern=$pattern[0];
 
-		$comma = ',';
-		$dot = '.';
-		$digit = '0';
-		$hash = '#';
+		$comma=',';
+		$dot='.';
+		$digit='0';
+		$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;
+		$groupPos2=false;
+		$groupSize1=false;
+		$groupSize2=false;
+		$decimalPoints=is_int($decimalPos) ?-1 : false;
 
-		$info['negPref'] = $this->data['NumberElements'][6];
-		$info['negPost'] = '';
+		$info['negPref']=$this->data['NumberElements'][6];
+		$info['negPost']='';
 
-		$info['negative'] = $negative;
-		$info['positive'] = $pattern;
+		$info['negative']=$negative;
+		$info['positive']=$pattern;
 
 		//find the negative prefix and postfix
 		if($negative)
 		{
-			$prefixPostfix = $this->getPrePostfix($negative);
-			$info['negPref'] = $prefixPostfix[0];
-			$info['negPost'] = $prefixPostfix[1];
+			$prefixPostfix=$this->getPrePostfix($negative);
+			$info['negPref']=$prefixPostfix[0];
+			$info['negPost']=$prefixPostfix[1];
 		}
 
-		$posfix = $this->getPrePostfix($pattern);
-		$info['posPref'] = $posfix[0];
-		$info['posPost'] = $posfix[1];
+		$posfix=$this->getPrePostfix($pattern);
+		$info['posPref']=$posfix[0];
+		$info['posPost']=$posfix[1];
 
 		//var_dump($pattern);
 		//var_dump($decimalPos);
 		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))
 			{
-				$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;
+						$groupSize1=$i - $groupPos1;
 						break;
 					}
 				}
@@ -309,36 +309,36 @@ 
 
 			//get the second group size
 			if(is_int($groupPos2))
-				$groupSize2 = $groupPos1 - $groupPos2-1;
+				$groupSize2=$groupPos1 - $groupPos2 - 1;
 		}
 
 		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;
+					$decimalPoints=$i - $decimalPos;
 					break;
 				}
 			}
 		}
 
 		if(is_int($decimalPos))
-			$digitPattern = substr($pattern,0,$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;
-		$info['groupPos2'] = $groupPos2;
-		$info['groupSize2'] = $groupSize2;
-		$info['decimalPos'] = $decimalPos;
-		$info['decimalPoints'] = $decimalPoints;
-		$info['digitSize'] = strlen($digitPattern);
+		$info['groupPos1']=$groupPos1;
+		$info['groupSize1']=$groupSize1;
+		$info['groupPos2']=$groupPos2;
+		$info['groupSize2']=$groupSize2;
+		$info['decimalPos']=$decimalPos;
+		$info['decimalPoints']=$decimalPoints;
+		$info['digitSize']=strlen($digitPattern);
 		return $info;
 	}
 
@@ -349,9 +349,9 @@ 
 	 */
 	protected function getPrePostfix($pattern)
 	{
-		$regexp = '/[#,\.0]+/';
-		$result = preg_split($regexp, $pattern);
-		return array($result[0],$result[1]);
+		$regexp='/[#,\.0]+/';
+		$result=preg_split($regexp, $pattern);
+		return array($result[0], $result[1]);
 	}
 
 
@@ -370,7 +370,7 @@ 
      */
     function setDecimalDigits($value)
     {
-    	return $this->pattern['decimalPoints'] = $value;
+    	return $this->pattern['decimalPoints']=$value;
     }
 
     function getDigitSize()
@@ -380,7 +380,7 @@ 
 
     function setDigitSize($value)
     {
-    	$this->pattern['digitSize'] = $value;
+    	$this->pattern['digitSize']=$value;
     }
 
     /**
@@ -398,7 +398,7 @@ 
      */
     function setDecimalSeparator($value)
     {
-    	return $this->data['NumberElements'][0] = $value;
+    	return $this->data['NumberElements'][0]=$value;
     }
 
     /**
@@ -418,7 +418,7 @@ 
      */
     function setGroupSeparator($value)
     {
-    	return $this->data['NumberElements'][1] = $value;
+    	return $this->data['NumberElements'][1]=$value;
     }
 
     /**
@@ -430,8 +430,8 @@ 
      */
     function getGroupSizes()
     {
-    	$group1 = $this->pattern['groupSize1'];
-    	$group2 = $this->pattern['groupSize2'];
+    	$group1=$this->pattern['groupSize1'];
+    	$group2=$this->pattern['groupSize2'];
 
     	return array($group1, $group2);
     }
@@ -445,8 +445,8 @@ 
      */
     function setGroupSizes($groupSize)
     {
-   		$this->pattern['groupSize1'] = $groupSize[0];
-   		$this->pattern['groupSize2'] = $groupSize[1];
+   		$this->pattern['groupSize1']=$groupSize[0];
+   		$this->pattern['groupSize2']=$groupSize[1];
     }
 
     /**
@@ -457,8 +457,8 @@ 
      */
     function getNegativePattern()
     {
-    	$prefix = $this->pattern['negPref'];
-    	$postfix = $this->pattern['negPost'];
+    	$prefix=$this->pattern['negPref'];
+    	$postfix=$this->pattern['negPost'];
     	return array($prefix, $postfix);
     }
 
@@ -470,8 +470,8 @@ 
      */
     function setNegativePattern($pattern)
     {
-    	$this->pattern['negPref'] = $pattern[0];
-    	$this->pattern['negPost'] = $pattern[1];
+    	$this->pattern['negPref']=$pattern[0];
+    	$this->pattern['negPost']=$pattern[1];
     }
 
     /**
@@ -482,8 +482,8 @@ 
      */
     function getPositivePattern()
     {
-    	$prefix = $this->pattern['posPref'];
-    	$postfix = $this->pattern['posPost'];
+    	$prefix=$this->pattern['posPref'];
+    	$postfix=$this->pattern['posPost'];
     	return array($prefix, $postfix);
     }
 
@@ -495,8 +495,8 @@ 
      */
     function setPositivePattern($pattern)
     {
-    	$this->pattern['posPref'] = $pattern[0];
-    	$this->pattern['posPost'] = $pattern[1];
+    	$this->pattern['posPref']=$pattern[0];
+    	$this->pattern['posPost']=$pattern[1];
     }
 
     /**
@@ -518,7 +518,7 @@ 
      */
     function setCurrencySymbol($symbol)
     {
-    	$this->pattern['symbol'] = $symbol;
+    	$this->pattern['symbol']=$symbol;
     }
 
     /**
@@ -536,7 +536,7 @@ 
      */
     function setNegativeInfinitySymbol($value)
     {
-		$this->pattern['negInfty'] = $value;
+		$this->pattern['negInfty']=$value;
     }
 
     /**
@@ -554,7 +554,7 @@ 
      */
     function setPositiveInfinitySymbol($value)
     {
-		$this->pattern['posInfty'] = $value;
+		$this->pattern['posInfty']=$value;
     }
 
     /**
@@ -572,7 +572,7 @@ 
      */
     function setNegativeSign($value)
     {
-    	$this->data['NumberElements'][6] = $value;
+    	$this->data['NumberElements'][6]=$value;
     }
 
     /**
@@ -590,7 +590,7 @@ 
      */
     function setPositiveSign($value)
     {
-    	$this->data['NumberElements'][11] = $value;
+    	$this->data['NumberElements'][11]=$value;
     }
 
     /**
@@ -608,7 +608,7 @@ 
      */
     function setNaNSymbol($value)
     {
-    	$this->data['NumberElements'][10] = $value;
+    	$this->data['NumberElements'][10]=$value;
     }
 
     /**
@@ -626,7 +626,7 @@ 
      */
     function setPercentSymbol($value)
     {
-    	$this->data['NumberElements'][3] = $value;
+    	$this->data['NumberElements'][3]=$value;
     }
 
     /**
@@ -644,7 +644,7 @@ 
      */
     function setPerMilleSymbol($value)
     {
-    	$this->data['NumberElements'][8] = $value;
+    	$this->data['NumberElements'][8]=$value;
     }
 }
 

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

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

Spacing +106 added lines, -106 removed lines

@@ -54,7 +54,7 @@ 
     *
     * @var string $_cacheDir
     */
-    protected $_cacheDir = '/tmp/';
+    protected $_cacheDir='/tmp/';
 
     /**
     * Enable / disable caching
@@ -63,14 +63,14 @@ 
     *
     * @var boolean $_caching
     */
-    protected $_caching = true;
+    protected $_caching=true;
 
     /**
     * Cache lifetime (in seconds)
     *
     * @var int $_lifeTime
     */
-    protected $_lifeTime = 3600;
+    protected $_lifeTime=3600;
 
     /**
     * Enable / disable fileLocking
@@ -79,7 +79,7 @@ 
     *
     * @var boolean $_fileLocking
     */
-    protected $_fileLocking = true;
+    protected $_fileLocking=true;
 
     /**
     * Timestamp of the last valid cache
@@ -105,7 +105,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_writeControl = true;
+    protected $_writeControl=true;
 
     /**
     * Enable / disable read control
@@ -115,7 +115,7 @@ 
     *
     * @var boolean $_writeControl
     */
-    protected $_readControl = true;
+    protected $_readControl=true;
 
     /**
     * Type of read control (only if read control is enabled)
@@ -128,7 +128,7 @@ 
     *
     * @var boolean $_readControlType
     */
-    protected $_readControlType = 'crc32';
+    protected $_readControlType='crc32';
 
     /**
     * Current cache id
@@ -151,7 +151,7 @@ 
     *
     * @var boolean $_memoryCaching
     */
-    protected $_memoryCaching = false;
+    protected $_memoryCaching=false;
 
     /**
     * Enable / Disable "Only Memory Caching"
@@ -159,28 +159,28 @@ 
     *
     * @var boolean $_onlyMemoryCaching
     */
-    protected $_onlyMemoryCaching = false;
+    protected $_onlyMemoryCaching=false;
 
     /**
     * Memory caching array
     *
     * @var array $_memoryCachingArray
     */
-    protected $_memoryCachingArray = array();
+    protected $_memoryCachingArray=array();
 
     /**
     * Memory caching counter
     *
     * @var int $memoryCachingCounter
     */
-    protected $_memoryCachingCounter = 0;
+    protected $_memoryCachingCounter=0;
 
     /**
     * Memory caching limit
     *
     * @var int $memoryCachingLimit
     */
-    protected $_memoryCachingLimit = 1000;
+    protected $_memoryCachingLimit=1000;
 
     /**
     * File Name protection
@@ -192,7 +192,7 @@ 
     *
     * @var boolean $fileNameProtection
     */
-    protected $_fileNameProtection = true;
+    protected $_fileNameProtection=true;
 
     /**
     * Enable / disable automatic serialization
@@ -202,7 +202,7 @@ 
     *
     * @var boolean $_serialize
     */
-    protected $_automaticSerialization = false;
+    protected $_automaticSerialization=false;
 
     // --- Public methods ---
 
@@ -228,9 +228,9 @@ 
     * @param array $options options
     * @access public
     */
-    function __construct($options = array(null))
+    function __construct($options=array(null))
     {
-        $availableOptions = array(	'automaticSerialization',
+        $availableOptions=array('automaticSerialization',
         							'fileNameProtection',
         							'memoryCaching',
         							'onlyMemoryCaching',
@@ -244,11 +244,11 @@ 
         							'readControlType');
         foreach($options as $key => $value) {
             if(in_array($key, $availableOptions)) {
-                $property = '_'.$key;
-                $this->$property = $value;
+                $property='_'.$key;
+                $this->$property=$value;
             }
         }
-        $this->_refreshTime = time() - $this->_lifeTime;
+        $this->_refreshTime=time() - $this->_lifeTime;
 	}
 
     /**
@@ -261,41 +261,41 @@ 
     * @return string data of the cache (or false if no cache available)
     * @access public
     */
-    function get($id, $group = 'default', $doNotTestCacheValidity = false)
+    function get($id, $group='default', $doNotTestCacheValidity=false)
     {
-        $this->_id = $id;
-        $this->_group = $group;
-        $data = false;
-        if ($this->_caching) {
+        $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) {
+            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) {
+                    if($this->_onlyMemoryCaching) {
                         return false;
                     }
                 }
             }
-            if ($doNotTestCacheValidity) {
-                if (file_exists($this->_file)) {
-                    $data = $this->_read();
+            if($doNotTestCacheValidity) {
+                if(file_exists($this->_file)) {
+                    $data=$this->_read();
                 }
             } else {
-                if (@filemtime($this->_file) > $this->_refreshTime) {
-                    $data = $this->_read();
+                if(@filemtime($this->_file) > $this->_refreshTime) {
+                    $data=$this->_read();
                 }
             }
-            if (($data) and ($this->_memoryCaching)) {
+            if(($data) and ($this->_memoryCaching)) {
                 $this->_memoryCacheAdd($this->_file, $data);
             }
-            if ($this->_automaticSerialization && is_string($data)) {
-                $data = unserialize($data);
+            if($this->_automaticSerialization && is_string($data)) {
+                $data=unserialize($data);
             }
             return $data;
         }
@@ -312,24 +312,24 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function save($data, $id = null, $group = 'default')
+    function save($data, $id=null, $group='default')
     {
-        if ($this->_caching) {
-            if ($this->_automaticSerialization) {
-                $data = serialize($data);
+        if($this->_caching) {
+            if($this->_automaticSerialization) {
+                $data=serialize($data);
             }
-            if (isset($id)) {
+            if(isset($id)) {
                 $this->_setFileName($id, $group);
             }
-            if ($this->_memoryCaching) {
+            if($this->_memoryCaching) {
                 $this->_memoryCacheAdd($this->_file, $data);
-                if ($this->_onlyMemoryCaching) {
+                if($this->_onlyMemoryCaching) {
                     return true;
                 }
             }
-            if ($this->_writeControl) {
-                if (!$this->_writeAndControl($data)) {
-                    @touch($this->_file, time() - 2*abs($this->_lifeTime));
+            if($this->_writeControl) {
+                if(!$this->_writeAndControl($data)) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 } else {
                     return true;
@@ -349,10 +349,10 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function remove($id, $group = 'default')
+    function remove($id, $group='default')
     {
         $this->_setFileName($id, $group);
-        if (!@unlink($this->_file)) {
+        if(!@unlink($this->_file)) {
             $this->raiseError('TCache_Lite : Unable to remove cache !', -3);
             return false;
         }
@@ -369,35 +369,35 @@ 
     * @return boolean true if no problem
     * @access public
     */
-    function clean($group = false)
+    function clean($group=false)
     {
-        if ($this->_fileNameProtection) {
-            $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_';
+        if($this->_fileNameProtection) {
+            $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)) {
-                if (strpos($key, $motif, 0)) {
+        if($this->_memoryCaching) {
+            while(list($key, $value)=each($this->_memoryCaching)) {
+                if(strpos($key, $motif, 0)) {
                     unset($this->_memoryCaching[$key]);
-                    $this->_memoryCachingCounter =
+                    $this->_memoryCachingCounter=
                     		$this->_memoryCachingCounter - 1;
                 }
             }
-            if ($this->_onlyMemoryCaching) {
+            if($this->_onlyMemoryCaching) {
                 return true;
             }
         }
-        if (!($dh = opendir($this->_cacheDir))) {
+        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)) {
+        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;
                         }
@@ -416,22 +416,22 @@ 
     */
     function setLifeTime($newLifeTime)
     {
-        $this->_lifeTime = $newLifeTime;
-        $this->_refreshTime = time() - $newLifeTime;
+        $this->_lifeTime=$newLifeTime;
+        $this->_refreshTime=time() - $newLifeTime;
     }
 
     /**
     *
     * @access public
     */
-    function saveMemoryCachingState($id, $group = 'default')
+    function saveMemoryCachingState($id, $group='default')
     {
-        if ($this->_caching) {
-            $array = array(
+        if($this->_caching) {
+            $array=array(
                 'counter' => $this->_memoryCachingCounter,
                 'array' => $this->_memoryCachingState
             );
-            $data = serialize($array);
+            $data=serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -440,15 +440,15 @@ 
     *
     * @access public
     */
-    function getMemoryCachingState($id, $group = 'default',
-    								$doNotTestCacheValidity = false)
+    function getMemoryCachingState($id, $group='default',
+    								$doNotTestCacheValidity=false)
     {
-        if ($this->_caching) {
-            if ($data = $this->get($id, $group, $doNotTestCacheValidity))
+        if($this->_caching) {
+            if($data=$this->get($id, $group, $doNotTestCacheValidity))
             {
-                $array = unserialize($data);
-                $this->_memoryCachingCounter = $array['counter'];
-                $this->_memoryCachingArray = $array['array'];
+                $array=unserialize($data);
+                $this->_memoryCachingCounter=$array['counter'];
+                $this->_memoryCachingArray=$array['array'];
             }
         }
     }
@@ -488,12 +488,12 @@ 
     */
     function _memoryCacheAdd($id, $data)
     {
-        $this->_memoryCachingArray[$this->_file] = $data;
-        if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) {
-            list($key, $value) = each($this->_memoryCachingArray);
+        $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;
+            $this->_memoryCachingCounter=$this->_memoryCachingCounter + 1;
         }
     }
 
@@ -506,11 +506,11 @@ 
     */
     function _setFileName($id, $group)
     {
-        if ($this->_fileNameProtection) {
-            $this->_file = ($this->_cacheDir.'cache_'.md5($group).'_'
+        if($this->_fileNameProtection) {
+            $this->_file=($this->_cacheDir.'cache_'.md5($group).'_'
             						.md5($id));
         } else {
-            $this->_file = $this->_cacheDir.'cache_'.$group.'_'.$id;
+            $this->_file=$this->_cacheDir.'cache_'.$group.'_'.$id;
         }
     }
 
@@ -527,30 +527,30 @@ 
     */
     function _read()
     {
-        $fp = @fopen($this->_file, "rb");
-        if ($this->_fileLocking) @flock($fp, LOCK_SH);
-        if ($fp) {
+        $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);
+            $length=@filesize($this->_file);
 			if(version_compare(PHP_VERSION, '5.3.0', 'lt'))
 			{
-	            $mqr = get_magic_quotes_runtime();
+	            $mqr=get_magic_quotes_runtime();
     	        set_magic_quotes_runtime(0);
 			}
-            if ($this->_readControl) {
-                $hashControl = @fread($fp, 32);
-                $length = $length - 32;
+            if($this->_readControl) {
+                $hashControl=@fread($fp, 32);
+                $length=$length - 32;
             }
-            $data = @fread($fp, $length);
+            $data=@fread($fp, $length);
 			if(isset($mqr))
 	            set_magic_quotes_runtime($mqr);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            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));
+            if($this->_readControl) {
+                $hashData=$this->_hash($data, $this->_readControlType);
+                if($hashData!=$hashControl) {
+                    @touch($this->_file, time() - 2 * abs($this->_lifeTime));
                     return false;
                 }
             }
@@ -569,15 +569,15 @@ 
     */
     function _write($data)
     {
-        $fp = @fopen($this->_file, "wb");
-        if ($fp) {
-            if ($this->_fileLocking) @flock($fp, LOCK_EX);
-            if ($this->_readControl) {
+        $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);
+            $len=strlen($data);
             @fwrite($fp, $data, $len);
-            if ($this->_fileLocking) @flock($fp, LOCK_UN);
+            if($this->_fileLocking) @flock($fp, LOCK_UN);
             @fclose($fp);
             return true;
         }
@@ -596,7 +596,7 @@ 
     function _writeAndControl($data)
     {
         $this->_write($data);
-        $dataRead = $this->_read($data);
+        $dataRead=$this->_read($data);
         return ($dataRead==$data);
     }
 
@@ -610,7 +610,7 @@ 
     */
     function _hash($data, $controlType)
     {
-        switch ($controlType) {
+        switch($controlType) {
         case 'md5':
             return md5($data);
         case 'crc32':

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

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

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

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Core interfaces essential for TApplication class.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System
- */
+	 * Core interfaces essential for TApplication class.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System
+	 */
 
 /**
  * IModule interface.

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

@@ -60,14 +60,14 @@ 
     */
     public function __construct($p_tarname)
     {
-        $this->_tarname = $p_tarname;
+        $this->_tarname=$p_tarname;
     }
 
     public function __destruct()
     {
         $this->_close();
         // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
+        if($this->_temp_tarname!='')
             @unlink($this->_temp_tarname);
     }
 
@@ -110,11 +110,11 @@ 
     */
     protected function extractModify($p_path, $p_remove_path)
     {
-        $v_result = true;
-        $v_list_detail = array();
+        $v_result=true;
+        $v_list_detail=array();
 
-        if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
+        if($v_result=$this->_openRead()) {
+            $v_result=$this->_extractList($p_path, $v_list_detail,
 			                                "complete", 0, $p_remove_path);
             $this->_close();
         }
@@ -129,8 +129,8 @@ 
 
     private function _isArchive($p_filename=null)
     {
-        if ($p_filename == null) {
-            $p_filename = $this->_tarname;
+        if($p_filename==null) {
+            $p_filename=$this->_tarname;
         }
         clearstatcache();
         return @is_file($p_filename);
@@ -138,39 +138,39 @@ 
 
     private function _openRead()
     {
-        if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+        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')) {
+          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 = '';
+                $this->_temp_tarname='';
                 return false;
               }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+              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;
               }
-              while ($v_data = @fread($v_file_from, 1024))
+              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;
+          $v_filename=$this->_temp_tarname;
 
         } else
           // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+          $v_filename=$this->_tarname;
 
-		$this->_file = @fopen($v_filename, "rb");
+		$this->_file=@fopen($v_filename, "rb");
 
-        if ($this->_file == 0) {
+        if($this->_file==0) {
             $this->_error('Unable to open in read mode \''.$v_filename.'\'');
             return false;
         }
@@ -181,17 +181,17 @@ 
     private function _close()
     {
         //if (isset($this->_file)) {
-        if (is_resource($this->_file))
+        if(is_resource($this->_file))
 		{
                @fclose($this->_file);
-            $this->_file = 0;
+            $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 != '') {
+        if($this->_temp_tarname!='') {
             @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
+            $this->_temp_tarname='';
         }
 
         return true;
@@ -202,76 +202,76 @@ 
         $this->_close();
 
         // ----- Look for a local copy
-        if ($this->_temp_tarname != '') {
+        if($this->_temp_tarname!='') {
             // ----- Remove the local copy but not the remote tarname
             @unlink($this->_temp_tarname);
-            $this->_temp_tarname = '';
+            $this->_temp_tarname='';
         } else {
             // ----- Remove the local tarname file
             @unlink($this->_tarname);
         }
-        $this->_tarname = '';
+        $this->_tarname='';
 
         return true;
     }
 
     private function _readBlock()
     {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-              $v_block = @fread($this->_file, 512);
+      $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;
+      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) {
-            $v_header['filename'] = '';
+        if(strlen($v_binary_data)==0) {
+            $v_header['filename']='';
             return true;
         }
 
-        if (strlen($v_binary_data) != 512) {
-            $v_header['filename'] = '';
+        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;
+        $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/"
+        $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'] = '';
+        $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))
+            if(($v_checksum==256) && ($v_header['checksum']==0))
                 return true;
 
             $this->_error('Invalid checksum for file "'.$v_data['filename']
@@ -281,38 +281,38 @@ 
         }
 
         // ----- 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;
+        $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;
+      $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;
+      if(($v_header['size'] % 512)!=0) {
+        $v_content=$this->_readBlock();
+        $v_filename.=$v_content;
       }
 
       // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
+      $v_binary_data=$this->_readBlock();
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
+      if(!$this->_readHeader($v_binary_data, $v_header))
         return false;
 
-      $v_header['filename'] = $v_filename;
+      $v_header['filename']=$v_filename;
 
       return true;
     }
@@ -321,34 +321,34 @@ 
 	                      $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;
+    $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);
+    $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);
+    if(($p_remove_path!='') && (substr($p_remove_path, -1)!='/'))
+      $p_remove_path.='/';
+    $p_remove_path_size=strlen($p_remove_path);
 
-    switch ($p_mode) {
+    switch($p_mode) {
       case "complete" :
-        $v_extract_all = true;
-        $v_listing = false;
+        $v_extract_all=true;
+        $v_listing=false;
       break;
       case "partial" :
-          $v_extract_all = false;
-          $v_listing = false;
+          $v_extract_all=false;
+          $v_listing=false;
       break;
       case "list" :
-          $v_extract_all = false;
-          $v_listing = true;
+          $v_extract_all=false;
+          $v_listing=true;
       break;
       default :
         $this->_error('Invalid extract mode ('.$p_mode.')');
@@ -357,103 +357,103 @@ 
 
     clearstatcache();
 
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
+    while(strlen($v_binary_data=$this->_readBlock())!=0)
     {
-      $v_extract_file = false;
-      $v_extraction_stopped = 0;
+      $v_extract_file=false;
+      $v_extraction_stopped=0;
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
+      if(!$this->_readHeader($v_binary_data, $v_header))
         return false;
 
-      if ($v_header['filename'] == '') {
+      if($v_header['filename']=='') {
         continue;
       }
 
       // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
+      if($v_header['typeflag']=='L') {
+        if(!$this->_readLongHeader($v_header))
           return false;
       }
 
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
+      if((!$v_extract_all) && (is_array($p_file_list))) {
         // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
+        $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) == '/') {
+          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]))
+            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;
+              $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;
+          elseif($p_file_list[$i]==$v_header['filename']) {
+            $v_extract_file=true;
             break;
           }
         }
       } else {
-        $v_extract_file = true;
+        $v_extract_file=true;
       }
 
       // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
+      if(($v_extract_file) && (!$v_listing))
       {
-        if (($p_remove_path != '')
+        if(($p_remove_path!='')
             && (substr($v_header['filename'], 0, $p_remove_path_size)
 			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
+          $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(($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'];
+          if(substr($v_header['filename'], 0, 1)=='/')
+              $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']))
-		      && ($v_header['typeflag'] == '')) {
+        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")) {
+          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'])) {
+          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']) {
+          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) {
+        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)) {
+        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;
@@ -461,18 +461,18 @@ 
                 chmod($v_header['filename'], PRADO_CHMOD);
             }
           } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+              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();
+                  $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();
+            if(($v_header['size'] % 512)!=0) {
+              $v_content=$this->_readBlock();
               fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
             }
 
@@ -486,7 +486,7 @@ 
 
           // ----- Check the file size
           clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
+          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'])
@@ -496,10 +496,10 @@ 
           }
           }
         } 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 ...
@@ -509,15 +509,15 @@ 
         $v_end_of_file = @feof($this->_file);
         */
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+      if($v_listing || $v_extract_file || $v_extraction_stopped) {
         // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
+        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 = '/';
+          $v_file_dir='';
+        if((substr($v_header['filename'], 0, 1)=='/') && ($v_file_dir==''))
+          $v_file_dir='/';
 
-        $p_list_detail[$v_nb++] = $v_header;
+        $p_list_detail[$v_nb++]=$v_header;
       }
     }
 
@@ -534,36 +534,36 @@ 
      */
     protected function _dirCheck($p_dir)
     {
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
+        if((@is_dir($p_dir)) || ($p_dir==''))
             return true;
 
-        $p_parent_dir = dirname($p_dir);
+        $p_parent_dir=dirname($p_dir);
 
-        if (($p_parent_dir != $p_dir) &&
-            ($p_parent_dir != '') &&
+        if(($p_parent_dir!=$p_dir) &&
+            ($p_parent_dir!='') &&
             (!$this->_dirCheck($p_parent_dir)))
              return false;
 
-        if (!@mkdir($p_dir, PRADO_CHMOD)) {
+        if(!@mkdir($p_dir, PRADO_CHMOD)) {
             $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)
     {
-      if (substr(PHP_OS, 0, 3) == 'WIN') {
+      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);
+          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, '\\', '/');
+          if((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1)=='\\')) {
+              $p_path=strtr($p_path, '\\', '/');
           }
       }
       return $p_path;

Braces +6 added lines, -4 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);
           }
@@ -410,8 +411,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)
 	{

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TTextWriter class file
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.IO
- */
+	 * TTextWriter class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.IO
+	 */
 
 /**
  * TTextWriter class.

framework/PradoBase.php

Doc Comments +1 added lines

@@ -184,6 +184,7 @@
 	 * will cause the throw of an exception.
 	 * This method should only be used by framework developers.
 	 * @param TApplication the application instance
+	 * @param TApplication $application
 	 * @throws TInvalidOperationException if this method is invoked twice or more.
 	 */
 	public static function setApplication($application)

Braces +11 added lines, -22 removed lines

@@ -116,8 +116,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
-		}
-		else
+		} else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
@@ -169,8 +168,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -259,8 +257,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -282,24 +279,21 @@ 
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				if($checkClassExistence && !class_exists($namespace,false))
 					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
 				else
 					throw $e;
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[$namespace]=$path;
 				set_include_path(get_include_path().PATH_SEPARATOR.$path);
-			}
-			else  // a file
+			} else  // a file
 			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
@@ -307,8 +301,7 @@ 
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className,false))
 							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
@@ -317,8 +310,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 
@@ -384,8 +376,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 
@@ -430,8 +421,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -526,8 +516,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}

Indentation +13 added lines, -13 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * PradoBase class file.
- *
- * This is the file that establishes the PRADO component model
- * and error handling mechanism.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2016 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System
- */
+	 * PradoBase class file.
+	 *
+	 * This is the file that establishes the PRADO component model
+	 * and error handling mechanism.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2016 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System
+	 */
 
 /**
  * Defines the PRADO framework installation path.
@@ -18,8 +18,8 @@ 
 if(!defined('PRADO_DIR'))
 	define('PRADO_DIR',dirname(__FILE__));
 /**
- * Defines the default permission for writable directories and files
- */
+	 * Defines the default permission for writable directories and files
+	 */
 if(!defined('PRADO_CHMOD'))
 	define('PRADO_CHMOD',0777);
 

Spacing +78 added lines, -78 removed lines

@@ -16,12 +16,12 @@ 
  * Defines the PRADO framework installation path.
  */
 if(!defined('PRADO_DIR'))
-	define('PRADO_DIR',dirname(__FILE__));
+	define('PRADO_DIR', dirname(__FILE__));
 /**
  * Defines the default permission for writable directories and files
  */
 if(!defined('PRADO_CHMOD'))
-	define('PRADO_CHMOD',0777);
+	define('PRADO_CHMOD', 0777);
 
 /**
  * PradoBase class.
@@ -62,7 +62,7 @@ 
 	/**
 	 * @var array list of class exists checks
 	 */
-	protected static $classExists = array();
+	protected static $classExists=array();
 
 	/**
 	 * @return string the version of Prado framework
@@ -82,15 +82,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(array('PradoBase','phpErrorHandler'));
+		set_error_handler(array('PradoBase', 'phpErrorHandler'));
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(array('PradoBase','phpFatalErrorHandler'));
+		register_shutdown_function(array('PradoBase', 'phpFatalErrorHandler'));
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(array('PradoBase','exceptionHandler'));
+		set_exception_handler(array('PradoBase', 'exceptionHandler'));
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -113,11 +113,11 @@ 
 	 */
 	public static function poweredByPrado($logoType=0)
 	{
-		$logoName=$logoType==1?'powered2':'powered';
+		$logoName=$logoType==1 ? 'powered2' : 'powered';
 		if(self::$_application!==null)
 		{
 			$am=self::$_application->getAssetManager();
-			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
+			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName, '.gif'));
 		}
 		else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
@@ -134,10 +134,10 @@ 
 	 * @param string the filename that the error was raised in
 	 * @param integer the line number the error was raised at
 	 */
-	public static function phpErrorHandler($errno,$errstr,$errfile,$errline)
+	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
 		if(error_reporting() & $errno)
-			throw new TPhpErrorException($errno,$errstr,$errfile,$errline);
+			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 	}
 
 	/**
@@ -148,12 +148,12 @@ 
 	 */
 	public static function phpFatalErrorHandler()
 	{
-		$error = error_get_last();
+		$error=error_get_last();
 		if($error && 
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type'])
 		{
-			self::exceptionHandler(new TPhpErrorException($error['type'],$error['message'],$error['file'],$error['line']));
+			self::exceptionHandler(new TPhpErrorException($error['type'], $error['message'], $error['file'], $error['line']));
 		}
 	}
 
@@ -170,7 +170,7 @@ 
 	{
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
-			$errorHandler->handleError(null,$exception);
+			$errorHandler->handleError(null, $exception);
 		}
 		else
 		{
@@ -227,19 +227,19 @@ 
 	public static function createComponent($type)
 	{
 		if(!isset(self::$classExists[$type]))
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 
-		if( !isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			self::using($type);
-			self::$classExists[$type] = class_exists($type, false);
+			self::$classExists[$type]=class_exists($type, false);
 		}
 
-		if( ($pos = strrpos($type, '.')) !== false)
-			$type = substr($type,$pos+1);
+		if(($pos=strrpos($type, '.'))!==false)
+			$type=substr($type, $pos + 1);
 
-		if(($n=func_num_args())>1)
+		if(($n=func_num_args()) > 1)
 		{
-			$args = func_get_args();
+			$args=func_get_args();
 			switch($n) {
 				case 2:
 					return new $type($args[1]);
@@ -255,7 +255,7 @@ 
 				break;
 				default:
 					$s='$args[1]';
-					for($i=2;$i<$n;++$i)
+					for($i=2; $i < $n; ++$i)
 						$s.=",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -275,11 +275,11 @@ 
 	 * @param boolean whether to check the existence of the class after the class file is included
 	 * @throws TInvalidDataValueException if the namespace is invalid
 	 */
-	public static function using($namespace,$checkClassExistence=true)
+	public static function using($namespace, $checkClassExistence=true)
 	{
-		if(isset(self::$_usings[$namespace]) || class_exists($namespace,false))
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false))
 			return;
-		if(($pos=strrpos($namespace,'.'))===false)  // a class name
+		if(($pos=strrpos($namespace, '.'))===false)  // a class name
 		{
 			try
 			{
@@ -287,15 +287,15 @@ 
 			}
 			catch(Exception $e)
 			{
-				if($checkClassExistence && !class_exists($namespace,false))
-					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
+				if($checkClassExistence && !class_exists($namespace, false))
+					throw new TInvalidOperationException('prado_component_unknown', $namespace, $e->getMessage());
 				else
 					throw $e;
 			}
 		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		else if(($path=self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT))!==null)
 		{
-			$className=substr($namespace,$pos+1);
+			$className=substr($namespace, $pos + 1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[$namespace]=$path;
@@ -304,7 +304,7 @@ 
 			else  // a file
 			{
 				self::$_usings[$namespace]=$path;
-				if(!$checkClassExistence || !class_exists($className,false))
+				if(!$checkClassExistence || !class_exists($className, false))
 				{
 					try
 					{
@@ -312,8 +312,8 @@ 
 					}
 					catch(Exception $e)
 					{
-						if($checkClassExistence && !class_exists($className,false))
-							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
+						if($checkClassExistence && !class_exists($className, false))
+							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						else
 							throw $e;
 					}
@@ -321,7 +321,7 @@ 
 			}
 		}
 		else
-			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
+			throw new TInvalidDataValueException('prado_using_invalid', $namespace);
 	}
 
 	/**
@@ -338,7 +338,7 @@ 
 	 */
 	public static function getPathOfNamespace($namespace, $ext='')
 	{
-		if(self::CLASS_FILE_EXT === $ext || empty($ext))
+		if(self::CLASS_FILE_EXT===$ext || empty($ext))
 		{
 			if(isset(self::$_usings[$namespace]))
 				return self::$_usings[$namespace];
@@ -347,11 +347,11 @@ 
 				return self::$_aliases[$namespace];
 		}
 
-		$segs = explode('.',$namespace);
-		$alias = array_shift($segs);
+		$segs=explode('.', $namespace);
+		$alias=array_shift($segs);
 
-		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias)))
-			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR ,$segs),'/\\').(($file === '*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
+		if(null!==($file=array_pop($segs)) && null!==($root=self::getPathOfAlias($alias)))
+			return rtrim($root.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $segs), '/\\').(($file==='*') ? '' : DIRECTORY_SEPARATOR.$file.$ext);
 
 		return null;
 	}
@@ -362,7 +362,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ? self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -376,19 +376,19 @@ 
 	 * @throws TInvalidOperationException if the alias is already defined
 	 * @throws TInvalidDataValueException if the path is not a valid file path
 	 */
-	public static function setPathOfAlias($alias,$path)
+	public static function setPathOfAlias($alias, $path)
 	{
 		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
-			throw new TInvalidOperationException('prado_alias_redefined',$alias);
+			throw new TInvalidOperationException('prado_alias_redefined', $alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-			if(strpos($alias,'.')===false)
+			if(strpos($alias, '.')===false)
 				self::$_aliases[$alias]=$rp;
 			else
-				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
+				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
 		}
 		else
-			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
+			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
 	/**
@@ -413,13 +413,13 @@ 
 				continue;
 			echo '#'.$index.' ';
 			if(isset($t['file']))
-				echo basename($t['file']) . ':' . $t['line'];
+				echo basename($t['file']).':'.$t['line'];
 			else
 				 echo '<PHP inner-code>';
 			echo ' -- ';
 			if(isset($t['class']))
-				echo $t['class'] . $t['type'];
-			echo $t['function'] . '(';
+				echo $t['class'].$t['type'];
+			echo $t['function'].'(';
 			if(isset($t['args']) && sizeof($t['args']) > 0)
 			{
 				$count=0;
@@ -428,25 +428,25 @@ 
 					if(is_string($item))
 					{
 						$str=htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
-							echo "'". substr($str, 0, 70) . "...'";
+						if(strlen($item) > 70)
+							echo "'".substr($str, 0, 70)."...'";
 						else
-							echo "'" . $str . "'";
+							echo "'".$str."'";
 					}
-					else if (is_int($item) || is_float($item))
+					else if(is_int($item) || is_float($item))
 						echo $item;
-					else if (is_object($item))
+					else if(is_object($item))
 						echo get_class($item);
-					else if (is_array($item))
-						echo 'array(' . count($item) . ')';
-					else if (is_bool($item))
+					else if(is_array($item))
+						echo 'array('.count($item).')';
+					else if(is_bool($item))
 						echo $item ? 'true' : 'false';
-					else if ($item === null)
+					else if($item===null)
 						echo 'NULL';
-					else if (is_resource($item))
+					else if(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -473,10 +473,10 @@ 
 			else
 			{
 				$languages=array();
-				foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
-					$array=explode(';q=',trim($language));
-					$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;
+					$array=explode(';q=', trim($language));
+					$languages[trim($array[0])]=isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages=array_keys($languages);
@@ -497,7 +497,7 @@ 
 		if($language===null)
 		{
 			$langs=Prado::getUserLanguages();
-			$lang=explode('-',$langs[0]);
+			$lang=explode('-', $langs[0]);
 			if(empty($lang[0]) || !ctype_alpha($lang[0]))
 				$language='en';
 			else
@@ -518,7 +518,7 @@ 
 	 * @param (string|TControl) control of the message
 	 * @see log, getLogger
 	 */
-	public static function trace($msg,$category='Uncategorized',$ctl=null)
+	public static function trace($msg, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_application && self::$_application->getMode()===TApplicationMode::Performance)
 			return;
@@ -531,7 +531,7 @@ 
 		}
 		else
 			$level=TLogger::INFO;
-		self::log($msg,$level,$category,$ctl);
+		self::log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -546,11 +546,11 @@ 
 	 * @param string category of the message
 	 * @param (string|TControl) control of the message
 	 */
-	public static function log($msg,$level=TLogger::INFO,$category='Uncategorized',$ctl=null)
+	public static function log($msg, $level=TLogger::INFO, $category='Uncategorized', $ctl=null)
 	{
 		if(self::$_logger===null)
 			self::$_logger=new TLogger;
-		self::$_logger->log($msg,$level,$category,$ctl);
+		self::$_logger->log($msg, $level, $category, $ctl);
 	}
 
 	/**
@@ -572,10 +572,10 @@ 
 	 * @param boolean whether to syntax highlight the output. Defaults to false.
 	 * @return string the string representation of the variable
 	 */
-	public static function varDump($var,$depth=10,$highlight=false)
+	public static function varDump($var, $depth=10, $highlight=false)
 	{
 		Prado::using('System.Util.TVarDumper');
-		return TVarDumper::dump($var,$depth,$highlight);
+		return TVarDumper::dump($var, $depth, $highlight);
 	}
 
 	/**
@@ -591,32 +591,32 @@ 
 	public static function localize($text, $parameters=array(), $catalogue=null, $charset=null)
 	{
 		Prado::using('System.I18N.Translation');
-		$app = Prado::getApplication()->getGlobalization(false);
+		$app=Prado::getApplication()->getGlobalization(false);
 
-		$params = array();
+		$params=array();
 		foreach($parameters as $key => $value)
-			$params['{'.$key.'}'] = $value;
+			$params['{'.$key.'}']=$value;
 
 		//no translation handler provided
-		if($app===null || ($config = $app->getTranslationConfiguration())===null)
+		if($app===null || ($config=$app->getTranslationConfiguration())===null)
 			return strtr($text, $params);
 
-		if ($catalogue===null)
-			$catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue===null)
+			$catalogue=isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 
 		//globalization charset
-		$appCharset = $app===null ? '' : $app->getCharset();
+		$appCharset=$app===null ? '' : $app->getCharset();
 
 		//default charset
-		$defaultCharset = ($app===null) ? 'UTF-8' : $app->getDefaultCharset();
+		$defaultCharset=($app===null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if(empty($charset)) $charset = $appCharset;
-		if(empty($charset)) $charset = $defaultCharset;
+		if(empty($charset)) $charset=$appCharset;
+		if(empty($charset)) $charset=$defaultCharset;
 
-		return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
+		return Translation::formatter($catalogue)->format($text, $params, $catalogue, $charset);
 	}
 }
 

framework/Security/IUserManager.php

Doc Comments +3 added lines

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

Spacing +1 added lines, -1 removed lines

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