From 50a777c37eeee58b16dcb9a28f8980585e26a582 Mon Sep 17 00:00:00 2001 From: Alexey Kachayev Date: Fri, 4 Sep 2009 14:57:34 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8C-=D0=B0=D0=B2=D1=82=D0=BE=D1=80?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=B3=D0=BB=D0=B0=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8=D1=87?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=B8=20=D1=83=D0=B4=D0=B0=D0=BB=D1=8F=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20talk-=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BA=D0=B8.=20=D0=9F=D1=80=D0=B8=20=D1=87=D1=82=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC=D0=B0,=20=D1=83?= =?UTF-8?q?=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B3=D0=BE=20=D0=BD?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D1=83=D1=87=D0=B0=D1=81=D1=82=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20=D1=82=D0=B5=D0=BA=D1=83?= =?UTF-8?q?=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F,=20=D0=B0=20=D1=82=D0=B0?= =?UTF-8?q?=D0=BA=D0=B6=D0=B5=20=D0=BD=D0=B5=D1=82=20=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=B5=20=D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0?= =?UTF-8?q?=D1=80=D0=B8=D0=B5=D0=B2,=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B5=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/actions/ActionProfile.class.php | 6 +++++- classes/actions/ActionTalk.class.php | 18 ++++++++++++++++++ classes/modules/user/User.class.php | 2 -- templates/skin/new/actions/ActionTalk/read.tpl | 2 ++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/classes/actions/ActionProfile.class.php b/classes/actions/ActionProfile.class.php index 86dc991d..97b81e75 100644 --- a/classes/actions/ActionProfile.class.php +++ b/classes/actions/ActionProfile.class.php @@ -441,7 +441,11 @@ class ActionProfile extends Action { 'user_text'=>$sUserText ) ); - $this->Talk_SendTalk($sTitle,$sText,$this->oUserCurrent,array($oUser),false,false); + $oTalk=$this->Talk_SendTalk($sTitle,$sText,$this->oUserCurrent,array($oUser),false,false); + /** + * Удаляем отправляющего юзера из переписки + */ + $this->Talk_DeleteTalkUserByArray($oTalk->getId(),$this->oUserCurrent->getId()); } else { $this->Message_AddErrorSingle($this->Lang_Get('system_error'),$this->Lang_Get('error')); } diff --git a/classes/actions/ActionTalk.class.php b/classes/actions/ActionTalk.class.php index 7e0dbd4e..450a7cf0 100644 --- a/classes/actions/ActionTalk.class.php +++ b/classes/actions/ActionTalk.class.php @@ -316,6 +316,24 @@ class ActionTalk extends Action { $this->Viewer_Assign('aComments',$aComments); $this->Viewer_Assign('iMaxIdComment',$iMaxIdComment); $this->Viewer_AddBlocks('right',array('actions/ActionTalk/speakers.tpl')); + /** + * Подсчитываем нужно ли отображать комментарии. + * Комментарии не отображаются, если у вестки только один читатель + * и ранее созданных комментариев нет. + */ + if(count($aComments)==0) { + $iActiveSpeakers=0; + foreach((array)$oTalk->getTalkUsers() as $oTalkUser) { + if( ($oTalkUser->getUserId()!=$this->oUserCurrent->getId()) + && $oTalkUser->getUserActive()==LsTalk::TALK_USER_ACTIVE ){ + $iActiveSpeakers++; + break; + } + } + if($iActiveSpeakers==0) { + $this->Viewer_Assign('bNoComments',true); + } + } } diff --git a/classes/modules/user/User.class.php b/classes/modules/user/User.class.php index a8e3ed52..d9fb37a1 100644 --- a/classes/modules/user/User.class.php +++ b/classes/modules/user/User.class.php @@ -823,8 +823,6 @@ class LsUser extends Module { return $data; } - - /** * Получает инвайт по его коду * diff --git a/templates/skin/new/actions/ActionTalk/read.tpl b/templates/skin/new/actions/ActionTalk/read.tpl index e778508c..fbe67bf5 100644 --- a/templates/skin/new/actions/ActionTalk/read.tpl +++ b/templates/skin/new/actions/ActionTalk/read.tpl @@ -20,6 +20,7 @@ {assign var="oTalkUser" value=$oTalk->getTalkUser()} + {if !$bNoComments} {include file='comment_tree.tpl' iTargetId=$oTalk->getId() @@ -29,6 +30,7 @@ sNoticeCommentAdd=$aLang.topic_comment_add bNoCommentFavourites=true } + {/if} {include file='footer.tpl'} \ No newline at end of file