pradosoft / prado

framework/Web/UI/ActiveControls/TActiveTableRow.php

Spacing +11 added lines, -11 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		if ($param instanceof TActiveTableCellEventParameter)
+		if($param instanceof TActiveTableCellEventParameter)
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
@@ -147,7 +147,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnRowSelected'))
+		if($this->hasEventHandler('OnRowSelected'))
 			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -160,10 +160,10 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getHasPreRendered())
+		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
+			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else
@@ -171,9 +171,9 @@ 
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
-			if ($this->getHasControls())
+			if($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
+				foreach($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
 					$control->getActiveControl()->setEnableUpdate(false);
 			}
 		}
@@ -199,8 +199,8 @@ 
 	 */
 	public function getRowIndex()
 	{
-		foreach ($this->getTable()->getRows() as $key => $row)
-			if ($row == $this) return $key;
+		foreach($this->getTable()->getRows() as $key => $row)
+			if($row == $this) return $key;
 		throw new TConfigurationException('tactivetablerow_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	public function getTable()
 	{
-		if ($this->_table === null)
+		if($this->_table === null)
 		{
 			$table = $this->getParent();
-			while (!($table instanceof TTable) && $table !== null)
+			while(!($table instanceof TTable) && $table !== null)
 			{
 				$table = $table->getParent();
 			}
-			if ($table instanceof TTable) $this->_table = $table;
+			if($table instanceof TTable) $this->_table = $table;
 			else throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
 		}
 		return $this->_table;

Braces +8 added lines, -8 removed lines

@@ -121,8 +121,7 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -165,16 +164,16 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+		} else
 		{
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableRow on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
 			if ($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
-					$control->getActiveControl()->setEnableUpdate(false);
+				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control) {
+									$control->getActiveControl()->setEnableUpdate(false);
+				}
 			}
 		}
 	}
@@ -199,8 +198,9 @@ 
 	 */
 	public function getRowIndex()
 	{
-		foreach ($this->getTable()->getRows() as $key => $row)
-			if ($row == $this) return $key;
+		foreach ($this->getTable()->getRows() as $key => $row) {
+					if ($row == $this) return $key;
+		}
 		throw new TConfigurationException('tactivetablerow_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 

framework/Web/UI/ActiveControls/TActiveFileUpload.php

Braces +7 added lines, -10 removed lines

@@ -239,13 +239,11 @@ 
 				// this is the most secure method, file info can't be forged from client side, no matter what
 				$token = md5('TActiveFileUpload::Params::' . $this->ClientID . '::' . rand(1000 * 1000, 9999 * 1000));
 				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
 				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		return $token;
@@ -259,13 +257,11 @@ 
 				assert($v != '');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
 				$params = unserialize($v);
-			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+			} elseif ($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$v = $mgr->decrypt(base64_decode(urldecode($token)));
 				$params = unserialize($v);
-			}
-		else
+			} else
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
 		assert($params instanceof TActiveFileUploadCallbackParams);
@@ -346,10 +342,11 @@ 
 	public function onUnload($param){
 		if ($this->getPage()->getIsCallback())
 		{
-		  foreach($this->getFiles() as $file)
-			if($file->getHasFile() && file_exists($file->getLocalName())){
+		  foreach($this->getFiles() as $file) {
+		  			if($file->getHasFile() && file_exists($file->getLocalName())){
 			  unlink($file->getLocalName());
 		  }
+		  }
 		}
 		parent::onUnload($param);
 	}

Spacing +34 added lines, -34 removed lines

@@ -89,7 +89,7 @@ 
 	 * TActiveControlAdapter. If you override this class, be sure to set the
 	 * adapter appropriately by, for example, by calling this constructor.
 	 */
-	public function __construct(){
+	public function __construct() {
 		parent::__construct();
 		$this->setAdapter(new TActiveControlAdapter($this));
 	}
@@ -114,10 +114,10 @@ 
 	 */
 	public function onFileUpload($param)
 	{
-		if ($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()){
+		if($this->_flag->getValue() && $this->getPage()->getIsPostBack() && $param == $this->_target->getUniqueID()) {
 		  $params = new TActiveFileUploadCallbackParams;
 		  // save the files so that they will persist past the end of this return.
-		  foreach ($this->getFiles() as $file) {
+		  foreach($this->getFiles() as $file) {
 			  $localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			  $file->saveAs($localName);
 			  $file->setLocalName($localName);
@@ -129,7 +129,7 @@ 
           	 Options = new Object();
           	 Options.clientID = '{$this->getClientID()}';
           	 Options.targetID = '{$this->_target->getUniqueID()}';
-          	 Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+          	 Options.errorCode = '" . (int) !$this->getHasAllFiles() . "';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
           	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
              Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
@@ -146,7 +146,7 @@ 
 	 * @return string the path where the uploaded file will be stored temporarily, in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function getTempPath(){
+	public function getTempPath() {
 		return $this->getViewState('TempPath', 'Application.runtime.*');
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param string the path where the uploaded file will be stored temporarily in namespace format
 	 * default "Application.runtime.*"
 	 */
-	public function setTempPath($value){
+	public function setTempPath($value) {
 		$this->setViewState('TempPath', $value, 'Application.runtime.*');
 	}
 
@@ -162,7 +162,7 @@ 
 	 * @return boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function getAutoPostBack(){
+	public function getAutoPostBack() {
 		return $this->getViewState('AutoPostBack', true);
 	}
 
@@ -170,28 +170,28 @@ 
 	 * @param boolean a value indicating whether an automatic callback to the server will occur whenever the user modifies the text in the TTextBox control and then tabs out of the component. Defaults to true.
 	 * Note: When set to false, you will need to trigger the callback yourself.
 	 */
-	public function setAutoPostBack($value){
+	public function setAutoPostBack($value) {
 		$this->setViewState('AutoPostBack', TPropertyValue::ensureBoolean($value), true);
 	}
 
 	/**
 	 * @return string A chuck of javascript that will need to be called if {{@link getAutoPostBack AutoPostBack} is set to false}
 	 */
-	public function getCallbackJavascript(){
+	public function getCallbackJavascript() {
 		return "Prado.WebUI.TActiveFileUpload.fileChanged(\"{$this->getClientID()}\")";
 	}
 
 	/**
 	 * @throws TInvalidDataValueException if the {@link getTempPath TempPath} is not writable.
 	 */
-	public function onInit($sender){
+	public function onInit($sender) {
 		parent::onInit($sender);
 
-		if (!Prado::getApplication()->getCache())
-		  if (!Prado::getApplication()->getSecurityManager())
+		if(!Prado::getApplication()->getCache())
+		  if(!Prado::getApplication()->getSecurityManager())
 			throw new Exception('TActiveFileUpload needs either an application level cache or a security manager to work securely');
 
-		if (!is_writable(Prado::getPathOfNamespace($this->getTempPath()))){
+		if(!is_writable(Prado::getPathOfNamespace($this->getTempPath()))) {
 			throw new TInvalidDataValueException("activefileupload_temppath_invalid", $this->getTempPath());
 		}
 	}
@@ -203,9 +203,9 @@ 
 	 * This method is mainly used by framework and control developers.
 	 * @param TCallbackEventParameter $param the event parameter
 	 */
-	public function raiseCallbackEvent($param){
+	public function raiseCallbackEvent($param) {
 		$cp = $param->getCallbackParameter();
-		if ($key = $cp->targetID == $this->_target->getUniqueID()){
+		if($key = $cp->targetID == $this->_target->getUniqueID()) {
 
 			$params = $this->popParamsByToken($cp->callbackToken);
 	  foreach($params->files as $index => $file)
@@ -234,13 +234,13 @@ 
 
 	protected function pushParamsAndGetToken(TActiveFileUploadCallbackParams $params)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache = Prado::getApplication()->getCache())
 			{
 				// this is the most secure method, file info can't be forged from client side, no matter what
 				$token = md5('TActiveFileUpload::Params::' . $this->ClientID . '::' . rand(1000 * 1000, 9999 * 1000));
 				$cache->set($token, serialize($params), 5 * 60); // expire in 5 minutes - the callback should arrive back in seconds, actually
 			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+		elseif($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				// this is a less secure method, file info can be still forged from client side, but only if attacker knows the secret application key
 				$token = urlencode(base64_encode($mgr->encrypt(serialize($params))));
@@ -253,14 +253,14 @@ 
 
 	protected function popParamsByToken($token)
 	{
-		if ($cache = Prado::getApplication()->getCache())
+		if($cache = Prado::getApplication()->getCache())
 			{
 				$v = $cache->get($token);
 				assert($v != '');
 				$cache->delete($token); // remove it from cache so it can't be used again and won't take up space either
 				$params = unserialize($v);
 			}
-		elseif ($mgr = Prado::getApplication()->getSecurityManager())
+		elseif($mgr = Prado::getApplication()->getSecurityManager())
 			{
 				$v = $mgr->decrypt(base64_decode(urldecode($token)));
 				$params = unserialize($v);
@@ -283,7 +283,7 @@ 
 		if(!$this->getPage()->getIsPostBack() && isset($_GET['TActiveFileUpload_InputId']) && isset($_GET['TActiveFileUpload_TargetId']) && $_GET['TActiveFileUpload_InputId'] == $this->getClientID())
 		{
 		  $params = new TActiveFileUploadCallbackParams;
-		  foreach ($this->getFiles() as $file) {
+		  foreach($this->getFiles() as $file) {
 			$localName = str_replace('\\', '/', tempnam(Prado::getPathOfNamespace($this->getTempPath()), ''));
 			$file->setLocalName($localName);
 			// tricky workaround to intercept "uploaded file too big" error: real uploads happens in onFileUpload instead
@@ -295,7 +295,7 @@ 
           	 Options = new Object();
           	 Options.clientID = '{$_GET['TActiveFileUpload_InputId']}';
           	 Options.targetID = '{$_GET['TActiveFileUpload_TargetId']}';
-			       Options.errorCode = '" . (int)!$this->getHasAllFiles() . "';
+			       Options.errorCode = '" . (int) !$this->getHasAllFiles() . "';
           	 Options.callbackToken = '{$this->pushParamsAndGetToken($params)}';
           	 Options.fileName = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileName') : $this->getFileName(), JSON_HEX_APOS) . "';
              Options.fileSize = '" . TJavaScript::jsonEncode($this->getMultiple() ? array_column($params->files, 'fileSize') : $this->getFileSize(), JSON_HEX_APOS) . "';
@@ -343,11 +343,11 @@ 
 	/**
 	 * Removes localfile on ending of the callback.
 	 */
-	public function onUnload($param){
-		if ($this->getPage()->getIsCallback())
+	public function onUnload($param) {
+		if($this->getPage()->getIsCallback())
 		{
 		  foreach($this->getFiles() as $file)
-			if($file->getHasFile() && file_exists($file->getLocalName())){
+			if($file->getHasFile() && file_exists($file->getLocalName())) {
 			  unlink($file->getLocalName());
 		  }
 		}
@@ -357,7 +357,7 @@ 
 	/**
 	 * @return TBaseActiveCallbackControl standard callback control options.
 	 */
-	public function getActiveControl(){
+	public function getActiveControl() {
 		return $this->getAdapter()->getBaseActiveControl();
 	}
 
@@ -373,7 +373,7 @@ 
 	 * Adds ID attribute, and renders the javascript for active component.
 	 * @param THtmlWriter $writer the writer used for the rendering purpose
 	 */
-	public function addAttributesToRender($writer){
+	public function addAttributesToRender($writer) {
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
 
@@ -383,7 +383,7 @@ 
 	/**
 	 * @return string corresponding javascript class name for this control.
 	 */
-	protected function getClientClassName(){
+	protected function getClientClassName() {
 		return 'Prado.WebUI.TActiveFileUpload';
 	}
 
@@ -397,7 +397,7 @@ 
 	 * 					completeID => complete client ID,
 	 * 					errorID => error client ID)
 	 */
-	protected function getClientOptions(){
+	protected function getClientOptions() {
 		$options['ID'] = $this->getClientID();
 		$options['EventTarget'] = $this->getUniqueID();
 
@@ -419,9 +419,9 @@ 
 	 * If true, you will not be able to save the uploaded file again.
 	 * @return boolean true if the file saving is successful
 	 */
-	public function saveAs($fileName, $deleteTempFile = true, $index = 0){
-		if (($this->getErrorCode($index) === UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))){
-			if ($deleteTempFile)
+	public function saveAs($fileName, $deleteTempFile = true, $index = 0) {
+		if(($this->getErrorCode($index) === UPLOAD_ERR_OK) && (file_exists($this->getLocalName($index)))) {
+			if($deleteTempFile)
 				return rename($this->getLocalName($index), $fileName);
 			else
 				return copy($this->getLocalName($index), $fileName);
@@ -433,7 +433,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		completes successfully.
 	 */
-	public function getSuccessImage(){
+	public function getSuccessImage() {
 		$this->ensureChildControls();
 		return $this->_success;
 	}
@@ -442,7 +442,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		does not complete successfully.
 	 */
-	public function getErrorImage(){
+	public function getErrorImage() {
 		$this->ensureChildControls();
 		return $this->_error;
 	}
@@ -451,7 +451,7 @@ 
 	 * @return TImage the image displayed when an upload
 	 * 		is in progress.
 	 */
-	public function getBusyImage(){
+	public function getBusyImage() {
 		$this->ensureChildControls();
 		return $this->_busy;
 	}

framework/Web/UI/ActiveControls/TActiveTableCell.php

Spacing +10 added lines, -10 removed lines

@@ -129,7 +129,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnCellSelected'))
+		if($this->hasEventHandler('OnCellSelected'))
 			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
 	}
 
@@ -142,19 +142,19 @@ 
 	 */
 	public function render($writer)
 	{
-		if ($this->getHasPreRendered())
+		if($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
+			if($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
 		}
 		else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableCell on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
-			if ($this->getHasControls())
+			if($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
+				foreach($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
 					$control->getActiveControl()->setEnableUpdate(false);
 			}
 		}
@@ -180,8 +180,8 @@ 
 	 */
 	public function getCellIndex()
 	{
-		foreach ($this->getRow()->getCells() as $key => $row)
-			if ($row == $this) return $key;
+		foreach($this->getRow()->getCells() as $key => $row)
+			if($row == $this) return $key;
 		throw new TConfigurationException('tactivetablecell_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 
@@ -192,14 +192,14 @@ 
 	 */
 	public function getRow()
 	{
-		if ($this->_row === null)
+		if($this->_row === null)
 		{
 			$row = $this->getParent();
-			while (!($row instanceof TTableRow) && $row !== null)
+			while(!($row instanceof TTableRow) && $row !== null)
 			{
 				$row = $row->getParent();
 			}
-			if ($row instanceof TTableRow) $this->_row = $row;
+			if($row instanceof TTableRow) $this->_row = $row;
 			else throw new TConfigurationException('tactivetablecell_control_outoftable', get_class($this), $this->getUniqueID());
 		}
 		return $this->_row;

Braces +7 added lines, -6 removed lines

@@ -147,15 +147,15 @@ 
 			parent::render($writer);
 			if ($this->getActiveControl()->canUpdateClientSide())
 				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else {
+		} else {
 			$this->getPage()->getAdapter()->registerControlToRender($this, $writer);
 			// If we update a TActiveTableCell on callback, we shouldn't update all childs,
 			// because the whole content will be replaced by the parent.
 			if ($this->getHasControls())
 			{
-				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control)
-					$control->getActiveControl()->setEnableUpdate(false);
+				foreach ($this->findControlsByType('Prado\Web\UI\ActiveControls\IActiveControl', false) as $control) {
+									$control->getActiveControl()->setEnableUpdate(false);
+				}
 			}
 		}
 	}
@@ -180,8 +180,9 @@ 
 	 */
 	public function getCellIndex()
 	{
-		foreach ($this->getRow()->getCells() as $key => $row)
-			if ($row == $this) return $key;
+		foreach ($this->getRow()->getCells() as $key => $row) {
+					if ($row == $this) return $key;
+		}
 		throw new TConfigurationException('tactivetablecell_control_notincollection', get_class($this), $this->getUniqueID());
 	}
 

framework/Web/UI/TCompositeLiteral.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	public function evaluateDynamicContent()
 	{
-		$context = $this->_container === null?$this:$this->_container;
+		$context = $this->_container === null ? $this : $this->_container;
 		foreach($this->_expressions as $id => $expression)
 			$this->_items[$id] = $context->evaluateExpression($expression);
 		foreach($this->_statements as $id => $statement)
@@ -92,7 +92,7 @@ 
 	 */
 	public function dataBind()
 	{
-		$context = $this->_container === null?$this:$this->_container;
+		$context = $this->_container === null ? $this : $this->_container;
 		foreach($this->_bindings as $id => $binding)
 			$this->_items[$id] = $context->evaluateExpression($binding);
 	}

Braces +10 added lines, -8 removed lines

@@ -52,8 +52,7 @@ 
 				elseif($item[0] === self::TYPE_DATABINDING)
 					$this->_bindings[$id] = $item[1];
 				$this->_items[$id] = '';
-			}
-			else
+			} else
 				$this->_items[$id] = $item;
 		}
 	}
@@ -80,10 +79,12 @@ 
 	public function evaluateDynamicContent()
 	{
 		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_expressions as $id => $expression)
-			$this->_items[$id] = $context->evaluateExpression($expression);
-		foreach($this->_statements as $id => $statement)
-			$this->_items[$id] = $context->evaluateStatements($statement);
+		foreach($this->_expressions as $id => $expression) {
+					$this->_items[$id] = $context->evaluateExpression($expression);
+		}
+		foreach($this->_statements as $id => $statement) {
+					$this->_items[$id] = $context->evaluateStatements($statement);
+		}
 	}
 
 	/**
@@ -93,8 +94,9 @@ 
 	public function dataBind()
 	{
 		$context = $this->_container === null?$this:$this->_container;
-		foreach($this->_bindings as $id => $binding)
-			$this->_items[$id] = $context->evaluateExpression($binding);
+		foreach($this->_bindings as $id => $binding) {
+					$this->_items[$id] = $context->evaluateExpression($binding);
+		}
 	}
 
 	/**

framework/Web/UI/JuiControls/TJuiDialog.php

Braces +4 added lines, -4 removed lines

@@ -108,9 +108,10 @@ 
 		if(!isset($options['appendTo']))
 			$options['appendTo'] = 'form:first';
 
-		foreach($this->getControls() as $control)
-			if($control instanceof TJuiDialogButton)
+		foreach($this->getControls() as $control) {
+					if($control instanceof TJuiDialogButton)
 				$options['buttons'][] = $control->getPostBackOptions();
+		}
 
 		return $options;
 	}
@@ -193,8 +194,7 @@ 
 		{
 		  parent::renderContents($writer);
 			$this->getPage()->getCallbackClient()->replaceContent($this, $writer, false);
-		}
-		else
+		} else
 			parent::render($writer);
 	}
 }

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options = $this->getViewState('JuiOptions')) === null)
+		if(($options = $this->getViewState('JuiOptions')) === null)
 		{
 		  $options = new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -144,7 +144,7 @@ 
 	 * Raises the OnCreate event
 	 * @param object $params event parameters
 	 */
-	public function onOpen ($params)
+	public function onOpen($params)
 	{
 		$this->raiseEvent('OnOpen', $this, $params);
 	}

framework/Web/UI/JuiControls/TJuiControlOptions.php

Braces +3 added lines, -2 removed lines

@@ -141,9 +141,10 @@
 	{
 		$ret = ($this->_options === null) ? [] : $this->_options;
 
-		foreach($this->_control->getValidEvents() as $event)
-			if($this->_control->hasEventHandler('on' . $event))
+		foreach($this->_control->getValidEvents() as $event) {
+					if($this->_control->hasEventHandler('on' . $event))
 				$ret[$event] = new TJavaScriptLiteral("function( event, ui ) { Prado.JuiCallback(" . TJavaScript::encode($this->_control->getUniqueID()) . ", " . TJavaScript::encode($event) . ", event, ui, this); }");
+		}
 
 		return $ret;
 	}

framework/Web/UI/JuiControls/TJuiCallbackPageStateTracker.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	 */
   protected function updateJuiOptions($options)
   {
-	foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	foreach ($options as $key => $value) {
+		$options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	}
 	$code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
 	$this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	 */
   protected function updateJuiOptions($options)
   {
-	foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	foreach($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
 	$code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
 	$this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }

framework/Web/UI/JuiControls/TJuiEventParameter.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	{
 		$control = null;
 		$service = Prado::getApplication()->getService();
-		if ($service instanceof TPageService)
+		if($service instanceof TPageService)
 		{
 			// Find the control
 			// Warning, this will not work if you have a '_' in your control Id !

framework/Web/UI/TTemplate.php

Braces +36 added lines, -60 removed lines

@@ -233,8 +233,9 @@ 
 					$component->trackViewState(false);
 
 					$component->applyStyleSheetSkin($page);
-					foreach($properties as $name => $value)
-						$this->configureControl($component, $name, $value);
+					foreach($properties as $name => $value) {
+											$this->configureControl($component, $name, $value);
+					}
 
 					$component->trackViewState(true);
 
@@ -244,8 +245,7 @@ 
 						$component->createdOnTemplate($parent);
 					if($component->getAllowChildControls())
 						$controls[$key] = $component;
-				}
-				elseif($component instanceof TComponent)
+				} elseif($component instanceof TComponent)
 				{
 					$controls[$key] = $component;
 					if(isset($properties['id']))
@@ -256,15 +256,15 @@ 
 						if(!$component->hasProperty('id'))
 							unset($properties['id']);
 					}
-					foreach($properties as $name => $value)
-						$this->configureComponent($component, $name, $value);
+					foreach($properties as $name => $value) {
+											$this->configureComponent($component, $name, $value);
+					}
 					if($parent === $parentControl)
 						$directChildren[] = $component;
 					else
 						$component->createdOnTemplate($parent);
 				}
-			}
-			else
+			} else
 			{
 				if($object[1] instanceof TCompositeLiteral)
 				{
@@ -275,8 +275,7 @@ 
 						$directChildren[] = $o;
 					else
 						$parent->addParsedObject($o);
-				}
-				else
+				} else
 				{
 					if($parent === $parentControl)
 						$directChildren[] = $object[1];
@@ -387,8 +386,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			if (substr($name, 0, 2) == 'js')
 				if ($value and !($value instanceof TJavaScriptLiteral))
@@ -436,8 +434,7 @@ 
 					throw new TConfigurationException('template_tag_unexpected', $name, $value[1]);
 					break;
 			}
-		}
-		else
+		} else
 			$component->setSubProperty($name, $value);
 	}
 
@@ -498,8 +495,7 @@ 
 						$stack[] = $type;
 						$container = $c - 1;
 					}
-				}
-				elseif(strpos($str, '</com:') === 0)	// closing component tag
+				} elseif(strpos($str, '</com:') === 0)	// closing component tag
 				{
 					if($expectPropEnd)
 						continue;
@@ -518,8 +514,7 @@ 
 						throw new TConfigurationException('template_closingtag_expected', $tag, "</com:$type>");
 					}
 					$container = $tpl[$container][0];
-				}
-				elseif(strpos($str, '<%@') === 0)	// directive
+				} elseif(strpos($str, '<%@') === 0)	// directive
 				{
 					if($expectPropEnd)
 						continue;
@@ -529,8 +524,7 @@ 
 					if(isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
 					$this->_directive = $this->parseAttributes($match[4][0], $match[4][1]);
-				}
-				elseif(strpos($str, '<%') === 0)	// expression
+				} elseif(strpos($str, '<%') === 0)	// expression
 				{
 					if($expectPropEnd)
 						continue;
@@ -555,8 +549,7 @@ 
 						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
 						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
 					}
-				}
-				elseif(strpos($str, '<prop:') === 0)	// opening property
+				} elseif(strpos($str, '<prop:') === 0)	// opening property
 				{
 					if(strrpos($str, '/>') === strlen($str) - 2)  //subproperties
 					{
@@ -568,8 +561,9 @@ 
 						$prop = strtolower($match[6][0]);
 						$attrs = $this->parseAttributes($match[7][0], $match[7][1]);
 						$attributes = [];
-						foreach($attrs as $name => $value)
-							$attributes[$prop . '.' . $name] = $value;
+						foreach($attrs as $name => $value) {
+													$attributes[$prop . '.' . $name] = $value;
+						}
 						$type = $tpl[$container][1];
 						$this->validateAttributes($type, $attributes);
 						foreach($attributes as $name => $value)
@@ -578,8 +572,7 @@ 
 								throw new TConfigurationException('template_property_duplicated', $name);
 							$tpl[$container][2][$name] = $value;
 						}
-					}
-					else  // regular property
+					} else  // regular property
 					{
 						$prop = strtolower($match[3][0]);
 						$stack[] = '@' . $prop;
@@ -591,8 +584,7 @@ 
 							$expectPropEnd = true;
 						}
 					}
-				}
-				elseif(strpos($str, '</prop:') === 0)	// closing property
+				} elseif(strpos($str, '</prop:') === 0)	// closing property
 				{
 					$prop = strtolower($match[3][0]);
 					if(empty($stack))
@@ -619,23 +611,20 @@ 
 								if(isset($tpl[$container][2][$prop]))
 									throw new TConfigurationException('template_property_duplicated', $prop);
 								$tpl[$container][2][$prop] = $value;
-							}
-							else	// a property for the template control
+							} else	// a property for the template control
 								$this->_directive[$prop] = $value;
 							$textStart = $matchEnd + 1;
 						}
 						$expectPropEnd = false;
 					}
-				}
-				elseif(strpos($str, '<!--') === 0)	// comments
+				} elseif(strpos($str, '<!--') === 0)	// comments
 				{
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
 						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
-				}
-				else
+				} else
 					throw new TConfigurationException('template_matching_unexpected', $match);
 			}
 			if(!empty($stack))
@@ -646,8 +635,7 @@ 
 			}
 			if($textStart < strlen($input))
 				$tpl[$c++] = [$container,substr($input, $textStart)];
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -680,14 +668,12 @@ 
 				{
 					$parent = null;
 					$objects[$id] = $object;
-				}
-				else
+				} else
 				{
 					$parent = $object[0];
 					$merged = [$parent,[$object[1]]];
 				}
-			}
-			else
+			} else
 				$merged[1][] = $object[1];
 		}
 		if($parent !== null)
@@ -726,8 +712,7 @@ 
 					$attributes[$name] = $this->parseTemplateProperty(substr($value, 1, strlen($value) - 2), $match[2][1] + 1);
 				else
 					$attributes[$name] = $this->parseTemplateProperty($value, $match[2][1]);
-			}
-			else
+			} else
 			{
 				if($value[0] === '\'' || $value[0] === '"')
 					$attributes[$name] = $this->parseAttribute(substr($value, 1, strlen($value) - 2));
@@ -776,8 +761,7 @@ 
 				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
 			else
 				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
-		}
-		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
+		} elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
 			$value = $matches[1];
 			if($value[2] === '~')
@@ -790,8 +774,7 @@ 
 				$literal = trim(substr($value, 3, strlen($value) - 5));
 				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
-		}
-		else
+		} else
 			return $value;
 	}
 
@@ -813,16 +796,14 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 				{
 					// an event
 					if(!$class->hasMethod($name))
 						throw new TConfigurationException('template_event_unknown', $type, $name);
 					elseif(!is_string($att))
 						throw new TConfigurationException('template_eventhandler_invalid', $type, $name);
-				}
-				else
+				} else
 				{
 					// a simple property
 					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
@@ -831,8 +812,7 @@ 
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
-					}
-					elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
+					} elseif(is_array($att) && $att[0] !== self::CONFIG_EXPRESSION)
 					{
 						if(strcasecmp($name, 'id') === 0)
 							throw new TConfigurationException('template_controlid_invalid', $type);
@@ -841,8 +821,7 @@ 
 					}
 				}
 			}
-		}
-		elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
+		} elseif(is_subclass_of($className, '\Prado\TComponent') || $className === '\Prado\TComponent')
 		{
 			foreach($attributes as $name => $att)
 			{
@@ -854,8 +833,7 @@ 
 					$subname = substr($name, 0, $pos);
 					if(!$class->hasMethod('get' . $subname))
 						throw new TConfigurationException('template_property_unknown', $type, $subname);
-				}
-				elseif(strncasecmp($name, 'on', 2) === 0)
+				} elseif(strncasecmp($name, 'on', 2) === 0)
 					throw new TConfigurationException('template_event_forbidden', $type, $name);
 				else
 				{
@@ -869,8 +847,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('template_component_required', $type);
 		return $class->getName();
 	}
@@ -906,8 +883,7 @@ 
 						$line = $line - $this->_includeAtLine[$i] + 1;
 						$srcFile = $this->_includedFiles[$i];
 						break;
-					}
-					else
+					} else
 						$line = $line - $this->_includeLines[$i] + 1;
 				}
 			}

Spacing +44 added lines, -44 removed lines

@@ -337,9 +337,9 @@ 
 	protected function configureEvent($control, $name, $value, $contextControl)
 	{
 		if(strpos($value, '.') === false)
-			$control->attachEventHandler($name, [$contextControl,'TemplateControl.' . $value]);
+			$control->attachEventHandler($name, [$contextControl, 'TemplateControl.' . $value]);
 		else
-			$control->attachEventHandler($name, [$contextControl,$value]);
+			$control->attachEventHandler($name, [$contextControl, $value]);
 	}
 
 	/**
@@ -390,8 +390,8 @@ 
 		}
 		else
 		{
-			if (substr($name, 0, 2) == 'js')
-				if ($value and !($value instanceof TJavaScriptLiteral))
+			if(substr($name, 0, 2) == 'js')
+				if($value and !($value instanceof TJavaScriptLiteral))
 					$value = new TJavaScriptLiteral($value);
 			$setter = 'set' . $name;
 			$component->$setter($value);
@@ -476,7 +476,7 @@ 
 		$this->_directive = null;
 		try
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$match = &$matches[$i];
 				$str = $match[0][0];
@@ -487,12 +487,12 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$type = $match[1][0];
 					$attributes = $this->parseAttributes($match[2][0], $match[2][1]);
 					$class = $this->validateAttributes($type, $attributes);
-					$tpl[$c++] = [$container,$class,$attributes];
+					$tpl[$c++] = [$container, $class, $attributes];
 					if($str[strlen($str) - 2] !== '/')  // open tag
 					{
 						$stack[] = $type;
@@ -504,7 +504,7 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$type = $match[1][0];
 
@@ -524,7 +524,7 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					if(isset($tpl[0]) || $this->_directive !== null)
 						throw new TConfigurationException('template_directive_nonunique');
@@ -535,25 +535,25 @@ 
 					if($expectPropEnd)
 						continue;
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 					$literal = trim($match[5][0]);
 					if($str[2] === '=')	// expression
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, $literal]];
 					elseif($str[2] === '%')  // statements
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_STATEMENTS,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_STATEMENTS, $literal]];
 					elseif($str[2] === '#')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_DATABINDING,$literal]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_DATABINDING, $literal]];
 					elseif($str[2] === '$')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->getApplication()->getParameters()->itemAt('$literal')"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->getApplication()->getParameters()->itemAt('$literal')"]];
 					elseif($str[2] === '~')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"\$this->publishFilePath('$this->_contextPath/$literal')"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "\$this->publishFilePath('$this->_contextPath/$literal')"]];
 					elseif($str[2] === '/')
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"]];
 					elseif($str[2] === '[')
 					{
-						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'","\\" => "\\\\"]);
-						$tpl[$c++] = [$container,[TCompositeLiteral::TYPE_EXPRESSION,"Prado::localize('$literal')"]];
+						$literal = strtr(trim(substr($literal, 0, strlen($literal) - 1)), ["'" => "\'", "\\" => "\\\\"]);
+						$tpl[$c++] = [$container, [TCompositeLiteral::TYPE_EXPRESSION, "Prado::localize('$literal')"]];
 					}
 				}
 				elseif(strpos($str, '<prop:') === 0)	// opening property
@@ -563,7 +563,7 @@ 
 						if($expectPropEnd)
 							continue;
 						if($matchStart > $textStart)
-							$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+							$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 						$textStart = $matchEnd + 1;
 						$prop = strtolower($match[6][0]);
 						$attrs = $this->parseAttributes($match[7][0], $match[7][1]);
@@ -586,7 +586,7 @@ 
 						if(!$expectPropEnd)
 						{
 							if($matchStart > $textStart)
-								$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+								$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 							$textStart = $matchEnd + 1;
 							$expectPropEnd = true;
 						}
@@ -632,7 +632,7 @@ 
 					if($expectPropEnd)
 						throw new TConfigurationException('template_comments_forbidden');
 					if($matchStart > $textStart)
-						$tpl[$c++] = [$container,substr($input, $textStart, $matchStart - $textStart)];
+						$tpl[$c++] = [$container, substr($input, $textStart, $matchStart - $textStart)];
 					$textStart = $matchEnd + 1;
 				}
 				else
@@ -645,9 +645,9 @@ 
 				throw new TConfigurationException('template_closingtag_expected', $tag, "nothing");
 			}
 			if($textStart < strlen($input))
-				$tpl[$c++] = [$container,substr($input, $textStart)];
+				$tpl[$c++] = [$container, substr($input, $textStart)];
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			if(($e instanceof TException) && ($e instanceof TTemplateException))
 				throw $e;
@@ -672,9 +672,9 @@ 
 				if($parent !== null)
 				{
 					if(count($merged[1]) === 1 && is_string($merged[1][0]))
-						$objects[$id - 1] = [$merged[0],$merged[1][0]];
+						$objects[$id - 1] = [$merged[0], $merged[1][0]];
 					else
-						$objects[$id - 1] = [$merged[0],new TCompositeLiteral($merged[1])];
+						$objects[$id - 1] = [$merged[0], new TCompositeLiteral($merged[1])];
 				}
 				if(isset($object[2]))
 				{
@@ -684,7 +684,7 @@ 
 				else
 				{
 					$parent = $object[0];
-					$merged = [$parent,[$object[1]]];
+					$merged = [$parent, [$object[1]]];
 				}
 			}
 			else
@@ -693,9 +693,9 @@ 
 		if($parent !== null)
 		{
 			if(count($merged[1]) === 1 && is_string($merged[1][0]))
-				$objects[$id] = [$merged[0],$merged[1][0]];
+				$objects[$id] = [$merged[0], $merged[1][0]];
 			else
-				$objects[$id] = [$merged[0],new TCompositeLiteral($merged[1])];
+				$objects[$id] = [$merged[0], new TCompositeLiteral($merged[1])];
 		}
 		$tpl = $objects;
 		return $objects;
@@ -713,7 +713,7 @@ 
 		$pattern = '/([\w\.\-]+)\s*=\s*(\'.*?\'|".*?"|<%.*?%>)/msS';
 		$attributes = [];
 		$n = preg_match_all($pattern, $str, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		for($i = 0;$i < $n;++$i)
+		for($i = 0; $i < $n; ++$i)
 		{
 			$match = &$matches[$i];
 			$name = strtolower($match[1][0]);
@@ -741,7 +741,7 @@ 
 	protected function parseTemplateProperty($content, $offset)
 	{
 		$line = $this->_startingLine + count(explode("\n", substr($this->_content, 0, $offset))) - 1;
-		return [self::CONFIG_TEMPLATE,new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
+		return [self::CONFIG_TEMPLATE, new TTemplate($content, $this->_contextPath, $this->_tplFile, $line, false)];
 	}
 
 	/**
@@ -756,7 +756,7 @@ 
 			$isDataBind = false;
 			$textStart = 0;
 			$expr = '';
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$match = $matches[0][$i];
 				$token = $match[0];
@@ -765,30 +765,30 @@ 
 				if($token[2] === '#')
 					$isDataBind = true;
 				if($offset > $textStart)
-					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+					$expr .= ".'" . strtr(substr($value, $textStart, $offset - $textStart), ["'" => "\\'", "\\" => "\\\\"]) . "'";
 				$expr .= '.(' . substr($token, 3, $length - 5) . ')';
 				$textStart = $offset + $length;
 			}
 			$length = strlen($value);
 			if($length > $textStart)
-				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'","\\" => "\\\\"]) . "'";
+				$expr .= ".'" . strtr(substr($value, $textStart, $length - $textStart), ["'" => "\\'", "\\" => "\\\\"]) . "'";
 			if($isDataBind)
-				return [self::CONFIG_DATABIND,ltrim($expr, '.')];
+				return [self::CONFIG_DATABIND, ltrim($expr, '.')];
 			else
-				return [self::CONFIG_EXPRESSION,ltrim($expr, '.')];
+				return [self::CONFIG_EXPRESSION, ltrim($expr, '.')];
 		}
 		elseif(preg_match('/\\s*(<%~.*?%>|<%\\$.*?%>|<%\\[.*?\\]%>|<%\/.*?%>)\\s*/msS', $value, $matches) && $matches[0] === $value)
 		{
 			$value = $matches[1];
 			if($value[2] === '~')
-				return [self::CONFIG_ASSET,trim(substr($value, 3, strlen($value) - 5))];
+				return [self::CONFIG_ASSET, trim(substr($value, 3, strlen($value) - 5))];
 			elseif($value[2] === '[')
-				return [self::CONFIG_LOCALIZATION,trim(substr($value, 3, strlen($value) - 6))];
+				return [self::CONFIG_LOCALIZATION, trim(substr($value, 3, strlen($value) - 6))];
 			elseif($value[2] === '$')
-				return [self::CONFIG_PARAMETER,trim(substr($value, 3, strlen($value) - 5))];
+				return [self::CONFIG_PARAMETER, trim(substr($value, 3, strlen($value) - 5))];
 			elseif($value[2] === '/') {
 				$literal = trim(substr($value, 3, strlen($value) - 5));
-				return [self::CONFIG_EXPRESSION,"rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
+				return [self::CONFIG_EXPRESSION, "rtrim(dirname(\$this->getApplication()->getRequest()->getApplicationUrl()), '\/').'/$literal'"];
 			}
 		}
 		else
@@ -825,9 +825,9 @@ 
 				else
 				{
 					// a simple property
-					if (! ($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
+					if(!($class->hasMethod('set' . $name) || $class->hasMethod('setjs' . $name) || $this->isClassBehaviorMethod($class, 'set' . $name)))
 					{
-						if ($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
+						if($class->hasMethod('get' . $name) || $class->hasMethod('getjs' . $name))
 							throw new TConfigurationException('template_property_readonly', $type, $name);
 						else
 							throw new TConfigurationException('template_property_unknown', $type, $name);
@@ -897,7 +897,7 @@ 
 
 		if(($n = count($this->_includedFiles)) > 0) // need to adjust error row number and file name
 		{
-			for($i = $n - 1;$i >= 0;--$i)
+			for($i = $n - 1; $i >= 0; --$i)
 			{
 				if($this->_includeAtLine[$i] <= $line)
 				{
@@ -930,7 +930,7 @@ 
 	{
 		if($n = preg_match_all('/<%include(.*?)%>/', $input, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$filePath = Prado::getPathOfNamespace(trim($matches[$i][1][0]), TTemplateManager::TEMPLATE_FILE_EXT);
 				if($filePath !== null && is_file($filePath))
@@ -942,7 +942,7 @@ 
 				}
 			}
 			$base = 0;
-			for($i = 0;$i < $n;++$i)
+			for($i = 0; $i < $n; ++$i)
 			{
 				$ext = file_get_contents($this->_includedFiles[$i]);
 				$length = strlen($matches[$i][0][0]);