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/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('user', '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/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 */