pradosoft / prado

framework/Security/TAuthorizationRuleCollection.php

Braces +10 added lines, -8 removed lines

@@ -37,13 +37,14 @@ 
 			$verb = strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
-					return ($decision > 0);
+				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0) {
+									return ($decision > 0);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -56,9 +57,10 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		if($item instanceof TAuthorizationRule) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		}
 	}
 }
\ No newline at end of file

framework/Security/TUser.php

Braces +20 added lines, -15 removed lines

@@ -112,15 +112,16 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
-			$this->setState('Roles', $value, []);
-		else
+		if(is_array($value)) {
+					$this->setState('Roles', $value, []);
+		} else
 		{
 			$roles = [];
 			foreach(explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
-					$roles[] = $role;
+				if(($role = trim($role)) !== '') {
+									$roles[] = $role;
+				}
 			}
 			$this->setState('Roles', $roles, []);
 		}
@@ -132,9 +133,10 @@ 
 	 */
 	public function isInRole($role)
 	{
-		foreach($this->getRoles() as $r)
-			if(strcasecmp($role, $r) === 0)
+		foreach($this->getRoles() as $r) {
+					if(strcasecmp($role, $r) === 0)
 				return true;
+		}
 		return false;
 	}
 
@@ -152,10 +154,12 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
-			$this->_state = unserialize($data);
-		if(!is_array($this->_state))
-			$this->_state = [];
+		if(!empty($data)) {
+					$this->_state = unserialize($data);
+		}
+		if(!is_array($this->_state)) {
+					$this->_state = [];
+		}
 		return $this;
 	}
 
@@ -193,10 +197,11 @@ 
 	 */
 	protected function setState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
-			unset($this->_state[$key]);
-		else
-			$this->_state[$key] = $value;
+		if($value === $defaultValue) {
+					unset($this->_state[$key]);
+		} else {
+					$this->_state[$key] = $value;
+		}
 		$this->_stateChanged = true;
 	}
 

framework/Security/TDbUserManager.php

Braces +18 added lines, -14 removed lines

@@ -61,11 +61,13 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
-			throw new TConfigurationException('dbusermanager_userclass_required');
+		if($this->_userClass === '') {
+					throw new TConfigurationException('dbusermanager_userclass_required');
+		}
 		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
-		if(!($this->_userFactory instanceof TDbUser))
-			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
+		if(!($this->_userFactory instanceof TDbUser)) {
+					throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
+		}
 	}
 
 	/**
@@ -123,9 +125,9 @@ 
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
+		} else {
+					return $this->_userFactory->createUser($username);
 		}
-		else
-			return $this->_userFactory->createUser($username);
 	}
 
 	/**
@@ -171,13 +173,14 @@ 
 		if($connectionID !== '')
 		{
 			$conn = $this->getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
-				return $conn->getDbConnection();
-			else
-				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
+			if($conn instanceof TDataSourceConfig) {
+							return $conn->getDbConnection();
+			} else {
+							throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
+			}
+		} else {
+					throw new TConfigurationException('dbusermanager_connectionid_required');
 		}
-		else
-			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 
 	/**
@@ -199,7 +202,8 @@ 
 	public function saveUserToCookie($cookie)
 	{
 		$user = $this->getApplication()->getUser();
-		if($user instanceof TDbUser)
-			$user->saveUserToCookie($cookie);
+		if($user instanceof TDbUser) {
+					$user->saveUserToCookie($cookie);
+		}
 	}
 }
\ No newline at end of file

framework/Security/TSecurityManager.php

Braces +19 added lines, -14 removed lines

@@ -99,8 +99,9 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
+		}
 
 		$this->_validationKey = $value;
 	}
@@ -126,8 +127,9 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
-			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		if('' === $value) {
+					throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
+		}
 
 		$this->_encryptionKey = $value;
 	}
@@ -148,8 +150,9 @@ 
 	public function setHashAlgorithm($value)
 	{
 		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
-		if(!in_array($this->_hashAlgorithm, hash_algos()))
-			throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
+		if(!in_array($this->_hashAlgorithm, hash_algos())) {
+					throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
+		}
 	}
 
 	/**
@@ -167,8 +170,9 @@ 
 	public function setCryptAlgorithm($value)
 	{
 		$this->_cryptAlgorithm = TPropertyValue::ensureString($value);
-		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
-			throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
+		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods())) {
+					throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
+		}
 	}
 
 	/**
@@ -184,9 +188,9 @@ 
 			$key = md5($this->getEncryptionKey());
 			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return $iv . openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
+		} else {
+					throw new TNotSupportedException('securitymanager_openssl_required');
 		}
-		else
-			throw new TNotSupportedException('securitymanager_openssl_required');
 	}
 
 	/**
@@ -202,9 +206,9 @@ 
 			$key = md5($this->getEncryptionKey());
 			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return openssl_decrypt($this->substr($data, $this->strlen($iv), $this->strlen($data)), $this->_cryptAlgorithm, $key, null, $iv);
+		} else {
+					throw new TNotSupportedException('securitymanager_openssl_required');
 		}
-		else
-			throw new TNotSupportedException('securitymanager_openssl_required');
 	}
 
 	/**
@@ -229,8 +233,9 @@ 
 	{
 		$len = $this->strlen($this->computeHMAC('test'));
 
-		if($this->strlen($data) < $len)
-			return false;
+		if($this->strlen($data) < $len) {
+					return false;
+		}
 
 		$hmac = $this->substr($data, 0, $len);
 		$data2 = $this->substr($data, $len, $this->strlen($data));

framework/Wsat/TWsatBaseGenerator.php

Braces +12 added lines, -8 removed lines

@@ -33,8 +33,9 @@ 
 
 	public function __construct()
 	{
-		if (!class_exists("TActiveRecordManager", false))
-			throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
+		if (!class_exists("TActiveRecordManager", false)) {
+					throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
+		}
 		$ar_manager = TActiveRecordManager::getInstance();
 		$_conn = $ar_manager->getDbConnection();
 		$_conn->Active = true;
@@ -44,10 +45,12 @@ 
 	public function setOpFile($op_file_namespace)
 	{
 		$op_file = Prado::getPathOfNamespace($op_file_namespace);
-		if (empty($op_file))
-			throw new Exception("You need to fix your output folder namespace.");
-		if (!is_dir($op_file))
-			mkdir($op_file, 0777, true);
+		if (empty($op_file)) {
+					throw new Exception("You need to fix your output folder namespace.");
+		}
+		if (!is_dir($op_file)) {
+					mkdir($op_file, 0777, true);
+		}
 		$this->_opFile = $op_file;
 	}
 
@@ -68,8 +71,9 @@ 
 	{
 		$tableNames = $this->_dbMetaData->findTableNames();
 		$index = array_search('pradocache', $tableNames);
-		if ($index)
-			array_splice($tableNames, $index, 1);
+		if ($index) {
+					array_splice($tableNames, $index, 1);
+		}
 		return $tableNames;
 	}
 

framework/Wsat/TWsatARGenerator.php

Braces +24 added lines, -15 removed lines

@@ -71,8 +71,10 @@ 
 						if (!empty($this->_relations))
 						{
 								// Cancel generation of M-M relationships middle table
-								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+								if (count($tableInfo->getPrimaryKeys()) === 2 && count($tableInfo->getColumns()) === 2) {
+									//M-M relationships
 										continue;
+								}
 						}
 						$this->_commonGenerate($tableName, $tableInfo);
 				}
@@ -87,9 +89,11 @@ 
 						$pks = $tableInfo->getPrimaryKeys();
 						$fks = $tableInfo->getForeignKeys();
 
-						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2)//M-M relationships
+						if (count($pks) === 2 && count($tableInfo->getColumns()) === 2) {
+							//M-M relationships
 						{
 								$table_name_mm = $fks[0]["table"];
+						}
 								$table_name_mm2 = $fks[1]["table"];
 
 								$this->_relations[$table_name_mm][] = [
@@ -107,9 +111,11 @@ 
 								];
 								continue;
 						}
-						foreach ($fks as $fk_data)//1-M relationships
+						foreach ($fks as $fk_data) {
+							//1-M relationships
 						{
 								$owner_table = $fk_data["table"];
+						}
 								$slave_table = $table_name;
 								$fk_prop = key($fk_data["keys"]);
 
@@ -136,13 +142,14 @@ 
 
 		private function _commonGenerate($tableName, $tableInfo)
 		{
-				if (count($tableInfo->getColumns()) === 0)
-						throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
-				else
+				if (count($tableInfo->getColumns()) === 0) {
+										throw new Exception("Unable to find table or view $tableName in " . $this->_dbMetaData->getDbConnection()->getConnectionString() . ".");
+				} else
 				{
 						$properties = [];
-						foreach ($tableInfo->getColumns() as $field => $metadata)
-								$properties[] = $this->generateProperty($field, $metadata);
+						foreach ($tableInfo->getColumns() as $field => $metadata) {
+														$properties[] = $this->generateProperty($field, $metadata);
+						}
 						$toString = $this->_buildSmartToString($tableInfo);
 				}
 
@@ -175,12 +182,14 @@ 
 
 		private function _renderRelations($tablename)
 		{
-				if (!isset($this->_relations[$tablename]))
-						return "";
+				if (!isset($this->_relations[$tablename])) {
+										return "";
+				}
 
 				$code = "\tpublic static \$RELATIONS = array (";
-				foreach ($this->_relations[$tablename] as $rel_data)
-						$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				foreach ($this->_relations[$tablename] as $rel_data) {
+										$code .= "\n\t\t'" . $rel_data["prop_name"] . "' => array(" . $rel_data["rel_type"] . ", '" . $rel_data["ref_class_name"] . "', '" . $rel_data["prop_ref"] . "'),";
+				}
 
 				$code = substr($code, 0, -1);
 				$code .= "\n\t);";
@@ -195,9 +204,9 @@ 
 				{
 						foreach ($tableInfo->getColumns() as $column)
 						{
-								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey)
-										$property = str_replace($this->uqChars, "", $column->ColumnName);
-								elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
+								if (isset($column->IsPrimaryKey) && $column->IsPrimaryKey) {
+																		$property = str_replace($this->uqChars, "", $column->ColumnName);
+								} elseif ($column->PdoType == PDO::PARAM_STR && $column->DBType != "date")
 								{
 										$property = str_replace($this->uqChars, "", $column->ColumnName);
 										break;

framework/Wsat/TWsatService.php

Braces +6 added lines, -4 removed lines

@@ -48,11 +48,13 @@
 
 		public function init($config)
 		{
-				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal)
-						throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
+				if ($this->getApplication()->getMode() === TApplicationMode::Performance || $this->getApplication()->getMode() === TApplicationMode::Normal) {
+										throw new TInvalidOperationException("You should not use Prado WSAT in any of the production modes.");
+				}
 
-				if (empty($this->_pass))
-						throw new TConfigurationException("You need to specify the Password attribute.");
+				if (empty($this->_pass)) {
+										throw new TConfigurationException("You need to specify the Password attribute.");
+				}
 
 				$this->setDefaultPage("TWsatHome");
 				$this->_startThemeManager();

framework/Wsat/pages/TWsatGenerateAR.php

Braces +8 added lines, -6 removed lines

@@ -37,13 +37,15 @@
 								$ar_generator->setClasPrefix($classPrefix);
 								$ar_generator->setClassSufix($classSuffix);
 
-								if ($this->build_rel->Checked)
-										$ar_generator->buildRelations();
+								if ($this->build_rel->Checked) {
+																		$ar_generator->buildRelations();
+								}
 
-								if ($tableName != "*")
-										$ar_generator->generate($tableName);
-								else
-										$ar_generator->generateAll();
+								if ($tableName != "*") {
+																		$ar_generator->generate($tableName);
+								} else {
+																		$ar_generator->generateAll();
+								}
 
 								$this->feedback_panel->CssClass = "green_panel";
 								$this->generation_msg->Text = "The code has been generated successfully.";

framework/TApplicationComponent.php

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);