yuncms / framework

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/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/widgets/views/popular.php

Braces +5 added lines, -2 removed lines

@@ -15,9 +15,12 @@
                         </a>
                     </li>
                 <?php endforeach; ?>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <?= Yii::t('yuncms', 'No popular users') ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </ul>
     </div>
 </div>

src/mail/text/user/welcome.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 <?= Yii::t('yuncms', 'Hello') ?>,
 
 <?= Yii::t('yuncms', 'Your account on {0} has been created.', Yii::$app->name) ?>.
-<?php if (Yii::$app->settings->get('enableGeneratingPassword','user')): ?>
+<?php if (Yii::$app->settings->get('enableGeneratingPassword', 'user')): ?>
     <?= Yii::t('yuncms', 'We have generated a password for you') ?>:
     <?= $user->password ?>
 <?php endif ?>

src/mail/user/welcome.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">
     <?= Yii::t('yuncms', 'Your account on {0} has been created.', Yii::$app->name) ?>.
-    <?php if ($showPassword || Yii::$app->settings->get('enableGeneratingPassword','user')): ?>
+    <?php if ($showPassword || Yii::$app->settings->get('enableGeneratingPassword', 'user')): ?>
         <?= Yii::t('yuncms', 'We have generated a password for you') ?>: <strong><?= $user->password ?></strong>
     <?php endif ?>
 

src/user/models/SettingsForm.php

Spacing +3 added lines, -3 removed lines

@@ -91,12 +91,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('yuncms', 'Current password is not valid'));
                 }
@@ -140,7 +140,7 @@ 
             if ($this->email == $this->user->email && $this->user->unconfirmed_email != null) {
                 $this->user->unconfirmed_email = null;
             } elseif ($this->email != $this->user->email) {
-                switch (Yii::$app->settings->get('emailChangeStrategy','user')) {
+                switch (Yii::$app->settings->get('emailChangeStrategy', 'user')) {
                     case UserSettings::STRATEGY_INSECURE:
                         $this->insecureEmailChange();
                         break;

src/user/models/ResendForm.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,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('yuncms', 'This account has already been confirmed'));
                 }
@@ -88,7 +88,7 @@ 
         /** @var UserToken $token */
         $token = new UserToken(['user_id' => $this->user->id, 'type' => UserToken::TYPE_CONFIRMATION]);
         $token->save(false);
-        Yii::$app->sendMail($this->user->email,Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name),'user/confirmation',['user' => $this->user, 'token' => $token]);
+        Yii::$app->sendMail($this->user->email, Yii::t('yuncms', 'Confirm account on {0}', Yii::$app->name), 'user/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;
     }