ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 03:30:48 +03:00
Code Issues Releases Wiki Activity

fix blog

Browse source
This commit is contained in:
Mzhelskiy Maxim 2010-03-31 14:39:44 +00:00
parent d23d54d85f
commit b9dbea41a6
3 changed files with 29 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
classes/actions/ActionBlog.class.php
View file

@ -704,22 +704,28 @@ class ActionBlog extends Action {
/**
* Передан ли номер страницы
*/
$iPage= $this->GetParamEventMatch(($sShowType=='good')?0:1,2) ? $this->GetParamEventMatch(($sShowType=='good')?0:1,2) : 1;
/**
* Получаем список топиков
*/
$aResult=$this->Topic_GetTopicsByBlog($oBlog,$iPage,Config::Get('module.topic.per_page'),$sShowType);
$aTopics=$aResult['collection'];
/**
* Формируем постраничность
*/
$aPaging=($sShowType=='good')
$iPage= $this->GetParamEventMatch(($sShowType=='good')?0:1,2) ? $this->GetParamEventMatch(($sShowType=='good')?0:1,2) : 1;
if (!$bCloseBlog) {
/**
* Получаем список топиков
*/
$aResult=$this->Topic_GetTopicsByBlog($oBlog,$iPage,Config::Get('module.topic.per_page'),$sShowType);
$aTopics=$aResult['collection'];
/**
* Формируем постраничность
*/
$aPaging=($sShowType=='good')
? $this->Viewer_MakePaging($aResult['count'],$iPage,Config::Get('module.topic.per_page'),4,rtrim($oBlog->getUrlFull(),'/'))
: $this->Viewer_MakePaging($aResult['count'],$iPage,Config::Get('module.topic.per_page'),4,$oBlog->getUrlFull().$sShowType);
/**
* Получаем число новых топиков в текущем блоге
*/
$this->iCountTopicsBlogNew=$this->Topic_GetCountTopicsByBlogNew($oBlog);
: $this->Viewer_MakePaging($aResult['count'],$iPage,Config::Get('module.topic.per_page'),4,$oBlog->getUrlFull().$sShowType);
/**
* Получаем число новых топиков в текущем блоге
*/
$this->iCountTopicsBlogNew=$this->Topic_GetCountTopicsByBlogNew($oBlog);
$this->Viewer_Assign('aPaging',$aPaging);
$this->Viewer_Assign('aTopics',$aTopics);
}
/**
* Выставляем SEO данные
*/
@ -755,8 +761,6 @@ class ActionBlog extends Action {
$this->Viewer_Assign('iCountBlogUsers',count($aBlogUsers));
$this->Viewer_Assign('iCountBlogModerators',count($aBlogModerators));
$this->Viewer_Assign('iCountBlogAdministrators',count($aBlogAdministrators)+1);
$this->Viewer_Assign('aPaging',$aPaging);
$this->Viewer_Assign('aTopics',$aTopics);
$this->Viewer_Assign('oBlog',$oBlog);
$this->Viewer_Assign('bCloseBlog',$bCloseBlog);
$this->Viewer_AddHtmlTitle($oBlog->getTitle());

31
classes/modules/topic/Topic.class.php
View file

@ -797,9 +797,9 @@ class LsTopic extends Module {
* @return unknown
*/
public function GetTopicsByBlog($oBlog,$iPage,$iPerPage,$sShowType='good') {
$aFilter=array(
$aFilter=array(
'topic_publish' => 1,
'blog_id' => $oBlog->getId(),
'blog_id' => $oBlog->getId(),
);
switch ($sShowType) {
case 'good':
@ -819,15 +819,7 @@ class LsTopic extends Module {
break;
default:
break;
}
/**
* Если пользователь авторизирован, то добавляем в выдачу
* закрытые блоги в которых он состоит
*/
if($this->oUserCurrent) {
$aOpenBlogs = $this->Blog_GetAccessibleBlogsByUser($this->oUserCurrent);
if(count($aOpenBlogs)) $aFilter['blog_type']['close'] = $aOpenBlogs;
}
}
return $this->GetTopicsByFilter($aFilter,$iPage,$iPerPage);
}
@ -839,25 +831,12 @@ class LsTopic extends Module {
*/
public function GetCountTopicsByBlogNew($oBlog) {
$sDate=date("Y-m-d H:00:00",time()-Config::Get('module.topic.new_time'));
$aFilter=array(
'blog_type' => array(
'open',
),
$aFilter=array(
'topic_publish' => 1,
'blog_id' => $oBlog->getId(),
'topic_new' => $sDate,
);
/**
* Если пользователь авторизирован, то добавляем в выдачу
* закрытые блоги в которых он состоит
*/
if($this->oUserCurrent) {
$aOpenBlogs = $this->Blog_GetAccessibleBlogsByUser($this->oUserCurrent);
if(count($aOpenBlogs)) $aFilter['blog_type']['close'] = $aOpenBlogs;
}
);
return $this->GetCountTopicsByFilter($aFilter);
}
/**

6
templates/skin/new/menu.blog.tpl
View file

@ -14,9 +14,9 @@
<a href="{router page='blog'}">{$aLang.blog_menu_collective}</a> {if $iCountTopicsCollectiveNew>0}+{$iCountTopicsCollectiveNew}{/if}
{if $sMenuItemSelect=='blog'}
<ul class="sub-menu" >
<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><div><a href="{router page='blog'}">{$aLang.blog_menu_collective_good}</a></div></li>
{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><div><a href="{router page='blog'}new/">{$aLang.blog_menu_collective_new}</a> +{$iCountTopicsBlogNew}</div></li>{/if}
<li {if $sMenuSubItemSelect=='bad'}class="active"{/if}><div><a href="{router page='blog'}bad/">{$aLang.blog_menu_collective_bad}</a></div></li>
<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><div><a href="{$sMenuSubBlogUrl}">{$aLang.blog_menu_collective_good}</a></div></li>
{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><div><a href="{$sMenuSubBlogUrl}new/">{$aLang.blog_menu_collective_new}</a> +{$iCountTopicsBlogNew}</div></li>{/if}
<li {if $sMenuSubItemSelect=='bad'}class="active"{/if}><div><a href="{$sMenuSubBlogUrl}bad/">{$aLang.blog_menu_collective_bad}</a></div></li>
</ul>
{/if}
</li>