mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-06-30 21:45:01 +03:00
Небольшая доработка RSS
This commit is contained in:
parent
121227ba25
commit
2d33666477
|
@ -24,6 +24,7 @@ class ActionRss extends Action {
|
||||||
|
|
||||||
public function Init() {
|
public function Init() {
|
||||||
$this->SetDefaultEvent('index');
|
$this->SetDefaultEvent('index');
|
||||||
|
Router::SetIsShowStats(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function RegisterEvent() {
|
protected function RegisterEvent() {
|
||||||
|
@ -91,7 +92,7 @@ class ActionRss extends Action {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function RssComments() {
|
protected function RssComments() {
|
||||||
$aResult=$this->Comment_GetCommentsAll(0,1,BLOG_TOPIC_PER_PAGE*2);
|
$aResult=$this->Comment_GetCommentsAll(0,1,BLOG_COMMENT_PER_PAGE*2);
|
||||||
$aComments=$aResult['collection'];
|
$aComments=$aResult['collection'];
|
||||||
|
|
||||||
$aChannel['title']=SITE_NAME;
|
$aChannel['title']=SITE_NAME;
|
||||||
|
@ -119,7 +120,12 @@ class ActionRss extends Action {
|
||||||
|
|
||||||
protected function RssTopicComments() {
|
protected function RssTopicComments() {
|
||||||
$sTopicId=$this->GetParam(0);
|
$sTopicId=$this->GetParam(0);
|
||||||
$aComments=$this->Comment_GetCommentsByTopicId($sTopicId);
|
|
||||||
|
if (!($oTopic=$this->Topic_GetTopicById($sTopicId))) {
|
||||||
|
return parent::EventNotFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
$aComments=$this->Comment_GetCommentsByTopicId($oTopic->getId());
|
||||||
|
|
||||||
$aChannel['title']=SITE_NAME;
|
$aChannel['title']=SITE_NAME;
|
||||||
$aChannel['link']=DIR_WEB_ROOT;
|
$aChannel['link']=DIR_WEB_ROOT;
|
||||||
|
@ -130,9 +136,9 @@ class ActionRss extends Action {
|
||||||
|
|
||||||
$comments=array();
|
$comments=array();
|
||||||
foreach ($aComments as $oComment){
|
foreach ($aComments as $oComment){
|
||||||
$item['title']='коментар до: '.$oComment->getTopicTitle();
|
$item['title']='коментар до: '.$oTopic->getTitle();
|
||||||
$item['guid']=$oComment->getTopicUrl().'#comment'.$oComment->getId();
|
$item['guid']=$oTopic->getUrl().'#comment'.$oComment->getId();
|
||||||
$item['link']=$oComment->getTopicUrl().'#comment'.$oComment->getId();
|
$item['link']=$oTopic->getUrl().'#comment'.$oComment->getId();
|
||||||
$item['description']=$oComment->getText();
|
$item['description']=$oComment->getText();
|
||||||
$item['pubDate']=$oComment->getDate();
|
$item['pubDate']=$oComment->getDate();
|
||||||
$item['author']=$oComment->getUserLogin();
|
$item['author']=$oComment->getUserLogin();
|
||||||
|
@ -174,16 +180,16 @@ class ActionRss extends Action {
|
||||||
|
|
||||||
protected function RssColectiveBlog() {
|
protected function RssColectiveBlog() {
|
||||||
$sBlogUrl=$this->GetParam(0);
|
$sBlogUrl=$this->GetParam(0);
|
||||||
if (!$sBlogUrl or !($sBlog=$this->Blog_GetBlogByUrl($sBlogUrl))) {
|
if (!$sBlogUrl or !($oBlog=$this->Blog_GetBlogByUrl($sBlogUrl))) {
|
||||||
$aResult['collection']=array();
|
return parent::EventNotFound();
|
||||||
}else{
|
}else{
|
||||||
$aResult=$this->Topic_GetTopicsByBlogGood($sBlog,0,1,BLOG_TOPIC_PER_PAGE*2);
|
$aResult=$this->Topic_GetTopicsByBlogGood($oBlog,0,1,BLOG_TOPIC_PER_PAGE*2);
|
||||||
}
|
}
|
||||||
$aTopics=$aResult['collection'];
|
$aTopics=$aResult['collection'];
|
||||||
|
|
||||||
$aChannel['title']=SITE_NAME;
|
$aChannel['title']=SITE_NAME;
|
||||||
$aChannel['link']=DIR_WEB_ROOT;
|
$aChannel['link']=DIR_WEB_ROOT;
|
||||||
$aChannel['description']=SITE_NAME.' / RSS channel';
|
$aChannel['description']=SITE_NAME.' / '.$oBlog->getTitle().' / RSS channel';
|
||||||
$aChannel['language']='ru';
|
$aChannel['language']='ru';
|
||||||
$aChannel['managingEditor']=RSS_EDITOR_MAIL;
|
$aChannel['managingEditor']=RSS_EDITOR_MAIL;
|
||||||
$aChannel['generator']=SITE_NAME;
|
$aChannel['generator']=SITE_NAME;
|
||||||
|
@ -206,16 +212,16 @@ class ActionRss extends Action {
|
||||||
|
|
||||||
protected function RssPersonalBlog() {
|
protected function RssPersonalBlog() {
|
||||||
$this->sUserLogin=$this->GetParam(0);
|
$this->sUserLogin=$this->GetParam(0);
|
||||||
if (!$this->sUserLogin or !($this->oUserProfile=$this->User_GetUserByLogin($this->sUserLogin))) {
|
if (!$this->sUserLogin or !($oUser=$this->User_GetUserByLogin($this->sUserLogin))) {
|
||||||
$aResult['collection']=array();
|
return parent::EventNotFound();
|
||||||
}else{
|
}else{
|
||||||
$aResult=$this->Topic_GetTopicsPersonalByUser($this->oUserProfile->getId(),1,0,1,BLOG_TOPIC_PER_PAGE*2);
|
$aResult=$this->Topic_GetTopicsPersonalByUser($oUser->getId(),1,0,1,BLOG_TOPIC_PER_PAGE*2);
|
||||||
}
|
}
|
||||||
$aTopics=$aResult['collection'];
|
$aTopics=$aResult['collection'];
|
||||||
|
|
||||||
$aChannel['title']=SITE_NAME;
|
$aChannel['title']=SITE_NAME;
|
||||||
$aChannel['link']=DIR_WEB_ROOT;
|
$aChannel['link']=DIR_WEB_ROOT;
|
||||||
$aChannel['description']=SITE_NAME.' / RSS channel';
|
$aChannel['description']=SITE_NAME.' / '.$oUser->getLogin().' / RSS channel';
|
||||||
$aChannel['language']='ru';
|
$aChannel['language']='ru';
|
||||||
$aChannel['managingEditor']=RSS_EDITOR_MAIL;
|
$aChannel['managingEditor']=RSS_EDITOR_MAIL;
|
||||||
$aChannel['generator']=SITE_NAME;
|
$aChannel['generator']=SITE_NAME;
|
||||||
|
|
|
@ -474,8 +474,8 @@ class ActionTopic extends Action {
|
||||||
/**
|
/**
|
||||||
* Проверяем есть ли содержание топика
|
* Проверяем есть ли содержание топика
|
||||||
*/
|
*/
|
||||||
if (!func_check(getRequest('topic_text'),'text',2,3000)) {
|
if (!func_check(getRequest('topic_text'),'text',2,15000)) {
|
||||||
$this->Message_AddError('Текст топика должен быть от 2 до 3000 символов','Ошибка');
|
$this->Message_AddError('Текст топика должен быть от 2 до 15000 символов','Ошибка');
|
||||||
$bOk=false;
|
$bOk=false;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -40,6 +40,7 @@ class Router extends Object {
|
||||||
static protected $aParams=array();
|
static protected $aParams=array();
|
||||||
protected $oAction=null;
|
protected $oAction=null;
|
||||||
protected $oEngine=null;
|
protected $oEngine=null;
|
||||||
|
static protected $bShowStats=true;
|
||||||
|
|
||||||
static protected $oInstance=null;
|
static protected $oInstance=null;
|
||||||
|
|
||||||
|
@ -240,6 +241,25 @@ class Router extends Object {
|
||||||
self::$aParams[$iOffset]=$value;
|
self::$aParams[$iOffset]=$value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Показывать или нет статистику выполение скрипта
|
||||||
|
* Иногда бывает отключить показ, например, при выводе RSS ленты
|
||||||
|
*
|
||||||
|
* @param unknown_type $bState
|
||||||
|
*/
|
||||||
|
static public function SetIsShowStats($bState) {
|
||||||
|
self::$bShowStats=$bState;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Получить статус показывать или нет статистику
|
||||||
|
*
|
||||||
|
* @return unknown
|
||||||
|
*/
|
||||||
|
static public function GetIsShowStats() {
|
||||||
|
return self::$bShowStats;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ставим хук на вызов неизвестного метода и считаем что хотели вызвать метод какого либо модуля
|
* Ставим хук на вызов неизвестного метода и считаем что хотели вызвать метод какого либо модуля
|
||||||
*
|
*
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*/
|
*/
|
||||||
error_reporting(E_ALL);
|
error_reporting(E_ALL);
|
||||||
ini_set('display_errors', 1);
|
ini_set('display_errors', 1);
|
||||||
define('SYS_HACKER_CONSOLE',true);
|
define('SYS_HACKER_CONSOLE',false);
|
||||||
header('Content-Type: text/html; charset=utf-8');
|
header('Content-Type: text/html; charset=utf-8');
|
||||||
|
|
||||||
$t1=microtime(true);
|
$t1=microtime(true);
|
||||||
|
@ -38,7 +38,7 @@ $t2=microtime(true);
|
||||||
|
|
||||||
<?
|
<?
|
||||||
$oUser=$oRouter->User_GetUserCurrent();
|
$oUser=$oRouter->User_GetUserCurrent();
|
||||||
if ($oUser and $oUser->getId()==2) {
|
if (Router::GetIsShowStats() and $oUser and $oUser->getId()==2) {
|
||||||
?>
|
?>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<legend>Статистика выполнения</legend>
|
<legend>Статистика выполнения</legend>
|
||||||
|
|
|
@ -78,6 +78,7 @@
|
||||||
<a href="#" onclick="ajaxJoinLeaveBlog({$oBlog->getId()},'leave'); return false;" title="покинуть блог"><img src="{$DIR_STATIC_SKIN}/img/blog_leave.gif" border="0" alt="покинуть"></a>
|
<a href="#" onclick="ajaxJoinLeaveBlog({$oBlog->getId()},'leave'); return false;" title="покинуть блог"><img src="{$DIR_STATIC_SKIN}/img/blog_leave.gif" border="0" alt="покинуть"></a>
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
|
<a href="{$DIR_WEB_ROOT}/rss/blog/{$oBlog->getUrl()}/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
{if $oUserCurrent and $oUserCurrent->getId()==$oBlog->getOwnerId()}
|
{if $oUserCurrent and $oUserCurrent->getId()==$oBlog->getOwnerId()}
|
||||||
<a href="{$DIR_WEB_ROOT}/blog/edit/{$oBlog->getId()}/" title="отредактировать блог"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать блог"></a>
|
<a href="{$DIR_WEB_ROOT}/blog/edit/{$oBlog->getId()}/" title="отредактировать блог"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать блог"></a>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -80,6 +80,7 @@
|
||||||
<a href="#" onclick="ajaxJoinLeaveBlog({$oBlog->getId()},'leave'); return false;" title="покинуть блог"><img src="{$DIR_STATIC_SKIN}/img/blog_leave.gif" border="0" alt="покинуть"></a>
|
<a href="#" onclick="ajaxJoinLeaveBlog({$oBlog->getId()},'leave'); return false;" title="покинуть блог"><img src="{$DIR_STATIC_SKIN}/img/blog_leave.gif" border="0" alt="покинуть"></a>
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
|
<a href="{$DIR_WEB_ROOT}/rss/blog/{$oBlog->getUrl()}/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
{if $oUserCurrent and $oUserCurrent->getId()==$oBlog->getOwnerId()}
|
{if $oUserCurrent and $oUserCurrent->getId()==$oBlog->getOwnerId()}
|
||||||
<a href="{$DIR_WEB_ROOT}/blog/edit/{$oBlog->getId()}/" title="отредактировать блог"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать блог"></a>
|
<a href="{$DIR_WEB_ROOT}/blog/edit/{$oBlog->getId()}/" title="отредактировать блог"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать блог"></a>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -13,6 +13,6 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="live_section_title_all" align="right">
|
<div class="live_section_title_all" align="right">
|
||||||
<span style="color:#666666">»</span> <a href="{$DIR_WEB_ROOT}/comments/">весь прямой эфир</a>
|
<span style="color:#666666">»</span> <a href="{$DIR_WEB_ROOT}/comments/">весь прямой эфир</a> <a href="{$DIR_WEB_ROOT}/rss/allcomments/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.js"></script>
|
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.js"></script>
|
||||||
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.Request.js"></script>
|
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Autocompleter.Request.js"></script>
|
||||||
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Observer.js"></script>
|
<script type="text/javascript" src="{$DIR_WEB_ROOT}/classes/lib/external/MooTools_1.2/plugs/Autocompleter/Observer.js"></script>
|
||||||
<script type="text/javascript" src="{$DIR_STATIC_SKIN}/js/main.js?v=7"></script>
|
<script type="text/javascript" src="{$DIR_STATIC_SKIN}/js/main.js?v=8"></script>
|
||||||
<BODY>
|
<BODY>
|
||||||
|
|
||||||
{literal}
|
{literal}
|
||||||
|
|
BIN
templates/skin/habra/img/rss_small.gif
Normal file
BIN
templates/skin/habra/img/rss_small.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 351 B |
|
@ -59,11 +59,11 @@
|
||||||
<TD vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_bl.gif" width=10></TD>
|
<TD vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_bl.gif" width=10></TD>
|
||||||
|
|
||||||
<TD class="subitem2 three_columns{if $sMenuSubItemSelect=='good'} active_personal{/if}" noWrap align=middle>
|
<TD class="subitem2 three_columns{if $sMenuSubItemSelect=='good'} active_personal{/if}" noWrap align=middle>
|
||||||
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $sMenuSubItemSelect=='good'}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/">Хорошие</A>
|
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $sMenuSubItemSelect=='good'}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/">Хорошие</A> <a href="{$DIR_WEB_ROOT}/rss/index/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
</TD>
|
</TD>
|
||||||
|
|
||||||
<TD class="subitem2 three_columns{if $sMenuSubItemSelect=='new'} active_personal{/if}" noWrap align=middle>
|
<TD class="subitem2 three_columns{if $sMenuSubItemSelect=='new'} active_personal{/if}" noWrap align=middle>
|
||||||
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $sMenuSubItemSelect=='new'}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/new/">Новые</A> {if ($iCountTopicsNew)>0}<span style="color: #339900;">+{$iCountTopicsNew}</span>{/if}
|
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $sMenuSubItemSelect=='new'}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/new/">Новые</A> {if ($iCountTopicsNew)>0}<span style="color: #339900;">+{$iCountTopicsNew}</span>{/if} <a href="{$DIR_WEB_ROOT}/rss/new/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
</TD>
|
</TD>
|
||||||
|
|
||||||
<TD style="BORDER-RIGHT: white 2px solid" vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_br.gif" width=10></TD>
|
<TD style="BORDER-RIGHT: white 2px solid" vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_br.gif" width=10></TD>
|
||||||
|
|
|
@ -138,7 +138,7 @@
|
||||||
<TD vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_bl.gif" width=10></TD>
|
<TD vAlign=bottom width=10><IMG height=10 src="{$DIR_STATIC_SKIN}/img/green2_bl.gif" width=10></TD>
|
||||||
|
|
||||||
<TD class="subitem2 three_columns{if $aParams[0]=='blog' or $aParams[0]==''} active_personal{/if}" noWrap align=middle>
|
<TD class="subitem2 three_columns{if $aParams[0]=='blog' or $aParams[0]==''} active_personal{/if}" noWrap align=middle>
|
||||||
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $aParams[0]=='blog' or $aParams[0]==''}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/my/{$oUserProfile->getLogin()}/">Блог{if $iCountTopicUser} ({$iCountTopicUser}){/if}</A>
|
<IMG class=arrow_cc height=7 src="{$DIR_STATIC_SKIN}/img/{if $aParams[0]=='blog' or $aParams[0]==''}arrow_menu_main.gif{else}arrow_menu_main_un.gif{/if}" width=10><A href="{$DIR_WEB_ROOT}/my/{$oUserProfile->getLogin()}/">Блог{if $iCountTopicUser} ({$iCountTopicUser}){/if}</A> <a href="{$DIR_WEB_ROOT}/rss/log/{$oUserProfile->getLogin()}/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
</TD>
|
</TD>
|
||||||
|
|
||||||
<TD class="subitem2 three_columns{if $aParams[0]=='comment'} active_personal{/if}" noWrap align=middle>
|
<TD class="subitem2 three_columns{if $aParams[0]=='comment'} active_personal{/if}" noWrap align=middle>
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
{if $oUserCurrent and $oUserCurrent->getId()==$oTopic->getUserId()}
|
{if $oUserCurrent and $oUserCurrent->getId()==$oTopic->getUserId()}
|
||||||
<a href="{$DIR_WEB_ROOT}/topic/edit/{$oTopic->getId()}/" title="отредактировать топик"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать топик"></a>
|
<a href="{$DIR_WEB_ROOT}/topic/edit/{$oTopic->getId()}/" title="отредактировать топик"><img src="{$DIR_STATIC_SKIN}/img/blog_edit.gif" border="0" title="отредактировать топик"></a>
|
||||||
{/if}
|
{/if}
|
||||||
|
<a href="{$DIR_WEB_ROOT}/rss/comments/{$oTopic->getId()}/" title="RSS лента"><IMG height=12 src="{$DIR_STATIC_SKIN}/img/rss_small.gif" width=12></a>
|
||||||
</h1>
|
</h1>
|
||||||
<div class="groups_topic_text">
|
<div class="groups_topic_text">
|
||||||
{$oTopic->getText()}
|
{$oTopic->getText()}
|
||||||
|
|
Loading…
Reference in a new issue