pradosoft / prado

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

framework/Web/UI/TCompositeControl.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer = null)
+	protected function initRecursive($namingContainer=null)
 	{
 		$this->ensureChildControls();
 		parent::initRecursive($namingContainer);

framework/Web/UI/TTemplateControl.php

Spacing +56 added lines, -56 removed lines

@@ -33,12 +33,12 @@ 
 	/**
 	 * template file extension.
 	 */
-	const EXT_TEMPLATE = '.tpl';
+	const EXT_TEMPLATE='.tpl';
 
 	/**
 	 * @var ITemplate the parsed template structure shared by the same control class
 	 */
-	private static $_template = [];
+	private static $_template=[];
 	/**
 	 * @var ITemplate the parsed template structure specific for this control instance
 	 */
@@ -50,15 +50,15 @@ 
 	/**
 	 * @var string master control class name
 	 */
-	private $_masterClass = '';
+	private $_masterClass='';
 	/**
 	 * @var array list of TContent controls
 	 */
-	private $_contents = [];
+	private $_contents=[];
 	/**
 	 * @var array list of TContentPlaceHolder controls
 	 */
-	private $_placeholders = [];
+	private $_placeholders=[];
 
 	/**
 	 * Returns the template object associated with this control object.
@@ -66,11 +66,11 @@ 
 	 */
 	public function getTemplate()
 	{
-		if($this->_localTemplate === null)
+		if($this->_localTemplate===null)
 		{
-			$class = get_class($this);
+			$class=get_class($this);
 			if(!isset(self::$_template[$class]))
-				self::$_template[$class] = $this->loadTemplate();
+				self::$_template[$class]=$this->loadTemplate();
 			return self::$_template[$class];
 		}
 		else
@@ -85,7 +85,7 @@ 
 	 */
 	public function setTemplate($value)
 	{
-		$this->_localTemplate = $value;
+		$this->_localTemplate=$value;
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if(($template=$this->getTemplate())!==null)
 			return $template->getIsSourceTemplate();
 		else
 			return false;
@@ -106,7 +106,7 @@ 
 	 */
 	public function getTemplateDirectory()
 	{
-		if(($template = $this->getTemplate()) !== null)
+		if(($template=$this->getTemplate())!==null)
 			return $template->getContextPath();
 		else
 			return '';
@@ -118,8 +118,8 @@ 
 	 */
 	protected function loadTemplate()
 	{
-		Prado::trace("Loading template " . get_class($this), '\Prado\Web\UI\TTemplateControl');
-		$template = $this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
+		Prado::trace("Loading template ".get_class($this), '\Prado\Web\UI\TTemplateControl');
+		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));
 		return $template;
 	}
 
@@ -130,7 +130,7 @@ 
 	 */
 	public function createChildControls()
 	{
-		if($tpl = $this->getTemplate())
+		if($tpl=$this->getTemplate())
 		{
 			foreach($tpl->getDirective() as $name => $value)
 			{
@@ -153,7 +153,7 @@ 
 		if(isset($this->_contents[$id]))
 			throw new TConfigurationException('templatecontrol_contentid_duplicated', $id);
 		else
-			$this->_contents[$id] = $object;
+			$this->_contents[$id]=$object;
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 		if(isset($this->_placeholders[$id]))
 			throw new TConfigurationException('templatecontrol_placeholderid_duplicated', $id);
 		else
-			$this->_placeholders[$id] = $object;
+			$this->_placeholders[$id]=$object;
 	}
 
 	/**
@@ -183,7 +183,7 @@ 
 	 */
 	public function setMasterClass($value)
 	{
-		$this->_masterClass = $value;
+		$this->_masterClass=$value;
 	}
 
 	/**
@@ -204,9 +204,9 @@ 
 	{
 		if(isset($this->_placeholders[$id]))
 		{
-			$placeholder = $this->_placeholders[$id];
-			$controls = $placeholder->getParent()->getControls();
-			$loc = $controls->remove($placeholder);
+			$placeholder=$this->_placeholders[$id];
+			$controls=$placeholder->getParent()->getControls();
+			$loc=$controls->remove($placeholder);
 			$controls->insertAt($loc, $content);
 		}
 		else
@@ -221,15 +221,15 @@ 
 	 * Only framework developers should use this method.
 	 * @param TControl the naming container control
 	 */
-	protected function initRecursive($namingContainer = null)
+	protected function initRecursive($namingContainer=null)
 	{
 		$this->ensureChildControls();
-		if($this->_masterClass !== '')
+		if($this->_masterClass!=='')
 		{
-			$master = Prado::createComponent($this->_masterClass);
+			$master=Prado::createComponent($this->_masterClass);
 			if(!($master instanceof TTemplateControl))
 				throw new TInvalidDataValueException('templatecontrol_mastercontrol_invalid');
-			$this->_master = $master;
+			$this->_master=$master;
 			$this->getControls()->clear();
 			$this->getControls()->add($master);
 			$master->ensureChildControls();
@@ -248,38 +248,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;
@@ -288,9 +288,9 @@ 
 										break;
 								}
 						}
-						catch (Exception $ex)
+						catch(Exception $ex)
 						{
-								if ($throwExceptions)
+								if($throwExceptions)
 										throw $ex;
 						}
 				}
@@ -302,26 +302,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/TClientScriptManager.php

Spacing +156 added lines, -156 removed lines

@@ -34,11 +34,11 @@ 
 	/**
 	 * file containing javascript packages and their cross dependencies
 	 */
-	const PACKAGES_FILE = 'Web/Javascripts/packages.php';
+	const PACKAGES_FILE='Web/Javascripts/packages.php';
 	/**
 	 * file containing css packages and their cross dependencies
 	 */
-	const CSS_PACKAGES_FILE = 'Web/Javascripts/css-packages.php';
+	const CSS_PACKAGES_FILE='Web/Javascripts/css-packages.php';
 	/**
 	 * @var TPage page who owns this manager
 	 */
@@ -46,39 +46,39 @@ 
 	/**
 	 * @var array registered hidden fields, indexed by hidden field names
 	 */
-	private $_hiddenFields = [];
+	private $_hiddenFields=[];
 	/**
 	 * @var array javascript blocks to be rendered at the beginning of the form
 	 */
-	private $_beginScripts = [];
+	private $_beginScripts=[];
 	/**
 	 * @var array javascript blocks to be rendered at the end of the form
 	 */
-	private $_endScripts = [];
+	private $_endScripts=[];
 	/**
 	 * @var array javascript files to be rendered in the form
 	 */
-	private $_scriptFiles = [];
+	private $_scriptFiles=[];
 	/**
 	 * @var array javascript files to be rendered in page head section
 	 */
-	private $_headScriptFiles = [];
+	private $_headScriptFiles=[];
 	/**
 	 * @var array javascript blocks to be rendered in page head section
 	 */
-	private $_headScripts = [];
+	private $_headScripts=[];
 	/**
 	 * @var array CSS files
 	 */
-	private $_styleSheetFiles = [];
+	private $_styleSheetFiles=[];
 	/**
 	 * @var array CSS declarations
 	 */
-	private $_styleSheets = [];
+	private $_styleSheets=[];
 	/**
 	 * @var array registered PRADO script libraries
 	 */
-	private $_registeredScripts = [];
+	private $_registeredScripts=[];
 	/**
 	 * Client-side javascript library dependencies, loads from PACKAGES_FILE;
 	 * @var array
@@ -97,7 +97,7 @@ 
 	/**
 	 * @var array registered PRADO style libraries
 	 */
-	private $_registeredStyles = [];
+	private $_registeredStyles=[];
 	/**
 	 * Client-side style library dependencies, loads from CSS_PACKAGES_FILE;
 	 * @var array
@@ -116,7 +116,7 @@ 
 
 	private $_renderedHiddenFields;
 
-	private $_renderedScriptFiles = [];
+	private $_renderedScriptFiles=[];
 
 	private $_expandedScripts;
 	private $_expandedStyles;
@@ -127,7 +127,7 @@ 
 	 */
 	public function __construct(TPage $owner)
 	{
-		$this->_page = $owner;
+		$this->_page=$owner;
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	public function registerPradoScript($name)
 	{
 		$this->registerPradoScriptInternal($name);
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoScript', $params);
 	}
 
@@ -170,50 +170,50 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredScripts[$name]))
 		{
-			if(self::$_scripts === null)
+			if(self::$_scripts===null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
-				list($folders, $packages, $deps) = include($packageFile);
-				self::$_scriptsFolders = $folders;
-				self::$_scripts = $deps;
-				self::$_scriptsPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_scriptsFolders=$folders;
+				self::$_scripts=$deps;
+				self::$_scriptsPackages=$packages;
 			}
 
-			if (isset(self::$_scripts[$name]))
-				$this->_registeredScripts[$name] = true;
+			if(isset(self::$_scripts[$name]))
+				$this->_registeredScripts[$name]=true;
 			else
 				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredScripts)) !== [])
+			if(($packages=array_keys($this->_registeredScripts))!==[])
 			{
-				$packagesUrl = [];
-				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
-				foreach ($packages as $p)
+				$packagesUrl=[];
+				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				foreach($packages as $p)
 				{
-					foreach (self::$_scripts[$p] as $dep)
+					foreach(self::$_scripts[$p] as $dep)
 					{
-						foreach (self::$_scriptsPackages[$dep] as $script)
+						foreach(self::$_scriptsPackages[$dep] as $script)
 						{
-							if (!isset($this->_expandedScripts[$script]))
+							if(!isset($this->_expandedScripts[$script]))
 							{
-								list($base, $subPath) = $this->getScriptPackageFolder($script);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getScriptPackageFolder($script);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedScripts[$script] = true;
+								$this->_expandedScripts[$script]=true;
 								if($isDebug)
 								{
-									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-										$packagesUrl[] = $url;
+									if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+										$packagesUrl[]=$url;
 								} else {
-								  $minPath = preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
-								  if (!in_array($url = $baseUrl . '/' . $minPath, $packagesUrl))
+								  $minPath=preg_replace('/^(.*)(?<!\.min)\.js$/', "\\1.min.js", $subPath);
+								  if(!in_array($url=$baseUrl.'/'.$minPath, $packagesUrl))
 									{
-										if(!is_file($filePath = $path . DIRECTORY_SEPARATOR . $minPath))
+										if(!is_file($filePath=$path.DIRECTORY_SEPARATOR.$minPath))
 										{
-											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base . '/' . $subPath)));
+											file_put_contents($filePath, TJavaScript::JSMin(file_get_contents($base.'/'.$subPath)));
 											chmod($filePath, PRADO_CHMOD);
 										}
-										$packagesUrl[] = $url;
+										$packagesUrl[]=$url;
 									}
 								}
 							}
@@ -229,26 +229,26 @@ 
 	/**
 	 * @return string Prado javascript library base asset url.
 	 */
-	public function getPradoScriptAssetUrl($script = 'prado')
+	public function getPradoScriptAssetUrl($script='prado')
 	{
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedUrl($base);
 	}
 
 	/**
 	 * @return string Prado javascript library base asset path in local filesystem.
 	 */
-	public function getPradoScriptAssetPath($script = 'prado')
+	public function getPradoScriptAssetPath($script='prado')
 	{
 		if(!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
-		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
-		$assets = Prado::getApplication()->getAssetManager();
+		$base=Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
+		$assets=Prado::getApplication()->getAssetManager();
 		return $assets->getPublishedPath($base);
 	}
 
@@ -258,9 +258,9 @@ 
 	 */
 	public function getScriptUrls()
 	{
-		$scripts = array_values($this->_headScriptFiles);
-		$scripts = array_merge($scripts, array_values($this->_scriptFiles));
-		$scripts = array_unique($scripts);
+		$scripts=array_values($this->_headScriptFiles);
+		$scripts=array_merge($scripts, array_values($this->_scriptFiles));
+		$scripts=array_unique($scripts);
 
 		return $scripts;
 	}
@@ -271,14 +271,14 @@ 
 	 */
 	protected function getPackagePathUrl($base)
 	{
-		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl()) === false)
+		$assets=Prado::getApplication()->getAssetManager();
+		if(strpos($base, $assets->getBaseUrl())===false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
 		}
 		else
 		{
-			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
+			return [$assets->getBasePath().str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
 	}
 
@@ -288,14 +288,14 @@ 
 	 */
 	protected function getScriptPackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_scriptsFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
-		$namespace = self::$_scriptsFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
-		  $namespace = $dir;
+		$namespace=self::$_scriptsFolders[$base];
+		if(($dir=Prado::getPathOfNameSpace($namespace))!==null) {
+		  $namespace=$dir;
 		}
 
 		return [$namespace, $subPath];
@@ -307,14 +307,14 @@ 
 	 */
 	protected function getStylePackageFolder($script)
 	{
-		list($base, $subPath) = explode("/", $script, 2);
+		list($base, $subPath)=explode("/", $script, 2);
 
 		if(!array_key_exists($base, self::$_stylesFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
-		$namespace = self::$_stylesFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
-		  $namespace = $dir;
+		$namespace=self::$_stylesFolders[$base];
+		if(($dir=Prado::getPathOfNameSpace($namespace))!==null) {
+		  $namespace=$dir;
 		}
 
 		return [$namespace, $subPath];
@@ -326,15 +326,15 @@ 
 	 * @param array additional callback options
 	 * @return string javascript statement that creates a new callback request.
 	 */
-	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options = null)
+	public function getCallbackReference(ICallbackEventHandler $callbackHandler, $options=null)
 	{
-		$options = !is_array($options) ? [] : $options;
-		$class = new \ReflectionClass($callbackHandler);
-		$clientSide = $callbackHandler->getActiveControl()->getClientSide();
-		$options = array_merge($options, $clientSide->getOptions()->toArray());
-		$optionString = TJavaScript::encode($options);
+		$options=!is_array($options) ? [] : $options;
+		$class=new \ReflectionClass($callbackHandler);
+		$clientSide=$callbackHandler->getActiveControl()->getClientSide();
+		$options=array_merge($options, $clientSide->getOptions()->toArray());
+		$optionString=TJavaScript::encode($options);
 		$this->registerPradoScriptInternal('ajax');
-		$id = $callbackHandler->getUniqueID();
+		$id=$callbackHandler->getUniqueID();
 		return "new Prado.CallbackRequest('{$id}',{$optionString})";
 	}
 
@@ -345,12 +345,12 @@ 
 	 */
 	public function registerCallbackControl($class, $options)
 	{
-		$optionString = TJavaScript::encode($options);
-		$code = "new {$class}({$optionString});";
-		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
+		$optionString=TJavaScript::encode($options);
+		$code="new {$class}({$optionString});";
+		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('ajax');
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerCallbackControl', $params);
 	}
 
@@ -362,18 +362,18 @@ 
 	 */
 	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if($class===null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
-			$options['FormID'] = $form->getClientID();
-		$optionString = TJavaScript::encode($options);
-		$code = "new {$class}({$optionString});";
+		if(!isset($options['FormID']) && ($form=$this->_page->getForm())!==null)
+			$options['FormID']=$form->getClientID();
+		$optionString=TJavaScript::encode($options);
+		$code="new {$class}({$optionString});";
 
-		$this->_endScripts[sprintf('%08X', crc32($code))] = $code;
+		$this->_endScripts[sprintf('%08X', crc32($code))]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPostBackControl', $params);
 	}
 
@@ -385,22 +385,22 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID=is_string($panel) ? $panel : $panel->getUniqueID();
 
 		if(is_string($button))
-			$buttonID = $button;
+			$buttonID=$button;
 		else
 		{
 			$button->setIsDefaultButton(true);
-			$buttonID = $button->getUniqueID();
+			$buttonID=$button->getUniqueID();
 		}
-		$options = TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
-		$code = "new Prado.WebUI.DefaultButton($options);";
+		$options=TJavaScript::encode($this->getDefaultButtonOptions($panelID, $buttonID));
+		$code="new Prado.WebUI.DefaultButton($options);";
 
-		$this->_endScripts['prado:' . $panelID] = $code;
+		$this->_endScripts['prado:'.$panelID]=$code;
 		$this->registerPradoScriptInternal('prado');
 
-		$params = [$panelID,$buttonID];
+		$params=[$panelID, $buttonID];
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerDefaultButton', $params);
 	}
 
@@ -411,11 +411,11 @@ 
 	 */
 	protected function getDefaultButtonOptions($panelID, $buttonID)
 	{
-		$options['ID'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Panel'] = TControl::convertUniqueIdToClientId($panelID);
-		$options['Target'] = TControl::convertUniqueIdToClientId($buttonID);
-		$options['EventTarget'] = $buttonID;
-		$options['Event'] = 'click';
+		$options['ID']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Panel']=TControl::convertUniqueIdToClientId($panelID);
+		$options['Target']=TControl::convertUniqueIdToClientId($buttonID);
+		$options['EventTarget']=$buttonID;
+		$options['Event']='click';
 		return $options;
 	}
 
@@ -427,10 +427,10 @@ 
 	{
 		$this->registerPradoScriptInternal('jquery');
 		if($target instanceof TControl)
-			$target = $target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
+			$target=$target->getClientID();
+		$this->_endScripts['prado:focus']='jQuery(\'#'.$target.'\').focus();';
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
 	}
 
@@ -442,7 +442,7 @@ 
 	public function registerPradoStyle($name)
 	{
 		$this->registerPradoStyleInternal($name);
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerPradoStyle', $params);
 	}
 
@@ -454,39 +454,39 @@ 
 		// $this->checkIfNotInRender();
 		if(!isset($this->_registeredStyles[$name]))
 		{
-			if(self::$_styles === null)
+			if(self::$_styles===null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::CSS_PACKAGES_FILE;
-				list($folders, $packages, $deps) = include($packageFile);
-				self::$_stylesFolders = $folders;
-				self::$_styles = $deps;
-				self::$_stylesPackages = $packages;
+				$packageFile=Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
+				list($folders, $packages, $deps)=include($packageFile);
+				self::$_stylesFolders=$folders;
+				self::$_styles=$deps;
+				self::$_stylesPackages=$packages;
 			}
 
-			if (isset(self::$_styles[$name]))
-				$this->_registeredStyles[$name] = true;
+			if(isset(self::$_styles[$name]))
+				$this->_registeredStyles[$name]=true;
 			else
 				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
 
-			if(($packages = array_keys($this->_registeredStyles)) !== [])
+			if(($packages=array_keys($this->_registeredStyles))!==[])
 			{
-				$packagesUrl = [];
-				$isDebug = $this->getApplication()->getMode() === TApplicationMode::Debug;
-				foreach ($packages as $p)
+				$packagesUrl=[];
+				$isDebug=$this->getApplication()->getMode()===TApplicationMode::Debug;
+				foreach($packages as $p)
 				{
-					foreach (self::$_styles[$p] as $dep)
+					foreach(self::$_styles[$p] as $dep)
 					{
-						foreach (self::$_stylesPackages[$dep] as $style)
+						foreach(self::$_stylesPackages[$dep] as $style)
 						{
-							if (!isset($this->_expandedStyles[$style]))
+							if(!isset($this->_expandedStyles[$style]))
 							{
-								list($base, $subPath) = $this->getStylePackageFolder($style);
-								list($path, $baseUrl) = $this->getPackagePathUrl($base);
+								list($base, $subPath)=$this->getStylePackageFolder($style);
+								list($path, $baseUrl)=$this->getPackagePathUrl($base);
 
-								$this->_expandedStyles[$style] = true;
+								$this->_expandedStyles[$style]=true;
 								// TODO minify css?
-								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
-									$packagesUrl[] = $url;
+								if(!in_array($url=$baseUrl.'/'.$subPath, $packagesUrl))
+									$packagesUrl[]=$url;
 							}
 						}
 					}
@@ -519,14 +519,14 @@ 
 	 * @param string URL to the CSS file
 	 * @param string media type of the CSS (such as 'print', 'screen', etc.). Defaults to empty, meaning the CSS applies to all media types.
 	 */
-	public function registerStyleSheetFile($key, $url, $media = '')
+	public function registerStyleSheetFile($key, $url, $media='')
 	{
-		if($media === '')
-			$this->_styleSheetFiles[$key] = $url;
+		if($media==='')
+			$this->_styleSheetFiles[$key]=$url;
 		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+			$this->_styleSheetFiles[$key]=[$url, $media];
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
 	}
 
@@ -535,11 +535,11 @@ 
 	 * @param string a unique key identifying the CSS block
 	 * @param string CSS block
 	 */
-	public function registerStyleSheet($key, $css, $media = '')
+	public function registerStyleSheet($key, $css, $media='')
 	{
-		$this->_styleSheets[$key] = $css;
+		$this->_styleSheets[$key]=$css;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheet', $params);
 	}
 
@@ -549,17 +549,17 @@ 
 	 */
 	public function getStyleSheetUrls()
 	{
-		$stylesheets = array_values(
+		$stylesheets=array_values(
 			array_map(function($e) {
 				return is_array($e) ? $e[0] : $e;
 			}, $this->_styleSheetFiles)
 		);
 
 		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
-			if (substr($url, strlen($url) - 4) == '.css')
-				$stylesheets[] = $url;
+			if(substr($url, strlen($url) - 4)=='.css')
+				$stylesheets[]=$url;
 
-		$stylesheets = array_unique($stylesheets);
+		$stylesheets=array_unique($stylesheets);
 
 		return $stylesheets;
 	}
@@ -581,9 +581,9 @@ 
 	public function registerHeadScriptFile($key, $url)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScriptFiles[$key] = $url;
+		$this->_headScriptFiles[$key]=$url;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScriptFile', $params);
 	}
 
@@ -595,9 +595,9 @@ 
 	public function registerHeadScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_headScripts[$key] = $script;
+		$this->_headScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHeadScript', $params);
 	}
 
@@ -608,9 +608,9 @@ 
 	 */
 	public function registerScriptFile($key, $url)
 	{
-		$this->_scriptFiles[$key] = $url;
+		$this->_scriptFiles[$key]=$url;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerScriptFile', $params);
 	}
 
@@ -622,9 +622,9 @@ 
 	public function registerBeginScript($key, $script)
 	{
 		$this->checkIfNotInRender();
-		$this->_beginScripts[$key] = $script;
+		$this->_beginScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerBeginScript', $params);
 	}
 
@@ -635,9 +635,9 @@ 
 	 */
 	public function registerEndScript($key, $script)
 	{
-		$this->_endScripts[$key] = $script;
+		$this->_endScripts[$key]=$script;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerEndScript', $params);
 	}
 
@@ -649,9 +649,9 @@ 
 	 */
 	public function registerHiddenField($name, $value)
 	{
-		$this->_hiddenFields[$name] = $value;
+		$this->_hiddenFields[$name]=$value;
 
-		$params = func_get_args();
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerHiddenField', $params);
 	}
 
@@ -748,13 +748,13 @@ 
 	 */
 	public function renderStyleSheetFiles($writer)
 	{
-		$str = '';
+		$str='';
 		foreach($this->_styleSheetFiles as $url)
 		{
 			if(is_array($url))
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"" . THttpUtility::htmlEncode($url[0]) . "\" />\n";
+				$str.="<link rel=\"stylesheet\" type=\"text/css\" media=\"{$url[1]}\" href=\"".THttpUtility::htmlEncode($url[0])."\" />\n";
 			else
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+				$str.="<link rel=\"stylesheet\" type=\"text/css\" href=\"".THttpUtility::htmlEncode($url)."\" />\n";
 		}
 		$writer->write($str);
 	}
@@ -765,7 +765,7 @@ 
 	public function renderStyleSheets($writer)
 	{
 		if(count($this->_styleSheets))
-			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -796,8 +796,8 @@ 
 
 	public function markScriptFileAsRendered($url)
 	{
-		$this->_renderedScriptFiles[$url] = $url;
-		$params = func_get_args();
+		$this->_renderedScriptFiles[$url]=$url;
+		$params=func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'markScriptFileAsRendered', $params);
 	}
 
@@ -822,7 +822,7 @@ 
 	{
 		if(!empty($this->_scriptFiles))
 		{
-			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
+			$addedScripts=array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
 			$this->renderScriptFiles($writer, $addedScripts);
 		}
 	}
@@ -874,7 +874,7 @@ 
 	 * @param THtmlWriter writer for the rendering purpose
 	 * @param TControl the control forcing the flush (used only in error messages)
 	 */
-	public function flushScriptFiles($writer, $control = null)
+	public function flushScriptFiles($writer, $control=null)
 	{
 		if(!$this->_page->getIsCallback())
 		{
@@ -893,25 +893,25 @@ 
 
 	protected function renderHiddenFieldsInt($writer, $initial)
 	{
-		if ($initial) $this->_renderedHiddenFields = [];
-		$str = '';
+		if($initial) $this->_renderedHiddenFields=[];
+		$str='';
 		foreach($this->_hiddenFields as $name => $value)
 		{
-			if (in_array($name, $this->_renderedHiddenFields)) continue;
-			$id = strtr($name, ':', '_');
+			if(in_array($name, $this->_renderedHiddenFields)) continue;
+			$id=strtr($name, ':', '_');
 			if(is_array($value))
 			{
 				foreach($value as $v)
-					$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '[]" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+					$str.='<input type="text" style="display:none" autocomplete="off" name="'.$name.'[]" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
 			else
 			{
-				$str .= '<input type="text" style="display:none" autocomplete="off" name="' . $name . '" id="' . $id . '" value="' . THttpUtility::htmlEncode($value) . "\" />\n";
+				$str.='<input type="text" style="display:none" autocomplete="off" name="'.$name.'" id="'.$id.'" value="'.THttpUtility::htmlEncode($value)."\" />\n";
 			}
-			$this->_renderedHiddenFields[] = $name;
+			$this->_renderedHiddenFields[]=$name;
 		}
-		if($str !== '')
-			$writer->write("<div style=\"visibility:hidden;\">\n" . $str . "</div>\n");
+		if($str!=='')
+			$writer->write("<div style=\"visibility:hidden;\">\n".$str."</div>\n");
 	}
 
 	public function getHiddenFields()
@@ -924,7 +924,7 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
+		if($form=$this->_page->InFormRender)
 			throw new \Exception('Operation invalid when page is already rendering');
 	}
 }

framework/Web/UI/TTemplateManager.php

Spacing +20 added lines, -20 removed lines

@@ -39,11 +39,11 @@ 
 	/**
 	 * Template file extension
 	 */
-	const TEMPLATE_FILE_EXT = '.tpl';
+	const TEMPLATE_FILE_EXT='.tpl';
 	/**
 	 * Prefix of the cache variable name for storing parsed templates
 	 */
-	const TEMPLATE_CACHE_PREFIX = 'prado:template:';
+	const TEMPLATE_CACHE_PREFIX='prado:template:';
 
 	/**
 	 * Initializes the module.
@@ -62,8 +62,8 @@ 
 	 */
 	public function getTemplateByClassName($className)
 	{
-		$class = new \ReflectionClass($className);
-		$tplFile = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $class->getShortName() . self::TEMPLATE_FILE_EXT;
+		$class=new \ReflectionClass($className);
+		$tplFile=dirname($class->getFileName()).DIRECTORY_SEPARATOR.$class->getShortName().self::TEMPLATE_FILE_EXT;
 		return $this->getTemplateByFileName($tplFile);
 	}
 
@@ -73,38 +73,38 @@ 
 	 */
 	public function getTemplateByFileName($fileName)
 	{
-		if(($fileName = $this->getLocalizedTemplate($fileName)) !== null)
+		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
 			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
-			if(($cache = $this->getApplication()->getCache()) === null)
+			if(($cache=$this->getApplication()->getCache())===null)
 				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
-				$array = $cache->get(self::TEMPLATE_CACHE_PREFIX . $fileName);
+				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
-					list($template, $timestamps) = $array;
-					if($this->getApplication()->getMode() === TApplicationMode::Performance)
+					list($template, $timestamps)=$array;
+					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
-					$cacheValid = true;
+					$cacheValid=true;
 					foreach($timestamps as $tplFile => $timestamp)
 					{
 						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
-							$cacheValid = false;
+							$cacheValid=false;
 							break;
 						}
 					}
 					if($cacheValid)
 						return $template;
 				}
-				$template = new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
-				$includedFiles = $template->getIncludedFiles();
-				$timestamps = [];
-				$timestamps[$fileName] = filemtime($fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
+				$includedFiles=$template->getIncludedFiles();
+				$timestamps=[];
+				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
-					$timestamps[$includedFile] = filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX . $fileName, [$template,$timestamps]);
+					$timestamps[$includedFile]=filemtime($includedFile);
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, [$template, $timestamps]);
 				return $template;
 			}
 		}
@@ -119,11 +119,11 @@ 
 	 */
 	protected function getLocalizedTemplate($filename)
 	{
-		if(($app = $this->getApplication()->getGlobalization(false)) === null)
-			return is_file($filename)?$filename:null;
+		if(($app=$this->getApplication()->getGlobalization(false))===null)
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
-			if(($file = realpath($file)) !== false && is_file($file))
+			if(($file=realpath($file))!==false && is_file($file))
 				return $file;
 		}
 		return null;