yuncms / framework

src/admin/views/user/index.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 //                    ],
                     [
                         'attribute' => 'registration_ip',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->registration_ip == null
                                 ? '<span class="not-set">' . Yii::t('app', '(not set)') . '</span>'
                                 : $model->registration_ip;
@@ -95,7 +95,7 @@ 
                     ],
                     [
                         'header' => Yii::t('yuncms', 'Confirmation'),
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             if ($model->isEmailConfirmed) {
                                 return '<div class="text-center"><span class="text-success">' . Yii::t('yuncms', 'Confirmed') . '</span></div>';
                             } else {
@@ -111,7 +111,7 @@ 
                     ],
                     [
                         'header' => Yii::t('yuncms', 'Block status'),
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             if ($model->isBlocked) {
                                 return Html::a(Yii::t('yuncms', 'Unblock'), ['block', 'id' => $model->id], [
                                     'class' => 'btn btn-xs btn-success btn-block',

src/admin/ItemController.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
         $model = new AdminAuthItem(null);
         $model->type = $this->type;
         if ($model->load(Yii::$app->getRequest()->post()) && $model->save()) {
-            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Create success.'));
+            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Create success.'));
             return $this->redirect(['view', 'id' => $model->name]);
         } else {
             return $this->render('create', ['model' => $model]);

src/admin/models/AdminAuthItem.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         return [
             [['ruleName'], 'checkRule'],
             [['name', 'type'], 'required'],
-            [['name'], 'checkUnique', 'when' => function () {
+            [['name'], 'checkUnique', 'when' => function() {
                 return $this->isNewRecord || ($this->_item->name != $this->name);
             }],
             [['type'], 'integer'],

src/admin/controllers/AssignmentController.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         parent::init();
         if ($this->userClassName === null) {
             $this->userClassName = Yii::$app->getUser()->identityClass;
-            $this->userClassName ? : 'yuncms\admin\models\Admin';
+            $this->userClassName ?: 'yuncms\admin\models\Admin';
         }
     }
 

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;

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 */