newicon / neon

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/UserCreate.php

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

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()) {
 			$userClass = neon()->getUser()->identityClass;

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;

neon/user/migrations/m20200407_122322_user_store_user_uuid.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		// the key fields in this table are responsible for the session
 		// this is the session id, expire and data fields.  After that the next important field is the user_uuid
 		// then the following additional information fields
-		$this->addColumn(\neon\user\models\Session::tableName(), 'user_uuid', $this->uuid64()  .' AFTER `data`');
+		$this->addColumn(\neon\user\models\Session::tableName(), 'user_uuid', $this->uuid64().' AFTER `data`');
 	}
 
 	public function safeDown()

neon/user/migrations/m170104_26042017_user_api_tokens.php

Indentation +21 added lines, -21 removed lines

@@ -6,30 +6,30 @@
 class m170104_26042017_user_api_tokens extends Migration
 {
 
-    /**
-     * @inheritdoc
-     * Install the User, AuthRule, AuthItem, AuthItemChild, AuthAssignment tables
-     */
+	/**
+	 * @inheritdoc
+	 * Install the User, AuthRule, AuthItem, AuthItemChild, AuthAssignment tables
+	 */
 	public function safeUp()
-    {
+	{
 		$sql = "DROP TABLE IF EXISTS ".UserApiToken::tableName();
 		\Yii::$app->getDb()->createCommand($sql)->execute();
 
-	    $this->createTable(UserApiToken::tableName(), [
-		    'token'=>'varchar(64) PRIMARY KEY COMMENT "The token"',
-	    	'name' => 'varchar(100) COMMENT "A name for this token"',
-		    'user_id'=>'int COMMENT "foreign key of the user who owns this token"',
-		    'active'=>'int not null default 0 COMMENT "whether the token is currently active, 1 is an active token, 0 is a non active token and will not produce successful requests"',
-		    'last_used'=>'datetime COMMENT "store the date and time of the last request that used this token"',
-		    'used_count'=>'int not null default 0 COMMENT "number of times this token has been used"',
-		    // timestamps
-		    'created_at' =>  $this->createdAt(),
-		    'updated_at' =>  $this->updatedAt(),
-	    ]);
-    }
+		$this->createTable(UserApiToken::tableName(), [
+			'token'=>'varchar(64) PRIMARY KEY COMMENT "The token"',
+			'name' => 'varchar(100) COMMENT "A name for this token"',
+			'user_id'=>'int COMMENT "foreign key of the user who owns this token"',
+			'active'=>'int not null default 0 COMMENT "whether the token is currently active, 1 is an active token, 0 is a non active token and will not produce successful requests"',
+			'last_used'=>'datetime COMMENT "store the date and time of the last request that used this token"',
+			'used_count'=>'int not null default 0 COMMENT "number of times this token has been used"',
+			// timestamps
+			'created_at' =>  $this->createdAt(),
+			'updated_at' =>  $this->updatedAt(),
+		]);
+	}
 
-    public function safeDown()
-    {
-	    $this->dropTable(UserApiToken::tableName());
-    }
+	public function safeDown()
+	{
+		$this->dropTable(UserApiToken::tableName());
+	}
 }

neon/user/migrations/m181128_143758_user_create_invite_table.php

Indentation +11 added lines, -11 removed lines

@@ -7,17 +7,17 @@
 {
 	public function safeUp()
 	{
-	    $this->createTable(UserInvite::tableName(), [
-		    'token'=>'varchar(255) CHARACTER SET latin1 COLLATE latin1_general_cs PRIMARY KEY COMMENT "The token"',
-		    'user_id'=> $this->uuid64( 'foreign key of the user who owns this token')->notNull(),
-		    // timestamps
-		    'expires_at' => $this->dateTime(),
-		    'created_at' => $this->createdAt(),
-		    'updated_at' => $this->updatedAt(),
-		    // blames
-		    'created_by' => $this->createdBy(),
-		    'updated_by' => $this->updatedBy()
-	    ]);
+		$this->createTable(UserInvite::tableName(), [
+			'token'=>'varchar(255) CHARACTER SET latin1 COLLATE latin1_general_cs PRIMARY KEY COMMENT "The token"',
+			'user_id'=> $this->uuid64( 'foreign key of the user who owns this token')->notNull(),
+			// timestamps
+			'expires_at' => $this->dateTime(),
+			'created_at' => $this->createdAt(),
+			'updated_at' => $this->updatedAt(),
+			// blames
+			'created_by' => $this->createdBy(),
+			'updated_by' => $this->updatedBy()
+		]);
 	}
 
 	public function safeDown()

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	{
 	    $this->createTable(UserInvite::tableName(), [
 		    'token'=>'varchar(255) CHARACTER SET latin1 COLLATE latin1_general_cs PRIMARY KEY COMMENT "The token"',
-		    'user_id'=> $this->uuid64( 'foreign key of the user who owns this token')->notNull(),
+		    'user_id'=> $this->uuid64('foreign key of the user who owns this token')->notNull(),
 		    // timestamps
 		    'expires_at' => $this->dateTime(),
 		    'created_at' => $this->createdAt(),

neon/user/migrations/m140506_102106_user_init.php

Spacing +4 added lines, -4 removed lines

@@ -71,22 +71,22 @@
 			'created_at' => $this->integer(),
 			'updated_at' => $this->integer(),
 			'PRIMARY KEY (name)',
-			'FOREIGN KEY (rule_name) REFERENCES ' . neon()->authManager->ruleTable . ' (name) ON DELETE SET NULL ON UPDATE CASCADE'
+			'FOREIGN KEY (rule_name) REFERENCES '.neon()->authManager->ruleTable.' (name) ON DELETE SET NULL ON UPDATE CASCADE'
 		]);
 		$this->createIndex('idx-auth_item-type', AuthItem::tableName(), 'type');
 		$this->createTable(AuthItemChild::tableName(), [
 			'parent' => $this->string(64)->notNull(),
 			'child' => $this->string(64)->notNull(),
 			'PRIMARY KEY (parent, child)',
-			'FOREIGN KEY (parent) REFERENCES ' . neon()->authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
-			'FOREIGN KEY (child) REFERENCES ' . neon()->authManager->itemTable  . ' (name) ON DELETE CASCADE ON UPDATE CASCADE'
+			'FOREIGN KEY (parent) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+			'FOREIGN KEY (child) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE'
 		]);
 		$this->createTable(AuthAssignment::tableName(), [
 			'item_name' => $this->string(64)->notNull(),
 			'user_id' => $this->string(64)->notNull(),
 			'created_at' => $this->integer(),
 			'PRIMARY KEY (item_name, user_id)',
-			'FOREIGN KEY (item_name) REFERENCES ' . neon()->authManager->itemTable . ' (name) ON DELETE CASCADE ON UPDATE CASCADE',
+			'FOREIGN KEY (item_name) REFERENCES '.neon()->authManager->itemTable.' (name) ON DELETE CASCADE ON UPDATE CASCADE',
 		]);
 		$this->createTable(Session::tableName(), [
 			'id' => 'CHAR(64) NOT NULL PRIMARY KEY',