pradosoft / prado

framework/Web/TAssetManager.php

Spacing +26 added lines, -26 removed lines

@@ -82,9 +82,9 @@ 
 		if($this->_basePath===null)
 			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
+			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()),'/\\').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized=true;
 	}
@@ -111,7 +111,7 @@ 
 		{
 			$this->_basePath=Prado::getPathOfNamespace($value);
 			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid',$value);
+				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
 
@@ -132,7 +132,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=rtrim($value,'/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -149,19 +149,19 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path,$checkTimestamp=false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
 		else if(empty($path) || ($fullpath=realpath($path))===false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid',$path);
+			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		else if(is_file($fullpath))
 		{
 			$dir=$this->hash(dirname($fullpath));
 			$fileName=basename($fullpath);
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
-				$this->copyFile($fullpath,$dst);
+				$this->copyFile($fullpath, $dst);
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
@@ -169,8 +169,8 @@ 
 			$dir=$this->hash($fullpath);
 			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				Prado::trace("Publishing directory $fullpath",'System.Web.UI.TAssetManager');
-				$this->copyDirectory($fullpath,$this->_basePath.DIRECTORY_SEPARATOR.$dir);
+				Prado::trace("Publishing directory $fullpath", 'System.Web.UI.TAssetManager');
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
 			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
@@ -191,7 +191,7 @@ 
 	 */
 	protected function setPublished($values=array())
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -234,7 +234,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x',crc32($dir.Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 * @param string source file path
 	 * @param string destination directory (if not exists, it will be created)
 	 */
-	protected function copyFile($src,$dst)
+	protected function copyFile($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -252,10 +252,10 @@ 
 			@chmod($dst, PRADO_CHMOD);
 		}
 		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
-		if(@filemtime($dstFile)<@filemtime($src))
+		if(@filemtime($dstFile) < @filemtime($src))
 		{
-			Prado::trace("Publishing file $src to $dstFile",'System.Web.TAssetManager');
-			@copy($src,$dstFile);
+			Prado::trace("Publishing file $src to $dstFile", 'System.Web.TAssetManager');
+			@copy($src, $dstFile);
 		}
 	}
 
@@ -267,7 +267,7 @@ 
 	 * @param string the destination directory
 	 * @todo a generic solution to ignore certain directories and files
 	 */
-	public function copyDirectory($src,$dst)
+	public function copyDirectory($src, $dst)
 	{
 		if(!is_dir($dst))
 		{
@@ -282,14 +282,14 @@ 
 					continue;
 				else if(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -313,7 +313,7 @@ 
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
 		else if(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid',$md5sum);
+			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir=$this->hash(dirname($fullpath));
@@ -321,10 +321,10 @@ 
 			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
 			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName)<@filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
-					$this->copyFile($fullpath,$dst);
-					$this->deployTarFile($tarfile,$dst);
+					$this->copyFile($fullpath, $dst);
+					$this->deployTarFile($tarfile, $dst);
 				}
 			}
 			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
@@ -338,14 +338,14 @@ 
 	 * @param string path where the contents of tar file are to be extracted
 	 * @return boolean true if extract successful, false otherwise.
 	 */
-	protected function deployTarFile($path,$destination)
+	protected function deployTarFile($path, $destination)
 	{
 		if(($fullpath=realpath($path))===false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid',$path);
+			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
 			Prado::using('System.IO.TTarFileExtractor');
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

framework/Web/TCacheHttpSession.php

Spacing +4 added lines, -4 removed lines

@@ -55,11 +55,11 @@ 
 		if($this->_cacheModuleID==='')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
 		else if(($cache=$this->getApplication()->getModule($this->_cacheModuleID))===null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
 		else if($cache instanceof ICache)
 			$this->_cache=$cache;
 		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid',$this->_cacheModuleID);
+			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
 		$this->setUseCustomStorage(true);
 		parent::init($config);
     }
@@ -104,9 +104,9 @@ 
 	 * @param string session data
 	 * @return boolean whether session write is successful
 	 */
-	public function _write($id,$data)
+	public function _write($id, $data)
 	{
-		return $this->_cache->set($this->calculateKey($id),$data,$this->getTimeout());
+		return $this->_cache->set($this->calculateKey($id), $data, $this->getTimeout());
 	}
 
 	/**

framework/Web/THttpUtility.php

Spacing +6 added lines, -6 removed lines

@@ -18,9 +18,9 @@ 
  */
 class THttpUtility
 {
-	private static $_encodeTable=array('<'=>'&lt;','>'=>'&gt;','"'=>'&quot;');
-	private static $_decodeTable=array('&lt;'=>'<','&gt;'=>'>','&quot;'=>'"');
-	private static $_stripTable=array('&lt;'=>'','&gt;'=>'','&quot;'=>'');
+	private static $_encodeTable=array('<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;');
+	private static $_decodeTable=array('&lt;'=>'<', '&gt;'=>'>', '&quot;'=>'"');
+	private static $_stripTable=array('&lt;'=>'', '&gt;'=>'', '&quot;'=>'');
 
 	/**
 	 * HTML-encodes a string.
@@ -32,7 +32,7 @@ 
 	 */
 	public static function htmlEncode($s)
 	{
-		return strtr($s,self::$_encodeTable);
+		return strtr($s, self::$_encodeTable);
 	}
 
 	/**
@@ -43,7 +43,7 @@ 
 	 */
 	public static function htmlDecode($s)
 	{
-		return strtr($s,self::$_decodeTable);
+		return strtr($s, self::$_decodeTable);
 	}
 
 	/**
@@ -54,7 +54,7 @@ 
 	 */
 	public static function htmlStrip($s)
 	{
-		return strtr($s,self::$_stripTable);
+		return strtr($s, self::$_stripTable);
 	}
 }
 

framework/Util/TDateTimeStamp.php

Spacing +34 added lines, -34 removed lines

@@ -25,8 +25,8 @@ 
  */
 class TDateTimeStamp
 {
-	protected static $_month_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	protected static $_month_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
+	protected static $_month_normal=array("", 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+	protected static $_month_leaf=array("", 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
 	/**
 	 * Returns the day of the week (0=Sunday, 1=Monday, .. 6=Saturday)
@@ -36,7 +36,7 @@ 
 	 */
 	public function getDayofWeek($year, $month, $day)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setDate($year, $month, $day);
 		return (int) $dt->format('w');
 	}
@@ -49,8 +49,8 @@ 
 	 */
 	public function isLeapYear($year)
 	{
-		$year = $this->digitCheck($year);
-		$dt = new DateTime();
+		$year=$this->digitCheck($year);
+		$dt=new DateTime();
 		$dt->setDate($year, 1, 1);
 		return (bool) $dt->format('L');
 	}
@@ -62,22 +62,22 @@ 
 	 */
 	protected function digitCheck($y)
 	{
-		if ($y < 100){
-			$yr = (integer) date("Y");
-			$century = (integer) ($yr /100);
+		if($y < 100) {
+			$yr=(integer) date("Y");
+			$century=(integer) ($yr / 100);
 
-			if ($yr%100 > 50) {
-				$c1 = $century + 1;
-				$c0 = $century;
+			if($yr % 100 > 50) {
+				$c1=$century + 1;
+				$c0=$century;
 			} else {
-				$c1 = $century;
-				$c0 = $century - 1;
+				$c1=$century;
+				$c0=$century - 1;
 			}
-			$c1 *= 100;
+			$c1*=100;
 			// if 2-digit year is less than 30 years in future, set it to this century
 			// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-			if (($y + $c1) < $yr+30) $y = $y + $c1;
-			else $y = $y + $c0*100;
+			if(($y + $c1) < $yr + 30) $y=$y + $c1;
+			else $y=$y + $c0 * 100;
 		}
 		return $y;
 	}
@@ -92,7 +92,7 @@ 
 	 */
 	public function getGMTDiff($ts=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($ts)
 			$dt->setTimeStamp($ts);
 		else
@@ -106,9 +106,9 @@ 
 	 */
 	function parseDate($txt=false)
 	{
-		if ($txt === false) return getdate();
+		if($txt===false) return getdate();
 
-		$dt = new DateTime($txt);
+		$dt=new DateTime($txt);
 
 		return array(
 			'seconds' => (int) $dt->format('s'),
@@ -128,11 +128,11 @@ 
 	/**
 	 * @return array an array with date info.
 	 */
-	function getDate($d=false,$fast=false)
+	function getDate($d=false, $fast=false)
 	{
-		if ($d === false) return getdate();
+		if($d===false) return getdate();
 
-		$dt = new DateTime();
+		$dt=new DateTime();
 		$dt->setTimestamp($d);
 
 		return array(
@@ -153,20 +153,20 @@ 
 	/**
 	 * @return boolean true if valid date, semantic check only.
 	 */
-	public function isValidDate($y,$m,$d)
+	public function isValidDate($y, $m, $d)
 	{
-		if ($this->isLeapYear($y))
-			$marr =& self::$_month_leaf;
+		if($this->isLeapYear($y))
+			$marr=& self::$_month_leaf;
 		else
-			$marr =& self::$_month_normal;
+			$marr=& self::$_month_normal;
 
-		if ($m > 12 || $m < 1) return false;
+		if($m > 12 || $m < 1) return false;
 
-		if ($d > 31 || $d < 1) return false;
+		if($d > 31 || $d < 1) return false;
 
-		if ($marr[$m] < $d) return false;
+		if($marr[$m] < $d) return false;
 
-		if ($y < 1000 && $y > 3000) return false;
+		if($y < 1000 && $y > 3000) return false;
 
 		return true;
 	}
@@ -174,9 +174,9 @@ 
 	/**
 	 * @return string formatted date based on timestamp $d
 	 */
-	function formatDate($fmt,$ts=false,$is_gmt=false)
+	function formatDate($fmt, $ts=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setTimestamp($ts);
@@ -187,9 +187,9 @@ 
 	/**
 	 * @return integer|float a timestamp given a local time
      */
-	function getTimeStamp($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_gmt=false)
+	function getTimeStamp($hr, $min, $sec, $mon=false, $day=false, $year=false, $is_gmt=false)
 	{
-		$dt = new DateTime();
+		$dt=new DateTime();
 		if($is_gmt)
 			$dt->setTimeZone(new DateTimeZone('UTC'));
 		$dt->setDate($year!==false ? $year : date('Y'),

framework/Util/TCallChain.php

Spacing +10 added lines, -10 removed lines

@@ -44,9 +44,9 @@ 
 	 *			the object and method name as string
 	 *  @param array The array of arguments to the function call chain
 	 */
-	public function addCall($method,$args)
+	public function addCall($method, $args)
 	{
-		$this->add(array($method,$args));
+		$this->add(array($method, $args));
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	{
 		$args=func_get_args();
 		if($this->getCount()===0)
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 
 		if(!$this->_iterator)
 		{
@@ -103,15 +103,15 @@ 
 			do {
 				$handler=$this->_iterator->current();
 				$this->_iterator->next();
-				if(is_array($handler[0])&&$handler[0][0] instanceof IClassBehavior)
-					array_splice($handler[1],1,count($args),$args);
+				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
+					array_splice($handler[1], 1, count($args), $args);
 				else
-					array_splice($handler[1],0,count($args),$args);
+					array_splice($handler[1], 0, count($args), $args);
 				$handler[1][]=$this;
-				$result=call_user_func_array($handler[0],$handler[1]);
+				$result=call_user_func_array($handler[0], $handler[1]);
 			} while($this->_iterator->valid());
 		else
-			$result = $args[0];
+			$result=$args[0];
 		return $result;
 	}
 
@@ -137,10 +137,10 @@ 
 	 * @param string method name of the unspecified object method
 	 * @param array arguments to the unspecified object method
 	 */
-	public function __dycall($method,$args)
+	public function __dycall($method, $args)
 	{
 		if($this->_method==$method)
-			return call_user_func_array(array($this,'call'),$args);
+			return call_user_func_array(array($this, 'call'), $args);
 		return null;
 	}
 }
\ No newline at end of file

framework/Util/TSimpleDateFormatter.php

Spacing +76 added lines, -76 removed lines

@@ -54,7 +54,7 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
@@ -80,7 +80,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -106,17 +106,17 @@ 
 	 */
 	public function format($value)
 	{
-		$date = $this->getDate($value);
-		$bits['yyyy'] = $date['year'];
-		$bits['yy'] = substr("{$date['year']}", -2);
+		$date=$this->getDate($value);
+		$bits['yyyy']=$date['year'];
+		$bits['yy']=substr("{$date['year']}", -2);
 
-		$bits['MM'] = str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
-		$bits['M'] = $date['mon'];
+		$bits['MM']=str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
+		$bits['M']=$date['mon'];
 
-		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
-		$bits['d'] = $date['mday'];
+		$bits['dd']=str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
+		$bits['d']=$date['mday'];
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -153,13 +153,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = array();
-		if(is_int($day= strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month= strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year= strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=array();
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -171,7 +171,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 		if(is_numeric($value))
 			return $s->getDate($value);
 		else
@@ -183,10 +183,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value,$defaultToCurrentTime=true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -205,108 +205,108 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
 		$token='';
 		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern,$i_format);
+			$c=$this->charAt($pattern, $i_format);
 			$token='';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token=='yyyy' || $token=='yy' || $token=='y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token=='yyyy') { $x=4;$y=4; }
-				if ($token=='yy')   { $x=2;$y=2; }
-				if ($token=='y')    { $x=2;$y=4; }
-				$year = $this->getInteger($value,$i_val,$x,$y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
 			elseif($token=='MM' || $token=='M')
 			{
-				$month=$this->getInteger($value,$i_val,
-									$this->length($token),2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12 )
+				$month=$this->getInteger($value, $i_val,
+									$this->length($token), 2);
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token=='dd' || $token=='d')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay >31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
 			return $s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		}
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -352,15 +352,15 @@ 
 	 * @param int maximum integer length
 	 * @return string integer portion of the string, null otherwise
 	 */
-	private function getInteger($str,$i,$minlength,$maxlength)
+	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token= $this->substring($str, $i,$x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

framework/Util/TDataFieldAccessor.php

Spacing +10 added lines, -10 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return mixed value at the specified field
 	 * @throws TInvalidDataValueException if field or data is invalid
 	 */
-	public static function getDataFieldValue($data,$field)
+	public static function getDataFieldValue($data, $field)
 	{
 		try
 		{
@@ -57,33 +57,33 @@ 
 				if(isset($data[$field]))
 					return $data[$field];
 
-				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-				    $tmp = $tmp[$f];
+				$tmp=$data;
+				foreach(explode(".", $field) as $f)
+				    $tmp=$tmp[$f];
 				return $tmp;
 			}
 			else if(is_object($data))
 			{
-				if(strpos($field,'.')===false)  // simple field
+				if(strpos($field, '.')===false)  // simple field
 				{
 					if(method_exists($data, 'get'.$field))
-						return call_user_func(array($data,'get'.$field));
+						return call_user_func(array($data, 'get'.$field));
 					else
 						return $data->{$field};
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
-					foreach(explode('.',$field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f)
+						$object=TDataFieldAccessor::getDataFieldValue($object, $f);
 					return $object;
 				}
 			}
 		}
 		catch(Exception $e)
 		{
-			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field,$e->getMessage());
+			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}
-		throw new TInvalidDataValueException('datafieldaccessor_data_invalid',$field);
+		throw new TInvalidDataValueException('datafieldaccessor_data_invalid', $field);
 	}
 }

framework/Util/TBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$this->_owner=$owner;
 		foreach($this->events() as $event=>$handler)
-			$owner->attachEventHandler($event,array($this,$handler));
+			$owner->attachEventHandler($event, array($this, $handler));
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event=>$handler)
-			$owner->detachEventHandler($event,array($this,$handler));
+			$owner->detachEventHandler($event, array($this, $handler));
 		$this->_owner=null;
 	}
 

framework/Util/TLogger.php

Spacing +20 added lines, -20 removed lines

@@ -63,16 +63,16 @@ 
 	 * @param string category of the message
 	 * @param string|TControl control of the message
 	 */
-	public function log($message,$level,$category='Uncategorized', $ctl=null)
+	public function log($message, $level, $category='Uncategorized', $ctl=null)
 	{
 		if($ctl) {
 			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
+				$ctl=$ctl->ClientId;
 			else if(!is_string($ctl))
-				$ctl = null;
+				$ctl=null;
 		} else
-			$ctl = null;
-		$this->_logs[]=array($message,$level,$category,microtime(true),memory_get_usage(),$ctl);
+			$ctl=null;
+		$this->_logs[]=array($message, $level, $category, microtime(true), memory_get_usage(), $ctl);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 *   [4] => memory in bytes
 	 *   [5] => control client id
 	 */
-	public function getLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function getLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
 		$this->_levels=$levels;
 		$this->_categories=$categories;
@@ -116,15 +116,15 @@ 
 		$this->_timestamp=$timestamp;
 		if(empty($levels) && empty($categories) && empty($controls) && is_null($timestamp))
 			return $this->_logs;
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByLevels')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByLevels'))));
 		if(!empty($categories))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByCategories')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByCategories'))));
 		if(!empty($controls))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByControl')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByControl'))));
 		if(!is_null($timestamp))
-			$logs = array_values(array_filter( array_filter($logs,array($this,'filterByTimeStamp')) ));
+			$logs=array_values(array_filter(array_filter($logs, array($this, 'filterByTimeStamp'))));
 		return $logs;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param array category filter
 	 * @param array control filter
 	 */
-	public function deleteLogs($levels=null,$categories=null,$controls=null,$timestamp=null)
+	public function deleteLogs($levels=null, $categories=null, $controls=null, $timestamp=null)
 	{
 		$this->_levels=$levels;
 		$this->_categories=$categories;
@@ -163,16 +163,16 @@ 
 			$this->_logs=array();
 			return;
 		}
-		$logs = $this->_logs;
+		$logs=$this->_logs;
 		if(!empty($levels))
-			$logs = array_filter( array_filter($logs,array($this,'filterByLevels')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByLevels')));
 		if(!empty($categories))
-			$logs = array_filter( array_filter($logs,array($this,'filterByCategories')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByCategories')));
 		if(!empty($controls))
-			$logs = array_filter( array_filter($logs,array($this,'filterByControl')) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByControl')));
 		if(!is_null($timestamp))
-			$logs = array_filter( array_filter($logs,array($this,'filterByTimeStamp')) );
-		$this->_logs = array_values( array_diff_key($this->_logs, $logs) );
+			$logs=array_filter(array_filter($logs, array($this, 'filterByTimeStamp')));
+		$this->_logs=array_values(array_diff_key($this->_logs, $logs));
 	}
 
 	/**
@@ -184,7 +184,7 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2]===$category || strpos($value[2],$category.'.')===0)
+			if($value[2]===$category || strpos($value[2], $category.'.')===0)
 				return $value;
 		}
 		return false;
@@ -212,7 +212,7 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5]===$control || strpos($value[5],$control)===0)
+			if($value[5]===$control || strpos($value[5], $control)===0)
 				return $value;
 		}
 		return false;