pradosoft / prado

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

framework/Security/TAuthorizationRule.php

Spacing +37 added lines, -37 removed lines

@@ -75,61 +75,61 @@ 
 	 * @param string verb, can be empty, 'get', or 'post'
 	 * @param string IP rules (separated by comma, can contain wild card *)
 	 */
-	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
+	public function __construct($action, $users, $roles, $verb='', $ipRules='')
 	{
-		$action = strtolower(trim($action));
-		if($action === 'allow' || $action === 'deny')
-			$this->_action = $action;
+		$action=strtolower(trim($action));
+		if($action==='allow' || $action==='deny')
+			$this->_action=$action;
 		else
 			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
-		$this->_users = [];
-		$this->_roles = [];
-		$this->_ipRules = [];
-		$this->_everyone = false;
-		$this->_guest = false;
-		$this->_authenticated = false;
-
-		if(trim($users) === '')
-			$users = '*';
+		$this->_users=[];
+		$this->_roles=[];
+		$this->_ipRules=[];
+		$this->_everyone=false;
+		$this->_guest=false;
+		$this->_authenticated=false;
+
+		if(trim($users)==='')
+			$users='*';
 		foreach(explode(',', $users) as $user)
 		{
-			if(($user = trim(strtolower($user))) !== '')
+			if(($user=trim(strtolower($user)))!=='')
 			{
-				if($user === '*')
+				if($user==='*')
 				{
-					$this->_everyone = true;
+					$this->_everyone=true;
 					break;
 				}
-				elseif($user === '?')
-					$this->_guest = true;
-				elseif($user === '@')
-					$this->_authenticated = true;
+				elseif($user==='?')
+					$this->_guest=true;
+				elseif($user==='@')
+					$this->_authenticated=true;
 				else
-					$this->_users[] = $user;
+					$this->_users[]=$user;
 			}
 		}
 
-		if(trim($roles) === '')
-			$roles = '*';
+		if(trim($roles)==='')
+			$roles='*';
 		foreach(explode(',', $roles) as $role)
 		{
-			if(($role = trim(strtolower($role))) !== '')
-				$this->_roles[] = $role;
+			if(($role=trim(strtolower($role)))!=='')
+				$this->_roles[]=$role;
 		}
 
-		if(($verb = trim(strtolower($verb))) === '')
-			$verb = '*';
-		if($verb === '*' || $verb === 'get' || $verb === 'post')
-			$this->_verb = $verb;
+		if(($verb=trim(strtolower($verb)))==='')
+			$verb='*';
+		if($verb==='*' || $verb==='get' || $verb==='post')
+			$this->_verb=$verb;
 		else
 			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
-		if(trim($ipRules) === '')
-			$ipRules = '*';
+		if(trim($ipRules)==='')
+			$ipRules='*';
 		foreach(explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule = trim($ipRule)) !== '')
-				$this->_ipRules[] = $ipRule;
+			if(($ipRule=trim($ipRule))!=='')
+				$this->_ipRules[]=$ipRule;
 		}
 	}
 
@@ -207,7 +207,7 @@ 
 	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
 		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action === 'allow')?1:-1;
+			return ($this->_action==='allow') ? 1 : -1;
 		else
 			return 0;
 	}
@@ -218,7 +218,7 @@ 
 			return 1;
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
+			if($rule==='*' || $rule===$ip || (($pos=strpos($rule, '*'))!==false && strncmp($ip, $rule, $pos)===0))
 				return 1;
 		}
 		return 0;
@@ -233,7 +233,7 @@ 
 	{
 		foreach($this->_roles as $role)
 		{
-			if($role === '*' || $user->isInRole($role))
+			if($role==='*' || $user->isInRole($role))
 				return true;
 		}
 		return false;
@@ -241,6 +241,6 @@ 
 
 	private function isVerbMatched($verb)
 	{
-		return ($this->_verb === '*' || strcasecmp($verb, $this->_verb) === 0);
+		return ($this->_verb==='*' || strcasecmp($verb, $this->_verb)===0);
 	}
 }
\ No newline at end of file

framework/Collections/TStack.php

Spacing +12 added lines, -12 removed lines

@@ -40,12 +40,12 @@ 
 	 * internal data storage
 	 * @var array
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * number of items
 	 * @var integer
 	 */
-	private $_c = 0;
+	private $_c=0;
 
 	/**
 	 * Constructor.
@@ -53,9 +53,9 @@ 
 	 * @param array|Iterator the initial data. Default is null, meaning no initialization.
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data = null)
+	public function __construct($data=null)
 	{
-		if($data !== null)
+		if($data!==null)
 			$this->copyFrom($data);
 	}
 
@@ -80,11 +80,11 @@ 
 			$this->clear();
 			foreach($data as $item)
 			{
-				$this->_d[] = $item;
+				$this->_d[]=$item;
 				++$this->_c;
 			}
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('stack_data_not_iterable');
 	}
 
@@ -93,8 +93,8 @@ 
 	 */
 	public function clear()
 	{
-		$this->_c = 0;
-		$this->_d = [];
+		$this->_c=0;
+		$this->_d=[];
 	}
 
 	/**
@@ -103,7 +103,7 @@ 
 	 */
 	public function contains($item)
 	{
-		return array_search($item, $this->_d, true) !== false;
+		return array_search($item, $this->_d, true)!==false;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 */
 	public function peek()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 			return $this->_d[$this->_c - 1];
@@ -127,7 +127,7 @@ 
 	 */
 	public function pop()
 	{
-		if($this->_c === 0)
+		if($this->_c===0)
 			throw new TInvalidOperationException('stack_empty');
 		else
 		{
@@ -143,7 +143,7 @@ 
 	public function push($item)
 	{
 		++$this->_c;
-		$this->_d[] = $item;
+		$this->_d[]=$item;
 	}
 
 	/**

framework/Collections/TPriorityMap.php

Spacing +70 added lines, -70 removed lines

@@ -65,15 +65,15 @@ 
 	/**
 	 * @var array internal data storage
 	 */
-	private $_d = [];
+	private $_d=[];
 	/**
 	 * @var boolean whether this list is read-only
 	 */
-	private $_r = false;
+	private $_r=false;
 	/**
 	 * @var boolean indicates if the _d is currently ordered.
 	 */
-	private $_o = false;
+	private $_o=false;
 	/**
 	 * @var array cached flattened internal data storage
 	 */
@@ -81,15 +81,15 @@ 
 	/**
 	 * @var integer number of items contain within the map
 	 */
-	private $_c = 0;
+	private $_c=0;
 	/**
 	 * @var numeric the default priority of items without specified priorities
 	 */
-	private $_dp = 10;
+	private $_dp=10;
 	/**
 	 * @var integer the precision of the numeric priorities within this priority list.
 	 */
-	private $_p = 8;
+	private $_p=8;
 
 	/**
 	 * Constructor.
@@ -100,9 +100,9 @@ 
 	 * @param integer the precision of the numeric priorities
 	 * @throws TInvalidDataTypeException If data is not null and neither an array nor an iterator.
 	 */
-	public function __construct($data = null, $readOnly = false, $defaultPriority = 10, $precision = 8)
+	public function __construct($data=null, $readOnly=false, $defaultPriority=10, $precision=8)
 	{
-		if($data !== null)
+		if($data!==null)
 			$this->copyFrom($data);
 		$this->setReadOnly($readOnly);
 		$this->setPrecision($precision);
@@ -122,7 +122,7 @@ 
 	 */
 	protected function setReadOnly($value)
 	{
-		$this->_r = TPropertyValue::ensureBoolean($value);
+		$this->_r=TPropertyValue::ensureBoolean($value);
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	protected function setDefaultPriority($value)
 	{
-		$this->_dp = (string)round(TPropertyValue::ensureFloat($value), $this->_p);
+		$this->_dp=(string) round(TPropertyValue::ensureFloat($value), $this->_p);
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	protected function setPrecision($value)
 	{
-		$this->_p = TPropertyValue::ensureInteger($value);
+		$this->_p=TPropertyValue::ensureInteger($value);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	protected function sortPriorities() {
 		if(!$this->_o) {
 			ksort($this->_d, SORT_NUMERIC);
-			$this->_o = true;
+			$this->_o=true;
 		}
 	}
 
@@ -189,9 +189,9 @@ 
 			return $this->_fd;
 
 		$this->sortPriorities();
-		$this->_fd = [];
+		$this->_fd=[];
 		foreach($this->_d as $priority => $itemsatpriority)
-			$this->_fd = array_merge($this->_fd, $itemsatpriority);
+			$this->_fd=array_merge($this->_fd, $itemsatpriority);
 		return $this->_fd;
 	}
 
@@ -219,11 +219,11 @@ 
 	 * it will be set to the default {@link getDefaultPriority}
 	 * @return integer the number of items in the map at the specified priority
 	 */
-	public function getPriorityCount($priority = null)
+	public function getPriorityCount($priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!isset($this->_d[$priority]) || !is_array($this->_d[$priority]))
 			return false;
@@ -257,16 +257,16 @@ 
 	 * and numeric is a specific priority.  default: false, any priority.
 	 * @return mixed the element at the offset, null if no element is found at the offset
 	 */
-	public function itemAt($key, $priority = false)
+	public function itemAt($key, $priority=false)
 	{
-		if($priority === false){
-			$map = $this->flattenPriorities();
-			return isset($map[$key])?$map[$key]:null;
+		if($priority===false) {
+			$map=$this->flattenPriorities();
+			return isset($map[$key]) ? $map[$key] : null;
 		} else {
-			if($priority === null)
-				$priority = $this->getDefaultPriority();
-			$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
-			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key]))?$this->_d[$priority][$key]:null;
+			if($priority===null)
+				$priority=$this->getDefaultPriority();
+			$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
+			return (isset($this->_d[$priority]) && isset($this->_d[$priority][$key])) ? $this->_d[$priority][$key] : null;
 		}
 	}
 
@@ -277,15 +277,15 @@ 
 	 * @param numeric|null the priority.  default: null, filled in with the default priority numeric.
 	 * @return numeric old priority of the item
 	 */
-	public function setPriorityAt($key, $priority = null)
+	public function setPriorityAt($key, $priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		$oldpriority = $this->priorityAt($key);
-		if($oldpriority !== false && $oldpriority != $priority) {
-			$value = $this->remove($key, $oldpriority);
+		$oldpriority=$this->priorityAt($key);
+		if($oldpriority!==false && $oldpriority!=$priority) {
+			$value=$this->remove($key, $oldpriority);
 			$this->add($key, $value, $priority);
 		}
 		return $oldpriority;
@@ -296,13 +296,13 @@ 
 	 * @param numeric priority of the items to get.  Defaults to null, filled in with the default priority, if left blank.
 	 * @return array all items at priority in index order, null if there are no items at that priority
 	 */
-	public function itemsAtPriority($priority = null)
+	public function itemsAtPriority($priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
-		return isset($this->_d[$priority])?$this->_d[$priority]:null;
+		return isset($this->_d[$priority]) ? $this->_d[$priority] : null;
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	{
 		$this->sortPriorities();
 		foreach($this->_d as $priority => $items)
-			if(($index = array_search($item, $items, true)) !== false)
+			if(($index=array_search($item, $items, true))!==false)
 				return $priority;
 		return false;
 	}
@@ -346,11 +346,11 @@ 
 	 * @return numeric priority at which the pair was added
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function add($key, $value, $priority = null)
+	public function add($key, $value, $priority=null)
 	{
-		if($priority === null)
-			$priority = $this->getDefaultPriority();
-		$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+		if($priority===null)
+			$priority=$this->getDefaultPriority();
+		$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 
 		if(!$this->_r)
 		{
@@ -359,17 +359,17 @@ 
 				{
 					unset($this->_d[$innerpriority][$key]);
 					$this->_c--;
-					if(count($this->_d[$innerpriority]) === 0)
+					if(count($this->_d[$innerpriority])===0)
 						unset($this->_d[$innerpriority]);
 				}
 			if(!isset($this->_d[$priority])) {
-				$this->_d[$priority] = [$key => $value];
-				$this->_o = false;
+				$this->_d[$priority]=[$key => $value];
+				$this->_o=false;
 			}
 			else
-				$this->_d[$priority][$key] = $value;
+				$this->_d[$priority][$key]=$value;
 			$this->_c++;
-			$this->_fd = null;
+			$this->_fd=null;
 		}
 		else
 			throw new TInvalidOperationException('map_readonly', get_class($this));
@@ -388,45 +388,45 @@ 
 	 * @return mixed the removed value, null if no such key exists.
 	 * @throws TInvalidOperationException if the map is read-only
 	 */
-	public function remove($key, $priority = false)
+	public function remove($key, $priority=false)
 	{
 		if(!$this->_r)
 		{
-			if($priority === null)
-				$priority = $this->getDefaultPriority();
+			if($priority===null)
+				$priority=$this->getDefaultPriority();
 
-			if($priority === false)
+			if($priority===false)
 			{
 				$this->sortPriorities();
 				foreach($this->_d as $priority => $items)
 					if(array_key_exists($key, $items))
 					{
-						$value = $this->_d[$priority][$key];
+						$value=$this->_d[$priority][$key];
 						unset($this->_d[$priority][$key]);
 						$this->_c--;
-						if(count($this->_d[$priority]) === 0)
+						if(count($this->_d[$priority])===0)
 						{
 							unset($this->_d[$priority]);
-							$this->_o = false;
+							$this->_o=false;
 						}
-						$this->_fd = null;
+						$this->_fd=null;
 						return $value;
 					}
 				return null;
 			}
 			else
 			{
-				$priority = (string)round(TPropertyValue::ensureFloat($priority), $this->_p);
+				$priority=(string) round(TPropertyValue::ensureFloat($priority), $this->_p);
 				if(isset($this->_d[$priority]) && (isset($this->_d[$priority][$key]) || array_key_exists($key, $this->_d[$priority])))
 				{
-					$value = $this->_d[$priority][$key];
+					$value=$this->_d[$priority][$key];
 					unset($this->_d[$priority][$key]);
 					$this->_c--;
-					if(count($this->_d[$priority]) === 0) {
+					if(count($this->_d[$priority])===0) {
 						unset($this->_d[$priority]);
-						$this->_o = false;
+						$this->_o=false;
 					}
-					$this->_fd = null;
+					$this->_fd=null;
 					return $value;
 				}
 				else
@@ -453,7 +453,7 @@ 
 	 */
 	public function contains($key)
 	{
-		$map = $this->flattenPriorities();
+		$map=$this->flattenPriorities();
 		return isset($map[$key]) || array_key_exists($key, $map);
 	}
 
@@ -475,15 +475,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are below a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayBelowPriority($priority, $inclusive = false)
+	public function toArrayBelowPriority($priority, $inclusive=false)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority >= $priority) || $itemspriority > $priority)
 				break;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -495,15 +495,15 @@ 
 	 * @return array the array of priorities keys with values of arrays of items that are above a specified priority.
 	 *  The priorities are sorted so important priorities, lower numerics, are first.
 	 */
-	public function toArrayAbovePriority($priority, $inclusive = true)
+	public function toArrayAbovePriority($priority, $inclusive=true)
 	{
 		$this->sortPriorities();
-		$items = [];
+		$items=[];
 		foreach($this->_d as $itemspriority => $itemsatpriority)
 		{
 			if((!$inclusive && $itemspriority <= $priority) || $itemspriority < $priority)
 				continue;
-			$items = array_merge($items, $itemsatpriority);
+			$items=array_merge($items, $itemsatpriority);
 		}
 		return $items;
 	}
@@ -534,7 +534,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -560,7 +560,7 @@ 
 			foreach($data as $key => $value)
 				$this->add($key, $value);
 		}
-		elseif($data !== null)
+		elseif($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TListItemCollection.php

Spacing +19 added lines, -19 removed lines

@@ -35,9 +35,9 @@ 
 	 * If -1, the item will be appended to the end.
 	 * @return TListItem list item object
 	 */
-	public function createListItem($index = -1)
+	public function createListItem($index=-1)
 	{
-		$item = $this->createNewListItem();
+		$item=$this->createNewListItem();
 		if($index < 0)
 			$this->add($item);
 		else
@@ -48,10 +48,10 @@ 
 	/**
 	 * @return TListItem new item.
 	 */
-	protected function createNewListItem($text = null)
+	protected function createNewListItem($text=null)
 	{
-		$item = new TListItem;
-		if($text !== null)
+		$item=new TListItem;
+		if($text!==null)
 			$item->setText($text);
 		return $item;
 	}
@@ -66,7 +66,7 @@ 
 	public function insertAt($index, $item)
 	{
 		if(is_string($item))
-			$item = $this->createNewListItem($item);
+			$item=$this->createNewListItem($item);
 		if(!($item instanceof TListItem))
 			throw new TInvalidDataTypeException('listitemcollection_item_invalid', get_class($this));
 		parent::insertAt($index, $item);
@@ -78,13 +78,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByValue($value, $includeDisabled = true)
+	public function findIndexByValue($value, $includeDisabled=true)
 	{
-		$value = TPropertyValue::ensureString($value);
-		$index = 0;
+		$value=TPropertyValue::ensureString($value);
+		$index=0;
 		foreach($this as $item)
 		{
-			if($item->getValue() === $value && ($includeDisabled || $item->getEnabled()))
+			if($item->getValue()===$value && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -97,13 +97,13 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return integer the index of the item found, -1 if not found.
 	 */
-	public function findIndexByText($text, $includeDisabled = true)
+	public function findIndexByText($text, $includeDisabled=true)
 	{
-		$text = TPropertyValue::ensureString($text);
-		$index = 0;
+		$text=TPropertyValue::ensureString($text);
+		$index=0;
 		foreach($this as $item)
 		{
-			if($item->getText() === $text && ($includeDisabled || $item->getEnabled()))
+			if($item->getText()===$text && ($includeDisabled || $item->getEnabled()))
 				return $index;
 			$index++;
 		}
@@ -116,9 +116,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByValue($value, $includeDisabled = true)
+	public function findItemByValue($value, $includeDisabled=true)
 	{
-		if(($index = $this->findIndexByValue($value, $includeDisabled)) >= 0)
+		if(($index=$this->findIndexByValue($value, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -130,9 +130,9 @@ 
 	 * @param boolean whether to look for disabled items also
 	 * @return TListItem the item found, null if not found.
 	 */
-	public function findItemByText($text, $includeDisabled = true)
+	public function findItemByText($text, $includeDisabled=true)
 	{
-		if(($index = $this->findIndexByText($text, $includeDisabled)) >= 0)
+		if(($index=$this->findIndexByText($text, $includeDisabled)) >= 0)
 			return $this->itemAt($index);
 		else
 			return null;
@@ -146,7 +146,7 @@ 
 	public function loadState($state)
 	{
 		$this->clear();
-		if($state !== null)
+		if($state!==null)
 			$this->copyFrom($state);
 	}