pradosoft / prado

framework/Web/Services/TJsonService.php

Spacing +14 added lines, -14 removed lines

@@ -80,19 +80,19 @@ 
 	 */
 	protected function loadJsonServices($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(is_array($config))
+			if (is_array($config))
 			{
-				foreach($config['json'] as $id => $json)
+				foreach ($config['json'] as $id => $json)
 					$this->_services[$id] = $json;
 			}
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('json') as $json)
+			foreach ($config->getElementsByTagName('json') as $json)
 			{
-				if(($id = $json->getAttribute('id')) !== null)
+				if (($id = $json->getAttribute('id')) !== null)
 					$this->_services[$id] = $json;
 				else
 					throw new TConfigurationException('jsonservice_id_required');
@@ -107,17 +107,17 @@ 
 	public function run()
 	{
 		$id = $this->getRequest()->getServiceParameter();
-		if(isset($this->_services[$id]))
+		if (isset($this->_services[$id]))
 		{
 			$serviceConfig = $this->_services[$id];
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
-				if(isset($serviceConfig['class']))
+				if (isset($serviceConfig['class']))
 				{
 					$service = Prado::createComponent($serviceConfig['class']);
-					if($service instanceof TJsonResponse)
+					if ($service instanceof TJsonResponse)
 					{
-						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:[];
+						$properties = isset($serviceConfig['properties']) ? $serviceConfig['properties'] : [];
 						$this->createJsonResponse($service, $properties, $serviceConfig);
 					}
 					else
@@ -129,10 +129,10 @@ 
 			else
 			{
 				$properties = $serviceConfig->getAttributes();
-				if(($class = $properties->remove('class')) !== null)
+				if (($class = $properties->remove('class')) !== null)
 				{
 					$service = Prado::createComponent($class);
-					if($service instanceof TJsonResponse)
+					if ($service instanceof TJsonResponse)
 						$this->createJsonResponse($service, $properties, $serviceConfig);
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
@@ -152,12 +152,12 @@ 
 	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
-		foreach($properties as $name => $value)
+		foreach ($properties as $name => $value)
 			$service->setSubproperty($name, $value);
 		$service->init($config);
 
 		//send content if not null
-		if(($content = $service->getJsonContent()) !== null)
+		if (($content = $service->getJsonContent()) !== null)
 		{
 			$response = $this->getResponse();
 			$response->setContentType('application/json');

Braces +26 added lines, -24 removed lines

@@ -84,18 +84,19 @@ 
 		{
 			if(is_array($config))
 			{
-				foreach($config['json'] as $id => $json)
-					$this->_services[$id] = $json;
+				foreach($config['json'] as $id => $json) {
+									$this->_services[$id] = $json;
+				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('json') as $json)
 			{
-				if(($id = $json->getAttribute('id')) !== null)
-					$this->_services[$id] = $json;
-				else
-					throw new TConfigurationException('jsonservice_id_required');
+				if(($id = $json->getAttribute('id')) !== null) {
+									$this->_services[$id] = $json;
+				} else {
+									throw new TConfigurationException('jsonservice_id_required');
+				}
 			}
 		}
 	}
@@ -119,30 +120,30 @@ 
 					{
 						$properties = isset($serviceConfig['properties'])?$serviceConfig['properties']:[];
 						$this->createJsonResponse($service, $properties, $serviceConfig);
+					} else {
+											throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 					}
-					else
-						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
+				} else {
+									throw new TConfigurationException('jsonservice_class_required', $id);
 				}
-				else
-					throw new TConfigurationException('jsonservice_class_required', $id);
-			}
-			else
+			} else
 			{
 				$properties = $serviceConfig->getAttributes();
 				if(($class = $properties->remove('class')) !== null)
 				{
 					$service = Prado::createComponent($class);
-					if($service instanceof TJsonResponse)
-						$this->createJsonResponse($service, $properties, $serviceConfig);
-					else
-						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
+					if($service instanceof TJsonResponse) {
+											$this->createJsonResponse($service, $properties, $serviceConfig);
+					} else {
+											throw new TConfigurationException('jsonservice_response_type_invalid', $id);
+					}
+				} else {
+									throw new TConfigurationException('jsonservice_class_required', $id);
 				}
-				else
-					throw new TConfigurationException('jsonservice_class_required', $id);
 			}
+		} else {
+					throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 		}
-		else
-			throw new THttpException(404, 'jsonservice_provider_unknown', $id);
 	}
 
 	/**
@@ -152,8 +153,9 @@ 
 	protected function createJsonResponse($service, $properties, $config)
 	{
 		// init service properties
-		foreach($properties as $name => $value)
-			$service->setSubproperty($name, $value);
+		foreach($properties as $name => $value) {
+					$service->setSubproperty($name, $value);
+		}
 		$service->init($config);
 
 		//send content if not null

framework/Web/Services/TSoapServer.php

Spacing +29 added lines, -29 removed lines

@@ -62,7 +62,7 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5)
+		if (strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5)
 			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
 		$this->_id = $id;
 	}
@@ -72,14 +72,14 @@ 
 	 */
 	public function run()
 	{
-		if(($provider = $this->getProvider()) !== null)
+		if (($provider = $this->getProvider()) !== null)
 		{
 			Prado::using($provider);
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$providerClass = ($pos = strrpos($provider, '.')) !== false ?substr($provider, $pos + 1) : $provider;
 			$this->guessMethodCallRequested($providerClass);
 			$server = $this->createServer();
 			$server->setClass($providerClass, $this);
-			if($this->_persistent)
+			if ($this->_persistent)
 				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
 		}
 		else
@@ -90,7 +90,7 @@ 
 		}
 		catch (\Exception $e)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
 			else
 				$this->fault($e->getMessage());
@@ -107,7 +107,7 @@ 
 	 */
 	public function fault($title, $details = '', $code = 'SERVER', $actor = '', $name = '')
 	{
-		Prado::trace('SOAP-Fault ' . $code . ' ' . $title . ' : ' . $details, 'Prado\Web\Services\TSoapService');
+		Prado::trace('SOAP-Fault '.$code.' '.$title.' : '.$details, 'Prado\Web\Services\TSoapService');
 		$this->_server->fault($code, $title, $actor, $details, $name);
 	}
 
@@ -118,12 +118,12 @@ 
 	 */
 	protected function guessMethodCallRequested($class)
 	{
-		$namespace = $class . 'wsdl';
+		$namespace = $class.'wsdl';
 		$message = file_get_contents("php://input");
 		$matches = [];
-		if(preg_match('/xmlns:([^=]+)="urn:' . $namespace . '"/', $message, $matches))
+		if (preg_match('/xmlns:([^=]+)="urn:'.$namespace.'"/', $message, $matches))
 		{
-			if(preg_match('/<' . $matches[1] . ':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
+			if (preg_match('/<'.$matches[1].':([a-zA-Z_]+[a-zA-Z0-9_]+)/', $message, $method))
 			{
 				$this->_requestedMethod = $method[1];
 			}
@@ -145,9 +145,9 @@ 
 	 */
 	protected function createServer()
 	{
-		if($this->_server === null)
+		if ($this->_server === null)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
+			if ($this->getApplication()->getMode() === TApplicationMode::Debug)
 				ini_set("soap.wsdl_cache_enabled", 0);
 			$this->_server = new \SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
@@ -160,19 +160,19 @@ 
 	protected function getOptions()
 	{
 		$options = [];
-		if($this->_version === '1.1')
+		if ($this->_version === '1.1')
 			$options['soap_version'] = SOAP_1_1;
-		elseif($this->_version === '1.2')
+		elseif ($this->_version === '1.2')
 			$options['soap_version'] = SOAP_1_2;
-		if(!empty($this->_actor))
+		if (!empty($this->_actor))
 			$options['actor'] = $this->_actor;
-		if(!empty($this->_encoding))
+		if (!empty($this->_encoding))
 			$options['encoding'] = $this->_encoding;
-		if(!empty($this->_uri))
+		if (!empty($this->_uri))
 			$options['uri'] = $this->_uri;
-		if(is_string($this->_classMap))
+		if (is_string($this->_classMap))
 		{
-			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className)
+			foreach (preg_split('/\s*,\s*/', $this->_classMap) as $className)
 				$options['classmap'][$className] = $className; //complex type uses the class name in the wsdl
 		}
 		return $options;
@@ -187,18 +187,18 @@ 
 	 */
 	public function getWsdl()
 	{
-		if($this->_wsdlUri === '')
+		if ($this->_wsdlUri === '')
 		{
 			$provider = $this->getProvider();
-			$providerClass = ($pos = strrpos($provider, '.')) !== false?substr($provider, $pos + 1):$provider;
+			$providerClass = ($pos = strrpos($provider, '.')) !== false ?substr($provider, $pos + 1) : $provider;
 			Prado::using($provider);
-			if($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
+			if ($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
 			{
-				$wsdl = $cache->get(self::WSDL_CACHE_PREFIX . $providerClass);
-				if(is_string($wsdl))
+				$wsdl = $cache->get(self::WSDL_CACHE_PREFIX.$providerClass);
+				if (is_string($wsdl))
 					return $wsdl;
 				$wsdl = WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
-				$cache->set(self::WSDL_CACHE_PREFIX . $providerClass, $wsdl);
+				$cache->set(self::WSDL_CACHE_PREFIX.$providerClass, $wsdl);
 				return $wsdl;
 			}
 			else
@@ -215,8 +215,8 @@ 
 	 */
 	public function getWsdlUri()
 	{
-		if($this->_wsdlUri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID() . '.wsdl', false);
+		if ($this->_wsdlUri === '')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID().'.wsdl', false);
 		else
 			return $this->_wsdlUri;
 	}
@@ -234,8 +234,8 @@ 
 	 */
 	public function getUri()
 	{
-		if($this->_uri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID(), false);
+		if ($this->_uri === '')
+			return $this->getRequest()->getBaseUrl().$this->getService()->constructUrl($this->getID(), false);
 		else
 			return $this->_uri;
 	}
@@ -278,7 +278,7 @@ 
 	 */
 	public function setVersion($value)
 	{
-		if($value === '1.1' || $value === '1.2' || $value === '')
+		if ($value === '1.1' || $value === '1.2' || $value === '')
 			$this->_version = $value;
 		else
 			throw new TInvalidDataValueException('soapserver_version_invalid', $value);

Braces +56 added lines, -44 removed lines

@@ -62,8 +62,9 @@ 
 	 */
 	public function setID($id)
 	{
-		if(strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5)
-			throw new TInvalidDataValueException('soapserver_id_invalid', $id);
+		if(strrpos($this->_id, '.wsdl') === strlen($this->_id) - 5) {
+					throw new TInvalidDataValueException('soapserver_id_invalid', $id);
+		}
 		$this->_id = $id;
 	}
 
@@ -79,21 +80,22 @@ 
 			$this->guessMethodCallRequested($providerClass);
 			$server = $this->createServer();
 			$server->setClass($providerClass, $this);
-			if($this->_persistent)
-				$server->setPersistence(SOAP_PERSISTENCE_SESSION);
+			if($this->_persistent) {
+							$server->setPersistence(SOAP_PERSISTENCE_SESSION);
+			}
+		} else {
+					$server = $this->createServer();
 		}
-		else
-			$server = $this->createServer();
 		try
 		{
 			$server->handle();
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
-				$this->fault($e->getMessage(), $e->__toString());
-			else
-				$this->fault($e->getMessage());
+			if($this->getApplication()->getMode() === TApplicationMode::Debug) {
+							$this->fault($e->getMessage(), $e->__toString());
+			} else {
+							$this->fault($e->getMessage());
+			}
 		}
 	}
 
@@ -147,8 +149,9 @@ 
 	{
 		if($this->_server === null)
 		{
-			if($this->getApplication()->getMode() === TApplicationMode::Debug)
-				ini_set("soap.wsdl_cache_enabled", 0);
+			if($this->getApplication()->getMode() === TApplicationMode::Debug) {
+							ini_set("soap.wsdl_cache_enabled", 0);
+			}
 			$this->_server = new \SoapServer($this->getWsdlUri(), $this->getOptions());
 		}
 		return $this->_server;
@@ -160,20 +163,26 @@ 
 	protected function getOptions()
 	{
 		$options = [];
-		if($this->_version === '1.1')
-			$options['soap_version'] = SOAP_1_1;
-		elseif($this->_version === '1.2')
-			$options['soap_version'] = SOAP_1_2;
-		if(!empty($this->_actor))
-			$options['actor'] = $this->_actor;
-		if(!empty($this->_encoding))
-			$options['encoding'] = $this->_encoding;
-		if(!empty($this->_uri))
-			$options['uri'] = $this->_uri;
+		if($this->_version === '1.1') {
+					$options['soap_version'] = SOAP_1_1;
+		} elseif($this->_version === '1.2') {
+					$options['soap_version'] = SOAP_1_2;
+		}
+		if(!empty($this->_actor)) {
+					$options['actor'] = $this->_actor;
+		}
+		if(!empty($this->_encoding)) {
+					$options['encoding'] = $this->_encoding;
+		}
+		if(!empty($this->_uri)) {
+					$options['uri'] = $this->_uri;
+		}
 		if(is_string($this->_classMap))
 		{
-			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className)
-				$options['classmap'][$className] = $className; //complex type uses the class name in the wsdl
+			foreach(preg_split('/\s*,\s*/', $this->_classMap) as $className) {
+							$options['classmap'][$className] = $className;
+			}
+			//complex type uses the class name in the wsdl
 		}
 		return $options;
 	}
@@ -195,19 +204,19 @@ 
 			if($this->getApplication()->getMode() === TApplicationMode::Performance && ($cache = $this->getApplication()->getCache()) !== null)
 			{
 				$wsdl = $cache->get(self::WSDL_CACHE_PREFIX . $providerClass);
-				if(is_string($wsdl))
-					return $wsdl;
+				if(is_string($wsdl)) {
+									return $wsdl;
+				}
 				$wsdl = WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 				$cache->set(self::WSDL_CACHE_PREFIX . $providerClass, $wsdl);
 				return $wsdl;
-			}
-			else
+			} else
 			{
 				return WsdlGenerator::generate($providerClass, $this->getUri(), $this->getEncoding());
 			}
+		} else {
+					return file_get_contents($this->_wsdlUri);
 		}
-		else
-			return file_get_contents($this->_wsdlUri);
 	}
 
 	/**
@@ -215,10 +224,11 @@ 
 	 */
 	public function getWsdlUri()
 	{
-		if($this->_wsdlUri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID() . '.wsdl', false);
-		else
-			return $this->_wsdlUri;
+		if($this->_wsdlUri === '') {
+					return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID() . '.wsdl', false);
+		} else {
+					return $this->_wsdlUri;
+		}
 	}
 
 	/**
@@ -234,10 +244,11 @@ 
 	 */
 	public function getUri()
 	{
-		if($this->_uri === '')
-			return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID(), false);
-		else
-			return $this->_uri;
+		if($this->_uri === '') {
+					return $this->getRequest()->getBaseUrl() . $this->getService()->constructUrl($this->getID(), false);
+		} else {
+					return $this->_uri;
+		}
 	}
 
 	/**
@@ -278,10 +289,11 @@ 
 	 */
 	public function setVersion($value)
 	{
-		if($value === '1.1' || $value === '1.2' || $value === '')
-			$this->_version = $value;
-		else
-			throw new TInvalidDataValueException('soapserver_version_invalid', $value);
+		if($value === '1.1' || $value === '1.2' || $value === '') {
+					$this->_version = $value;
+		} else {
+					throw new TInvalidDataValueException('soapserver_version_invalid', $value);
+		}
 	}
 
 	/**

framework/Web/Javascripts/TJavaScript.php

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str = '';
-		foreach($files as $file)
+		foreach ($files as $file)
 			$str .= self::renderScriptFile($file);
 		return $str;
 	}
@@ -46,7 +46,7 @@ 
 	 */
 	public static function renderScriptFile($file)
 	{
-		return '<script type="text/javascript" src="' . THttpUtility::htmlEncode($file) . "\"></script>\n";
+		return '<script type="text/javascript" src="'.THttpUtility::htmlEncode($file)."\"></script>\n";
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 */
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
+		if (count($scripts))
+			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n".implode("\n", $scripts)."\n/*]]>*/\n</script>\n";
 		else
 			return '';
 	}
@@ -69,8 +69,8 @@ 
 	 */
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n", $scripts) . "\n";
+		if (count($scripts))
+			return implode("\n", $scripts)."\n";
 		else
 			return '';
 	}
@@ -103,7 +103,7 @@ 
 	 */
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
+		if ($js instanceof TJavaScriptLiteral)
 			return $js;
 		else
 			return new TJavaScriptLiteral($js);
@@ -141,45 +141,45 @@ 
 	 */
 	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
 	{
-		if(is_string($value))
+		if (is_string($value))
 			return self::quoteString($value);
-		elseif(is_bool($value))
-			return $value?'true':'false';
-		elseif(is_array($value))
+		elseif (is_bool($value))
+			return $value ? 'true' : 'false';
+		elseif (is_array($value))
 		{
 			$results = '';
-			if(($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
+			if (($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
 			{
-				foreach($value as $k => $v)
+				foreach ($value as $k => $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results !== '')
+						if ($results !== '')
 							$results .= ',';
-						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
+						$results .= "'$k':".self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '{' . $results . '}';
+				return '{'.$results.'}';
 			}
 			else
 			{
-				foreach($value as $v)
+				foreach ($value as $v)
 				{
-					if($v !== '' || $encodeEmptyStrings)
+					if ($v !== '' || $encodeEmptyStrings)
 					{
-						if($results !== '')
+						if ($results !== '')
 							$results .= ',';
 						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
-				return '[' . $results . ']';
+				return '['.$results.']';
 			}
 		}
-		elseif(is_int($value))
+		elseif (is_int($value))
 			return "$value";
-		elseif(is_float($value))
+		elseif (is_float($value))
 		{
-			switch($value)
+			switch ($value)
 			{
 				case -INF:
 					return 'Number.NEGATIVE_INFINITY';
@@ -189,19 +189,19 @@ 
 					break;
 				default:
 					$locale = localeConv();
-					if($locale['decimal_point'] == '.')
+					if ($locale['decimal_point'] == '.')
 						return "$value";
 					else
 						return str_replace($locale['decimal_point'], '.', "$value");
 					break;
 			}
 		}
-		elseif(is_object($value))
+		elseif (is_object($value))
 			if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
 			else
 				return self::encode(get_object_vars($value), $toMap);
-		elseif($value === null)
+		elseif ($value === null)
 			return 'null';
 		else
 			return '';
@@ -230,11 +230,11 @@ 
 	 * @param string $sourceEncoding
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
+		if (is_string($value))
 			$value = iconv($sourceEncoding, 'UTF-8', $value);
 		elseif (is_array($value))
 		{
-			foreach($value as &$element)
+			foreach ($value as &$element)
 				self::convertToUtf8($element, $sourceEncoding);
 		}
 	}

Braces +54 added lines, -47 removed lines

@@ -34,8 +34,9 @@ 
 	public static function renderScriptFiles($files)
 	{
 		$str = '';
-		foreach($files as $file)
-			$str .= self::renderScriptFile($file);
+		foreach($files as $file) {
+					$str .= self::renderScriptFile($file);
+		}
 		return $str;
 	}
 
@@ -56,10 +57,11 @@ 
 	 */
 	public static function renderScriptBlocks($scripts)
 	{
-		if(count($scripts))
-			return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return "<script type=\"text/javascript\">\n/*<![CDATA[*/\n" . implode("\n", $scripts) . "\n/*]]>*/\n</script>\n";
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -69,10 +71,11 @@ 
 	 */
 	public static function renderScriptBlocksCallback($scripts)
 	{
-		if(count($scripts))
-			return implode("\n", $scripts) . "\n";
-		else
-			return '';
+		if(count($scripts)) {
+					return implode("\n", $scripts) . "\n";
+		} else {
+					return '';
+		}
 	}
 
 	/**
@@ -103,10 +106,11 @@ 
 	 */
 	public static function quoteJsLiteral($js)
 	{
-		if($js instanceof TJavaScriptLiteral)
-			return $js;
-		else
-			return new TJavaScriptLiteral($js);
+		if($js instanceof TJavaScriptLiteral) {
+					return $js;
+		} else {
+					return new TJavaScriptLiteral($js);
+		}
 	}
 
 	/**
@@ -141,11 +145,11 @@ 
 	 */
 	public static function encode($value, $toMap = true, $encodeEmptyStrings = false)
 	{
-		if(is_string($value))
-			return self::quoteString($value);
-		elseif(is_bool($value))
-			return $value?'true':'false';
-		elseif(is_array($value))
+		if(is_string($value)) {
+					return self::quoteString($value);
+		} elseif(is_bool($value)) {
+					return $value?'true':'false';
+		} elseif(is_array($value))
 		{
 			$results = '';
 			if(($n = count($value)) > 0 && array_keys($value) !== range(0, $n - 1))
@@ -154,30 +158,30 @@ 
 				{
 					if($v !== '' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
+						if($results !== '') {
+													$results .= ',';
+						}
 						$results .= "'$k':" . self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '{' . $results . '}';
-			}
-			else
+			} else
 			{
 				foreach($value as $v)
 				{
 					if($v !== '' || $encodeEmptyStrings)
 					{
-						if($results !== '')
-							$results .= ',';
+						if($results !== '') {
+													$results .= ',';
+						}
 						$results .= self::encode($v, $toMap, $encodeEmptyStrings);
 					}
 				}
 				return '[' . $results . ']';
 			}
-		}
-		elseif(is_int($value))
-			return "$value";
-		elseif(is_float($value))
+		} elseif(is_int($value)) {
+					return "$value";
+		} elseif(is_float($value))
 		{
 			switch($value)
 			{
@@ -189,22 +193,24 @@ 
 					break;
 				default:
 					$locale = localeConv();
-					if($locale['decimal_point'] == '.')
-						return "$value";
-					else
-						return str_replace($locale['decimal_point'], '.', "$value");
+					if($locale['decimal_point'] == '.') {
+											return "$value";
+					} else {
+											return str_replace($locale['decimal_point'], '.', "$value");
+					}
 					break;
 			}
-		}
-		elseif(is_object($value))
-			if ($value instanceof TJavaScriptLiteral)
+		} elseif(is_object($value)) {
+					if ($value instanceof TJavaScriptLiteral)
 				return $value->toJavaScriptLiteral();
-			else
-				return self::encode(get_object_vars($value), $toMap);
-		elseif($value === null)
-			return 'null';
-		else
-			return '';
+		} else {
+							return self::encode(get_object_vars($value), $toMap);
+			}
+		elseif($value === null) {
+					return 'null';
+		} else {
+					return '';
+		}
 	}
 	/**
 	 * Encodes a PHP variable into javascript string.
@@ -230,12 +236,13 @@ 
 	 * @param string $sourceEncoding
 	 */
 	private static function convertToUtf8(&$value, $sourceEncoding) {
-		if(is_string($value))
-			$value = iconv($sourceEncoding, 'UTF-8', $value);
-		elseif (is_array($value))
+		if(is_string($value)) {
+					$value = iconv($sourceEncoding, 'UTF-8', $value);
+		} elseif (is_array($value))
 		{
-			foreach($value as &$element)
-				self::convertToUtf8($element, $sourceEncoding);
+			foreach($value as &$element) {
+							self::convertToUtf8($element, $sourceEncoding);
+			}
 		}
 	}
 

framework/Web/THttpCookieCollection.php

Spacing +6 added lines, -6 removed lines

@@ -54,10 +54,10 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof THttpCookie)
+		if ($item instanceof THttpCookie)
 		{
 			parent::insertAt($index, $item);
-			if($this->_o instanceof THttpResponse)
+			if ($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
 		}
 		else
@@ -74,7 +74,7 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
+		if ($this->_o instanceof THttpResponse)
 			$this->_o->removeCookie($item);
 		return $item;
 	}
@@ -85,7 +85,7 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_int($index))
+		if (is_int($index))
 			return parent::itemAt($index);
 		else
 			return $this->findCookieByName($index);
@@ -98,8 +98,8 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName() === $name)
+		foreach ($this as $cookie)
+			if ($cookie->getName() === $name)
 				return $cookie;
 		return null;
 	}

Braces +16 added lines, -12 removed lines

@@ -57,11 +57,12 @@ 
 		if($item instanceof THttpCookie)
 		{
 			parent::insertAt($index, $item);
-			if($this->_o instanceof THttpResponse)
-				$this->_o->addCookie($item);
+			if($this->_o instanceof THttpResponse) {
+							$this->_o->addCookie($item);
+			}
+		} else {
+					throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 		}
-		else
-			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
 	/**
@@ -74,8 +75,9 @@ 
 	public function removeAt($index)
 	{
 		$item = parent::removeAt($index);
-		if($this->_o instanceof THttpResponse)
-			$this->_o->removeCookie($item);
+		if($this->_o instanceof THttpResponse) {
+					$this->_o->removeCookie($item);
+		}
 		return $item;
 	}
 
@@ -85,10 +87,11 @@ 
 	 */
 	public function itemAt($index)
 	{
-		if(is_int($index))
-			return parent::itemAt($index);
-		else
-			return $this->findCookieByName($index);
+		if(is_int($index)) {
+					return parent::itemAt($index);
+		} else {
+					return $this->findCookieByName($index);
+		}
 	}
 
 	/**
@@ -98,9 +101,10 @@ 
 	 */
 	public function findCookieByName($name)
 	{
-		foreach($this as $cookie)
-			if($cookie->getName() === $name)
+		foreach($this as $cookie) {
+					if($cookie->getName() === $name)
 				return $cookie;
+		}
 		return null;
 	}
 }
\ No newline at end of file

framework/Web/UI/TControlCollection.php

Spacing +4 added lines, -4 removed lines

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

Braces +10 added lines, -8 removed lines

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

framework/Web/UI/TTheme.php

Spacing +41 added lines, -41 removed lines

@@ -89,33 +89,33 @@ 
 		$this->_name = basename($themePath);
 		$cacheValid = false;
 		// TODO: the following needs to be cleaned up (Qiang)
-		if(($cache = $this->getApplication()->getCache()) !== null)
+		if (($cache = $this->getApplication()->getCache()) !== null)
 		{
-			$array = $cache->get(self::THEME_CACHE_PREFIX . $themePath);
-			if(is_array($array))
+			$array = $cache->get(self::THEME_CACHE_PREFIX.$themePath);
+			if (is_array($array))
 			{
 				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
-				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
+				if ($this->getApplication()->getMode() !== TApplicationMode::Performance)
 				{
-					if(($dir = opendir($themePath)) === false)
+					if (($dir = opendir($themePath)) === false)
 						throw new TIOException('theme_path_inexistent', $themePath);
 					$cacheValid = true;
-					while(($file = readdir($dir)) !== false)
+					while (($file = readdir($dir)) !== false)
 					{
-						if($file === '.' || $file === '..')
+						if ($file === '.' || $file === '..')
 							continue;
-						elseif(basename($file, '.css') !== $file)
-							$this->_cssFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, '.js') !== $file)
-							$this->_jsFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
+						elseif (basename($file, '.css') !== $file)
+							$this->_cssFiles[] = $themeUrl.'/'.$file;
+						elseif (basename($file, '.js') !== $file)
+							$this->_jsFiles[] = $themeUrl.'/'.$file;
+						elseif (basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath.DIRECTORY_SEPARATOR.$file) > $timestamp)
 						{
 							$cacheValid = false;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
+					if ($cacheValid)
 						$this->_skins = $skins;
 				}
 				else
@@ -127,34 +127,34 @@ 
 				}
 			}
 		}
-		if(!$cacheValid)
+		if (!$cacheValid)
 		{
 			$this->_cssFiles = [];
 			$this->_jsFiles = [];
 			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
+			if (($dir = opendir($themePath)) === false)
 				throw new TIOException('theme_path_inexistent', $themePath);
-			while(($file = readdir($dir)) !== false)
+			while (($file = readdir($dir)) !== false)
 			{
-				if($file === '.' || $file === '..')
+				if ($file === '.' || $file === '..')
 					continue;
-				elseif(basename($file, '.css') !== $file)
-					$this->_cssFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, '.js') !== $file)
-					$this->_jsFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, self::SKIN_FILE_EXT) !== $file)
+				elseif (basename($file, '.css') !== $file)
+					$this->_cssFiles[] = $themeUrl.'/'.$file;
+				elseif (basename($file, '.js') !== $file)
+					$this->_jsFiles[] = $themeUrl.'/'.$file;
+				elseif (basename($file, self::SKIN_FILE_EXT) !== $file)
 				{
-					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
-					foreach($template->getItems() as $skin)
+					$template = new TTemplate(file_get_contents($themePath.'/'.$file), $themePath, $themePath.'/'.$file);
+					foreach ($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  // a text string, ignored
+						if (!isset($skin[2]))  // a text string, ignored
 							continue;
-						elseif($skin[0] !== -1)
+						elseif ($skin[0] !== -1)
 							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
 						$type = $skin[1];
-						$id = isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
+						$id = isset($skin[2]['skinid']) ? $skin[2]['skinid'] : 0;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
+						if (isset($this->_skins[$type][$id]))
 							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
 						/*
 						foreach($skin[2] as $name=>$value)
@@ -170,8 +170,8 @@ 
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache !== null)
-				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+			if ($cache !== null)
+				$cache->set(self::THEME_CACHE_PREFIX.$themePath, [$this->_skins, $this->_cssFiles, $this->_jsFiles, time()]);
 		}
 	}
 
@@ -251,22 +251,22 @@ 
 	public function applySkin($control)
 	{
 		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
+		if (($id = $control->getSkinID()) === '')
 			$id = 0;
-		if(isset($this->_skins[$type][$id]))
+		if (isset($this->_skins[$type][$id]))
 		{
-			foreach($this->_skins[$type][$id] as $name => $value)
+			foreach ($this->_skins[$type][$id] as $name => $value)
 			{
 				Prado::trace("Applying skin $name to $type", 'Prado\Web\UI\TThemeManager');
-				if(is_array($value))
+				if (is_array($value))
 				{
-					switch($value[0])
+					switch ($value[0])
 					{
 						case TTemplate::CONFIG_EXPRESSION:
 							$value = $this->evaluateExpression($value[1]);
 							break;
 						case TTemplate::CONFIG_ASSET:
-							$value = $this->_themeUrl . '/' . ltrim($value[1], '/');
+							$value = $this->_themeUrl.'/'.ltrim($value[1], '/');
 							break;
 						case TTemplate::CONFIG_DATABIND:
 							$control->bindProperty($name, $value[1]);
@@ -285,15 +285,15 @@ 
 							break;
 					}
 				}
-				if(!is_array($value))
+				if (!is_array($value))
 				{
-					if(strpos($name, '.') === false)	// is simple property or custom attribute
+					if (strpos($name, '.') === false)	// is simple property or custom attribute
 					{
-						if($control->hasProperty($name))
+						if ($control->hasProperty($name))
 						{
-							if($control->canSetProperty($name))
+							if ($control->canSetProperty($name))
 							{
-								$setter = 'set' . $name;
+								$setter = 'set'.$name;
 								$control->$setter($value);
 							}
 							else

Braces +50 added lines, -40 removed lines

@@ -97,28 +97,29 @@ 
 				list($skins, $cssFiles, $jsFiles, $timestamp) = $array;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
 				{
-					if(($dir = opendir($themePath)) === false)
-						throw new TIOException('theme_path_inexistent', $themePath);
+					if(($dir = opendir($themePath)) === false) {
+											throw new TIOException('theme_path_inexistent', $themePath);
+					}
 					$cacheValid = true;
 					while(($file = readdir($dir)) !== false)
 					{
-						if($file === '.' || $file === '..')
-							continue;
-						elseif(basename($file, '.css') !== $file)
-							$this->_cssFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, '.js') !== $file)
-							$this->_jsFiles[] = $themeUrl . '/' . $file;
-						elseif(basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
+						if($file === '.' || $file === '..') {
+													continue;
+						} elseif(basename($file, '.css') !== $file) {
+													$this->_cssFiles[] = $themeUrl . '/' . $file;
+						} elseif(basename($file, '.js') !== $file) {
+													$this->_jsFiles[] = $themeUrl . '/' . $file;
+						} elseif(basename($file, self::SKIN_FILE_EXT) !== $file && filemtime($themePath . DIRECTORY_SEPARATOR . $file) > $timestamp)
 						{
 							$cacheValid = false;
 							break;
 						}
 					}
 					closedir($dir);
-					if($cacheValid)
-						$this->_skins = $skins;
-				}
-				else
+					if($cacheValid) {
+											$this->_skins = $skins;
+					}
+				} else
 				{
 					$cacheValid = true;
 					$this->_cssFiles = $cssFiles;
@@ -132,30 +133,34 @@ 
 			$this->_cssFiles = [];
 			$this->_jsFiles = [];
 			$this->_skins = [];
-			if(($dir = opendir($themePath)) === false)
-				throw new TIOException('theme_path_inexistent', $themePath);
+			if(($dir = opendir($themePath)) === false) {
+							throw new TIOException('theme_path_inexistent', $themePath);
+			}
 			while(($file = readdir($dir)) !== false)
 			{
-				if($file === '.' || $file === '..')
-					continue;
-				elseif(basename($file, '.css') !== $file)
-					$this->_cssFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, '.js') !== $file)
-					$this->_jsFiles[] = $themeUrl . '/' . $file;
-				elseif(basename($file, self::SKIN_FILE_EXT) !== $file)
+				if($file === '.' || $file === '..') {
+									continue;
+				} elseif(basename($file, '.css') !== $file) {
+									$this->_cssFiles[] = $themeUrl . '/' . $file;
+				} elseif(basename($file, '.js') !== $file) {
+									$this->_jsFiles[] = $themeUrl . '/' . $file;
+				} elseif(basename($file, self::SKIN_FILE_EXT) !== $file)
 				{
 					$template = new TTemplate(file_get_contents($themePath . '/' . $file), $themePath, $themePath . '/' . $file);
 					foreach($template->getItems() as $skin)
 					{
-						if(!isset($skin[2]))  // a text string, ignored
+						if(!isset($skin[2])) {
+							// a text string, ignored
 							continue;
-						elseif($skin[0] !== -1)
-							throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
+						} elseif($skin[0] !== -1) {
+													throw new TConfigurationException('theme_control_nested', $skin[1], dirname($themePath));
+						}
 						$type = $skin[1];
 						$id = isset($skin[2]['skinid'])?$skin[2]['skinid']:0;
 						unset($skin[2]['skinid']);
-						if(isset($this->_skins[$type][$id]))
-							throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
+						if(isset($this->_skins[$type][$id])) {
+													throw new TConfigurationException('theme_skinid_duplicated', $type, $id, dirname($themePath));
+						}
 						/*
 						foreach($skin[2] as $name=>$value)
 						{
@@ -170,8 +175,9 @@ 
 			closedir($dir);
 			sort($this->_cssFiles);
 			sort($this->_jsFiles);
-			if($cache !== null)
-				$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+			if($cache !== null) {
+							$cache->set(self::THEME_CACHE_PREFIX . $themePath, [$this->_skins,$this->_cssFiles,$this->_jsFiles,time()]);
+			}
 		}
 	}
 
@@ -251,8 +257,9 @@ 
 	public function applySkin($control)
 	{
 		$type = get_class($control);
-		if(($id = $control->getSkinID()) === '')
-			$id = 0;
+		if(($id = $control->getSkinID()) === '') {
+					$id = 0;
+		}
 		if(isset($this->_skins[$type][$id]))
 		{
 			foreach($this->_skins[$type][$id] as $name => $value)
@@ -287,29 +294,32 @@ 
 				}
 				if(!is_array($value))
 				{
-					if(strpos($name, '.') === false)	// is simple property or custom attribute
+					if(strpos($name, '.') === false) {
+						// is simple property or custom attribute
 					{
 						if($control->hasProperty($name))
 						{
 							if($control->canSetProperty($name))
 							{
 								$setter = 'set' . $name;
+					}
 								$control->$setter($value);
+							} else {
+															throw new TConfigurationException('theme_property_readonly', $type, $name);
 							}
-							else
-								throw new TConfigurationException('theme_property_readonly', $type, $name);
+						} else {
+													throw new TConfigurationException('theme_property_undefined', $type, $name);
 						}
-						else
-							throw new TConfigurationException('theme_property_undefined', $type, $name);
-					}
-					else	// complex property
+					} else {
+						// complex property
 						$control->setSubProperty($name, $value);
+					}
 				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**

framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php

Spacing +4 added lines, -4 removed lines

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

Braces +12 added lines, -11 removed lines

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

framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php

Spacing +3 added lines, -3 removed lines

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

Braces +6 added lines, -4 removed lines

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

framework/Web/UI/ActiveControls/TActiveControlAdapter.php

Spacing +9 added lines, -9 removed lines

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

Braces +7 added lines, -6 removed lines

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