yuncms / framework

src/user/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -41,13 +41,13 @@ 
 class User extends \yuncms\models\User
 {
     //场景定义
-    const SCENARIO_CREATE = 'create';//后台或控制台创建用户
-    const SCENARIO_UPDATE = 'update';//后台或控制台修改用户
-    const SCENARIO_REGISTER = 'basic_create';//邮箱注册
-    const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册
-    const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册
-    const SCENARIO_SETTINGS = 'settings';//更新
-    const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户
+    const SCENARIO_CREATE = 'create'; //后台或控制台创建用户
+    const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户
+    const SCENARIO_REGISTER = 'basic_create'; //邮箱注册
+    const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册
+    const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册
+    const SCENARIO_SETTINGS = 'settings'; //更新
+    const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户
     const SCENARIO_PASSWORD = 'password';
 
     //头像
@@ -70,7 +70,7 @@ 
     public function behaviors()
     {
         $behaviors = parent::behaviors();
-        return ArrayHelper::merge($behaviors,[
+        return ArrayHelper::merge($behaviors, [
             'taggable' => [
                 'class' => TaggableBehavior::class,
                 'tagValuesAsArray' => true,
@@ -93,8 +93,8 @@ 
             static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'],
             static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'],
             static::SCENARIO_SETTINGS => ['username', 'email', 'password'],
-            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空
-            static::SCENARIO_PASSWORD => ['password'],//只修改密码
+            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空
+            static::SCENARIO_PASSWORD => ['password'], //只修改密码
         ]);
     }
 
@@ -104,7 +104,7 @@ 
      */
     public function rules()
     {
-        return ArrayHelper::merge(parent::rules(),[
+        return ArrayHelper::merge(parent::rules(), [
             // nickname rules
             'nicknameRequired' => ['nickname', 'required', 'on' => [self::SCENARIO_EMAIL_REGISTER, self::SCENARIO_CONNECT]],
             // email rules

src/user/models/UserProfile.php

Spacing +8 added lines, -8 removed lines

@@ -52,13 +52,13 @@ 
     const GENDER_FEMALE = 0b10;
 
     //当前状态
-    const CURRENT_OTHER = 0b0;//其他
-    const CURRENT_WORK = 0b1;//正常工作
-    const CURRENT_FREELANCE = 0b10;//自由职业者
-    const CURRENT_START = 0b11;//创业
-    const CURRENT_OUTSOURCE = 0b100;//外包
-    const CURRENT_JOB = 0b101;//求职
-    const CURRENT_STUDENT = 0b110;//学生
+    const CURRENT_OTHER = 0b0; //其他
+    const CURRENT_WORK = 0b1; //正常工作
+    const CURRENT_FREELANCE = 0b10; //自由职业者
+    const CURRENT_START = 0b11; //创业
+    const CURRENT_OUTSOURCE = 0b100; //外包
+    const CURRENT_JOB = 0b101; //求职
+    const CURRENT_STUDENT = 0b110; //学生
 
     /**
      * @inheritdoc
@@ -100,7 +100,7 @@ 
             [
                 'mobile',
                 'yuncms\core\validators\MobileValidator',
-                'when' => function ($model) {
+                'when' => function($model) {
                     return $model->country == 'China';
                 }
             ],

src/user/controllers/SettingsController.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
                 'rules' => [
                     [
                         'allow' => true,
-                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect','follower-tag'],
+                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect', 'follower-tag'],
                         'roles' => ['@'],
                     ],
                 ],
@@ -128,7 +128,7 @@ 
         Yii::$app->response->format = Response::FORMAT_JSON;
         $tagId = Yii::$app->request->post('tag_id', null);
         if (($tag = Tag::findOne($tagId)) == null) {
-            throw new NotFoundHttpException ();
+            throw new NotFoundHttpException();
         } else {
             /** @var \yuncms\user\models\User $user */
             $user = Yii::$app->user->identity;

src/user/models/SettingsForm.php

Spacing +2 added lines, -2 removed lines

@@ -94,12 +94,12 @@
             'emailRequired' => ['email', 'required'],
             'emailTrim' => ['email', 'filter', 'filter' => 'trim'],
             'emailPattern' => ['email', 'email'],
-            'emailUsernameUnique' => [['email', 'username'], 'unique', 'when' => function ($model, $attribute) {
+            'emailUsernameUnique' => [['email', 'username'], 'unique', 'when' => function($model, $attribute) {
                 return $this->user->$attribute != $model->$attribute;
             }, 'targetClass' => User::class],
             'newPasswordLength' => ['new_password', 'string', 'min' => 6],
             'currentPasswordRequired' => ['current_password', 'required'],
-            'currentPasswordValidate' => ['current_password', function ($attr) {
+            'currentPasswordValidate' => ['current_password', function($attr) {
                 if (!PasswordHelper::validate($this->$attr, $this->user->password_hash)) {
                     $this->addError($attr, Yii::t('user', 'Current password is not valid'));
                 }

src/user/models/RegistrationForm.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
             ],
 
             'registrationPolicyRequired' => ['registrationPolicy', 'required', 'skipOnEmpty' => false, 'requiredValue' => true,
-                'message' => Yii::t('yuncms', 'By registering you confirm that you accept the Service Agreement and Privacy Policy.'),],
+                'message' => Yii::t('yuncms', 'By registering you confirm that you accept the Service Agreement and Privacy Policy.'), ],
         ];
     }
 

src/user/models/RecoveryForm.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
             'emailRequired' => ['email', 'required'],
             'emailPattern' => ['email', 'email'],
             'emailExist' => ['email', 'exist', 'targetClass' => User::class, 'message' => Yii::t('yuncms', 'There is no user with this email address')],
-            'emailUnconfirmed' => ['email', function ($attribute) {
+            'emailUnconfirmed' => ['email', function($attribute) {
                 $this->user = User::findByEmail($this->email);
                 if ($this->user !== null && $this->getSetting('enableConfirmation') && !$this->user->isEmailConfirmed) {
                     $this->addError($attribute, Yii::t('yuncms', 'You need to confirm your email address.'));
@@ -85,9 +85,9 @@ 
     {
         if ($this->validate()) {
             /** @var UserToken $token */
-            $token = new UserToken([ 'user_id' => $this->user->id, 'type' => UserToken::TYPE_RECOVERY]);
+            $token = new UserToken(['user_id' => $this->user->id, 'type' => UserToken::TYPE_RECOVERY]);
             $token->save(false);
-            $this->sendMessage($this->user->email,Yii::t('yuncms', 'Complete password reset on {0}', Yii::$app->name),'recovery',['user' => $this->user, 'token' => $token]);
+            $this->sendMessage($this->user->email, Yii::t('yuncms', 'Complete password reset on {0}', Yii::$app->name), 'recovery', ['user' => $this->user, 'token' => $token]);
             Yii::$app->session->setFlash('info', Yii::t('yuncms', 'An email has been sent with instructions for resetting your password'));
             return true;
         }

src/user/models/ResendForm.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
             'emailRequired' => ['email', 'required'],
             'emailPattern' => ['email', 'email'],
             'emailExist' => ['email', 'exist', 'targetClass' => User::class],
-            'emailConfirmed' => ['email', function () {
+            'emailConfirmed' => ['email', function() {
                 if ($this->user != null && $this->user->isEmailConfirmed) {
                     $this->addError('email', Yii::t('user', 'This account has already been confirmed'));
                 }
@@ -90,7 +90,7 @@ 
         /** @var UserToken $token */
         $token = new UserToken(['user_id' => $this->user->id, 'type' => UserToken::TYPE_CONFIRMATION]);
         $token->save(false);
-        $this->sendMessage($this->user->email,Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name),'confirmation',['user' => $this->user, 'token' => $token]);
+        $this->sendMessage($this->user->email, Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name), 'confirmation', ['user' => $this->user, 'token' => $token]);
         Yii::$app->session->setFlash('info', Yii::t('yuncms', 'A message has been sent to your email address. It contains a confirmation link that you must click to complete registration.'));
         return true;
     }

src/user/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     {
         //监听用户活动时间
         /** @var \yii\web\UserEvent $event */
-        $app->on(Application::EVENT_AFTER_REQUEST, function ($event) use ($app) {
+        $app->on(Application::EVENT_AFTER_REQUEST, function($event) use ($app) {
             if (!$app->user->isGuest && Yii::$app->has('queue')) {
                 //$app->user->identity->update
                 //记录最后活动时间
@@ -37,7 +37,7 @@ 
 
         //监听用户登录事件
         /** @var \yii\web\UserEvent $event */
-        $app->user->on(User::EVENT_AFTER_LOGIN, function ($event) use ($app) {
+        $app->user->on(User::EVENT_AFTER_LOGIN, function($event) use ($app) {
             //记录最后登录时间记录最后登录IP记录登录次数
             Yii::$app->queue->push(new ResetLoginDataJob(['user_id' => $app->user->identity->getId(), 'ip' => Yii::$app->request->userIP]));
         });

config/web.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
     ],
     'components' => [
         'cache' => [
-            'keyPrefix' => 'web',       //前缀
+            'keyPrefix' => 'web', //前缀
         ],
         'user' => [
             'identityClass' => yuncms\user\models\User::class,
@@ -22,13 +22,13 @@ 
             'secureProtocolHeaders' => [
                 'X-Forwarded-Proto' => ['https'], // Common
                 'Front-End-Https' => ['on'], // Microsoft
-                'X-Client-Scheme' => ['https'],// Aliyun CDN
+                'X-Client-Scheme' => ['https'], // Aliyun CDN
                 'X-Client-Proto' => ['https'],
             ],
             'ipHeaders' => [
-                'X-Forwarded-For',// Common
+                'X-Forwarded-For', // Common
                 'X-Cluster-Client-IP',
-                'ALI-CDN-REAL-IP',// Aliyun CDN
+                'ALI-CDN-REAL-IP', // Aliyun CDN
                 'Client-IP',
                 'X-Forwarded',
                 'Forwarded-For',