yuncms / framework

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',

src/user/controllers/SecurityController.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
                 Yii::$app->session->setFlash('danger', Yii::t('yuncms', 'Your account has been blocked.'));
                 $this->action->successUrl = Url::to(['/user/security/login']);
             } else {
-                Yii::$app->user->login($account->user, Yii::$app->settings->get('rememberFor','user'));
+                Yii::$app->user->login($account->user, Yii::$app->settings->get('rememberFor', 'user'));
                 $this->action->successUrl = Yii::$app->getUser()->getReturnUrl();
             }
         } else {

src/user/models/UserProfile.php

Spacing +8 added lines, -8 removed lines

@@ -53,13 +53,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
@@ -101,7 +101,7 @@ 
             [
                 'mobile',
                 MobileValidator::class,
-                'when' => function ($model) {
+                'when' => function($model) {
                     return $model->country == 'China';
                 }
             ],

src/user/controllers/RegistrationController.php

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
 
         if ($user->load(Yii::$app->request->post()) && $user->createUser()) {
             $account->connect($user);
-            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor','user'));
+            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor', 'user'));
             return $this->goBack();
         }
 
@@ -149,7 +149,7 @@ 
     public function actionConfirm($id, $code)
     {
         $user = User::findOne($id);
-        if ($user === null || Yii::$app->settings->get('enableConfirmation','user') == false) {
+        if ($user === null || Yii::$app->settings->get('enableConfirmation', 'user') == false) {
             return $this->goBack();
         }
         $user->attemptConfirmation($code);
@@ -163,7 +163,7 @@ 
      */
     public function actionResend()
     {
-        if (Yii::$app->settings->get('enableConfirmation','user') == false) {
+        if (Yii::$app->settings->get('enableConfirmation', 'user') == false) {
             return $this->goBack();
         }
         /** @var ResendForm $model */

src/user/views/security/login.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
         'autocomplete' => 'off',
         'autofocus' => 'autofocus',
         'tabindex' => '1',
-        'placeholder' => Yii::t('yuncms','Please enter your email address / phone number.'),
+        'placeholder' => Yii::t('yuncms', 'Please enter your email address / phone number.'),
         'required' => true,
     ]]) ?>
 
-    <?= $form->field($model, 'password', ['inputOptions' => ['autocomplete' => 'off','required' => true, 'tabindex' => '2']])->passwordInput()->label(Yii::t('yuncms', 'Password') . (Yii::$app->settings->get('enablePasswordRecovery', 'user') ? ' (' . Html::a(Yii::t('yuncms', 'Forgot password?'), ['/user/recovery/request'], ['tabindex' => '5']) . ')' : '')) ?>
+    <?= $form->field($model, 'password', ['inputOptions' => ['autocomplete' => 'off', 'required' => true, 'tabindex' => '2']])->passwordInput()->label(Yii::t('yuncms', 'Password') . (Yii::$app->settings->get('enablePasswordRecovery', 'user') ? ' (' . Html::a(Yii::t('yuncms', 'Forgot password?'), ['/user/recovery/request'], ['tabindex' => '5']) . ')' : '')) ?>
 
     <?= $form->field($model, 'rememberMe', [
         'options' => [

src/user/views/settings/networks.php

Spacing +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
                                     Html::a(Yii::t('yuncms', 'Disconnect'), $auth->createClientUrl($client), [
                                         'class' => 'btn btn-danger btn-block',
                                         'data-method' => 'post',
-                                    ]) :
-                                    Html::a(Yii::t('yuncms', 'Connect'), $auth->createClientUrl($client), [
+                                    ]) : Html::a(Yii::t('yuncms', 'Connect'), $auth->createClientUrl($client), [
                                         'class' => 'btn btn-success btn-block',
                                     ])
                                 ?>

src/user/models/RegistrationForm.php

Spacing +5 added lines, -5 removed lines

@@ -59,20 +59,20 @@ 
             'emailUnique' => ['email', 'unique', 'targetClass' => User::class, 'message' => Yii::t('yuncms', 'This email address has already been taken')],
 
             // password rules
-            'passwordRequired' => ['password', 'required', 'skipOnEmpty' => Yii::$app->settings->get('enableGeneratingPassword','user')],
+            'passwordRequired' => ['password', 'required', 'skipOnEmpty' => Yii::$app->settings->get('enableGeneratingPassword', 'user')],
             'passwordLength' => ['password', 'string', 'min' => 6],
 
             // verifyCode needs to be entered correctly
             'verifyCodeRequired' => ['verifyCode', 'required',
-                'skipOnEmpty' => !Yii::$app->settings->get('enableRegistrationCaptcha','user')],
+                'skipOnEmpty' => !Yii::$app->settings->get('enableRegistrationCaptcha', 'user')],
 
             'verifyCode' => ['verifyCode', 'captcha',
                 'captchaAction' => '/user/registration/captcha',
-                'skipOnEmpty' => !Yii::$app->settings->get('enableRegistrationCaptcha','user')
+                'skipOnEmpty' => !Yii::$app->settings->get('enableRegistrationCaptcha', 'user')
             ],
 
             '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.'), ],
         ];
     }
 
@@ -117,7 +117,7 @@ 
             return false;
         }
         Yii::$app->session->setFlash('info', Yii::t('yuncms', 'Your account has been created and a message with further instructions has been sent to your email'));
-        return Yii::$app->getUser()->login($user, Yii::$app->settings->get('rememberFor','user'));
+        return Yii::$app->getUser()->login($user, Yii::$app->settings->get('rememberFor', 'user'));
     }
 
     /**

src/user/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -41,13 +41,13 @@ 
 class User extends \yuncms\models\BaseUser
 {
     //场景定义
-    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