From 883b179b4843fe134a9d838483588f7a5ace593c Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Tue, 9 Jun 2009 15:55:10 +0000 Subject: [PATCH] --- classes/actions/ActionBlog.class.php | 9 ++--- classes/modules/blog/Blog.class.php | 17 ++++----- .../modules/blog/mapper/Blog.mapper.class.php | 35 ++++--------------- .../skin/new/actions/ActionBlog/admin.tpl | 11 +++--- templates/skin/new/blog_list.tpl | 5 +-- 5 files changed, 28 insertions(+), 49 deletions(-) diff --git a/classes/actions/ActionBlog.class.php b/classes/actions/ActionBlog.class.php index 5140ed71..29f088cc 100644 --- a/classes/actions/ActionBlog.class.php +++ b/classes/actions/ActionBlog.class.php @@ -252,11 +252,12 @@ class ActionBlog extends Action { /** * Явлется ли авторизованный пользователь хозяином блога, либо его администратором */ - $oBlogUser=$this->Blog_GetRelationBlogUserByBlogIdAndUserId($oBlog->getId(),$this->oUserCurrent->getId()); + $oBlogUser=$this->Blog_GetBlogUserByBlogIdAndUserId($oBlog->getId(),$this->oUserCurrent->getId()); $bIsAdministratorBlog=$oBlogUser ? $oBlogUser->getIsAdministrator() : false; if ($oBlog->getOwnerId()!=$this->oUserCurrent->getId() and !$this->oUserCurrent->isAdministrator() and !$bIsAdministratorBlog) { return parent::EventNotFound(); } + $this->Viewer_AddHtmlTitle($oBlog->getTitle()); $this->Viewer_AddHtmlTitle($this->Lang_Get('blog_edit')); @@ -362,7 +363,7 @@ class ActionBlog extends Action { /** * Явлется ли авторизованный пользователь хозяином блога, либо его администратором */ - $oBlogUser=$this->Blog_GetRelationBlogUserByBlogIdAndUserId($oBlog->getId(),$this->oUserCurrent->getId()); + $oBlogUser=$this->Blog_GetBlogUserByBlogIdAndUserId($oBlog->getId(),$this->oUserCurrent->getId()); $bIsAdministratorBlog=$oBlogUser ? $oBlogUser->getIsAdministrator() : false; if ($oBlog->getOwnerId()!=$this->oUserCurrent->getId() and !$this->oUserCurrent->isAdministrator() and !$bIsAdministratorBlog) { return parent::EventNotFound(); @@ -377,7 +378,7 @@ class ActionBlog extends Action { $aUserRank=array(); } foreach ($aUserRank as $sUserId => $sRank) { - if (!($oBlogUser=$this->Blog_GetRelationBlogUserByBlogIdAndUserId($oBlog->getId(),$sUserId))) { + if (!($oBlogUser=$this->Blog_GetBlogUserByBlogIdAndUserId($oBlog->getId(),$sUserId))) { $this->Message_AddError($this->Lang_Get('system_error'),$this->Lang_Get('error')); break; } @@ -403,7 +404,7 @@ class ActionBlog extends Action { /** * Получаем список подписчиков блога */ - $aBlogUsers=$this->Blog_GetRelationBlog($oBlog->getId()); + $aBlogUsers=$this->Blog_GetBlogUsersByBlogId($oBlog->getId()); $this->Viewer_AddHtmlTitle($oBlog->getTitle()); $this->Viewer_AddHtmlTitle($this->Lang_Get('blog_admin')); diff --git a/classes/modules/blog/Blog.class.php b/classes/modules/blog/Blog.class.php index 2b2668a9..10166007 100644 --- a/classes/modules/blog/Blog.class.php +++ b/classes/modules/blog/Blog.class.php @@ -171,9 +171,9 @@ class LsBlog extends Module { * @return unknown */ public function GetBlogById($sBlogId) { - $aBlogs=$this->GetBlogsAdditionalData($sId); - if (isset($aBlogs[$sId])) { - return $aBlogs[$sId]; + $aBlogs=$this->GetBlogsAdditionalData($sBlogId); + if (isset($aBlogs[$sBlogId])) { + return $aBlogs[$sBlogId]; } return null; } @@ -497,15 +497,12 @@ class LsBlog extends Module { * @param unknown_type $iLimit * @return unknown */ - public function GetBlogsRating($iCurrPage,$iPerPage) { - $s1=-1; - if ($this->oUserCurrent) { - $s1=$this->oUserCurrent->getId(); - } - if (false === ($data = $this->Cache_Get("blog_rating_{$iCurrPage}_{$iPerPage}_$s1"))) { + public function GetBlogsRating($iCurrPage,$iPerPage) { + if (false === ($data = $this->Cache_Get("blog_rating_{$iCurrPage}_{$iPerPage}"))) { $data = array('collection'=>$this->oMapperBlog->GetBlogsRating($iCount,$iCurrPage,$iPerPage),'count'=>$iCount); - $this->Cache_Set($data, "blog_rating_{$iCurrPage}_{$iPerPage}_$s1", array("blog_update","blog_new"), 60*15); + $this->Cache_Set($data, "blog_rating_{$iCurrPage}_{$iPerPage}", array("blog_update","blog_new"), 60*15); } + $data['collection']=$this->GetBlogsAdditionalData($data['collection']); return $data; } /** diff --git a/classes/modules/blog/mapper/Blog.mapper.class.php b/classes/modules/blog/mapper/Blog.mapper.class.php index 9706ef48..aa52ce67 100644 --- a/classes/modules/blog/mapper/Blog.mapper.class.php +++ b/classes/modules/blog/mapper/Blog.mapper.class.php @@ -298,40 +298,19 @@ class Mapper_Blog extends Mapper { - public function GetBlogsRating(&$iCount,$iCurrPage,$iPerPage) { - $iCurrentUserId=-1; - if (is_object($this->oUserCurrent)) { - $iCurrentUserId=$this->oUserCurrent->getId(); - } + public function GetBlogsRating(&$iCount,$iCurrPage,$iPerPage) { $sql = "SELECT - b.*, - u.user_profile_avatar as user_profile_avatar, - u.user_profile_avatar_type as user_profile_avatar_type, - u.user_login as user_login, - IF(bu.blog_id IS NULL,0,1) as current_user_is_join + b.blog_id FROM - ".DB_TABLE_BLOG." as b - - LEFT JOIN ( - SELECT - blog_id - FROM ".DB_TABLE_BLOG_USER." - WHERE user_id = ?d - ) AS bu ON b.blog_id = bu.blog_id, - - ".DB_TABLE_USER." as u + ".DB_TABLE_BLOG." as b WHERE - b.blog_type<>'personal' - AND - b.user_owner_id=u.user_id + b.blog_type<>'personal' ORDER by b.blog_rating desc - LIMIT ?d, ?d - ; - "; + LIMIT ?d, ?d "; $aReturn=array(); - if ($aRows=$this->oDb->selectPage($iCount,$sql,$iCurrentUserId,($iCurrPage-1)*$iPerPage, $iPerPage)) { + if ($aRows=$this->oDb->selectPage($iCount,$sql,($iCurrPage-1)*$iPerPage, $iPerPage)) { foreach ($aRows as $aRow) { - $aReturn[]=new BlogEntity_Blog($aRow); + $aReturn[]=$aRow['blog_id']; } } return $aReturn; diff --git a/templates/skin/new/actions/ActionBlog/admin.tpl b/templates/skin/new/actions/ActionBlog/admin.tpl index 5ebf9fcf..df178df9 100644 --- a/templates/skin/new/actions/ActionBlog/admin.tpl +++ b/templates/skin/new/actions/ActionBlog/admin.tpl @@ -17,14 +17,15 @@ {foreach from=$aBlogUsers item=oBlogUser} + {assign var="oUser" value=$oBlogUser->getUser()} - {$oBlogUser->getUserLogin()} - {if $oBlogUser->getUserId()==$oUserCurrent->getId()} + {$oUser->getLogin()} + {if $oUser->getId()==$oUserCurrent->getId()} {$aLang.blog_admin_users_current_administrator} {else} - getIsAdministrator()}checked{/if}/> - getIsModerator()}checked{/if}/> - getIsAdministrator() and !$oBlogUser->getIsModerator()}checked{/if}/> + getIsAdministrator()}checked{/if}/> + getIsModerator()}checked{/if}/> + getIsAdministrator() and !$oBlogUser->getIsModerator()}checked{/if}/> {/if} {/foreach} diff --git a/templates/skin/new/blog_list.tpl b/templates/skin/new/blog_list.tpl index 56e5d03b..f0a8ab80 100644 --- a/templates/skin/new/blog_list.tpl +++ b/templates/skin/new/blog_list.tpl @@ -12,14 +12,15 @@ {foreach from=$aBlogs item=oBlog} + {assign var="oUserOwner" value=$oBlog->getOwner()} {$oBlog->getTitle()|escape:'html'}
- {$aLang.blogs_owner}: {$oBlog->getUserLogin()} + {$aLang.blogs_owner}: {$oUserOwner->getLogin()} {if $oUserCurrent} - + {if $oUserCurrent->getId()!=$oBlog->getOwnerId()} {/if}