pradosoft / prado

framework/Web/UI/JuiControls/TJuiCallbackPageStateTracker.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	 */
   protected function updateJuiOptions($options)
   {
-	foreach ($options as $key => $value) $options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	foreach ($options as $key => $value) {
+		$options[$key] = $key . ': ' . (is_string($value) ? "'{$value}'" : TPropertyValue::ensureString($value));
+	}
 	$code = "jQuery('#{$this->_control->getWidgetID()}').{$this->_control->getWidget()}('option', { " . implode(', ', $options) . " });";
 	$this->_control->getPage()->getClientScript()->registerEndScript(sprintf('%08X', crc32($code)), $code);
   }

framework/Web/UI/WebControls/TOutputCacheTextWriterMulti.php

Braces +6 added lines, -4 removed lines

@@ -36,14 +36,16 @@
 
 	public function write($s)
 	{
-		foreach($this->_writers as $writer)
-			$writer->write($s);
+		foreach($this->_writers as $writer) {
+					$writer->write($s);
+		}
 	}
 
 	public function flush()
 	{
-		foreach($this->_writers as $writer)
-			$s = $writer->flush();
+		foreach($this->_writers as $writer) {
+					$s = $writer->flush();
+		}
 		return $s;
 	}
 }
\ No newline at end of file

framework/Util/TBehavior.php

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
 	public function attach($owner)
 	{
 		$this->_owner = $owner;
-		foreach($this->events() as $event => $handler)
-			$owner->attachEventHandler($event, [$this,$handler]);
+		foreach($this->events() as $event => $handler) {
+					$owner->attachEventHandler($event, [$this,$handler]);
+		}
 	}
 
 	/**
@@ -57,8 +58,9 @@ 
 	 */
 	public function detach($owner)
 	{
-		foreach($this->events() as $event => $handler)
-			$owner->detachEventHandler($event, [$this,$handler]);
+		foreach($this->events() as $event => $handler) {
+					$owner->detachEventHandler($event, [$this,$handler]);
+		}
 		$this->_owner = null;
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Braces +3 added lines, -2 removed lines

@@ -111,8 +111,9 @@
 			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
 			for($i = 0;$i < $total;$i++)
 			{
-				foreach($fkeys as $fKey => $srcKey)
-					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
+				foreach($fkeys as $fKey => $srcKey) {
+									$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
+				}
 				$success = $fkObjects[$i]->save() && $success;
 			}
 		}

bin/prado-cli.php

Braces +106 added lines, -77 removed lines

@@ -9,8 +9,9 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli')
+if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli') {
 	die('Must be run from the command line');
+}
 
 // Locate composer's autoloader
 if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
@@ -78,8 +79,9 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance === null) {
+					$instance = new self;
+		}
 		return $instance;
 	}
 
@@ -94,8 +96,9 @@ 
 	 */
 	public function run($args)
 	{
-		if(count($args) > 1)
-			array_shift($args);
+		if(count($args) > 1) {
+					array_shift($args);
+		}
 		$valid = false;
 		foreach($this->_actions as $class => $action)
 		{
@@ -103,14 +106,14 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
 		}
-		if(!$valid)
-			$this->printHelp();
+		if(!$valid) {
+					$this->printHelp();
+		}
 	}
 
 	/**
@@ -123,8 +126,9 @@ 
 		echo "usage: php prado-cli.php action <parameter> [optional]\n";
 		echo "example: php prado-cli.php -c mysite\n\n";
 		echo "actions:\n";
-		foreach($this->_actions as $action)
-			echo $action->renderHelp();
+		foreach($this->_actions as $action) {
+					echo $action->renderHelp();
+		}
 	}
 }
 
@@ -150,8 +154,9 @@ 
 			mkdir($dir);
 			echo "creating $dir\n";
 		}
-		if(is_dir($dir))
-			chmod($dir, $mask);
+		if(is_dir($dir)) {
+					chmod($dir, $mask);
+		}
 	}
 
 	protected function createFile($filename, $content)
@@ -172,16 +177,19 @@ 
 	public function renderHelp()
 	{
 		$params = [];
-		foreach($this->parameters as $v)
-			$params[] = '<' . $v . '>';
+		foreach($this->parameters as $v) {
+					$params[] = '<' . $v . '>';
+		}
 		$parameters = implode($params, ' ');
 		$options = [];
-		foreach($this->optional as $v)
-			$options[] = '[' . $v . ']';
+		foreach($this->optional as $v) {
+					$options[] = '[' . $v . ']';
+		}
 		$optional = (strlen($parameters) ? ' ' : '') . implode($options, ' ');
 		$description = '';
-		foreach(explode("\n", wordwrap($this->description, 65)) as $line)
-			$description .= '    ' . $line . "\n";
+		foreach(explode("\n", wordwrap($this->description, 65)) as $line) {
+					$description .= '    ' . $line . "\n";
+		}
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -205,8 +213,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+' . str_repeat('-', 77) . "+\n";
@@ -243,15 +250,17 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if(basename($dir) !== '.')
-			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
-		else
-			$basePath = $rootPath;
+		if(basename($dir) !== '.') {
+					$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
+		} else {
+					$basePath = $rootPath;
+		}
 		$appName = basename($basePath);
 		$assetPath = $basePath . DIRECTORY_SEPARATOR . 'assets';
 		$protectedPath = $basePath . DIRECTORY_SEPARATOR . 'protected';
@@ -390,8 +399,9 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 		$basePath = $rootPath . '/' . basename($dir);
@@ -457,8 +467,9 @@ 
 
 	public function performAction($args)
 	{
-		if(count($args) > 1)
-			$this->initializePradoApplication($args[1]);
+		if(count($args) > 1) {
+					$this->initializePradoApplication($args[1]);
+		}
 
 		\Psy\debug([], Prado::getApplication());
 		return true;
@@ -487,44 +498,51 @@ 
 		{
 			$config = $this->getActiveRecordConfig($app_dir);
 			$output = $this->getOutputFile($app_dir, $args[2]);
-			if(is_file($output))
-				echo "** File $output already exists, skiping. \n";
-			elseif($config !== false && $output !== false)
-				$this->generateActiveRecord($config, $args[1], $output);
+			if(is_file($output)) {
+							echo "** File $output already exists, skiping. \n";
+			} elseif($config !== false && $output !== false) {
+							$this->generateActiveRecord($config, $args[1], $output);
+			}
 		}
 		return true;
 	}
 
 	protected function getAppDir($dir = ".")
 	{
-		if(is_dir($dir))
-			return realpath($dir);
-		if(false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-			return $app_dir;
+		if(is_dir($dir)) {
+					return realpath($dir);
+		}
+		if(false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir)) {
+					return $app_dir;
+		}
 		echo '** Unable to find directory "' . $dir . "\".\n";
 		return false;
 	}
 
 	protected function getXmlFile($app_dir)
 	{
-		if(false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
-			return $xml;
-		if(false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-			return $xml;
+		if(false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml)) {
+					return $xml;
+		}
+		if(false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml)) {
+					return $xml;
+		}
 		echo '** Unable to find application.xml in ' . $app_dir . "\n";
 		return false;
 	}
 
 	protected function getActiveRecordConfig($app_dir)
 	{
-		if(false === ($xml = $this->getXmlFile($app_dir)))
-			return false;
+		if(false === ($xml = $this->getXmlFile($app_dir))) {
+					return false;
+		}
 		if(false !== ($app = $this->initializePradoApplication($app_dir)))
 		{
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach($app->getModules() as $module)
-				if($module instanceof TActiveRecordConfig)
+			foreach($app->getModules() as $module) {
+							if($module instanceof TActiveRecordConfig)
 					return $module;
+			}
 			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
 		}
 		return false;
@@ -532,13 +550,15 @@ 
 
 	protected function getOutputFile($app_dir, $namespace)
 	{
-		if(is_file($namespace) && strpos($namespace, $app_dir) === 0)
-				return $namespace;
+		if(is_file($namespace) && strpos($namespace, $app_dir) === 0) {
+						return $namespace;
+		}
 		$file = Prado::getPathOfNamespace($namespace, ".php");
 		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
 		{
-			if(strpos($path, $app_dir) === 0)
-				return $file;
+			if(strpos($path, $app_dir) === 0) {
+							return $file;
+			}
 		}
 		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
 		return false;
@@ -554,12 +574,12 @@ 
 			{
 				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = [];
-				foreach($tableInfo->getColumns() as $field => $column)
-					$properties[] = $this->generateProperty($field, $column);
+				foreach($tableInfo->getColumns() as $field => $column) {
+									$properties[] = $this->generateProperty($field, $column);
+				}
 			}
 
 			$classname = basename($output, '.php');
@@ -692,58 +712,67 @@ 
 		if(count($input) > 2)
 		{
 			$app_dir = '.';
-			if(Prado::getApplication() !== null)
-				$app_dir = dirname(Prado::getApplication()->getBasePath());
+			if(Prado::getApplication() !== null) {
+							$app_dir = dirname(Prado::getApplication()->getBasePath());
+			}
 			$args = [$input[0],$input[1], $input[2],$app_dir];
-			if(count($input) > 3)
-				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
+			if(count($input) > 3) {
+							$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
+			}
 			$cmd = new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
-		}
-		else
+		} else
 		{
 			echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 		}
 	}
 
 	protected function getAppDir($dir = ".") {
-		if (is_dir($dir))
-			return realpath($dir);
-		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-			return $app_dir;
+		if (is_dir($dir)) {
+					return realpath($dir);
+		}
+		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir)) {
+					return $app_dir;
+		}
 		echo '** Unable to find directory "' . $dir . "\".\n";
 		return false;
 	}
 
 	protected function getXmlFile($app_dir) {
-		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
-			return $xml;
-		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-			return $xml;
+		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml)) {
+					return $xml;
+		}
+		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml)) {
+					return $xml;
+		}
 		echo '** Unable to find application.xml in ' . $app_dir . "\n";
 		return false;
 	}
 
 	protected function getActiveRecordConfig($app_dir) {
-		if (false === ($xml = $this->getXmlFile($app_dir)))
-			return false;
+		if (false === ($xml = $this->getXmlFile($app_dir))) {
+					return false;
+		}
 		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach ($app->getModules() as $module)
-				if ($module instanceof TActiveRecordConfig)
+			foreach ($app->getModules() as $module) {
+							if ($module instanceof TActiveRecordConfig)
 					return $module;
+			}
 			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
 		}
 		return false;
 	}
 
 	protected function getOutputFile($app_dir, $namespace) {
-		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
-			return $namespace;
+		if (is_file($namespace) && strpos($namespace, $app_dir) === 0) {
+					return $namespace;
+		}
 		$file = Prado::getPathOfNamespace($namespace, "");
 		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-			if (strpos($path, $app_dir) === 0)
-				return $file;
+			if (strpos($path, $app_dir) === 0) {
+							return $file;
+			}
 		}
 		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
 		return false;

framework/TApplication.php

Braces +113 added lines, -82 removed lines

@@ -300,8 +300,9 @@ 
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if($cacheConfig) {
+					$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		}
 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
@@ -324,17 +325,18 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath = realpath($basePath)) === false)
-			throw new TConfigurationException('application_basepath_invalid', $basePath);
-		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
-			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
-		elseif(is_file($basePath))
+		if(empty($basePath) || ($basePath = realpath($basePath)) === false) {
+					throw new TConfigurationException('application_basepath_invalid', $basePath);
+		}
+		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName())) {
+					$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		} elseif(is_file($basePath))
 		{
 			$configFile = $basePath;
 			$basePath = dirname($configFile);
+		} else {
+					$configFile = null;
 		}
-		else
-			$configFile = null;
 
 		// determine runtime path
 		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
@@ -345,17 +347,18 @@ 
 				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
 				if(!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath) === false)
-						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					if(@mkdir($runtimePath) === false) {
+											throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					}
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
+		} else {
+					throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 		}
-		else
-			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -374,17 +377,18 @@ 
 			$this->_requestCompleted = false;
 			while($this->_step < $n)
 			{
-				if($this->_mode === TApplicationMode::Off)
-					throw new THttpException(503, 'application_unavailable');
-				if($this->_requestCompleted)
-					break;
+				if($this->_mode === TApplicationMode::Off) {
+									throw new THttpException(503, 'application_unavailable');
+				}
+				if($this->_requestCompleted) {
+									break;
+				}
 				$method = self::$_steps[$this->_step];
 				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -435,12 +439,14 @@ 
 	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
 		$this->_stateChanged = true;
-		if($value === $defaultValue)
-			unset($this->_globals[$key]);
-		else
-			$this->_globals[$key] = $value;
-		if($forceSave)
-			$this->saveGlobals();
+		if($value === $defaultValue) {
+					unset($this->_globals[$key]);
+		} else {
+					$this->_globals[$key] = $value;
+		}
+		if($forceSave) {
+					$this->saveGlobals();
+		}
 	}
 
 	/**
@@ -636,8 +642,9 @@ 
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath = $value;
-		if($this->_cacheFile)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if($this->_cacheFile) {
+					$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		}
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
 	}
@@ -666,10 +673,11 @@ 
 	 */
 	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated', $id);
-		else
-			$this->_modules[$id] = $module;
+		if(isset($this->_modules[$id])) {
+					throw new TConfigurationException('application_moduleid_duplicated', $id);
+		} else {
+					$this->_modules[$id] = $module;
+		}
 	}
 
 	/**
@@ -677,8 +685,9 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
-			return null;
+		if(!array_key_exists($id, $this->_modules)) {
+					return null;
+		}
 
 		// force loading of a lazy module
 		if($this->_modules[$id] === null)
@@ -917,8 +926,9 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules === null)
-			$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
+		if($this->_authRules === null) {
+					$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
+		}
 		return $this->_authRules;
 	}
 
@@ -941,7 +951,9 @@ 
 		$module = Prado::createComponent($moduleClass);
 		foreach($initProperties as $name => $value)
 		{
-			if($name === 'lazy') continue;
+			if($name === 'lazy') {
+				continue;
+			}
 			$module->setSubProperty($name, $value);
 		}
 		$this->setModule($id, $module);
@@ -957,24 +969,29 @@ 
 	 */
 	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
-			return;
+		if($config->getIsEmpty()) {
+					return;
+		}
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias => $path)
-			Prado::setPathOfAlias($alias, $path);
-		foreach($config->getUsings() as $using)
-			Prado::using($using);
+		foreach($config->getAliases() as $alias => $path) {
+					Prado::setPathOfAlias($alias, $path);
+		}
+		foreach($config->getUsings() as $using) {
+					Prado::using($using);
+		}
 
 		// set application properties
 		if(!$withinService)
 		{
-			foreach($config->getProperties() as $name => $value)
-				$this->setSubProperty($name, $value);
+			foreach($config->getProperties() as $name => $value) {
+							$this->setSubProperty($name, $value);
+			}
 		}
 
-		if(empty($this->_services))
-			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+		if(empty($this->_services)) {
+					$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+		}
 
 		// load parameters
 		foreach($config->getParameters() as $id => $parameter)
@@ -982,40 +999,47 @@ 
 			if(is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
-					$component->setSubProperty($name, $value);
+				foreach($parameter[1] as $name => $value) {
+									$component->setSubProperty($name, $value);
+				}
 				$this->_parameters->add($id, $component);
+			} else {
+							$this->_parameters->add($id, $parameter);
 			}
-			else
-				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
 		$modules = [];
 		foreach($config->getModules() as $id => $moduleConfig)
 		{
-			if(!is_string($id))
-				$id = '_module' . count($this->_lazyModules);
+			if(!is_string($id)) {
+							$id = '_module' . count($this->_lazyModules);
+			}
 			$this->_lazyModules[$id] = $moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[] = $module;
+			if($module = $this->internalLoadModule($id)) {
+							$modules[] = $module;
+			}
+		}
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
 
 		// load service
-		foreach($config->getServices() as $serviceID => $serviceConfig)
-			$this->_services[$serviceID] = $serviceConfig;
+		foreach($config->getServices() as $serviceID => $serviceConfig) {
+					$this->_services[$serviceID] = $serviceConfig;
+		}
 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $condition)
 		{
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			if($condition !== true) {
+							$condition = $this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid', $filePath);
+				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path)) {
+									throw new TConfigurationException('application_includefile_invalid', $filePath);
+				}
 				$cn = $this->getApplicationConfigurationClass();
 				$c = new $cn;
 				$c->loadFromFile($path);
@@ -1043,17 +1067,19 @@ 
 			{
 				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile !== null)
-					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
+				if($this->_cacheFile !== null) {
+									file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
+				}
+			} else {
+							$config = unserialize(file_get_contents($this->_cacheFile));
 			}
-			else
-				$config = unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
-			$serviceID = $this->getPageServiceID();
+		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null) {
+					$serviceID = $this->getPageServiceID();
+		}
 
 		$this->startService($serviceID);
 	}
@@ -1070,30 +1096,34 @@ 
 		{
 			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
 			$service = Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500, 'application_service_invalid', $serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
+			if(!($service instanceof IService)) {
+							throw new THttpException(500, 'application_service_invalid', $serviceClass);
+			}
+			if(!$service->getEnabled()) {
+							throw new THttpException(500, 'application_service_unavailable', $serviceClass);
+			}
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name => $value)
-				$service->setSubProperty($name, $value);
+			foreach($initProperties as $name => $value) {
+							$service->setSubProperty($name, $value);
+			}
 
 			if($configElement !== null)
 			{
 				$config = new TApplicationConfiguration;
-				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement, $this->getBasePath());
-				else
-					$config->loadFromXml($configElement, $this->getBasePath());
+				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP) {
+									$config->loadFromPhp($configElement, $this->getBasePath());
+				} else {
+									$config->loadFromXml($configElement, $this->getBasePath());
+				}
 				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
+		} else {
+					throw new THttpException(500, 'application_service_unknown', $serviceID);
 		}
-		else
-			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1190,8 +1220,9 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
-			$this->_service->run();
+		if($this->_service) {
+					$this->_service->run();
+		}
 	}
 
 	/**

framework/Security/TUserManager.php

Braces +37 added lines, -30 removed lines

@@ -117,8 +117,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -134,10 +133,11 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-			$this->loadUserDataFromPhp($config);
-		else
-			$this->loadUserDataFromXml($config);
+		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+					$this->loadUserDataFromPhp($config);
+		} else {
+					$this->loadUserDataFromXml($config);
+		}
 	}
 
 	/**
@@ -158,8 +158,9 @@ 
 				{
 					foreach(explode(',', $roles) as $role)
 					{
-						if(($role = trim($role)) !== '')
-							$this->_roles[$name][] = $role;
+						if(($role = trim($role)) !== '') {
+													$this->_roles[$name][] = $role;
+						}
 					}
 				}
 			}
@@ -172,8 +173,9 @@ 
 				$users = isset($role['users'])?$role['users']:'';
 				foreach(explode(',', $users) as $user)
 				{
-					if(($user = trim($user)) !== '')
-						$this->_roles[strtolower($user)][] = $name;
+					if(($user = trim($user)) !== '') {
+											$this->_roles[strtolower($user)][] = $name;
+					}
 				}
 			}
 		}
@@ -193,8 +195,9 @@ 
 			{
 				foreach(explode(',', $roles) as $role)
 				{
-					if(($role = trim($role)) !== '')
-						$this->_roles[$name][] = $role;
+					if(($role = trim($role)) !== '') {
+											$this->_roles[$name][] = $role;
+					}
 				}
 			}
 		}
@@ -202,8 +205,9 @@ 
 		{
 			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
-				if(($user = trim($user)) !== '')
-					$this->_roles[strtolower($user)][] = $node->getAttribute('name');
+				if(($user = trim($user)) !== '') {
+									$this->_roles[strtolower($user)][] = $node->getAttribute('name');
+				}
 			}
 		}
 	}
@@ -248,10 +252,11 @@ 
 	 */
 	public function setUserFile($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid', $value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('usermanager_userfile_unchangeable');
+		} elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile)) {
+					throw new TConfigurationException('usermanager_userfile_invalid', $value);
+		}
 	}
 
 	/**
@@ -294,10 +299,11 @@ 
 	 */
 	public function validateUser($username, $password)
 	{
-		if($this->_passwordMode === TUserManagerPasswordMode::MD5)
-			$password = md5($password);
-		elseif($this->_passwordMode === TUserManagerPasswordMode::SHA1)
-			$password = sha1($password);
+		if($this->_passwordMode === TUserManagerPasswordMode::MD5) {
+					$password = md5($password);
+		} elseif($this->_passwordMode === TUserManagerPasswordMode::SHA1) {
+					$password = sha1($password);
+		}
 		$username = strtolower($username);
 		return (isset($this->_users[$username]) && $this->_users[$username] === $password);
 	}
@@ -314,8 +320,7 @@ 
 			$user = new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username = strtolower($username);
 			if(isset($this->_users[$username]))
@@ -323,12 +328,13 @@ 
 				$user = new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				if(isset($this->_roles[$username]))
-					$user->setRoles($this->_roles[$username]);
+				if(isset($this->_roles[$username])) {
+									$user->setRoles($this->_roles[$username]);
+				}
 				return $user;
+			} else {
+							return null;
 			}
-			else
-				return null;
 		}
 	}
 
@@ -346,8 +352,9 @@ 
 			if(is_array($data) && count($data) === 2)
 			{
 				list($username, $token) = $data;
-				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username]))
-					return $this->getUser($username);
+				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username])) {
+									return $this->getUser($username);
+				}
 			}
 		}
 		return null;

framework/Security/TAuthManager.php

Braces +57 added lines, -40 removed lines

@@ -89,17 +89,21 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager === null)
-			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName === null)
-			$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		if($this->_userManager === null) {
+					throw new TConfigurationException('authmanager_usermanager_required');
+		}
+		if($this->_returnUrlVarName === null) {
+					$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		}
 		$application = $this->getApplication();
 		if(is_string($this->_userManager))
 		{
-			if(($users = $application->getModule($this->_userManager)) === null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
-			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+			if(($users = $application->getModule($this->_userManager)) === null) {
+							throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
+			}
+			if(!($users instanceof IUserManager)) {
+							throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+			}
 			$this->_userManager = $users;
 		}
 		$application->attachEventHandler('OnAuthentication', [$this,'doAuthentication']);
@@ -122,10 +126,12 @@ 
 	 */
 	public function setUserManager($provider)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
-		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
+		}
+		if(!is_string($provider) && !($provider instanceof IUserManager)) {
+					throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+		}
 		$this->_userManager = $provider;
 	}
 
@@ -160,8 +166,9 @@ 
 		$this->onAuthenticate($param);
 
 		$service = $this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
-			$this->_skipAuthorization = true;
+		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage()) {
+					$this->_skipAuthorization = true;
+		}
 	}
 
 	/**
@@ -284,8 +291,9 @@ 
 		$application = $this->getApplication();
 
 		// restoring user info from session
-		if(($session = $application->getSession()) === null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session = $application->getSession()) === null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$session->open();
 		$sessionInfo = $session->itemAt($this->getUserKey());
 		$user = $this->_userManager->getUser(null)->loadFromString($sessionInfo);
@@ -313,14 +321,16 @@ 
 		$application->setUser($user);
 
 		// handle authentication expiration or update expiration time
-		if($isAuthExpired)
-			$this->onAuthExpire($param);
-		else
-			$session->add('AuthExpireTime', time() + $this->_authExpire);
+		if($isAuthExpired) {
+					$this->onAuthExpire($param);
+		} else {
+					$session->add('AuthExpireTime', time() + $this->_authExpire);
+		}
 
 		// event handler gets a chance to do further auth work
-		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate', $this, $application);
+		if($this->hasEventHandler('OnAuthenticate')) {
+					$this->raiseEvent('OnAuthenticate', $this, $application);
+		}
 	}
 
 	/**
@@ -331,8 +341,9 @@ 
 	public function onAuthExpire($param)
 	{
 		$this->logout();
-		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire', $this, $param);
+		if($this->hasEventHandler('OnAuthExpire')) {
+					$this->raiseEvent('OnAuthExpire', $this, $param);
+		}
 	}
 
 	/**
@@ -345,8 +356,9 @@ 
 	public function onAuthorize($param)
 	{
 		$application = $this->getApplication();
-		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize', $this, $application);
+		if($this->hasEventHandler('OnAuthorize')) {
+					$this->raiseEvent('OnAuthorize', $this, $application);
+		}
 		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
@@ -360,8 +372,9 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey === null)
-			$this->_userKey = $this->generateUserKey();
+		if($this->_userKey === null) {
+					$this->_userKey = $this->generateUserKey();
+		}
 		return $this->_userKey;
 	}
 
@@ -383,10 +396,11 @@ 
 	{
 		if(!$user->getIsGuest())
 		{
-			if(($session = $this->getSession()) === null)
-				throw new TConfigurationException('authmanager_session_required');
-			else
-				$session->add($this->getUserKey(), $user->saveToString());
+			if(($session = $this->getSession()) === null) {
+							throw new TConfigurationException('authmanager_session_required');
+			} else {
+							$session->add($this->getUserKey(), $user->saveToString());
+			}
 		}
 	}
 
@@ -398,8 +412,9 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user = $this->_userManager->getUser($username)) === null)
-			return false;
+		if(($user = $this->_userManager->getUser($username)) === null) {
+					return false;
+		}
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
 		return true;
@@ -418,8 +433,9 @@ 
 	{
 		if($this->_userManager->validateUser($username, $password))
 		{
-			if(($user = $this->_userManager->getUser($username)) === null)
-				return false;
+			if(($user = $this->_userManager->getUser($username)) === null) {
+							return false;
+			}
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
@@ -431,9 +447,9 @@ 
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -443,8 +459,9 @@ 
 	 */
 	public function logout()
 	{
-		if(($session = $this->getSession()) === null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session = $this->getSession()) === null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
 		if($this->getAllowAutoLogin())

framework/Security/TDbUser.php

Braces +3 added lines, -2 removed lines

@@ -49,8 +49,9 @@
 					$this->_connection = $connection;
 				}
 			}
-			if($this->_connection === null)
-				throw new TConfigurationException('dbuser_dbconnection_invalid');
+			if($this->_connection === null) {
+							throw new TConfigurationException('dbuser_dbconnection_invalid');
+			}
 		}
 		return $this->_connection;
 	}