pradosoft / prado

framework/Collections/TPagedList.php

Spacing +31 added lines, -31 removed lines

@@ -63,26 +63,26 @@ 
 	/**
 	 * @var boolean whether to allow custom paging
 	 */
-	private $_customPaging = false;
+	private $_customPaging=false;
 	/**
 	 * @var integer number of items in each page
 	 */
-	private $_pageSize = 10;
+	private $_pageSize=10;
 	/**
 	 * @var integer current page index
 	 */
-	private $_currentPageIndex = -1;
+	private $_currentPageIndex=-1;
 	/**
 	 * @var integer user-assigned number of items in data source
 	 */
-	private $_virtualCount = -1;
+	private $_virtualCount=-1;
 
 	/**
 	 * Constructor.
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @param boolean whether the list is read-only. Always true for paged list.
 	 */
-	public function __construct($data = null, $readOnly = false)
+	public function __construct($data=null, $readOnly=false)
 	{
 		parent::__construct($data, true);
 	}
@@ -100,7 +100,7 @@ 
 	 */
 	public function setCustomPaging($value)
 	{
-		$this->_customPaging = TPropertyValue::ensureBoolean($value);
+		$this->_customPaging=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 */
 	public function setPageSize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_pageSize = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) > 0)
+			$this->_pageSize=$value;
 		else
 			throw new TInvalidDataValueException('pagedlist_pagesize_invalid');
 	}
@@ -136,7 +136,7 @@ 
 	 */
 	public function setCurrentPageIndex($value)
 	{
-		if($this->gotoPage($value = TPropertyValue::ensureInteger($value)) === false)
+		if($this->gotoPage($value=TPropertyValue::ensureInteger($value))===false)
 			throw new TInvalidDataValueException('pagedlist_currentpageindex_invalid');
 	}
 
@@ -169,21 +169,21 @@ 
 	 */
 	public function gotoPage($pageIndex)
 	{
-		if($pageIndex === $this->_currentPageIndex)
+		if($pageIndex===$this->_currentPageIndex)
 			return $pageIndex;
 		if($this->_customPaging)
 		{
 			if($pageIndex >= 0 && ($this->_virtualCount < 0 || $pageIndex < $this->getPageCount()))
 			{
-				$param = new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
+				$param=new TPagedListFetchDataEventParameter($pageIndex, $this->_pageSize * $pageIndex, $this->_pageSize);
 				$this->onFetchData($param);
-				if(($data = $param->getData()) !== null)
+				if(($data=$param->getData())!==null)
 				{
 					$this->setReadOnly(false);
 					$this->copyFrom($data);
 					$this->setReadOnly(true);
-					$oldPage = $this->_currentPageIndex;
-					$this->_currentPageIndex = $pageIndex;
+					$oldPage=$this->_currentPageIndex;
+					$this->_currentPageIndex=$pageIndex;
 					$this->onPageIndexChanged(new TPagedListPageChangedEventParameter($oldPage));
 					return $pageIndex;
 				}
@@ -197,7 +197,7 @@ 
 		{
 			if($pageIndex >= 0 && $pageIndex < $this->getPageCount())
 			{
-				$this->_currentPageIndex = $pageIndex;
+				$this->_currentPageIndex=$pageIndex;
 				$this->onPageIndexChanged(null);
 				return $pageIndex;
 			}
@@ -237,9 +237,9 @@ 
 	 */
 	public function setVirtualCount($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) < 0)
-			$value = -1;
-		$this->_virtualCount = $value;
+		if(($value=TPropertyValue::ensureInteger($value)) < 0)
+			$value=-1;
+		$this->_virtualCount=$value;
 	}
 
 	/**
@@ -250,12 +250,12 @@ 
 		if($this->_customPaging)
 		{
 			if($this->_virtualCount >= 0)
-				return (int)(($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
+				return (int) (($this->_virtualCount + $this->_pageSize - 1) / $this->_pageSize);
 			else
 				return -1;
 		}
 		else
-			return (int)((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
+			return (int) ((parent::getCount() + $this->_pageSize - 1) / $this->_pageSize);
 	}
 
 	/**
@@ -263,7 +263,7 @@ 
 	 */
 	public function getIsFirstPage()
 	{
-		return $this->_currentPageIndex === 0;
+		return $this->_currentPageIndex===0;
 	}
 
 	/**
@@ -271,7 +271,7 @@ 
 	 */
 	public function getIsLastPage()
 	{
-		return $this->_currentPageIndex === $this->getPageCount() - 1;
+		return $this->_currentPageIndex===$this->getPageCount() - 1;
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 			return parent::getCount();
 		else
 		{
-			if($this->_currentPageIndex === $this->getPageCount() - 1)
+			if($this->_currentPageIndex===$this->getPageCount() - 1)
 				return parent::getCount() - $this->_pageSize * $this->_currentPageIndex;
 			else
 				return $this->_pageSize;
@@ -299,7 +299,7 @@ 
 			return parent::getIterator();
 		else
 		{
-			$data = $this->toArray();
+			$data=$this->toArray();
 			return new \ArrayIterator($data);
 		}
 	}
@@ -325,9 +325,9 @@ 
 	 */
 	public function indexOf($item)
 	{
-		$c = $this->getCount();
-		for($i = 0;$i < $c;++$i)
-			if($this->itemAt($i) === $item)
+		$c=$this->getCount();
+		for($i=0; $i < $c; ++$i)
+			if($this->itemAt($i)===$item)
 				return $i;
 		return -1;
 	}
@@ -360,10 +360,10 @@ 
 	 */
 	public function toArray()
 	{
-		$c = $this->getCount();
-		$array = [];
-		for($i = 0;$i < $c;++$i)
-			$array[$i] = $this->itemAt($i);
+		$c=$this->getCount();
+		$array=[];
+		for($i=0; $i < $c; ++$i)
+			$array[$i]=$this->itemAt($i);
 		return $array;
 	}
 }
\ No newline at end of file

framework/Collections/TAttributeCollection.php

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
  */
 class TAttributeCollection extends TMap
 {
-	private $_caseSensitive = false;
+	private $_caseSensitive=false;
 
 	/**
 	 * Returns an array with the names of all variables of this object that should NOT be serialized
@@ -52,8 +52,8 @@ 
 	protected function _getZappableSleepProps(&$exprops)
 	{
 		parent::_getZappableSleepProps($exprops);
-		if ($this->_caseSensitive === false)
-			$exprops[] = "\0Prado\Collections\TAttributeCollection\0_caseSensitive";
+		if($this->_caseSensitive===false)
+			$exprops[]="\0Prado\Collections\TAttributeCollection\0_caseSensitive";
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function __get($name)
 	{
-		return $this->contains($name)?$this->itemAt($name):parent::__get($name);
+		return $this->contains($name) ? $this->itemAt($name) : parent::__get($name);
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function setCaseSensitive($value)
 	{
-		$this->_caseSensitive = TPropertyValue::ensureBoolean($value);
+		$this->_caseSensitive=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 */
 	public function itemAt($key)
 	{
-		return parent::itemAt($this->_caseSensitive?$key:strtolower($key));
+		return parent::itemAt($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function add($key, $value)
 	{
-		parent::add($this->_caseSensitive?$key:strtolower($key), $value);
+		parent::add($this->_caseSensitive ? $key : strtolower($key), $value);
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function remove($key)
 	{
-		return parent::remove($this->_caseSensitive?$key:strtolower($key));
+		return parent::remove($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 */
 	public function contains($key)
 	{
-		return parent::contains($this->_caseSensitive?$key:strtolower($key));
+		return parent::contains($this->_caseSensitive ? $key : strtolower($key));
 	}
 
 	/**

framework/Collections/TQueue.php

Spacing +12 added lines, -12 removed lines

@@ -41,12 +41,12 @@ 
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c = 0;
+	private $_c=0;
 
 	/**
 	 * Constructor.
@@ -54,9 +54,9 @@ 
 	 * @param array|Iterator the intial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data = null)
+	public function __construct($data=null)
 	{
-		if($data !== null)
+		if($data!==null)
 			$this->copyFrom($data);
 	}
 
@@ -81,11 +81,11 @@ 
 			$this->clear();
 			foreach($data as $item)
 			{
-				$this->_d[] = $item;
+				$this->_d[]=$item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 
@@ -94,8 +94,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c = 0;
-		$this->_d = [];
+		$this->_c=0;
+		$this->_d=[];
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item, $this->_d, true) !== false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -115,7 +115,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 			return $this->_d[0];
@@ -128,7 +128,7 @@ 
 	 */
 	public function dequeue()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('queue_empty');
 		else
 		{
@@ -144,7 +144,7 @@ 
 	public function enqueue($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

framework/TPropertyValue.php

Spacing +21 added lines, -21 removed lines

@@ -62,10 +62,10 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value, 'true') == 0 || $value != 0;
+		if(is_string($value))
+			return strcasecmp($value, 'true')==0 || $value!=0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -77,12 +77,12 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
+		if(TJavaScript::isJsLiteral($value))
 			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
+		if(is_bool($value))
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -118,18 +118,18 @@ 
 	{
 		if(is_string($value))
 		{
-			$value = trim($value);
-			$len = strlen($value);
-			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
+			$value=trim($value);
+			$len=strlen($value);
+			if($len >= 2 && $value[0]=='(' && $value[$len - 1]==')')
 			{
-				eval('$array=array' . $value . ';');
+				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len > 0?[$value]:[];
+				return $len > 0 ? [$value] : [];
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 */
 	public static function ensureEnum($value, $enums)
 	{
-		static $types = [];
-		if(func_num_args() === 2 && is_string($enums))
+		static $types=[];
+		if(func_num_args()===2 && is_string($enums))
 		{
 			if(!isset($types[$enums]))
-				$types[$enums] = new \ReflectionClass($enums);
+				$types[$enums]=new \ReflectionClass($enums);
 			if($types[$enums]->hasConstant($value))
 				return $value;
 			else
@@ -174,7 +174,7 @@ 
 		}
 		elseif(!is_array($enums))
 		{
-			$enums = func_get_args();
+			$enums=func_get_args();
 			array_shift($enums);
 		}
 		if(in_array($value, $enums, true))
@@ -190,6 +190,6 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ?null:$value;
 	}
 }
\ No newline at end of file

framework/TApplicationStatePersister.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Name of the value stored in cache
 	 */
-	const CACHE_NAME = 'prado:appstate';
+	const CACHE_NAME='prado:appstate';
 
 	/**
 	 * Initializes module.
@@ -43,7 +43,7 @@ 
 	 */
 	protected function getStateFilePath()
 	{
-		return $this->getApplication()->getRuntimePath() . '/global.cache';
+		return $this->getApplication()->getRuntimePath().'/global.cache';
 	}
 
 	/**
@@ -52,11 +52,11 @@ 
 	 */
 	public function load()
 	{
-		if(($cache = $this->getApplication()->getCache()) !== null && ($value = $cache->get(self::CACHE_NAME)) !== false)
+		if(($cache=$this->getApplication()->getCache())!==null && ($value=$cache->get(self::CACHE_NAME))!==false)
 			return unserialize($value);
 		else
 		{
-			if(($content = @file_get_contents($this->getStateFilePath())) !== false)
+			if(($content=@file_get_contents($this->getStateFilePath()))!==false)
 				return unserialize($content);
 			else
 				return null;
@@ -69,18 +69,18 @@ 
 	 */
 	public function save($state)
 	{
-		$content = serialize($state);
-		$saveFile = true;
-		if(($cache = $this->getApplication()->getCache()) !== null)
+		$content=serialize($state);
+		$saveFile=true;
+		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			if($cache->get(self::CACHE_NAME) === $content)
-				$saveFile = false;
+			if($cache->get(self::CACHE_NAME)===$content)
+				$saveFile=false;
 			else
 				$cache->set(self::CACHE_NAME, $content);
 		}
 		if($saveFile)
 		{
-			$fileName = $this->getStateFilePath();
+			$fileName=$this->getStateFilePath();
 			file_put_contents($fileName, $content, LOCK_EX);
 		}
 	}

framework/TModule.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 }
 

framework/Web/THttpResponse.php

Spacing +94 added lines, -94 removed lines

@@ -66,13 +66,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 = [
+	private static $HTTP_STATUS_CODES=[
 		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',
@@ -83,11 +83,11 @@ 
 	/**
 	 * @var boolean whether to buffer output
 	 */
-	private $_bufferOutput = true;
+	private $_bufferOutput=true;
 	/**
 	 * @var boolean if the application is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var THttpCookieCollection list of cookies to return
 	 */
@@ -95,15 +95,15 @@ 
 	/**
 	 * @var integer response status code
 	 */
-	private $_status = 200;
+	private $_status=200;
 	/**
 	 * @var string reason correspond to status code
 	 */
-	private $_reason = 'OK';
+	private $_reason='OK';
 	/**
 	 * @var string HTML writer type
 	 */
-	private $_htmlWriterType = '\Prado\Web\UI\THtmlWriter';
+	private $_htmlWriterType='\Prado\Web\UI\THtmlWriter';
 	/**
 	 * @var string content type
 	 */
@@ -111,7 +111,7 @@ 
 	/**
 	 * @var string|boolean character set, e.g. UTF-8 or false if no character set should be send to client
 	 */
-	private $_charset = '';
+	private $_charset='';
 	/**
 	 * @var THttpResponseAdapter adapter.
 	 */
@@ -140,7 +140,7 @@ 
 	 */
 	public function setAdapter(THttpResponseAdapter $adapter)
 	{
-		$this->_adapter = $adapter;
+		$this->_adapter=$adapter;
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function getHasAdapter()
 	{
-		return $this->_adapter !== null;
+		return $this->_adapter!==null;
 	}
 
 	/**
@@ -169,7 +169,7 @@ 
 	{
 		if($this->_bufferOutput)
 			ob_start();
-		$this->_initialized = true;
+		$this->_initialized=true;
 		$this->getApplication()->setResponse($this);
 	}
 
@@ -203,7 +203,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none','nocache','private','private_no_expire','public']));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none', 'nocache', 'private', 'private_no_expire', 'public']));
 	}
 
 	/**
@@ -211,9 +211,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;
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset=(strToLower($charset)==='false') ? false : (string) $charset;
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
-			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+			$this->_bufferOutput=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -276,24 +276,24 @@ 
 	 * @param integer HTTP status code
 	 * @param string HTTP status reason, defaults to standard HTTP reasons
 	 */
-	public function setStatusCode($status, $reason = null)
+	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);
+		$status=TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
-			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason === null || $reason === '') {
+			$this->_reason=self::$HTTP_STATUS_CODES[$status];
+		} else {
+			if($reason===null || $reason==='') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
-			$reason = TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
+			$reason=TPropertyValue::ensureString($reason);
+			if(strpos($reason, "\r")!=false || strpos($reason, "\n")!=false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
-			$this->_reason = $reason;
+			$this->_reason=$reason;
 		}
-		$this->_status = $status;
+		$this->_status=$status;
 	}
 
 	/**
@@ -308,8 +308,8 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
-			$this->_cookies = new THttpCookieCollection($this);
+		if($this->_cookies===null)
+			$this->_cookies=new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
 
@@ -321,7 +321,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;
 	}
@@ -338,9 +338,9 @@ 
 	 * @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 = [
+		static $defaultMimeTypes=[
 			'css' => 'text/css',
 			'gif' => 'image/gif',
 			'png' => 'image/png',
@@ -353,26 +353,26 @@ 
 			'xls' => 'application/vnd.ms-excel',
 		];
 
-		if($mimeType === null)
+		if($mimeType===null)
 		{
-			$mimeType = 'text/plain';
+			$mimeType='text/plain';
 			if(function_exists('mime_content_type'))
-				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+				$mimeType=mime_content_type($fileName);
+			elseif(($ext=strrchr($fileName, '.'))!==false)
 			{
-				$ext = substr($ext, 1);
+				$ext=substr($ext, 1);
 				if(isset($defaultMimeTypes[$ext]))
-					$mimeType = $defaultMimeTypes[$ext];
+					$mimeType=$defaultMimeTypes[$ext];
 			}
 		}
 
-		if($clientFileName === null)
-			$clientFileName = basename($fileName);
+		if($clientFileName===null)
+			$clientFileName=basename($fileName);
 		else
-			$clientFileName = basename($clientFileName);
+			$clientFileName=basename($clientFileName);
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if($fileSize===null || $fileSize < 0)
+			$fileSize=($content===null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
@@ -386,13 +386,13 @@ 
 			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-Length: '.$fileSize);
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
+		if($content===null)
 			readfile($fileName);
 		else
 			echo $content;
@@ -430,25 +430,25 @@ 
 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
-		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
-		if ($this->_status >= 300 && $this->_status < 400)
+		$isIIS=(stripos($this->getRequest()->getServerSoftware(), "microsoft-iis")!==false);
+		if($url[0]==='/')
+			$url=$this->getRequest()->getBaseUrl().$url;
+		if($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
 			if($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
 			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
-			header('Location: ' . str_replace('&amp;', '&', $url));
+				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
 		if(!$this->getApplication()->getRequestCompleted())
@@ -470,7 +470,7 @@ 
 	/**
 	 * Flush the response contents and headers.
 	 */
-	public function flush($continueBuffering = true)
+	public function flush($continueBuffering=true)
 	{
 		if($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
@@ -492,18 +492,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');
 		$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
@@ -520,7 +520,7 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
+		if(!$this->_httpHeaderSent)
 			$this->sendHttpHeader();
 	}
 
@@ -529,13 +529,13 @@ 
 	 */
 	protected function sendHttpHeader()
 	{
-		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol = 'HTTP/1.1';
+		$protocol=$this->getRequest()->getHttpProtocolVersion();
+		if($this->getRequest()->getHttpProtocolVersion()===null)
+			$protocol='HTTP/1.1';
 
-		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
-		$this->_httpHeaderSent = true;
+		$this->_httpHeaderSent=true;
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
+		if(!$this->_contentTypeHeaderSent)
 			$this->sendContentTypeHeader();
 	}
 
@@ -552,20 +552,20 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType = $this->_contentType === null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
-		$charset = $this->getCharset();
-		if($charset === false) {
-			$this->appendHeader('Content-Type: ' . $contentType);
+		$contentType=$this->_contentType===null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
+		$charset=$this->getCharset();
+		if($charset===false) {
+			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
-			$charset = $globalization->getCharset();
+		if($charset==='' && ($globalization=$this->getApplication()->getGlobalization(false))!==null)
+			$charset=$globalization->getCharset();
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
+		if($charset==='') $charset=self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
-		$this->_contentTypeHeaderSent = true;
+		$this->_contentTypeHeaderSent=true;
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	public function getContents()
 	{
 		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ?ob_get_contents() : '';
 	}
 
 	/**
@@ -594,21 +594,21 @@ 
 	 * @param integer|null Either {@link CASE_UPPER} or {@link CASE_LOWER} or as is null (default)
 	 * @return array
 	 */
-	public function getHeaders($case = null)
+	public function getHeaders($case=null)
 	{
-		$result = [];
-		$headers = headers_list();
+		$result=[];
+		$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;
@@ -619,7 +619,7 @@ 
 	 * @param string header
 	 * @param boolean whether the header should replace a previous similar header, or add a second header of the same type
 	 */
-	public function appendHeader($value, $replace = true)
+	public function appendHeader($value, $replace=true)
 	{
 		Prado::trace("Sending header '$value'", 'Prado\Web\THttpResponse');
 		header($value, $replace);
@@ -634,7 +634,7 @@ 
 	 * @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);
 	}
@@ -646,10 +646,10 @@ 
 	 */
 	public function addCookie($cookie)
 	{
-		$request = $this->getRequest();
+		$request=$this->getRequest();
 		if($request->getEnableCookieValidation())
 		{
-			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
+			$value=$this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
 				$cookie->getName(),
 				$value,
@@ -704,7 +704,7 @@ 
 	 */
 	public function setHtmlWriterType($value)
 	{
-		$this->_htmlWriterType = $value;
+		$this->_htmlWriterType=$value;
 	}
 
 	/**
@@ -712,10 +712,10 @@ 
 	 * If the type of the HTML writer is not supplied, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 * @param string type of the HTML writer to be created. If null, {@link getHtmlWriterType HtmlWriterType} will be assumed.
 	 */
-	public function createHtmlWriter($type = null)
+	public function createHtmlWriter($type=null)
 	{
-		if($type === null)
-			$type = $this->getHtmlWriterType();
+		if($type===null)
+			$type=$this->getHtmlWriterType();
 		if($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else

framework/Web/Services/TJsonResponse.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  */
 abstract class TJsonResponse extends \Prado\TApplicationComponent
 {
-	private $_id = '';
+	private $_id='';
 
 	/**
 	 * Initializes the feed.
@@ -49,7 +49,7 @@ 
 	 */
 	public function setID($value)
 	{
-		$this->_id = $value;
+		$this->_id=$value;
 	}
 
 	/**

framework/Web/Services/TPageService.php

Spacing +85 added lines, -85 removed lines

@@ -81,31 +81,31 @@ 
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_XML = 'config.xml';
+	const CONFIG_FILE_XML='config.xml';
 	/**
 	 * Configuration file name
 	 */
-	const CONFIG_FILE_PHP = 'config.php';
+	const CONFIG_FILE_PHP='config.php';
 	/**
 	 * Default base path
 	 */
-	const DEFAULT_BASEPATH = 'Pages';
+	const DEFAULT_BASEPATH='Pages';
 	/**
 	 * Fallback base path - used to be the default up to Prado < 3.2
 	 */
-	const FALLBACK_BASEPATH = 'pages';
+	const FALLBACK_BASEPATH='pages';
 	/**
 	 * Prefix of ID used for storing parsed configuration in cache
 	 */
-	const CONFIG_CACHE_PREFIX = 'prado:pageservice:';
+	const CONFIG_CACHE_PREFIX='prado:pageservice:';
 	/**
 	 * Page template file extension
 	 */
-	const PAGE_FILE_EXT = '.page';
+	const PAGE_FILE_EXT='.page';
 	/**
 	 * 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
 	 */
@@ -113,16 +113,16 @@ 
 	/**
 	 * @var string base path class in namespace format
 	 */
-	private $_basePageClass = '\Prado\Web\UI\TPage';
+	private $_basePageClass='\Prado\Web\UI\TPage';
 	/**
 	 * @var string clientscript manager class in namespace format
 	 * @since 3.1.7
 	 */
-	private $_clientScriptManagerClass = '\Prado\Web\UI\TClientScriptManager';
+	private $_clientScriptManagerClass='\Prado\Web\UI\TClientScriptManager';
 	/**
 	 * @var string default page
 	 */
-	private $_defaultPage = 'Home';
+	private $_defaultPage='Home';
 	/**
 	 * @var string requested page (path)
 	 */
@@ -134,11 +134,11 @@ 
 	/**
 	 * @var array list of initial page property values
 	 */
-	private $_properties = [];
+	private $_properties=[];
 	/**
 	 * @var boolean whether service is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var TThemeManager theme manager
 	 */
@@ -157,11 +157,11 @@ 
 	{
 		Prado::trace("Initializing TPageService", '\Prado\Web\Services\TPageService');
 
-		$pageConfig = $this->loadPageConfig($config);
+		$pageConfig=$this->loadPageConfig($config);
 
 		$this->initPageContext($pageConfig);
 
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 	 */
 	protected function initPageContext($pageConfig)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 
@@ -187,20 +187,20 @@ 
 	protected function applyConfiguration($config)
 	{
 		// initial page properties (to be set when page runs)
-		$this->_properties = array_merge($this->_properties, $config->getProperties());
+		$this->_properties=array_merge($this->_properties, $config->getProperties());
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
-		$pagePath = $this->getRequestedPagePath();
+		$pagePath=$this->getRequestedPagePath();
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $params)
 		{
-			list($configPagePath, $condition) = $params;
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			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))
+				if(($path=Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt()))===null || !is_file($path))
 					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
-				$c = new TPageConfiguration($pagePath);
+				$c=new TPageConfiguration($pagePath);
 				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
 			}
@@ -214,9 +214,9 @@ 
 	 */
 	protected function determineRequestedPagePath()
 	{
-		$pagePath = $this->getRequest()->getServiceParameter();
+		$pagePath=$this->getRequest()->getServiceParameter();
 		if(empty($pagePath))
-			$pagePath = $this->getDefaultPage();
+			$pagePath=$this->getDefaultPage();
 		return $pagePath;
 	}
 
@@ -227,14 +227,14 @@ 
 	 */
 	protected function loadPageConfig($config)
 	{
-		$application = $this->getApplication();
-		$pagePath = $this->getRequestedPagePath();
-		if(($cache = $application->getCache()) === null)
+		$application=$this->getApplication();
+		$pagePath=$this->getRequestedPagePath();
+		if(($cache=$application->getCache())===null)
 		{
-			$pageConfig = new TPageConfiguration($pagePath);
-			if($config !== null)
+			$pageConfig=new TPageConfiguration($pagePath);
+			if($config!==null)
 			{
-				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
 					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
@@ -243,61 +243,61 @@ 
 		}
 		else
 		{
-			$configCached = true;
-			$currentTimestamp = [];
-			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
+			$configCached=true;
+			$currentTimestamp=[];
+			$arr=$cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
 			if(is_array($arr))
 			{
-				list($pageConfig, $timestamps) = $arr;
-				if($application->getMode() !== TApplicationMode::Performance)
+				list($pageConfig, $timestamps)=$arr;
+				if($application->getMode()!==TApplicationMode::Performance)
 				{
 					foreach($timestamps as $fileName => $timestamp)
 					{
-						if($fileName === 0) // application config file
+						if($fileName===0) // application config file
 						{
-							$appConfigFile = $application->getConfigurationFile();
-							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+							$appConfigFile=$application->getConfigurationFile();
+							$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
-								$configCached = false;
+								$configCached=false;
 						}
 						else
 						{
-							$currentTimestamp[$fileName] = @filemtime($fileName);
+							$currentTimestamp[$fileName]=@filemtime($fileName);
 							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
-								$configCached = false;
+								$configCached=false;
 						}
 					}
 				}
 			}
 			else
 			{
-				$configCached = false;
-				$paths = explode('.', $pagePath);
-				$configPath = $this->getBasePath();
-				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
+				$configCached=false;
+				$paths=explode('.', $pagePath);
+				$configPath=$this->getBasePath();
+				$fileName=$this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
 				foreach($paths as $path)
 				{
-					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
-					$currentTimestamp[$configFile] = @filemtime($configFile);
-					$configPath .= DIRECTORY_SEPARATOR . $path;
+					$configFile=$configPath.DIRECTORY_SEPARATOR.$fileName;
+					$currentTimestamp[$configFile]=@filemtime($configFile);
+					$configPath.=DIRECTORY_SEPARATOR.$path;
 				}
-				$appConfigFile = $application->getConfigurationFile();
-				$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+				$appConfigFile=$application->getConfigurationFile();
+				$currentTimestamp[0]=$appConfigFile===null ? 0 : @filemtime($appConfigFile);
 			}
 			if(!$configCached)
 			{
-				$pageConfig = new TPageConfiguration($pagePath);
-				if($config !== null)
+				$pageConfig=new TPageConfiguration($pagePath);
+				if($config!==null)
 				{
-					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					if($application->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
 						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, [$pageConfig,$currentTimestamp]);
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, [$pageConfig, $currentTimestamp]);
 			}
 		}
 		return $pageConfig;
@@ -310,7 +310,7 @@ 
 	{
 		if(!$this->_templateManager)
 		{
-			$this->_templateManager = new TTemplateManager;
+			$this->_templateManager=new TTemplateManager;
 			$this->_templateManager->init(null);
 		}
 		return $this->_templateManager;
@@ -321,7 +321,7 @@ 
 	 */
 	public function setTemplateManager(TTemplateManager $value)
 	{
-		$this->_templateManager = $value;
+		$this->_templateManager=$value;
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 	{
 		if(!$this->_themeManager)
 		{
-			$this->_themeManager = new TThemeManager;
+			$this->_themeManager=new TThemeManager;
 			$this->_themeManager->init(null);
 		}
 		return $this->_themeManager;
@@ -342,7 +342,7 @@ 
 	 */
 	public function setThemeManager(TThemeManager $value)
 	{
-		$this->_themeManager = $value;
+		$this->_themeManager=$value;
 	}
 
 	/**
@@ -350,9 +350,9 @@ 
 	 */
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath === null)
+		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');
 		}
@@ -384,7 +384,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
-			$this->_defaultPage = $value;
+			$this->_defaultPage=$value;
 	}
 
 	/**
@@ -400,13 +400,13 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if($this->_basePath===null)
 		{
-			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+			$basePath=$this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if(($this->_basePath=realpath($basePath))===false || !is_dir($this->_basePath))
 			{
-				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
-				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+				$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);
 			}
 		}
@@ -421,9 +421,9 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+		elseif(($path=Prado::getPathOfNamespace($value))===null || !is_dir($path))
 			throw new TConfigurationException('pageservice_basepath_invalid', $value);
-		$this->_basePath = realpath($path);
+		$this->_basePath=realpath($path);
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 	 */
 	public function setBasePageClass($value)
 	{
-		$this->_basePageClass = $value;
+		$this->_basePageClass=$value;
 	}
 
 	/**
@@ -452,7 +452,7 @@ 
 	 */
 	public function setClientScriptManagerClass($value)
 	{
-		$this->_clientScriptManagerClass = $value;
+		$this->_clientScriptManagerClass=$value;
 	}
 
 	/**
@@ -472,7 +472,7 @@ 
 	public function run()
 	{
 		Prado::trace("Running page service", 'Prado\Web\Services\TPageService');
-		$this->_page = $this->createPage($this->getRequestedPagePath());
+		$this->_page=$this->createPage($this->getRequestedPagePath());
 		$this->runPage($this->_page, $this->_properties);
 	}
 
@@ -485,40 +485,40 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$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);
+		$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);
 
 		if($hasClassFile)
 		{
-			$className = basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX . str_replace('.', '\\', $pagePath);
+			$className=basename($path);
+			$namespacedClassName=static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
 			if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
-				include_once($path . Prado::CLASS_FILE_EXT);
+				include_once($path.Prado::CLASS_FILE_EXT);
 
 			if(!class_exists($className, false))
-				$className = $namespacedClassName;
+				$className=$namespacedClassName;
 		}
 		else
 		{
-			$className = $this->getBasePageClass();
+			$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($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
+		if($className!=='\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		$page = Prado::createComponent($className);
+		$page=Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
 		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
 
 		return $page;
 	}
@@ -543,7 +543,7 @@ 
 	 * @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);
 	}