yuncms / framework

src/user/models/User.php

Spacing +9 added lines, -9 removed lines

@@ -48,13 +48,13 @@ 
     const AFTER_REGISTER = 'afterRegister';
 
     //场景定义
-    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';
 
     /**
@@ -95,8 +95,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'], //只修改密码
         ]);
     }
 

src/models/Attachment.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
                 'attributes' => [
                     ActiveRecord::EVENT_BEFORE_INSERT => 'user_id'
                 ],
-                'value' => function () {
+                'value' => function() {
                     return Yii::$app->user->id;
                 }
             ],

config/console.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $config = [
     'components' => [
         'cache' => [
-            'keyPrefix' => 'rest',       //前缀
+            'keyPrefix' => 'rest', //前缀
         ],
         'request' => [
             'class' => yuncms\console\Request::class,

src/gii/generators/model/model.php

Spacing +13 added lines, -13 removed lines

@@ -21,19 +21,19 @@ 
 use Yii;
 use <?= $generator->baseClass?>;
 use yii\db\Connection;
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\helpers\Inflector;
 <?php endif; ?>
 
 use yii\caching\DbDependency;
 use yii\caching\ChainedDependency;
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 use yii\behaviors\TimestampBehavior;
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
 use yii\behaviors\BlameableBehavior;
 <?php endif; ?>
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\behaviors\AttributeBehavior;
 <?php endif; ?>
 use yuncms\helpers\DateHelper;
@@ -53,7 +53,7 @@ 
 <?php endif; ?>
  *
  * @property-read boolean $isAuthor 是否是作者
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
  * @property-read boolean $isDraft 是否草稿
  * @property-read boolean $isPublished 是否发布
 <?php endif; ?>
@@ -64,7 +64,7 @@ 
     //场景定义
     const SCENARIO_CREATE = 'create';//创建
     const SCENARIO_UPDATE = 'update';//更新
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     //状态定义
     const STATUS_DRAFT = 0b0;//草稿
     const STATUS_REVIEW = 0b1;//待审核
@@ -97,7 +97,7 @@ 
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className()
         ];
-<?php elseif(isset($labels['created_at'])): ?>
+<?php elseif (isset($labels['created_at'])): ?>
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className(),
             'attributes' => [
@@ -105,7 +105,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
         $behaviors['user'] = [
             'class' => BlameableBehavior::className(),
             'attributes' => [
@@ -113,7 +113,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['slug'])): ?>
+<?php if (isset($labels['slug'])): ?>
         $behaviors['slug'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -124,7 +124,7 @@ 
             }
         ];
 <?php endif; ?>
-<?php if(isset($labels['uuid'])): ?>
+<?php if (isset($labels['uuid'])): ?>
         $behaviors['uuid'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -166,7 +166,7 @@ 
      */
     public function rules()
     {
-        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if(isset($labels['status'])): ?>// status rule
+        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if (isset($labels['status'])): ?>// status rule
             ['status', 'default', 'value' => self::STATUS_REVIEW],
             ['status', 'in', 'range' => [self::STATUS_DRAFT, self::STATUS_REVIEW, self::STATUS_REJECTED, self::STATUS_PUBLISHED]],<?php endif; ?>
         ];
@@ -215,7 +215,7 @@ 
     {
         return $this->user_id == Yii::$app->user->id;
     }
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     /**
      * 是否草稿状态
      * @return bool
@@ -364,7 +364,7 @@ 
         ]));
         return $total;
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 获取模型今日新增总数

src/user/models/UserAuthItem.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/UserItemController.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
         $model = new UserAuthItem(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/views/user-item/_form.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 unset($rules[RouteRule::RULE_NAME]);
 ?>
 
-<?php $form = ActiveForm::begin(['layout' => 'horizontal',]); ?>
+<?php $form = ActiveForm::begin(['layout' => 'horizontal', ]); ?>
 <?= $form->field($model, 'name')->textInput(['maxlength' => 64]) ?>
 <div class="hr-line-dashed"></div>
 <?= $form->field($model, 'description')->textarea(['rows' => 2]) ?>

src/admin/views/user-item/index.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
                         'attribute' => 'description',
                         'label' => Yii::t('yuncms', 'Role Description'),
                     ],
-                    ['class' => 'yuncms\grid\ActionColumn',],
+                    ['class' => 'yuncms\grid\ActionColumn', ],
                 ],
             ])
             ?>

src/admin/controllers/UserRuleController.php

Spacing +5 added lines, -5 removed lines

@@ -73,10 +73,10 @@ 
         $model = new UserBizRule(null);
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             UserRBACHelper::invalidate();
-            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,]);
+            return $this->render('create', ['model' => $model, ]);
         }
     }
 
@@ -93,11 +93,11 @@ 
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             UserRBACHelper::invalidate();
-            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Update success.'));
+            Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Update success.'));
             return $this->redirect(['view', 'id' => $model->name]);
         }
 
-        return $this->render('update', ['model' => $model,]);
+        return $this->render('update', ['model' => $model, ]);
     }
 
     /**
@@ -113,7 +113,7 @@ 
         $model = $this->findModel($id);
         Yii::$app->authManager->remove($model->item);
         UserRBACHelper::invalidate();
-        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Delete success.'));
+        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
         return $this->redirect(['index']);
     }