pradosoft / prado

framework/Web/THttpCookie.php

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 	/**
 	 * @var string domain of the cookie
 	 */
-	private $_domain = '';
+	private $_domain='';
 	/**
 	 * @var string name of the cookie
 	 */
@@ -36,23 +36,23 @@ 
 	/**
 	 * @var string value of the cookie
 	 */
-	private $_value = '';
+	private $_value='';
 	/**
 	 * @var integer expire of the cookie
 	 */
-	private $_expire = 0;
+	private $_expire=0;
 	/**
 	 * @var string path of the cookie
 	 */
-	private $_path = '/';
+	private $_path='/';
 	/**
 	 * @var boolean whether cookie should be sent via secure connection
 	 */
-	private $_secure = false;
+	private $_secure=false;
 	/**
 	 * @var boolean if true the cookie value will be unavailable to JavaScript
 	 */
-	private $_httpOnly = false;
+	private $_httpOnly=false;
 
 	/**
 	 * Constructor.
@@ -61,8 +61,8 @@ 
 	 */
 	public function __construct($name, $value)
 	{
-		$this->_name = $name;
-		$this->_value = $value;
+		$this->_name=$name;
+		$this->_value=$value;
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setDomain($value)
 	{
-		$this->_domain = $value;
+		$this->_domain=$value;
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	public function setExpire($value)
 	{
-		$this->_expire = TPropertyValue::ensureInteger($value);
+		$this->_expire=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 */
 	public function setHttpOnly($value)
 	{
-		$this->_httpOnly = TPropertyValue::ensureBoolean($value);
+		$this->_httpOnly=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	public function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 */
 	public function setValue($value)
 	{
-		$this->_value = $value;
+		$this->_value=$value;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 */
 	public function setPath($value)
 	{
-		$this->_path = $value;
+		$this->_path=$value;
 	}
 
 	/**
@@ -174,6 +174,6 @@ 
 	 */
 	public function setSecure($value)
 	{
-		$this->_secure = TPropertyValue::ensureBoolean($value);
+		$this->_secure=TPropertyValue::ensureBoolean($value);
 	}
 }
\ No newline at end of file

framework/Web/Javascripts/TJavaScript.php

Spacing +38 added lines, -38 removed lines

@@ -33,9 +33,9 @@ 
 	 */
 	public static function renderScriptFiles($files)
 	{
-		$str = '';
+		$str='';
 		foreach($files as $file)
-			$str .= self::renderScriptFile($file);
+			$str.=self::renderScriptFile($file);
 		return $str;
 	}
 
@@ -46,7 +46,7 @@ 
 	 */
 	public static function renderScriptFile($file)
 	{
-		return '<script type="text/javascript" src="' . THttpUtility::htmlEncode($file) . "\"></script>\n";
+		return '<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	public static function renderScriptBlocks($scripts)
 	{
 		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -70,7 +70,7 @@ 
 	public static function renderScriptBlocksCallback($scripts)
 	{
 		if(count($scripts))
-			return implode("\n", $scripts) . "\n";
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -139,40 +139,40 @@ 
 	 * @param boolean wether to encode empty strings too. Default to false for BC.
 	 * @return string the encoded string
 	 */
-	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
+	public static function encode($value, $toMap=true, $encodeEmptyStrings=false)
 	{
 		if(is_string($value))
 			return self::quoteString($value);
 		elseif(is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		elseif(is_array($value))
 		{
-			$results = '';
-			if(($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
+			$results='';
+			if(($n=count($value)) > 0 && array_keys($value)!==range(0, $n - 1))
 			{
 				foreach($value as $k => $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
-						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
+						if($results!=='')
+							$results.=',';
+						$results.="'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '{' . $results . '}';
+				return '{'.$results.'}';
 			}
 			else
 			{
 				foreach($value as $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if($v!=='' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
-						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
+						if($results!=='')
+							$results.=',';
+						$results.=self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '[' . $results . ']';
+				return '['.$results.']';
 			}
 		}
 		elseif(is_int($value))
@@ -188,8 +188,8 @@ 
 					return 'Number.POSITIVE_INFINITY';
 					break;
 				default:
-					$locale = localeConv();
-					if($locale['decimal_point'] == '.')
+					$locale=localeConv();
+					if($locale['decimal_point']=='.')
 						return "$value";
 					else
 						return str_replace($locale['decimal_point'], '.', "$value");
@@ -197,11 +197,11 @@ 
 			}
 		}
 		elseif(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+			if($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
 				return self::encode(get_object_vars($value), $toMap);
-		elseif($value === null)
+		elseif($value===null)
 			return 'null';
 		else
 			return '';
@@ -212,14 +212,14 @@ 
 	 * @param mixed variable to be encoded
 	 * @return string encoded string
 	 */
-	public static function jsonEncode($value, $options = 0)
+	public static function jsonEncode($value, $options=0)
 	{
-		if (($g = Prado::getApplication()->getGlobalization(false)) !== null &&
-			strtoupper($enc = $g->getCharset()) != 'UTF-8') {
+		if(($g=Prado::getApplication()->getGlobalization(false))!==null &&
+			strtoupper($enc=$g->getCharset())!='UTF-8') {
 			self::convertToUtf8($value, $enc);
 		}
 
-		$s = @json_encode($value, $options);
+		$s=@json_encode($value, $options);
 		self::checkJsonError();
 		return $s;
 	}
@@ -231,8 +231,8 @@ 
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
 		if(is_string($value))
-			$value = iconv($sourceEncoding, 'UTF-8', $value);
-		elseif (is_array($value))
+			$value=iconv($sourceEncoding, 'UTF-8', $value);
+		elseif(is_array($value))
 		{
 			foreach($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
@@ -247,37 +247,37 @@ 
 	 * @param int recursion depth
 	 * @return mixed decoded variable
 	 */
-	public static function jsonDecode($value, $assoc = false, $depth = 512)
+	public static function jsonDecode($value, $assoc=false, $depth=512)
 	{
-		$s = @json_decode($value, $assoc, $depth);
+		$s=@json_decode($value, $assoc, $depth);
 		self::checkJsonError();
 		return $s;
 	}
 
 	private static function checkJsonError()
 	{
-		switch ($err = json_last_error())
+		switch($err=json_last_error())
 		{
 			case JSON_ERROR_NONE:
 				return;
 				break;
 			case JSON_ERROR_DEPTH:
-				$msg = 'Maximum stack depth exceeded';
+				$msg='Maximum stack depth exceeded';
 				break;
 			case JSON_ERROR_STATE_MISMATCH:
-				$msg = 'Underflow or the modes mismatch';
+				$msg='Underflow or the modes mismatch';
 				break;
 			case JSON_ERROR_CTRL_CHAR:
-				$msg = 'Unexpected control character found';
+				$msg='Unexpected control character found';
 				break;
 			case JSON_ERROR_SYNTAX:
-				$msg = 'Syntax error, malformed JSON';
+				$msg='Syntax error, malformed JSON';
 				break;
 			case JSON_ERROR_UTF8:
-				$msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+				$msg='Malformed UTF-8 characters, possibly incorrectly encoded';
 				break;
 			default:
-				$msg = 'Unknown error';
+				$msg='Unknown error';
 				break;
 		}
 		throw new \Exception("JSON error ($err): $msg");

framework/Web/Javascripts/packages.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 //package base folder in prado alias notation
-$folders = [
+$folders=[
 	'prado' => 'Prado\\Web\\Javascripts\\source\\prado',
 	'jquery' => 'Vendor\\bower-asset\\jquery\\dist',
 	'jquery-ui' => 'Vendor\\bower-asset\\jquery-ui',
@@ -13,7 +13,7 @@ 
 ];
 
 //package names and its contents (files relative to the current directory)
-$packages = [
+$packages=[
 	// base prado scripts
 	'prado' => [
 		'prado/prado.js',
@@ -112,7 +112,7 @@ 
 ];
 
 //package names and their dependencies
-$dependencies = [
+$dependencies=[
 	'jquery' => ['jquery'],
 	'prado' => ['jquery', 'prado'],
 	'bootstrap' => ['jquery', 'bootstrap'],

framework/Web/Javascripts/css-packages.php

Spacing +3 added lines, -3 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 //package base folder in prado alias notation
-$folders = [
+$folders=[
 	'jquery-ui' => 'Vendor\\bower-asset\\jquery-ui',
 	'bootstrap' => 'Vendor\\bower-asset\\bootstrap\\dist',
 	'highlightjs' => 'Vendor\\bower-asset\\highlightjs',
 ];
 
 //package names and its contents (files relative to the current directory)
-$packages = [
+$packages=[
 	'jquery-ui' => [
 		'jquery-ui/themes/base/jquery-ui.css',
 	],
@@ -73,7 +73,7 @@ 
 ];
 
 //package names and their dependencies
-$dependencies = [
+$dependencies=[
 		'jquery-ui' => ['jquery-ui'],
 		'jquery.ui.accordion' => ['jquery.ui.core', 'jquery.ui.accordion'],
 		'jquery.ui.autocomplete' => ['jquery.ui.core', 'jquery.ui.autocomplete'],

framework/Web/TAssetManager.php

Spacing +52 added lines, -52 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Default web accessible base path for storing private files
 	 */
-	const DEFAULT_BASEPATH = 'assets';
+	const DEFAULT_BASEPATH='assets';
 	/**
 	 * @var string base web accessible path for storing private files
 	 */
@@ -67,7 +67,7 @@ 
 	/**
 	 * @var boolean whether to use timestamp checking to ensure files are published with up-to-date versions.
 	 */
-	private $_checkTimestamp = false;
+	private $_checkTimestamp=false;
 	/**
 	 * @var TApplication application instance
 	 */
@@ -75,11 +75,11 @@ 
 	/**
 	 * @var array published assets
 	 */
-	private $_published = [];
+	private $_published=[];
 	/**
 	 * @var boolean whether the module is initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 
 	/**
 	 * Initializes the module.
@@ -88,15 +88,15 @@ 
 	 */
 	public function init($config)
 	{
-		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		$application=$this->getApplication();
+		if($this->_basePath===null)
+			$this->_basePath=dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
 			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if($this->_baseUrl===null)
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/**
@@ -119,8 +119,8 @@ 
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
-			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+			$this->_basePath=Prado::getPathOfNamespace($value);
+			if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
 				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
@@ -142,7 +142,7 @@ 
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl = rtrim($value, '/');
+			$this->_baseUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -159,30 +159,30 @@ 
 	 * @throws TInvalidDataValueException if the file path to be published is
 	 * invalid
 	 */
-	public function publishFilePath($path, $checkTimestamp = false)
+	public function publishFilePath($path, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$path]))
 			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
+		elseif(empty($path) || ($fullpath=realpath($path))===false)
 			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
 		elseif(is_file($fullpath))
 		{
-			$dir = $this->hash(dirname($fullpath));
-			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash(dirname($fullpath));
+			$fileName=basename($fullpath);
+			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
+			return $this->_published[$path]=$this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
 		{
-			$dir = $this->hash($fullpath);
-			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash($fullpath);
+			if(!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
 				Prado::trace("Publishing directory $fullpath", 'Prado\Web\TAssetManager');
-				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$path]=$this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -199,9 +199,9 @@ 
 	 * @param $values List of published assets
 	 * @since 3.1.6
 	 */
-	protected function setPublished($values = [])
+	protected function setPublished($values=[])
 	{
-		$this->_published = $values;
+		$this->_published=$values;
 	}
 
 	/**
@@ -213,11 +213,11 @@ 
 	 */
 	public function getPublishedPath($path)
 	{
-		$path = realpath($path);
+		$path=realpath($path);
 		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
 		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
 
 	/**
@@ -229,11 +229,11 @@ 
 	 */
 	public function getPublishedUrl($path)
 	{
-		$path = realpath($path);
+		$path=realpath($path);
 		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
 		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+			return $this->_baseUrl.'/'.$this->hash($path);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x', crc32($dir . Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -261,7 +261,7 @@ 
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
+		$dstFile=$dst.DIRECTORY_SEPARATOR.basename($src);
 		if(@filemtime($dstFile) < @filemtime($src))
 		{
 			Prado::trace("Publishing file $src to $dstFile", 'Prado\Web\TAssetManager');
@@ -284,22 +284,22 @@ 
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder = @opendir($src))
+		if($folder=@opendir($src))
 		{
-			while($file = @readdir($folder))
+			while($file=@readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
+				if($file==='.' || $file==='..' || $file==='.svn' || $file==='.git')
 					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				elseif(is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
+					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
-						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
+						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -318,26 +318,26 @@ 
 	 * @param boolean Wether or not to check the time stamp of the file for publishing. Defaults to false.
 	 * @return string URL path to the directory where the tar file was extracted.
 	 */
-	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
+	public function publishTarFile($tarfile, $md5sum, $checkTimestamp=false)
 	{
 		if(isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+		elseif(($fullpath=realpath($md5sum))===false || !is_file($fullpath))
 			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
-			$dir = $this->hash(dirname($fullpath));
-			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dir=$this->hash(dirname($fullpath));
+			$fileName=basename($fullpath);
+			$dst=$this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if(!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode()!==TApplicationMode::Performance)
 			{
-				if(@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
+				if(@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
 					$this->copyFile($fullpath, $dst);
 					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$md5sum]=$this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -350,11 +350,11 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
+		if(($fullpath=realpath($path))===false || !is_file($fullpath))
 			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{
-			$tar = new TTarFileExtractor($fullpath);
+			$tar=new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);
 		}
 	}

framework/Web/THttpRequestUrlFormat.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
  */
 class THttpRequestUrlFormat extends \Prado\TEnumerable
 {
-	const Get = 'Get';
-	const Path = 'Path';
-	const HiddenPath = 'HiddenPath';
+	const Get='Get';
+	const Path='Path';
+	const HiddenPath='HiddenPath';
 }
\ No newline at end of file

framework/Web/THttpUtility.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 class THttpUtility
 {
-	private static $_encodeTable = ['<' => '&lt;','>' => '&gt;','"' => '&quot;'];
-	private static $_decodeTable = ['&lt;' => '<','&gt;' => '>','&quot;' => '"'];
-	private static $_stripTable = ['&lt;' => '','&gt;' => '','&quot;' => ''];
+	private static $_encodeTable=['<' => '&lt;', '>' => '&gt;', '"' => '&quot;'];
+	private static $_decodeTable=['&lt;' => '<', '&gt;' => '>', '&quot;' => '"'];
+	private static $_stripTable=['&lt;' => '', '&gt;' => '', '&quot;' => ''];
 
 	/**
 	 * HTML-encodes a string.

framework/Web/THttpResponseAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	 */
 	public function __construct($response)
 	{
-		$this->_response = $response;
+		$this->_response=$response;
 	}
 
 	/**

framework/Web/UI/TTheme.php

Spacing +59 added lines, -59 removed lines

@@ -46,11 +46,11 @@ 
 	/**
 	 * prefix for cache variable name used to store parsed themes
 	 */
-	const THEME_CACHE_PREFIX = 'prado:theme:';
+	const THEME_CACHE_PREFIX='prado:theme:';
 	/**
 	 * Extension name of skin files
 	 */
-	const SKIN_FILE_EXT = '.skin';
+	const SKIN_FILE_EXT='.skin';
 	/**
 	 * @var string theme path
 	 */
@@ -66,15 +66,15 @@ 
 	/**
 	 * @var string theme name
 	 */
-	private $_name = '';
+	private $_name='';
 	/**
 	 * @var array list of css files
 	 */
-	private $_cssFiles = [];
+	private $_cssFiles=[];
 	/**
 	 * @var array list of js files
 	 */
-	private $_jsFiles = [];
+	private $_jsFiles=[];
 
 	/**
 	 * Constructor.
@@ -84,75 +84,75 @@ 
 	 */
 	public function __construct($themePath, $themeUrl)
 	{
-		$this->_themeUrl = $themeUrl;
-		$this->_themePath = realpath($themePath);
-		$this->_name = basename($themePath);
-		$cacheValid = false;
+		$this->_themeUrl=$themeUrl;
+		$this->_themePath=realpath($themePath);
+		$this->_name=basename($themePath);
+		$cacheValid=false;
 		// TODO: the following needs to be cleaned up (Qiang)
-		if(($cache = $this->getApplication()->getCache()) !== null)
+		if(($cache=$this->getApplication()->getCache())!==null)
 		{
-			$array = $cache->get(self::THEME_CACHE_PREFIX . $themePath);
+			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
 			if(is_array($array))
 			{
-				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				list($skins, $cssFiles, $jsFiles, $timestamp)=$array;
+				if($this->getApplication()->getMode()!==TApplicationMode::Performance)
 				{
-					if(($dir = opendir($themePath)) === false)
+					if(($dir=opendir($themePath))===false)
 						throw new TIOException('theme_path_inexistent', $themePath);
-					$cacheValid = true;
-					while(($file = readdir($dir)) !== false)
+					$cacheValid=true;
+					while(($file=readdir($dir))!==false)
 					{
-						if($file === '.' || $file === '..')
+						if($file==='.' || $file==='..')
 							continue;
-						elseif(basename($file, '.css') !== $file)
-							$this->_cssFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, '.js') !== $file)
-							$this->_jsFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
+						elseif(basename($file, '.css')!==$file)
+							$this->_cssFiles[]=$themeUrl.'/'.$file;
+						elseif(basename($file, '.js')!==$file)
+							$this->_jsFiles[]=$themeUrl.'/'.$file;
+						elseif(basename($file, self::SKIN_FILE_EXT)!==$file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
 						{
-							$cacheValid = false;
+							$cacheValid=false;
 							break;
 						}
 					}
 					closedir($dir);
 					if($cacheValid)
-						$this->_skins = $skins;
+						$this->_skins=$skins;
 				}
 				else
 				{
-					$cacheValid = true;
-					$this->_cssFiles = $cssFiles;
-					$this->_jsFiles = $jsFiles;
-					$this->_skins = $skins;
+					$cacheValid=true;
+					$this->_cssFiles=$cssFiles;
+					$this->_jsFiles=$jsFiles;
+					$this->_skins=$skins;
 				}
 			}
 		}
 		if(!$cacheValid)
 		{
-			$this->_cssFiles = [];
-			$this->_jsFiles = [];
-			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
+			$this->_cssFiles=[];
+			$this->_jsFiles=[];
+			$this->_skins=[];
+			if(($dir=opendir($themePath))===false)
 				throw new TIOException('theme_path_inexistent', $themePath);
-			while(($file = readdir($dir)) !== false)
+			while(($file=readdir($dir))!==false)
 			{
-				if($file === '.' || $file === '..')
+				if($file==='.' || $file==='..')
 					continue;
-				elseif(basename($file, '.css') !== $file)
-					$this->_cssFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, '.js') !== $file)
-					$this->_jsFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, self::SKIN_FILE_EXT) !== $file)
+				elseif(basename($file, '.css')!==$file)
+					$this->_cssFiles[]=$themeUrl.'/'.$file;
+				elseif(basename($file, '.js')!==$file)
+					$this->_jsFiles[]=$themeUrl.'/'.$file;
+				elseif(basename($file, self::SKIN_FILE_EXT)!==$file)
 				{
-					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
+					$template=new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
 					foreach($template->getItems() as $skin)
 					{
 						if(!isset($skin[2]))  // a text string, ignored
 							continue;
-						elseif($skin[0] !== -1)
+						elseif($skin[0]!==-1)
 							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
-						$type = $skin[1];
-						$id = isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$type=$skin[1];
+						$id=isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
 						if(isset($this->_skins[$type][$id]))
 							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
@@ -163,15 +163,15 @@ 
 								throw new TConfigurationException('theme_databind_forbidden',dirname($themePath),$type,$id);
 						}
 						*/
-						$this->_skins[$type][$id] = $skin[2];
+						$this->_skins[$type][$id]=$skin[2];
 					}
 				}
 			}
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache !== null)
-				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+			if($cache!==null)
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, [$this->_skins, $this->_cssFiles, $this->_jsFiles, time()]);
 		}
 	}
 
@@ -188,7 +188,7 @@ 
 	 */
 	protected function setName($value)
 	{
-		$this->_name = $value;
+		$this->_name=$value;
 	}
 
 	/**
@@ -204,7 +204,7 @@ 
 	 */
 	protected function setBaseUrl($value)
 	{
-		$this->_themeUrl = rtrim($value, '/');
+		$this->_themeUrl=rtrim($value, '/');
 	}
 
 	/**
@@ -220,7 +220,7 @@ 
 	 */
 	protected function setBasePath($value)
 	{
-		$this->_themePath = $value;
+		$this->_themePath=$value;
 	}
 
 	/**
@@ -236,7 +236,7 @@ 
 	 */
 	protected function setSkins($value)
 	{
-		$this->_skins = $value;
+		$this->_skins=$value;
 	}
 
 	/**
@@ -250,9 +250,9 @@ 
 	 */
 	public function applySkin($control)
 	{
-		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
-			$id = 0;
+		$type=get_class($control);
+		if(($id=$control->getSkinID())==='')
+			$id=0;
 		if(isset($this->_skins[$type][$id]))
 		{
 			foreach($this->_skins[$type][$id] as $name => $value)
@@ -263,10 +263,10 @@ 
 					switch($value[0])
 					{
 						case TTemplate::CONFIG_EXPRESSION:
-							$value = $this->evaluateExpression($value[1]);
+							$value=$this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value = $this->_themeUrl . '/' . ltrim($value[1], '/');
+							$value=$this->_themeUrl.'/'.ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
 							$control->bindProperty($name, $value[1]);
@@ -287,13 +287,13 @@ 
 				}
 				if(!is_array($value))
 				{
-					if(strpos($name, '.') === false)	// is simple property or custom attribute
+					if(strpos($name, '.')===false)	// is simple property or custom attribute
 					{
 						if($control->hasProperty($name))
 						{
 							if($control->canSetProperty($name))
 							{
-								$setter = 'set' . $name;
+								$setter='set'.$name;
 								$control->$setter($value);
 							}
 							else
@@ -325,7 +325,7 @@ 
 	 */
 	protected function setStyleSheetFiles($value)
 	{
-		$this->_cssFiles = $value;
+		$this->_cssFiles=$value;
 	}
 
 	/**
@@ -341,6 +341,6 @@ 
 	 */
 	protected function setJavaScriptFiles($value)
 	{
-		$this->_jsFiles = $value;
+		$this->_jsFiles=$value;
 	}
 }
\ No newline at end of file