pradosoft / prado

framework/Security/TAuthorizationRuleCollection.php

Spacing +2 added lines, -2 removed lines

@@ -34,10 +34,10 @@
 	{
 		if($user instanceof IUser)
 		{
-			$verb = strtolower(trim($verb));
+			$verb=strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+				if(($decision=$rule->isUserAllowed($user, $verb, $ip))!==0)
 					return ($decision > 0);
 			}
 			return true;

framework/Security/TUserManagerPasswordMode.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@
  */
 class TUserManagerPasswordMode extends \Prado\TEnumerable
 {
-	const Clear = 'Clear';
-	const MD5 = 'MD5';
-	const SHA1 = 'SHA1';
+	const Clear='Clear';
+	const MD5='MD5';
+	const SHA1='SHA1';
 }
\ No newline at end of file

framework/Security/TDbUser.php

Spacing +5 added lines, -5 removed lines

@@ -37,19 +37,19 @@
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
+		if($this->_connection===null)
 		{
-			$userManager = $this->getManager();
+			$userManager=$this->getManager();
 			if($userManager instanceof TDbUserManager)
 			{
-				$connection = $userManager->getDbConnection();
+				$connection=$userManager->getDbConnection();
 				if($connection instanceof TDbConnection)
 				{
 					$connection->setActive(true);
-					$this->_connection = $connection;
+					$this->_connection=$connection;
 				}
 			}
-			if($this->_connection === null)
+			if($this->_connection===null)
 				throw new TConfigurationException('dbuser_dbconnection_invalid');
 		}
 		return $this->_connection;

framework/Security/TUserManager.php

Spacing +52 added lines, -52 removed lines

@@ -75,28 +75,28 @@ 
 	/**
 	 * extension name to the user file
 	 */
-	const USER_FILE_EXT = '.xml';
+	const USER_FILE_EXT='.xml';
 
 	/**
 	 * @var array list of users managed by this module
 	 */
-	private $_users = [];
+	private $_users=[];
 	/**
 	 * @var array list of roles managed by this module
 	 */
-	private $_roles = [];
+	private $_roles=[];
 	/**
 	 * @var string guest name
 	 */
-	private $_guestName = 'Guest';
+	private $_guestName='Guest';
 	/**
 	 * @var TUserManagerPasswordMode password mode
 	 */
-	private $_passwordMode = TUserManagerPasswordMode::MD5;
+	private $_passwordMode=TUserManagerPasswordMode::MD5;
 	/**
 	 * @var boolean whether the module has been initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var string user/role information file
 	 */
@@ -111,21 +111,21 @@ 
 	public function init($config)
 	{
 		$this->loadUserData($config);
-		if($this->_userFile !== null)
+		if($this->_userFile!==null)
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			{
-				$userFile = include $this->_userFile;
+				$userFile=include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
 			}
 			else
 			{
-				$dom = new TXmlDocument;
+				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
 				$this->loadUserDataFromXml($dom);
 			}
 		}
-		$this->_initialized = true;
+		$this->_initialized=true;
 	}
 
 	/*
@@ -134,7 +134,7 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 			$this->loadUserDataFromPhp($config);
 		else
 			$this->loadUserDataFromXml($config);
@@ -150,16 +150,16 @@ 
 		{
 			foreach($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
-				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
-				if($roles !== '')
+				$name=trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password=isset($user['password']) ? $user['password'] : '';
+				$this->_users[$name]=$password;
+				$roles=isset($user['roles']) ? $user['roles'] : '';
+				if($roles!=='')
 				{
 					foreach(explode(',', $roles) as $role)
 					{
-						if(($role = trim($role)) !== '')
-							$this->_roles[$name][] = $role;
+						if(($role=trim($role))!=='')
+							$this->_roles[$name][]=$role;
 					}
 				}
 			}
@@ -168,12 +168,12 @@ 
 		{
 			foreach($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
+				$name=isset($role['name']) ? $role['name'] : '';
+				$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;
 				}
 			}
 		}
@@ -187,14 +187,14 @@ 
 	{
 		foreach($xmlNode->getElementsByTagName('user') as $node)
 		{
-			$name = trim(strtolower($node->getAttribute('name')));
-			$this->_users[$name] = $node->getAttribute('password');
-			if(($roles = trim($node->getAttribute('roles'))) !== '')
+			$name=trim(strtolower($node->getAttribute('name')));
+			$this->_users[$name]=$node->getAttribute('password');
+			if(($roles=trim($node->getAttribute('roles')))!=='')
 			{
 				foreach(explode(',', $roles) as $role)
 				{
-					if(($role = trim($role)) !== '')
-						$this->_roles[$name][] = $role;
+					if(($role=trim($role))!=='')
+						$this->_roles[$name][]=$role;
 				}
 			}
 		}
@@ -202,8 +202,8 @@ 
 		{
 			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');
 			}
 		}
 	}
@@ -250,7 +250,7 @@ 
 	{
 		if($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
+		elseif(($this->_userFile=Prado::getPathOfNamespace($value, self::USER_FILE_EXT))===null || !is_file($this->_userFile))
 			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
@@ -267,7 +267,7 @@ 
 	 */
 	public function setGuestName($value)
 	{
-		$this->_guestName = $value;
+		$this->_guestName=$value;
 	}
 
 	/**
@@ -283,7 +283,7 @@ 
 	 */
 	public function setPasswordMode($value)
 	{
-		$this->_passwordMode = TPropertyValue::ensureEnum($value, 'Prado\\Security\\TUserManagerPasswordMode');
+		$this->_passwordMode=TPropertyValue::ensureEnum($value, 'Prado\\Security\\TUserManagerPasswordMode');
 	}
 
 	/**
@@ -294,12 +294,12 @@ 
 	 */
 	public function validateUser($username, $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);
+		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);
 	}
 
 	/**
@@ -307,20 +307,20 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username = null)
+	public function getUser($username=null)
 	{
-		if($username === null)
+		if($username===null)
 		{
-			$user = new TUser($this);
+			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
 		}
 		else
 		{
-			$username = strtolower($username);
+			$username=strtolower($username);
 			if(isset($this->_users[$username]))
 			{
-				$user = new TUser($this);
+				$user=new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
 				if(isset($this->_roles[$username]))
@@ -340,13 +340,13 @@ 
 	 */
 	public function getUserFromCookie($cookie)
 	{
-		if(($data = $cookie->getValue()) !== '')
+		if(($data=$cookie->getValue())!=='')
 		{
-			$data = unserialize($data);
-			if(is_array($data) && count($data) === 2)
+			$data=unserialize($data);
+			if(is_array($data) && count($data)===2)
 			{
-				list($username, $token) = $data;
-				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username]))
+				list($username, $token)=$data;
+				if(isset($this->_users[$username]) && $token===md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
 		}
@@ -360,11 +360,11 @@ 
 	 */
 	public function saveUserToCookie($cookie)
 	{
-		$user = $this->getApplication()->getUser();
-		$username = strtolower($user->getName());
+		$user=$this->getApplication()->getUser();
+		$username=strtolower($user->getName());
 		if(isset($this->_users[$username]))
 		{
-			$data = [$username,md5($username . $this->_users[$username])];
+			$data=[$username, md5($username.$this->_users[$username])];
 			$cookie->setValue(serialize($data));
 		}
 	}

framework/Security/TAuthManager.php

Spacing +49 added lines, -49 removed lines

@@ -47,11 +47,11 @@ 
 	/**
 	 * GET variable name for return url
 	 */
-	const RETURN_URL_VAR = 'ReturnUrl';
+	const RETURN_URL_VAR='ReturnUrl';
 	/**
 	 * @var boolean if the module has been initialized
 	 */
-	private $_initialized = false;
+	private $_initialized=false;
 	/**
 	 * @var IUserManager user manager instance
 	 */
@@ -63,7 +63,7 @@ 
 	/**
 	 * @var boolean whether authorization should be skipped
 	 */
-	private $_skipAuthorization = false;
+	private $_skipAuthorization=false;
 	/**
 	 * @var string the session var name for storing return URL
 	 */
@@ -71,7 +71,7 @@ 
 	/**
 	 * @var boolean whether to allow auto login (using cookie)
 	 */
-	private $_allowAutoLogin = false;
+	private $_allowAutoLogin=false;
 	/**
 	 * @var string variable name used to store user session or cookie
 	 */
@@ -79,7 +79,7 @@ 
 	/**
 	 * @var integer authentication expiration time in seconds. Defaults to zero (no expiration)
 	 */
-	private $_authExpire = 0;
+	private $_authExpire=0;
 
 	/**
 	 * Initializes this module.
@@ -89,23 +89,23 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager === null)
+		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($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)
+			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;
+			$this->_userManager=$users;
 		}
-		$application->attachEventHandler('OnAuthentication', [$this,'doAuthentication']);
-		$application->attachEventHandler('OnEndRequest', [$this,'leave']);
-		$application->attachEventHandler('OnAuthorization', [$this,'doAuthorization']);
-		$this->_initialized = true;
+		$application->attachEventHandler('OnAuthentication', [$this, 'doAuthentication']);
+		$application->attachEventHandler('OnEndRequest', [$this, 'leave']);
+		$application->attachEventHandler('OnAuthorization', [$this, 'doAuthorization']);
+		$this->_initialized=true;
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
 		if(!is_string($provider) && !($provider instanceof IUserManager))
 			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
-		$this->_userManager = $provider;
+		$this->_userManager=$provider;
 	}
 
 	/**
@@ -145,7 +145,7 @@ 
 	 */
 	public function setLoginPage($pagePath)
 	{
-		$this->_loginPage = $pagePath;
+		$this->_loginPage=$pagePath;
 	}
 
 	/**
@@ -159,9 +159,9 @@ 
 	{
 		$this->onAuthenticate($param);
 
-		$service = $this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
-			$this->_skipAuthorization = true;
+		$service=$this->getService();
+		if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage())
+			$this->_skipAuthorization=true;
 	}
 
 	/**
@@ -188,15 +188,15 @@ 
 	 */
 	public function leave($sender, $param)
 	{
-		$application = $this->getApplication();
-		if($application->getResponse()->getStatusCode() === 401)
+		$application=$this->getApplication();
+		if($application->getResponse()->getStatusCode()===401)
 		{
-			$service = $application->getService();
+			$service=$application->getService();
 			if($service instanceof TPageService)
 			{
-				$returnUrl = $application->getRequest()->getRequestUri();
+				$returnUrl=$application->getRequest()->getRequestUri();
 				$this->setReturnUrl($returnUrl);
-				$url = $service->constructUrl($this->getLoginPage());
+				$url=$service->constructUrl($this->getLoginPage());
 				$application->getResponse()->redirect($url);
 			}
 		}
@@ -215,7 +215,7 @@ 
 	 */
 	public function setReturnUrlVarName($value)
 	{
-		$this->_returnUrlVarName = $value;
+		$this->_returnUrlVarName=$value;
 	}
 
 	/**
@@ -250,7 +250,7 @@ 
 	 */
 	public function setAllowAutoLogin($value)
 	{
-		$this->_allowAutoLogin = TPropertyValue::ensureBoolean($value);
+		$this->_allowAutoLogin=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
 	 */
 	public function setAuthExpire($value)
 	{
-		$this->_authExpire = TPropertyValue::ensureInteger($value);
+		$this->_authExpire=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -281,31 +281,31 @@ 
 	 */
 	public function onAuthenticate($param)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 
 		// restoring user info from session
-		if(($session = $application->getSession()) === null)
+		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);
+		$sessionInfo=$session->itemAt($this->getUserKey());
+		$user=$this->_userManager->getUser(null)->loadFromString($sessionInfo);
 
 		// check for authentication expiration
-		$isAuthExpired = $this->_authExpire > 0 && !$user->getIsGuest() &&
-		($expiretime = $session->itemAt('AuthExpireTime')) && $expiretime < time();
+		$isAuthExpired=$this->_authExpire > 0 && !$user->getIsGuest() &&
+		($expiretime=$session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
 		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
 		{
-			$cookie = $this->getRequest()->getCookies()->itemAt($this->getUserKey());
+			$cookie=$this->getRequest()->getCookies()->itemAt($this->getUserKey());
 			if($cookie instanceof THttpCookie)
 			{
-				if(($user2 = $this->_userManager->getUserFromCookie($cookie)) !== null)
+				if(($user2=$this->_userManager->getUserFromCookie($cookie))!==null)
 				{
-					$user = $user2;
+					$user=$user2;
 					$this->updateSessionUser($user);
 					// user is restored from cookie, auth may not expire
-					$isAuthExpired = false;
+					$isAuthExpired=false;
 				}
 			}
 		}
@@ -344,7 +344,7 @@ 
 	 */
 	public function onAuthorize($param)
 	{
-		$application = $this->getApplication();
+		$application=$this->getApplication();
 		if($this->hasEventHandler('OnAuthorize'))
 			$this->raiseEvent('OnAuthorize', $this, $application);
 		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
@@ -360,8 +360,8 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey === null)
-			$this->_userKey = $this->generateUserKey();
+		if($this->_userKey===null)
+			$this->_userKey=$this->generateUserKey();
 		return $this->_userKey;
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	protected function generateUserKey()
 	{
-		return md5($this->getApplication()->getUniqueID() . 'prado:user');
+		return md5($this->getApplication()->getUniqueID().'prado:user');
 	}
 
 	/**
@@ -383,7 +383,7 @@ 
 	{
 		if(!$user->getIsGuest())
 		{
-			if(($session = $this->getSession()) === null)
+			if(($session=$this->getSession())===null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
 				$session->add($this->getUserKey(), $user->saveToString());
@@ -398,7 +398,7 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user = $this->_userManager->getUser($username)) === null)
+		if(($user=$this->_userManager->getUser($username))===null)
 			return false;
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
@@ -414,18 +414,18 @@ 
 	 * @param integer number of seconds that automatic login will remain effective. If 0, it means user logs out when session ends. This parameter is added since 3.1.1.
 	 * @return boolean if login is successful
 	 */
-	public function login($username, $password, $expire = 0)
+	public function login($username, $password, $expire=0)
 	{
 		if($this->_userManager->validateUser($username, $password))
 		{
-			if(($user = $this->_userManager->getUser($username)) === null)
+			if(($user=$this->_userManager->getUser($username))===null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
 			if($expire > 0)
 			{
-				$cookie = new THttpCookie($this->getUserKey(), '');
+				$cookie=new THttpCookie($this->getUserKey(), '');
 				$cookie->setExpire(time() + $expire);
 				$this->_userManager->saveUserToCookie($cookie);
 				$this->getResponse()->getCookies()->add($cookie);
@@ -443,13 +443,13 @@ 
 	 */
 	public function logout()
 	{
-		if(($session = $this->getSession()) === null)
+		if(($session=$this->getSession())===null)
 			throw new TConfigurationException('authmanager_session_required');
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
 		if($this->getAllowAutoLogin())
 		{
-			$cookie = new THttpCookie($this->getUserKey(), '');
+			$cookie=new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);
 		}
 	}

framework/Security/TUser.php

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var boolean whether user state is changed
 	 */
-	private $_stateChanged = false;
+	private $_stateChanged=false;
 	/**
 	 * @var IUserManager user manager
 	 */
@@ -49,8 +49,8 @@ 
 	 */
 	public function __construct(IUserManager $manager)
 	{
-		$this->_state = [];
-		$this->_manager = $manager;
+		$this->_state=[];
+		$this->_manager=$manager;
 		$this->setName($manager->getGuestName());
 	}
 
@@ -91,7 +91,7 @@ 
 	 */
 	public function setIsGuest($value)
 	{
-		if($isGuest = TPropertyValue::ensureBoolean($value))
+		if($isGuest=TPropertyValue::ensureBoolean($value))
 		{
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles([]);
@@ -116,11 +116,11 @@ 
 			$this->setState('Roles', $value, []);
 		else
 		{
-			$roles = [];
+			$roles=[];
 			foreach(explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
-					$roles[] = $role;
+				if(($role=trim($role))!=='')
+					$roles[]=$role;
 			}
 			$this->setState('Roles', $roles, []);
 		}
@@ -133,7 +133,7 @@ 
 	public function isInRole($role)
 	{
 		foreach($this->getRoles() as $r)
-			if(strcasecmp($role, $r) === 0)
+			if(strcasecmp($role, $r)===0)
 				return true;
 		return false;
 	}
@@ -153,9 +153,9 @@ 
 	public function loadFromString($data)
 	{
 		if(!empty($data))
-			$this->_state = unserialize($data);
+			$this->_state=unserialize($data);
 		if(!is_array($this->_state))
-			$this->_state = [];
+			$this->_state=[];
 		return $this;
 	}
 
@@ -172,9 +172,9 @@ 
 	 * @return mixed the value of the variable. If it doesn't exist, the provided default value will be returned
 	 * @see setState
 	 */
-	protected function getState($key, $defaultValue = null)
+	protected function getState($key, $defaultValue=null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**
@@ -191,13 +191,13 @@ 
 	 * @param mixed default value. If $value===$defaultValue, the variable will be removed from persistent storage.
 	 * @see getState
 	 */
-	protected function setState($key, $value, $defaultValue = null)
+	protected function setState($key, $value, $defaultValue=null)
 	{
-		if($value === $defaultValue)
+		if($value===$defaultValue)
 			unset($this->_state[$key]);
 		else
-			$this->_state[$key] = $value;
-		$this->_stateChanged = true;
+			$this->_state[$key]=$value;
+		$this->_stateChanged=true;
 	}
 
 	/**
@@ -213,7 +213,7 @@ 
 	 */
 	public function setStateChanged($value)
 	{
-		$this->_stateChanged = TPropertyValue::ensureBoolean($value);
+		$this->_stateChanged=TPropertyValue::ensureBoolean($value);
 	}
 }
 

framework/Security/TDbUserManager.php

Spacing +16 added lines, -16 removed lines

@@ -48,10 +48,10 @@ 
  */
 class TDbUserManager extends \Prado\TModule implements IUserManager
 {
-	private $_connID = '';
+	private $_connID='';
 	private $_conn;
-	private $_guestName = 'Guest';
-	private $_userClass = '';
+	private $_guestName='Guest';
+	private $_userClass='';
 	private $_userFactory;
 
 	/**
@@ -61,9 +61,9 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
+		if($this->_userClass==='')
 			throw new TConfigurationException('dbusermanager_userclass_required');
-		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
+		$this->_userFactory=Prado::createComponent($this->_userClass, $this);
 		if(!($this->_userFactory instanceof TDbUser))
 			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
@@ -81,7 +81,7 @@ 
 	 */
 	public function setUserClass($value)
 	{
-		$this->_userClass = $value;
+		$this->_userClass=$value;
 	}
 
 	/**
@@ -97,7 +97,7 @@ 
 	 */
 	public function setGuestName($value)
 	{
-		$this->_guestName = $value;
+		$this->_guestName=$value;
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username = null)
+	public function getUser($username=null)
 	{
-		if($username === null)
+		if($username===null)
 		{
-			$user = Prado::createComponent($this->_userClass, $this);
+			$user=Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
 		}
@@ -144,7 +144,7 @@ 
 	 */
 	public function setConnectionID($value)
 	{
-		$this->_connID = $value;
+		$this->_connID=$value;
 	}
 
 	/**
@@ -152,9 +152,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if($this->_conn===null)
 		{
-			$this->_conn = $this->createDbConnection($this->_connID);
+			$this->_conn=$this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
 		}
 		return $this->_conn;
@@ -168,9 +168,9 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID !== '')
+		if($connectionID!=='')
 		{
-			$conn = $this->getApplication()->getModule($connectionID);
+			$conn=$this->getApplication()->getModule($connectionID);
 			if($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
@@ -198,7 +198,7 @@ 
 	 */
 	public function saveUserToCookie($cookie)
 	{
-		$user = $this->getApplication()->getUser();
+		$user=$this->getApplication()->getUser();
 		if($user instanceof TDbUser)
 			$user->saveUserToCookie($cookie);
 	}

framework/Security/TSecurityManager.php

Spacing +28 added lines, -28 removed lines

@@ -50,13 +50,13 @@ 
  */
 class TSecurityManager extends \Prado\TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
 
 	private $_validationKey;
 	private $_encryptionKey;
-	private $_hashAlgorithm = 'sha256';
-	private $_cryptAlgorithm = 'aes-256-cbc';
+	private $_hashAlgorithm='sha256';
+	private $_cryptAlgorithm='aes-256-cbc';
 	private $_mbstring;
 
 	/**
@@ -66,7 +66,7 @@ 
 	 */
 	public function init($config)
 	{
-		$this->_mbstring = extension_loaded('mbstring');
+		$this->_mbstring=extension_loaded('mbstring');
 		$this->getApplication()->setSecurityManager($this);
 	}
 
@@ -84,9 +84,9 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -99,10 +99,10 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 
 	/**
@@ -111,9 +111,9 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -126,10 +126,10 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	 */
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, hash_algos()))
 			throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
 	}
@@ -166,7 +166,7 @@ 
 	 */
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = TPropertyValue::ensureString($value);
+		$this->_cryptAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
 			throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
 	}
@@ -181,9 +181,9 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$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);
+			$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');
@@ -199,8 +199,8 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$key = md5($this->getEncryptionKey());
-			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
+			$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
@@ -214,8 +214,8 @@ 
 	 */
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
-		return $hmac . $data;
+		$hmac=$this->computeHMAC($data);
+		return $hmac.$data;
 	}
 
 	/**
@@ -227,14 +227,14 @@ 
 	 */
 	public function validateData($data)
 	{
-		$len = $this->strlen($this->computeHMAC('test'));
+		$len=$this->strlen($this->computeHMAC('test'));
 
 		if($this->strlen($data) < $len)
 			return false;
 
-		$hmac = $this->substr($data, 0, $len);
-		$data2 = $this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		$hmac=$this->substr($data, 0, $len);
+		$data2=$this->substr($data, $len, $this->strlen($data));
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 
 	/**

framework/Security/IUserManager.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param string user name, null if it is a guest.
 	 * @return TUser the user instance, null if the specified username is not in the user database.
 	 */
-	public function getUser($username = null);
+	public function getUser($username=null);
 	/**
 	 * Returns a user instance according to auth data stored in a cookie.
 	 * @param THttpCookie the cookie storing user authentication information