ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-19 09:18:18 +03:00
Code Issues Releases Wiki Activity

Доработка механизма выбора пользователей + framework

Browse source
This commit is contained in:
Denis Shakhov 2015-08-12 23:29:44 +07:00
parent 61cba775f7
commit f1f4cbf9ef
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
application/classes/actions/ActionTalk.class.php
View file

@ -518,21 +518,27 @@ class ActionTalk extends Action
/**
* Проверяем адресатов
*/
$sUsers = getRequest('talk_users');
$aUsers = explode(',', (string)$sUsers);
$aUsers = getRequest('talk_users');
$aUsersNew = array();
$aUserInBlacklist = $this->Talk_GetBlacklistByTargetId($this->oUserCurrent->getId());
$this->aUsersId = array();
foreach ($aUsers as $sUser) {
$sUser = trim($sUser);
if ($sUser == '' or strtolower($sUser) == strtolower($this->oUserCurrent->getLogin())) {
if (!is_array($aUsers)) $aUsers = array();
foreach ($aUsers as $iUserId) {
$iUserId = (int) $iUserId;
if ($iUserId == 0 or $iUserId == $this->oUserCurrent->getId()) {
continue;
}
if ($oUser = $this->User_GetUserByLogin($sUser) and $oUser->getActivate() == 1) {
if ($oUser = $this->User_GetUserById($iUserId) and $oUser->getActivate() == 1) {
// Проверяем, попал ли отправиль в блек лист
if (!in_array($oUser->getId(), $aUserInBlacklist)) {
$this->aUsersId[] = $oUser->getId();
$aUsersNew[] = array(
'value' => $oUser->getId(),
'text' => $oUser->getLogin()
);
} else {
$this->Message_AddError(
str_replace(
@ -547,11 +553,10 @@ class ActionTalk extends Action
continue;
}
} else {
$this->Message_AddError($this->Lang_Get('talk.add.notices.users_error_not_found') . ' «' . htmlspecialchars($sUser) . '»',
$this->Message_AddError($this->Lang_Get('talk.add.notices.users_error_not_found') . ' «' . $iUserId . '»',
$this->Lang_Get('common.error.error'));
$bOk = false;
}
$aUsersNew[] = $sUser;
}
if (!count($aUsersNew)) {
$this->Message_AddError($this->Lang_Get('talk.add.notices.users_error'), $this->Lang_Get('common.error.error'));
@ -562,7 +567,7 @@ class ActionTalk extends Action
$this->Message_AddError($this->Lang_Get('talk.add.notices.users_error_many'), $this->Lang_Get('common.error.error'));
$bOk = false;
}
$_REQUEST['talk_users'] = join(',', $aUsersNew);
$_REQUEST['talk_users'] = $aUsersNew;
}
/**
* Выполнение хуков
@ -815,7 +820,7 @@ class ActionTalk extends Action
* Если пользователь пытается добавить в блеклист самого себя,
* возвращаем ошибку
*/
if (strtolower($sUser) == strtolower($this->oUserCurrent->getLogin())) {
if ($sUser == $this->oUserCurrent->getId()) {
$aResult[] = array(
'bStateError' => true,
'sMsgTitle' => $this->Lang_Get('common.error.error'),
@ -826,7 +831,7 @@ class ActionTalk extends Action
/**
* Если пользователь не найден или неактивен, возвращаем ошибку
*/
if ($oUser = $this->User_GetUserByLogin($sUser) and $oUser->getActivate() == 1) {
if ($oUser = $this->User_GetUserById($sUser) and $oUser->getActivate() == 1) {
if (!isset($aUserBlacklist[$oUser->getId()])) {
if ($this->Talk_AddUserToBlackList($oUser->getId(), $this->oUserCurrent->getId())) {
$oViewer = $this->Viewer_GetLocalViewer();
@ -1086,7 +1091,7 @@ class ActionTalk extends Action
/**
* Попытка добавить себя
*/
if (strtolower($sUser) == strtolower($this->oUserCurrent->getLogin())) {
if ($sUser == $this->oUserCurrent->getId()) {
$aResult[] = array(
'bStateError' => true,
'sMsgTitle' => $this->Lang_Get('common.error.error'),
@ -1094,7 +1099,7 @@ class ActionTalk extends Action
);
continue;
}
if (($oUser = $this->User_GetUserByLogin($sUser))
if (($oUser = $this->User_GetUserById($sUser))
&& ($oUser->getActivate() == 1)
) {
if (!in_array($oUser->getId(), $aUserInBlacklist)) {

2
application/frontend/components/talk/add.tpl
View file

@ -11,7 +11,7 @@
{* Получатели *}
{component 'user' template='choose'
name = 'talk_users'
name = 'talk_users[]'
rules = [ 'required' => true, 'rangetags' => '[1,99]' ]
classes = 'js-talk-add-user-choose'
label = {lang 'talk.add.fields.users.label'}

2
framework

@ -1 +1 @@
Subproject commit 0559d0e95063f4758c7e481e862b24bcedaaba46
Subproject commit 9a9ffce8abf3e0004b4d6899f1db7d49db495bb3