pradosoft / prado

framework/Wsat/pages/TWsatScaffolding.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 								{
 										$id = "cb_$tableName";
 										$obj = $this->tableNames->findControl($id);
-										if($obj !== null && $obj->Checked)
+										if ($obj !== null && $obj->Checked)
 										{
 												$scf_generator->generateCRUD($tableName);
 										}

framework/TApplicationComponent.php

Spacing +2 added lines, -2 removed lines

@@ -98,10 +98,10 @@
 	 */
 	public function publishAsset($assetPath, $className = null)
 	{
-		if($className === null)
+		if ($className === null)
 			$className = get_class($this);
 		$class = new \ReflectionClass($className);
-		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
+		$fullPath = dirname($class->getFileName()).DIRECTORY_SEPARATOR.$assetPath;
 		return $this->publishFilePath($fullPath);
 	}
 

Braces +3 added lines, -2 removed lines

@@ -98,8 +98,9 @@
 	 */
 	public function publishAsset($assetPath, $className = null)
 	{
-		if($className === null)
-			$className = get_class($this);
+		if($className === null) {
+					$className = get_class($this);
+		}
 		$class = new \ReflectionClass($className);
 		$fullPath = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . $assetPath;
 		return $this->publishFilePath($fullPath);

framework/TApplicationConfiguration.php

Spacing +64 added lines, -64 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
@@ -95,28 +95,28 @@ 
 	public function loadFromPhp($config, $configPath)
 	{
 		// application properties
-		if(isset($config['application']))
+		if (isset($config['application']))
 		{
-			foreach($config['application'] as $name => $value)
+			foreach ($config['application'] as $name => $value)
 			{
 				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
+		if (isset($config['paths']) && is_array($config['paths']))
 			$this->loadPathsPhp($config['paths'], $configPath);
 
-		if(isset($config['modules']) && is_array($config['modules']))
+		if (isset($config['modules']) && is_array($config['modules']))
 			$this->loadModulesPhp($config['modules'], $configPath);
 
-		if(isset($config['services']) && is_array($config['services']))
+		if (isset($config['services']) && is_array($config['services']))
 			$this->loadServicesPhp($config['services'], $configPath);
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
+		if (isset($config['parameters']) && is_array($config['parameters']))
 			$this->loadParametersPhp($config['parameters'], $configPath);
 
-		if(isset($config['includes']) && is_array($config['includes']))
+		if (isset($config['includes']) && is_array($config['includes']))
 			$this->loadExternalXml($config['includes'], $configPath);
 	}
 
@@ -128,15 +128,15 @@ 
 	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
-		foreach($dom->getAttributes() as $name => $value)
+		foreach ($dom->getAttributes() as $name => $value)
 		{
 			$this->_properties[$name] = $value;
 			$this->_empty = false;
 		}
 
-		foreach($dom->getElements() as $element)
+		foreach ($dom->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'paths':
 					$this->loadPathsXml($element, $configPath);
@@ -167,26 +167,26 @@ 
 	 */
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
+		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases']))
 		{
-			foreach($pathsNode['aliases'] as $id => $path)
+			foreach ($pathsNode['aliases'] as $id => $path)
 			{
 				$path = str_replace('\\', '/', $path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 					$p = realpath($path);
 				else
-					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-				if($p === false || !is_dir($p))
+					$p = realpath($configPath.DIRECTORY_SEPARATOR.$path);
+				if ($p === false || !is_dir($p))
 					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-				if(isset($this->_aliases[$id]))
+				if (isset($this->_aliases[$id]))
 					throw new TConfigurationException('appconfig_alias_redefined', $id);
 				$this->_aliases[$id] = $p;
 			}
 		}
 
-		if(isset($pathsNode['using']) && is_array($pathsNode['using']))
+		if (isset($pathsNode['using']) && is_array($pathsNode['using']))
 		{
-			foreach($pathsNode['using'] as $namespace)
+			foreach ($pathsNode['using'] as $namespace)
 			{
 				$this->_usings[] = $namespace;
 			}
@@ -200,22 +200,22 @@ 
 	 */
 	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach($pathsNode->getElements() as $element)
+		foreach ($pathsNode->getElements() as $element)
 		{
-			switch($element->getTagName())
+			switch ($element->getTagName())
 			{
 				case 'alias':
 				{
-					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
+					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
 						$path = str_replace('\\', '/', $path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
 							$p = realpath($path);
 						else
-							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-						if($p === false || !is_dir($p))
+							$p = realpath($configPath.DIRECTORY_SEPARATOR.$path);
+						if ($p === false || !is_dir($p))
 							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-						if(isset($this->_aliases[$id]))
+						if (isset($this->_aliases[$id]))
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						$this->_aliases[$id] = $p;
 					}
@@ -226,7 +226,7 @@ 
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
+					if (($namespace = $element->getAttribute('namespace')) !== null)
 						$this->_usings[] = $namespace;
 					else
 						throw new TConfigurationException('appconfig_using_invalid');
@@ -246,20 +246,20 @@ 
 	 */
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach($modulesNode as $id => $module)
+		foreach ($modulesNode as $id => $module)
 		{
-			if(!isset($module['class']))
+			if (!isset($module['class']))
 				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = [];
-			if(isset($module['properties']))
+			if (isset($module['properties']))
 			{
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
+			$this->_modules[$id] = [$type, $properties, $module];
 			$this->_empty = false;
 		}
 	}
@@ -271,20 +271,20 @@ 
 	 */
 	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach($modulesNode->getElements() as $element)
+		foreach ($modulesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'module')
+			if ($element->getTagName() === 'module')
 			{
 				$properties = $element->getAttributes();
 				$id = $properties->itemAt('id');
 				$type = $properties->remove('class');
-				if($type === null)
+				if ($type === null)
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+				if ($id === null)
+					$this->_modules[] = [$type, $properties->toArray(), $element];
 				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+					$this->_modules[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -299,15 +299,15 @@ 
 	 */
 	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach($servicesNode as $id => $service)
+		foreach ($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
+			if (!isset($service['class']))
 				throw new TConfigurationException('appconfig_servicetype_required');
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
+			$this->_services[$id] = [$type, $properties, $service];
 			$this->_empty = false;
 		}
 	}
@@ -319,17 +319,17 @@ 
 	 */
 	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach($servicesNode->getElements() as $element)
+		foreach ($servicesNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'service')
+			if ($element->getTagName() === 'service')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
+				if (($id = $properties->itemAt('id')) === null)
 					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
+				if (($type = $properties->remove('class')) === null)
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
+				$this->_services[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			}
 			else
@@ -344,17 +344,17 @@ 
 	 */
 	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach($parametersNode as $id => $parameter)
+		foreach ($parametersNode as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
-				if(isset($parameter['class']))
+				if (isset($parameter['class']))
 				{
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : [];
 					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$this->_parameters[$id] = [$type, $properties];
 				}
 			}
 			else
@@ -371,22 +371,22 @@ 
 	 */
 	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach($parametersNode->getElements() as $element)
+		foreach ($parametersNode->getElements() as $element)
 		{
-			if($element->getTagName() === 'parameter')
+			if ($element->getTagName() === 'parameter')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('appconfig_parameterid_required');
-				if(($type = $properties->remove('class')) === null)
+				if (($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
+					if (($value = $properties->remove('value')) === null)
 						$this->_parameters[$id] = $element;
 					else
 						$this->_parameters[$id] = $value;
 				}
 				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
+					$this->_parameters[$id] = [$type, $properties->toArray()];
 				$this->_empty = false;
 			}
 			else
@@ -401,14 +401,14 @@ 
 	 */
 	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach($includeNode as $include)
+		foreach ($includeNode as $include)
 		{
-			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
+			$when = isset($include['when']) ?true:false;
+			if (!isset($include['file']))
 				throw new TConfigurationException('appconfig_includefile_required');
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = '('.$this->_includes[$filePath].') || ('.$when.')';
 			else
 				$$this->_includes[$filePath] = $when;
 			$this->_empty = false;
@@ -422,12 +422,12 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
+		if (($when = $includeNode->getAttribute('when')) === null)
 			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
+		if (($filePath = $includeNode->getAttribute('file')) === null)
 			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+		if (isset($this->_includes[$filePath]))
+			$this->_includes[$filePath] = '('.$this->_includes[$filePath].') || ('.$when.')';
 		else
 			$this->_includes[$filePath] = $when;
 		$this->_empty = false;

Braces +101 added lines, -76 removed lines

@@ -70,8 +70,7 @@ 
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
 			$dom->loadFromFile($fname);
@@ -104,20 +103,25 @@ 
 			$this->_empty = false;
 		}
 
-		if(isset($config['paths']) && is_array($config['paths']))
-			$this->loadPathsPhp($config['paths'], $configPath);
+		if(isset($config['paths']) && is_array($config['paths'])) {
+					$this->loadPathsPhp($config['paths'], $configPath);
+		}
 
-		if(isset($config['modules']) && is_array($config['modules']))
-			$this->loadModulesPhp($config['modules'], $configPath);
+		if(isset($config['modules']) && is_array($config['modules'])) {
+					$this->loadModulesPhp($config['modules'], $configPath);
+		}
 
-		if(isset($config['services']) && is_array($config['services']))
-			$this->loadServicesPhp($config['services'], $configPath);
+		if(isset($config['services']) && is_array($config['services'])) {
+					$this->loadServicesPhp($config['services'], $configPath);
+		}
 
-		if(isset($config['parameters']) && is_array($config['parameters']))
-			$this->loadParametersPhp($config['parameters'], $configPath);
+		if(isset($config['parameters']) && is_array($config['parameters'])) {
+					$this->loadParametersPhp($config['parameters'], $configPath);
+		}
 
-		if(isset($config['includes']) && is_array($config['includes']))
-			$this->loadExternalXml($config['includes'], $configPath);
+		if(isset($config['includes']) && is_array($config['includes'])) {
+					$this->loadExternalXml($config['includes'], $configPath);
+		}
 	}
 
 	/**
@@ -172,14 +176,18 @@ 
 			foreach($pathsNode['aliases'] as $id => $path)
 			{
 				$path = str_replace('\\', '/', $path);
-				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {
+					// if absolute path
 					$p = realpath($path);
-				else
-					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-				if($p === false || !is_dir($p))
-					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-				if(isset($this->_aliases[$id]))
-					throw new TConfigurationException('appconfig_alias_redefined', $id);
+				} else {
+									$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+				}
+				if($p === false || !is_dir($p)) {
+									throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+				}
+				if(isset($this->_aliases[$id])) {
+									throw new TConfigurationException('appconfig_alias_redefined', $id);
+				}
 				$this->_aliases[$id] = $p;
 			}
 		}
@@ -209,27 +217,32 @@ 
 					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null)
 					{
 						$path = str_replace('\\', '/', $path);
-						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path))	// if absolute path
+						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {
+							// if absolute path
 							$p = realpath($path);
-						else
-							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
-						if($p === false || !is_dir($p))
-							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
-						if(isset($this->_aliases[$id]))
-							throw new TConfigurationException('appconfig_alias_redefined', $id);
+						} else {
+													$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
+						}
+						if($p === false || !is_dir($p)) {
+													throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
+						}
+						if(isset($this->_aliases[$id])) {
+													throw new TConfigurationException('appconfig_alias_redefined', $id);
+						}
 						$this->_aliases[$id] = $p;
+					} else {
+											throw new TConfigurationException('appconfig_alias_invalid');
 					}
-					else
-						throw new TConfigurationException('appconfig_alias_invalid');
 					$this->_empty = false;
 					break;
 				}
 				case 'using':
 				{
-					if(($namespace = $element->getAttribute('namespace')) !== null)
-						$this->_usings[] = $namespace;
-					else
-						throw new TConfigurationException('appconfig_using_invalid');
+					if(($namespace = $element->getAttribute('namespace')) !== null) {
+											$this->_usings[] = $namespace;
+					} else {
+											throw new TConfigurationException('appconfig_using_invalid');
+					}
 					$this->_empty = false;
 					break;
 				}
@@ -248,8 +261,9 @@ 
 	{
 		foreach($modulesNode as $id => $module)
 		{
-			if(!isset($module['class']))
-				throw new TConfigurationException('appconfig_moduletype_required', $id);
+			if(!isset($module['class'])) {
+							throw new TConfigurationException('appconfig_moduletype_required', $id);
+			}
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = [];
@@ -278,17 +292,19 @@ 
 				$properties = $element->getAttributes();
 				$id = $properties->itemAt('id');
 				$type = $properties->remove('class');
-				if($type === null)
-					throw new TConfigurationException('appconfig_moduletype_required', $id);
+				if($type === null) {
+									throw new TConfigurationException('appconfig_moduletype_required', $id);
+				}
 				$element->setParent(null);
-				if($id === null)
-					$this->_modules[] = [$type,$properties->toArray(),$element];
-				else
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+				if($id === null) {
+									$this->_modules[] = [$type,$properties->toArray(),$element];
+				} else {
+									$this->_modules[$id] = [$type,$properties->toArray(),$element];
+				}
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_modules_invalid', $element->getTagName());
 		}
 	}
 
@@ -301,8 +317,9 @@ 
 	{
 		foreach($servicesNode as $id => $service)
 		{
-			if(!isset($service['class']))
-				throw new TConfigurationException('appconfig_servicetype_required');
+			if(!isset($service['class'])) {
+							throw new TConfigurationException('appconfig_servicetype_required');
+			}
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
@@ -324,16 +341,18 @@ 
 			if($element->getTagName() === 'service')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->itemAt('id')) === null)
-					throw new TConfigurationException('appconfig_serviceid_required');
-				if(($type = $properties->remove('class')) === null)
-					throw new TConfigurationException('appconfig_servicetype_required', $id);
+				if(($id = $properties->itemAt('id')) === null) {
+									throw new TConfigurationException('appconfig_serviceid_required');
+				}
+				if(($type = $properties->remove('class')) === null) {
+									throw new TConfigurationException('appconfig_servicetype_required', $id);
+				}
 				$element->setParent(null);
 				$this->_services[$id] = [$type,$properties->toArray(),$element];
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
 		}
 	}
 
@@ -356,8 +375,7 @@ 
 					$properties['id'] = $id;
 					$this->_parameters[$id] = [$type,$properties];
 				}
-			}
-			else
+			} else
 			{
 				$this->_parameters[$id] = $parameter;
 			}
@@ -376,21 +394,23 @@ 
 			if($element->getTagName() === 'parameter')
 			{
 				$properties = $element->getAttributes();
-				if(($id = $properties->remove('id')) === null)
-					throw new TConfigurationException('appconfig_parameterid_required');
+				if(($id = $properties->remove('id')) === null) {
+									throw new TConfigurationException('appconfig_parameterid_required');
+				}
 				if(($type = $properties->remove('class')) === null)
 				{
-					if(($value = $properties->remove('value')) === null)
-						$this->_parameters[$id] = $element;
-					else
-						$this->_parameters[$id] = $value;
+					if(($value = $properties->remove('value')) === null) {
+											$this->_parameters[$id] = $element;
+					} else {
+											$this->_parameters[$id] = $value;
+					}
+				} else {
+									$this->_parameters[$id] = [$type,$properties->toArray()];
 				}
-				else
-					$this->_parameters[$id] = [$type,$properties->toArray()];
 				$this->_empty = false;
+			} else {
+							throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 			}
-			else
-				throw new TConfigurationException('appconfig_parameters_invalid', $element->getTagName());
 		}
 	}
 
@@ -404,13 +424,15 @@ 
 		foreach($includeNode as $include)
 		{
 			$when = isset($include['when'])?true:false;
-			if(!isset($include['file']))
-				throw new TConfigurationException('appconfig_includefile_required');
+			if(!isset($include['file'])) {
+							throw new TConfigurationException('appconfig_includefile_required');
+			}
 			$filePath = $include['file'];
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
-			else
-				$$this->_includes[$filePath] = $when;
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+			} else {
+							$$this->_includes[$filePath] = $when;
+			}
 			$this->_empty = false;
 		}
 	}
@@ -422,14 +444,17 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if(($when = $includeNode->getAttribute('when')) === null)
-			$when = true;
-		if(($filePath = $includeNode->getAttribute('file')) === null)
-			throw new TConfigurationException('appconfig_includefile_required');
-		if(isset($this->_includes[$filePath]))
-			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
-		else
-			$this->_includes[$filePath] = $when;
+		if(($when = $includeNode->getAttribute('when')) === null) {
+					$when = true;
+		}
+		if(($filePath = $includeNode->getAttribute('file')) === null) {
+					throw new TConfigurationException('appconfig_includefile_required');
+		}
+		if(isset($this->_includes[$filePath])) {
+					$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
+		} else {
+					$this->_includes[$filePath] = $when;
+		}
 		$this->_empty = false;
 	}
 

framework/Web/TSessionIterator.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	public function current()
 	{
-		return isset($_SESSION[$this->_key])?$_SESSION[$this->_key]:null;
+		return isset($_SESSION[$this->_key]) ? $_SESSION[$this->_key] : null;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 		{
 			$this->_key = next($this->_keys);
 		}
-		while(!isset($_SESSION[$this->_key]) && $this->_key !== false);
+		while (!isset($_SESSION[$this->_key]) && $this->_key !== false);
 	}
 
 	/**

framework/Web/Services/TFeedService.php

Spacing +13 added lines, -13 removed lines

@@ -73,19 +73,19 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(is_array($config))
+			if (is_array($config))
 			{
-				foreach($config as $id => $feed)
+				foreach ($config as $id => $feed)
 					$this->_feeds[$id] = $feed;
 			}
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('feed') as $feed)
+			foreach ($config->getElementsByTagName('feed') as $feed)
 			{
-				if(($id = $feed->getAttributes()->remove('id')) !== null)
+				if (($id = $feed->getAttributes()->remove('id')) !== null)
 					$this->_feeds[$id] = $feed;
 				else
 					throw new TConfigurationException('feedservice_id_required');
@@ -108,18 +108,18 @@ 
 	public function run()
 	{
 		$id = $this->getRequest()->getServiceParameter();
-		if(isset($this->_feeds[$id]))
+		if (isset($this->_feeds[$id]))
 		{
 			$feedConfig = $this->_feeds[$id];
 			$properties = [];
 			$feed = null;
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
-				if(isset($feedConfig['class']))
+				if (isset($feedConfig['class']))
 				{
 					$feed = Prado::createComponent($feedConfig['class']);
-					if($service instanceof IFeedContentProvider)
-						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
+					if ($service instanceof IFeedContentProvider)
+						$properties = isset($feedConfig['properties']) ? $feedConfig['properties'] : [];
 					else
 						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
 				}
@@ -129,10 +129,10 @@ 
 			else
 			{
 				$properties = $feedConfig->getAttributes();
-				if(($class = $properties->remove('class')) !== null)
+				if (($class = $properties->remove('class')) !== null)
 				{
 					$feed = Prado::createComponent($class);
-					if(!($feed instanceof IFeedContentProvider))
+					if (!($feed instanceof IFeedContentProvider))
 						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
 				}
 				else
@@ -140,7 +140,7 @@ 
 			}
 
 			// init feed properties
-			foreach($properties as $name => $value)
+			foreach ($properties as $name => $value)
 				$feed->setSubproperty($name, $value);
 			$feed->init($feedConfig);
 

Braces +27 added lines, -24 removed lines

@@ -77,18 +77,19 @@ 
 		{
 			if(is_array($config))
 			{
-				foreach($config as $id => $feed)
-					$this->_feeds[$id] = $feed;
+				foreach($config as $id => $feed) {
+									$this->_feeds[$id] = $feed;
+				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('feed') as $feed)
 			{
-				if(($id = $feed->getAttributes()->remove('id')) !== null)
-					$this->_feeds[$id] = $feed;
-				else
-					throw new TConfigurationException('feedservice_id_required');
+				if(($id = $feed->getAttributes()->remove('id')) !== null) {
+									$this->_feeds[$id] = $feed;
+				} else {
+									throw new TConfigurationException('feedservice_id_required');
+				}
 			}
 		}
 	}
@@ -118,38 +119,40 @@ 
 				if(isset($feedConfig['class']))
 				{
 					$feed = Prado::createComponent($feedConfig['class']);
-					if($service instanceof IFeedContentProvider)
-						$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
-					else
-						throw new TConfigurationException('jsonservice_response_type_invalid', $id);
+					if($service instanceof IFeedContentProvider) {
+											$properties = isset($feedConfig['properties'])?$feedConfig['properties']:[];
+					} else {
+											throw new TConfigurationException('jsonservice_response_type_invalid', $id);
+					}
+				} else {
+									throw new TConfigurationException('jsonservice_class_required', $id);
 				}
-				else
-					throw new TConfigurationException('jsonservice_class_required', $id);
-			}
-			else
+			} else
 			{
 				$properties = $feedConfig->getAttributes();
 				if(($class = $properties->remove('class')) !== null)
 				{
 					$feed = Prado::createComponent($class);
-					if(!($feed instanceof IFeedContentProvider))
-						throw new TConfigurationException('feedservice_feedtype_invalid', $id);
+					if(!($feed instanceof IFeedContentProvider)) {
+											throw new TConfigurationException('feedservice_feedtype_invalid', $id);
+					}
+				} else {
+									throw new TConfigurationException('feedservice_class_required', $id);
 				}
-				else
-					throw new TConfigurationException('feedservice_class_required', $id);
 			}
 
 			// init feed properties
-			foreach($properties as $name => $value)
-				$feed->setSubproperty($name, $value);
+			foreach($properties as $name => $value) {
+							$feed->setSubproperty($name, $value);
+			}
 			$feed->init($feedConfig);
 
 			$content = $feed->getFeedContent();
 			//$this->getResponse()->setContentType('application/rss+xml');
 			$this->getResponse()->setContentType($feed->getContentType());
 			$this->getResponse()->write($content);
+		} else {
+					throw new THttpException(404, 'feedservice_feed_unknown', $id);
 		}
-		else
-			throw new THttpException(404, 'feedservice_feed_unknown', $id);
 	}
 }
\ No newline at end of file

framework/Web/Services/TSoapService.php

Spacing +20 added lines, -20 removed lines

@@ -119,9 +119,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_configFile !== null)
+		if ($this->_configFile !== null)
 		{
-			if(is_file($this->_configFile))
+			if (is_file($this->_configFile))
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
@@ -145,7 +145,7 @@ 
 	protected function resolveRequest()
 	{
 		$serverID = $this->getRequest()->getServiceParameter();
-		if(($pos = strrpos($serverID, '.wsdl')) === strlen($serverID) - 5)
+		if (($pos = strrpos($serverID, '.wsdl')) === strlen($serverID) - 5)
 		{
 			$serverID = substr($serverID, 0, $pos);
 			$this->_wsdlRequest = true;
@@ -153,7 +153,7 @@ 
 		else
 			$this->_wsdlRequest = false;
 		$this->_serverID = $serverID;
-		if(!isset($this->_servers[$serverID]))
+		if (!isset($this->_servers[$serverID]))
 			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
 	}
 
@@ -164,14 +164,14 @@ 
 	 */
 	private function loadConfig($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
-			if(is_array($config))
+			if (is_array($config))
 			{
-				foreach($config['soap'] as $id => $server)
+				foreach ($config['soap'] as $id => $server)
 				{
-					$properties = isset($server['properties'])?$server['properties']:[];
-					if(isset($this->_servers[$id]))
+					$properties = isset($server['properties']) ? $server['properties'] : [];
+					if (isset($this->_servers[$id]))
 						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 					$this->_servers[$id] = $properties;
 				}
@@ -179,12 +179,12 @@ 
 		}
 		else
 		{
-			foreach($config->getElementsByTagName('soap') as $serverXML)
+			foreach ($config->getElementsByTagName('soap') as $serverXML)
 			{
 				$properties = $serverXML->getAttributes();
-				if(($id = $properties->remove('id')) === null)
+				if (($id = $properties->remove('id')) === null)
 					throw new TConfigurationException('soapservice_serverid_required');
-				if(isset($this->_servers[$id]))
+				if (isset($this->_servers[$id]))
 					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
 				$this->_servers[$id] = $properties;
 			}
@@ -206,7 +206,7 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null)
+		if (($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null)
 			throw new TConfigurationException('soapservice_configfile_invalid', $value);
 	}
 
@@ -249,19 +249,19 @@ 
 	{
 		$properties = $this->_servers[$this->_serverID];
 		$serverClass = null;
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class']))
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class']))
 			$serverClass = $config['class'];
-		elseif($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML)
+		elseif ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML)
 			$serverClass = $properties->remove('class');
-		if($serverClass === null)
+		if ($serverClass === null)
 			$serverClass = self::DEFAULT_SOAP_SERVER;
 		Prado::using($serverClass);
-		$className = ($pos = strrpos($serverClass, '.')) !== false?substr($serverClass, $pos + 1):$serverClass;
-		if($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
+		$className = ($pos = strrpos($serverClass, '.')) !== false ?substr($serverClass, $pos + 1) : $serverClass;
+		if ($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
 			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
 		$server = new $className;
 		$server->setID($this->_serverID);
-		foreach($properties as $name => $value)
+		foreach ($properties as $name => $value)
 			$server->setSubproperty($name, $value);
 		return $server;
 	}
@@ -278,7 +278,7 @@ 
 		$server = $this->createServer();
 		$this->getResponse()->setContentType('text/xml');
 		$this->getResponse()->setCharset($server->getEncoding());
-		if($this->getIsWsdlRequest())
+		if ($this->getIsWsdlRequest())
 		{
 			// server WSDL file
 			Prado::trace("Generating WSDL", 'Prado\Web\Services\TSoapService');

Braces +35 added lines, -28 removed lines

@@ -126,9 +126,9 @@ 
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_configFile);
 				$this->loadConfig($dom);
+			} else {
+							throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 			}
-			else
-				throw new TConfigurationException('soapservice_configfile_invalid', $this->_configFile);
 		}
 		$this->loadConfig($config);
 
@@ -149,12 +149,13 @@ 
 		{
 			$serverID = substr($serverID, 0, $pos);
 			$this->_wsdlRequest = true;
+		} else {
+					$this->_wsdlRequest = false;
 		}
-		else
-			$this->_wsdlRequest = false;
 		$this->_serverID = $serverID;
-		if(!isset($this->_servers[$serverID]))
-			throw new THttpException(400, 'soapservice_request_invalid', $serverID);
+		if(!isset($this->_servers[$serverID])) {
+					throw new THttpException(400, 'soapservice_request_invalid', $serverID);
+		}
 	}
 
 	/**
@@ -171,21 +172,23 @@ 
 				foreach($config['soap'] as $id => $server)
 				{
 					$properties = isset($server['properties'])?$server['properties']:[];
-					if(isset($this->_servers[$id]))
-						throw new TConfigurationException('soapservice_serverid_duplicated', $id);
+					if(isset($this->_servers[$id])) {
+											throw new TConfigurationException('soapservice_serverid_duplicated', $id);
+					}
 					$this->_servers[$id] = $properties;
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('soap') as $serverXML)
 			{
 				$properties = $serverXML->getAttributes();
-				if(($id = $properties->remove('id')) === null)
-					throw new TConfigurationException('soapservice_serverid_required');
-				if(isset($this->_servers[$id]))
-					throw new TConfigurationException('soapservice_serverid_duplicated', $id);
+				if(($id = $properties->remove('id')) === null) {
+									throw new TConfigurationException('soapservice_serverid_required');
+				}
+				if(isset($this->_servers[$id])) {
+									throw new TConfigurationException('soapservice_serverid_duplicated', $id);
+				}
 				$this->_servers[$id] = $properties;
 			}
 		}
@@ -206,8 +209,9 @@ 
 	 */
 	public function setConfigFile($value)
 	{
-		if(($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null)
-			throw new TConfigurationException('soapservice_configfile_invalid', $value);
+		if(($this->_configFile = Prado::getPathOfNamespace($value, Prado::getApplication()->getConfigurationFileExt())) === null) {
+					throw new TConfigurationException('soapservice_configfile_invalid', $value);
+		}
 	}
 
 	/**
@@ -249,20 +253,24 @@ 
 	{
 		$properties = $this->_servers[$this->_serverID];
 		$serverClass = null;
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class']))
-			$serverClass = $config['class'];
-		elseif($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML)
-			$serverClass = $properties->remove('class');
-		if($serverClass === null)
-			$serverClass = self::DEFAULT_SOAP_SERVER;
+		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP && isset($config['class'])) {
+					$serverClass = $config['class'];
+		} elseif($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_XML) {
+					$serverClass = $properties->remove('class');
+		}
+		if($serverClass === null) {
+					$serverClass = self::DEFAULT_SOAP_SERVER;
+		}
 		Prado::using($serverClass);
 		$className = ($pos = strrpos($serverClass, '.')) !== false?substr($serverClass, $pos + 1):$serverClass;
-		if($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER))
-			throw new TConfigurationException('soapservice_server_invalid', $serverClass);
+		if($className !== self::DEFAULT_SOAP_SERVER && !is_subclass_of($className, self::DEFAULT_SOAP_SERVER)) {
+					throw new TConfigurationException('soapservice_server_invalid', $serverClass);
+		}
 		$server = new $className;
 		$server->setID($this->_serverID);
-		foreach($properties as $name => $value)
-			$server->setSubproperty($name, $value);
+		foreach($properties as $name => $value) {
+					$server->setSubproperty($name, $value);
+		}
 		return $server;
 	}
 
@@ -284,8 +292,7 @@ 
 			Prado::trace("Generating WSDL", 'Prado\Web\Services\TSoapService');
 			$this->getResponse()->clear();
 			$this->getResponse()->write($server->getWsdl());
-		}
-		else
+		} else
 		{
 			// provide SOAP service
 			Prado::trace("Handling SOAP request", 'Prado\Web\Services\TSoapService');

framework/Web/Services/TPageConfiguration.php

Spacing +65 added lines, -65 removed lines

@@ -114,16 +114,16 @@ 
 		$fileName = Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 			? TPageService::CONFIG_FILE_PHP
 			: TPageService::CONFIG_FILE_XML;
-		foreach($paths as $p)
+		foreach ($paths as $p)
 		{
-			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
-			$path .= DIRECTORY_SEPARATOR . $p;
-			if($configPagePath === '')
+			$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
+			$path .= DIRECTORY_SEPARATOR.$p;
+			if ($configPagePath === '')
 				$configPagePath = $p;
 			else
-				$configPagePath .= '.' . $p;
+				$configPagePath .= '.'.$p;
 		}
-		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
+		$this->loadFromFile($path.DIRECTORY_SEPARATOR.$fileName, $configPagePath);
 		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
 	}
 
@@ -135,10 +135,10 @@ 
 	public function loadFromFile($fname, $configPagePath)
 	{
 		Prado::trace("Loading page configuration file $fname", 'System.Web.Services.TPageService');
-		if(empty($fname) || !is_file($fname))
+		if (empty($fname) || !is_file($fname))
 			return;
 
-		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
@@ -146,7 +146,7 @@ 
 		else
 		{
 			$dom = new TXmlDocument;
-			if($dom->loadFromFile($fname))
+			if ($dom->loadFromFile($fname))
 				$this->loadFromXml($dom, dirname($fname), $configPagePath);
 			else
 				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
@@ -195,32 +195,32 @@ 
 	public function loadPageConfigurationFromPhp($config, $configPath, $configPagePath)
 	{
 		// authorization
-		if(isset($config['authorization']) && is_array($config['authorization']))
+		if (isset($config['authorization']) && is_array($config['authorization']))
 		{
 			$rules = [];
-			foreach($config['authorization'] as $authorization)
+			foreach ($config['authorization'] as $authorization)
 			{
-				$patterns = isset($authorization['pages'])?$authorization['pages']:'';
+				$patterns = isset($authorization['pages']) ? $authorization['pages'] : '';
 				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
+				if (empty($patterns) || trim($patterns) === '*') // null or empty string
 					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',', $patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if (($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if ($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+								$pattern = $configPagePath.'.'.$pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
 								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if ($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
 									$ruleApplies = true;
 									break;
@@ -229,58 +229,58 @@ 
 						}
 					}
 				}
-				if($ruleApplies)
+				if ($ruleApplies)
 				{
-					$action = isset($authorization['action'])?$authorization['action']:'';
-					$users = isset($authorization['users'])?$authorization['users']:'';
-					$roles = isset($authorization['roles'])?$authorization['roles']:'';
-					$verb = isset($authorization['verb'])?$authorization['verb']:'';
-					$ips = isset($authorization['ips'])?$authorization['ips']:'';
+					$action = isset($authorization['action']) ? $authorization['action'] : '';
+					$users = isset($authorization['users']) ? $authorization['users'] : '';
+					$roles = isset($authorization['roles']) ? $authorization['roles'] : '';
+					$verb = isset($authorization['verb']) ? $authorization['verb'] : '';
+					$ips = isset($authorization['ips']) ? $authorization['ips'] : '';
 					$rules[] = new TAuthorizationRule($action, $users, $roles, $verb, $ips);
 				}
 			}
 			$this->_rules = array_merge($rules, $this->_rules);
 		}
 		// pages
-		if(isset($config['pages']) && is_array($config['pages']))
+		if (isset($config['pages']) && is_array($config['pages']))
 		{
-			if(isset($config['pages']['properties']))
+			if (isset($config['pages']['properties']))
 			{
 				$this->_properties = array_merge($this->_properties, $config['pages']['properties']);
 				unset($config['pages']['properties']);
 			}
-			foreach($config['pages'] as $id => $page)
+			foreach ($config['pages'] as $id => $page)
 			{
 				$properties = [];
-				if(isset($page['properties']))
+				if (isset($page['properties']))
 				{
 					$properties = $page['properties'];
 					unset($page['properties']);
 				}
 				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
+				$id = ($configPagePath === '') ? $id : $configPagePath.'.'.$id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
 					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
+				elseif ($id[strlen($id) - 1] === '*') // try wildcard matching
 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
-				if($matching)
+				if ($matching)
 					$this->_properties = array_merge($this->_properties, $properties);
 			}
 		}
 
 		// external configurations
-		if(isset($config['includes']) && is_array($config['includes']))
+		if (isset($config['includes']) && is_array($config['includes']))
 		{
-			foreach($config['includes'] as $include)
+			foreach ($config['includes'] as $include)
 			{
-				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
+				$when = isset($include['when']) ?true:false;
+				if (!isset($include['file']))
 					throw new TConfigurationException('pageserviceconf_includefile_required');
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+				if (isset($this->_includes[$filePath]))
+					$this->_includes[$filePath] = [$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 				else
-					$this->_includes[$filePath] = [$configPagePath,$when];
+					$this->_includes[$filePath] = [$configPagePath, $when];
 			}
 		}
 	}
@@ -294,32 +294,32 @@ 
 	public function loadPageConfigurationFromXml($dom, $configPath, $configPagePath)
 	{
 		// authorization
-		if(($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
+		if (($authorizationNode = $dom->getElementByTagName('authorization')) !== null)
 		{
 			$rules = [];
-			foreach($authorizationNode->getElements() as $node)
+			foreach ($authorizationNode->getElements() as $node)
 			{
 				$patterns = $node->getAttribute('pages');
 				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
+				if (empty($patterns) || trim($patterns) === '*') // null or empty string
 					$ruleApplies = true;
 				else
 				{
-					foreach(explode(',', $patterns) as $pattern)
+					foreach (explode(',', $patterns) as $pattern)
 					{
-						if(($pattern = trim($pattern)) !== '')
+						if (($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
-								$pattern = $configPagePath . '.' . $pattern;
-							if(strcasecmp($pattern, $this->_pagePath) === 0)
+							if ($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+								$pattern = $configPagePath.'.'.$pattern;
+							if (strcasecmp($pattern, $this->_pagePath) === 0)
 							{
 								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if ($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
 							{
-								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
+								if (strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
 									$ruleApplies = true;
 									break;
@@ -328,45 +328,45 @@ 
 						}
 					}
 				}
-				if($ruleApplies)
+				if ($ruleApplies)
 					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
 			}
 			$this->_rules = array_merge($rules, $this->_rules);
 		}
 
 		// pages
-		if(($pagesNode = $dom->getElementByTagName('pages')) !== null)
+		if (($pagesNode = $dom->getElementByTagName('pages')) !== null)
 		{
 			$this->_properties = array_merge($this->_properties, $pagesNode->getAttributes()->toArray());
 			// at the page folder
-			foreach($pagesNode->getElementsByTagName('page') as $node)
+			foreach ($pagesNode->getElementsByTagName('page') as $node)
 			{
 				$properties = $node->getAttributes();
 				$id = $properties->remove('id');
-				if(empty($id))
+				if (empty($id))
 					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
 				$matching = false;
-				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
+				$id = ($configPagePath === '') ? $id : $configPagePath.'.'.$id;
+				if (strcasecmp($id, $this->_pagePath) === 0)
 					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
+				elseif ($id[strlen($id) - 1] === '*') // try wildcard matching
 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
-				if($matching)
+				if ($matching)
 					$this->_properties = array_merge($this->_properties, $properties->toArray());
 			}
 		}
 
 		// external configurations
-		foreach($dom->getElementsByTagName('include') as $node)
+		foreach ($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when = $node->getAttribute('when')) === null)
+			if (($when = $node->getAttribute('when')) === null)
 				$when = true;
-			if(($filePath = $node->getAttribute('file')) === null)
+			if (($filePath = $node->getAttribute('file')) === null)
 				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+			if (isset($this->_includes[$filePath]))
+				$this->_includes[$filePath] = [$configPagePath, '('.$this->_includes[$filePath][1].') || ('.$when.')'];
 			else
-				$this->_includes[$filePath] = [$configPagePath,$when];
+				$this->_includes[$filePath] = [$configPagePath, $when];
 		}
 	}
 }
\ No newline at end of file

Braces +73 added lines, -48 removed lines

@@ -118,10 +118,11 @@ 
 		{
 			$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
 			$path .= DIRECTORY_SEPARATOR . $p;
-			if($configPagePath === '')
-				$configPagePath = $p;
-			else
-				$configPagePath .= '.' . $p;
+			if($configPagePath === '') {
+							$configPagePath = $p;
+			} else {
+							$configPagePath .= '.' . $p;
+			}
 		}
 		$this->loadFromFile($path . DIRECTORY_SEPARATOR . $fileName, $configPagePath);
 		$this->_rules = new TAuthorizationRuleCollection($this->_rules);
@@ -135,21 +136,22 @@ 
 	public function loadFromFile($fname, $configPagePath)
 	{
 		Prado::trace("Loading page configuration file $fname", 'System.Web.Services.TPageService');
-		if(empty($fname) || !is_file($fname))
-			return;
+		if(empty($fname) || !is_file($fname)) {
+					return;
+		}
 
 		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname), $configPagePath);
-		}
-		else
+		} else
 		{
 			$dom = new TXmlDocument;
-			if($dom->loadFromFile($fname))
-				$this->loadFromXml($dom, dirname($fname), $configPagePath);
-			else
-				throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
+			if($dom->loadFromFile($fname)) {
+							$this->loadFromXml($dom, dirname($fname), $configPagePath);
+			} else {
+							throw new TConfigurationException('pageserviceconf_file_invalid', $fname);
+			}
 		}
 	}
 
@@ -202,27 +204,32 @@ 
 			{
 				$patterns = isset($authorization['pages'])?$authorization['pages']:'';
 				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
+				if(empty($patterns) || trim($patterns) === '*') {
+					// null or empty string
 					$ruleApplies = true;
-				else
+				} else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+							if($configPagePath !== '') {
+								// prepend the pattern with ConfigPagePath
 								$pattern = $configPagePath . '.' . $pattern;
+							}
 							if(strcasecmp($pattern, $this->_pagePath) === 0)
 							{
 								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1] === '*') {
+								// try wildcard matching
 							{
 								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
 									$ruleApplies = true;
+							}
 									break;
 								}
 							}
@@ -259,12 +266,15 @@ 
 				}
 				$matching = false;
 				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
+				if(strcasecmp($id, $this->_pagePath) === 0) {
+									$matching = true;
+				} elseif($id[strlen($id) - 1] === '*') {
+					// try wildcard matching
 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
-				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties);
+				}
+				if($matching) {
+									$this->_properties = array_merge($this->_properties, $properties);
+				}
 			}
 		}
 
@@ -274,13 +284,15 @@ 
 			foreach($config['includes'] as $include)
 			{
 				$when = isset($include['when'])?true:false;
-				if(!isset($include['file']))
-					throw new TConfigurationException('pageserviceconf_includefile_required');
+				if(!isset($include['file'])) {
+									throw new TConfigurationException('pageserviceconf_includefile_required');
+				}
 				$filePath = $include['file'];
-				if(isset($this->_includes[$filePath]))
-					$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
-				else
-					$this->_includes[$filePath] = [$configPagePath,$when];
+				if(isset($this->_includes[$filePath])) {
+									$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+				} else {
+									$this->_includes[$filePath] = [$configPagePath,$when];
+				}
 			}
 		}
 	}
@@ -301,35 +313,41 @@ 
 			{
 				$patterns = $node->getAttribute('pages');
 				$ruleApplies = false;
-				if(empty($patterns) || trim($patterns) === '*') // null or empty string
+				if(empty($patterns) || trim($patterns) === '*') {
+					// null or empty string
 					$ruleApplies = true;
-				else
+				} else
 				{
 					foreach(explode(',', $patterns) as $pattern)
 					{
 						if(($pattern = trim($pattern)) !== '')
 						{
 							// we know $configPagePath and $this->_pagePath
-							if($configPagePath !== '')  // prepend the pattern with ConfigPagePath
+							if($configPagePath !== '') {
+								// prepend the pattern with ConfigPagePath
 								$pattern = $configPagePath . '.' . $pattern;
+							}
 							if(strcasecmp($pattern, $this->_pagePath) === 0)
 							{
 								$ruleApplies = true;
 								break;
 							}
-							if($pattern[strlen($pattern) - 1] === '*') // try wildcard matching
+							if($pattern[strlen($pattern) - 1] === '*') {
+								// try wildcard matching
 							{
 								if(strncasecmp($this->_pagePath, $pattern, strlen($pattern) - 1) === 0)
 								{
 									$ruleApplies = true;
+							}
 									break;
 								}
 							}
 						}
 					}
 				}
-				if($ruleApplies)
-					$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
+				if($ruleApplies) {
+									$rules[] = new TAuthorizationRule($node->getTagName(), $node->getAttribute('users'), $node->getAttribute('roles'), $node->getAttribute('verb'), $node->getAttribute('ips'));
+				}
 			}
 			$this->_rules = array_merge($rules, $this->_rules);
 		}
@@ -343,30 +361,37 @@ 
 			{
 				$properties = $node->getAttributes();
 				$id = $properties->remove('id');
-				if(empty($id))
-					throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
+				if(empty($id)) {
+									throw new TConfigurationException('pageserviceconf_page_invalid', $configPath);
+				}
 				$matching = false;
 				$id = ($configPagePath === '')?$id:$configPagePath . '.' . $id;
-				if(strcasecmp($id, $this->_pagePath) === 0)
-					$matching = true;
-				elseif($id[strlen($id) - 1] === '*') // try wildcard matching
+				if(strcasecmp($id, $this->_pagePath) === 0) {
+									$matching = true;
+				} elseif($id[strlen($id) - 1] === '*') {
+					// try wildcard matching
 					$matching = strncasecmp($this->_pagePath, $id, strlen($id) - 1) === 0;
-				if($matching)
-					$this->_properties = array_merge($this->_properties, $properties->toArray());
+				}
+				if($matching) {
+									$this->_properties = array_merge($this->_properties, $properties->toArray());
+				}
 			}
 		}
 
 		// external configurations
 		foreach($dom->getElementsByTagName('include') as $node)
 		{
-			if(($when = $node->getAttribute('when')) === null)
-				$when = true;
-			if(($filePath = $node->getAttribute('file')) === null)
-				throw new TConfigurationException('pageserviceconf_includefile_required');
-			if(isset($this->_includes[$filePath]))
-				$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
-			else
-				$this->_includes[$filePath] = [$configPagePath,$when];
+			if(($when = $node->getAttribute('when')) === null) {
+							$when = true;
+			}
+			if(($filePath = $node->getAttribute('file')) === null) {
+							throw new TConfigurationException('pageserviceconf_includefile_required');
+			}
+			if(isset($this->_includes[$filePath])) {
+							$this->_includes[$filePath] = [$configPagePath,'(' . $this->_includes[$filePath][1] . ') || (' . $when . ')'];
+			} else {
+							$this->_includes[$filePath] = [$configPagePath,$when];
+			}
 		}
 	}
 }
\ No newline at end of file

framework/Web/Services/TPageService.php

Spacing +51 added lines, -51 removed lines

@@ -174,7 +174,7 @@ 
 	protected function initPageContext($pageConfig)
 	{
 		$application = $this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
+		foreach ($pageConfig->getApplicationConfigurations() as $appConfig)
 			$application->applyConfiguration($appConfig);
 
 		$this->applyConfiguration($pageConfig);
@@ -191,14 +191,14 @@ 
 		$this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
 		$pagePath = $this->getRequestedPagePath();
 		// external configurations
-		foreach($config->getExternalConfigurations() as $filePath => $params)
+		foreach ($config->getExternalConfigurations() as $filePath => $params)
 		{
 			list($configPagePath, $condition) = $params;
-			if($condition !== true)
+			if ($condition !== true)
 				$condition = $this->evaluateExpression($condition);
-			if($condition)
+			if ($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
+				if (($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
 					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
 				$c = new TPageConfiguration($pagePath);
 				$c->loadFromFile($path, $configPagePath);
@@ -215,7 +215,7 @@ 
 	protected function determineRequestedPagePath()
 	{
 		$pagePath = $this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
+		if (empty($pagePath))
 			$pagePath = $this->getDefaultPage();
 		return $pagePath;
 	}
@@ -229,12 +229,12 @@ 
 	{
 		$application = $this->getApplication();
 		$pagePath = $this->getRequestedPagePath();
-		if(($cache = $application->getCache()) === null)
+		if (($cache = $application->getCache()) === null)
 		{
 			$pageConfig = new TPageConfiguration($pagePath);
-			if($config !== null)
+			if ($config !== null)
 			{
-				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+				if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 				else
 					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
@@ -245,25 +245,25 @@ 
 		{
 			$configCached = true;
 			$currentTimestamp = [];
-			$arr = $cache->get(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath);
-			if(is_array($arr))
+			$arr = $cache->get(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath);
+			if (is_array($arr))
 			{
 				list($pageConfig, $timestamps) = $arr;
-				if($application->getMode() !== TApplicationMode::Performance)
+				if ($application->getMode() !== TApplicationMode::Performance)
 				{
-					foreach($timestamps as $fileName => $timestamp)
+					foreach ($timestamps as $fileName => $timestamp)
 					{
-						if($fileName === 0) // application config file
+						if ($fileName === 0) // application config file
 						{
 							$appConfigFile = $application->getConfigurationFile();
-							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
+							$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
+							if ($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
 								$configCached = false;
 						}
 						else
 						{
 							$currentTimestamp[$fileName] = @filemtime($fileName);
-							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
+							if ($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
 								$configCached = false;
 						}
 					}
@@ -277,27 +277,27 @@ 
 				$fileName = $this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP
 					? self::CONFIG_FILE_PHP
 					: self::CONFIG_FILE_XML;
-				foreach($paths as $path)
+				foreach ($paths as $path)
 				{
-					$configFile = $configPath . DIRECTORY_SEPARATOR . $fileName;
+					$configFile = $configPath.DIRECTORY_SEPARATOR.$fileName;
 					$currentTimestamp[$configFile] = @filemtime($configFile);
-					$configPath .= DIRECTORY_SEPARATOR . $path;
+					$configPath .= DIRECTORY_SEPARATOR.$path;
 				}
 				$appConfigFile = $application->getConfigurationFile();
-				$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+				$currentTimestamp[0] = $appConfigFile === null ? 0 : @filemtime($appConfigFile);
 			}
-			if(!$configCached)
+			if (!$configCached)
 			{
 				$pageConfig = new TPageConfiguration($pagePath);
-				if($config !== null)
+				if ($config !== null)
 				{
-					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+					if ($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
 					else
 						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
-				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, [$pageConfig,$currentTimestamp]);
+				$cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath, [$pageConfig, $currentTimestamp]);
 			}
 		}
 		return $pageConfig;
@@ -308,7 +308,7 @@ 
 	 */
 	public function getTemplateManager()
 	{
-		if(!$this->_templateManager)
+		if (!$this->_templateManager)
 		{
 			$this->_templateManager = new TTemplateManager;
 			$this->_templateManager->init(null);
@@ -329,7 +329,7 @@ 
 	 */
 	public function getThemeManager()
 	{
-		if(!$this->_themeManager)
+		if (!$this->_themeManager)
 		{
 			$this->_themeManager = new TThemeManager;
 			$this->_themeManager->init(null);
@@ -350,10 +350,10 @@ 
 	 */
 	public function getRequestedPagePath()
 	{
-		if($this->_pagePath === null)
+		if ($this->_pagePath === null)
 		{
 			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
-			if(empty($this->_pagePath))
+			if (empty($this->_pagePath))
 				throw new THttpException(404, 'pageservice_page_required');
 		}
 		return $this->_pagePath;
@@ -381,7 +381,7 @@ 
 	 */
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
 		else
 			$this->_defaultPage = $value;
@@ -400,13 +400,13 @@ 
 	 */
 	public function getBasePath()
 	{
-		if($this->_basePath === null)
+		if ($this->_basePath === null)
 		{
-			$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::DEFAULT_BASEPATH;
-			if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+			$basePath = $this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::DEFAULT_BASEPATH;
+			if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
 			{
-				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
-				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
+				$basePath = $this->getApplication()->getBasePath().DIRECTORY_SEPARATOR.self::FALLBACK_BASEPATH;
+				if (($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
 					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
 			}
 		}
@@ -419,9 +419,9 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
+		elseif (($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
 			throw new TConfigurationException('pageservice_basepath_invalid', $value);
 		$this->_basePath = realpath($path);
 	}
@@ -485,40 +485,40 @@ 
 	 */
 	protected function createPage($pagePath)
 	{
-		$path = $this->getBasePath() . DIRECTORY_SEPARATOR . strtr($pagePath, '.', DIRECTORY_SEPARATOR);
-		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
-		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
+		$path = $this->getBasePath().DIRECTORY_SEPARATOR.strtr($pagePath, '.', DIRECTORY_SEPARATOR);
+		$hasTemplateFile = is_file($path.self::PAGE_FILE_EXT);
+		$hasClassFile = is_file($path.Prado::CLASS_FILE_EXT);
 
-		if(!$hasTemplateFile && !$hasClassFile)
+		if (!$hasTemplateFile && !$hasClassFile)
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
-		if($hasClassFile)
+		if ($hasClassFile)
 		{
 			$className = basename($path);
-			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX . str_replace('.', '\\', $pagePath);
+			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX.str_replace('.', '\\', $pagePath);
 
-			if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
-				include_once($path . Prado::CLASS_FILE_EXT);
+			if (!class_exists($className, false) && !class_exists($namespacedClassName, false))
+				include_once($path.Prado::CLASS_FILE_EXT);
 
-			if(!class_exists($className, false))
+			if (!class_exists($className, false))
 				$className = $namespacedClassName;
 		}
 		else
 		{
 			$className = $this->getBasePageClass();
 			Prado::using($className);
-			if(($pos = strrpos($className, '.')) !== false)
+			if (($pos = strrpos($className, '.')) !== false)
 				$className = substr($className, $pos + 1);
 		}
 
-		if($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
+		if ($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
 			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
 
 		$page = Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+		if ($hasTemplateFile)
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
 
 		return $page;
 	}
@@ -530,7 +530,7 @@ 
 	 */
 	protected function runPage($page, $properties)
 	{
-		foreach($properties as $name => $value)
+		foreach ($properties as $name => $value)
 			$page->setSubProperty($name, $value);
 		$page->run($this->getResponse()->createHtmlWriter());
 	}

Braces +72 added lines, -55 removed lines

@@ -174,8 +174,9 @@ 
 	protected function initPageContext($pageConfig)
 	{
 		$application = $this->getApplication();
-		foreach($pageConfig->getApplicationConfigurations() as $appConfig)
-			$application->applyConfiguration($appConfig);
+		foreach($pageConfig->getApplicationConfigurations() as $appConfig) {
+					$application->applyConfiguration($appConfig);
+		}
 
 		$this->applyConfiguration($pageConfig);
 	}
@@ -194,12 +195,14 @@ 
 		foreach($config->getExternalConfigurations() as $filePath => $params)
 		{
 			list($configPagePath, $condition) = $params;
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			if($condition !== true) {
+							$condition = $this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path))
-					throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
+				if(($path = Prado::getPathOfNamespace($filePath, Prado::getApplication()->getConfigurationFileExt())) === null || !is_file($path)) {
+									throw new TConfigurationException('pageservice_includefile_invalid', $filePath);
+				}
 				$c = new TPageConfiguration($pagePath);
 				$c->loadFromFile($path, $configPagePath);
 				$this->applyConfiguration($c);
@@ -215,8 +218,9 @@ 
 	protected function determineRequestedPagePath()
 	{
 		$pagePath = $this->getRequest()->getServiceParameter();
-		if(empty($pagePath))
-			$pagePath = $this->getDefaultPage();
+		if(empty($pagePath)) {
+					$pagePath = $this->getDefaultPage();
+		}
 		return $pagePath;
 	}
 
@@ -234,14 +238,14 @@ 
 			$pageConfig = new TPageConfiguration($pagePath);
 			if($config !== null)
 			{
-				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-					$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
-				else
-					$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
+				if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+									$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
+				} else {
+									$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
+				}
 			}
 			$pageConfig->loadFromFiles($this->getBasePath());
-		}
-		else
+		} else
 		{
 			$configCached = true;
 			$currentTimestamp = [];
@@ -253,23 +257,25 @@ 
 				{
 					foreach($timestamps as $fileName => $timestamp)
 					{
-						if($fileName === 0) // application config file
+						if($fileName === 0) {
+							// application config file
 						{
 							$appConfigFile = $application->getConfigurationFile();
-							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
-							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0]))
-								$configCached = false;
 						}
-						else
+							$currentTimestamp[0] = $appConfigFile === null?0:@filemtime($appConfigFile);
+							if($currentTimestamp[0] > $timestamp || ($timestamp > 0 && !$currentTimestamp[0])) {
+															$configCached = false;
+							}
+						} else
 						{
 							$currentTimestamp[$fileName] = @filemtime($fileName);
-							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName]))
-								$configCached = false;
+							if($currentTimestamp[$fileName] > $timestamp || ($timestamp > 0 && !$currentTimestamp[$fileName])) {
+															$configCached = false;
+							}
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$configCached = false;
 				$paths = explode('.', $pagePath);
@@ -291,10 +297,11 @@ 
 				$pageConfig = new TPageConfiguration($pagePath);
 				if($config !== null)
 				{
-					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-						$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
-					else
-						$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
+					if($application->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+											$pageConfig->loadPageConfigurationFromPhp($config, $application->getBasePath(), '');
+					} else {
+											$pageConfig->loadPageConfigurationFromXml($config, $application->getBasePath(), '');
+					}
 				}
 				$pageConfig->loadFromFiles($this->getBasePath());
 				$cache->set(self::CONFIG_CACHE_PREFIX . $this->getID() . $pagePath, [$pageConfig,$currentTimestamp]);
@@ -353,8 +360,9 @@ 
 		if($this->_pagePath === null)
 		{
 			$this->_pagePath = strtr($this->determineRequestedPagePath(), '/\\', '..');
-			if(empty($this->_pagePath))
-				throw new THttpException(404, 'pageservice_page_required');
+			if(empty($this->_pagePath)) {
+							throw new THttpException(404, 'pageservice_page_required');
+			}
 		}
 		return $this->_pagePath;
 	}
@@ -381,10 +389,11 @@ 
 	 */
 	public function setDefaultPage($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
-		else
-			$this->_defaultPage = $value;
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_defaultpage_unchangeable');
+		} else {
+					$this->_defaultPage = $value;
+		}
 	}
 
 	/**
@@ -406,8 +415,9 @@ 
 			if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
 			{
 				$basePath = $this->getApplication()->getBasePath() . DIRECTORY_SEPARATOR . self::FALLBACK_BASEPATH;
-				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath))
-					throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
+				if(($this->_basePath = realpath($basePath)) === false || !is_dir($this->_basePath)) {
+									throw new TConfigurationException('pageservice_basepath_invalid', $basePath);
+				}
 			}
 		}
 		return $this->_basePath;
@@ -419,10 +429,11 @@ 
 	 */
 	public function setBasePath($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('pageservice_basepath_unchangeable');
-		elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path))
-			throw new TConfigurationException('pageservice_basepath_invalid', $value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('pageservice_basepath_unchangeable');
+		} elseif(($path = Prado::getPathOfNamespace($value)) === null || !is_dir($path)) {
+					throw new TConfigurationException('pageservice_basepath_invalid', $value);
+		}
 		$this->_basePath = realpath($path);
 	}
 
@@ -489,36 +500,41 @@ 
 		$hasTemplateFile = is_file($path . self::PAGE_FILE_EXT);
 		$hasClassFile = is_file($path . Prado::CLASS_FILE_EXT);
 
-		if(!$hasTemplateFile && !$hasClassFile)
-			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		if(!$hasTemplateFile && !$hasClassFile) {
+					throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		}
 
 		if($hasClassFile)
 		{
 			$className = basename($path);
 			$namespacedClassName = static::PAGE_NAMESPACE_PREFIX . str_replace('.', '\\', $pagePath);
 
-			if(!class_exists($className, false) && !class_exists($namespacedClassName, false))
-				include_once($path . Prado::CLASS_FILE_EXT);
+			if(!class_exists($className, false) && !class_exists($namespacedClassName, false)) {
+							include_once($path . Prado::CLASS_FILE_EXT);
+			}
 
-			if(!class_exists($className, false))
-				$className = $namespacedClassName;
-		}
-		else
+			if(!class_exists($className, false)) {
+							$className = $namespacedClassName;
+			}
+		} else
 		{
 			$className = $this->getBasePageClass();
 			Prado::using($className);
-			if(($pos = strrpos($className, '.')) !== false)
-				$className = substr($className, $pos + 1);
+			if(($pos = strrpos($className, '.')) !== false) {
+							$className = substr($className, $pos + 1);
+			}
 		}
 
-		if($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage'))
-			throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		if($className !== '\Prado\Web\UI\TPage' && !is_subclass_of($className, '\Prado\Web\UI\TPage')) {
+					throw new THttpException(404, 'pageservice_page_unknown', $pagePath);
+		}
 
 		$page = Prado::createComponent($className);
 		$page->setPagePath($pagePath);
 
-		if($hasTemplateFile)
-			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+		if($hasTemplateFile) {
+					$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path . self::PAGE_FILE_EXT));
+		}
 
 		return $page;
 	}
@@ -530,8 +546,9 @@ 
 	 */
 	protected function runPage($page, $properties)
 	{
-		foreach($properties as $name => $value)
-			$page->setSubProperty($name, $value);
+		foreach($properties as $name => $value) {
+					$page->setSubProperty($name, $value);
+		}
 		$page->run($this->getResponse()->createHtmlWriter());
 	}
 

framework/Web/Services/TJsonRpcProtocol.php

Spacing +15 added lines, -15 removed lines

@@ -40,31 +40,31 @@ 
 		{
 			$_request = $this->decode($requestPayload);
 
-			if(isset($_request['jsonrpc']))
+			if (isset($_request['jsonrpc']))
 			{
 				$this->_specificationVersion = $_request['jsonrpc'];
-				if($this->_specificationVersion > 2.0)
+				if ($this->_specificationVersion > 2.0)
 					throw new TRpcException('Unsupported specification version', '-32600');
 			}
 
-			if(isset($_request['id']))
+			if (isset($_request['id']))
 				$this->_id = $_request['id'];
 
-			if(!isset($_request['method']))
+			if (!isset($_request['method']))
 					throw new TRpcException('Missing request method', '-32600');
 
-			if(!isset($_request['params']))
+			if (!isset($_request['params']))
 				$parameters = [];
 			else
 				$parameters = $_request['params'];
 
-			if(!is_array($parameters))
+			if (!is_array($parameters))
 				$parameters = [$parameters];
 
 			// a request without an id is a notification that doesn't need a response
-			if($this->_id !== null)
+			if ($this->_id !== null)
 			{
-				if($this->_specificationVersion == 2.0)
+				if ($this->_specificationVersion == 2.0)
 				{
 					return $this->encode([
 						'jsonrpc' => '2.0',
@@ -80,15 +80,15 @@ 
 				}
 			}
 		}
-		catch(TRpcException $e)
+		catch (TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
 		}
-		catch(THttpException $e)
+		catch (THttpException $e)
 		{
 			throw $e;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}
@@ -101,7 +101,7 @@ 
 	 */
 	public function createErrorResponse(TRpcException $exception)
 	{
-		if($this->_specificationVersion == 2.0)
+		if ($this->_specificationVersion == 2.0)
 		{
 			return $this->encode([
 				'id' => $this->_id,
@@ -161,7 +161,7 @@ 
 	private static function checkJsonError()
 	{
 		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
+		if ($errnum != JSON_ERROR_NONE)
 			throw new \Exception("JSON error: $msg", $err);
 	}
 
@@ -174,8 +174,8 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
+		if (!isset($this->rpcMethods[$methodName]))
+			throw new TRpcException('Method "'.$methodName.'" not found', '-32601');
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}

Braces +26 added lines, -22 removed lines

@@ -43,23 +43,28 @@ 
 			if(isset($_request['jsonrpc']))
 			{
 				$this->_specificationVersion = $_request['jsonrpc'];
-				if($this->_specificationVersion > 2.0)
-					throw new TRpcException('Unsupported specification version', '-32600');
+				if($this->_specificationVersion > 2.0) {
+									throw new TRpcException('Unsupported specification version', '-32600');
+				}
 			}
 
-			if(isset($_request['id']))
-				$this->_id = $_request['id'];
+			if(isset($_request['id'])) {
+							$this->_id = $_request['id'];
+			}
 
-			if(!isset($_request['method']))
-					throw new TRpcException('Missing request method', '-32600');
+			if(!isset($_request['method'])) {
+								throw new TRpcException('Missing request method', '-32600');
+			}
 
-			if(!isset($_request['params']))
-				$parameters = [];
-			else
-				$parameters = $_request['params'];
+			if(!isset($_request['params'])) {
+							$parameters = [];
+			} else {
+							$parameters = $_request['params'];
+			}
 
-			if(!is_array($parameters))
-				$parameters = [$parameters];
+			if(!is_array($parameters)) {
+							$parameters = [$parameters];
+			}
 
 			// a request without an id is a notification that doesn't need a response
 			if($this->_id !== null)
@@ -79,16 +84,13 @@ 
 					]);
 				}
 			}
-		}
-		catch(TRpcException $e)
+		} catch(TRpcException $e)
 		{
 			return $this->createErrorResponse($e);
-		}
-		catch(THttpException $e)
+		} catch(THttpException $e)
 		{
 			throw $e;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}
@@ -161,8 +163,9 @@ 
 	private static function checkJsonError()
 	{
 		$errnum = json_last_error();
-		if($errnum != JSON_ERROR_NONE)
-			throw new \Exception("JSON error: $msg", $err);
+		if($errnum != JSON_ERROR_NONE) {
+					throw new \Exception("JSON error: $msg", $err);
+		}
 	}
 
 	/**
@@ -174,8 +177,9 @@ 
 	 */
 	public function callApiMethod($methodName, $parameters)
 	{
-		if(!isset($this->rpcMethods[$methodName]))
-			throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
+		if(!isset($this->rpcMethods[$methodName])) {
+					throw new TRpcException('Method "' . $methodName . '" not found', '-32601');
+		}
 
 		return call_user_func_array($this->rpcMethods[$methodName]['method'], $parameters);
 	}