newicon / neon

neon/user/interfaces/IUserManagement.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return array  users as
 	 *   [['uuid'=>'username']...]
 	 */
-	public function listUsers(Iterator &$iterator=null);
+	public function listUsers(Iterator &$iterator = null);
 
 	/**
 	 * Find a set of users based on a partial search string
@@ -47,7 +47,7 @@ 
 	 * @return array  users as
 	 *   [['uuid'=>'username']...]
 	 */
-	public function searchUsers($search, Iterator &$iterator=null);
+	public function searchUsers($search, Iterator &$iterator = null);
 
 	/**
 	 * Create a new User
@@ -59,7 +59,7 @@ 
 	 *   calling this must also be a superuser
 	 * @return string  - the users uuid
 	 */
-	public function addUser($username, $email, $password, $roles=[], $superuser=false);
+	public function addUser($username, $email, $password, $roles = [], $superuser = false);
 
 	/**
 	 * Get hold of an User given the user uuid

neon/user/models/User.php

Spacing +7 added lines, -7 removed lines

@@ -165,7 +165,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getHomeUrl($role=null)
+	public function getHomeUrl($role = null)
 	{
 		$userRoles = $this->getRoles();
 		$availableRoles = neon('user')->getRoles(true);
@@ -333,14 +333,14 @@ 
 	 * @see getUserListUncached for details
 	 * @return array
 	 */
-	public static function getUserList($query='', $filters=[], $fields=[], $start=0, $length=100)
+	public static function getUserList($query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		// because we need to cache according to the args we cannot store
 		// results in cache rather cacheArray. This is so we can clear cache
 		// appropriately in other calls such as edit and delete. Also user
 		// information should not be available in cached files
 		return neon()->cacheArray->getOrSet(
-			[static::CACHE_KEY_USER_LIST,func_get_args()],
+			[static::CACHE_KEY_USER_LIST, func_get_args()],
 			function() use ($query, $filters, $fields, $start, $length) {
 				return self::getUserListUncached($query, $filters, $fields, $start, $length);
 			}
@@ -359,7 +359,7 @@ 
 	 * @param int $length - the total number of rows to return
 	 * @return array
 	 */
-	public static function getUserListUncached($query='',$filters=[], $fields=[], $start=0, $length=100)
+	public static function getUserListUncached($query = '', $filters = [], $fields = [], $start = 0, $length = 100)
 	{
 		$q = self::find()->select(array_merge(['uuid', 'username', 'email'], $fields));
 		if ($q !== '')
@@ -384,7 +384,7 @@ 
 	{
 		return collect($userRows)->mapWithKeys(function($row, $key) use($fields) {
 			if (empty($fields))
-				return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+				return [$row['uuid'] => $row['username'] ? $row['username'].' - '.$row['email'] : $row['email']];
 			return [$row['uuid'] => $row];
 		})->all();
 	}
@@ -504,7 +504,7 @@ 
 	 */
 	public function generatePasswordResetToken()
 	{
-		$this->password_reset_token = neon()->security->generateRandomString() . '_' . time();
+		$this->password_reset_token = neon()->security->generateRandomString().'_'.time();
 	}
 
 	/**
@@ -621,7 +621,7 @@ 
 	/**
 	 * @inheritDoc
 	 */
-	public function getImageUrl($size=40)
+	public function getImageUrl($size = 40)
 	{
 		return Html::gravatar($this->email, $size, 'mm', 'g');
 	}

Braces +30 added lines, -20 removed lines

@@ -125,8 +125,9 @@ 
 	 */
 	public function getRoles()
 	{
-		if (!isset(static::$_userRoles[$this->id]))
-			static::$_userRoles[$this->id] = array_keys(neon()->authManager->getRolesByUser($this->id));
+		if (!isset(static::$_userRoles[$this->id])) {
+					static::$_userRoles[$this->id] = array_keys(neon()->authManager->getRolesByUser($this->id));
+		}
 		return is_array(static::$_userRoles[$this->id]) ? static::$_userRoles[$this->id] : [];
 	}
 
@@ -139,8 +140,9 @@ 
 		$authManager->revokeAll($this->id);
 		foreach ($roles as $role) {
 			$r = $authManager->getRole($role);
-			if ($r)
-				$authManager->assign($r, $this->id);
+			if ($r) {
+							$authManager->assign($r, $this->id);
+			}
 		}
 		unset(static::$_userRoles[$this->id]);
 	}
@@ -172,12 +174,14 @@ 
 
 		// searching in a specific role?
 		if (!empty($role)) {
-			if (isset($availableRoles[$role]['homeUrl']))
-				return $availableRoles[$role]['homeUrl'];
+			if (isset($availableRoles[$role]['homeUrl'])) {
+							return $availableRoles[$role]['homeUrl'];
+			}
 		} else { // or finding any one?
 			foreach ($userRoles as $role) {
-				if (isset($availableRoles[$role]['homeUrl']))
-					return $availableRoles[$role]['homeUrl'];
+				if (isset($availableRoles[$role]['homeUrl'])) {
+									return $availableRoles[$role]['homeUrl'];
+				}
 
 			}
 		}
@@ -204,8 +208,9 @@ 
 	public static function findIdentity($id)
 	{
 		// The id must be a uuid64
-		if (!Hash::isUuid64($id))
-			return null;
+		if (!Hash::isUuid64($id)) {
+					return null;
+		}
 		// The string conversion here is important to ensure the id is correctly quoted as a string
 		// otherwise if the $id is a number it will match uuid's that start with that number!
 		return self::findOne(['uuid' => (string) $id, 'status' => self::STATUS_ACTIVE]);
@@ -231,8 +236,9 @@ 
 	public static function findIdentityByInviteToken($token)
 	{
 		$invite = UserInvite::findInviteByInviteToken($token);
-		if (!$invite)
-			return null;
+		if (!$invite) {
+					return null;
+		}
 		return User::findOne(['uuid' => $invite->user_id, 'status' => [User::STATUS_PENDING]]);
 	}
 
@@ -362,10 +368,12 @@ 
 	public static function getUserListUncached($query='',$filters=[], $fields=[], $start=0, $length=100)
 	{
 		$q = self::find()->select(array_merge(['uuid', 'username', 'email'], $fields));
-		if ($q !== '')
-			$q->where(['or', ['like', 'username', $query], ['like', 'email', $query]]);
-		if (!empty($filters))
-			$q->andWhere($filters);
+		if ($q !== '') {
+					$q->where(['or', ['like', 'username', $query], ['like', 'email', $query]]);
+		}
+		if (!empty($filters)) {
+					$q->andWhere($filters);
+		}
 		$q->offset($start)
 			->limit($length)
 			->orderBy(['username' => SORT_ASC, 'email' => SORT_ASC])
@@ -383,8 +391,9 @@ 
 	public static function formatDataMapItems($userRows, $fields)
 	{
 		return collect($userRows)->mapWithKeys(function($row, $key) use($fields) {
-			if (empty($fields))
-				return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+			if (empty($fields)) {
+							return [$row['uuid'] => $row['username'] ? $row['username'] . ' - ' . $row['email'] : $row['email']];
+			}
 			return [$row['uuid'] => $row];
 		})->all();
 	}
@@ -538,8 +547,9 @@ 
 	{
 		// remove any caches and authorisations against the user
 		neon()->cacheArray->delete(static::CACHE_KEY_USER_LIST);
-		if ($this->id)
-			neon()->authManager->revokeAll($this->id);
+		if ($this->id) {
+					neon()->authManager->revokeAll($this->id);
+		}
 		return parent::beforeDelete();
 	}
 

neon/user/models/UserInvite.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 	public static function getInvite($token)
 	{
 		static $_invite;
-		if ($_invite === null){
+		if ($_invite === null) {
 			$_invite = self::findOne(['token' => $token]);
 		}
 		return $_invite;

Braces +6 added lines, -3 removed lines

@@ -110,8 +110,9 @@ 
 	 */
 	public static function findInviteByInviteToken($token, $ignoreExpiry = false)
 	{
-		if (!$ignoreExpiry && self::hasInviteTokenExpired($token))
-			return null;
+		if (!$ignoreExpiry && self::hasInviteTokenExpired($token)) {
+					return null;
+		}
 		
 		return self::findOne(['token' => $token]);
 	}
@@ -154,7 +155,9 @@ 
 	public static function hasInviteTokenExpired($token)
 	{
 		$invite = self::getInvite($token);
-		if (!$invite) return false;
+		if (!$invite) {
+			return false;
+		}
 		return strtotime($invite->expires_at) <= time();
 	}
 

neon/user/grid/UserGrid.php

Spacing +6 added lines, -6 removed lines

@@ -45,10 +45,10 @@ 
 			$this->addTextColumn('impersonate')->setFilter(false);
 		// scopes
 		// $this->addScope('all','All');
-		$this->addScope('active','Active');
-		$this->addScope('pending','Pending');
-		$this->addScope('suspended','Suspended');
-		$this->addScope('banned','Banned');
+		$this->addScope('active', 'Active');
+		$this->addScope('pending', 'Pending');
+		$this->addScope('suspended', 'Suspended');
+		$this->addScope('banned', 'Banned');
 		$this->addScope('super', 'Super');
 
 		$this->setPageSize(100);
@@ -196,7 +196,7 @@ 
 	 */
 	private function getRoles()
 	{
-		static $roles=null;
+		static $roles = null;
 		if (is_null($roles)) {
 			$roles = neon('user')->getRoles(true);
 		}
@@ -210,7 +210,7 @@ 
 	 */
 	private function getRoleLabels()
 	{
-		static $labels=null;
+		static $labels = null;
 		if (is_null($labels)) {
 			$roles = $this->getRoles();
 			foreach ($roles as $role => $details)

Braces +12 added lines, -8 removed lines

@@ -41,8 +41,9 @@ 
 		$this->addTextColumn('created_at');
 		$this->addTextColumn('updated_at', ['title'=>'Updated At']);
 		// action
-		if (neon()->user->isSuper())
-			$this->addTextColumn('impersonate')->setFilter(false);
+		if (neon()->user->isSuper()) {
+					$this->addTextColumn('impersonate')->setFilter(false);
+		}
 		// scopes
 		// $this->addScope('all','All');
 		$this->addScope('active','Active');
@@ -104,8 +105,9 @@ 
 		$userRoles = explode('|', $column->getCellData($model));
 		$displayRoles = [];
 		foreach ($userRoles as $ur) {
-			if (isset($roles[$ur]))
-				$displayRoles[] = $column->highlight($roles[$ur]['label'], $search);
+			if (isset($roles[$ur])) {
+							$displayRoles[] = $column->highlight($roles[$ur]['label'], $search);
+			}
 		}
 		return implode(', ', $displayRoles);
 	}
@@ -213,8 +215,9 @@ 
 		static $labels=null;
 		if (is_null($labels)) {
 			$roles = $this->getRoles();
-			foreach ($roles as $role => $details)
-				$labels[$details['label']] = $role;
+			foreach ($roles as $role => $details) {
+							$labels[$details['label']] = $role;
+			}
 		}
 		return $labels;
 	}
@@ -230,8 +233,9 @@ 
 		$labels = $this->getRoleLabels();
 		$roles = [];
 		foreach ($labels as $label => $role) {
-			if (stripos($label, $filter) !== false)
-				$roles[] = $role;
+			if (stripos($label, $filter) !== false) {
+							$roles[] = $role;
+			}
 		}
 		return $roles;
 	}

neon/user/services/apiTokenManager/JwtTokenAuth.php

Spacing +4 added lines, -4 removed lines

@@ -113,13 +113,13 @@ 
 		try {
 			$jwt = (array) JWT::decode($cookieString, static::secret(), ['HS256']);
 		} catch (Exception $e) {
-			throw new UnauthorizedHttpException('Your request was made with invalid credentials.' . neon()->debug ? ' Can not decode JWT token' : '');
+			throw new UnauthorizedHttpException('Your request was made with invalid credentials.'.neon()->debug ? ' Can not decode JWT token' : '');
 		}
 		// We will compare the CSRF token in the decoded API token against the CSRF header
 		// sent with the request. If the two don't match then this request is sent from
 		// an invalid source and we won't authenticate the request for further handling.
 		if (!$this->validCsrf($jwt, $request)) {
-			throw new UnauthorizedHttpException('Your request was made with invalid credentials.' . neon()->debug ? ' CSRF validation failed' : '');
+			throw new UnauthorizedHttpException('Your request was made with invalid credentials.'.neon()->debug ? ' CSRF validation failed' : '');
 		}
 
 		return $jwt;
@@ -215,7 +215,7 @@ 
 	 */
 	protected static function requestShouldReceiveFreshToken(Request $request)
 	{
-		return $request->isMethod('GET') && neon()->user->isLoggedIn() && ! $request->getIsAjax();
+		return $request->isMethod('GET') && neon()->user->isLoggedIn() && !$request->getIsAjax();
 	}
 
 	/**
@@ -227,6 +227,6 @@ 
 	protected static function responseShouldReceiveFreshToken(Response $response)
 	{
 		// if the cookie already exists do not create another one
-		return ! isset($response->cookies[static::$cookieName]);
+		return !isset($response->cookies[static::$cookieName]);
 	}
 }
\ No newline at end of file

Braces +9 added lines, -6 removed lines

@@ -56,8 +56,9 @@ 
 		// As there is no cookie or cookie string we return null allowing other authentication methods
 		// to attempt authentication
 		$tokenString = $this->getJwtStringFromCookie($request);
-		if ($tokenString === null)
-			return null;
+		if ($tokenString === null) {
+					return null;
+		}
 		// decode the cookie and perform csrf validation
 		// this only checks that the cookie data is good
 		$jwt = $this->decodeAndValidateJwtToken($tokenString, $request);
@@ -69,8 +70,9 @@ 
 		// @see self::findAndValidateUserIdentity()
 		// this is similar to the stock yii classes yii\filters\auth\HttpBearerAuth and yii\filters\auth\QueryParamAuth;
 		$identity = $user->loginByAccessToken($jwt, get_class($this));
-		if ($identity === null)
-			$this->handleFailure($response);
+		if ($identity === null) {
+					$this->handleFailure($response);
+		}
 
 		return $identity;
 	}
@@ -132,8 +134,9 @@ 
 	 */
 	public function getJwtStringFromCookie(Request $request)
 	{
-		if (!$request->cookies->has(static::$cookieName))
-			return null;
+		if (!$request->cookies->has(static::$cookieName)) {
+					return null;
+		}
 		$cookie = $request->cookies->get(static::$cookieName)->value;
 		return $cookie;
 	}

neon/user/services/apiTokenManager/models/UserApiToken.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public function getHttpBasicAuthorizationBase64()
 	{
-		return base64_encode($this->user_id . ':' . $this->token);
+		return base64_encode($this->user_id.':'.$this->token);
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param string $name
 	 * @return UserApiToken|null
 	 */
-	public static function generateTokenFor($userId, $name='')
+	public static function generateTokenFor($userId, $name = '')
 	{
 		$token = UserApiToken::getTokenRecord($userId);
 		// extra security:

Braces +9 added lines, -6 removed lines

@@ -55,17 +55,20 @@
 	public static function getValidUserByToken($token)
 	{
 		$validToken = self::isValidToken($token);
-		if (!$validToken)
-			return null;
+		if (!$validToken) {
+					return null;
+		}
 
 		$apiToken = self::findOne(['active' => 1, 'token' => (string) $token]);
-		if ($apiToken == null)
-			return null;
+		if ($apiToken == null) {
+					return null;
+		}
 
 		// TODO: SO 27/10/2018 - update this to be User::findIndentity() - migrate to uuids.
 		$user = User::findOne(['id' => $apiToken->user_id, 'status' => User::STATUS_ACTIVE]);
-		if ($user == null)
-			return null;
+		if ($user == null) {
+					return null;
+		}
 
 		// Usage successful
 		$apiToken->touchTokenUsed();

neon/user/services/UserManager.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function listUsers(Iterator &$iterator=null)
+	public function listUsers(Iterator &$iterator = null)
 	{
 		return $this->findUsers(null, $iterator);
 	}
@@ -55,7 +55,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function searchUsers($searchString, Iterator &$iterator=null)
+	public function searchUsers($searchString, Iterator &$iterator = null)
 	{
 		return $this->findUsers(['like', 'username', $searchString], $iterator);
 	}
@@ -63,7 +63,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function addUser($username, $email, $password, $roles=[], $superuser=false)
+	public function addUser($username, $email, $password, $roles = [], $superuser = false)
 	{
 		$user = new UserModel;
 		$user->uuid = Hash::uuid64();
@@ -95,7 +95,7 @@ 
 				'uuid'=>$user->uuid,
 				'username'=>$user->username,
 				'email'=>$user->email,
-				'superuser'=>(boolean)$user->super,
+				'superuser'=>(boolean) $user->super,
 				'status' => $user->status,
 				'roles'=>$user->getRoles()
 			];
@@ -113,7 +113,7 @@ 
 	{
 		$user = $this->findUserModel($uuid);
 		if ($user) {
-			$newValues = array_intersect_key($changes, array_flip(['email','password','roles']));
+			$newValues = array_intersect_key($changes, array_flip(['email', 'password', 'roles']));
 			foreach ($newValues as $key=>$value) {
 				$user->$key = $value;
 			}
@@ -153,7 +153,7 @@ 
 	 *   for the query.
 	 * @param Iterator $iterator  an iterator to go over the query
 	 */
-	private function findUsers($where, Iterator &$iterator=null) 
+	private function findUsers($where, Iterator &$iterator = null) 
 	{
 		$iterator = $iterator ? $iterator : new Iterator;
 
@@ -163,7 +163,7 @@ 
 		}
 
 		// get the rows
-		$query = UserModel::find()->select(['uuid','username'])
+		$query = UserModel::find()->select(['uuid', 'username'])
 			->limit($iterator->length)
 			->offset($iterator->start)
 			->orderBy('username');

Braces +21 added lines, -14 removed lines

@@ -29,8 +29,9 @@ 
 	{
 		$auth = neon()->authManager;
 		$authRole = $auth->createRole($role);
-		if ($authRole)
-			$auth->add($authRole);
+		if ($authRole) {
+					$auth->add($authRole);
+		}
 	}
 
 	/**
@@ -40,8 +41,9 @@ 
 	{
 		$auth = neon()->authManager;
 		$authRole = $auth->getRole($role);
-		if ($authRole)
-			$auth->remove($authRole);
+		if ($authRole) {
+					$auth->remove($authRole);
+		}
 	}
 
 	/**
@@ -70,8 +72,9 @@ 
 		$user->username = $username;
 		$user->email = $email;
 		$user->setPassword($password);
-		if ($superuser && neon()->user->isSuper())
-			$user->super = $superuser;
+		if ($superuser && neon()->user->isSuper()) {
+					$user->super = $superuser;
+		}
 		$user->generateAuthKey();
 		$success = $user->save();
 		if ($success) {
@@ -117,8 +120,9 @@ 
 			foreach ($newValues as $key=>$value) {
 				$user->$key = $value;
 			}
-			if (isset($changes['superuser']))
-				$user->__set_super($changes['superuser']);
+			if (isset($changes['superuser'])) {
+							$user->__set_super($changes['superuser']);
+			}
 			$success = $user->save();
 			return $success ? true : $user->errors;
 		}
@@ -132,8 +136,9 @@ 
 	public function destroyUser($uuid)
 	{
 		$user = $this->findUserModel($uuid);
-		if ($user)
-			$user->delete();
+		if ($user) {
+					$user->delete();
+		}
 	}
 
 
@@ -168,15 +173,17 @@ 
 			->offset($iterator->start)
 			->orderBy('username');
 
-		if ($where)
-			$query->where($where);
+		if ($where) {
+					$query->where($where);
+		}
 		
 		$userRows = $query->all();
 
 		// and return in required format
 		$users = [];
-		foreach ($userRows as $ur)
-			$users[$ur['uuid']] = $ur['username'];
+		foreach ($userRows as $ur) {
+					$users[$ur['uuid']] = $ur['username'];
+		}
 		return $users;
 	}
 

neon/user/services/User.php

Spacing +5 added lines, -5 removed lines

@@ -226,7 +226,7 @@ 
 	 * @param int $size
 	 * @return string
 	 */
-	public function getGuestUserImageUrl($size=40)
+	public function getGuestUserImageUrl($size = 40)
 	{
 		return "//www.gravatar.com/avatar?d=mm&s=$size";
 	}
@@ -234,7 +234,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getImageUrl($size=40)
+	public function getImageUrl($size = 40)
 	{
 		return $this->noIdentity() ? $this->getGuestUserImageUrl($size) : $this->identity->getImageUrl($size);
 	}
@@ -276,7 +276,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function getHomeUrl($role=null)
+	public function getHomeUrl($role = null)
 	{
 		return $this->noIdentity() ? null : $this->identity->getHomeUrl($role);
 	}
@@ -295,13 +295,13 @@ 
 		foreach ($userRoles as $ur) {
 			if (array_key_exists('homeUrl', $appRoles[$ur])) {
 				$url = $appRoles[$ur]['homeUrl'];
-				return parent::getReturnUrl( is_array($url) ? $url : [ $url ]);
+				return parent::getReturnUrl(is_array($url) ? $url : [$url]);
 			}
 		}
 
 		// use the default or application set one
 		if ($defaultUrl)
-			return parent::getReturnUrl( is_array($defaultUrl) ? $defaultUrl : [ $defaultUrl ] );
+			return parent::getReturnUrl(is_array($defaultUrl) ? $defaultUrl : [$defaultUrl]);
 
 		return parent::getReturnUrl();
 	}

Braces +6 added lines, -4 removed lines

@@ -107,8 +107,9 @@ 
 				$log = "User '$id' logged in from $ip. Session not enabled.";
 			}
 
-			if (neon()->getRequest()->enableCsrfValidation)
-				$this->regenerateCsrfToken();
+			if (neon()->getRequest()->enableCsrfValidation) {
+							$this->regenerateCsrfToken();
+			}
 
 			\Yii::info($log, __METHOD__);
 			$this->afterLogin($identity, false, $duration);
@@ -300,8 +301,9 @@ 
 		}
 
 		// use the default or application set one
-		if ($defaultUrl)
-			return parent::getReturnUrl( is_array($defaultUrl) ? $defaultUrl : [ $defaultUrl ] );
+		if ($defaultUrl) {
+					return parent::getReturnUrl( is_array($defaultUrl) ? $defaultUrl : [ $defaultUrl ] );
+		}
 
 		return parent::getReturnUrl();
 	}

neon/user/services/UserInvite.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 				return neon()->mailer->compose($templates, $templateData)
 					->setTo($user->email)
 					->setFrom([$fromAddress => $fromName])
-					->setSubject($siteName.' invitation for ' . $user->email)
+					->setSubject($siteName.' invitation for '.$user->email)
 					->send();
 			}
 		}

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 				$fromName = setting('admin', 'fromEmailName', neon()->name);
 				$fromAddress = setting('admin', 'fromEmailAddress', 'system@'.neon()->request->getHostName());
 				
-				if (!$fromAddress)
-					throw new \Exception('The From Address needs to be set in the admin section for emails');
+				if (!$fromAddress) {
+									throw new \Exception('The From Address needs to be set in the admin section for emails');
+				}
 
 				$templates = [
 					'html' => '@neon/user/views/mail/userInviteToken-html',