更新站内信

librecmscom · Sep 25, 2017 · 99e8381 · 99e8381
1 parent 7492a91
commit 99e8381
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/frontend/models/MessageForm.php b/frontend/models/MessageForm.php
@@ -20,7 +20,7 @@ class MessageForm extends Model
 
     public $parent;
     public $message;
-    public $username;
+    public $nickname;
 
     /**
      * @inheritdoc
@@ -34,7 +34,7 @@ public function rules()
             ['parent', 'filter', 'filter' => 'trim'],
             ['parent', 'required'],
 
-            ['username', 'filter', 'filter' => 'trim'],
+            ['nickname', 'filter', 'filter' => 'trim'],
         ];
     }
 
@@ -68,7 +68,7 @@ public function save()
             } else {
                 /** @var \yuncms\user\models\User $userClass */
                 $userClass = Yii::$app->user->identityClass;
-                $user = $userClass::findByEmailOrMobile($this->username);
+                $user = $userClass::findOne(['nickname' => $this->nickname]);
                 $new->user_id = $user->id;
             }
             return $new->save();

diff --git a/frontend/models/MessageSendForm.php b/frontend/models/MessageSendForm.php
@@ -24,9 +24,9 @@ class MessageSendForm extends Model
     public $user_id;
 
     /**
-     * @var string 用户名
+     * @var string 用户昵称
      */
-    public $username;
+    public $nickname;
 
     /**
      * @var string 消息内容
@@ -41,9 +41,9 @@ class MessageSendForm extends Model
     public function rules()
     {
         return [
-            [['message', 'username'], 'required'],
-            [['username', 'message'], 'filter', 'filter' => 'trim'],
-            ['username', 'validateUsername'],
+            [['message', 'nickname'], 'required'],
+            [['nickname', 'message'], 'filter', 'filter' => 'trim'],
+            ['nickname', 'validateNickname'],
         ];
     }
 
@@ -54,7 +54,7 @@ public function attributeLabels()
     {
         return [
             'user_id' => Yii::t('message', 'User ID'),
-            'username' => Yii::t('message', 'Username'),
+            'nickname' => Yii::t('message', 'Nickname'),
             'message' => Yii::t('message', 'Message Body'),
         ];
     }
@@ -103,7 +103,7 @@ protected function getUser()
     {
         if ($this->_user === null) {
             $userClass = Yii::$app->user->identityClass;
-            $this->_user = $userClass::findOne(['username' => $this->username]);
+            $this->_user = $userClass::findOne(['nickname' => $this->nickname]);
         }
         return $this->_user;
     }

diff --git a/frontend/views/message/send.php b/frontend/views/message/send.php
@@ -21,7 +21,7 @@
         <div class="row">
             <div class="col-md-12">
                 <?php $form = ActiveForm::begin(); ?>
-                <?= $form->field($model, 'username')->label(Yii::t('message','Username'))->input('', ['placeholder' => Yii::t('message','Please enter a user name')]); ?>
+                <?= $form->field($model, 'nickname')->label(Yii::t('message','Username'))->input('', ['placeholder' => Yii::t('message','Please enter a user name')]); ?>
                 <?= $form->field($model, 'message')->label(Yii::t('message','Message content'))->textarea(['placeholder' => Yii::t('message','Please enter the message content')]) ?>
                 <div class="form-group">
                     <?= Html::submitButton(Yii::t('message','Send Message'), ['class' => 'btn btn-primary']) ?>

diff --git a/messages/zh-CN/message.php b/messages/zh-CN/message.php
@@ -39,7 +39,7 @@
     'The requested page does not exist.' => '请求的页面不存在！',
     'Unread' => '未读',
     'User ID' => '用户ID',
-    'Username' => '用户名',
+    'Nickname' => '用户昵称',
     'You' => '你',
     'You enter the user name does not exist oh！' => '你输入的用户名不存在哦！',
     '{form} say to {to}' => '{form} 对 {to} 说',

diff --git a/widgets/SendMessage.php b/widgets/SendMessage.php
@@ -16,16 +16,16 @@ class SendMessage extends Widget
     public $validate = true;
 
     /**
-     * @var string 收件人用户名
+     * @var string 收件人昵称
      */
-    public $username;
+    public $nickname;
 
     /** @inheritdoc */
     public function init()
     {
         parent::init();
-        if (empty ($this->username)) {
-            throw new InvalidConfigException ('The "username" property must be set.');
+        if (empty ($this->nickname)) {
+            throw new InvalidConfigException ('The "nickname" property must be set.');
         }
     }
 
@@ -34,7 +34,7 @@ public function init()
     public function run()
     {
         $model = new MessageSendForm();
-        $model->username = $this->username;
+        $model->nickname = $this->nickname;
         return $this->render('send_message', [
             'model' => $model
         ]);

diff --git a/widgets/models/MessageSendForm.php b/widgets/models/MessageSendForm.php
@@ -24,9 +24,9 @@ class MessageSendForm extends Model
     public $user_id;
 
     /**
-     * @var string 用户名
+     * @var string 用户昵称
      */
-    public $username;
+    public $nickname;
 
     /**
      * @var string 消息内容
@@ -41,9 +41,9 @@ class MessageSendForm extends Model
     public function rules()
     {
         return [
-            [['message', 'username'], 'required'],
-            [['username', 'message'], 'filter', 'filter' => 'trim'],
-            ['username', 'validateUsername'],
+            [['message', 'nickname'], 'required'],
+            [['nickname', 'message'], 'filter', 'filter' => 'trim'],
+            ['nickname', 'validateNickname'],
         ];
     }
 
@@ -54,7 +54,7 @@ public function attributeLabels()
     {
         return [
             'user_id' => Yii::t('message', 'User ID'),
-            'username' => Yii::t('message', 'Username'),
+            'nickname' => Yii::t('message', 'Nickname'),
             'message' => Yii::t('message', 'Message Body'),
         ];
     }
@@ -103,7 +103,7 @@ protected function getUser()
     {
         if ($this->_user === null) {
             $userClass = Yii::$app->user->identityClass;
-            $this->_user = $userClass::findOne(['username' => $this->username]);
+            $this->_user = $userClass::findOne(['nickname' => $this->nickname]);
         }
         return $this->_user;
     }

diff --git a/widgets/views/send_message.php b/widgets/views/send_message.php
@@ -7,7 +7,7 @@
     'id' => 'message-form',
     'action' => ['/message/message/send']
 ]); ?>
-<?= $form->field($model, 'username')->label(false)->hiddenInput(); ?>
+<?= $form->field($model, 'nickname')->label(false)->hiddenInput(); ?>
 <?= $form->field($model, 'message')->label(false)->textarea(['class' => 'form-control']) ?>
 
 <?= Html::submitButton(Yii::t('message', 'Send'), ['class' => 'btn btn-primary']) ?>