Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #45154.

Browse Source
This commit is contained in:
liyuchun
2021-11-29 11:29:46 +08:00
parent 803a3524b9
commit dbf176316b
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mail/model.php
+4 -3
View File
@@ -292,9 +292,10 @@ class mailModel extends model
}
/* Remove deleted users. */
$users = $this->loadModel('user')->getPairs('nodeleted|all');
foreach($toList as $key => $to) if(!isset($users[trim($to)])) unset($toList[$key]);
foreach($ccList as $key => $cc) if(!isset($users[trim($cc)])) unset($ccList[$key]);
$users = $this->loadModel('user')->getPairs('nodeleted|all');
$blockUsers = isset($this->config->message->blockUser) ? explode(',', $this->config->message->blockUser) : array();
foreach($toList as $key => $to) if(!isset($users[trim($to)]) or in_array(trim($to), $blockUsers)) unset($toList[$key]);
foreach($ccList as $key => $cc) if(!isset($users[trim($cc)]) or in_array(trim($cc), $blockUsers)) unset($ccList[$key]);
if(!$toList and !$ccList) return;
if(!$toList and $ccList) $toList = array(array_shift($ccList));
module/message/control.php
+3 -1
View File
@@ -84,7 +84,9 @@ class message extends control
{
$data = fixer::input('post')->get();
$data->messageSetting = !empty($data->messageSetting) ? json_encode($data->messageSetting) : '';
$data->blockUser = !empty($data->blockUser) ? implode(',', $data->blockUser) : '';
$this->loadModel('setting')->setItem('system.message.setting', $data->messageSetting);
$this->loadModel('setting')->setItem('system.message.blockUser', $data->blockUser);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
@@ -95,7 +97,7 @@ class message extends control
$this->view->position[] = $this->lang->message->common;
$this->view->position[] = $this->lang->message->setting;
$users = $this->loadModel('user')->getPairs('noletter');
$users = $this->loadModel('user')->getPairs('noletter,noclosed');
unset($users['']);
$this->view->users = $users;
module/message/lang/en.php
+5 -4
View File
@@ -1,8 +1,9 @@
<?php
$lang->message->common = 'Notification';
$lang->message->index = 'Home';
$lang->message->setting = 'Settings';
$lang->message->browser = 'Browser Notification';
$lang->message->common = 'Notification';
$lang->message->index = 'Home';
$lang->message->setting = 'Settings';
$lang->message->browser = 'Browser Notification';
$lang->message->blockUser = 'Block User';
$lang->message->typeList['mail'] = 'Email';
$lang->message->typeList['message'] = 'Browser Notifications';
module/message/lang/zh-cn.php
+5 -4
View File
@@ -1,8 +1,9 @@
<?php
$lang->message->common = '消息';
$lang->message->index = '首页';
$lang->message->setting = '设置';
$lang->message->browser = '浏览器通知';
$lang->message->common = '消息';
$lang->message->index = '首页';
$lang->message->setting = '设置';
$lang->message->browser = '浏览器通知';
$lang->message->blockUser = '不通知人员';
$lang->message->typeList['mail'] = '邮件';
$lang->message->typeList['message'] = '浏览器通知';
module/message/view/setting.html.php
+4
View File
@@ -74,6 +74,10 @@
<?php endforeach;?>
</tr>
<?php endforeach;?>
<tr>
<td><?php echo $lang->message->blockUser;?></td>
<td><?php echo html::select('blockUser[]', $users, isset($config->message->blockUser) ? $config->message->blockUser: '', "class='form-control chosen' multiple");?></td>
</tr>
</tbody>
<tfoot>
<tr>