pradosoft / prado

framework/Web/UI/ActiveControls/TActivePageAdapter.php

Spacing +41 added lines, -41 removed lines

@@ -37,40 +37,40 @@ 
 	/**
 	 * Callback response data header name.
 	 */
-	const CALLBACK_DATA_HEADER = 'X-PRADO-DATA';
+	const CALLBACK_DATA_HEADER='X-PRADO-DATA';
 	/**
 	 * Callback response client-side action header name.
 	 */
-	const CALLBACK_ACTION_HEADER = 'X-PRADO-ACTIONS';
+	const CALLBACK_ACTION_HEADER='X-PRADO-ACTIONS';
 	/**
 	 * Callback error header name.
 	 */
-	const CALLBACK_ERROR_HEADER = 'X-PRADO-ERROR';
+	const CALLBACK_ERROR_HEADER='X-PRADO-ERROR';
 	/**
 	 * Callback page state header name.
 	 */
-	const CALLBACK_PAGESTATE_HEADER = 'X-PRADO-PAGESTATE';
+	const CALLBACK_PAGESTATE_HEADER='X-PRADO-PAGESTATE';
 	/**
 	 * Script list header name.
 	 */
-	const CALLBACK_SCRIPTLIST_HEADER = 'X-PRADO-SCRIPTLIST';
+	const CALLBACK_SCRIPTLIST_HEADER='X-PRADO-SCRIPTLIST';
 	/**
 	 * Stylesheet list header name.
 	 */
-	const CALLBACK_STYLESHEETLIST_HEADER = 'X-PRADO-STYLESHEETLIST';
+	const CALLBACK_STYLESHEETLIST_HEADER='X-PRADO-STYLESHEETLIST';
 	/**
 	 * Stylesheet header name.
 	 */
-	const CALLBACK_STYLESHEET_HEADER = 'X-PRADO-STYLESHEET';
+	const CALLBACK_STYLESHEET_HEADER='X-PRADO-STYLESHEET';
 	/**
 	 * Hidden field list header name.
 	 */
-	const CALLBACK_HIDDENFIELDLIST_HEADER = 'X-PRADO-HIDDENFIELDLIST';
+	const CALLBACK_HIDDENFIELDLIST_HEADER='X-PRADO-HIDDENFIELDLIST';
 
 	/**
 	 * Callback redirect url header name.
 	 */
-	const CALLBACK_REDIRECT = 'X-PRADO-REDIRECT';
+	const CALLBACK_REDIRECT='X-PRADO-REDIRECT';
 
 	/**
 	 * @var ICallbackEventHandler callback event handler.
@@ -96,7 +96,7 @@ 
 		parent::__construct($control);
 
 		//TODO: can this be done later?
-		$response = $this->getApplication()->getResponse();
+		$response=$this->getApplication()->getResponse();
 		$response->setAdapter(new TCallbackResponseAdapter($response));
 
 		$this->trapCallbackErrorsExceptions();
@@ -108,7 +108,7 @@ 
 	 */
 	public function processCallbackEvent($writer)
 	{
-		Prado::trace("ActivePage raiseCallbackEvent()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage raiseCallbackEvent()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		$this->raiseCallbackEvent();
 	}
 
@@ -117,11 +117,11 @@ 
 	 * @param TControl control for defered rendering
 	 * @param THtmlWriter the renderer
 	 */
-	public function registerControlToRender($control,$writer)
+	public function registerControlToRender($control, $writer)
 	{
-		$id = $control->getUniqueID();
+		$id=$control->getUniqueID();
 		if(!isset($this->_controlsToRender[$id]))
-			$this->_controlsToRender[$id] = array($control,$writer);
+			$this->_controlsToRender[$id]=array($control, $writer);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 */
 	public function renderCallbackResponse($writer)
 	{
-		Prado::trace("ActivePage renderCallbackResponse()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
-		if(($url = $this->getResponse()->getAdapter()->getRedirectedUrl())===null)
+		Prado::trace("ActivePage renderCallbackResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		if(($url=$this->getResponse()->getAdapter()->getRedirectedUrl())===null)
 			$this->renderResponse($writer);
 		else
 			$this->redirect($url);
@@ -151,7 +151,7 @@ 
 	 */
 	protected function redirect($url)
 	{
-		Prado::trace("ActivePage redirect()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage redirect()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		$this->appendContentPart($this->getResponse(), self::CALLBACK_REDIRECT, $url);
 	}
 
@@ -162,31 +162,31 @@ 
 	 */
 	protected function renderResponse($writer)
 	{
-		Prado::trace("ActivePage renderResponse()",'Prado\Web\UI\ActiveControls\TActivePageAdapter');
+		Prado::trace("ActivePage renderResponse()", 'Prado\Web\UI\ActiveControls\TActivePageAdapter');
 		//renders all the defered render() calls.
 		foreach($this->_controlsToRender as $rid => $forRender)
 			$forRender[0]->render($forRender[1]);
 
-		$response = $this->getResponse();
+		$response=$this->getResponse();
 
 		//send response data in header
 		if($response->getHasAdapter())
 		{
-			$responseData = $response->getAdapter()->getResponseData();
+			$responseData=$response->getAdapter()->getResponseData();
 			if($responseData!==null)
 			{
-				$data = TJavaScript::jsonEncode($responseData);
+				$data=TJavaScript::jsonEncode($responseData);
 
 				$this->appendContentPart($response, self::CALLBACK_DATA_HEADER, $data);
 			}
 		}
 
 		//sends page state in header
-		if(($handler = $this->getCallbackEventTarget()) !== null)
+		if(($handler=$this->getCallbackEventTarget())!==null)
 		{
 			if($handler->getActiveControl()->getClientSide()->getEnablePageStateUpdate())
 			{
-				$pagestate = $this->getPage()->getClientState();
+				$pagestate=$this->getPage()->getClientState();
 				$this->appendContentPart($response, self::CALLBACK_PAGESTATE_HEADER, $pagestate);
 			}
 		}
@@ -197,37 +197,37 @@ 
 		//output the end javascript
 		if($this->getPage()->getClientScript()->hasEndScripts())
 		{
-			$writer = $response->createHtmlWriter();
+			$writer=$response->createHtmlWriter();
 			$this->getPage()->getClientScript()->renderEndScriptsCallback($writer);
 			$this->getPage()->getCallbackClient()->evaluateScript($writer);
 		}
 
 		//output the actions
-		$executeJavascript = $this->getCallbackClientHandler()->getClientFunctionsToExecute();
-		$actions = TJavaScript::jsonEncode($executeJavascript);
+		$executeJavascript=$this->getCallbackClientHandler()->getClientFunctionsToExecute();
+		$actions=TJavaScript::jsonEncode($executeJavascript);
 		$this->appendContentPart($response, self::CALLBACK_ACTION_HEADER, $actions);
 
 
-		$cs = $this->Page->getClientScript();
+		$cs=$this->Page->getClientScript();
 
 		// collect all stylesheet file references
-		$stylesheets = $cs->getStyleSheetUrls();
-		if (count($stylesheets)>0)
+		$stylesheets=$cs->getStyleSheetUrls();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEETLIST_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all stylesheet snippets references
-		$stylesheets = $cs->getStyleSheetCodes();
-		if (count($stylesheets)>0)
+		$stylesheets=$cs->getStyleSheetCodes();
+		if(count($stylesheets) > 0)
 		$this->appendContentPart($response, self::CALLBACK_STYLESHEET_HEADER, TJavaScript::jsonEncode($stylesheets));
 
 		// collect all script file references
-		$scripts = $cs->getScriptUrls();
-		if (count($scripts)>0)
+		$scripts=$cs->getScriptUrls();
+		if(count($scripts) > 0)
 		$this->appendContentPart($response, self::CALLBACK_SCRIPTLIST_HEADER, TJavaScript::jsonEncode($scripts));
 
 		// collect all hidden field references
-		$fields = $cs->getHiddenFields();
-		if (count($fields)>0)
+		$fields=$cs->getHiddenFields();
+		if(count($fields) > 0)
 		$this->appendContentPart($response, self::CALLBACK_HIDDENFIELDLIST_HEADER, TJavaScript::jsonEncode($fields));
 	}
 
@@ -236,7 +236,7 @@ 
 	 */
 	private function appendContentPart($response, $delimiter, $data)
 	{
-		$content = $response->createHtmlWriter();
+		$content=$response->createHtmlWriter();
 		$content->getWriter()->setBoundary($delimiter);
 		$content->write($data);
 	}
@@ -253,8 +253,8 @@ 
 		 {
 			if($callbackHandler instanceof ICallbackEventHandler)
 			{
-				$param = $this->getCallbackEventParameter();
-				$result = new TCallbackEventParameter($this->getResponse(), $param);
+				$param=$this->getCallbackEventParameter();
+				$result=new TCallbackEventParameter($this->getResponse(), $param);
 				$callbackHandler->raiseCallbackEvent($result);
 			}
 			else
@@ -265,7 +265,7 @@ 
 		 }
 		 else
 		 {
-		 	$target = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
+		 	$target=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_TARGET);
 		 	throw new TInvalidCallbackException('callback_invalid_target', $target);
 		 }
 	}
@@ -302,7 +302,7 @@ 
 	{
 		if($this->_callbackEventParameter===null)
 		{
-			$param = $this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
+			$param=$this->getRequest()->itemAt(TPage::FIELD_CALLBACK_PARAMETER);
 			$this->_callbackEventParameter=$param;
 		}
 		return $this->_callbackEventParameter;
@@ -324,7 +324,7 @@ 
 	public function getCallbackClientHandler()
 	{
 		if($this->_callbackClient===null)
-			$this->_callbackClient = new TCallbackClientScript;
+			$this->_callbackClient=new TCallbackClientScript;
 		return $this->_callbackClient;
 	}
 }
\ No newline at end of file

framework/Web/UI/TTemplateManager.php

Spacing +7 added lines, -7 removed lines

@@ -74,21 +74,21 @@ 
 	{
 		if(($fileName=$this->getLocalizedTemplate($fileName))!==null)
 		{
-			Prado::trace("Loading template $fileName",'\Prado\Web\UI\TTemplateManager');
+			Prado::trace("Loading template $fileName", '\Prado\Web\UI\TTemplateManager');
 			if(($cache=$this->getApplication()->getCache())===null)
-				return new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				return new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 			else
 			{
 				$array=$cache->get(self::TEMPLATE_CACHE_PREFIX.$fileName);
 				if(is_array($array))
 				{
-					list($template,$timestamps)=$array;
+					list($template, $timestamps)=$array;
 					if($this->getApplication()->getMode()===TApplicationMode::Performance)
 						return $template;
 					$cacheValid=true;
 					foreach($timestamps as $tplFile=>$timestamp)
 					{
-						if(!is_file($tplFile) || filemtime($tplFile)>$timestamp)
+						if(!is_file($tplFile) || filemtime($tplFile) > $timestamp)
 						{
 							$cacheValid=false;
 							break;
@@ -97,13 +97,13 @@ 
 					if($cacheValid)
 						return $template;
 				}
-				$template=new TTemplate(file_get_contents($fileName),dirname($fileName),$fileName);
+				$template=new TTemplate(file_get_contents($fileName), dirname($fileName), $fileName);
 				$includedFiles=$template->getIncludedFiles();
 				$timestamps=array();
 				$timestamps[$fileName]=filemtime($fileName);
 				foreach($includedFiles as $includedFile)
 					$timestamps[$includedFile]=filemtime($includedFile);
-				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName,array($template,$timestamps));
+				$cache->set(self::TEMPLATE_CACHE_PREFIX.$fileName, array($template, $timestamps));
 				return $template;
 			}
 		}
@@ -119,7 +119,7 @@ 
 	protected function getLocalizedTemplate($filename)
 	{
 		if(($app=$this->getApplication()->getGlobalization(false))===null)
-			return is_file($filename)?$filename:null;
+			return is_file($filename) ? $filename : null;
 		foreach($app->getLocalizedResource($filename) as $file)
 		{
 			if(($file=realpath($file))!==false && is_file($file))

framework/Web/TAssetManager.php

Spacing +26 added lines, -26 removed lines

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