pradosoft / prado

framework/Web/UI/WebControls/TTableHeaderCell.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	{
 		parent::addAttributesToRender($writer);
 		if(($scope = $this->getScope()) !== TTableHeaderScope::NotSet)
-			$writer->addAttribute('scope', $scope === TTableHeaderScope::Row?'row':'col');
+			$writer->addAttribute('scope', $scope === TTableHeaderScope::Row ? 'row' : 'col');
 		if(($text = $this->getAbbreviatedText()) !== '')
 			$writer->addAttribute('abbr', $text);
 		if(($text = $this->getCategoryText()) !== '')

framework/Web/UI/WebControls/TValidationSummary.php

Braces +9 added lines, -6 removed lines

@@ -364,8 +364,9 @@ 
 		$content = '';
 		if(strlen($header))
 			$content .= $header . "<br/>\n";
-		foreach($messages as $message)
-			$content .= "$message<br/>\n";
+		foreach($messages as $message) {
+					$content .= "$message<br/>\n";
+		}
 		$writer->write($content);
 	}
 
@@ -380,8 +381,9 @@ 
 		$header = $this->getHeaderText();
 		$messages = $this->getErrorMessages();
 		$content = $header;
-		foreach($messages as $message)
-			$content .= ' ' . $message;
+		foreach($messages as $message) {
+					$content .= ' ' . $message;
+		}
 		$writer->write($content);
 	}
 
@@ -399,8 +401,9 @@ 
 		if(count($messages) > 0)
 		{
 			$content .= "<ul>\n";
-			foreach($messages as $message)
-				$content .= '<li>' . $message . "</li>\n";
+			foreach($messages as $message) {
+							$content .= '<li>' . $message . "</li>\n";
+			}
 			$content .= "</ul>\n";
 		}
 		$writer->write($content);

framework/Web/UI/WebControls/TCaptchaValidator.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 
 	private function generateTokenHash($token)
 	{
-		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)
+		for($h = 0, $i = strlen($token) - 1; $i >= 0; --$i)
 			$h += ord($token[$i]);
 		return $h;
 	}

Braces +4 added lines, -4 removed lines

@@ -108,8 +108,7 @@ 
 		{
 			$options['TokenHash'] = $this->generateTokenHash($control->getToken());
 			$options['CaseSensitive'] = true;
-		}
-		else
+		} else
 		{
 			$options['TokenHash'] = $this->generateTokenHash(strtoupper($control->getToken()));
 			$options['CaseSensitive'] = false;
@@ -119,8 +118,9 @@ 
 
 	private function generateTokenHash($token)
 	{
-		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i)
-			$h += ord($token[$i]);
+		for($h = 0,$i = strlen($token) - 1;$i >= 0;--$i) {
+					$h += ord($token[$i]);
+		}
 		return $h;
 	}
 }

framework/Web/TUrlManager.php

Braces +11 added lines, -14 removed lines

@@ -78,23 +78,22 @@ 
 					if(is_array($value))
 					{
 						$name = urlencode($name . '[]');
-						foreach($value as $v)
-							$url .= $amp . $name . '=' . urlencode($v);
-					}
-					else
+						foreach($value as $v) {
+													$url .= $amp . $name . '=' . urlencode($v);
+						}
+					} else
 						$url .= $amp . urlencode($name) . '=' . urlencode($value);
 				}
-			}
-			else
+			} else
 			{
 				foreach($getItems as $name => $value)
 				{
 					if(is_array($value))
 					{
-						foreach($value as $v)
-							$url .= $amp . $name . '[]=' . $v;
-					}
-					else
+						foreach($value as $v) {
+													$url .= $amp . $name . '[]=' . $v;
+						}
+					} else
 						$url .= $amp . $name . '=' . $value;
 				}
 			}
@@ -147,14 +146,12 @@ 
 							$getVariables[substr($name, 0, $pos)][] = $value;
 						else
 							$getVariables[$name] = $value;
-					}
-					else
+					} else
 						$getVariables[$path] = '';
 				}
 			}
 			return $getVariables;
-		}
-		else
+		} else
 			return [];
 	}
 }

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
 		$url = $serviceID . '=' . urlencode($serviceParam);
-		$amp = $encodeAmpersand?'&':'&';
+		$amp = $encodeAmpersand ? '&' : '&';
 		$request = $this->getRequest();
 		if(is_array($getItems) || $getItems instanceof \Traversable)
 		{
@@ -103,9 +103,9 @@ 
 		switch($request->getUrlFormat())
 		{
 			case THttpRequestUrlFormat::Path:
-				return $request->getApplicationUrl() . '/' . strtr($url, [$amp => '/','?' => '/','=' => $request->getUrlParamSeparator()]);
+				return $request->getApplicationUrl() . '/' . strtr($url, [$amp => '/', '?' => '/', '=' => $request->getUrlParamSeparator()]);
 			case THttpRequestUrlFormat::HiddenPath:
-				return rtrim(dirname($request->getApplicationUrl()), '/') . '/' . strtr($url, [$amp => '/','?' => '/','=' => $request->getUrlParamSeparator()]);
+				return rtrim(dirname($request->getApplicationUrl()), '/') . '/' . strtr($url, [$amp => '/', '?' => '/', '=' => $request->getUrlParamSeparator()]);
 			default:
 				return $request->getApplicationUrl() . '?' . $url;
 		}

framework/Web/THttpSession.php

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
 		if(!$this->_started)
 		{
 			if($this->_customStorage)
-				session_set_save_handler([$this,'_open'], [$this,'_close'], [$this,'_read'], [$this,'_write'], [$this,'_destroy'], [$this,'_gc']);
+				session_set_save_handler([$this, '_open'], [$this, '_close'], [$this, '_read'], [$this, '_write'], [$this, '_destroy'], [$this, '_gc']);
 			if($this->_cookie !== null)
 				session_set_cookie_params($this->_cookie->getExpire(), $this->_cookie->getPath(), $this->_cookie->getDomain(), $this->_cookie->getSecure(), $this->_cookie->getHttpOnly());
 			if(ini_get('session.auto_start') !== '1')
@@ -405,9 +405,9 @@ 
 		else
 		{
 			$value = TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
+			if($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
 					throw new TInvalidOperationException('httpsession_transid_cookieonly');
-			ini_set('session.use_trans_sid', $value?'1':'0');
+			ini_set('session.use_trans_sid', $value ? '1' : '0');
 		}
 	}
 

Braces +7 added lines, -10 removed lines

@@ -318,13 +318,11 @@ 
 	  {
 				ini_set('session.use_cookies', '0');
 			  ini_set('session.use_only_cookies', '0');
-	  }
-			elseif($value === THttpSessionCookieMode::Allow)
+	  } elseif($value === THttpSessionCookieMode::Allow)
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '0');
-			}
-			else
+			} else
 			{
 				ini_set('session.use_cookies', '1');
 				ini_set('session.use_only_cookies', '1');
@@ -377,8 +375,7 @@ 
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
@@ -570,8 +567,7 @@ 
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -580,8 +576,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 
 	/**

framework/Web/THttpRequest.php

Braces +15 added lines, -18 removed lines

@@ -232,8 +232,7 @@ 
 				$port = $_SERVER['SERVER_PORT'];
 				if(($port != 80 && !$secure) || ($port != 443 && $secure))
 					$url .= ':' . $port;
-			}
-			else
+			} else
 				$url .= $_SERVER['HTTP_HOST'];
 			$url .= $this->getRequestUri();
 			$this->_url = new TUri($url);
@@ -341,8 +340,7 @@ 
 				{
 					$this->_urlManager = new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager = $this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager === null)
@@ -462,8 +460,7 @@ 
 
 		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;
@@ -575,8 +572,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -679,11 +675,11 @@ 
 					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;
@@ -766,8 +762,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,8 +894,7 @@ 
 			$value = $this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -907,8 +903,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($this->_items) as $key)
-			$this->remove($key);
+		foreach(array_keys($this->_items) as $key) {
+					$this->remove($key);
+		}
 	}
 
 	/**

Spacing +23 added lines, -23 removed lines

@@ -180,7 +180,7 @@ 
 		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']))
 			$this->_pathInfo = substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME']));
@@ -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);
 	}
 
 	/**
@@ -225,7 +225,7 @@ 
 		if($this->_url === null)
 		{
 			$secure = $this->getIsSecureConnection();
-			$url = $secure?'https://':'http://';
+			$url = $secure ? 'https://' : 'http://';
 			if(empty($_SERVER['HTTP_HOST']))
 			{
 				$url .= $_SERVER['SERVER_NAME'];
@@ -277,7 +277,7 @@ 
 			{
 				$dependencies = null;
 				if($this->getApplication()->getMode() !== TApplicationMode::Performance)
-					if ($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
+					if($manager instanceof TUrlMapping && $fn = $manager->getConfigFile())
 					{
 						$fn = Prado::getPathOfNamespace($fn, $this->getApplication()->getConfigurationFileExt());
 						$dependencies = new TFileCacheDependency($fn);
@@ -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;
 	}
 
 	/**
@@ -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;
 	}
 
 	/**
@@ -496,9 +496,9 @@ 
 	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;
+		if(($port = $url->getPort())) $host .= ':' . $port;
 		return $scheme . '://' . $host;
 	}
 
@@ -510,7 +510,7 @@ 
 		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;
 	}
 
 	/**
@@ -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;
 	}
 
 	/**
@@ -732,11 +732,11 @@ 
 	 */
 	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;
+			return $url . (strpos($url, '?') === false ? '?' : ($encodeAmpersand ? '&' : '&')) . SID;
 		else
 			return $url;
 	}

framework/Web/THttpCookieCollection.php

Braces +4 added lines, -4 removed lines

@@ -59,8 +59,7 @@ 
 			parent::insertAt($index, $item);
 			if($this->_o instanceof THttpResponse)
 				$this->_o->addCookie($item);
-		}
-		else
+		} else
 			throw new TInvalidDataTypeException('httpcookiecollection_httpcookie_required');
 	}
 
@@ -98,9 +97,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/TUrlMappingPattern.php

Braces +19 added lines, -18 removed lines

@@ -364,10 +364,10 @@ 
 			$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 +381,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;
@@ -543,8 +544,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,23 +559,22 @@ 
 					if(is_array($value))
 					{
 						$name = rawurlencode($name . '[]');
-						foreach($value as $v)
-							$url2 .= $amp . $name . '=' . rawurlencode($v);
-					}
-					else
+						foreach($value as $v) {
+													$url2 .= $amp . $name . '=' . rawurlencode($v);
+						}
+					} 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;
-					}
-					else
+						foreach($value as $v) {
+													$url2 .= $amp . $name . '[]=' . $v;
+						}
+					} else
 						$url2 .= $amp . $name . '=' . $value;
 				}
 			}

Spacing +16 added lines, -16 removed lines

@@ -200,7 +200,7 @@ 
 	{
 		$params = [];
 		$values = [];
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key => $value)
 			{
@@ -208,7 +208,7 @@ 
 				$values[] = '(?P<' . $key . '>' . $value . ')';
 			}
 		}
-		if ($this->getIsWildCardPattern())
+		if($this->getIsWildCardPattern())
 		{
 				$params[] = '{*}';
 				// service parameter must not contain '=' and '/'
@@ -217,7 +217,7 @@ 
 		$params[] = '/';
 		$values[] = '\\/';
 		$regexp = str_replace($params, $values, trim($this->getPattern(), '/') . '/');
-		if ($this->_urlFormat === THttpRequestUrlFormat::Get)
+		if($this->_urlFormat === THttpRequestUrlFormat::Get)
 				$regexp = '/^' . $regexp . '$/u';
 		else
 				$regexp = '/^' . $regexp . '(?P<urlparams>.*)$/u';
@@ -312,7 +312,7 @@ 
 	 */
 	public function getParameters()
 	{
-		if (!$this->_parameters)
+		if(!$this->_parameters)
 		{
 			$this->_parameters = new TAttributeCollection;
 			$this->_parameters->setCaseSensitive(true);
@@ -334,7 +334,7 @@ 
 	 */
 	public function getConstants()
 	{
-		if (!$this->_constants)
+		if(!$this->_constants)
 		{
 			$this->_constants = new TAttributeCollection;
 			$this->_constants->setCaseSensitive(true);
@@ -359,10 +359,10 @@ 
 		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
 			$matches[$this->_serviceID] = str_replace('*', $matches[$this->_serviceID], $this->_serviceParameter);
 
-		if (isset($matches['urlparams']))
+		if(isset($matches['urlparams']))
 		{
 			$params = explode('/', $matches['urlparams']);
-			if ($this->_separator === '/')
+			if($this->_separator === '/')
 			{
 				while($key = array_shift($params))
 					$matches[$key] = ($value = array_shift($params)) ? $value : '';
@@ -486,7 +486,7 @@ 
 	{
 		if(!$this->_customUrl || $this->getPattern() === null)
 			return false;
-		if ($this->_parameters)
+		if($this->_parameters)
 		{
 			foreach($this->_parameters as $key => $value)
 			{
@@ -495,13 +495,13 @@ 
 			}
 		}
 
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key => $value)
 			{
-				if (!isset($getItems[$key]))
+				if(!isset($getItems[$key]))
 					return false;
-				if ($getItems[$key] != $value)
+				if($getItems[$key] != $value)
 					return false;
 			}
 		}
@@ -518,7 +518,7 @@ 
 	 */
 	public function constructUrl($getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		if ($this->_constants)
+		if($this->_constants)
 		{
 			foreach($this->_constants->toArray() as $key => $value)
 			{
@@ -542,14 +542,14 @@ 
 		// for the rest of the GET variables, put them in the query string
 		if(count($extra) > 0)
 		{
-			if ($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
-				foreach ($extra as $name => $value)
-					$url .= '/' . $name . $this->_separator . ($encodeGetItems?rawurlencode($value):$value);
+			if($this->_urlFormat === THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach($extra as $name => $value)
+					$url .= '/' . $name . $this->_separator . ($encodeGetItems ?rawurlencode($value) : $value);
 				return $url;
 			}
 
 			$url2 = '';
-			$amp = $encodeAmpersand?'&amp;':'&';
+			$amp = $encodeAmpersand ? '&amp;' : '&';
 			if($encodeGetItems)
 			{
 				foreach($extra as $name => $value)

framework/Web/TUrlMapping.php

Braces +7 added lines, -10 removed lines

@@ -137,15 +137,13 @@ 
 			{
 				$config = include $this->_configFile;
 				$this->loadUrlMappings($dom);
-			}
-			else
+			} else
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadUrlMappings($dom);
 			}
-		}
-		else
+		} else
 			throw new TConfigurationException('urlmapping_configfile_inexistent', $this->_configFile);
 	}
 
@@ -252,8 +250,7 @@ 
 					$this->buildUrlMapping($class, $properties, $url);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('url') as $url)
 			{
@@ -270,8 +267,9 @@ 
 		$pattern = Prado::createComponent($class, $this);
 		if(!($pattern instanceof TUrlMappingPattern))
 			throw new TConfigurationException('urlmapping_urlmappingpattern_required');
-		foreach($properties as $name => $value)
-			$pattern->setSubproperty($name, $value);
+		foreach($properties as $name => $value) {
+					$pattern->setSubproperty($name, $value);
+		}
 
 		if($url instanceof TXmlElement) {
 			$text = $url -> getValue();
@@ -367,8 +365,7 @@ 
 					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)
 				{

Spacing +3 added lines, -3 removed lines

@@ -247,8 +247,8 @@ 
 			{
 				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);
 				}
 			}
@@ -319,7 +319,7 @@ 
 					if(is_string($key))
 						$params[$key] = $value;
 				}
-				if (!$pattern->getIsWildCardPattern())
+				if(!$pattern->getIsWildCardPattern())
 					$params[$pattern->getServiceID()] = $pattern->getServiceParameter();
 				return $params;
 			}