pradosoft / prado

framework/Web/UI/TControl.php

Spacing +178 added lines, -178 removed lines

@@ -114,17 +114,17 @@ 
 	 * Indexes for the rare fields.
 	 * In order to save memory, rare fields will only be created if they are needed.
 	 */
-	const RF_CONTROLS = 0;			// child controls
-	const RF_CHILD_STATE = 1;			// child state field
-	const RF_NAMED_CONTROLS = 2;		// list of controls whose namingcontainer is this control
-	const RF_NAMED_CONTROLS_ID = 3;	// counter for automatic id
-	const RF_SKIN_ID = 4;				// skin ID
-	const RF_DATA_BINDINGS = 5;		// data bindings
-	const RF_EVENTS = 6;				// event handlers
-	const RF_CONTROLSTATE = 7;		// controlstate
-	const RF_NAMED_OBJECTS = 8;		// controls declared with ID on template
-	const RF_ADAPTER = 9;				// adapter
-	const RF_AUTO_BINDINGS = 10;		// auto data bindings
+	const RF_CONTROLS = 0; // child controls
+	const RF_CHILD_STATE = 1; // child state field
+	const RF_NAMED_CONTROLS = 2; // list of controls whose namingcontainer is this control
+	const RF_NAMED_CONTROLS_ID = 3; // counter for automatic id
+	const RF_SKIN_ID = 4; // skin ID
+	const RF_DATA_BINDINGS = 5; // data bindings
+	const RF_EVENTS = 6; // event handlers
+	const RF_CONTROLSTATE = 7; // controlstate
+	const RF_NAMED_OBJECTS = 8; // controls declared with ID on template
+	const RF_ADAPTER = 9; // adapter
+	const RF_AUTO_BINDINGS = 10; // auto data bindings
 
 	/**
 	 * @var string control ID
@@ -193,7 +193,7 @@ 
 	 */
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
 		else
 			return parent::__get($name);
@@ -217,7 +217,7 @@ 
 	 * @see __get
 	 */
 	public function __isset($name) {
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
 			return true;
 		} else {
 			return parent::__isset($name);
@@ -237,7 +237,7 @@ 
 	 */
 	public function getAdapter()
 	{
-		return isset($this->_rf[self::RF_ADAPTER])?$this->_rf[self::RF_ADAPTER]:null;
+		return isset($this->_rf[self::RF_ADAPTER]) ? $this->_rf[self::RF_ADAPTER] : null;
 	}
 
 	/**
@@ -261,9 +261,9 @@ 
 	 */
 	public function getNamingContainer()
 	{
-		if(!$this->_namingContainer && $this->_parent)
+		if (!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
+			if ($this->_parent instanceof INamingContainer)
 				$this->_namingContainer = $this->_parent;
 			else
 				$this->_namingContainer = $this->_parent->getNamingContainer();
@@ -276,11 +276,11 @@ 
 	 */
 	public function getPage()
 	{
-		if(!$this->_page)
+		if (!$this->_page)
 		{
-			if($this->_parent)
+			if ($this->_parent)
 				$this->_page = $this->_parent->getPage();
-			elseif($this->_tplControl)
+			elseif ($this->_tplControl)
 				$this->_page = $this->_tplControl->getPage();
 		}
 		return $this->_page;
@@ -311,7 +311,7 @@ 
 	 */
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
+		if (!$this->_tplControl && $this->_parent)
 			$this->_tplControl = $this->_parent->getTemplateControl();
 		return $this->_tplControl;
 	}
@@ -324,9 +324,9 @@ 
 	public function getSourceTemplateControl()
 	{
 		$control = $this;
-		while(($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
+		while (($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
+			if (($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
 				return $control;
 		}
 		return $this->getPage();
@@ -365,7 +365,7 @@ 
 	 */
 	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
+		if ($hideAutoID)
 			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
 		else
 			return $this->_id;
@@ -377,12 +377,12 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT, $id))
+		if (!preg_match(self::ID_FORMAT, $id))
 			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
 		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 	}
 
@@ -395,17 +395,17 @@ 
 	 */
 	public function getUniqueID()
 	{
-		if($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
+		if ($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
 		{
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
-			if($namingContainer = $this->getNamingContainer())
+			$this->_uid = ''; // set to not-null, so that clearCachedUniqueID() may take action
+			if ($namingContainer = $this->getNamingContainer())
 			{
-				if($this->getPage() === $namingContainer)
+				if ($this->getPage() === $namingContainer)
 					return ($this->_uid = $this->_id);
-				elseif(($prefix = $namingContainer->getUniqueID()) === '')
+				elseif (($prefix = $namingContainer->getUniqueID()) === '')
 					return $this->_id;
 				else
-					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
+					return ($this->_uid = $prefix.self::ID_SEPARATOR.$this->_id);
 			}
 			else	// no naming container
 				return $this->_id;
@@ -449,7 +449,7 @@ 
 	 */
 	public function getSkinID()
 	{
-		return isset($this->_rf[self::RF_SKIN_ID])?$this->_rf[self::RF_SKIN_ID]:'';
+		return isset($this->_rf[self::RF_SKIN_ID]) ? $this->_rf[self::RF_SKIN_ID] : '';
 	}
 
 	/**
@@ -458,7 +458,7 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
+		if (($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
 			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
 		else
 			$this->_rf[self::RF_SKIN_ID] = $value;
@@ -479,10 +479,10 @@ 
 	 */
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
+		if ($this->_flags & self::IS_DISABLE_THEMING)
 			return false;
 		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+			return $this->_parent ? $this->_parent->getEnableTheming() : true;
 	}
 
 	/**
@@ -491,9 +491,9 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
-		elseif(TPropertyValue::ensureBoolean($value))
+		elseif (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_THEMING;
 		else
 			$this->_flags |= self::IS_DISABLE_THEMING;
@@ -534,7 +534,7 @@ 
 	 */
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
+		if (!isset($this->_rf[self::RF_CONTROLS]))
 			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
 		return $this->_rf[self::RF_CONTROLS];
 	}
@@ -546,7 +546,7 @@ 
 	 */
 	protected function createControlCollection()
 	{
-		return $this->getAllowChildControls()?new TControlCollection($this):new TEmptyControlCollection($this);
+		return $this->getAllowChildControls() ? new TControlCollection($this) : new TEmptyControlCollection($this);
 	}
 
 	/**
@@ -558,10 +558,10 @@ 
 	 */
 	public function getVisible($checkParents = true)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getVisible(false))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getVisible(false))
 					return false;
 			return true;
 		}
@@ -589,10 +589,10 @@ 
 	 */
 	public function getEnabled($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getViewState('Enabled', true))
+			for ($control = $this; $control; $control = $control->_parent)
+				if (!$control->getViewState('Enabled', true))
 					return false;
 			return true;
 		}
@@ -613,7 +613,7 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->getCount() > 0;
 		else
 			return false;
@@ -627,7 +627,7 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes;
 		else
 		{
@@ -642,7 +642,7 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->contains($name);
 		else
 			return false;
@@ -653,7 +653,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->itemAt($name);
 		else
 			return null;
@@ -676,7 +676,7 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
+		if ($attributes = $this->getViewState('Attributes', null))
 			return $attributes->remove($name);
 		else
 			return null;
@@ -687,10 +687,10 @@ 
 	 */
 	public function getEnableViewState($checkParents = false)
 	{
-		if($checkParents)
+		if ($checkParents)
 		{
-			for($control = $this;$control !== null;$control = $control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for ($control = $this; $control !== null; $control = $control->getParent())
+				if ($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
 			return true;
 		}
@@ -703,7 +703,7 @@ 
 	 */
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
+		if (TPropertyValue::ensureBoolean($value))
 			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
 		else
 			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
@@ -720,7 +720,7 @@ 
 	 */
 	protected function getControlState($key, $defaultValue = null)
 	{
-		return isset($this->_rf[self::RF_CONTROLSTATE][$key])?$this->_rf[self::RF_CONTROLSTATE][$key]:$defaultValue;
+		return isset($this->_rf[self::RF_CONTROLSTATE][$key]) ? $this->_rf[self::RF_CONTROLSTATE][$key] : $defaultValue;
 	}
 
 	/**
@@ -735,7 +735,7 @@ 
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
 		else
 			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
@@ -772,11 +772,11 @@ 
 	 */
 	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
-		elseif(isset($this->_tempState[$key]))
+		if (isset($this->_viewState[$key]))
+			return $this->_viewState[$key] !== null ? $this->_viewState[$key] : $defaultValue;
+		elseif (isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
+			if (is_object($this->_tempState[$key]) && $this->_trackViewState)
 				$this->_viewState[$key] = $this->_tempState[$key];
 			return $this->_tempState[$key];
 		}
@@ -796,7 +796,7 @@ 
 	 */
 	public function setViewState($key, $value, $defaultValue = null)
 	{
-		if($this->_trackViewState)
+		if ($this->_trackViewState)
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
@@ -804,7 +804,7 @@ 
 		else
 		{
 			unset($this->_viewState[$key]);
-			if($value === $defaultValue)
+			if ($value === $defaultValue)
 				unset($this->_tempState[$key]);
 			else
 				$this->_tempState[$key] = $value;
@@ -870,11 +870,11 @@ 
 	protected function dataBindProperties()
 	{
 		Prado::trace("Data bind properties", 'Prado\Web\UI\TControl');
-		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
+		if (isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
+			if (($context = $this->getTemplateControl()) === null)
 				$context = $this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
+			foreach ($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
@@ -884,11 +884,11 @@ 
 	 */
 	protected function autoDataBindProperties()
 	{
-		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
+		if (isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
+			if (($context = $this->getTemplateControl()) === null)
 				$context = $this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
+			foreach ($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
 				$this->setSubProperty($property, $context->evaluateExpression($expression));
 		}
 	}
@@ -899,10 +899,10 @@ 
 	protected function dataBindChildren()
 	{
 		Prado::trace("dataBindChildren()", 'Prado\Web\UI\TControl');
-		if(isset($this->_rf[self::RF_CONTROLS]))
+		if (isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof IBindable)
 					$control->dataBind();
 		}
 	}
@@ -922,11 +922,11 @@ 
 	 */
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
+		if ($value)
 			$this->_flags |= self::IS_CHILD_CREATED;
 		else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
+			if ($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
 				$this->getControls()->clear();
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
@@ -939,19 +939,19 @@ 
 	 */
 	public function ensureChildControls()
 	{
-		if(!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
+		if (!($this->_flags & self::IS_CHILD_CREATED) && !($this->_flags & self::IS_CREATING_CHILD))
 		{
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
+				if (isset($this->_rf[self::RF_ADAPTER]))
 					$this->_rf[self::RF_ADAPTER]->createChildControls();
 				else
 					$this->createChildControls();
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -984,21 +984,21 @@ 
 	public function findControl($id)
 	{
 		$id = strtr($id, '.', self::ID_SEPARATOR);
-		$container = ($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
+		$container = ($this instanceof INamingContainer) ? $this : $this->getNamingContainer();
+		if (!$container || !$container->getHasControls())
 			return null;
-		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
+		if (!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS] = [];
 			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos = strpos($id, self::ID_SEPARATOR)) === false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		if (($pos = strpos($id, self::ID_SEPARATOR)) === false)
+			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id]) ? $container->_rf[self::RF_NAMED_CONTROLS][$id] : null;
 		else
 		{
 			$cid = substr($id, 0, $pos);
 			$sid = substr($id, $pos + 1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
+			if (isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
 				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
 			else
 				return null;
@@ -1014,13 +1014,13 @@ 
 	public function findControlsByType($type, $strict = true)
 	{
 		$controls = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
+				if (is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
 					$controls[] = $control;
-				if(($control instanceof TControl) && $control->getHasControls())
+				if (($control instanceof TControl) && $control->getHasControls())
 					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
 			}
 		}
@@ -1039,13 +1039,13 @@ 
 	public function findControlsByID($id)
 	{
 		$controls = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if($control->_id === $id)
+					if ($control->_id === $id)
 						$controls[] = $control;
 					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
@@ -1074,7 +1074,7 @@ 
 	 */
 	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
+		if (isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
 			throw new TInvalidOperationException('control_object_reregistered', $name);
 		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
@@ -1147,7 +1147,7 @@ 
 	 */
 	public function getRegisteredObject($name)
 	{
-		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name])?$this->_rf[self::RF_NAMED_OBJECTS][$name]:null;
+		return isset($this->_rf[self::RF_NAMED_OBJECTS][$name]) ? $this->_rf[self::RF_NAMED_OBJECTS][$name] : null;
 	}
 
 	/**
@@ -1190,7 +1190,7 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control = $this;
-		while($control !== $ancestor && $control->_parent)
+		while ($control !== $ancestor && $control->_parent)
 			$control = $control->_parent;
 		return $control === $ancestor;
 	}
@@ -1203,27 +1203,27 @@ 
 	 */
 	public function addedControl($control)
 	{
-		if($control->_parent)
+		if ($control->_parent)
 			$control->_parent->getControls()->remove($control);
 		$control->_parent = $this;
 		$control->_page = $this->getPage();
-		$namingContainer = ($this instanceof INamingContainer)?$this:$this->_namingContainer;
-		if($namingContainer)
+		$namingContainer = ($this instanceof INamingContainer) ? $this : $this->_namingContainer;
+		if ($namingContainer)
 		{
 			$control->_namingContainer = $namingContainer;
-			if($control->_id === '')
+			if ($control->_id === '')
 				$control->generateAutomaticID();
 			else
 				$namingContainer->clearNameTable();
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
+		if ($this->_stage >= self::CS_CHILD_INITIALIZED)
 		{
 			$control->initRecursive($namingContainer);
-			if($this->_stage >= self::CS_STATE_LOADED)
+			if ($this->_stage >= self::CS_STATE_LOADED)
 			{
-				if(isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
+				if (isset($this->_rf[self::RF_CHILD_STATE][$control->_id]))
 				{
 					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
@@ -1231,10 +1231,10 @@ 
 				else
 					$state = null;
 				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-				if($this->_stage >= self::CS_LOADED)
+				if ($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage >= self::CS_PRERENDERED)
+					if ($this->_stage >= self::CS_PRERENDERED)
 						$control->preRenderRecursive();
 				}
 			}
@@ -1248,7 +1248,7 @@ 
 	 */
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
+		if ($this->_namingContainer)
 			$this->_namingContainer->clearNameTable();
 		$control->unloadRecursive();
 		$control->_parent = null;
@@ -1256,7 +1256,7 @@ 
 		$control->_namingContainer = null;
 		$control->_tplControl = null;
 		//$control->_stage=self::CS_CONSTRUCTED;
-		if(!($control->_flags & self::IS_ID_SET))
+		if (!($control->_flags & self::IS_ID_SET))
 			$control->_id = '';
 		else
 			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
@@ -1271,32 +1271,32 @@ 
 	protected function initRecursive($namingContainer = null)
 	{
 		$this->ensureChildControls();
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
+			if ($this instanceof INamingContainer)
 				$namingContainer = $this;
 			$page = $this->getPage();
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
 					$control->_namingContainer = $namingContainer;
 					$control->_page = $page;
-					if($control->_id === '' && $namingContainer)
+					if ($control->_id === '' && $namingContainer)
 						$control->generateAutomaticID();
 					$control->initRecursive($namingContainer);
 				}
 			}
 		}
-		if($this->_stage < self::CS_INITIALIZED)
+		if ($this->_stage < self::CS_INITIALIZED)
 		{
 			$this->_stage = self::CS_CHILD_INITIALIZED;
-			if(($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
+			if (($page = $this->getPage()) && $this->getEnableTheming() && !($this->_flags & self::IS_SKIN_APPLIED))
 			{
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onInit(null);
 			else
 				$this->onInit(null);
@@ -1310,22 +1310,22 @@ 
 	 */
 	protected function loadRecursive()
 	{
-		if($this->_stage < self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onLoad(null);
 			else
 				$this->onLoad(null);
 		}
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->loadRecursive();
 			}
 		}
-		if($this->_stage < self::CS_LOADED)
+		if ($this->_stage < self::CS_LOADED)
 			$this->_stage = self::CS_LOADED;
 	}
 
@@ -1337,19 +1337,19 @@ 
 	{
 		$this->autoDataBindProperties();
 
-		if($this->getVisible(false))
+		if ($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
 			else
 				$this->onPreRender(null);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 						$control->preRenderRecursive();
-					elseif($control instanceof TCompositeLiteral)
+					elseif ($control instanceof TCompositeLiteral)
 						$control->evaluateDynamicContent();
 				}
 			}
@@ -1363,15 +1363,15 @@ 
 	 */
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
+		if (!($this->_flags & self::IS_ID_SET))
 			$this->_id = '';
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->unloadRecursive();
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->onUnload(null);
 		else
 			$this->onUnload(null);
@@ -1447,9 +1447,9 @@ 
 	protected function raiseBubbleEvent($sender, $param)
 	{
 		$control = $this;
-		while($control = $control->_parent)
+		while ($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender, $param))
+			if ($control->bubbleEvent($sender, $param))
 				break;
 		}
 	}
@@ -1486,7 +1486,7 @@ 
 	 */
 	public function broadcastEvent($name, $sender, $param)
 	{
-		$rootControl = (($page = $this->getPage()) === null)?$this:$page;
+		$rootControl = (($page = $this->getPage()) === null) ? $this : $page;
 		$rootControl->broadcastEventInternal($name, $sender, new TBroadcastEventParameter($name, $param));
 	}
 
@@ -1499,15 +1499,15 @@ 
 	 */
 	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
+		if ($this->hasEvent($name))
 			$this->raiseEvent($name, $sender, $param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
+		if ($this instanceof IBroadcastEventReceiver)
 			$this->broadcastEventReceived($sender, $param);
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 					$control->broadcastEventInternal($name, $sender, $param);
 			}
 		}
@@ -1532,19 +1532,19 @@ 
 	 */
 	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback !== null)
+		if ($preCallback !== null)
 			call_user_func($preCallback, $this, $param);
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
 					$control->traverseChildControls($param, $preCallback, $postCallback);
 				}
 			}
 		}
-		if($postCallback !== null)
+		if ($postCallback !== null)
 			call_user_func($postCallback, $this, $param);
 	}
 
@@ -1555,9 +1555,9 @@ 
 	 */
 	public function renderControl($writer)
 	{
-		if($this instanceof IActiveControl || $this->getVisible(false))
+		if ($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
+			if (isset($this->_rf[self::RF_ADAPTER]))
 				$this->_rf[self::RF_ADAPTER]->render($writer);
 			else
 				$this->render($writer);
@@ -1584,15 +1584,15 @@ 
 	 */
 	public function renderChildren($writer)
 	{
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
+				if (is_string($control))
 					$writer->write($control);
-				elseif($control instanceof TControl)
+				elseif ($control instanceof TControl)
 					$control->renderControl($writer);
-				elseif($control instanceof IRenderable)
+				elseif ($control instanceof IRenderable)
 					$control->render($writer);
 			}
 		}
@@ -1624,33 +1624,33 @@ 
 	 */
 	protected function loadStateRecursive(&$state, $needViewState = true)
 	{
-		if(is_array($state))
+		if (is_array($state))
 		{
 			// A null state means the stateful properties all take default values.
 			// So if the state is enabled, we have to assign the null value.
 			$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
-			if(isset($state[1]))
+			if (isset($state[1]))
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
 			}
 			else
 				unset($this->_rf[self::RF_CONTROLSTATE]);
-			if($needViewState)
+			if ($needViewState)
 			{
-				if(isset($state[0]))
+				if (isset($state[0]))
 					$this->_viewState = &$state[0];
 				else
 					$this->_viewState = [];
 			}
 			unset($state[0]);
-			if($this->getHasControls())
+			if ($this->getHasControls())
 			{
-				foreach($this->_rf[self::RF_CONTROLS] as $control)
+				foreach ($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
+					if ($control instanceof TControl)
 					{
-						if(isset($state[$control->_id]))
+						if (isset($state[$control->_id]))
 						{
 							$control->loadStateRecursive($state[$control->_id], $needViewState);
 							unset($state[$control->_id]);
@@ -1658,11 +1658,11 @@ 
 					}
 				}
 			}
-			if(!empty($state))
+			if (!empty($state))
 				$this->_rf[self::RF_CHILD_STATE] = &$state;
 		}
 		$this->_stage = self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->loadState();
 		else
 			$this->loadState();
@@ -1676,26 +1676,26 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
+		if (isset($this->_rf[self::RF_ADAPTER]))
 			$this->_rf[self::RF_ADAPTER]->saveState();
 		else
 			$this->saveState();
 		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 		$state = [];
-		if($this->getHasControls())
+		if ($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
+				if ($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
+					if (count($tmp = &$control->saveStateRecursive($needViewState)))
 						$state[$control->_id] = $tmp;
 				}
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
+		if ($needViewState && !empty($this->_viewState))
 			$state[0] = &$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
+		if (isset($this->_rf[self::RF_CONTROLSTATE]))
 			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
 		return $state;
 	}
@@ -1707,12 +1707,12 @@ 
 	 */
 	public function applyStyleSheetSkin($page)
 	{
-		if($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
+		if ($page && !($this->_flags & self::IS_STYLESHEET_APPLIED))
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
 		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
+		elseif ($this->_flags & self::IS_STYLESHEET_APPLIED)
 			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
@@ -1723,10 +1723,10 @@ 
 	 */
 	private function clearCachedUniqueID($recursive)
 	{
-		if($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
+		if ($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach ($this->_rf[self::RF_CONTROLS] as $control)
+				if ($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
 		}
 		$this->_uid = null;
@@ -1738,10 +1738,10 @@ 
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
+		if (!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
 			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
 		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
-		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
+		$this->_id = self::AUTOMATIC_ID_PREFIX.$id;
 		$this->_namingContainer->clearNameTable();
 	}
 
@@ -1761,18 +1761,18 @@ 
 	 */
 	private function fillNameTable($container, $controls)
 	{
-		foreach($controls as $control)
+		foreach ($controls as $control)
 		{
-			if($control instanceof TControl)
+			if ($control instanceof TControl)
 			{
-				if($control->_id !== '')
+				if ($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
+					if (isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
 						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
 					else
 						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
+				if (!($control instanceof INamingContainer) && $control->getHasControls())
 					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}

Braces +323 added lines, -248 removed lines

@@ -193,10 +193,11 @@ 
 	 */
 	public function __get($name)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			return $this->_rf[self::RF_NAMED_OBJECTS][$name];
-		else
-			return parent::__get($name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					return $this->_rf[self::RF_NAMED_OBJECTS][$name];
+		} else {
+					return parent::__get($name);
+		}
 	}
 
 	/**
@@ -263,10 +264,11 @@ 
 	{
 		if(!$this->_namingContainer && $this->_parent)
 		{
-			if($this->_parent instanceof INamingContainer)
-				$this->_namingContainer = $this->_parent;
-			else
-				$this->_namingContainer = $this->_parent->getNamingContainer();
+			if($this->_parent instanceof INamingContainer) {
+							$this->_namingContainer = $this->_parent;
+			} else {
+							$this->_namingContainer = $this->_parent->getNamingContainer();
+			}
 		}
 		return $this->_namingContainer;
 	}
@@ -278,10 +280,11 @@ 
 	{
 		if(!$this->_page)
 		{
-			if($this->_parent)
-				$this->_page = $this->_parent->getPage();
-			elseif($this->_tplControl)
-				$this->_page = $this->_tplControl->getPage();
+			if($this->_parent) {
+							$this->_page = $this->_parent->getPage();
+			} elseif($this->_tplControl) {
+							$this->_page = $this->_tplControl->getPage();
+			}
 		}
 		return $this->_page;
 	}
@@ -311,8 +314,9 @@ 
 	 */
 	public function getTemplateControl()
 	{
-		if(!$this->_tplControl && $this->_parent)
-			$this->_tplControl = $this->_parent->getTemplateControl();
+		if(!$this->_tplControl && $this->_parent) {
+					$this->_tplControl = $this->_parent->getTemplateControl();
+		}
 		return $this->_tplControl;
 	}
 
@@ -326,8 +330,9 @@ 
 		$control = $this;
 		while(($control instanceof TControl) && ($control = $control->getTemplateControl()) !== null)
 		{
-			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl())
-				return $control;
+			if(($control instanceof TTemplateControl) && $control->getIsSourceTemplateControl()) {
+							return $control;
+			}
 		}
 		return $this->getPage();
 	}
@@ -365,10 +370,11 @@ 
 	 */
 	public function getID($hideAutoID = true)
 	{
-		if($hideAutoID)
-			return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
-		else
-			return $this->_id;
+		if($hideAutoID) {
+					return ($this->_flags & self::IS_ID_SET) ? $this->_id : '';
+		} else {
+					return $this->_id;
+		}
 	}
 
 	/**
@@ -377,13 +383,15 @@ 
 	 */
 	public function setID($id)
 	{
-		if(!preg_match(self::ID_FORMAT, $id))
-			throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		if(!preg_match(self::ID_FORMAT, $id)) {
+					throw new TInvalidDataValueException('control_id_invalid', get_class($this), $id);
+		}
 		$this->_id = $id;
 		$this->_flags |= self::IS_ID_SET;
 		$this->clearCachedUniqueID($this instanceof INamingContainer);
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 	}
 
 	/**
@@ -395,23 +403,28 @@ 
 	 */
 	public function getUniqueID()
 	{
-		if($this->_uid === '' || $this->_uid === null)	// need to build the UniqueID
+		if($this->_uid === '' || $this->_uid === null) {
+			// need to build the UniqueID
 		{
-			$this->_uid = '';  // set to not-null, so that clearCachedUniqueID() may take action
+			$this->_uid = '';
+		}
+		// set to not-null, so that clearCachedUniqueID() may take action
 			if($namingContainer = $this->getNamingContainer())
 			{
-				if($this->getPage() === $namingContainer)
-					return ($this->_uid = $this->_id);
-				elseif(($prefix = $namingContainer->getUniqueID()) === '')
-					return $this->_id;
-				else
-					return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
-			}
-			else	// no naming container
+				if($this->getPage() === $namingContainer) {
+									return ($this->_uid = $this->_id);
+				} elseif(($prefix = $namingContainer->getUniqueID()) === '') {
+									return $this->_id;
+				} else {
+									return ($this->_uid = $prefix . self::ID_SEPARATOR . $this->_id);
+				}
+			} else {
+				// no naming container
 				return $this->_id;
+			}
+		} else {
+					return $this->_uid;
 		}
-		else
-			return $this->_uid;
 	}
 
 	/**
@@ -458,10 +471,11 @@ 
 	 */
 	public function setSkinID($value)
 	{
-		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
-		else
-			$this->_rf[self::RF_SKIN_ID] = $value;
+		if(($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage >= self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_skinid_unchangeable', get_class($this));
+		} else {
+					$this->_rf[self::RF_SKIN_ID] = $value;
+		}
 	}
 
 	/**
@@ -479,10 +493,11 @@ 
 	 */
 	public function getEnableTheming()
 	{
-		if($this->_flags & self::IS_DISABLE_THEMING)
-			return false;
-		else
-			return $this->_parent?$this->_parent->getEnableTheming():true;
+		if($this->_flags & self::IS_DISABLE_THEMING) {
+					return false;
+		} else {
+					return $this->_parent?$this->_parent->getEnableTheming():true;
+		}
 	}
 
 	/**
@@ -491,12 +506,13 @@ 
 	 */
 	public function setEnableTheming($value)
 	{
-		if($this->_stage >= self::CS_CHILD_INITIALIZED)
-			throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
-		elseif(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_THEMING;
-		else
-			$this->_flags |= self::IS_DISABLE_THEMING;
+		if($this->_stage >= self::CS_CHILD_INITIALIZED) {
+					throw new TInvalidOperationException('control_enabletheming_unchangeable', get_class($this), $this->getUniqueID());
+		} elseif(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_THEMING;
+		} else {
+					$this->_flags |= self::IS_DISABLE_THEMING;
+		}
 	}
 
 	/**
@@ -534,8 +550,9 @@ 
 	 */
 	public function getControls()
 	{
-		if(!isset($this->_rf[self::RF_CONTROLS]))
-			$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
+		if(!isset($this->_rf[self::RF_CONTROLS])) {
+					$this->_rf[self::RF_CONTROLS] = $this->createControlCollection();
+		}
 		return $this->_rf[self::RF_CONTROLS];
 	}
 
@@ -560,13 +577,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getVisible(false))
+			for($control = $this;$control;$control = $control->_parent) {
+							if(!$control->getVisible(false))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Visible', true);
 		}
-		else
-			return $this->getViewState('Visible', true);
 	}
 
 	/**
@@ -591,13 +609,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control;$control = $control->_parent)
-				if(!$control->getViewState('Enabled', true))
+			for($control = $this;$control;$control = $control->_parent) {
+							if(!$control->getViewState('Enabled', true))
 					return false;
+			}
 			return true;
+		} else {
+					return $this->getViewState('Enabled', true);
 		}
-		else
-			return $this->getViewState('Enabled', true);
 	}
 
 	/**
@@ -613,10 +632,11 @@ 
 	 */
 	public function getHasAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->getCount() > 0;
-		else
-			return false;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->getCount() > 0;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -627,9 +647,9 @@ 
 	 */
 	public function getAttributes()
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes;
-		else
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes;
+		} else
 		{
 			$attributes = new TAttributeCollection;
 			$this->setViewState('Attributes', $attributes, null);
@@ -642,10 +662,11 @@ 
 	 */
 	public function hasAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->contains($name);
-		else
-			return false;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->contains($name);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -653,10 +674,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->itemAt($name);
-		else
-			return null;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -676,10 +698,11 @@ 
 	 */
 	public function removeAttribute($name)
 	{
-		if($attributes = $this->getViewState('Attributes', null))
-			return $attributes->remove($name);
-		else
-			return null;
+		if($attributes = $this->getViewState('Attributes', null)) {
+					return $attributes->remove($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -689,13 +712,14 @@ 
 	{
 		if($checkParents)
 		{
-			for($control = $this;$control !== null;$control = $control->getParent())
-				if($control->_flags & self::IS_DISABLE_VIEWSTATE)
+			for($control = $this;$control !== null;$control = $control->getParent()) {
+							if($control->_flags & self::IS_DISABLE_VIEWSTATE)
 					return false;
+			}
 			return true;
+		} else {
+					return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 		}
-		else
-			return !($this->_flags & self::IS_DISABLE_VIEWSTATE);
 	}
 
 	/**
@@ -703,10 +727,11 @@ 
 	 */
 	public function setEnableViewState($value)
 	{
-		if(TPropertyValue::ensureBoolean($value))
-			$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
-		else
-			$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		if(TPropertyValue::ensureBoolean($value)) {
+					$this->_flags &= ~self::IS_DISABLE_VIEWSTATE;
+		} else {
+					$this->_flags |= self::IS_DISABLE_VIEWSTATE;
+		}
 	}
 
 	/**
@@ -735,10 +760,11 @@ 
 	 */
 	protected function setControlState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
-			unset($this->_rf[self::RF_CONTROLSTATE][$key]);
-		else
-			$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
+		if($value === $defaultValue) {
+					unset($this->_rf[self::RF_CONTROLSTATE][$key]);
+		} else {
+					$this->_rf[self::RF_CONTROLSTATE][$key] = $value;
+		}
 	}
 
 	/**
@@ -772,16 +798,17 @@ 
 	 */
 	public function getViewState($key, $defaultValue = null)
 	{
-		if(isset($this->_viewState[$key]))
-			return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
-		elseif(isset($this->_tempState[$key]))
+		if(isset($this->_viewState[$key])) {
+					return $this->_viewState[$key] !== null?$this->_viewState[$key]:$defaultValue;
+		} elseif(isset($this->_tempState[$key]))
 		{
-			if(is_object($this->_tempState[$key]) && $this->_trackViewState)
-				$this->_viewState[$key] = $this->_tempState[$key];
+			if(is_object($this->_tempState[$key]) && $this->_trackViewState) {
+							$this->_viewState[$key] = $this->_tempState[$key];
+			}
 			return $this->_tempState[$key];
+		} else {
+					return $defaultValue;
 		}
-		else
-			return $defaultValue;
 	}
 
 	/**
@@ -800,14 +827,14 @@ 
 		{
 			unset($this->_tempState[$key]);
 			$this->_viewState[$key] = $value;
-		}
-		else
+		} else
 		{
 			unset($this->_viewState[$key]);
-			if($value === $defaultValue)
-				unset($this->_tempState[$key]);
-			else
-				$this->_tempState[$key] = $value;
+			if($value === $defaultValue) {
+							unset($this->_tempState[$key]);
+			} else {
+							$this->_tempState[$key] = $value;
+			}
 		}
 	}
 
@@ -872,10 +899,12 @@ 
 		Prado::trace("Data bind properties", 'Prado\Web\UI\TControl');
 		if(isset($this->_rf[self::RF_DATA_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
-			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression)
-				$this->setSubProperty($property, $context->evaluateExpression($expression));
+			if(($context = $this->getTemplateControl()) === null) {
+							$context = $this;
+			}
+			foreach($this->_rf[self::RF_DATA_BINDINGS] as $property => $expression) {
+							$this->setSubProperty($property, $context->evaluateExpression($expression));
+			}
 		}
 	}
 
@@ -886,10 +915,12 @@ 
 	{
 		if(isset($this->_rf[self::RF_AUTO_BINDINGS]))
 		{
-			if(($context = $this->getTemplateControl()) === null)
-				$context = $this;
-			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression)
-				$this->setSubProperty($property, $context->evaluateExpression($expression));
+			if(($context = $this->getTemplateControl()) === null) {
+							$context = $this;
+			}
+			foreach($this->_rf[self::RF_AUTO_BINDINGS] as $property => $expression) {
+							$this->setSubProperty($property, $context->evaluateExpression($expression));
+			}
 		}
 	}
 
@@ -901,9 +932,10 @@ 
 		Prado::trace("dataBindChildren()", 'Prado\Web\UI\TControl');
 		if(isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof IBindable)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof IBindable)
 					$control->dataBind();
+			}
 		}
 	}
 
@@ -922,12 +954,13 @@ 
 	 */
 	final protected function setChildControlsCreated($value)
 	{
-		if($value)
-			$this->_flags |= self::IS_CHILD_CREATED;
-		else
+		if($value) {
+					$this->_flags |= self::IS_CHILD_CREATED;
+		} else
 		{
-			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED))
-				$this->getControls()->clear();
+			if($this->getHasControls() && ($this->_flags & self::IS_CHILD_CREATED)) {
+							$this->getControls()->clear();
+			}
 			$this->_flags &= ~self::IS_CHILD_CREATED;
 		}
 	}
@@ -944,14 +977,14 @@ 
 			try
 			{
 				$this->_flags |= self::IS_CREATING_CHILD;
-				if(isset($this->_rf[self::RF_ADAPTER]))
-					$this->_rf[self::RF_ADAPTER]->createChildControls();
-				else
-					$this->createChildControls();
+				if(isset($this->_rf[self::RF_ADAPTER])) {
+									$this->_rf[self::RF_ADAPTER]->createChildControls();
+				} else {
+									$this->createChildControls();
+				}
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$this->_flags &= ~self::IS_CREATING_CHILD;
 				$this->_flags |= self::IS_CHILD_CREATED;
@@ -985,23 +1018,25 @@ 
 	{
 		$id = strtr($id, '.', self::ID_SEPARATOR);
 		$container = ($this instanceof INamingContainer)?$this:$this->getNamingContainer();
-		if(!$container || !$container->getHasControls())
-			return null;
+		if(!$container || !$container->getHasControls()) {
+					return null;
+		}
 		if(!isset($container->_rf[self::RF_NAMED_CONTROLS]))
 		{
 			$container->_rf[self::RF_NAMED_CONTROLS] = [];
 			$container->fillNameTable($container, $container->_rf[self::RF_CONTROLS]);
 		}
-		if(($pos = strpos($id, self::ID_SEPARATOR)) === false)
-			return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
-		else
+		if(($pos = strpos($id, self::ID_SEPARATOR)) === false) {
+					return isset($container->_rf[self::RF_NAMED_CONTROLS][$id])?$container->_rf[self::RF_NAMED_CONTROLS][$id]:null;
+		} else
 		{
 			$cid = substr($id, 0, $pos);
 			$sid = substr($id, $pos + 1);
-			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid]))
-				return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
-			else
-				return null;
+			if(isset($container->_rf[self::RF_NAMED_CONTROLS][$cid])) {
+							return $container->_rf[self::RF_NAMED_CONTROLS][$cid]->findControl($sid);
+			} else {
+							return null;
+			}
 		}
 	}
 
@@ -1018,10 +1053,12 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type))))
-					$controls[] = $control;
-				if(($control instanceof TControl) && $control->getHasControls())
-					$controls = array_merge($controls, $control->findControlsByType($type, $strict));
+				if(is_object($control) && (get_class($control) === $type || (!$strict && ($control instanceof $type)))) {
+									$controls[] = $control;
+				}
+				if(($control instanceof TControl) && $control->getHasControls()) {
+									$controls = array_merge($controls, $control->findControlsByType($type, $strict));
+				}
 			}
 		}
 		return $controls;
@@ -1045,8 +1082,9 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if($control->_id === $id)
-						$controls[] = $control;
+					if($control->_id === $id) {
+											$controls[] = $control;
+					}
 					$controls = array_merge($controls, $control->findControlsByID($id));
 				}
 			}
@@ -1074,8 +1112,9 @@ 
 	 */
 	public function registerObject($name, $object)
 	{
-		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name]))
-			throw new TInvalidOperationException('control_object_reregistered', $name);
+		if(isset($this->_rf[self::RF_NAMED_OBJECTS][$name])) {
+					throw new TInvalidOperationException('control_object_reregistered', $name);
+		}
 		$this->_rf[self::RF_NAMED_OBJECTS][$name] = $object;
 	}
 
@@ -1190,8 +1229,9 @@ 
 	final protected function isDescendentOf($ancestor)
 	{
 		$control = $this;
-		while($control !== $ancestor && $control->_parent)
-			$control = $control->_parent;
+		while($control !== $ancestor && $control->_parent) {
+					$control = $control->_parent;
+		}
 		return $control === $ancestor;
 	}
 
@@ -1203,18 +1243,20 @@ 
 	 */
 	public function addedControl($control)
 	{
-		if($control->_parent)
-			$control->_parent->getControls()->remove($control);
+		if($control->_parent) {
+					$control->_parent->getControls()->remove($control);
+		}
 		$control->_parent = $this;
 		$control->_page = $this->getPage();
 		$namingContainer = ($this instanceof INamingContainer)?$this:$this->_namingContainer;
 		if($namingContainer)
 		{
 			$control->_namingContainer = $namingContainer;
-			if($control->_id === '')
-				$control->generateAutomaticID();
-			else
-				$namingContainer->clearNameTable();
+			if($control->_id === '') {
+							$control->generateAutomaticID();
+			} else {
+							$namingContainer->clearNameTable();
+			}
 			$control->clearCachedUniqueID($control instanceof INamingContainer);
 		}
 
@@ -1227,15 +1269,16 @@ 
 				{
 					$state = $this->_rf[self::RF_CHILD_STATE][$control->_id];
 					unset($this->_rf[self::RF_CHILD_STATE][$control->_id]);
+				} else {
+									$state = null;
 				}
-				else
-					$state = null;
 				$control->loadStateRecursive($state, !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 				if($this->_stage >= self::CS_LOADED)
 				{
 					$control->loadRecursive();
-					if($this->_stage >= self::CS_PRERENDERED)
-						$control->preRenderRecursive();
+					if($this->_stage >= self::CS_PRERENDERED) {
+											$control->preRenderRecursive();
+					}
 				}
 			}
 		}
@@ -1248,18 +1291,20 @@ 
 	 */
 	public function removedControl($control)
 	{
-		if($this->_namingContainer)
-			$this->_namingContainer->clearNameTable();
+		if($this->_namingContainer) {
+					$this->_namingContainer->clearNameTable();
+		}
 		$control->unloadRecursive();
 		$control->_parent = null;
 		$control->_page = null;
 		$control->_namingContainer = null;
 		$control->_tplControl = null;
 		//$control->_stage=self::CS_CONSTRUCTED;
-		if(!($control->_flags & self::IS_ID_SET))
-			$control->_id = '';
-		else
-			unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+		if(!($control->_flags & self::IS_ID_SET)) {
+					$control->_id = '';
+		} else {
+					unset($this->_rf[self::RF_NAMED_OBJECTS][$control->_id]);
+		}
 		$control->clearCachedUniqueID(true);
 	}
 
@@ -1273,8 +1318,9 @@ 
 		$this->ensureChildControls();
 		if($this->getHasControls())
 		{
-			if($this instanceof INamingContainer)
-				$namingContainer = $this;
+			if($this instanceof INamingContainer) {
+							$namingContainer = $this;
+			}
 			$page = $this->getPage();
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
@@ -1282,8 +1328,9 @@ 
 				{
 					$control->_namingContainer = $namingContainer;
 					$control->_page = $page;
-					if($control->_id === '' && $namingContainer)
-						$control->generateAutomaticID();
+					if($control->_id === '' && $namingContainer) {
+											$control->generateAutomaticID();
+					}
 					$control->initRecursive($namingContainer);
 				}
 			}
@@ -1296,10 +1343,11 @@ 
 				$page->applyControlSkin($this);
 				$this->_flags |= self::IS_SKIN_APPLIED;
 			}
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onInit(null);
-			else
-				$this->onInit(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onInit(null);
+			} else {
+							$this->onInit(null);
+			}
 			$this->_stage = self::CS_INITIALIZED;
 		}
 	}
@@ -1312,21 +1360,24 @@ 
 	{
 		if($this->_stage < self::CS_LOADED)
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onLoad(null);
-			else
-				$this->onLoad(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onLoad(null);
+			} else {
+							$this->onLoad(null);
+			}
 		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->loadRecursive();
+				if($control instanceof TControl) {
+									$control->loadRecursive();
+				}
 			}
 		}
-		if($this->_stage < self::CS_LOADED)
-			$this->_stage = self::CS_LOADED;
+		if($this->_stage < self::CS_LOADED) {
+					$this->_stage = self::CS_LOADED;
+		}
 	}
 
 	/**
@@ -1339,18 +1390,20 @@ 
 
 		if($this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->onPreRender(null);
-			else
-				$this->onPreRender(null);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->onPreRender(null);
+			} else {
+							$this->onPreRender(null);
+			}
 			if($this->getHasControls())
 			{
 				foreach($this->_rf[self::RF_CONTROLS] as $control)
 				{
-					if($control instanceof TControl)
-						$control->preRenderRecursive();
-					elseif($control instanceof TCompositeLiteral)
-						$control->evaluateDynamicContent();
+					if($control instanceof TControl) {
+											$control->preRenderRecursive();
+					} elseif($control instanceof TCompositeLiteral) {
+											$control->evaluateDynamicContent();
+					}
 				}
 			}
 		}
@@ -1363,18 +1416,21 @@ 
 	 */
 	protected function unloadRecursive()
 	{
-		if(!($this->_flags & self::IS_ID_SET))
-			$this->_id = '';
+		if(!($this->_flags & self::IS_ID_SET)) {
+					$this->_id = '';
+		}
 		if($this->getHasControls())
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->unloadRecursive();
+			}
+		}
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->onUnload(null);
+		} else {
+					$this->onUnload(null);
 		}
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->onUnload(null);
-		else
-			$this->onUnload(null);
 	}
 
 	/**
@@ -1449,8 +1505,9 @@ 
 		$control = $this;
 		while($control = $control->_parent)
 		{
-			if($control->bubbleEvent($sender, $param))
-				break;
+			if($control->bubbleEvent($sender, $param)) {
+							break;
+			}
 		}
 	}
 
@@ -1499,16 +1556,19 @@ 
 	 */
 	private function broadcastEventInternal($name, $sender, $param)
 	{
-		if($this->hasEvent($name))
-			$this->raiseEvent($name, $sender, $param->getParameter());
-		if($this instanceof IBroadcastEventReceiver)
-			$this->broadcastEventReceived($sender, $param);
+		if($this->hasEvent($name)) {
+					$this->raiseEvent($name, $sender, $param->getParameter());
+		}
+		if($this instanceof IBroadcastEventReceiver) {
+					$this->broadcastEventReceived($sender, $param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if($control instanceof TControl)
-					$control->broadcastEventInternal($name, $sender, $param);
+				if($control instanceof TControl) {
+									$control->broadcastEventInternal($name, $sender, $param);
+				}
 			}
 		}
 	}
@@ -1532,8 +1592,9 @@ 
 	 */
 	protected function traverseChildControls($param, $preCallback = null, $postCallback = null)
 	{
-		if($preCallback !== null)
-			call_user_func($preCallback, $this, $param);
+		if($preCallback !== null) {
+					call_user_func($preCallback, $this, $param);
+		}
 		if($this->getHasControls())
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
@@ -1544,8 +1605,9 @@ 
 				}
 			}
 		}
-		if($postCallback !== null)
-			call_user_func($postCallback, $this, $param);
+		if($postCallback !== null) {
+					call_user_func($postCallback, $this, $param);
+		}
 	}
 
 	/**
@@ -1557,10 +1619,11 @@ 
 	{
 		if($this instanceof IActiveControl || $this->getVisible(false))
 		{
-			if(isset($this->_rf[self::RF_ADAPTER]))
-				$this->_rf[self::RF_ADAPTER]->render($writer);
-			else
-				$this->render($writer);
+			if(isset($this->_rf[self::RF_ADAPTER])) {
+							$this->_rf[self::RF_ADAPTER]->render($writer);
+			} else {
+							$this->render($writer);
+			}
 		}
 	}
 
@@ -1588,12 +1651,13 @@ 
 		{
 			foreach($this->_rf[self::RF_CONTROLS] as $control)
 			{
-				if(is_string($control))
-					$writer->write($control);
-				elseif($control instanceof TControl)
-					$control->renderControl($writer);
-				elseif($control instanceof IRenderable)
-					$control->render($writer);
+				if(is_string($control)) {
+									$writer->write($control);
+				} elseif($control instanceof TControl) {
+									$control->renderControl($writer);
+				} elseif($control instanceof IRenderable) {
+									$control->render($writer);
+				}
 			}
 		}
 	}
@@ -1633,15 +1697,16 @@ 
 			{
 				$this->_rf[self::RF_CONTROLSTATE] = &$state[1];
 				unset($state[1]);
+			} else {
+							unset($this->_rf[self::RF_CONTROLSTATE]);
 			}
-			else
-				unset($this->_rf[self::RF_CONTROLSTATE]);
 			if($needViewState)
 			{
-				if(isset($state[0]))
-					$this->_viewState = &$state[0];
-				else
-					$this->_viewState = [];
+				if(isset($state[0])) {
+									$this->_viewState = &$state[0];
+				} else {
+									$this->_viewState = [];
+				}
 			}
 			unset($state[0]);
 			if($this->getHasControls())
@@ -1658,14 +1723,16 @@ 
 					}
 				}
 			}
-			if(!empty($state))
-				$this->_rf[self::RF_CHILD_STATE] = &$state;
+			if(!empty($state)) {
+							$this->_rf[self::RF_CHILD_STATE] = &$state;
+			}
 		}
 		$this->_stage = self::CS_STATE_LOADED;
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->loadState();
-		else
-			$this->loadState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->loadState();
+		} else {
+					$this->loadState();
+		}
 	}
 
 	/**
@@ -1676,10 +1743,11 @@ 
 	 */
 	protected function &saveStateRecursive($needViewState = true)
 	{
-		if(isset($this->_rf[self::RF_ADAPTER]))
-			$this->_rf[self::RF_ADAPTER]->saveState();
-		else
-			$this->saveState();
+		if(isset($this->_rf[self::RF_ADAPTER])) {
+					$this->_rf[self::RF_ADAPTER]->saveState();
+		} else {
+					$this->saveState();
+		}
 		$needViewState = ($needViewState && !($this->_flags & self::IS_DISABLE_VIEWSTATE));
 		$state = [];
 		if($this->getHasControls())
@@ -1688,15 +1756,18 @@ 
 			{
 				if($control instanceof TControl)
 				{
-					if(count($tmp = &$control->saveStateRecursive($needViewState)))
-						$state[$control->_id] = $tmp;
+					if(count($tmp = &$control->saveStateRecursive($needViewState))) {
+											$state[$control->_id] = $tmp;
+					}
 				}
 			}
 		}
-		if($needViewState && !empty($this->_viewState))
-			$state[0] = &$this->_viewState;
-		if(isset($this->_rf[self::RF_CONTROLSTATE]))
-			$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
+		if($needViewState && !empty($this->_viewState)) {
+					$state[0] = &$this->_viewState;
+		}
+		if(isset($this->_rf[self::RF_CONTROLSTATE])) {
+					$state[1] = &$this->_rf[self::RF_CONTROLSTATE];
+		}
 		return $state;
 	}
 
@@ -1711,9 +1782,9 @@ 
 		{
 			$page->applyControlStyleSheet($this);
 			$this->_flags |= self::IS_STYLESHEET_APPLIED;
+		} elseif($this->_flags & self::IS_STYLESHEET_APPLIED) {
+					throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 		}
-		elseif($this->_flags & self::IS_STYLESHEET_APPLIED)
-			throw new TInvalidOperationException('control_stylesheet_applied', get_class($this));
 	}
 
 	/**
@@ -1725,9 +1796,10 @@ 
 	{
 		if($recursive && $this->_uid !== null && isset($this->_rf[self::RF_CONTROLS]))
 		{
-			foreach($this->_rf[self::RF_CONTROLS] as $control)
-				if($control instanceof TControl)
+			foreach($this->_rf[self::RF_CONTROLS] as $control) {
+							if($control instanceof TControl)
 					$control->clearCachedUniqueID($recursive);
+			}
 		}
 		$this->_uid = null;
 	}
@@ -1738,8 +1810,9 @@ 
 	private function generateAutomaticID()
 	{
 		$this->_flags &= ~self::IS_ID_SET;
-		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]))
-			$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		if(!isset($this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID])) {
+					$this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID] = 0;
+		}
 		$id = $this->_namingContainer->_rf[self::RF_NAMED_CONTROLS_ID]++;
 		$this->_id = self::AUTOMATIC_ID_PREFIX . $id;
 		$this->_namingContainer->clearNameTable();
@@ -1767,13 +1840,15 @@ 
 			{
 				if($control->_id !== '')
 				{
-					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id]))
-						throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
-					else
-						$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
+					if(isset($container->_rf[self::RF_NAMED_CONTROLS][$control->_id])) {
+											throw new TInvalidDataValueException('control_id_nonunique', get_class($control), $control->_id);
+					} else {
+											$container->_rf[self::RF_NAMED_CONTROLS][$control->_id] = $control;
+					}
+				}
+				if(!($control instanceof INamingContainer) && $control->getHasControls()) {
+									$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 				}
-				if(!($control instanceof INamingContainer) && $control->getHasControls())
-					$this->fillNameTable($container, $control->_rf[self::RF_CONTROLS]);
 			}
 		}
 	}

framework/Web/UI/TSessionPageStatePersister.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
 	 */
 	public function setHistorySize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
+		if (($value = TPropertyValue::ensureInteger($value)) > 0)
 			$this->_historySize = $value;
 		else
 			throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
@@ -99,13 +99,13 @@ 
 		$session = $this->_page->getSession();
 		$session->open();
 		$data = serialize($state);
-		$timestamp = (string)microtime(true);
-		$key = self::STATE_SESSION_KEY . $timestamp;
+		$timestamp = (string) microtime(true);
+		$key = self::STATE_SESSION_KEY.$timestamp;
 		$session->add($key, $data);
-		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
+		if (($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
 			$queue = [];
 		$queue[] = $key;
-		if(count($queue) > $this->getHistorySize())
+		if (count($queue) > $this->getHistorySize())
 		{
 			$expiredKey = array_shift($queue);
 			$session->remove($expiredKey);
@@ -121,12 +121,12 @@ 
 	 */
 	public function load()
 	{
-		if(($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
+		if (($timestamp = TPageStateFormatter::unserialize($this->_page, $this->_page->getRequestClientState())) !== null)
 		{
 			$session = $this->_page->getSession();
 			$session->open();
-			$key = self::STATE_SESSION_KEY . $timestamp;
-			if(($data = $session->itemAt($key)) !== null)
+			$key = self::STATE_SESSION_KEY.$timestamp;
+			if (($data = $session->itemAt($key)) !== null)
 				return unserialize($data);
 		}
 		throw new THttpException(400, 'sessionpagestatepersister_pagestate_corrupted');

Braces +11 added lines, -8 removed lines

@@ -85,10 +85,11 @@ 
 	 */
 	public function setHistorySize($value)
 	{
-		if(($value = TPropertyValue::ensureInteger($value)) > 0)
-			$this->_historySize = $value;
-		else
-			throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
+		if(($value = TPropertyValue::ensureInteger($value)) > 0) {
+					$this->_historySize = $value;
+		} else {
+					throw new TInvalidDataValueException('sessionpagestatepersister_historysize_invalid');
+		}
 	}
 	/**
 	 * Saves state in session.
@@ -102,8 +103,9 @@ 
 		$timestamp = (string)microtime(true);
 		$key = self::STATE_SESSION_KEY . $timestamp;
 		$session->add($key, $data);
-		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null)
-			$queue = [];
+		if(($queue = $session->itemAt(self::QUEUE_SESSION_KEY)) === null) {
+					$queue = [];
+		}
 		$queue[] = $key;
 		if(count($queue) > $this->getHistorySize())
 		{
@@ -126,8 +128,9 @@ 
 			$session = $this->_page->getSession();
 			$session->open();
 			$key = self::STATE_SESSION_KEY . $timestamp;
-			if(($data = $session->itemAt($key)) !== null)
-				return unserialize($data);
+			if(($data = $session->itemAt($key)) !== null) {
+							return unserialize($data);
+			}
 		}
 		throw new THttpException(400, 'sessionpagestatepersister_pagestate_corrupted');
 	}

framework/Web/UI/TClientScriptManager.php

Spacing +51 added lines, -51 removed lines

@@ -168,11 +168,11 @@ 
 	protected function registerPradoScriptInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredScripts[$name]))
+		if (!isset($this->_registeredScripts[$name]))
 		{
-			if(self::$_scripts === null)
+			if (self::$_scripts === null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::PACKAGES_FILE;
+				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::PACKAGES_FILE;
 				list($folders, $packages, $deps) = include($packageFile);
 				self::$_scriptsFolders = $folders;
 				self::$_scripts = $deps;
@@ -184,7 +184,7 @@ 
 			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;
@@ -200,17 +200,17 @@ 
 								list($path, $baseUrl) = $this->getPackagePathUrl($base);
 
 								$this->_expandedScripts[$script] = true;
-								if($isDebug)
+								if ($isDebug)
 								{
-									if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
+									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))
+								  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;
@@ -220,7 +220,7 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
+				foreach ($packagesUrl as $url)
 					$this->registerScriptFile($url, $url);
 			}
 		}
@@ -231,7 +231,7 @@ 
 	 */
 	public function getPradoScriptAssetUrl($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
+		if (!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
@@ -244,7 +244,7 @@ 
 	 */
 	public function getPradoScriptAssetPath($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
+		if (!isset(self::$_scriptsFolders[$script]))
 			$this->registerPradoScriptInternal($script);
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
@@ -272,13 +272,13 @@ 
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		if(strpos($base, $assets->getBaseUrl()) === false)
+		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];
 		}
 	}
 
@@ -290,11 +290,11 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_scriptsFolders))
+		if (!array_key_exists($base, self::$_scriptsFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
 		$namespace = self::$_scriptsFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
+		if (($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
 		  $namespace = $dir;
 		}
 
@@ -309,11 +309,11 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_stylesFolders))
+		if (!array_key_exists($base, self::$_stylesFolders))
 			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
 
 		$namespace = self::$_stylesFolders[$base];
-		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
+		if (($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
 		  $namespace = $dir;
 		}
 
@@ -362,10 +362,10 @@ 
 	 */
 	public function registerPostBackControl($class, $options)
 	{
-		if($class === null) {
+		if ($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
+		if (!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
 			$options['FormID'] = $form->getClientID();
 		$optionString = TJavaScript::encode($options);
 		$code = "new {$class}({$optionString});";
@@ -385,9 +385,9 @@ 
 	 */
 	public function registerDefaultButton($panel, $button)
 	{
-		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
+		$panelID = is_string($panel) ? $panel : $panel->getUniqueID();
 
-		if(is_string($button))
+		if (is_string($button))
 			$buttonID = $button;
 		else
 		{
@@ -397,10 +397,10 @@ 
 		$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);
 	}
 
@@ -426,9 +426,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
+		if ($target instanceof TControl)
 			$target = $target->getClientID();
-		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
+		$this->_endScripts['prado:focus'] = 'jQuery(\'#'.$target.'\').focus();';
 
 		$params = func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerFocusControl', $params);
@@ -452,11 +452,11 @@ 
 	protected function registerPradoStyleInternal($name)
 	{
 		// $this->checkIfNotInRender();
-		if(!isset($this->_registeredStyles[$name]))
+		if (!isset($this->_registeredStyles[$name]))
 		{
-			if(self::$_styles === null)
+			if (self::$_styles === null)
 			{
-				$packageFile = Prado::getFrameworkPath() . DIRECTORY_SEPARATOR . self::CSS_PACKAGES_FILE;
+				$packageFile = Prado::getFrameworkPath().DIRECTORY_SEPARATOR.self::CSS_PACKAGES_FILE;
 				list($folders, $packages, $deps) = include($packageFile);
 				self::$_stylesFolders = $folders;
 				self::$_styles = $deps;
@@ -468,7 +468,7 @@ 
 			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;
@@ -485,13 +485,13 @@ 
 
 								$this->_expandedStyles[$style] = true;
 								// TODO minify css?
-								if (!in_array($url = $baseUrl . '/' . $subPath, $packagesUrl))
+								if (!in_array($url = $baseUrl.'/'.$subPath, $packagesUrl))
 									$packagesUrl[] = $url;
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
+				foreach ($packagesUrl as $url)
 					$this->registerStyleSheetFile($url, $url);
 			}
 		}
@@ -521,10 +521,10 @@ 
 	 */
 	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media === '')
+		if ($media === '')
 			$this->_styleSheetFiles[$key] = $url;
 		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+			$this->_styleSheetFiles[$key] = [$url, $media];
 
 		$params = func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
@@ -555,7 +555,7 @@ 
 			}, $this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
+		foreach (Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
 			if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
 
@@ -749,12 +749,12 @@ 
 	public function renderStyleSheetFiles($writer)
 	{
 		$str = '';
-		foreach($this->_styleSheetFiles as $url)
+		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";
+			if (is_array($url))
+				$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);
 	}
@@ -764,8 +764,8 @@ 
 	 */
 	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");
+		if (count($this->_styleSheets))
+			$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n".implode("\n", $this->_styleSheets)."\n/*]]>*/\n</style>\n");
 	}
 
 	/**
@@ -803,7 +803,7 @@ 
 
 	protected function renderScriptFiles($writer, array $scripts)
 	{
-		foreach($scripts as $script)
+		foreach ($scripts as $script)
 		{
 			$writer->write(TJavaScript::renderScriptFile($script));
 			$this->markScriptFileAsRendered($script);
@@ -820,7 +820,7 @@ 
 	 */
 	public function renderAllPendingScriptFiles($writer)
 	{
-		if(!empty($this->_scriptFiles))
+		if (!empty($this->_scriptFiles))
 		{
 			$addedScripts = array_diff($this->_scriptFiles, $this->getRenderedScriptFiles());
 			$this->renderScriptFiles($writer, $addedScripts);
@@ -876,7 +876,7 @@ 
 	 */
 	public function flushScriptFiles($writer, $control = null)
 	{
-		if(!$this->_page->getIsCallback())
+		if (!$this->_page->getIsCallback())
 		{
 			$this->_page->ensureRenderInForm($control);
 			$this->renderAllPendingScriptFiles($writer);
@@ -895,23 +895,23 @@ 
 	{
 		if ($initial) $this->_renderedHiddenFields = [];
 		$str = '';
-		foreach($this->_hiddenFields as $name => $value)
+		foreach ($this->_hiddenFields as $name => $value)
 		{
 			if (in_array($name, $this->_renderedHiddenFields)) continue;
 			$id = strtr($name, ':', '_');
-			if(is_array($value))
+			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";
+				foreach ($value as $v)
+					$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;
 		}
-		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()

Braces +76 added lines, -55 removed lines

@@ -179,10 +179,11 @@ 
 				self::$_scriptsPackages = $packages;
 			}
 
-			if (isset(self::$_scripts[$name]))
-				$this->_registeredScripts[$name] = true;
-			else
-				throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
+			if (isset(self::$_scripts[$name])) {
+							$this->_registeredScripts[$name] = true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradoscript_invalid', $name);
+			}
 
 			if(($packages = array_keys($this->_registeredScripts)) !== [])
 			{
@@ -202,8 +203,9 @@ 
 								$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))
@@ -220,8 +222,9 @@ 
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerScriptFile($url, $url);
+				foreach($packagesUrl as $url) {
+									$this->registerScriptFile($url, $url);
+				}
 			}
 		}
 	}
@@ -231,8 +234,9 @@ 
 	 */
 	public function getPradoScriptAssetUrl($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
-			$this->registerPradoScriptInternal($script);
+		if(!isset(self::$_scriptsFolders[$script])) {
+					$this->registerPradoScriptInternal($script);
+		}
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
 		$assets = Prado::getApplication()->getAssetManager();
@@ -244,8 +248,9 @@ 
 	 */
 	public function getPradoScriptAssetPath($script = 'prado')
 	{
-		if(!isset(self::$_scriptsFolders[$script]))
-			$this->registerPradoScriptInternal($script);
+		if(!isset(self::$_scriptsFolders[$script])) {
+					$this->registerPradoScriptInternal($script);
+		}
 
 		$base = Prado::getPathOfNameSpace(self::$_scriptsFolders[$script]);
 		$assets = Prado::getApplication()->getAssetManager();
@@ -275,8 +280,7 @@ 
 		if(strpos($base, $assets->getBaseUrl()) === false)
 		{
 			return [$assets->getPublishedPath($base), $assets->publishFilePath($base)];
-		}
-		else
+		} else
 		{
 			return [$assets->getBasePath() . str_replace($assets->getBaseUrl(), '', $base), $base];
 		}
@@ -290,8 +294,9 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_scriptsFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		if(!array_key_exists($base, self::$_scriptsFolders)) {
+					throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		}
 
 		$namespace = self::$_scriptsFolders[$base];
 		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
@@ -309,8 +314,9 @@ 
 	{
 		list($base, $subPath) = explode("/", $script, 2);
 
-		if(!array_key_exists($base, self::$_stylesFolders))
-			throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		if(!array_key_exists($base, self::$_stylesFolders)) {
+					throw new TInvalidOperationException('csmanager_pradostyle_invalid', $base);
+		}
 
 		$namespace = self::$_stylesFolders[$base];
 		if(($dir = Prado::getPathOfNameSpace($namespace)) !== null) {
@@ -365,8 +371,9 @@ 
 		if($class === null) {
 			return;
 		}
-		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null)
-			$options['FormID'] = $form->getClientID();
+		if(!isset($options['FormID']) && ($form = $this->_page->getForm()) !== null) {
+					$options['FormID'] = $form->getClientID();
+		}
 		$optionString = TJavaScript::encode($options);
 		$code = "new {$class}({$optionString});";
 
@@ -387,9 +394,9 @@ 
 	{
 		$panelID = is_string($panel)?$panel:$panel->getUniqueID();
 
-		if(is_string($button))
-			$buttonID = $button;
-		else
+		if(is_string($button)) {
+					$buttonID = $button;
+		} else
 		{
 			$button->setIsDefaultButton(true);
 			$buttonID = $button->getUniqueID();
@@ -426,8 +433,9 @@ 
 	public function registerFocusControl($target)
 	{
 		$this->registerPradoScriptInternal('jquery');
-		if($target instanceof TControl)
-			$target = $target->getClientID();
+		if($target instanceof TControl) {
+					$target = $target->getClientID();
+		}
 		$this->_endScripts['prado:focus'] = 'jQuery(\'#' . $target . '\').focus();';
 
 		$params = func_get_args();
@@ -463,10 +471,11 @@ 
 				self::$_stylesPackages = $packages;
 			}
 
-			if (isset(self::$_styles[$name]))
-				$this->_registeredStyles[$name] = true;
-			else
-				throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
+			if (isset(self::$_styles[$name])) {
+							$this->_registeredStyles[$name] = true;
+			} else {
+							throw new TInvalidOperationException('csmanager_pradostyle_invalid', $name);
+			}
 
 			if(($packages = array_keys($this->_registeredStyles)) !== [])
 			{
@@ -485,14 +494,16 @@ 
 
 								$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;
+								}
 							}
 						}
 					}
 				}
-				foreach($packagesUrl as $url)
-					$this->registerStyleSheetFile($url, $url);
+				foreach($packagesUrl as $url) {
+									$this->registerStyleSheetFile($url, $url);
+				}
 			}
 		}
 	}
@@ -521,10 +532,11 @@ 
 	 */
 	public function registerStyleSheetFile($key, $url, $media = '')
 	{
-		if($media === '')
-			$this->_styleSheetFiles[$key] = $url;
-		else
-			$this->_styleSheetFiles[$key] = [$url,$media];
+		if($media === '') {
+					$this->_styleSheetFiles[$key] = $url;
+		} else {
+					$this->_styleSheetFiles[$key] = [$url,$media];
+		}
 
 		$params = func_get_args();
 		$this->_page->registerCachingAction('Page.ClientScript', 'registerStyleSheetFile', $params);
@@ -555,9 +567,10 @@ 
 			}, $this->_styleSheetFiles)
 		);
 
-		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url)
-			if (substr($url, strlen($url) - 4) == '.css')
+		foreach(Prado::getApplication()->getAssetManager()->getPublished() as $path => $url) {
+					if (substr($url, strlen($url) - 4) == '.css')
 				$stylesheets[] = $url;
+		}
 
 		$stylesheets = array_unique($stylesheets);
 
@@ -751,10 +764,11 @@ 
 		$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";
-			else
-				$str .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"" . THttpUtility::htmlEncode($url) . "\" />\n";
+			if(is_array($url)) {
+							$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";
+			}
 		}
 		$writer->write($str);
 	}
@@ -764,8 +778,9 @@ 
 	 */
 	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");
+		if(count($this->_styleSheets)) {
+					$writer->write("<style type=\"text/css\">\n/*<![CDATA[*/\n" . implode("\n", $this->_styleSheets) . "\n/*]]>*/\n</style>\n");
+		}
 	}
 
 	/**
@@ -893,25 +908,30 @@ 
 
 	protected function renderHiddenFieldsInt($writer, $initial)
 	{
-		if ($initial) $this->_renderedHiddenFields = [];
+		if ($initial) {
+			$this->_renderedHiddenFields = [];
+		}
 		$str = '';
 		foreach($this->_hiddenFields as $name => $value)
 		{
-			if (in_array($name, $this->_renderedHiddenFields)) continue;
+			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";
-			}
-			else
+				foreach($value as $v) {
+									$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";
 			}
 			$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 +944,8 @@ 
 	 */
 	protected function checkIfNotInRender()
 	{
-		if ($form = $this->_page->InFormRender)
-			throw new \Exception('Operation invalid when page is already rendering');
+		if ($form = $this->_page->InFormRender) {
+					throw new \Exception('Operation invalid when page is already rendering');
+		}
 	}
 }

framework/Web/UI/TClientSideOptions.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
+		if (!TJavaScript::isJsLiteral($code))
 			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
 		$this->setOption($name, $code);
 	}

Braces +11 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
 	 */
 	protected function setFunction($name, $code)
 	{
-		if(!TJavaScript::isJsLiteral($code))
-			$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		if(!TJavaScript::isJsLiteral($code)) {
+					$code = TJavaScript::quoteJsLiteral($this->ensureFunction($code));
+		}
 		$this->setOption($name, $code);
 	}
 
@@ -53,10 +54,11 @@ 
 	 */
 	protected function getOption($name)
 	{
-		if ($this->_options)
-			return $this->_options->itemAt($name);
-		else
-			return null;
+		if ($this->_options) {
+					return $this->_options->itemAt($name);
+		} else {
+					return null;
+		}
 	}
 
 	/**
@@ -73,8 +75,9 @@ 
 	 */
 	public function getOptions()
 	{
-		if (!$this->_options)
-			$this->_options = new TMap;
+		if (!$this->_options) {
+					$this->_options = new TMap;
+		}
 		return $this->_options;
 	}
 

framework/Web/UI/TTemplateControlInheritable.php

Spacing +8 added lines, -8 removed lines

@@ -43,12 +43,12 @@ 
 	 */
 	public function createChildControls()
 	{
-		if(null === ($_template = $this->getTemplate())) {
+		if (null === ($_template = $this->getTemplate())) {
 			return $this->doCreateChildControlsFor(get_class($this));
 		}
 
-		foreach($_template->getDirective() as $_name => $_value) {
-			if(!is_string($_value)) {
+		foreach ($_template->getDirective() as $_name => $_value) {
+			if (!is_string($_value)) {
 				throw new TConfigurationException('templatecontrol_directive_invalid', get_class($this), $name);
 			}
 			
@@ -66,7 +66,7 @@ 
 	 */
 	public function doCreateChildControlsFor($parentClass)
 	{
-		if(false !== ($_parentClass = get_parent_class($parentClass)) && 'TTemplateControl' != $_parentClass) {
+		if (false !== ($_parentClass = get_parent_class($parentClass)) && 'TTemplateControl' != $_parentClass) {
 			$this->doCreateChildControlsFor($_parentClass);
 		}
 
@@ -82,9 +82,9 @@ 
 	 */
 	public function doTemplateForClass($parentClass)
 	{
-		if(null !== ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
-			foreach($_template->getDirective() as $_name => $_value) {
-				if(!is_string($_value)) {
+		if (null !== ($_template = $this->getService()->getTemplateManager()->getTemplateByClassName($parentClass))) {
+			foreach ($_template->getDirective() as $_name => $_value) {
+				if (!is_string($_value)) {
 					throw new TConfigurationException('templatecontrol_directive_invalid', get_class(this), $_name);
 				}
 				
@@ -105,7 +105,7 @@ 
 	 */
 	public function getIsSourceTemplateControl()
 	{
-		if(null !== ($_template = $this->getTemplate())) {
+		if (null !== ($_template = $this->getTemplate())) {
 			return $_template->getIsSourceTemplate();
 		}
 

framework/Web/UI/TForm.php

Spacing +4 added lines, -4 removed lines

@@ -52,16 +52,16 @@ 
 		$writer->addAttribute('method', $this->getMethod());
 		$uri = $this->getRequest()->getRequestURI();
 		$writer->addAttribute('action', str_replace('&', '&', str_replace('&', '&', $uri)));
-		if(($enctype = $this->getEnctype()) !== '')
+		if (($enctype = $this->getEnctype()) !== '')
 			$writer->addAttribute('enctype', $enctype);
 
 		$attributes = $this->getAttributes();
 		$attributes->remove('action');
 		$writer->addAttributes($attributes);
 
-		if(($butt = $this->getDefaultButton()) !== '')
+		if (($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button = $this->findControl($butt)) !== null)
+			if (($button = $this->findControl($butt)) !== null)
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 			else
 				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
@@ -80,7 +80,7 @@ 
 		$writer->renderBeginTag('form');
 
 		$cs = $page->getClientScript();
-		if($page->getClientSupportsJavaScript())
+		if ($page->getClientSupportsJavaScript())
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 			$cs->renderScriptFilesBegin($writer);

Braces +9 added lines, -8 removed lines

@@ -52,8 +52,9 @@ 
 		$writer->addAttribute('method', $this->getMethod());
 		$uri = $this->getRequest()->getRequestURI();
 		$writer->addAttribute('action', str_replace('&', '&', str_replace('&', '&', $uri)));
-		if(($enctype = $this->getEnctype()) !== '')
-			$writer->addAttribute('enctype', $enctype);
+		if(($enctype = $this->getEnctype()) !== '') {
+					$writer->addAttribute('enctype', $enctype);
+		}
 
 		$attributes = $this->getAttributes();
 		$attributes->remove('action');
@@ -61,10 +62,11 @@ 
 
 		if(($butt = $this->getDefaultButton()) !== '')
 		{
-			if(($button = $this->findControl($butt)) !== null)
-				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
-			else
-				throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
+			if(($button = $this->findControl($butt)) !== null) {
+							$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
+			} else {
+							throw new TInvalidDataValueException('form_defaultbutton_invalid', $butt);
+			}
 		}
 	}
 
@@ -93,8 +95,7 @@ 
 
 			$cs->renderScriptFilesEnd($writer);
 			$cs->renderEndScripts($writer);
-		}
-		else
+		} else
 		{
 			$cs->renderHiddenFieldsBegin($writer);
 

framework/Web/TUrlMappingPattern.php

Spacing +52 added lines, -52 removed lines

@@ -185,9 +185,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_serviceParameter === null)
+		if ($this->_serviceParameter === null)
 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter, '*') !== false)
+		if (strpos($this->_serviceParameter, '*') !== false)
 				$this->_isWildCardPattern = true;
 	}
 
@@ -202,27 +202,27 @@ 
 		$values = [];
 		if ($this->_parameters)
 		{
-			foreach($this->_parameters as $key => $value)
+			foreach ($this->_parameters as $key => $value)
 			{
-				$params[] = '{' . $key . '}';
-				$values[] = '(?P<' . $key . '>' . $value . ')';
+				$params[] = '{'.$key.'}';
+				$values[] = '(?P<'.$key.'>'.$value.')';
 			}
 		}
 		if ($this->getIsWildCardPattern())
 		{
 				$params[] = '{*}';
 				// service parameter must not contain '=' and '/'
-				$values[] = '(?P<' . $this->getServiceID() . '>[^=/]+)';
+				$values[] = '(?P<'.$this->getServiceID().'>[^=/]+)';
 		}
 		$params[] = '/';
 		$values[] = '\\/';
-		$regexp = str_replace($params, $values, trim($this->getPattern(), '/') . '/');
+		$regexp = str_replace($params, $values, trim($this->getPattern(), '/').'/');
 		if ($this->_urlFormat === THttpRequestUrlFormat::Get)
-				$regexp = '/^' . $regexp . '$/u';
+				$regexp = '/^'.$regexp.'$/u';
 		else
-				$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
+				$regexp = '/^'.$regexp.'(?P<urlparams>.*)$/u';
 
-		if(!$this->getCaseSensitive())
+		if (!$this->getCaseSensitive())
 			$regexp .= 'i';
 		return $regexp;
 	}
@@ -351,12 +351,12 @@ 
 	public function getPatternMatches($request)
 	{
 		$matches = [];
-		if(($pattern = $this->getRegularExpression()) !== '')
+		if (($pattern = $this->getRegularExpression()) !== '')
 			preg_match($pattern, $request->getPathInfo(), $matches);
 		else
-			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/') . '/', $matches);
+			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/').'/', $matches);
 
-		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
+		if ($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
 			$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
 		if (isset($matches['urlparams']))
@@ -364,13 +364,13 @@ 
 			$params = explode('/', $matches['urlparams']);
 			if ($this->_separator === '/')
 			{
-				while($key = array_shift($params))
+				while ($key = array_shift($params))
 					$matches[$key] = ($value = array_shift($params)) ? $value : '';
 			}
 			else
 			{
 				array_pop($params);
-				foreach($params as $param)
+				foreach ($params as $param)
 				{
 					list($key, $value) = explode($this->_separator, $param, 2);
 					$matches[$key] = $value;
@@ -379,9 +379,9 @@ 
 			unset($matches['urlparams']);
 		}
 
-		if(count($matches) > 0 && $this->_constants)
+		if (count($matches) > 0 && $this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key => $value)
+			foreach ($this->_constants->toArray() as $key => $value)
 				$matches[$key] = $value;
 		}
 
@@ -453,7 +453,7 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value) === 1)
+		if (strlen($value) === 1)
 			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
@@ -484,20 +484,20 @@ 
 	 */
 	public function supportCustomUrl($getItems)
 	{
-		if(!$this->_customUrl || $this->getPattern() === null)
+		if (!$this->_customUrl || $this->getPattern() === null)
 			return false;
 		if ($this->_parameters)
 		{
-			foreach($this->_parameters as $key => $value)
+			foreach ($this->_parameters as $key => $value)
 			{
-				if(!isset($getItems[$key]))
+				if (!isset($getItems[$key]))
 					return false;
 			}
 		}
 
 		if ($this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key => $value)
+			foreach ($this->_constants->toArray() as $key => $value)
 			{
 				if (!isset($getItems[$key]))
 					return false;
@@ -520,7 +520,7 @@ 
 	{
 		if ($this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key => $value)
+			foreach ($this->_constants->toArray() as $key => $value)
 			{
 				unset($getItems[$key]);
 			}
@@ -529,55 +529,55 @@ 
 		$extra = [];
 		$replace = [];
 		// for the GET variables matching the pattern, put them in the URL path
-		foreach($getItems as $key => $value)
+		foreach ($getItems as $key => $value)
 		{
-			if(($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern()))
-				$replace['{' . $key . '}'] = $encodeGetItems ? rawurlencode($value) : $value;
+			if (($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern()))
+				$replace['{'.$key.'}'] = $encodeGetItems ? rawurlencode($value) : $value;
 			else
 				$extra[$key] = $value;
 		}
 
-		$url = $this->_manager->getUrlPrefix() . '/' . ltrim(strtr($this->getPattern(), $replace), '/');
+		$url = $this->_manager->getUrlPrefix().'/'.ltrim(strtr($this->getPattern(), $replace), '/');
 
 		// for the rest of the GET variables, put them in the query string
-		if(count($extra) > 0)
+		if (count($extra) > 0)
 		{
 			if ($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
 				foreach ($extra as $name => $value)
-					$url .= '/' . $name . $this->_separator . ($encodeGetItems?rawurlencode($value):$value);
+					$url .= '/'.$name.$this->_separator.($encodeGetItems ?rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2 = '';
-			$amp = $encodeAmpersand?'&amp;':'&';
-			if($encodeGetItems)
+			$amp = $encodeAmpersand ? '&amp;' : '&';
+			if ($encodeGetItems)
 			{
-				foreach($extra as $name => $value)
+				foreach ($extra as $name => $value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						$name = rawurlencode($name . '[]');
-						foreach($value as $v)
-							$url2 .= $amp . $name . '=' . rawurlencode($v);
+						$name = rawurlencode($name.'[]');
+						foreach ($value as $v)
+							$url2 .= $amp.$name.'='.rawurlencode($v);
 					}
 					else
-						$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
+						$url2 .= $amp.rawurlencode($name).'='.rawurlencode($value);
 				}
 			}
 			else
 			{
-				foreach($extra as $name => $value)
+				foreach ($extra as $name => $value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
-							$url2 .= $amp . $name . '[]=' . $v;
+						foreach ($value as $v)
+							$url2 .= $amp.$name.'[]='.$v;
 					}
 					else
-						$url2 .= $amp . $name . '=' . $value;
+						$url2 .= $amp.$name.'='.$value;
 				}
 			}
-			$url = $url . '?' . substr($url2, strlen($amp));
+			$url = $url.'?'.substr($url2, strlen($amp));
 		}
 		return $this -> applySecureConnectionPrefix($url);
 	}
@@ -593,26 +593,26 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if ($request === null) $request = Prado::getApplication() -> getRequest();
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if ($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
 
-		switch($this -> getSecureConnection())
+		switch ($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
-				if($isSecureConnection) return $url;
-				return $request -> getBaseUrl(true) . $url;
+				if ($isSecureConnection) return $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
-				if(!$isSecureConnection) return $url;
-				return $request -> getBaseUrl(false) . $url;
+				if (!$isSecureConnection) return $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:
-				return $request -> getBaseUrl(true) . $url;
+				return $request -> getBaseUrl(true).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Disable:
-				return $request -> getBaseUrl(false) . $url;
+				return $request -> getBaseUrl(false).$url;
 			break;
 			case TUrlMappingPatternSecureConnection::Automatic:
 			default:

Braces +77 added lines, -54 removed lines

@@ -185,10 +185,12 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_serviceParameter === null)
-			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
-		if(strpos($this->_serviceParameter, '*') !== false)
-				$this->_isWildCardPattern = true;
+		if($this->_serviceParameter === null) {
+					throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());
+		}
+		if(strpos($this->_serviceParameter, '*') !== false) {
+						$this->_isWildCardPattern = true;
+		}
 	}
 
 	/**
@@ -217,13 +219,15 @@ 
 		$params[] = '/';
 		$values[] = '\\/';
 		$regexp = str_replace($params, $values, trim($this->getPattern(), '/') . '/');
-		if ($this->_urlFormat === THttpRequestUrlFormat::Get)
-				$regexp = '/^' . $regexp . '$/u';
-		else
-				$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
+		if ($this->_urlFormat === THttpRequestUrlFormat::Get) {
+						$regexp = '/^' . $regexp . '$/u';
+		} else {
+						$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
+		}
 
-		if(!$this->getCaseSensitive())
-			$regexp .= 'i';
+		if(!$this->getCaseSensitive()) {
+					$regexp .= 'i';
+		}
 		return $regexp;
 	}
 
@@ -351,23 +355,25 @@ 
 	public function getPatternMatches($request)
 	{
 		$matches = [];
-		if(($pattern = $this->getRegularExpression()) !== '')
-			preg_match($pattern, $request->getPathInfo(), $matches);
-		else
-			preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/') . '/', $matches);
+		if(($pattern = $this->getRegularExpression()) !== '') {
+					preg_match($pattern, $request->getPathInfo(), $matches);
+		} else {
+					preg_match($this->getParameterizedPattern(), trim($request->getPathInfo(), '/') . '/', $matches);
+		}
 
-		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
-			$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
+		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID])) {
+					$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
+		}
 
 		if (isset($matches['urlparams']))
 		{
 			$params = explode('/', $matches['urlparams']);
 			if ($this->_separator === '/')
 			{
-				while($key = array_shift($params))
-					$matches[$key] = ($value = array_shift($params)) ? $value : '';
-			}
-			else
+				while($key = array_shift($params)) {
+									$matches[$key] = ($value = array_shift($params)) ? $value : '';
+				}
+			} else
 			{
 				array_pop($params);
 				foreach($params as $param)
@@ -381,8 +387,9 @@ 
 
 		if(count($matches) > 0 && $this->_constants)
 		{
-			foreach($this->_constants->toArray() as $key => $value)
-				$matches[$key] = $value;
+			foreach($this->_constants->toArray() as $key => $value) {
+							$matches[$key] = $value;
+			}
 		}
 
 		return $matches;
@@ -453,10 +460,11 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value) === 1)
-			$this->_separator = $value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value) === 1) {
+					$this->_separator = $value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 
 	/**
@@ -484,14 +492,16 @@ 
 	 */
 	public function supportCustomUrl($getItems)
 	{
-		if(!$this->_customUrl || $this->getPattern() === null)
-			return false;
+		if(!$this->_customUrl || $this->getPattern() === null) {
+					return false;
+		}
 		if ($this->_parameters)
 		{
 			foreach($this->_parameters as $key => $value)
 			{
-				if(!isset($getItems[$key]))
-					return false;
+				if(!isset($getItems[$key])) {
+									return false;
+				}
 			}
 		}
 
@@ -499,10 +509,12 @@ 
 		{
 			foreach($this->_constants->toArray() as $key => $value)
 			{
-				if (!isset($getItems[$key]))
-					return false;
-				if ($getItems[$key] != $value)
-					return false;
+				if (!isset($getItems[$key])) {
+									return false;
+				}
+				if ($getItems[$key] != $value) {
+									return false;
+				}
 			}
 		}
 		return true;
@@ -531,10 +543,11 @@ 
 		// for the GET variables matching the pattern, put them in the URL path
 		foreach($getItems as $key => $value)
 		{
-			if(($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern()))
-				$replace['{' . $key . '}'] = $encodeGetItems ? rawurlencode($value) : $value;
-			else
-				$extra[$key] = $value;
+			if(($this->_parameters && $this->_parameters->contains($key)) || ($key === '*' && $this->getIsWildCardPattern())) {
+							$replace['{' . $key . '}'] = $encodeGetItems ? rawurlencode($value) : $value;
+			} else {
+							$extra[$key] = $value;
+			}
 		}
 
 		$url = $this->_manager->getUrlPrefix() . '/' . ltrim(strtr($this->getPattern(), $replace), '/');
@@ -543,8 +556,9 @@ 
 		if(count($extra) > 0)
 		{
 			if ($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name => $value)
-					$url .= '/' . $name . $this->_separator . ($encodeGetItems?rawurlencode($value):$value);
+				foreach ($extra as $name => $value) {
+									$url .= '/' . $name . $this->_separator . ($encodeGetItems?rawurlencode($value):$value);
+				}
 				return $url;
 			}
 
@@ -557,24 +571,25 @@ 
 					if(is_array($value))
 					{
 						$name = rawurlencode($name . '[]');
-						foreach($value as $v)
-							$url2 .= $amp . $name . '=' . rawurlencode($v);
+						foreach($value as $v) {
+													$url2 .= $amp . $name . '=' . rawurlencode($v);
+						}
+					} else {
+											$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
 					}
-					else
-						$url2 .= $amp . rawurlencode($name) . '=' . rawurlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($extra as $name => $value)
 				{
 					if(is_array($value))
 					{
-						foreach($value as $v)
-							$url2 .= $amp . $name . '[]=' . $v;
+						foreach($value as $v) {
+													$url2 .= $amp . $name . '[]=' . $v;
+						}
+					} else {
+											$url2 .= $amp . $name . '=' . $value;
 					}
-					else
-						$url2 .= $amp . $name . '=' . $value;
 				}
 			}
 			$url = $url . '?' . substr($url2, strlen($amp));
@@ -593,19 +608,27 @@ 
 	protected function applySecureConnectionPrefix($url)
 	{
 		static $request;
-		if($request === null) $request = Prado::getApplication() -> getRequest();
+		if($request === null) {
+			$request = Prado::getApplication() -> getRequest();
+		}
 
 		static $isSecureConnection;
-		if($isSecureConnection === null) $isSecureConnection = $request -> getIsSecureConnection();
+		if($isSecureConnection === null) {
+			$isSecureConnection = $request -> getIsSecureConnection();
+		}
 
 		switch($this -> getSecureConnection())
 		{
 			case TUrlMappingPatternSecureConnection::EnableIfNotSecure:
-				if($isSecureConnection) return $url;
+				if($isSecureConnection) {
+					return $url;
+				}
 				return $request -> getBaseUrl(true) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::DisableIfSecure:
-				if(!$isSecureConnection) return $url;
+				if(!$isSecureConnection) {
+					return $url;
+				}
 				return $request -> getBaseUrl(false) . $url;
 			break;
 			case TUrlMappingPatternSecureConnection::Enable:

framework/Web/TUrlMapping.php

Spacing +34 added lines, -34 removed lines

@@ -107,15 +107,15 @@ 
 	public function init($config)
 	{
 		parent::init($config);
-		if($this->getRequest()->getRequestResolved())
+		if ($this->getRequest()->getRequestResolved())
 			throw new TConfigurationException('urlmapping_global_required');
-		if($this->_configFile !== null)
+		if ($this->_configFile !== null)
 			$this->loadConfigFile();
 		$this->loadUrlMappings($config);
-		if($this->_urlPrefix === '')
+		if ($this->_urlPrefix === '')
 		{
 			$request = $this->getRequest();
-			if($request->getUrlFormat() === THttpRequestUrlFormat::HiddenPath)
+			if ($request->getUrlFormat() === THttpRequestUrlFormat::HiddenPath)
 			{
 				$this->_urlPrefix = dirname($request->getApplicationUrl());
 			} else {
@@ -131,9 +131,9 @@ 
 	 */
 	protected function loadConfigFile()
 	{
-		if(is_file($this->_configFile))
+		if (is_file($this->_configFile))
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
@@ -207,7 +207,7 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
+		if (($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
 			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
 	}
 
@@ -241,24 +241,24 @@ 
 	{
 		$defaultClass = $this->getDefaultMappingClass();
 
-		if(is_array($config))
+		if (is_array($config))
 		{
-			if(isset($config['urls']) && is_array($config['urls']))
+			if (isset($config['urls']) && is_array($config['urls']))
 			{
-				foreach($config['urls'] as $url)
+				foreach ($config['urls'] as $url)
 				{
-					$class = isset($url['class'])?$url['class']:$defaultClass;
-					$properties = isset($url['properties'])?$url['properties']:[];
+					$class = isset($url['class']) ? $url['class'] : $defaultClass;
+					$properties = isset($url['properties']) ? $url['properties'] : [];
 					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('url') as $url)
+			foreach ($config->getElementsByTagName('url') as $url)
 			{
 				$properties = $url->getAttributes();
-				if(($class = $properties->remove('class')) === null)
+				if (($class = $properties->remove('class')) === null)
 					$class = $defaultClass;
 				$this->buildUrlMapping($class, $properties, $url);
 			}
@@ -268,16 +268,16 @@ 
 	private function buildUrlMapping($class, $properties, $url)
 	{
 		$pattern = Prado::createComponent($class, $this);
-		if(!($pattern instanceof TUrlMappingPattern))
+		if (!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
-		foreach($properties as $name => $value)
+		foreach ($properties as $name => $value)
 			$pattern->setSubproperty($name, $value);
 
-		if($url instanceof TXmlElement) {
+		if ($url instanceof TXmlElement) {
 			$text = $url -> getValue();
-			if($text) {
+			if ($text) {
 				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
+				if (($regExp = $pattern->getRegularExpression()) !== '')
 				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
@@ -292,7 +292,7 @@ 
 		$this->_patterns[] = $pattern;
 		$pattern->init($url);
 
-		$key = $pattern->getServiceID() . ':' . $pattern->getServiceParameter();
+		$key = $pattern->getServiceID().':'.$pattern->getServiceParameter();
 		$this->_constructRules[$key][] = $pattern;
 	}
 
@@ -307,16 +307,16 @@ 
 	public function parseUrl()
 	{
 		$request = $this->getRequest();
-		foreach($this->_patterns as $pattern)
+		foreach ($this->_patterns as $pattern)
 		{
 			$matches = $pattern->getPatternMatches($request);
-			if(count($matches) > 0)
+			if (count($matches) > 0)
 			{
 				$this->_matched = $pattern;
 				$params = [];
-				foreach($matches as $key => $value)
+				foreach ($matches as $key => $value)
 				{
-					if(is_string($key))
+					if (is_string($key))
 						$params[$key] = $value;
 				}
 				if (!$pattern->getIsWildCardPattern())
@@ -353,26 +353,26 @@ 
 	 */
 	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if($this->_customUrl)
+		if ($this->_customUrl)
 		{
-			if(!(is_array($getItems) || ($getItems instanceof \Traversable)))
+			if (!(is_array($getItems) || ($getItems instanceof \Traversable)))
 				$getItems = [];
-			$key = $serviceID . ':' . $serviceParam;
+			$key = $serviceID.':'.$serviceParam;
 			$wildCardKey = ($pos = strrpos($serviceParam, '.')) !== false ?
-				$serviceID . ':' . substr($serviceParam, 0, $pos) . '.*' : $serviceID . ':*';
-			if(isset($this->_constructRules[$key]))
+				$serviceID.':'.substr($serviceParam, 0, $pos).'.*' : $serviceID.':*';
+			if (isset($this->_constructRules[$key]))
 			{
-				foreach($this->_constructRules[$key] as $rule)
+				foreach ($this->_constructRules[$key] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
+					if ($rule->supportCustomUrl($getItems))
 						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
 				}
 			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			elseif (isset($this->_constructRules[$wildCardKey]))
 			{
-				foreach($this->_constructRules[$wildCardKey] as $rule)
+				foreach ($this->_constructRules[$wildCardKey] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
+					if ($rule->supportCustomUrl($getItems))
 					{
 						$getItems['*'] = $pos ? substr($serviceParam, $pos + 1) : $serviceParam;
 						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);

Braces +38 added lines, -30 removed lines

@@ -107,10 +107,12 @@ 
 	public function init($config)
 	{
 		parent::init($config);
-		if($this->getRequest()->getRequestResolved())
-			throw new TConfigurationException('urlmapping_global_required');
-		if($this->_configFile !== null)
-			$this->loadConfigFile();
+		if($this->getRequest()->getRequestResolved()) {
+					throw new TConfigurationException('urlmapping_global_required');
+		}
+		if($this->_configFile !== null) {
+					$this->loadConfigFile();
+		}
 		$this->loadUrlMappings($config);
 		if($this->_urlPrefix === '')
 		{
@@ -137,16 +139,15 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
+		} else {
+					throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 		}
-		else
-			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
 	/**
@@ -207,8 +208,9 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null)
-			throw new TConfigurationException('urlmapping_configfile_invalid', $value);
+		if(($this->_configFile = Prado::getPathOfNamespace($value, $this->getApplication()->getConfigurationFileExt())) === null) {
+					throw new TConfigurationException('urlmapping_configfile_invalid', $value);
+		}
 	}
 
 	/**
@@ -252,14 +254,14 @@ 
 					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
 				$properties = $url->getAttributes();
-				if(($class = $properties->remove('class')) === null)
-					$class = $defaultClass;
+				if(($class = $properties->remove('class')) === null) {
+									$class = $defaultClass;
+				}
 				$this->buildUrlMapping($class, $properties, $url);
 			}
 		}
@@ -268,23 +270,26 @@ 
 	private function buildUrlMapping($class, $properties, $url)
 	{
 		$pattern = Prado::createComponent($class, $this);
-		if(!($pattern instanceof TUrlMappingPattern))
-			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
-		foreach($properties as $name => $value)
-			$pattern->setSubproperty($name, $value);
+		if(!($pattern instanceof TUrlMappingPattern)) {
+					throw new TConfigurationException('urlmapping_urlmappingpattern_required');
+		}
+		foreach($properties as $name => $value) {
+					$pattern->setSubproperty($name, $value);
+		}
 
 		if($url instanceof TXmlElement) {
 			$text = $url -> getValue();
 			if($text) {
 				$text = preg_replace('/(\s+)/S', '', $text);
-				if(($regExp = $pattern->getRegularExpression()) !== '')
-				trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
+				if(($regExp = $pattern->getRegularExpression()) !== '') {
+								trigger_error(sPrintF('%s.RegularExpression property value "%s" for ServiceID="%s" and ServiceParameter="%s" was replaced by node value "%s"',
 				get_class($pattern),
 				$regExp,
 				$pattern->getServiceID(),
 				$pattern->getServiceParameter(),
 				$text),
 				E_USER_NOTICE);
+				}
 				$pattern->setRegularExpression($text);
 			}
 		}
@@ -316,11 +321,13 @@ 
 				$params = [];
 				foreach($matches as $key => $value)
 				{
-					if(is_string($key))
-						$params[$key] = $value;
+					if(is_string($key)) {
+											$params[$key] = $value;
+					}
+				}
+				if (!$pattern->getIsWildCardPattern()) {
+									$params[$pattern->getServiceID()] = $pattern->getServiceParameter();
 				}
-				if (!$pattern->getIsWildCardPattern())
-					$params[$pattern->getServiceID()] = $pattern->getServiceParameter();
 				return $params;
 			}
 		}
@@ -355,8 +362,9 @@ 
 	{
 		if($this->_customUrl)
 		{
-			if(!(is_array($getItems) || ($getItems instanceof \Traversable)))
-				$getItems = [];
+			if(!(is_array($getItems) || ($getItems instanceof \Traversable))) {
+							$getItems = [];
+			}
 			$key = $serviceID . ':' . $serviceParam;
 			$wildCardKey = ($pos = strrpos($serviceParam, '.')) !== false ?
 				$serviceID . ':' . substr($serviceParam, 0, $pos) . '.*' : $serviceID . ':*';
@@ -364,11 +372,11 @@ 
 			{
 				foreach($this->_constructRules[$key] as $rule)
 				{
-					if($rule->supportCustomUrl($getItems))
-						return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
+					if($rule->supportCustomUrl($getItems)) {
+											return $rule->constructUrl($getItems, $encodeAmpersand, $encodeGetItems);
+					}
 				}
-			}
-			elseif(isset($this->_constructRules[$wildCardKey]))
+			} elseif(isset($this->_constructRules[$wildCardKey]))
 			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)
 				{

framework/Web/THttpRequest.php

Spacing +69 added lines, -69 removed lines

@@ -162,7 +162,7 @@ 
 	public function init($config)
 	{
 		// Fill in default request info when the script is run in command line
-		if(php_sapi_name() === 'cli')
+		if (php_sapi_name() === 'cli')
 		{
 			$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
 			$_SERVER['REQUEST_METHOD'] = 'GET';
@@ -177,29 +177,29 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
+		if (isset($_SERVER['REQUEST_URI']))
 			$this->_requestUri = $_SERVER['REQUEST_URI'];
 		else  // TBD: in this case, SCRIPT_NAME need to be escaped
-			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING'])?'':'?' . $_SERVER['QUERY_STRING']);
+			$this->_requestUri = $_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']);
 
-		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
+		if ($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
 			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
+		elseif (isset($_SERVER['PATH_INFO']))
 			$this->_pathInfo = $_SERVER['PATH_INFO'];
-		elseif(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
+		elseif (strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
 			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
 		else
 			$this->_pathInfo = '';
 
-		if(get_magic_quotes_gpc())
+		if (get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
+			if (isset($_GET))
 				$_GET = $this->stripSlashes($_GET);
-			if(isset($_POST))
+			if (isset($_POST))
 				$_POST = $this->stripSlashes($_POST);
-			if(isset($_REQUEST))
+			if (isset($_REQUEST))
 				$_REQUEST = $this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
+			if (isset($_COOKIE))
 				$_COOKIE = $this->stripSlashes($_COOKIE);
 		}
 
@@ -214,7 +214,7 @@ 
 	 */
 	public function stripSlashes(&$data)
 	{
-		return is_array($data)?array_map([$this,'stripSlashes'], $data):stripslashes($data);
+		return is_array($data) ?array_map([$this, 'stripSlashes'], $data) : stripslashes($data);
 	}
 
 	/**
@@ -222,16 +222,16 @@ 
 	 */
 	public function getUrl()
 	{
-		if($this->_url === null)
+		if ($this->_url === null)
 		{
 			$secure = $this->getIsSecureConnection();
-			$url = $secure?'https://':'http://';
-			if(empty($_SERVER['HTTP_HOST']))
+			$url = $secure ? 'https://' : 'http://';
+			if (empty($_SERVER['HTTP_HOST']))
 			{
 				$url .= $_SERVER['SERVER_NAME'];
 				$port = $_SERVER['SERVER_PORT'];
-				if(($port != 80 && !$secure) || ($port != 443 && $secure))
-					$url .= ':' . $port;
+				if (($port != 80 && !$secure) || ($port != 443 && $secure))
+					$url .= ':'.$port;
 			}
 			else
 				$url .= $_SERVER['HTTP_HOST'];
@@ -270,13 +270,13 @@ 
 	 */
 	protected function cacheUrlManager($manager)
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
@@ -294,13 +294,13 @@ 
 	 */
 	protected function loadCachedUrlManager()
 	{
-		if($this->getEnableCache())
+		if ($this->getEnableCache())
 		{
 			$cache = $this->getApplication()->getCache();
-			if($cache !== null)
+			if ($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
+				if ($manager instanceof TUrlManager)
 					return $manager;
 			}
 		}
@@ -333,11 +333,11 @@ 
 	 */
 	public function getUrlManagerModule()
 	{
-		if($this->_urlManager === null)
+		if ($this->_urlManager === null)
 		{
-			if(($this->_urlManager = $this->loadCachedUrlManager()) === null)
+			if (($this->_urlManager = $this->loadCachedUrlManager()) === null)
 			{
-				if(empty($this->_urlManagerID))
+				if (empty($this->_urlManagerID))
 				{
 					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
@@ -345,9 +345,9 @@ 
 				else
 				{
 					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager === null)
+					if ($this->_urlManager === null)
 						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
+					if (!($this->_urlManager instanceof TUrlManager))
 						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
 				}
 				$this->cacheUrlManager($this->_urlManager);
@@ -391,7 +391,7 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value) === 1)
+		if (strlen($value) === 1)
 			$this->_separator = $value;
 		else
 			throw new TInvalidDataValueException('httprequest_separator_invalid');
@@ -402,7 +402,7 @@ 
 	 */
 	public function getRequestType()
 	{
-		return isset($_SERVER['REQUEST_METHOD'])?$_SERVER['REQUEST_METHOD']:null;
+		return isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null;
 	}
 
 	/**
@@ -411,10 +411,10 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
+		if (!isset($_SERVER['CONTENT_TYPE']))
 			return null;
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
+		if ($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
 			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
 
 		return $_SERVER['CONTENT_TYPE'];
@@ -441,7 +441,7 @@ 
 	 */
 	public function getQueryString()
 	{
-		return isset($_SERVER['QUERY_STRING'])?$_SERVER['QUERY_STRING']:null;
+		return isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : null;
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 	 */
 	public function getHttpProtocolVersion()
 	{
-		return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:null;
+		return isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : null;
 	}
 
 	/**
@@ -460,19 +460,19 @@ 
 	{
 		static $result;
 
-		if($result === null && function_exists('apache_request_headers')) {
+		if ($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
 		}
-		elseif($result === null) {
+		elseif ($result === null) {
 			$result = [];
-			foreach($_SERVER as $key => $value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+			foreach ($_SERVER as $key => $value) {
+				if (strncasecmp($key, 'HTTP_', 5) !== 0) continue;
 					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -496,10 +496,10 @@ 
 	public function getBaseUrl($forceSecureConnection = null)
 	{
 		$url = $this->getUrl();
-		$scheme = ($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
+		$scheme = ($forceSecureConnection) ? "https" : (($forceSecureConnection === null) ? $url->getScheme() : 'http');
 		$host = $url->getHost();
-		if (($port = $url->getPort())) $host .= ':' . $port;
-		return $scheme . '://' . $host;
+		if (($port = $url->getPort())) $host .= ':'.$port;
+		return $scheme.'://'.$host;
 	}
 
 	/**
@@ -507,10 +507,10 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
+		if ($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
 			return $_SERVER['ORIG_SCRIPT_NAME'];
 
-		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
+		return isset($_SERVER['SCRIPT_NAME']) ? $_SERVER['SCRIPT_NAME'] : null;
 	}
 
 	/**
@@ -522,7 +522,7 @@ 
 	 */
 	public function getAbsoluteApplicationUrl($forceSecureConnection = null)
 	{
-		return $this->getBaseUrl($forceSecureConnection) . $this->getApplicationUrl();
+		return $this->getBaseUrl($forceSecureConnection).$this->getApplicationUrl();
 	}
 
 	/**
@@ -530,7 +530,7 @@ 
 	 */
 	public function getApplicationFilePath()
 	{
-		return realpath(isset($_SERVER['SCRIPT_FILENAME'])?$_SERVER['SCRIPT_FILENAME']:null);
+		return realpath(isset($_SERVER['SCRIPT_FILENAME']) ? $_SERVER['SCRIPT_FILENAME'] : null);
 	}
 
 	/**
@@ -538,7 +538,7 @@ 
 	 */
 	public function getServerName()
 	{
-		return isset($_SERVER['SERVER_NAME'])?$_SERVER['SERVER_NAME']:null;
+		return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 */
 	public function getServerPort()
 	{
-		return isset($_SERVER['SERVER_PORT'])?$_SERVER['SERVER_PORT']:null;
+		return isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : null;
 	}
 
 	/**
@@ -554,7 +554,7 @@ 
 	 */
 	public function getUrlReferrer()
 	{
-		return isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:null;
+		return isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
 	}
 
 	/**
@@ -563,7 +563,7 @@ 
 	 */
 	public function getServerSoftware()
 	{
-		return isset($_SERVER['SERVER_SOFTWARE'])?$_SERVER['SERVER_SOFTWARE']:null;
+		return isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : null;
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 		{
 			return get_browser();
 		}
-		catch(TPhpErrorException $e)
+		catch (TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -587,7 +587,7 @@ 
 	 */
 	public function getUserAgent()
 	{
-		return isset($_SERVER['HTTP_USER_AGENT'])?$_SERVER['HTTP_USER_AGENT']:null;
+		return isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
 	}
 
 	/**
@@ -595,7 +595,7 @@ 
 	 */
 	public function getUserHostAddress()
 	{
-		return isset($_SERVER['REMOTE_ADDR'])?$_SERVER['REMOTE_ADDR']:null;
+		return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
 	}
 
 	/**
@@ -603,7 +603,7 @@ 
 	 */
 	public function getUserHost()
 	{
-		return isset($_SERVER['REMOTE_HOST'])?$_SERVER['REMOTE_HOST']:null;
+		return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
 	}
 
 	/**
@@ -612,7 +612,7 @@ 
 	public function getAcceptTypes()
 	{
 		// TBD: break it into array??
-		return isset($_SERVER['HTTP_ACCEPT'])?$_SERVER['HTTP_ACCEPT']:null;
+		return isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 	}
 
 	/**
@@ -668,21 +668,21 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
+		if ($this->_cookies === null)
 		{
 			$this->_cookies = new THttpCookieCollection;
-			if($this->getEnableCookieValidation())
+			if ($this->getEnableCookieValidation())
 			{
 				$sm = $this->getApplication()->getSecurityManager();
-				foreach($_COOKIE as $key => $value)
+				foreach ($_COOKIE as $key => $value)
 				{
-					if(($value = $sm->validateData($value)) !== false)
+					if (($value = $sm->validateData($value)) !== false)
 						$this->_cookies->add(new THttpCookie($key, $value));
 				}
 			}
 			else
 			{
-				foreach($_COOKIE as $key => $value)
+				foreach ($_COOKIE as $key => $value)
 					$this->_cookies->add(new THttpCookie($key, $value));
 			}
 		}
@@ -733,10 +733,10 @@ 
 	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
 		if ($this->_cookieOnly === null)
-				$this->_cookieOnly = (int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+				$this->_cookieOnly = (int) ini_get('session.use_cookies') && (int) ini_get('session.use_only_cookies');
 		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url, '?') === false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		if (defined('SID') && SID != '' && !$this->_cookieOnly)
+			return $url.(strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&' : '&')).SID;
 		else
 			return $url;
 	}
@@ -764,15 +764,15 @@ 
 	 */
 	public function resolveRequest($serviceIDs)
 	{
-		Prado::trace("Resolving request from " . $_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
+		Prado::trace("Resolving request from ".$_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
 		$getParams = $this->parseUrl();
-		foreach($getParams as $name => $value)
+		foreach ($getParams as $name => $value)
 			$_GET[$name] = $value;
 		$this->_items = array_merge($_GET, $_POST);
 		$this->_requestResolved = true;
-		foreach($serviceIDs as $serviceID)
+		foreach ($serviceIDs as $serviceID)
 		{
-			if($this->contains($serviceID))
+			if ($this->contains($serviceID))
 			{
 				$this->setServiceID($serviceID);
 				$this->setServiceParameter($this->itemAt($serviceID));
@@ -892,7 +892,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($this->_items[$key]) || array_key_exists($key, $this->_items))
+		if (isset($this->_items[$key]) || array_key_exists($key, $this->_items))
 		{
 			$value = $this->_items[$key];
 			unset($this->_items[$key]);
@@ -907,7 +907,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
+		foreach (array_keys($this->_items) as $key)
 			$this->remove($key);
 	}
 

Braces +92 added lines, -69 removed lines

@@ -177,30 +177,37 @@ 
 		// QUERY_STRING is the string following the '?' in the ur (eg the a=x part in http://foo/bar?a=x)
 		// REQUEST_URI contains the URI part entered in the browser address bar
 		// SCRIPT_FILENAME is the file path to the executing script
-		if(isset($_SERVER['REQUEST_URI']))
-			$this->_requestUri = $_SERVER['REQUEST_URI'];
-		else  // TBD: in this case, SCRIPT_NAME need to be escaped
+		if(isset($_SERVER['REQUEST_URI'])) {
+					$this->_requestUri = $_SERVER['REQUEST_URI'];
+		} else {
+			// TBD: in this case, SCRIPT_NAME need to be escaped
 			$this->_requestUri = $_SERVER['SCRIPT_NAME'] . (empty($_SERVER['QUERY_STRING'])?'':'?' . $_SERVER['QUERY_STRING']);
+		}
 
-		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO']))
-			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
-		elseif(isset($_SERVER['PATH_INFO']))
-			$this->_pathInfo = $_SERVER['PATH_INFO'];
-		elseif(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME'])
-			$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
-		else
-			$this->_pathInfo = '';
+		if($this->_cgiFix & self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO'])) {
+					$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
+		} elseif(isset($_SERVER['PATH_INFO'])) {
+					$this->_pathInfo = $_SERVER['PATH_INFO'];
+		} elseif(strpos($_SERVER['PHP_SELF'], $_SERVER['SCRIPT_NAME']) === 0 && $_SERVER['PHP_SELF'] !== $_SERVER['SCRIPT_NAME']) {
+					$this->_pathInfo = substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME']));
+		} else {
+					$this->_pathInfo = '';
+		}
 
 		if(get_magic_quotes_gpc())
 		{
-			if(isset($_GET))
-				$_GET = $this->stripSlashes($_GET);
-			if(isset($_POST))
-				$_POST = $this->stripSlashes($_POST);
-			if(isset($_REQUEST))
-				$_REQUEST = $this->stripSlashes($_REQUEST);
-			if(isset($_COOKIE))
-				$_COOKIE = $this->stripSlashes($_COOKIE);
+			if(isset($_GET)) {
+							$_GET = $this->stripSlashes($_GET);
+			}
+			if(isset($_POST)) {
+							$_POST = $this->stripSlashes($_POST);
+			}
+			if(isset($_REQUEST)) {
+							$_REQUEST = $this->stripSlashes($_REQUEST);
+			}
+			if(isset($_COOKIE)) {
+							$_COOKIE = $this->stripSlashes($_COOKIE);
+			}
 		}
 
 		$this->getApplication()->setRequest($this);
@@ -230,11 +237,12 @@ 
 			{
 				$url .= $_SERVER['SERVER_NAME'];
 				$port = $_SERVER['SERVER_PORT'];
-				if(($port != 80 && !$secure) || ($port != 443 && $secure))
-					$url .= ':' . $port;
+				if(($port != 80 && !$secure) || ($port != 443 && $secure)) {
+									$url .= ':' . $port;
+				}
+			} else {
+							$url .= $_SERVER['HTTP_HOST'];
 			}
-			else
-				$url .= $_SERVER['HTTP_HOST'];
 			$url .= $this->getRequestUri();
 			$this->_url = new TUri($url);
 		}
@@ -276,10 +284,11 @@ 
 			if($cache !== null)
 			{
 				$dependencies = null;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+				if($this->getApplication()->getMode() !== TApplicationMode::Performance) {
+									if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
+				}
 						$dependencies = new TFileCacheDependency($fn);
 					}
 				return $cache->set($this->getCacheKey(), $manager, 0, $dependencies);
@@ -300,8 +309,9 @@ 
 			if($cache !== null)
 			{
 				$manager = $cache->get($this->getCacheKey());
-				if($manager instanceof TUrlManager)
-					return $manager;
+				if($manager instanceof TUrlManager) {
+									return $manager;
+				}
 			}
 		}
 		return null;
@@ -341,14 +351,15 @@ 
 				{
 					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
-					if($this->_urlManager === null)
-						throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
-					if(!($this->_urlManager instanceof TUrlManager))
-						throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
+					if($this->_urlManager === null) {
+											throw new TConfigurationException('httprequest_urlmanager_inexist', $this->_urlManagerID);
+					}
+					if(!($this->_urlManager instanceof TUrlManager)) {
+											throw new TConfigurationException('httprequest_urlmanager_invalid', $this->_urlManagerID);
+					}
 				}
 				$this->cacheUrlManager($this->_urlManager);
 			}
@@ -391,10 +402,11 @@ 
 	 */
 	public function setUrlParamSeparator($value)
 	{
-		if(strlen($value) === 1)
-			$this->_separator = $value;
-		else
-			throw new TInvalidDataValueException('httprequest_separator_invalid');
+		if(strlen($value) === 1) {
+					$this->_separator = $value;
+		} else {
+					throw new TInvalidDataValueException('httprequest_separator_invalid');
+		}
 	}
 
 	/**
@@ -411,11 +423,13 @@ 
 	 */
 	public function getContentType($mimetypeOnly = true)
 	{
-		if(!isset($_SERVER['CONTENT_TYPE']))
-			return null;
+		if(!isset($_SERVER['CONTENT_TYPE'])) {
+					return null;
+		}
 
-		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false)
-			return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		if($mimetypeOnly === true && ($_pos = strpos(';', $_SERVER['CONTENT_TYPE'])) !== false) {
+					return substr($_SERVER['CONTENT_TYPE'], 0, $_pos);
+		}
 
 		return $_SERVER['CONTENT_TYPE'];
 	}
@@ -462,18 +476,20 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = [];
 			foreach($_SERVER as $key => $value) {
-				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
+				if(strncasecmp($key, 'HTTP_', 5) !== 0) {
+					continue;
+				}
 					$key = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))));
 					$result[$key] = $value;
 			}
 		}
 
-		if($case !== null)
-			return array_change_key_case($result, $case);
+		if($case !== null) {
+					return array_change_key_case($result, $case);
+		}
 
 		return $result;
 	}
@@ -498,7 +514,9 @@ 
 		$url = $this->getUrl();
 		$scheme = ($forceSecureConnection)?"https": (($forceSecureConnection === null)?$url->getScheme():'http');
 		$host = $url->getHost();
-		if (($port = $url->getPort())) $host .= ':' . $port;
+		if (($port = $url->getPort())) {
+			$host .= ':' . $port;
+		}
 		return $scheme . '://' . $host;
 	}
 
@@ -507,8 +525,9 @@ 
 	 */
 	public function getApplicationUrl()
 	{
-		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME']))
-			return $_SERVER['ORIG_SCRIPT_NAME'];
+		if($this->_cgiFix & self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME'])) {
+					return $_SERVER['ORIG_SCRIPT_NAME'];
+		}
 
 		return isset($_SERVER['SCRIPT_NAME'])?$_SERVER['SCRIPT_NAME']:null;
 	}
@@ -575,8 +594,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -676,14 +694,15 @@ 
 				$sm = $this->getApplication()->getSecurityManager();
 				foreach($_COOKIE as $key => $value)
 				{
-					if(($value = $sm->validateData($value)) !== false)
-						$this->_cookies->add(new THttpCookie($key, $value));
+					if(($value = $sm->validateData($value)) !== false) {
+											$this->_cookies->add(new THttpCookie($key, $value));
+					}
 				}
-			}
-			else
+			} else
 			{
-				foreach($_COOKIE as $key => $value)
-					$this->_cookies->add(new THttpCookie($key, $value));
+				foreach($_COOKIE as $key => $value) {
+									$this->_cookies->add(new THttpCookie($key, $value));
+				}
 			}
 		}
 		return $this->_cookies;
@@ -732,13 +751,15 @@ 
 	 */
 	public function constructUrl($serviceID, $serviceParam, $getItems = null, $encodeAmpersand = true, $encodeGetItems = true)
 	{
-		if ($this->_cookieOnly === null)
-				$this->_cookieOnly = (int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		if ($this->_cookieOnly === null) {
+						$this->_cookieOnly = (int)ini_get('session.use_cookies') && (int)ini_get('session.use_only_cookies');
+		}
 		$url = $this->getUrlManagerModule()->constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems);
-		if(defined('SID') && SID != '' && !$this->_cookieOnly)
-			return $url . (strpos($url, '?') === false? '?' : ($encodeAmpersand?'&':'&')) . SID;
-		else
-			return $url;
+		if(defined('SID') && SID != '' && !$this->_cookieOnly) {
+					return $url . (strpos($url, '?') === false? '?' : ($encodeAmpersand?'&':'&')) . SID;
+		} else {
+					return $url;
+		}
 	}
 
 	/**
@@ -766,8 +787,9 @@ 
 	{
 		Prado::trace("Resolving request from " . $_SERVER['REMOTE_ADDR'], 'Prado\Web\THttpRequest');
 		$getParams = $this->parseUrl();
-		foreach($getParams as $name => $value)
-			$_GET[$name] = $value;
+		foreach($getParams as $name => $value) {
+					$_GET[$name] = $value;
+		}
 		$this->_items = array_merge($_GET, $_POST);
 		$this->_requestResolved = true;
 		foreach($serviceIDs as $serviceID)
@@ -897,9 +919,9 @@ 
 			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -907,8 +929,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 
 	/**