pradosoft / prado

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);
+		}
 	}
 
 	/**

framework/Web/TUrlManager.php

Spacing +24 added lines, -24 removed lines

@@ -66,48 +66,48 @@ 
 	 */
 	public function constructUrl($serviceID, $serviceParam, $getItems, $encodeAmpersand, $encodeGetItems)
 	{
-		$url = $serviceID . '=' . urlencode($serviceParam);
-		$amp = $encodeAmpersand?'&':'&';
+		$url = $serviceID.'='.urlencode($serviceParam);
+		$amp = $encodeAmpersand ? '&' : '&';
 		$request = $this->getRequest();
-		if(is_array($getItems) || $getItems instanceof \Traversable)
+		if (is_array($getItems) || $getItems instanceof \Traversable)
 		{
-			if($encodeGetItems)
+			if ($encodeGetItems)
 			{
-				foreach($getItems as $name => $value)
+				foreach ($getItems as $name => $value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						$name = urlencode($name . '[]');
-						foreach($value as $v)
-							$url .= $amp . $name . '=' . urlencode($v);
+						$name = urlencode($name.'[]');
+						foreach ($value as $v)
+							$url .= $amp.$name.'='.urlencode($v);
 					}
 					else
-						$url .= $amp . urlencode($name) . '=' . urlencode($value);
+						$url .= $amp.urlencode($name).'='.urlencode($value);
 				}
 			}
 			else
 			{
-				foreach($getItems as $name => $value)
+				foreach ($getItems as $name => $value)
 				{
-					if(is_array($value))
+					if (is_array($value))
 					{
-						foreach($value as $v)
-							$url .= $amp . $name . '[]=' . $v;
+						foreach ($value as $v)
+							$url .= $amp.$name.'[]='.$v;
 					}
 					else
-						$url .= $amp . $name . '=' . $value;
+						$url .= $amp.$name.'='.$value;
 				}
 			}
 		}
 
-		switch($request->getUrlFormat())
+		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;
+				return $request->getApplicationUrl().'?'.$url;
 		}
 	}
 
@@ -128,22 +128,22 @@ 
 	{
 		$request = $this->getRequest();
 		$pathInfo = trim($request->getPathInfo(), '/');
-		if(($request->getUrlFormat() === THttpRequestUrlFormat::Path ||
+		if (($request->getUrlFormat() === THttpRequestUrlFormat::Path ||
 			$request->getUrlFormat() === THttpRequestUrlFormat::HiddenPath) &&
 			$pathInfo !== '')
 		{
 			$separator = $request->getUrlParamSeparator();
 			$paths = explode('/', $pathInfo);
 			$getVariables = [];
-			foreach($paths as $path)
+			foreach ($paths as $path)
 			{
-				if(($path = trim($path)) !== '')
+				if (($path = trim($path)) !== '')
 				{
-					if(($pos = strpos($path, $separator)) !== false)
+					if (($pos = strpos($path, $separator)) !== false)
 					{
 						$name = substr($path, 0, $pos);
 						$value = substr($path, $pos + 1);
-						if(($pos = strpos($name, '[]')) !== false)
+						if (($pos = strpos($name, '[]')) !== false)
 							$getVariables[substr($name, 0, $pos)][] = $value;
 						else
 							$getVariables[$name] = $value;

Braces +20 added lines, -18 removed lines

@@ -78,24 +78,25 @@ 
 					if(is_array($value))
 					{
 						$name = urlencode($name . '[]');
-						foreach($value as $v)
-							$url .= $amp . $name . '=' . urlencode($v);
+						foreach($value as $v) {
+													$url .= $amp . $name . '=' . urlencode($v);
+						}
+					} else {
+											$url .= $amp . urlencode($name) . '=' . urlencode($value);
 					}
-					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;
+						foreach($value as $v) {
+													$url .= $amp . $name . '[]=' . $v;
+						}
+					} else {
+											$url .= $amp . $name . '=' . $value;
 					}
-					else
-						$url .= $amp . $name . '=' . $value;
 				}
 			}
 		}
@@ -143,19 +144,20 @@ 
 					{
 						$name = substr($path, 0, $pos);
 						$value = substr($path, $pos + 1);
-						if(($pos = strpos($name, '[]')) !== false)
-							$getVariables[substr($name, 0, $pos)][] = $value;
-						else
-							$getVariables[$name] = $value;
+						if(($pos = strpos($name, '[]')) !== false) {
+													$getVariables[substr($name, 0, $pos)][] = $value;
+						} else {
+													$getVariables[$name] = $value;
+						}
+					} else {
+											$getVariables[$path] = '';
 					}
-					else
-						$getVariables[$path] = '';
 				}
 			}
 			return $getVariables;
+		} else {
+					return [];
 		}
-		else
-			return [];
 	}
 }
 

framework/Web/THttpResponse.php

Spacing +50 added lines, -50 removed lines

@@ -167,7 +167,7 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_start();
 		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
@@ -203,7 +203,7 @@ 
 	 */
 	public function setCacheControl($value)
 	{
-		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none','nocache','private','private_no_expire','public']));
+		session_cache_limiter(TPropertyValue::ensureEnum($value, ['none', 'nocache', 'private', 'private_no_expire', 'public']));
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->_charset = (strToLower($charset) === 'false') ? false : (string)$charset;
+		$this->_charset = (strToLower($charset) === 'false') ? false : (string) $charset;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
 		else
 			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
@@ -281,14 +281,14 @@ 
 		if ($this->_httpHeaderSent)
 			throw new \Exception('Unable to alter response as HTTP header already sent');
 		$status = TPropertyValue::ensureInteger($status);
-		if(isset(self::$HTTP_STATUS_CODES[$status])) {
+		if (isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
-			if($reason === null || $reason === '') {
+		} else {
+			if ($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
 			$reason = TPropertyValue::ensureString($reason);
-			if(strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
+			if (strpos($reason, "\r") != false || strpos($reason, "\n") != false) {
 				throw new TInvalidDataValueException("response_status_reason_barchars");
 			}
 			$this->_reason = $reason;
@@ -308,7 +308,7 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
+		if ($this->_cookies === null)
 			$this->_cookies = new THttpCookieCollection($this);
 		return $this->_cookies;
 	}
@@ -353,31 +353,31 @@ 
 			'xls' => 'application/vnd.ms-excel',
 		];
 
-		if($mimeType === null)
+		if ($mimeType === null)
 		{
 			$mimeType = 'text/plain';
-			if(function_exists('mime_content_type'))
+			if (function_exists('mime_content_type'))
 				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+			elseif (($ext = strrchr($fileName, '.')) !== false)
 			{
 				$ext = substr($ext, 1);
-				if(isset($defaultMimeTypes[$ext]))
+				if (isset($defaultMimeTypes[$ext]))
 					$mimeType = $defaultMimeTypes[$ext];
 			}
 		}
 
-		if($clientFileName === null)
+		if ($clientFileName === null)
 			$clientFileName = basename($fileName);
 		else
 			$clientFileName = basename($clientFileName);
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if ($fileSize === null || $fileSize < 0)
+			$fileSize = ($content === null ?filesize($fileName) : strlen($content));
 
 		$this->sendHttpHeader();
-		if(is_array($headers))
+		if (is_array($headers))
 		{
-			foreach($headers as $h)
+			foreach ($headers as $h)
 				header($h);
 		}
 		else
@@ -389,10 +389,10 @@ 
 			$this->_contentTypeHeaderSent = true;
 		}
 
-		header('Content-Length: ' . $fileSize);
-		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
+		header('Content-Length: '.$fileSize);
+		header("Content-Disposition: ".($forceDownload ? 'attachment' : 'inline')."; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
+		if ($content === null)
 			readfile($fileName);
 		else
 			echo $content;
@@ -406,7 +406,7 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->httpRedirect($url);
 		else
 			$this->httpRedirect($url);
@@ -431,27 +431,27 @@ 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
 		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if ($url[0] === '/')
+			$url = $this->getRequest()->getBaseUrl().$url;
 		if ($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
-			if($isIIS)
+			if ($isIIS)
 			{
-				header('HTTP/1.1 ' . $this->_status . ' ' . self::$HTTP_STATUS_CODES[
+				header('HTTP/1.1 '.$this->_status.' '.self::$HTTP_STATUS_CODES[
 					array_key_exists($this->_status, self::$HTTP_STATUS_CODES)
 						? $this->_status
 						: 302
 					]);
 			}
-			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
+			header('Location: '.str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
-			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
-			header('Location: ' . str_replace('&amp;', '&', $url));
+			if ($isIIS)
+				header('HTTP/1.1 302 '.self::$HTTP_STATUS_CODES[302]);
+			header('Location: '.str_replace('&amp;', '&', $url));
 		}
 
-		if(!$this->getApplication()->getRequestCompleted())
+		if (!$this->getApplication()->getRequestCompleted())
 			$this->getApplication()->onEndRequest();
 
 		exit();
@@ -472,7 +472,7 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			$this->_adapter->flushContent($continueBuffering);
 		else
 			$this->flushContent($continueBuffering);
@@ -496,7 +496,7 @@ 
 	{
 		Prado::trace("Flushing output", 'Prado\Web\THttpResponse');
 		$this->ensureHeadersSent();
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 		{
 			// avoid forced send of http headers (ob_flush() does that) if there's no output yet
 			if (ob_get_length() > 0)
@@ -530,10 +530,10 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
+		if ($this->getRequest()->getHttpProtocolVersion() === null)
 			$protocol = 'HTTP/1.1';
 
-		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
+		header($protocol.' '.$this->_status.' '.$this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
 		$this->_httpHeaderSent = true;
 	}
@@ -552,18 +552,18 @@ 
 	 */
 	protected function sendContentTypeHeader()
 	{
-		$contentType = $this->_contentType === null?self::DEFAULT_CONTENTTYPE:$this->_contentType;
+		$contentType = $this->_contentType === null ?self::DEFAULT_CONTENTTYPE : $this->_contentType;
 		$charset = $this->getCharset();
-		if($charset === false) {
-			$this->appendHeader('Content-Type: ' . $contentType);
+		if ($charset === false) {
+			$this->appendHeader('Content-Type: '.$contentType);
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
+		if ($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
 			$charset = $globalization->getCharset();
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
-		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
+		if ($charset === '') $charset = self::DEFAULT_CHARSET;
+		$this->appendHeader('Content-Type: '.$contentType.';charset='.$charset);
 
 		$this->_contentTypeHeaderSent = true;
 	}
@@ -577,7 +577,7 @@ 
 	public function getContents()
 	{
 		Prado::trace("Retrieving output", 'Prado\Web\THttpResponse');
-		return $this->_bufferOutput?ob_get_contents():'';
+		return $this->_bufferOutput ?ob_get_contents() : '';
 	}
 
 	/**
@@ -585,7 +585,7 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
+		if ($this->_bufferOutput)
 			ob_clean();
 		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
@@ -598,17 +598,17 @@ 
 	{
 		$result = [];
 		$headers = headers_list();
-		foreach($headers as $header) {
+		foreach ($headers as $header) {
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
+			if (isset($result[$key]))
+				$result[$key] .= ', '.$value;
 			else
 				$result[$key] = $value;
 		}
 
-		if($case !== null)
+		if ($case !== null)
 			return array_change_key_case($result, $case);
 
 		return $result;
@@ -647,7 +647,7 @@ 
 	public function addCookie($cookie)
 	{
 		$request = $this->getRequest();
-		if($request->getEnableCookieValidation())
+		if ($request->getEnableCookieValidation())
 		{
 			$value = $this->getApplication()->getSecurityManager()->hashData($cookie->getValue());
 			setcookie(
@@ -714,9 +714,9 @@ 
 	 */
 	public function createHtmlWriter($type = null)
 	{
-		if($type === null)
+		if ($type === null)
 			$type = $this->getHtmlWriterType();
-		if($this->getHasAdapter())
+		if ($this->getHasAdapter())
 			return $this->_adapter->createNewHtmlWriter($type, $this);
 		else
 			return $this->createNewHtmlWriter($type, $this);

Braces +102 added lines, -77 removed lines

@@ -167,8 +167,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_bufferOutput)
-			ob_start();
+		if($this->_bufferOutput) {
+					ob_start();
+		}
 		$this->_initialized = true;
 		$this->getApplication()->setResponse($this);
 	}
@@ -211,8 +212,9 @@ 
 	 */
 	public function setContentType($type)
 	{
-		if ($this->_contentTypeHeaderSent)
-			throw new \Exception('Unable to alter content-type as it has been already sent');
+		if ($this->_contentTypeHeaderSent) {
+					throw new \Exception('Unable to alter content-type as it has been already sent');
+		}
 		$this->_contentType = $type;
 	}
 
@@ -254,10 +256,11 @@ 
 	 */
 	public function setBufferOutput($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
-		else
-			$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpresponse_bufferoutput_unchangeable');
+		} else {
+					$this->_bufferOutput = TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -278,12 +281,13 @@ 
 	 */
 	public function setStatusCode($status, $reason = null)
 	{
-		if ($this->_httpHeaderSent)
-			throw new \Exception('Unable to alter response as HTTP header already sent');
+		if ($this->_httpHeaderSent) {
+					throw new \Exception('Unable to alter response as HTTP header already sent');
+		}
 		$status = TPropertyValue::ensureInteger($status);
 		if(isset(self::$HTTP_STATUS_CODES[$status])) {
 			$this->_reason = self::$HTTP_STATUS_CODES[$status];
-		}else{
+		} else{
 			if($reason === null || $reason === '') {
 				throw new TInvalidDataValueException("response_status_reason_missing");
 			}
@@ -308,8 +312,9 @@ 
 	 */
 	public function getCookies()
 	{
-		if($this->_cookies === null)
-			$this->_cookies = new THttpCookieCollection($this);
+		if($this->_cookies === null) {
+					$this->_cookies = new THttpCookieCollection($this);
+		}
 		return $this->_cookies;
 	}
 
@@ -321,8 +326,9 @@ 
 	public function write($str)
 	{
 		// when starting output make sure we send the headers first
-		if (!$this->_bufferOutput and !$this->_httpHeaderSent)
-			$this->ensureHeadersSent();
+		if (!$this->_bufferOutput and !$this->_httpHeaderSent) {
+					$this->ensureHeadersSent();
+		}
 		echo $str;
 	}
 
@@ -356,31 +362,34 @@ 
 		if($mimeType === null)
 		{
 			$mimeType = 'text/plain';
-			if(function_exists('mime_content_type'))
-				$mimeType = mime_content_type($fileName);
-			elseif(($ext = strrchr($fileName, '.')) !== false)
+			if(function_exists('mime_content_type')) {
+							$mimeType = mime_content_type($fileName);
+			} elseif(($ext = strrchr($fileName, '.')) !== false)
 			{
 				$ext = substr($ext, 1);
-				if(isset($defaultMimeTypes[$ext]))
-					$mimeType = $defaultMimeTypes[$ext];
+				if(isset($defaultMimeTypes[$ext])) {
+									$mimeType = $defaultMimeTypes[$ext];
+				}
 			}
 		}
 
-		if($clientFileName === null)
-			$clientFileName = basename($fileName);
-		else
-			$clientFileName = basename($clientFileName);
+		if($clientFileName === null) {
+					$clientFileName = basename($fileName);
+		} else {
+					$clientFileName = basename($clientFileName);
+		}
 
-		if($fileSize === null || $fileSize < 0)
-			$fileSize = ($content === null?filesize($fileName):strlen($content));
+		if($fileSize === null || $fileSize < 0) {
+					$fileSize = ($content === null?filesize($fileName):strlen($content));
+		}
 
 		$this->sendHttpHeader();
 		if(is_array($headers))
 		{
-			foreach($headers as $h)
-				header($h);
-		}
-		else
+			foreach($headers as $h) {
+							header($h);
+			}
+		} else
 		{
 			header('Pragma: public');
 			header('Expires: 0');
@@ -392,10 +401,11 @@ 
 		header('Content-Length: ' . $fileSize);
 		header("Content-Disposition: " . ($forceDownload ? 'attachment' : 'inline') . "; filename=\"$clientFileName\"");
 		header('Content-Transfer-Encoding: binary');
-		if($content === null)
-			readfile($fileName);
-		else
-			echo $content;
+		if($content === null) {
+					readfile($fileName);
+		} else {
+					echo $content;
+		}
 	}
 
 	/**
@@ -406,10 +416,11 @@ 
 	 */
 	public function redirect($url)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->httpRedirect($url);
-		else
-			$this->httpRedirect($url);
+		if($this->getHasAdapter()) {
+					$this->_adapter->httpRedirect($url);
+		} else {
+					$this->httpRedirect($url);
+		}
 	}
 
 	/**
@@ -431,8 +442,9 @@ 
 		// Under IIS, explicitly send an HTTP response including the status code
 		// this is handled automatically by PHP on Apache and others
 		$isIIS = (stripos($this->getRequest()->getServerSoftware(), "microsoft-iis") !== false);
-		if($url[0] === '/')
-			$url = $this->getRequest()->getBaseUrl() . $url;
+		if($url[0] === '/') {
+					$url = $this->getRequest()->getBaseUrl() . $url;
+		}
 		if ($this->_status >= 300 && $this->_status < 400)
 		{
 			// The status code has been modified to a valid redirection status, send it
@@ -446,13 +458,15 @@ 
 			}
 			header('Location: ' . str_replace('&amp;', '&', $url), true, $this->_status);
 		} else {
-			if($isIIS)
-				header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
+			if($isIIS) {
+							header('HTTP/1.1 302 ' . self::$HTTP_STATUS_CODES[302]);
+			}
 			header('Location: ' . str_replace('&amp;', '&', $url));
 		}
 
-		if(!$this->getApplication()->getRequestCompleted())
-			$this->getApplication()->onEndRequest();
+		if(!$this->getApplication()->getRequestCompleted()) {
+					$this->getApplication()->onEndRequest();
+		}
 
 		exit();
 	}
@@ -472,10 +486,11 @@ 
 	 */
 	public function flush($continueBuffering = true)
 	{
-		if($this->getHasAdapter())
-			$this->_adapter->flushContent($continueBuffering);
-		else
-			$this->flushContent($continueBuffering);
+		if($this->getHasAdapter()) {
+					$this->_adapter->flushContent($continueBuffering);
+		} else {
+					$this->flushContent($continueBuffering);
+		}
 	}
 
 	/**
@@ -505,14 +520,14 @@ 
 				{
 					$this->_bufferOutput = false;
 					ob_end_flush();
+				} else {
+									ob_flush();
 				}
-				else
-					ob_flush();
 				flush();
 			}
+		} else {
+					flush();
 		}
-		else
-			flush();
 	}
 
 	/**
@@ -520,8 +535,9 @@ 
 	 */
 	protected function ensureHttpHeaderSent()
 	{
-		if (!$this->_httpHeaderSent)
-			$this->sendHttpHeader();
+		if (!$this->_httpHeaderSent) {
+					$this->sendHttpHeader();
+		}
 	}
 
 	/**
@@ -530,8 +546,9 @@ 
 	protected function sendHttpHeader()
 	{
 		$protocol = $this->getRequest()->getHttpProtocolVersion();
-		if($this->getRequest()->getHttpProtocolVersion() === null)
-			$protocol = 'HTTP/1.1';
+		if($this->getRequest()->getHttpProtocolVersion() === null) {
+					$protocol = 'HTTP/1.1';
+		}
 
 		header($protocol . ' ' . $this->_status . ' ' . $this->_reason, true, TPropertyValue::ensureInteger($this->_status));
 
@@ -543,8 +560,9 @@ 
 	 */
 	protected function ensureContentTypeHeaderSent()
 	{
-		if (!$this->_contentTypeHeaderSent)
-			$this->sendContentTypeHeader();
+		if (!$this->_contentTypeHeaderSent) {
+					$this->sendContentTypeHeader();
+		}
 	}
 
 	/**
@@ -559,10 +577,13 @@ 
 			return;
 		}
 
-		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null)
-			$charset = $globalization->getCharset();
+		if($charset === '' && ($globalization = $this->getApplication()->getGlobalization(false)) !== null) {
+					$charset = $globalization->getCharset();
+		}
 
-		if($charset === '') $charset = self::DEFAULT_CHARSET;
+		if($charset === '') {
+			$charset = self::DEFAULT_CHARSET;
+		}
 		$this->appendHeader('Content-Type: ' . $contentType . ';charset=' . $charset);
 
 		$this->_contentTypeHeaderSent = true;
@@ -585,8 +606,9 @@ 
 	 */
 	public function clear()
 	{
-		if($this->_bufferOutput)
-			ob_clean();
+		if($this->_bufferOutput) {
+					ob_clean();
+		}
 		Prado::trace("Clearing output", 'Prado\Web\THttpResponse');
 	}
 
@@ -602,14 +624,16 @@ 
 			$tmp = explode(':', $header);
 			$key = trim(array_shift($tmp));
 			$value = trim(implode(':', $tmp));
-			if(isset($result[$key]))
-				$result[$key] .= ', ' . $value;
-			else
-				$result[$key] = $value;
+			if(isset($result[$key])) {
+							$result[$key] .= ', ' . $value;
+			} else {
+							$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;
 	}
@@ -659,8 +683,7 @@ 
 				$cookie->getSecure(),
 				$cookie->getHttpOnly()
 			);
-		}
-		else {
+		} else {
 			setcookie(
 				$cookie->getName(),
 				$cookie->getValue(),
@@ -714,12 +737,14 @@ 
 	 */
 	public function createHtmlWriter($type = null)
 	{
-		if($type === null)
-			$type = $this->getHtmlWriterType();
-		if($this->getHasAdapter())
-			return $this->_adapter->createNewHtmlWriter($type, $this);
-		else
-			return $this->createNewHtmlWriter($type, $this);
+		if($type === null) {
+					$type = $this->getHtmlWriterType();
+		}
+		if($this->getHasAdapter()) {
+					return $this->_adapter->createNewHtmlWriter($type, $this);
+		} else {
+					return $this->createNewHtmlWriter($type, $this);
+		}
 	}
 
 	/**

framework/Web/TCacheHttpSession.php

Spacing +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_cacheModuleID === '')
+		if ($this->_cacheModuleID === '')
 			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
+		elseif (($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
 			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
-		elseif($cache instanceof ICache)
+		elseif ($cache instanceof ICache)
 			$this->_cache = $cache;
 		else
 			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
@@ -100,7 +100,7 @@ 
 	 */
 	public function _read($id)
 	{
-		return (string)$this->_cache->get($this->calculateKey($id));
+		return (string) $this->_cache->get($this->calculateKey($id));
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	protected function calculateKey($id)
 	{
-		return $this->_prefix . ':' . $id;
+		return $this->_prefix.':'.$id;
 	}
 }
 

Braces +9 added lines, -8 removed lines

@@ -57,14 +57,15 @@
 	 */
 	public function init($config)
 	{
-		if($this->_cacheModuleID === '')
-			throw new TConfigurationException('cachesession_cachemoduleid_required');
-		elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null)
-			throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
-		elseif($cache instanceof ICache)
-			$this->_cache = $cache;
-		else
-			throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
+		if($this->_cacheModuleID === '') {
+					throw new TConfigurationException('cachesession_cachemoduleid_required');
+		} elseif(($cache = $this->getApplication()->getModule($this->_cacheModuleID)) === null) {
+					throw new TConfigurationException('cachesession_cachemodule_inexistent', $this->_cacheModuleID);
+		} elseif($cache instanceof ICache) {
+					$this->_cache = $cache;
+		} else {
+					throw new TConfigurationException('cachesession_cachemodule_invalid', $this->_cacheModuleID);
+		}
 		$this->setUseCustomStorage(true);
 		parent::init($config);
 	}

framework/Web/THttpSession.php

Spacing +28 added lines, -28 removed lines

@@ -125,7 +125,7 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
+		if ($this->_autoStart)
 			$this->open();
 		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
@@ -137,13 +137,13 @@ 
 	 */
 	public function open()
 	{
-		if(!$this->_started)
+		if (!$this->_started)
 		{
-			if($this->_customStorage)
-				session_set_save_handler([$this,'_open'], [$this,'_close'], [$this,'_read'], [$this,'_write'], [$this,'_destroy'], [$this,'_gc']);
-			if($this->_cookie !== null)
+			if ($this->_customStorage)
+				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')
+			if (ini_get('session.auto_start') !== '1')
 				session_start();
 			$this->_started = true;
 		}
@@ -154,7 +154,7 @@ 
 	 */
 	public function close()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_write_close();
 			$this->_started = false;
@@ -166,7 +166,7 @@ 
 	 */
 	public function destroy()
 	{
-		if($this->_started)
+		if ($this->_started)
 		{
 			session_destroy();
 			$this->_started = false;
@@ -209,7 +209,7 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
 		else
 			session_id($value);
@@ -229,9 +229,9 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		elseif(ctype_alnum($value))
+		elseif (ctype_alnum($value))
 			session_name($value);
 		else
 			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
@@ -251,11 +251,11 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		elseif(is_dir($value))
+		elseif (is_dir($value))
 			session_save_path(realpath($value));
-		elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
+		elseif (null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
 			session_save_path(realpath($ns));
 		else
 			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
@@ -285,7 +285,7 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie === null)
+		if ($this->_cookie === null)
 			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
 		return $this->_cookie;
 	}
@@ -295,9 +295,9 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies') === '0')
+		if (ini_get('session.use_cookies') === '0')
 			return THttpSessionCookieMode::None;
-		elseif(ini_get('session.use_only_cookies') === '0')
+		elseif (ini_get('session.use_only_cookies') === '0')
 			return THttpSessionCookieMode::Allow;
 		else
 			return THttpSessionCookieMode::Only;
@@ -309,17 +309,17 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpSessionCookieMode');
-			if($value === THttpSessionCookieMode::None)
+			if ($value === THttpSessionCookieMode::None)
 	  {
 				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');
@@ -347,7 +347,7 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
 		else
 			$this->_autoStart = TPropertyValue::ensureBoolean($value);
@@ -368,12 +368,12 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureInteger($value);
-			if($value >= 0 && $value <= 100)
+			if ($value >= 0 && $value <= 100)
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
@@ -400,14 +400,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_transid_unchangeable');
 		else
 		{
 			$value = TPropertyValue::ensureBoolean($value);
 			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');
 		}
 	}
 
@@ -425,7 +425,7 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
+		if ($this->_started)
 			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
 		else
 			ini_set('session.gc_maxlifetime', $value);
@@ -565,7 +565,7 @@ 
 	 */
 	public function remove($key)
 	{
-		if(isset($_SESSION[$key]))
+		if (isset($_SESSION[$key]))
 		{
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
@@ -580,7 +580,7 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
+		foreach (array_keys($_SESSION) as $key)
 			unset($_SESSION[$key]);
 	}
 

Braces +74 added lines, -63 removed lines

@@ -125,8 +125,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_autoStart)
-			$this->open();
+		if($this->_autoStart) {
+					$this->open();
+		}
 		$this->_initialized = true;
 		$this->getApplication()->setSession($this);
 		register_shutdown_function([$this, "close"]);
@@ -139,12 +140,15 @@ 
 	{
 		if(!$this->_started)
 		{
-			if($this->_customStorage)
-				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')
-				session_start();
+			if($this->_customStorage) {
+							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') {
+							session_start();
+			}
 			$this->_started = true;
 		}
 	}
@@ -209,10 +213,11 @@ 
 	 */
 	public function setSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
-		else
-			session_id($value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionid_unchangeable');
+		} else {
+					session_id($value);
+		}
 	}
 
 	/**
@@ -229,12 +234,13 @@ 
 	 */
 	public function setSessionName($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
-		elseif(ctype_alnum($value))
-			session_name($value);
-		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_sessionname_unchangeable');
+		} elseif(ctype_alnum($value)) {
+					session_name($value);
+		} else {
+					throw new TInvalidDataValueException('httpsession_sessionname_invalid', $value);
+		}
 	}
 
 	/**
@@ -251,14 +257,15 @@ 
 	 */
 	public function setSavePath($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_savepath_unchangeable');
-		elseif(is_dir($value))
-			session_save_path(realpath($value));
-		elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns))
-			session_save_path(realpath($ns));
-		else
-			throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_savepath_unchangeable');
+		} elseif(is_dir($value)) {
+					session_save_path(realpath($value));
+		} elseif(null !== ($ns = Prado::getPathOfNamespace($value)) && is_dir($ns)) {
+					session_save_path(realpath($ns));
+		} else {
+					throw new TInvalidDataValueException('httpsession_savepath_invalid', $value);
+		}
 	}
 
 	/**
@@ -285,8 +292,9 @@ 
 	 */
 	public function getCookie()
 	{
-		if($this->_cookie === null)
-			$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
+		if($this->_cookie === null) {
+					$this->_cookie = new THttpCookie($this->getSessionName(), $this->getSessionID());
+		}
 		return $this->_cookie;
 	}
 
@@ -295,12 +303,13 @@ 
 	 */
 	public function getCookieMode()
 	{
-		if(ini_get('session.use_cookies') === '0')
-			return THttpSessionCookieMode::None;
-		elseif(ini_get('session.use_only_cookies') === '0')
-			return THttpSessionCookieMode::Allow;
-		else
-			return THttpSessionCookieMode::Only;
+		if(ini_get('session.use_cookies') === '0') {
+					return THttpSessionCookieMode::None;
+		} elseif(ini_get('session.use_only_cookies') === '0') {
+					return THttpSessionCookieMode::Allow;
+		} else {
+					return THttpSessionCookieMode::Only;
+		}
 	}
 
 	/**
@@ -309,22 +318,20 @@ 
 	 */
 	public function setCookieMode($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_cookiemode_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureEnum($value, 'Prado\\Web\\THttpSessionCookieMode');
 			if($value === THttpSessionCookieMode::None)
 	  {
 				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');
@@ -347,10 +354,11 @@ 
 	 */
 	public function setAutoStart($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('httpsession_autostart_unchangeable');
-		else
-			$this->_autoStart = TPropertyValue::ensureBoolean($value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('httpsession_autostart_unchangeable');
+		} else {
+					$this->_autoStart = TPropertyValue::ensureBoolean($value);
+		}
 	}
 
 	/**
@@ -368,18 +376,18 @@ 
 	 */
 	public function setGCProbability($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_gcprobability_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureInteger($value);
 			if($value >= 0 && $value <= 100)
 			{
 				ini_set('session.gc_probability', $value);
 				ini_set('session.gc_divisor', '100');
+			} else {
+							throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 			}
-			else
-				throw new TInvalidDataValueException('httpsession_gcprobability_invalid', $value);
 		}
 	}
 
@@ -400,13 +408,14 @@ 
 	 */
 	public function setUseTransparentSessionID($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_transid_unchangeable');
-		else
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_transid_unchangeable');
+		} else
 		{
 			$value = TPropertyValue::ensureBoolean($value);
-			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only)
-					throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			if ($value && $this->getCookieMode() == THttpSessionCookieMode::Only) {
+								throw new TInvalidOperationException('httpsession_transid_cookieonly');
+			}
 			ini_set('session.use_trans_sid', $value?'1':'0');
 		}
 	}
@@ -425,10 +434,11 @@ 
 	 */
 	public function setTimeout($value)
 	{
-		if($this->_started)
-			throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
-		else
-			ini_set('session.gc_maxlifetime', $value);
+		if($this->_started) {
+					throw new TInvalidOperationException('httpsession_maxlifetime_unchangeable');
+		} else {
+					ini_set('session.gc_maxlifetime', $value);
+		}
 	}
 
 	/**
@@ -570,9 +580,9 @@ 
 			$value = $_SESSION[$key];
 			unset($_SESSION[$key]);
 			return $value;
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -580,8 +590,9 @@ 
 	 */
 	public function clear()
 	{
-		foreach(array_keys($_SESSION) as $key)
-			unset($_SESSION[$key]);
+		foreach(array_keys($_SESSION) as $key) {
+					unset($_SESSION[$key]);
+		}
 	}
 
 	/**

framework/Web/TAssetManager.php

Spacing +43 added lines, -43 removed lines

@@ -89,12 +89,12 @@ 
 	public function init($config)
 	{
 		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
+		if ($this->_basePath === null)
+			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()).DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+		if (!is_writable($this->_basePath) || !is_dir($this->_basePath))
 			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if ($this->_baseUrl === null)
+			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->setAssetManager($this);
 		$this->_initialized = true;
 	}
@@ -115,12 +115,12 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
 		else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
+			if ($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
 				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
 		}
 	}
@@ -139,7 +139,7 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
 			$this->_baseUrl = rtrim($value, '/');
@@ -161,28 +161,28 @@ 
 	 */
 	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
+		if (isset($this->_published[$path]))
 			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
+		elseif (empty($path) || ($fullpath = realpath($path)) === false)
 			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
-		elseif(is_file($fullpath))
+		elseif (is_file($fullpath))
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dst = $this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if (!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 				$this->copyFile($fullpath, $dst);
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
+			return $this->_published[$path] = $this->_baseUrl.'/'.$dir.'/'.$fileName;
 		}
 		else
 		{
 			$dir = $this->hash($fullpath);
-			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			if (!is_dir($this->_basePath.DIRECTORY_SEPARATOR.$dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
 				Prado::trace("Publishing directory $fullpath", 'Prado\Web\TAssetManager');
-				$this->copyDirectory($fullpath, $this->_basePath . DIRECTORY_SEPARATOR . $dir);
+				$this->copyDirectory($fullpath, $this->_basePath.DIRECTORY_SEPARATOR.$dir);
 			}
-			return $this->_published[$path] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$path] = $this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -214,10 +214,10 @@ 
 	public function getPublishedPath($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+		if (is_file($path))
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash(dirname($path)).DIRECTORY_SEPARATOR.basename($path);
 		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+			return $this->_basePath.DIRECTORY_SEPARATOR.$this->hash($path);
 	}
 
 	/**
@@ -230,10 +230,10 @@ 
 	public function getPublishedUrl($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+		if (is_file($path))
+			return $this->_baseUrl.'/'.$this->hash(dirname($path)).'/'.basename($path);
 		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+			return $this->_baseUrl.'/'.$this->hash($path);
 	}
 
 	/**
@@ -244,7 +244,7 @@ 
 	 */
 	protected function hash($dir)
 	{
-		return sprintf('%x', crc32($dir . Prado::getVersion()));
+		return sprintf('%x', crc32($dir.Prado::getVersion()));
 	}
 
 	/**
@@ -256,13 +256,13 @@ 
 	 */
 	protected function copyFile($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		$dstFile = $dst . DIRECTORY_SEPARATOR . basename($src);
-		if(@filemtime($dstFile) < @filemtime($src))
+		$dstFile = $dst.DIRECTORY_SEPARATOR.basename($src);
+		if (@filemtime($dstFile) < @filemtime($src))
 		{
 			Prado::trace("Publishing file $src to $dstFile", 'Prado\Web\TAssetManager');
 			@copy($src, $dstFile);
@@ -279,27 +279,27 @@ 
 	 */
 	public function copyDirectory($src, $dst)
 	{
-		if(!is_dir($dst))
+		if (!is_dir($dst))
 		{
 			@mkdir($dst);
 			@chmod($dst, PRADO_CHMOD);
 		}
-		if($folder = @opendir($src))
+		if ($folder = @opendir($src))
 		{
-			while($file = @readdir($folder))
+			while ($file = @readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
+				if ($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
 					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				elseif (is_file($src.DIRECTORY_SEPARATOR.$file))
 				{
-					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
+					if (@filemtime($dst.DIRECTORY_SEPARATOR.$file) < @filemtime($src.DIRECTORY_SEPARATOR.$file))
 					{
-						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
-						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
+						@copy($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
+						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);
 					}
 				}
 				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
+					$this->copyDirectory($src.DIRECTORY_SEPARATOR.$file, $dst.DIRECTORY_SEPARATOR.$file);
 			}
 			closedir($folder);
 		} else {
@@ -320,24 +320,24 @@ 
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
+		if (isset($this->_published[$md5sum]))
 			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
+		elseif (($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
 			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
 		else
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
-			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
+			$dst = $this->_basePath.DIRECTORY_SEPARATOR.$dir;
+			if (!is_file($dst.DIRECTORY_SEPARATOR.$fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
 			{
-				if(@filemtime($dst . DIRECTORY_SEPARATOR . $fileName) < @filemtime($fullpath))
+				if (@filemtime($dst.DIRECTORY_SEPARATOR.$fileName) < @filemtime($fullpath))
 				{
 					$this->copyFile($fullpath, $dst);
 					$this->deployTarFile($tarfile, $dst);
 				}
 			}
-			return $this->_published[$md5sum] = $this->_baseUrl . '/' . $dir;
+			return $this->_published[$md5sum] = $this->_baseUrl.'/'.$dir;
 		}
 	}
 
@@ -350,7 +350,7 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
+		if (($fullpath = realpath($path)) === false || !is_file($fullpath))
 			throw new TIOException('assetmanager_tarfile_invalid', $path);
 		else
 		{

Braces +52 added lines, -45 removed lines

@@ -89,12 +89,15 @@ 
 	public function init($config)
 	{
 		$application = $this->getApplication();
-		if($this->_basePath === null)
-			$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
-			throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
-		if($this->_baseUrl === null)
-			$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		if($this->_basePath === null) {
+					$this->_basePath = dirname($application->getRequest()->getApplicationFilePath()) . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
+		}
+		if(!is_writable($this->_basePath) || !is_dir($this->_basePath)) {
+					throw new TConfigurationException('assetmanager_basepath_invalid', $this->_basePath);
+		}
+		if($this->_baseUrl === null) {
+					$this->_baseUrl = rtrim(dirname($application->getRequest()->getApplicationUrl()), '/\\') . '/' . self::DEFAULT_BASEPATH;
+		}
 		$application->setAssetManager($this);
 		$this->_initialized = true;
 	}
@@ -115,13 +118,14 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
-		else
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_basepath_unchangeable');
+		} else
 		{
 			$this->_basePath = Prado::getPathOfNamespace($value);
-			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath))
-				throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
+			if($this->_basePath === null || !is_dir($this->_basePath) || !is_writable($this->_basePath)) {
+							throw new TInvalidDataValueException('assetmanager_basepath_invalid', $value);
+			}
 		}
 	}
 
@@ -139,10 +143,11 @@ 
 	 */
 	public function setBaseUrl($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
-		else
-			$this->_baseUrl = rtrim($value, '/');
+		if($this->_initialized) {
+					throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
+		} else {
+					$this->_baseUrl = rtrim($value, '/');
+		}
 	}
 
 	/**
@@ -161,20 +166,20 @@ 
 	 */
 	public function publishFilePath($path, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$path]))
-			return $this->_published[$path];
-		elseif(empty($path) || ($fullpath = realpath($path)) === false)
-			throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
-		elseif(is_file($fullpath))
+		if(isset($this->_published[$path])) {
+					return $this->_published[$path];
+		} elseif(empty($path) || ($fullpath = realpath($path)) === false) {
+					throw new TInvalidDataValueException('assetmanager_filepath_invalid', $path);
+		} elseif(is_file($fullpath))
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
 			$dst = $this->_basePath . DIRECTORY_SEPARATOR . $dir;
-			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
-				$this->copyFile($fullpath, $dst);
+			if(!is_file($dst . DIRECTORY_SEPARATOR . $fileName) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance) {
+							$this->copyFile($fullpath, $dst);
+			}
 			return $this->_published[$path] = $this->_baseUrl . '/' . $dir . '/' . $fileName;
-		}
-		else
+		} else
 		{
 			$dir = $this->hash($fullpath);
 			if(!is_dir($this->_basePath . DIRECTORY_SEPARATOR . $dir) || $checkTimestamp || $this->getApplication()->getMode() !== TApplicationMode::Performance)
@@ -214,10 +219,11 @@ 
 	public function getPublishedPath($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
-		else
-			return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+		if(is_file($path)) {
+					return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash(dirname($path)) . DIRECTORY_SEPARATOR . basename($path);
+		} else {
+					return $this->_basePath . DIRECTORY_SEPARATOR . $this->hash($path);
+		}
 	}
 
 	/**
@@ -230,10 +236,11 @@ 
 	public function getPublishedUrl($path)
 	{
 		$path = realpath($path);
-		if(is_file($path))
-			return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
-		else
-			return $this->_baseUrl . '/' . $this->hash($path);
+		if(is_file($path)) {
+					return $this->_baseUrl . '/' . $this->hash(dirname($path)) . '/' . basename($path);
+		} else {
+					return $this->_baseUrl . '/' . $this->hash($path);
+		}
 	}
 
 	/**
@@ -288,18 +295,18 @@ 
 		{
 			while($file = @readdir($folder))
 			{
-				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git')
-					continue;
-				elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
+				if($file === '.' || $file === '..' || $file === '.svn' || $file === '.git') {
+									continue;
+				} elseif(is_file($src . DIRECTORY_SEPARATOR . $file))
 				{
 					if(@filemtime($dst . DIRECTORY_SEPARATOR . $file) < @filemtime($src . DIRECTORY_SEPARATOR . $file))
 					{
 						@copy($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 						@chmod($dst . DIRECTORY_SEPARATOR . $file, PRADO_CHMOD);
 					}
+				} else {
+									$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 				}
-				else
-					$this->copyDirectory($src . DIRECTORY_SEPARATOR . $file, $dst . DIRECTORY_SEPARATOR . $file);
 			}
 			closedir($folder);
 		} else {
@@ -320,11 +327,11 @@ 
 	 */
 	public function publishTarFile($tarfile, $md5sum, $checkTimestamp = false)
 	{
-		if(isset($this->_published[$md5sum]))
-			return $this->_published[$md5sum];
-		elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath))
-			throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
-		else
+		if(isset($this->_published[$md5sum])) {
+					return $this->_published[$md5sum];
+		} elseif(($fullpath = realpath($md5sum)) === false || !is_file($fullpath)) {
+					throw new TInvalidDataValueException('assetmanager_tarchecksum_invalid', $md5sum);
+		} else
 		{
 			$dir = $this->hash(dirname($fullpath));
 			$fileName = basename($fullpath);
@@ -350,9 +357,9 @@ 
 	 */
 	protected function deployTarFile($path, $destination)
 	{
-		if(($fullpath = realpath($path)) === false || !is_file($fullpath))
-			throw new TIOException('assetmanager_tarfile_invalid', $path);
-		else
+		if(($fullpath = realpath($path)) === false || !is_file($fullpath)) {
+					throw new TIOException('assetmanager_tarfile_invalid', $path);
+		} else
 		{
 			$tar = new TTarFileExtractor($fullpath);
 			return $tar->extract($destination);

framework/Caching/TEtcdCache.php

Spacing +5 added lines, -5 removed lines

@@ -139,7 +139,7 @@ 
 	 */
 	protected function getValue($key)
 	{
-		$result = $this->request('GET', $this->_dir . '/' . $key);
+		$result = $this->request('GET', $this->_dir.'/'.$key);
 	return property_exists($result, 'errorCode') ? false : unserialize($result->node->value);
 	}
 
@@ -156,7 +156,7 @@ 
 	{
 	$value = ['value' => serialize($value)];
 	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+		$result = $this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -173,7 +173,7 @@ 
 	{
 	$value = ['value' => serialize($value), 'prevExist' => 'false'];
 	if ($expire > 0) $value['ttl'] = $expire;
-		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
+		$result = $this->request('PUT', $this->_dir.'/'.$key, $value);
 	return !property_exists($result, 'errorCode');
 	}
 
@@ -185,7 +185,7 @@ 
 	 */
 	protected function deleteValue($key)
 	{
-		$this->request('DELETE', $this->_dir . '/' . $key);
+		$this->request('DELETE', $this->_dir.'/'.$key);
 	return true;
 	}
 
@@ -195,7 +195,7 @@ 
 	 */
 	public function flush()
 	{
-	 $this->request('DELETE', $this->_dir . '?recursive=true');
+	 $this->request('DELETE', $this->_dir.'?recursive=true');
 	}
   
   /**

Braces +9 added lines, -3 removed lines

@@ -79,7 +79,9 @@ 
     */
 	public function init($config)
 	{
-		if (!function_exists('curl_version')) throw new TConfigurationException('curl_extension_required');
+		if (!function_exists('curl_version')) {
+			throw new TConfigurationException('curl_extension_required');
+		}
 		parent::init($config);
 	}
   
@@ -155,7 +157,9 @@ 
 	protected function setValue($key, $value, $expire)
 	{
 	$value = ['value' => serialize($value)];
-	if ($expire > 0) $value['ttl'] = $expire;
+	if ($expire > 0) {
+		$value['ttl'] = $expire;
+	}
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
 	return !property_exists($result, 'errorCode');
 	}
@@ -172,7 +176,9 @@ 
 	protected function addValue($key, $value, $expire)
 	{
 	$value = ['value' => serialize($value), 'prevExist' => 'false'];
-	if ($expire > 0) $value['ttl'] = $expire;
+	if ($expire > 0) {
+		$value['ttl'] = $expire;
+	}
 		$result = $this->request('PUT', $this->_dir . '/' . $key, $value);
 	return !property_exists($result, 'errorCode');
 	}