newicon / neon

neon/user/web/DbSession.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  */
 class DbSession extends \yii\web\DbSession
 {
-	protected function composeFields($id=null, $data=null)
+	protected function composeFields($id = null, $data = null)
 	{
 		// NOTE: do not interact with the identity inside this call
 		// this will trigger a "session_regenerate_id(): Cannot call session save handler in a recursive manner" error

neon/user/controllers/IndexController.php

Braces +8 added lines, -6 removed lines

@@ -103,12 +103,14 @@
 			if ($loggedInUser->isSuper()) {
 				if ($loggedInUser->getId() != $id) {
 					$user = $this->findModel($id);
-					if ($user->delete())
-						neon()->session->setFlash('success', 'The user has been successfully deleted');
-					else
-						neon()->session->setFlash('error', 'Something went wrong while trying to delete the user');
-				} else
-					neon()->session->setFlash('error', 'Sorry, you cannot delete yourself from the system.');
+					if ($user->delete()) {
+											neon()->session->setFlash('success', 'The user has been successfully deleted');
+					} else {
+											neon()->session->setFlash('error', 'Something went wrong while trying to delete the user');
+					}
+				} else {
+									neon()->session->setFlash('error', 'Sorry, you cannot delete yourself from the system.');
+				}
 				return $this->redirect(['/user/index/index']);
 			}
 			neon()->session->setFlash('error', 'You do not have permissions to delete the user');

neon/user/controllers/AccountController.php

Spacing +3 added lines, -3 removed lines

@@ -26,18 +26,18 @@
 			[
 				'allow' => true,
 				'actions' => ['login', 'logout', 'request-password-reset', 'reset-password', 'impersonate-restore'],
-				'roles' => [ '?', '@' ] // any guest user or logged in user
+				'roles' => ['?', '@'] // any guest user or logged in user
 			],
 			[
 				'allow' => setting('user', 'allowUserInvitations', false), // Allow registration if allowed in settings
 				'actions' => ['register'],
-				'roles' => [ '?', '@' ]
+				'roles' => ['?', '@']
 			],
 			// allow users with neon-administrator access to all functions defined
 			[
 				'allow' => true,
 				'actions' => ['index', 'impersonate'],
-				'roles' => [ 'neon-administrator' ]
+				'roles' => ['neon-administrator']
 			],
 			// everything else is denied
 		];

neon/user/controllers/InviteController.php

Spacing +2 added lines, -2 removed lines

@@ -87,11 +87,11 @@
 			// allow authenticated users if invites are allowed
 			[
 				'allow' => setting('user', 'allowUserInvitations', false),
-				'roles' => [ 'neon-administrator' ]
+				'roles' => ['neon-administrator']
 			],
 			[
 				'allow' => setting('user', 'allowUserInvitations', false),
-				'matchCallback' => function ($rule, $action) {
+				'matchCallback' => function($rule, $action) {
 					return neon()->user->isSuper();
 				}
 			]

neon/user/forms/UserEdit.php

Braces +12 added lines, -8 removed lines

@@ -27,15 +27,18 @@ 
 			$user->username = $this->getField('username')->getValue();
 			$user->email = $this->getField('email')->getValue();
 			$password = $this->getField('password')->getValue();
-			if (strlen($password) >= setting('user', 'minimumPasswordLength', self::MIN_PASSWORD_LENGTH))
-				$user->setPassword($password);
+			if (strlen($password) >= setting('user', 'minimumPasswordLength', self::MIN_PASSWORD_LENGTH)) {
+							$user->setPassword($password);
+			}
 			$user->generateAuthKey();
 			$user->status = $this->getField('status')->getValue();
-			if (neon()->user->isSuper())
-				$user->super = $this->getField('super')->getValue();
+			if (neon()->user->isSuper()) {
+							$user->super = $this->getField('super')->getValue();
+			}
 			$success = $user->save();
-			if ($success)
-				$user->setRoles($this->getField('roles')->getValue());
+			if ($success) {
+							$user->setRoles($this->getField('roles')->getValue());
+			}
 		}
 		return $success;
 	}
@@ -43,7 +46,8 @@ 
 	public function load($user = null)
 	{
 		parent::load($user);
-		if ($user)
-			$this->getField('roles')->setValue($user->getRoles());
+		if ($user) {
+					$this->getField('roles')->setValue($user->getRoles());
+		}
 	}
 }

neon/user/forms/PasswordReset.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		if (User::hasPasswordResetTokenExpired($token)) {
 			throw new InvalidArgumentException('This password reset token has expired.');
 		}
-		if ( !$this->_user ) {
+		if (!$this->_user) {
 			throw new InvalidArgumentException('Wrong password reset token.');
 		}
 		parent::__construct($config);

neon/user/forms/UserCreate.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 		return $roleItems;
 	}
 
-	public function signupNewUser(&$user=null)
+	public function signupNewUser(&$user = null)
 	{
 		if ($this->validate()) {
 			$user = new User;

Braces +9 added lines, -6 removed lines

@@ -25,8 +25,9 @@ 
 				'unique' => ['targetClass' => '\neon\user\models\User', 'message' => 'This username has already been taken.'],
 				'string' => ['min' => 2, 'max' => 255]
 		];
-		if ($this->editing)
-			unset($userNameValidators['unique']);
+		if ($this->editing) {
+					unset($userNameValidators['unique']);
+		}
 		$this->addFieldText('username')
 			->setLabel('Username')
 			->setValidators($userNameValidators);
@@ -38,8 +39,9 @@ 
 				'string' => ['min'=>5, 'max' => 255],
 				'unique' => ['targetClass' => '\neon\user\models\User', 'message' => 'This email address has already been taken.']
 			];
-		if ($this->editing)
-			unset($emailValidators['unique']);
+		if ($this->editing) {
+					unset($emailValidators['unique']);
+		}
 		$this->addFieldEmail('email')
 			->setLabel('Email')
 			->setValidators($emailValidators);
@@ -105,8 +107,9 @@ 
 			$user->username = $this->getField('username')->getValue();
 			$user->email = $this->getField('email')->getValue();
 			$user->setPassword($this->getField('password')->getValue());
-			if (neon()->user->isSuper())
-				$user->super = $this->getField('super')->getValue();
+			if (neon()->user->isSuper()) {
+							$user->super = $this->getField('super')->getValue();
+			}
 			$user->generateAuthKey();
 			$success = $user->save();
 			if ($success) {

neon/user/forms/PasswordResetRequest.php

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 			if ($user->save()) {
 				$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/passwordResetToken-html',

neon/user/forms/UserInvite.php

Braces +3 added lines, -2 removed lines

@@ -70,8 +70,9 @@
 				$user = new User;
 				$user->email = $this->getField('email')->getValue();
 				$user->status = User::STATUS_PENDING;
-				if (neon()->user->isSuper())
-					$user->super = $this->getField('super')->getValue();
+				if (neon()->user->isSuper()) {
+									$user->super = $this->getField('super')->getValue();
+				}
 				$user->setPassword(neon()->security->generateRandomString(32));
 				if (!$user->save()) {
 					return false;