pradosoft / prado

framework/Caching/TDbCache.php

Spacing +28 added lines, -28 removed lines

@@ -110,11 +110,11 @@ 
 	/**
 	 * @var boolean
 	 */
-	private $_cacheInitialized = false;
+	private $_cacheInitialized=false;
 	/**
 	 * @var boolean
 	 */
-	private $_createCheck= false;
+	private $_createCheck=false;
 	/**
 	 * @var boolean whether the cache DB table should be created automatically
 	 */
@@ -188,20 +188,20 @@ 
 		$db=$this->getDbConnection();
 		try
 		{
-			$key = 'TDbCache:' . $this->_cacheTable . ':created';
+			$key='TDbCache:'.$this->_cacheTable.':created';
 			if($force)
-				$this -> _createCheck = false;
+				$this -> _createCheck=false;
 			else
-				$this -> _createCheck = $this -> getApplication() -> getGlobalState($key, 0);
+				$this -> _createCheck=$this -> getApplication() -> getGlobalState($key, 0);
 
 			if($this->_autoCreate && !$this -> _createCheck) {
 
-				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ') . $this -> id . ', ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
+				Prado::trace(($force ? 'Force initializing: ' : 'Initializing: ').$this -> id.', '.$this->_cacheTable, '\Prado\Caching\TDbCache');
 
 				$sql='SELECT 1 FROM '.$this->_cacheTable.' WHERE 0=1';
 				$db->createCommand($sql)->queryScalar();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 		}
@@ -210,7 +210,7 @@ 
 			// DB table not exists
 			if($this->_autoCreate)
 			{
-				Prado::trace('Autocreate: ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
+				Prado::trace('Autocreate: '.$this->_cacheTable, '\Prado\Caching\TDbCache');
 
 				$driver=$db->getDriverName();
 				if($driver==='mysql')
@@ -223,16 +223,16 @@ 
 				$sql='CREATE TABLE '.$this->_cacheTable." (itemkey CHAR(128) PRIMARY KEY, value $blob, expire INTEGER)";
 				$db->createCommand($sql)->execute();
 
-				$sql='CREATE INDEX IX_expire ON ' . $this->_cacheTable . ' (expire)';
+				$sql='CREATE INDEX IX_expire ON '.$this->_cacheTable.' (expire)';
 				$db->createCommand($sql)->execute();
 
-				$this -> _createCheck = true;
+				$this -> _createCheck=true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
 			else
-				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
+				throw new TConfigurationException('db_cachetable_inexistent', $this->_cacheTable);
 		}
-		$this->_cacheInitialized = true;
+		$this->_cacheInitialized=true;
 	}
 
 	/**
@@ -243,17 +243,17 @@ 
 	 */
 	public function flushCacheExpired($force=false)
 	{
-		$interval = $this -> getFlushInterval();
-		if(!$force && $interval === 0) return;
+		$interval=$this -> getFlushInterval();
+		if(!$force && $interval===0) return;
 
-		$key	= 'TDbCache:' . $this->_cacheTable . ':flushed';
-		$now	= time();
-		$next	= $interval + (integer)$this -> getApplication() -> getGlobalState($key, 0);
+		$key='TDbCache:'.$this->_cacheTable.':flushed';
+		$now=time();
+		$next=$interval + (integer) $this -> getApplication() -> getGlobalState($key, 0);
 
 		if($force || $next <= $now)
 		{
 			if(!$this->_cacheInitialized) $this->initializeCache();
-			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ') . $this -> id . ', ' . $this->_cacheTable, '\Prado\Caching\TDbCache');
+			Prado::trace(($force ? 'Force flush of expired items: ' : 'Flush expired items: ').$this -> id.', '.$this->_cacheTable, '\Prado\Caching\TDbCache');
 			$sql='DELETE FROM '.$this->_cacheTable.' WHERE expire<>0 AND expire<'.$now;
 			$this->getDbConnection()->createCommand($sql)->execute();
 			$this -> getApplication() -> setGlobalState($key, $now);
@@ -280,7 +280,7 @@ 
 	 */
 	public function setFlushInterval($value)
 	{
-		$this->_flushInterval = (integer) $value;
+		$this->_flushInterval=(integer) $value;
 	}
 
 	/**
@@ -297,7 +297,7 @@ 
 			if($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
-				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
+				throw new TConfigurationException('dbcache_connectionid_invalid', $this->_connID);
 		}
 		else
 		{
@@ -484,10 +484,10 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function setValue($key,$value,$expire)
+	protected function setValue($key, $value, $expire)
 	{
 		$this->deleteValue($key);
-		return $this->addValue($key,$value,$expire);
+		return $this->addValue($key, $value, $expire);
 	}
 
 	/**
@@ -499,16 +499,16 @@ 
 	 * @param integer the number of seconds in which the cached value will expire. 0 means never expire.
 	 * @return boolean true if the value is successfully stored into cache, false otherwise
 	 */
-	protected function addValue($key,$value,$expire)
+	protected function addValue($key, $value, $expire)
 	{
 		if(!$this->_cacheInitialized) $this->initializeCache();
-		$expire=($expire<=0)?0:time()+$expire;
+		$expire=($expire <= 0) ? 0 : time() + $expire;
 		$sql="INSERT INTO {$this->_cacheTable} (itemkey,value,expire) VALUES(:key,:value,$expire)";
 		try
 		{
 			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindValue(':key',$key,\PDO::PARAM_STR);
-			$command->bindValue(':value',serialize($value),\PDO::PARAM_LOB);
+			$command->bindValue(':key', $key, \PDO::PARAM_STR);
+			$command->bindValue(':value', serialize($value), \PDO::PARAM_LOB);
 			$command->execute();
 			return true;
 		}
@@ -539,7 +539,7 @@ 
 		try
 		{
 			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable} WHERE itemkey=:key");
-			$command->bindValue(':key',$key,\PDO::PARAM_STR);
+			$command->bindValue(':key', $key, \PDO::PARAM_STR);
 			$command->execute();
 			return true;
 		}
@@ -560,7 +560,7 @@ 
 		if(!$this->_cacheInitialized) $this->initializeCache();
 		try
 		{
-			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
+			$command=$this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
 		}
 		catch(\Exception $e)

framework/Web/THttpRequest.php

Spacing +65 added lines, -65 removed lines

@@ -76,8 +76,8 @@ 
  */
 class THttpRequest extends \Prado\TApplicationComponent implements \IteratorAggregate, \ArrayAccess, \Countable, \Prado\IModule
 {
-	const CGIFIX__PATH_INFO		= 1;
-	const CGIFIX__SCRIPT_NAME	= 2;
+	const CGIFIX__PATH_INFO=1;
+	const CGIFIX__SCRIPT_NAME=2;
 	/**
 	 * @var TUrlManager the URL manager module
 	 */
@@ -180,14 +180,14 @@ 
 		if(isset($_SERVER['REQUEST_URI']))
 			$this->_requestUri=$_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']);
+			$this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']);
 
-		if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
 			$this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
 		elseif(isset($_SERVER['PATH_INFO']))
 			$this->_pathInfo=$_SERVER['PATH_INFO'];
-		else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME']));
+		else if(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME'])
+			$this->_pathInfo=substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
 			$this->_pathInfo='';
 
@@ -214,7 +214,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map(array($this,'stripSlashes'),$data):stripslashes($data);
+		return is_array($data) ? array_map(array($this, 'stripSlashes'), $data) : stripslashes($data);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 		if($this->_url===null)
 		{
 			$secure=$this->getIsSecureConnection();
-			$url=$secure?'https://':'http://';
+			$url=$secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url.=$_SERVER['SERVER_NAME'];
@@ -248,7 +248,7 @@ 
 	 */
 	public function setEnableCache($value)
 	{
-		$this->_enableCache = TPropertyValue::ensureBoolean($value);
+		$this->_enableCache=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -272,15 +272,15 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				$dependencies=null;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
+					if($manager instanceof TUrlMapping && $fn=$manager->getConfigFile())
 					{
-						$fn = Prado::getPathOfNamespace($fn,$this->getApplication()->getConfigurationFileExt());
-						$dependencies = new TFileCacheDependency($fn);
+						$fn=Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+						$dependencies=new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
 			}
@@ -296,10 +296,10 @@ 
 	{
 		if($this->getEnableCache())
 		{
-			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			$cache=$this->getApplication()->getCache();
+			if($cache!==null)
 			{
-				$manager = $cache->get($this->getCacheKey());
+				$manager=$cache->get($this->getCacheKey());
 				if($manager instanceof TUrlManager)
 					return $manager;
 			}
@@ -335,7 +335,7 @@ 
 	{
 		if($this->_urlManager===null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager())===null)
+			if(($this->_urlManager=$this->loadCachedUrlManager())===null)
 			{
 				if(empty($this->_urlManagerID))
 				{
@@ -346,9 +346,9 @@ 
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
 					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid',$this->_urlManagerID);
+						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -374,7 +374,7 @@ 
 	 */
 	public function setUrlFormat($value)
 	{
-		$this->_urlFormat=TPropertyValue::ensureEnum($value,'Prado\\Web\\THttpRequestUrlFormat');
+		$this->_urlFormat=TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpRequestUrlFormat');
 	}
 
 	/**
@@ -402,19 +402,19 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
 	 * @param boolean $mimetypeOnly whether to return only the mimetype (default: true)
 	 * @return string content type (e.g. 'application/json' or 'text/html; encoding=gzip') or null if not specified
 	 */
-	public function getContentType($mimetypeOnly = true)
+	public function getContentType($mimetypeOnly=true)
 	{
 		if(!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if($mimetypeOnly===true && ($_pos=strpos(';', $_SERVER['CONTENT_TYPE']))!==false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -425,7 +425,7 @@ 
 	 */
 	public function getIsSecureConnection()
 	{
-			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'],'off');
+			return isset($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off');
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
@@ -460,19 +460,19 @@ 
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
-			$result = apache_request_headers();
+		if($result===null && function_exists('apache_request_headers')) {
+			$result=apache_request_headers();
 		}
-		elseif($result === null) {
-			$result = array();
+		elseif($result===null) {
+			$result=array();
 			foreach($_SERVER as $key=>$value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
-					$key = str_replace(' ','-', ucwords(strtolower(str_replace('_',' ', substr($key, 5)))));
-					$result[$key] = $value;
+				if(strncasecmp($key, 'HTTP_', 5)!==0) continue;
+					$key=str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
+					$result[$key]=$value;
 			}
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -496,9 +496,9 @@ 
 	public function getBaseUrl($forceSecureConnection=null)
 	{
 		$url=$this->getUrl();
-		$scheme=($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$scheme=($forceSecureConnection) ? "https" : (($forceSecureConnection===null) ? $url->getScheme() : 'http');
 		$host=$url->getHost();
-		if (($port=$url->getPort())) $host.=':'.$port;
+		if(($port=$url->getPort())) $host.=':'.$port;
 		return $scheme.'://'.$host;
 	}
 
@@ -507,10 +507,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -522,7 +522,7 @@ 
 	 */
 	public function getAbsoluteApplicationUrl($forceSecureConnection=null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -554,7 +554,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -586,7 +586,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -594,7 +594,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -603,7 +603,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -668,13 +668,13 @@ 
 				foreach($_COOKIE as $key=>$value)
 				{
 					if(($value=$sm->validateData($value))!==false)
-						$this->_cookies->add(new THttpCookie($key,$value));
+						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
 				foreach($_COOKIE as $key=>$value)
-					$this->_cookies->add(new THttpCookie($key,$value));
+					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
 		return $this->_cookies;
@@ -721,13 +721,13 @@ 
 	 * @return string URL
 	 * @see TUrlManager::constructUrl
 	 */
-	public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serviceID, $serviceParam, $getItems=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		if ($this->_cookieOnly===null)
-				$this->_cookieOnly=(int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
-		$url=$this->getUrlManagerModule()->constructUrl($serviceID,$serviceParam,$getItems,$encodeAmpersand,$encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url,'?')===false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if($this->_cookieOnly===null)
+				$this->_cookieOnly=(int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
+		$url=$this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
+		if(defined('SID') && SID!='' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?')===false ? '?' : ($encodeAmpersand ? '&' : '&')).SID;
 		else
 			return $url;
 	}
@@ -755,11 +755,11 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'],'Prado\Web\THttpRequest');
+		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
 		$getParams=$this->parseUrl();
 		foreach($getParams as $name=>$value)
 			$_GET[$name]=$value;
-		$this->_items=array_merge($_GET,$_POST);
+		$this->_items=array_merge($_GET, $_POST);
 		$this->_requestResolved=true;
 		foreach($serviceIDs as $serviceID)
 		{
@@ -870,7 +870,7 @@ 
 	 * @param mixed key
 	 * @param mixed value
 	 */
-	public function add($key,$value)
+	public function add($key, $value)
 	{
 		$this->_items[$key]=$value;
 	}
@@ -883,7 +883,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key,$this->_items))
+		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
@@ -908,7 +908,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return isset($this->_items[$key]) || array_key_exists($key,$this->_items);
+		return isset($this->_items[$key]) || array_key_exists($key, $this->_items);
 	}
 
 	/**
@@ -947,9 +947,9 @@ 
 	 * @param integer the offset to set element
 	 * @param mixed the element value
 	 */
-	public function offsetSet($offset,$item)
+	public function offsetSet($offset, $item)
 	{
-		$this->add($offset,$item);
+		$this->add($offset, $item);
 	}
 
 	/**

framework/Web/Services/TSoapServer.php

Spacing +17 added lines, -17 removed lines

@@ -61,8 +61,8 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id,'.wsdl')===strlen($this->_id)-5)
-			throw new TInvalidDataValueException('soapserver_id_invalid',$id);
+		if(strrpos($this->_id, '.wsdl')===strlen($this->_id) - 5)
+			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
 		$this->_id=$id;
 	}
 
@@ -74,7 +74,7 @@ 
 		if(($provider=$this->getProvider())!==null)
 		{
 			Prado::using($provider);
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
 			$server=$this->createServer();
 			$server->setClass($providerClass, $this);
@@ -87,7 +87,7 @@ 
 		{
 			$server->handle();
 		}
-		catch (\Exception $e)
+		catch(\Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -106,7 +106,7 @@ 
 	 */
 	public function fault($title, $details='', $code='SERVER', $actor='', $name='')
 	{
-		Prado::trace('SOAP-Fault '.$code. ' '.$title.' : '.$details, 'Prado\Web\Services\TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'Prado\Web\Services\TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -117,14 +117,14 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class.'wsdl';
-		$message = file_get_contents("php://input");
-		$matches= array();
+		$namespace=$class.'wsdl';
+		$message=file_get_contents("php://input");
+		$matches=array();
 		if(preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
 			if(preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
-				$this->_requestedMethod = $method[1];
+				$this->_requestedMethod=$method[1];
 			}
 		}
 	}
@@ -147,8 +147,8 @@ 
 		if($this->_server===null)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
-				ini_set("soap.wsdl_cache_enabled",0);
-			$this->_server = new \SoapServer($this->getWsdlUri(),$this->getOptions());
+				ini_set("soap.wsdl_cache_enabled", 0);
+			$this->_server=new \SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
 	}
@@ -189,7 +189,7 @@ 
 		if($this->_wsdlUri==='')
 		{
 			$provider=$this->getProvider();
-			$providerClass=($pos=strrpos($provider,'.'))!==false?substr($provider,$pos+1):$provider;
+			$providerClass=($pos=strrpos($provider, '.'))!==false ? substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
 			if($this->getApplication()->getMode()===TApplicationMode::Performance && ($cache=$this->getApplication()->getCache())!==null)
 			{
@@ -197,7 +197,7 @@ 
 				if(is_string($wsdl))
 					return $wsdl;
 				$wsdl=WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass,$wsdl);
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -215,7 +215,7 @@ 
 	public function getWsdlUri()
 	{
 		if($this->_wsdlUri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl',false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -234,7 +234,7 @@ 
 	public function getUri()
 	{
 		if($this->_uri==='')
-			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(),false);
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -280,7 +280,7 @@ 
 		if($value==='1.1' || $value==='1.2' || $value==='')
 			$this->_version=$value;
 		else
-			throw new TInvalidDataValueException('soapserver_version_invalid',$value);
+			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
 	}
 
 	/**
@@ -344,6 +344,6 @@ 
 	 */
 	public function setClassMaps($classes)
 	{
-		$this->_classMap = $classes;
+		$this->_classMap=$classes;
 	}
 }
\ No newline at end of file

framework/Web/Services/TSoapService.php

Spacing +18 added lines, -18 removed lines

@@ -127,7 +127,7 @@ 
 				$this->loadConfig($dom);
 			}
 			else
-				throw new TConfigurationException('soapservice_configfile_invalid',$this->_configFile);
+				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 
@@ -144,16 +144,16 @@ 
 	protected function resolveRequest()
 	{
 		$serverID=$this->getRequest()->getServiceParameter();
-		if(($pos=strrpos($serverID,'.wsdl'))===strlen($serverID)-5)
+		if(($pos=strrpos($serverID, '.wsdl'))===strlen($serverID) - 5)
 		{
-			$serverID=substr($serverID,0,$pos);
+			$serverID=substr($serverID, 0, $pos);
 			$this->_wsdlRequest=true;
 		}
 		else
 			$this->_wsdlRequest=false;
 		$this->_serverID=$serverID;
 		if(!isset($this->_servers[$serverID]))
-			throw new THttpException(400,'soapservice_request_invalid',$serverID);
+			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 			{
 				foreach($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:array();
+					$properties=isset($server['properties']) ? $server['properties'] : array();
 					if(isset($this->_servers[$id]))
-						throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 					$this->_servers[$id]=$properties;
 				}
 			}
@@ -184,7 +184,7 @@ 
 				if(($id=$properties->remove('id'))===null)
 					throw new TConfigurationException('soapservice_serverid_required');
 				if(isset($this->_servers[$id]))
-					throw new TConfigurationException('soapservice_serverid_duplicated',$id);
+					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 				$this->_servers[$id]=$properties;
 			}
 		}
@@ -205,8 +205,8 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile=Prado::getPathOfNamespace($value,Prado::getApplication()->getConfigurationFileExt()))===null)
-			throw new TConfigurationException('soapservice_configfile_invalid',$value);
+		if(($this->_configFile=Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt()))===null)
+			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
 	/**
@@ -217,9 +217,9 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($serverID,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($serverID, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$serverID,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $serverID, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 
 	/**
@@ -255,13 +255,13 @@ 
 		if($serverClass===null)
 			$serverClass=self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className=($pos=strrpos($serverClass,'.'))!==false?substr($serverClass,$pos+1):$serverClass;
-		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className,self::DEFAULT_SOAP_SERVER))
-			throw new TConfigurationException('soapservice_server_invalid',$serverClass);
+		$className=($pos=strrpos($serverClass, '.'))!==false ? substr($serverClass, $pos + 1) : $serverClass;
+		if($className!==self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server=new $className;
 		$server->setID($this->_serverID);
 		foreach($properties as $name=>$value)
-			$server->setSubproperty($name,$value);
+			$server->setSubproperty($name, $value);
 		return $server;
 	}
 
@@ -273,21 +273,21 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running SOAP service",'Prado\Web\Services\TSoapService');
+		Prado::trace("Running SOAP service", 'Prado\Web\Services\TSoapService');
 		$server=$this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
 		if($this->getIsWsdlRequest())
 		{
 			// server WSDL file
-			Prado::trace("Generating WSDL",'Prado\Web\Services\TSoapService');
+			Prado::trace("Generating WSDL", 'Prado\Web\Services\TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
 		}
 		else
 		{
 			// provide SOAP service
-			Prado::trace("Handling SOAP request",'Prado\Web\Services\TSoapService');
+			Prado::trace("Handling SOAP request", 'Prado\Web\Services\TSoapService');
 			$server->run();
 		}
 	}

framework/Web/Services/TPageService.php

Spacing +38 added lines, -38 removed lines

@@ -104,7 +104,7 @@ 
 	/**
 	 * Prefix of Pages used for instantiating new pages
 	 */
-	const PAGE_NAMESPACE_PREFIX = 'Application\\Pages\\';
+	const PAGE_NAMESPACE_PREFIX='Application\\Pages\\';
 	/**
 	 * @var string root path of pages
 	 */
@@ -154,7 +154,7 @@ 
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'\Prado\Web\Services\TPageService');
+		Prado::trace("Initializing TPageService", '\Prado\Web\Services\TPageService');
 
 		$pageConfig=$this->loadPageConfig($config);
 
@@ -192,15 +192,15 @@ 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath=>$params)
 		{
-			list($configPagePath,$condition)=$params;
+			list($configPagePath, $condition)=$params;
 			if($condition!==true)
 				$condition=$this->evaluateExpression($condition);
 			if($condition)
 			{
-				if(($path=Prado::getPathOfNamespace($filePath,Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
+				if(($path=Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
+					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
 				$c=new TPageConfiguration($pagePath);
-				$c->loadFromFile($path,$configPagePath);
+				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
 		}
@@ -234,9 +234,9 @@ 
 			if($config!==null)
 			{
 				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
-					$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
 		}
@@ -247,7 +247,7 @@ 
 			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig,$timestamps)=$arr;
+				list($pageConfig, $timestamps)=$arr;
 				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName=>$timestamp)
@@ -255,14 +255,14 @@ 
 						if($fileName===0) // application config file
 						{
 							$appConfigFile=$application->getConfigurationFile();
-							$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0]>$timestamp || ($timestamp>0 && !$currentTimestamp[0]))
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
+							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
 								$configCached=false;
 						}
 						else
 						{
 							$currentTimestamp[$fileName]=@filemtime($fileName);
-							if($currentTimestamp[$fileName]>$timestamp || ($timestamp>0 && !$currentTimestamp[$fileName]))
+							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
 								$configCached=false;
 						}
 					}
@@ -271,9 +271,9 @@ 
 			else
 			{
 				$configCached=false;
-				$paths=explode('.',$pagePath);
+				$paths=explode('.', $pagePath);
 				$configPath=$this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
@@ -283,7 +283,7 @@ 
 					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile=$application->getConfigurationFile();
-				$currentTimestamp[0]=$appConfigFile===null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
@@ -291,12 +291,12 @@ 
 				if($config!==null)
 				{
 					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
-						$pageConfig->loadPageConfigurationFromXml($config,$application->getBasePath(),'');
+						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, array($pageConfig, $currentTimestamp));
 			}
 		}
 		return $pageConfig;
@@ -351,9 +351,9 @@ 
 	{
 		if($this->_pagePath===null)
 		{
-			$this->_pagePath=strtr($this->determineRequestedPagePath(),'/\\','..');
+			$this->_pagePath=strtr($this->determineRequestedPagePath(), '/\\', '..');
 			if(empty($this->_pagePath))
-				throw new THttpException(404,'pageservice_page_required');
+				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
 	}
@@ -406,7 +406,7 @@ 
 			{
 				$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
 				if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid',$basePath);
+					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
 		return $this->_basePath;
@@ -421,7 +421,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
 		else if(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid',$value);
+			throw new TConfigurationException('pageservice_basepath_invalid', $value);
 		$this->_basePath=realpath($path);
 	}
 
@@ -470,9 +470,9 @@ 
 	 */
 	public function run()
 	{
-		Prado::trace("Running page service",'Prado\Web\Services\TPageService');
+		Prado::trace("Running page service", 'Prado\Web\Services\TPageService');
 		$this->_page=$this->createPage($this->getRequestedPagePath());
-		$this->runPage($this->_page,$this->_properties);
+		$this->runPage($this->_page, $this->_properties);
 	}
 
 	/**
@@ -484,34 +484,34 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath,'.',DIRECTORY_SEPARATOR);
+		$path=$this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath, '.', DIRECTORY_SEPARATOR);
 		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
 		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
 
 		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		if($hasClassFile)
 		{
 			$className=basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX .str_replace('.', '\\', $pagePath);
+			$namespacedClassName=static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
-            if(!class_exists($className,false) && !class_exists($namespacedClassName, false))
+            if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
                 include_once($path.Prado::CLASS_FILE_EXT);
 
-			if(!class_exists($className,false))
-				$className = $namespacedClassName;
+			if(!class_exists($className, false))
+				$className=$namespacedClassName;
 		}
 		else
 		{
 			$className=$this->getBasePageClass();
 			Prado::using($className);
-			if(($pos=strrpos($className,'.'))!==false)
-				$className=substr($className,$pos+1);
+			if(($pos=strrpos($className, '.'))!==false)
+				$className=substr($className, $pos + 1);
 		}
 
- 		if(!class_exists($className,false) || ($className!=='TPage' && !is_subclass_of($className,'TPage')))
-			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
+ 		if(!class_exists($className, false) || ($className!=='TPage' && !is_subclass_of($className, 'TPage')))
+			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
@@ -527,10 +527,10 @@ 
 	 * @param TPage the page instance to be run
 	 * @param array list of initial page properties
 	 */
-	protected function runPage($page,$properties)
+	protected function runPage($page, $properties)
 	{
 		foreach($properties as $name=>$value)
-			$page->setSubProperty($name,$value);
+			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 
@@ -542,8 +542,8 @@ 
 	 * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
 	 * @return string URL for the page and GET parameters
 	 */
-	public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
+	public function constructUrl($pagePath, $getParams=null, $encodeAmpersand=true, $encodeGetItems=true)
 	{
-		return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);
+		return $this->getRequest()->constructUrl($this->getID(), $pagePath, $getParams, $encodeAmpersand, $encodeGetItems);
 	}
 }
\ No newline at end of file

framework/Web/THttpResponse.php

Spacing +49 added lines, -49 removed lines

@@ -65,13 +65,13 @@ 
  */
 class THttpResponse extends \Prado\TModule implements \Prado\IO\ITextWriter
 {
-	const DEFAULT_CONTENTTYPE	= 'text/html';
-	const DEFAULT_CHARSET		= 'UTF-8';
+	const DEFAULT_CONTENTTYPE='text/html';
+	const DEFAULT_CHARSET='UTF-8';
 
 	/**
 	 * @var The differents defined status code by RFC 2616 {@link http://www.faqs.org/rfcs/rfc2616}
 	 */
-	private static $HTTP_STATUS_CODES = array(
+	private static $HTTP_STATUS_CODES=array(
 		100 => 'Continue', 101 => 'Switching Protocols',
 		200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content',
 		300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
@@ -202,7 +202,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value,array('none','nocache','private','private_no_expire','public')));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, array('none', 'nocache', 'private', 'private_no_expire', 'public')));
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
+		if($this->_contentTypeHeaderSent)
 			throw new \Exception('Unable to alter content-type as it has been already sent');
-		$this->_contentType = $type;
+		$this->_contentType=$type;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -277,12 +277,12 @@ 
 	 */
 	public function setStatusCode($status, $reason=null)
 	{
-		if ($this->_httpHeaderSent)
+		if($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
 		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason=self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else {
 			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -320,7 +320,7 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
+		if(!$this->_bufferOutput and !$this->_httpHeaderSent)
 			$this->ensureHeadersSent();
 		echo $str;
 	}
@@ -337,7 +337,7 @@ 
 	 * @param integer size of file or content in bytes if already known. Defaults to 'null' means auto-detect.
 	 * @throws TInvalidDataValueException if the file cannot be found
 	 */
-	public function writeFile($fileName,$content=null,$mimeType=null,$headers=null,$forceDownload=true,$clientFileName=null,$fileSize=null)
+	public function writeFile($fileName, $content=null, $mimeType=null, $headers=null, $forceDownload=true, $clientFileName=null, $fileSize=null)
 	{
 		static $defaultMimeTypes=array(
 			'css'=>'text/css',
@@ -357,9 +357,9 @@ 
 			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
 				$mimeType=mime_content_type($fileName);
-			else if(($ext=strrchr($fileName,'.'))!==false)
+			else if(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext=substr($ext,1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
 					$mimeType=$defaultMimeTypes[$ext];
 			}
@@ -371,7 +371,7 @@ 
 			$clientFileName=basename($clientFileName);
 
 		if($fileSize===null || $fileSize < 0)
-			$fileSize = ($content===null?filesize($fileName):strlen($content));
+			$fileSize=($content===null ? filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -385,11 +385,11 @@ 
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
 			header("Content-Type: $mimeType");
-			$this->_contentTypeHeaderSent = true;
+			$this->_contentTypeHeaderSent=true;
 		}
 
 		header('Content-Length: '.$fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
 		if($content===null)
 			readfile($fileName);
@@ -429,11 +429,11 @@ 
 
 		if($url[0]==='/')
 			$url=$this->getRequest()->getBaseUrl().$url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		if($this->_status >= 300 && $this->_status < 400)
 			// The status code has been modified to a valid redirection status, send it
-			header('Location: '.str_replace('&amp;','&',$url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		else
-			header('Location: '.str_replace('&amp;','&',$url));
+			header('Location: '.str_replace('&amp;', '&', $url));
 
 		if(!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
@@ -454,7 +454,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -476,18 +476,18 @@ 
 	 * This method is used internally. Please use {@link flush} instead.
 	 * @param boolean whether to continue buffering after flush if buffering was active
 	 */
-	public function flushContent($continueBuffering = true)
+	public function flushContent($continueBuffering=true)
 	{
-		Prado::trace("Flushing output",'Prado\Web\THttpResponse');
+		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
 		if($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
-			if (ob_get_length()>0)
+			if(ob_get_length() > 0)
 			{
-				if (!$continueBuffering)
+				if(!$continueBuffering)
 				{
-					$this->_bufferOutput = false;
+					$this->_bufferOutput=false;
 					ob_end_flush();
 				}
 				else
@@ -504,7 +504,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -514,15 +514,15 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol=$this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if($this->getRequest()->getHttpProtocolVersion()===null)
 			$protocol='HTTP/1.1';
 
-		$phpSapiName = substr(php_sapi_name(), 0, 3);
-		$cgi = $phpSapiName == 'cgi' || $phpSapiName == 'fpm';
+		$phpSapiName=substr(php_sapi_name(), 0, 3);
+		$cgi=$phpSapiName=='cgi' || $phpSapiName=='fpm';
 
 		header(($cgi ? 'Status:' : $protocol).' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -539,9 +539,9 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType=$this->_contentType===null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType=$this->_contentType===null ? self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset=$this->getCharset();
-		if($charset === false) {
+		if($charset===false) {
 			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
@@ -549,10 +549,10 @@ 
 		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
 			$charset=$globalization->getCharset();
 
-		if($charset==='') $charset = self::DEFAULT_CHARSET;
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
 		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -563,8 +563,8 @@ 
 	 */
 	public function getContents()
 	{
-		Prado::trace("Retrieving output",'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
+		return $this->_bufferOutput ? ob_get_contents() : '';
 	}
 
 	/**
@@ -574,7 +574,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_clean();
-		Prado::trace("Clearing output",'Prado\Web\THttpResponse');
+		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
 
 	/**
@@ -583,19 +583,19 @@ 
 	 */
 	public function getHeaders($case=null)
 	{
-		$result = array();
-		$headers = headers_list();
+		$result=array();
+		$headers=headers_list();
 		foreach($headers as $header) {
-			$tmp = explode(':', $header);
-			$key = trim(array_shift($tmp));
-			$value = trim(implode(':', $tmp));
+			$tmp=explode(':', $header);
+			$key=trim(array_shift($tmp));
+			$value=trim(implode(':', $tmp));
 			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+				$result[$key].=', '.$value;
 			else
-				$result[$key] = $value;
+				$result[$key]=$value;
 		}
 
-		if($case !== null)
+		if($case!==null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -608,7 +608,7 @@ 
 	 */
 	public function appendHeader($value, $replace=true)
 	{
-		Prado::trace("Sending header '$value'",'Prado\Web\THttpResponse');
+		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
 		header($value, $replace);
 	}
 
@@ -621,9 +621,9 @@ 
 	 * @param string The extra headers. It's used when the message parameter is set to 1. This message type uses the same internal function as mail() does.
 	 * @see http://us2.php.net/manual/en/function.error-log.php
 	 */
-	public function appendLog($message,$messageType=0,$destination='',$extraHeaders='')
+	public function appendLog($message, $messageType=0, $destination='', $extraHeaders='')
 	{
-		error_log($message,$messageType,$destination,$extraHeaders);
+		error_log($message, $messageType, $destination, $extraHeaders);
 	}
 
 	/**

framework/Web/UI/TTemplateControl.php

Spacing +44 added lines, -44 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template ".get_class($this),'\Prado\Web\UI\TTemplateControl');
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
 		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
@@ -134,9 +134,9 @@ 
 			foreach($tpl->getDirective() as $name=>$value)
 			{
 				if(is_string($value))
-					$this->setSubProperty($name,$value);
+					$this->setSubProperty($name, $value);
 				else
-					throw new TConfigurationException('templatecontrol_directive_invalid',get_class($this),$name);
+					throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			$tpl->instantiateIn($this);
 		}
@@ -147,10 +147,10 @@ 
 	 * @param string ID of the content
 	 * @param TContent
 	 */
-	public function registerContent($id,TContent $object)
+	public function registerContent($id, TContent $object)
 	{
 		if(isset($this->_contents[$id]))
-			throw new TConfigurationException('templatecontrol_contentid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
 			$this->_contents[$id]=$object;
 	}
@@ -161,10 +161,10 @@ 
 	 * @param string placeholder ID
 	 * @param TContentPlaceHolder placeholder control
 	 */
-	public function registerContentPlaceHolder($id,TContentPlaceHolder $object)
+	public function registerContentPlaceHolder($id, TContentPlaceHolder $object)
 	{
 		if(isset($this->_placeholders[$id]))
-			throw new TConfigurationException('templatecontrol_placeholderid_duplicated',$id);
+			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
 			$this->_placeholders[$id]=$object;
 	}
@@ -199,17 +199,17 @@ 
 	 * @param string ID of the content control
 	 * @param TContent the content to be injected
 	 */
-	public function injectContent($id,$content)
+	public function injectContent($id, $content)
 	{
 		if(isset($this->_placeholders[$id]))
 		{
 			$placeholder=$this->_placeholders[$id];
 			$controls=$placeholder->getParent()->getControls();
 			$loc=$controls->remove($placeholder);
-			$controls->insertAt($loc,$content);
+			$controls->insertAt($loc, $content);
 		}
 		else
-			throw new TConfigurationException('templatecontrol_placeholder_inexistent',$id);
+			throw new TConfigurationException('templatecontrol_placeholder_inexistent', $id);
 	}
 
 	/**
@@ -233,10 +233,10 @@ 
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
 			foreach($this->_contents as $id=>$content)
-				$master->injectContent($id,$content);
+				$master->injectContent($id, $content);
 		}
 		else if(!empty($this->_contents))
-			throw new TConfigurationException('templatecontrol_mastercontrol_required',get_class($this));
+			throw new TConfigurationException('templatecontrol_mastercontrol_required', get_class($this));
 		parent::initRecursive($namingContainer);
 	}
         
@@ -247,38 +247,38 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateView($arObj, $throwExceptions = false)
+        public function tryToUpdateView($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key != "RELATIONS")
+                                if($key!="RELATIONS")
                                 {
-                                        $control = $this->{$key};
-                                        if ($control instanceof TTextBox)
-                                                $control->Text = $arObj->{$key};
-                                        elseif ($control instanceof TCheckBox)
-                                                $control->Checked = (boolean) $arObj->{$key};
-                                        elseif ($control instanceof TDatePicker)
-                                                $control->Date = $arObj->{$key};
+                                        $control=$this->{$key};
+                                        if($control instanceof TTextBox)
+                                                $control->Text=$arObj->{$key};
+                                        elseif($control instanceof TCheckBox)
+                                                $control->Checked=(boolean) $arObj->{$key};
+                                        elseif($control instanceof TDatePicker)
+                                                $control->Date=$arObj->{$key};
                                 }
                                 else
                                 {
-                                        foreach ($objAttrs["RELATIONS"] as $relKey => $relValues)
+                                        foreach($objAttrs["RELATIONS"] as $relKey => $relValues)
                                         {
-                                                $relControl = $this->{$relKey};
-                                                switch ($relValues[0])
+                                                $relControl=$this->{$relKey};
+                                                switch($relValues[0])
                                                 {
                                                         case TActiveRecord::BELONGS_TO:
                                                         case TActiveRecord::HAS_ONE:
-                                                                $relControl->Text = $arObj->{$relKey};
+                                                                $relControl->Text=$arObj->{$relKey};
                                                                 break;
                                                         case TActiveRecord::HAS_MANY:
-                                                                if ($relControl instanceof TListControl)
+                                                                if($relControl instanceof TListControl)
                                                                 {
-                                                                        $relControl->DataSource = $arObj->{$relKey};
+                                                                        $relControl->DataSource=$arObj->{$relKey};
                                                                         $relControl->dataBind();
                                                                 }
                                                                 break;
@@ -287,9 +287,9 @@ 
                                         break;
                                 }
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }
@@ -301,26 +301,26 @@ 
          * @param Boolean $throwExceptions Wheter or not to throw exceptions
          * @author Daniel Sampedro <darthdaniel85@gmail.com>
          */
-        public function tryToUpdateAR($arObj, $throwExceptions = false)
+        public function tryToUpdateAR($arObj, $throwExceptions=false)
         {
-                $objAttrs = get_class_vars(get_class($arObj));
-                foreach (array_keys($objAttrs) as $key)
+                $objAttrs=get_class_vars(get_class($arObj));
+                foreach(array_keys($objAttrs) as $key)
                 {
                         try
                         {
-                                if ($key == "RELATIONS")
+                                if($key=="RELATIONS")
                                         break;
-                                $control = $this->{$key};
-                                if ($control instanceof TTextBox)
-                                        $arObj->{$key} = $control->Text;
-                                elseif ($control instanceof TCheckBox)
-                                        $arObj->{$key} = $control->Checked;
-                                elseif ($control instanceof TDatePicker)
-                                        $arObj->{$key} = $control->Date;
+                                $control=$this->{$key};
+                                if($control instanceof TTextBox)
+                                        $arObj->{$key}=$control->Text;
+                                elseif($control instanceof TCheckBox)
+                                        $arObj->{$key}=$control->Checked;
+                                elseif($control instanceof TDatePicker)
+                                        $arObj->{$key}=$control->Date;
                         } 
-                        catch (Exception $ex)
+                        catch(Exception $ex)
                         {
-                                if ($throwExceptions)
+                                if($throwExceptions)
                                         throw $ex;
                         }
                 }

framework/Web/UI/JuiControls/TJuiDialog.php

Spacing +8 added lines, -8 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -103,14 +103,14 @@ 
 	 */
 	protected function getPostBackOptions()
 	{
-		$options = $this->getOptions()->toArray();
+		$options=$this->getOptions()->toArray();
 		// always make the dialog a child of the form, or its inner inputs won't be collected
 		if(!isset($options['appendTo']))
-			$options['appendTo'] = 'form:first';
+			$options['appendTo']='form:first';
 
 		foreach($this->getControls() as $control)
 			if($control instanceof TJuiDialogButton)
-				$options['buttons'][] = $control->getPostBackOptions();
+				$options['buttons'][]=$control->getPostBackOptions();
 
 		return $options;
 	}
@@ -123,7 +123,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 
-		$writer->addAttribute('id',$this->getClientID());
+		$writer->addAttribute('id', $this->getClientID());
 		$options=TJavascript::encode($this->getPostBackOptions());
 		$cs=$this->getPage()->getClientScript();
 		$code="jQuery('#".$this->getWidgetID()."').".$this->getWidget()."(".$options.");";
@@ -144,7 +144,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}
@@ -167,8 +167,8 @@ 
 
 	private function triggerClientMethod($method)
 	{
-		$cs = $this->getPage()->getClientScript();
-		$code = "jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
+		$cs=$this->getPage()->getClientScript();
+		$code="jQuery(document).ready(function() { jQuery('#".$this->getClientId()."').dialog('".$method."'); })";
 		$cs->registerEndScript(sprintf('%08X', crc32($code)), $code);
 	}
 

framework/Web/UI/JuiControls/TJuiDialogButton.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 		return array(
 			'text' => $this->getText(),
 			'click' => new TJavaScriptLiteral("function(){new Prado.Callback('".$this->getUniqueID()."', 'onClick');}"
-			)) ;
+			));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	public function getText()
 	{
-		return $this->getViewState('Text','');
+		return $this->getViewState('Text', '');
 	}
 
 	/**
@@ -82,14 +82,14 @@ 
 	 */
 	public function setText($value)
 	{
-		$this->setViewState('Text',$value,'');
+		$this->setViewState('Text', $value, '');
 	}
 
 	/**
 	 * Raises the OnClick event
 	 * @param object $params event parameters
 	 */
-	public function onClick ($params)
+	public function onClick($params)
 	{
 		$this->raiseEvent('OnClick', $this, $params);
 	}
@@ -101,7 +101,7 @@ 
 	 */
 	public function raiseCallbackEvent($param)
 	{
-		if($param->CallbackParameter === 'onClick')
+		if($param->CallbackParameter==='onClick')
 			$this->onClick($param);
 	}