diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php index 5d5376ce6..61daecfd2 100644 --- a/framework/id/textcube/config.default.php +++ b/framework/id/textcube/config.default.php @@ -61,5 +61,4 @@ $service['debug_rewrite_module'] = false; $service['useNumericURLonRSS'] = false; $service['forceinstall'] = false; -$service['adminskin'] = 'canon'; ?> diff --git a/interface/blog/page.php b/interface/blog/page.php index 203bdfbbc..d745789f4 100644 --- a/interface/blog/page.php +++ b/interface/blog/page.php @@ -2,5 +2,37 @@ /// Copyright (c) 2004-2010, Needlworks / Tatter Network Foundation /// All rights reserved. Licensed under the GPL. /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT) -require ROOT . '/interface/blog/notice.php'; +require ROOT . '/library/preprocessor.php'; + +if (isset($suri['id']) || (isset($suri['value']) && strlen($suri['value']) > 0)) { + if (!isset($suri['id']) || (Setting::getBlogSettingGlobal('useSloganOnPost',1) == 1)) { + list($entries, $paging) = getEntryWithPagingBySlogan($blogid, $suri['value'], true); + } else { + list($entries, $paging) = getEntryWithPaging($blogid, $suri['id'], true); + } + fireEvent('OBStart'); + require ROOT . '/interface/common/blog/begin.php'; + + if (empty($entries)) { + header('HTTP/1.1 404 Not Found'); + if (empty($skin->pageError)) { + dress('article_rep', '
' . _text('존재하지 않는 페이지입니다.') . '
', $view); + } else { + dress('article_rep', NULL, $view); + dress('page_error', $skin->pageError, $view); + } + unset($paging); + } else { + require ROOT . '/interface/common/blog/entries.php'; + } + require ROOT . '/interface/common/blog/end.php'; + fireEvent('OBEnd'); +} else { + list($entries, $paging) = getEntriesWithPagingByPage($blogid, $suri['page'], $blog['entriesOnPage']); + fireEvent('OBStart'); + require ROOT . '/interface/common/blog/begin.php'; + require ROOT . '/interface/common/blog/entries.php'; + require ROOT . '/interface/common/blog/end.php'; + fireEvent('OBEnd'); +} ?> diff --git a/interface/common/blog/entries.php b/interface/common/blog/entries.php index 7a3e2e3b4..9420a8733 100644 --- a/interface/common/blog/entries.php +++ b/interface/common/blog/entries.php @@ -70,6 +70,21 @@ dress('notice_rep_author_link', $blogURL."/author/".rawurlencode(User::getName($entry['userid'])), $entryView); $entriesView .= $entryView; + } else if ($entry['category'] == - 3) { // This is page + $entryView = $skin->pageItem; + dress('page_rep_microformat_published', Timestamp::getISO8601($entry['published']), $entryView); + dress('page_rep_microformat_updated', Timestamp::getISO8601($entry['modified']), $entryView); + dress('page_rep_date', fireEvent('ViewNoticeDate', Timestamp::format5($entry['published']), $entry['published']), $entryView); + dress('page_rep_date_modified', fireEvent('ViewNoticeDate', Timestamp::format5($entry['modified']), $entry['modified']), $entryView); + dress('page_rep_title', htmlspecialchars(fireEvent('ViewNoticeTitle', $entry['title'], $entry['id'])), $entryView); + dress('page_rep_link', $permalink, $entryView); + + // 사용자가 작성한 본문은 interface/common/blog/end.php의 removeAllTags() 다음에 처리하기 위한 조치. + $contentContainer["page_{$entry['id']}"] = getEntryContentView($blogid, $entry['id'], $entry['content'], $entry['contentformatter'], getKeywordNames($blogid), 'Page'); + dress('page_rep_desc', setTempTag("page_{$entry['id']}"), $entryView); + dress('page_rep_author', User::getName($entry['userid']), $entryView); + dress('page_rep_author_link', $blogURL."/author/".rawurlencode(User::getName($entry['userid'])), $entryView); + $entriesView .= $entryView; } else if (doesHaveOwnership() || ($entry['visibility'] >= 2) || (isset($_COOKIE['GUEST_PASSWORD']) && (trim($_COOKIE['GUEST_PASSWORD']) == trim($entry['password'])))) { // This is post $entryView = $skin->entry; $entryView = ''.CRLF.$entryView; diff --git a/library/blog.skin.php b/library/blog.skin.php index 213adfb09..4a141552e 100644 --- a/library/blog.skin.php +++ b/library/blog.skin.php @@ -21,6 +21,7 @@ class Skin { var $noticeItem; var $recentNotice; var $recentNoticeItem; + var $pageItem; var $locative; var $locativeSpot; var $locativeEntry; @@ -227,6 +228,7 @@ function __construct($name, $previewMode = false) { list($sval, $this->keyword) = $this->cutSkinTag($sval, 'keyword'); list($sval, $this->noticeItem) = $this->cutSkinTag($sval, 'notice_rep'); + list($sval, $this->pageItem) = $this->cutSkinTag($sval, 'page_rep'); list($sval, $this->keylogItem) = $this->cutSkinTag($sval, 'keylog_rep'); list($sval, $this->recentNoticeItem) = $this->cutSkinTag($sval, 'rct_notice_rep'); list($sval, $this->recentNotice) = $this->cutSkinTag($sval, 'rct_notice'); diff --git a/library/include.php b/library/include.php index e711e660f..3d803ada9 100644 --- a/library/include.php +++ b/library/include.php @@ -33,7 +33,6 @@ } if(isset($service['codecache']) && $service['codecache'] == true && $codeCacheRead == false) { - requireComponent('Needlworks.Cache.PageCache'); $libCode = new CodeCache(); $libCode->name = $codeName; $libCode->save(); diff --git a/library/preprocessor.php b/library/preprocessor.php index 9328c1dab..2c13de3cf 100644 --- a/library/preprocessor.php +++ b/library/preprocessor.php @@ -214,7 +214,6 @@ if($browser->isMobile()) { $context->setProperty('panel.skin', "/skin/admin/mobile"); } else { - if(!is_null($context->getProperty('service.adminskin'))) { $context->setProperty('panel.skin',"/skin/admin/".$context->getProperty('service.adminskin')); } else { @@ -254,7 +253,6 @@ else if($blogVisibility == 1) requireMembership(); } } - if(in_array($context->getProperty('uri.interfaceType'), array('owner','reader'))) { requireOwnership(); // Check access control list if(!empty($_SESSION['acl'])) { diff --git a/skin/blog/coolant/index.xml b/skin/blog/coolant/index.xml index 9274889a3..7e7e618b6 100644 --- a/skin/blog/coolant/index.xml +++ b/skin/blog/coolant/index.xml @@ -2,7 +2,7 @@ Coolant (textcube ver.) - 3.0.3 + 3.1.0 diff --git a/skin/blog/coolant/skin.html b/skin/blog/coolant/skin.html index 2fe9a3d30..a7b5ab81f 100644 --- a/skin/blog/coolant/skin.html +++ b/skin/blog/coolant/skin.html @@ -30,6 +30,8 @@

[##_title_##]