@@ -19,7 +19,7 @@ |
||
| 19 | 19 | /* @var $this yii\web\View */ |
| 20 | 20 | /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */ |
| 21 | 21 | |
| 22 | -$this->title = <?= $generator->generateString('Update '.Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>; |
|
| 22 | +$this->title = <?= $generator->generateString('Update ' . Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>; |
|
| 23 | 23 | $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString('Manage ' . Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>, 'url' => ['index']]; |
| 24 | 24 | $this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]]; |
| 25 | 25 | $this->params['breadcrumbs'][] = Yii::t('yuncms', 'Update'); |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | } |
| 79 | 79 | return $model; |
| 80 | 80 | } else { |
| 81 | - throw new NotFoundHttpException ('User not found.'); |
|
| 81 | + throw new NotFoundHttpException('User not found.'); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | 'rules' => [ |
| 50 | 50 | [ |
| 51 | 51 | 'allow' => true, |
| 52 | - 'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect','follower-tag'], |
|
| 52 | + 'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect', 'follower-tag'], |
|
| 53 | 53 | 'roles' => ['@'], |
| 54 | 54 | ], |
| 55 | 55 | ], |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | Yii::$app->response->format = Response::FORMAT_JSON; |
| 130 | 130 | $tagId = Yii::$app->request->post('tag_id', null); |
| 131 | 131 | if (($tag = Tag::findOne($tagId)) == null) { |
| 132 | - throw new NotFoundHttpException (); |
|
| 132 | + throw new NotFoundHttpException(); |
|
| 133 | 133 | } else { |
| 134 | 134 | /** @var \yuncms\user\models\User $user */ |
| 135 | 135 | $user = Yii::$app->user->identity; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | public function actionConfirm($id, $code) |
| 158 | 158 | { |
| 159 | 159 | $user = User::findOne($id); |
| 160 | - if ($user === null || Yii::$app->settings->get('emailChangeStrategy','user') == UserSettings::STRATEGY_INSECURE) { |
|
| 160 | + if ($user === null || Yii::$app->settings->get('emailChangeStrategy', 'user') == UserSettings::STRATEGY_INSECURE) { |
|
| 161 | 161 | throw new NotFoundHttpException(); |
| 162 | 162 | } |
| 163 | 163 | $user->attemptEmailChange($code); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | if ($user->load(Yii::$app->request->post()) && $user->createUser()) { |
| 130 | 130 | $account->connect($user); |
| 131 | - Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor','user')); |
|
| 131 | + Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor', 'user')); |
|
| 132 | 132 | return $this->goBack(); |
| 133 | 133 | } |
| 134 | 134 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | public function actionConfirm($id, $code) |
| 150 | 150 | { |
| 151 | 151 | $user = User::findOne($id); |
| 152 | - if ($user === null || Yii::$app->settings->get('enableConfirmation','user') == false) { |
|
| 152 | + if ($user === null || Yii::$app->settings->get('enableConfirmation', 'user') == false) { |
|
| 153 | 153 | return $this->goBack(); |
| 154 | 154 | } |
| 155 | 155 | $user->attemptEmailConfirmation($code); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | */ |
| 164 | 164 | public function actionResend() |
| 165 | 165 | { |
| 166 | - if (Yii::$app->settings->get('enableConfirmation','user') == false) { |
|
| 166 | + if (Yii::$app->settings->get('enableConfirmation', 'user') == false) { |
|
| 167 | 167 | return $this->goBack(); |
| 168 | 168 | } |
| 169 | 169 | /** @var ResendForm $model */ |
@@ -26,17 +26,17 @@ |
||
| 26 | 26 | return [ |
| 27 | 27 | 'id', |
| 28 | 28 | 'nickname', |
| 29 | - 'faceUrl' => function () { |
|
| 29 | + 'faceUrl' => function() { |
|
| 30 | 30 | return $this->getAvatar(AvatarHelper::AVATAR_MIDDLE); |
| 31 | 31 | }, |
| 32 | 32 | 'identified', |
| 33 | - "created_datetime" => function () { |
|
| 33 | + "created_datetime" => function() { |
|
| 34 | 34 | return gmdate(DATE_ISO8601, $this->created_at); |
| 35 | 35 | }, |
| 36 | - "updated_datetime" => function () { |
|
| 36 | + "updated_datetime" => function() { |
|
| 37 | 37 | return gmdate(DATE_ISO8601, $this->updated_at); |
| 38 | 38 | }, |
| 39 | - 'blocked_datetime' => function () { |
|
| 39 | + 'blocked_datetime' => function() { |
|
| 40 | 40 | return gmdate(DATE_ISO8601, $this->blocked_at); |
| 41 | 41 | } |
| 42 | 42 | ]; |
@@ -24,17 +24,17 @@ |
||
| 24 | 24 | } |
| 25 | 25 | // https://segmentfault.com/q/1010000000672529/a-1020000000679702 |
| 26 | 26 | $this->createTable($this->tableName, [ |
| 27 | - 'id' => $this->bigPrimaryKey()->unsigned()->comment('Id'),//通知ID |
|
| 28 | - 'user_id' => $this->unsignedInteger()->notNull()->comment('User Id'),//接收器 |
|
| 29 | - 'verb' => $this->string(32)->notNull()->comment('Verb'),//活动图片 |
|
| 30 | - 'template' => $this->string()->notNull()->comment('Template'),//通知类型 |
|
| 31 | - 'is_read' => $this->boolean()->defaultValue(false)->comment('Read'),//是否已读 |
|
| 32 | - 'is_pending' => $this->boolean()->defaultValue(false)->comment('Pending'),//是否已经推送 |
|
| 33 | - 'entity' => $this->text()->notNull()->comment('Entity'),//通知实体 |
|
| 34 | - 'publish_at' => $this->unixTimestamp()->notNull()->comment('Publish At'),//发送时间 |
|
| 27 | + 'id' => $this->bigPrimaryKey()->unsigned()->comment('Id'), //通知ID |
|
| 28 | + 'user_id' => $this->unsignedInteger()->notNull()->comment('User Id'), //接收器 |
|
| 29 | + 'verb' => $this->string(32)->notNull()->comment('Verb'), //活动图片 |
|
| 30 | + 'template' => $this->string()->notNull()->comment('Template'), //通知类型 |
|
| 31 | + 'is_read' => $this->boolean()->defaultValue(false)->comment('Read'), //是否已读 |
|
| 32 | + 'is_pending' => $this->boolean()->defaultValue(false)->comment('Pending'), //是否已经推送 |
|
| 33 | + 'entity' => $this->text()->notNull()->comment('Entity'), //通知实体 |
|
| 34 | + 'publish_at' => $this->unixTimestamp()->notNull()->comment('Publish At'), //发送时间 |
|
| 35 | 35 | ], $tableOptions); |
| 36 | 36 | |
| 37 | - $this->createIndex('notification_index', $this->tableName, ['user_id','is_pending']); |
|
| 37 | + $this->createIndex('notification_index', $this->tableName, ['user_id', 'is_pending']); |
|
| 38 | 38 | |
| 39 | 39 | $this->addForeignKey('notification_fk_1', $this->tableName, 'user_id', '{{%user}}', 'id', 'CASCADE', 'RESTRICT'); |
| 40 | 40 | } |