pradosoft / prado

framework/Web/UI/TControlCollection.php

Spacing +4 added lines, -4 removed lines

@@ -60,12 +60,12 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TControl)
+		if ($item instanceof TControl)
 		{
 			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
 		}
-		elseif(is_string($item) || ($item instanceof IRenderable))
+		elseif (is_string($item) || ($item instanceof IRenderable))
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('controlcollection_control_required');
@@ -81,7 +81,7 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($item instanceof TControl)
+		if ($item instanceof TControl)
 			$this->_o->removedControl($item);
 		return $item;
 	}
@@ -92,7 +92,7 @@ 
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
+		if ($this->_o instanceof INamingContainer)
 			$this->_o->clearNamingContainer();
 	}
 }
\ No newline at end of file

Braces +10 added lines, -8 removed lines

@@ -64,11 +64,11 @@ 
 		{
 			parent::insertAt($index, $item);
 			$this->_o->addedControl($item);
+		} elseif(is_string($item) || ($item instanceof IRenderable)) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('controlcollection_control_required');
 		}
-		elseif(is_string($item) || ($item instanceof IRenderable))
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('controlcollection_control_required');
 	}
 
 	/**
@@ -81,8 +81,9 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($item instanceof TControl)
-			$this->_o->removedControl($item);
+		if($item instanceof TControl) {
+					$this->_o->removedControl($item);
+		}
 		return $item;
 	}
 
@@ -92,7 +93,8 @@ 
 	public function clear()
 	{
 		parent::clear();
-		if($this->_o instanceof INamingContainer)
-			$this->_o->clearNamingContainer();
+		if($this->_o instanceof INamingContainer) {
+					$this->_o->clearNamingContainer();
+		}
 	}
 }
\ No newline at end of file

framework/Web/UI/TTheme.php

Spacing +41 added lines, -41 removed lines

@@ -89,33 +89,33 @@ 
 		$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);
-			if(is_array($array))
+			$array = $cache->get(self::THEME_CACHE_PREFIX.$themePath);
+			if (is_array($array))
 			{
 				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				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)
+					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;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
+					if ($cacheValid)
 						$this->_skins = $skins;
 				}
 				else
@@ -127,34 +127,34 @@ 
 				}
 			}
 		}
-		if(!$cacheValid)
+		if (!$cacheValid)
 		{
 			$this->_cssFiles = [];
 			$this->_jsFiles = [];
 			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
+			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);
-					foreach($template->getItems() as $skin)
+					$template = new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
+					foreach ($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  // a text string, ignored
+						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;
+						$id = isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
+						if (isset($this->_skins[$type][$id]))
 							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
 						/*
 						foreach($skin[2] as $name=>$value)
@@ -170,8 +170,8 @@ 
 			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()]);
 		}
 	}
 
@@ -251,22 +251,22 @@ 
 	public function applySkin($control)
 	{
 		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
+		if (($id = $control->getSkinID()) === '')
 			$id = 0;
-		if(isset($this->_skins[$type][$id]))
+		if (isset($this->_skins[$type][$id]))
 		{
-			foreach($this->_skins[$type][$id] as $name => $value)
+			foreach ($this->_skins[$type][$id] as $name => $value)
 			{
 				Prado::trace("Applying skin $name to $type", 'Prado\Web\UI\TThemeManager');
-				if(is_array($value))
+				if (is_array($value))
 				{
-					switch($value[0])
+					switch ($value[0])
 					{
 						case TTemplate::CONFIG_EXPRESSION:
 							$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]);
@@ -285,15 +285,15 @@ 
 							break;
 					}
 				}
-				if(!is_array($value))
+				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->hasProperty($name))
 						{
-							if($control->canSetProperty($name))
+							if ($control->canSetProperty($name))
 							{
-								$setter = 'set' . $name;
+								$setter = 'set'.$name;
 								$control->$setter($value);
 							}
 							else

Braces +50 added lines, -40 removed lines

@@ -97,28 +97,29 @@ 
 				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
 				{
-					if(($dir = opendir($themePath)) === false)
-						throw new TIOException('theme_path_inexistent', $themePath);
+					if(($dir = opendir($themePath)) === false) {
+											throw new TIOException('theme_path_inexistent', $themePath);
+					}
 					$cacheValid = true;
 					while(($file = readdir($dir)) !== false)
 					{
-						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)
+						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)
 						{
 							$cacheValid = false;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
-						$this->_skins = $skins;
-				}
-				else
+					if($cacheValid) {
+											$this->_skins = $skins;
+					}
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -132,30 +133,34 @@ 
 			$this->_cssFiles = [];
 			$this->_jsFiles = [];
 			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
-				throw new TIOException('theme_path_inexistent', $themePath);
+			if(($dir = opendir($themePath)) === false) {
+							throw new TIOException('theme_path_inexistent', $themePath);
+			}
 			while(($file = readdir($dir)) !== false)
 			{
-				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)
+				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)
 				{
 					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
 					foreach($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  // a text string, ignored
+						if(!isset($skin[2])) {
+							// a text string, ignored
 							continue;
-						elseif($skin[0] !== -1)
-							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
+						} 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;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
-							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
+						if(isset($this->_skins[$type][$id])) {
+													throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
+						}
 						/*
 						foreach($skin[2] as $name=>$value)
 						{
@@ -170,8 +175,9 @@ 
 			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()]);
+			}
 		}
 	}
 
@@ -251,8 +257,9 @@ 
 	public function applySkin($control)
 	{
 		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
-			$id = 0;
+		if(($id = $control->getSkinID()) === '') {
+					$id = 0;
+		}
 		if(isset($this->_skins[$type][$id]))
 		{
 			foreach($this->_skins[$type][$id] as $name => $value)
@@ -287,29 +294,32 @@ 
 				}
 				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;
+					}
 								$control->$setter($value);
+							} else {
+															throw new TConfigurationException('theme_property_readonly', $type, $name);
 							}
-							else
-								throw new TConfigurationException('theme_property_readonly', $type, $name);
+						} else {
+													throw new TConfigurationException('theme_property_undefined', $type, $name);
 						}
-						else
-							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else {
+						// complex property
 						$control->setSubProperty($name, $value);
+					}
 				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveTableRow.php

Braces +20 added lines, -13 removed lines

@@ -121,8 +121,9 @@ 
 		{
 			$this->raiseCallbackEvent($param);
 			return true;
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/**
@@ -147,8 +148,9 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->hasEventHandler('OnRowSelected'))
-			$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		if ($this->hasEventHandler('OnRowSelected')) {
+					$this->getActiveControl()->registerCallbackClientScript($this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 
 	/**
@@ -163,18 +165,19 @@ 
 		if ($this->getHasPreRendered())
 		{
 			parent::render($writer);
-			if ($this->getActiveControl()->canUpdateClientSide())
-				$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
-		}
-		else
+			if ($this->getActiveControl()->canUpdateClientSide()) {
+							$this->getPage()->getCallbackClient()->replaceContent($this, $writer);
+			}
+		} 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 +202,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());
 	}
 
@@ -218,8 +222,11 @@ 
 			{
 				$table = $table->getParent();
 			}
-			if ($table instanceof TTable) $this->_table = $table;
-			else throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
+			if ($table instanceof TTable) {
+				$this->_table = $table;
+			} else {
+				throw new TConfigurationException('tactivetablerow_control_outoftable', get_class($this), $this->getUniqueID());
+			}
 		}
 		return $this->_table;
 	}

framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php

Spacing +4 added lines, -4 removed lines

@@ -36,17 +36,17 @@
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
 	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
-		if($this->getButtonType() === TButtonColumnType::LinkButton)
+		if ($this->getButtonType() === TButtonColumnType::LinkButton)
 			$button = new TActiveLinkButton;
-		elseif($this->getButtonType() === TButtonColumnType::PushButton)
+		elseif ($this->getButtonType() === TButtonColumnType::PushButton)
 				$button = new TActiveButton;
 			else  // image buttons
 			{
 				$button = new TActiveImageButton;
 				$button->setToolTip($text);
-				if(strcasecmp($commandName, 'Update') === 0)
+				if (strcasecmp($commandName, 'Update') === 0)
 					$url = $this->getUpdateImageUrl();
-				elseif(strcasecmp($commandName, 'Cancel') === 0)
+				elseif (strcasecmp($commandName, 'Cancel') === 0)
 						$url = $this->getCancelImageUrl();
 					else
 						$url = $this->getEditImageUrl();

Braces +12 added lines, -11 removed lines

@@ -36,20 +36,21 @@
  */
 class TActiveEditCommandColumn extends TEditCommandColumn {
 	protected function createButton($commandName, $text, $causesValidation, $validationGroup) {
-		if($this->getButtonType() === TButtonColumnType::LinkButton)
-			$button = new TActiveLinkButton;
-		elseif($this->getButtonType() === TButtonColumnType::PushButton)
-				$button = new TActiveButton;
-			else  // image buttons
+		if($this->getButtonType() === TButtonColumnType::LinkButton) {
+					$button = new TActiveLinkButton;
+		} elseif($this->getButtonType() === TButtonColumnType::PushButton) {
+						$button = new TActiveButton;
+		} else  // image buttons
 			{
 				$button = new TActiveImageButton;
 				$button->setToolTip($text);
-				if(strcasecmp($commandName, 'Update') === 0)
-					$url = $this->getUpdateImageUrl();
-				elseif(strcasecmp($commandName, 'Cancel') === 0)
-						$url = $this->getCancelImageUrl();
-					else
-						$url = $this->getEditImageUrl();
+				if(strcasecmp($commandName, 'Update') === 0) {
+									$url = $this->getUpdateImageUrl();
+				} elseif(strcasecmp($commandName, 'Cancel') === 0) {
+										$url = $this->getCancelImageUrl();
+				} else {
+											$url = $this->getEditImageUrl();
+					}
 				$button->setImageUrl($url);
 			}
 		$button->setText($text);

framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	public function flushContent()
 	{
-		foreach($this->_writers as $writer)
+		foreach ($this->_writers as $writer)
 			echo $writer->flush();
 		parent::flushContent();
 	}
@@ -86,8 +86,8 @@ 
 	 */
 	public function httpRedirect($url)
 	{
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if ($url[0] === '/')
+			$url = $this->getRequest()->getBaseUrl().$url;
 		$this->_redirectUrl = str_replace('&', '&', $url);
 	}
 

Braces +6 added lines, -4 removed lines

@@ -59,8 +59,9 @@ 
 	 */
 	public function flushContent()
 	{
-		foreach($this->_writers as $writer)
-			echo $writer->flush();
+		foreach($this->_writers as $writer) {
+					echo $writer->flush();
+		}
 		parent::flushContent();
 	}
 
@@ -86,8 +87,9 @@ 
 	 */
 	public function httpRedirect($url)
 	{
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if($url[0] === '/') {
+					$url = $this->getRequest()->getBaseUrl() . $url;
+		}
 		$this->_redirectUrl = str_replace('&', '&', $url);
 	}
 

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Spacing +9 added lines, -9 removed lines

@@ -70,9 +70,9 @@ 
 	 */
 	protected function setBaseControlClass($type)
 	{
-		if($type === null)
+		if ($type === null)
 		{
-			if($this->getControl() instanceof ICallbackEventHandler)
+			if ($this->getControl() instanceof ICallbackEventHandler)
 				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
 			else
 				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
@@ -95,11 +95,11 @@ 
 	public function render($writer)
 	{
 		$this->getPage()->getClientScript()->registerPradoScript('ajax');
-		if($this->_control->getVisible(false))
+		if ($this->_control->getVisible(false))
 		{
 			parent::render($writer);
 		} else {
-			$writer->write("<span id=\"" . $this->_control->getClientID() . "\" style=\"display:none\"></span>");
+			$writer->write("<span id=\"".$this->_control->getClientID()."\" style=\"display:none\"></span>");
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 */
 	public function getBaseActiveControl()
 	{
-		if($this->_baseActiveControl === null)
+		if ($this->_baseActiveControl === null)
 		{
 			$type = $this->_activeControlType;
 			$this->_baseActiveControl = new $type($this->getControl());
@@ -129,10 +129,10 @@ 
 	 */
 	protected function getIsTrackingPageState()
 	{
-		if($this->getPage()->getIsCallback())
+		if ($this->getPage()->getIsCallback())
 		{
 			$target = $this->getPage()->getCallbackEventTarget();
-			if($target instanceof ICallbackEventHandler)
+			if ($target instanceof ICallbackEventHandler)
 			{
 				$client = $target->getActiveControl()->getClientSide();
 				return $client->getEnablePageStateUpdate();
@@ -146,7 +146,7 @@ 
 	 */
 	public function onLoad($param)
 	{
-		if($this->getIsTrackingPageState())
+		if ($this->getIsTrackingPageState())
 		{
 		  $stateTrackerClass = $this->_stateTrackerClass;
 			$this->_stateTracker = new $stateTrackerClass($this->getControl());
@@ -161,7 +161,7 @@ 
 	 */
 	public function saveState()
 	{
-		if(($this->_stateTracker !== null)
+		if (($this->_stateTracker !== null)
 			&& $this->getControl()->getActiveControl()->canUpdateClientSide(true))
 		{
 			$this->_stateTracker->respondToChanges();

Braces +7 added lines, -6 removed lines

@@ -72,13 +72,14 @@
 	{
 		if($type === null)
 		{
-			if($this->getControl() instanceof ICallbackEventHandler)
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
-			else
-				$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
+			if($this->getControl() instanceof ICallbackEventHandler) {
+							$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveCallbackControl';
+			} else {
+							$this->_activeControlType = 'Prado\\Web\UI\\ActiveControls\\TBaseActiveControl';
+			}
+		} else {
+					$this->_activeControlType = $type;
 		}
-		else
-			$this->_activeControlType = $type;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveListBox.php

Spacing +3 added lines, -3 removed lines

@@ -89,13 +89,13 @@
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
+		if (parent::getSelectionMode() === $value)
 			return;
 
 		parent::setSelectionMode($value);
 		$multiple = $this->getIsMultiSelect();
-		$id = $this->getUniqueID(); $multi_id = $id . '[]';
-		if($this->getActiveControl()->canUpdateClientSide())
+		$id = $this->getUniqueID(); $multi_id = $id.'[]';
+		if ($this->getActiveControl()->canUpdateClientSide())
 		{
 			$client = $this->getPage()->getCallbackClient();
 			$client->setAttribute($this, 'multiple', $multiple ? 'multiple' : false);

Braces +6 added lines, -4 removed lines

@@ -89,8 +89,9 @@ 
 	 */
 	public function setSelectionMode($value)
 	{
-		if(parent::getSelectionMode() === $value)
-			return;
+		if(parent::getSelectionMode() === $value) {
+					return;
+		}
 
 		parent::setSelectionMode($value);
 		$multiple = $this->getIsMultiSelect();
@@ -151,9 +152,10 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		$writer->addAttribute('id', $this->getClientID());
-		if ($this->getAutoPostBack())
-			$this->getActiveControl()->registerCallbackClientScript(
+		if ($this->getAutoPostBack()) {
+					$this->getActiveControl()->registerCallbackClientScript(
 				$this->getClientClassName(), $this->getPostBackOptions());
+		}
 	}
 }
 

framework/Web/UI/ActiveControls/TCallbackClientSide.php

Spacing +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
+		if ($value instanceof TControl)
 			$value = $value->getUniqueID();
 		$this->setOption('EventTarget', $value);
 	}

Braces +3 added lines, -2 removed lines

@@ -273,8 +273,9 @@
 	 */
 	public function setPostBackTarget($value)
 	{
-		if($value instanceof TControl)
-			$value = $value->getUniqueID();
+		if($value instanceof TControl) {
+					$value = $value->getUniqueID();
+		}
 		$this->setOption('EventTarget', $value);
 	}
 

framework/Web/UI/ActiveControls/TActiveHtmlArea4.php

Spacing +2 added lines, -2 removed lines

@@ -64,9 +64,9 @@
    */
   public function setText($value) {
 	parent::setText($value);
-	if($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
+	if ($this->getActiveControl()->canUpdateClientSide() && $this->getHasLoadedPostData())
 	{
-	  if($this->getEnableVisualEdit())
+	  if ($this->getEnableVisualEdit())
 	  {
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinymce.get('{$this->getClientID()}').setContent('{$value}')";

Braces +2 added lines, -2 removed lines

@@ -71,9 +71,9 @@
 		$value = str_ireplace(["\r\n", "\n"], "", $value);
 		$command = "tinymce.get('{$this->getClientID()}').setContent('{$value}')";
 		$this->getPage()->getCallbackClient()->evaluateScript($command);
+	  } else {
+	  		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	  }
-	  else
-		$this->getPage()->getCallbackClient()->setValue($this, $value);
 	}
   }