From f4f44da48d042871c3120eef951828e7ff583f70 Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 12 Jul 2007 09:50:50 +0000 Subject: [PATCH] =?UTF-8?q?=EB=B8=94=EB=A1=9C=EA=B7=B8/=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=EB=93=B1=20=EB=AA=A8=EB=93=88=EC=97=90=20=EC=83=81?= =?UTF-8?q?=EA=B4=80=EC=97=86=EC=9D=B4=20=EB=AC=B8=EC=84=9C=EC=9D=98=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=EC=9D=84=20=EC=B2=98=EB=A6=AC=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20document.item.php=EC=9D=98=20isAccessible(?= =?UTF-8?q?)=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=B2=98=EB=A6=AC=EB=A5=BC=20Context=EB=A5=BC=20?= =?UTF-8?q?=EC=9D=B4=EC=9A=A9=ED=95=98=EC=97=AC=20=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/trunk@1913 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/display/DisplayHandler.class.php | 8 +++++--- modules/blog/skins/xe_blog/css/white.css | 17 +++++++++++------ modules/blog/skins/xe_blog/view_document.html | 7 ++++--- modules/document/document.item.php | 6 ++++++ modules/document/document.view.php | 8 ++++---- modules/document/tpl/print_page.html | 11 +++++++++-- 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index f7620353d..7b8dbe5fc 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -34,9 +34,11 @@ if(__DEBUG__==3) $start = getMicroTime(); $oTemplate = &TemplateHandler::getInstance(); - $layout_path = $oModule->getLayoutPath(); - $layout_file = $oModule->getLayoutFile(); - $edited_layout_file = $oModule->getEditedLayoutFile(); + if(Context::get('layout') != 'none') { + $layout_path = $oModule->getLayoutPath(); + $layout_file = $oModule->getLayoutFile(); + $edited_layout_file = $oModule->getEditedLayoutFile(); + } if(!$layout_path) $layout_path = './common/tpl/'; if(!$layout_file) $layout_file = 'default_layout.html'; diff --git a/modules/blog/skins/xe_blog/css/white.css b/modules/blog/skins/xe_blog/css/white.css index dd5e5a8b9..33f52ea0d 100644 --- a/modules/blog/skins/xe_blog/css/white.css +++ b/modules/blog/skins/xe_blog/css/white.css @@ -151,17 +151,22 @@ Jeong, Chan Myeong 070601~070630 .boardRead .readFooter .fileAttached li { display:inline; margin-right:.75em; line-height:1.5em;} .boardRead .readFooter .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; position:relative; color:#444444; background:url(../images/white/iconFile.gif) no-repeat left top;} .boardRead .readFooter .fileAttached li a:visited { color:#777777;} -.boardRead .replyAndTrackback { position:relative; overflow:hidden; _width:100%; padding:.8em 0em; height:1em; background:url(../images/white/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #e0e1db; border-bottom:2px solid #666760;} -.boardRead .replyAndTrackback li { position:relative; left:1.5em; padding-left:1.4em; float:left; margin-right:1em;} + +.boardRead .replyAndTrackback { position:relative; overflow:hidden; _width:100%; padding:.8em 0em; height:1.2em; background:url(../images/white/bgBoardListTh.gif) repeat-x left bottom; border-top:1px solid #e0e1db; border-bottom:2px solid #666760;} +.boardRead .replyAndTrackback li { margin-left:1em; padding-left:1.4em; float:left; list-style:none;} + .boardRead .replyAndTrackback li.reply { background:url(../images/white/iconReply.gif) no-repeat left top;} -.boardRead .replyAndTrackback li.reply a { _position:relative; _top:-.5em;} +.boardRead .replyAndTrackback li.reply a { position:relative; top:-.3em; _top:-.6em;} + .boardRead .replyAndTrackback li.trackback { background:url(../images/white/iconTrackback.gif) no-repeat left top;} -.boardRead .replyAndTrackback a { display:block; float:left; color:#333333; height:1em; padding:.1em 1.5em .1em 0; white-space:nowrap;} +.boardRead .replyAndTrackback li.trackback a { position:relative; top:-.3em; _top:0em;} + +.boardRead .replyAndTrackback a { color:#333333; white-space:nowrap; text-decoration:none;} .boardRead .replyAndTrackback a strong { color:#ff6600;} .boardRead .replyAndTrackback a#toggleReply { background:url(../images/white/buttonToggleReply.gif) no-repeat right top;} .boardRead .replyAndTrackback a#toggleTrackback { background:url(../images/white/buttonToggleReply.gif) no-repeat right -13px;} -.boardRead .replyAndTrackback li.button { float:right; } -.boardRead .replyAndTrackback li.button a { display:inline; padding:0; margin:0 1em 0 1em;} +.boardRead .replyAndTrackback .listButton { float:right; margin:0 1em 0 0; position:relative; top:-5px; _top:-7px;} + #trackbacks { padding:.6em .6em; color:#666666; border:1px solid #e0e1db;;margin-top:.5em;} #trackbacks li { padding:.6em .8em .6em .6em; line-height:1.25em; border-bottom:1px dotted #EEEEEE; list-style:none;} diff --git a/modules/blog/skins/xe_blog/view_document.html b/modules/blog/skins/xe_blog/view_document.html index 4c382ba14..619dd853c 100644 --- a/modules/blog/skins/xe_blog/view_document.html +++ b/modules/blog/skins/xe_blog/view_document.html @@ -68,15 +68,16 @@ diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 45c632a6f..8282a1c81 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -67,6 +67,10 @@ $_SESSION['own_document'][$this->document_srl] = true; } + function isAccessible() { + return $_SESSION['accessible'][$this->document_srl]==true?true:false; + } + function allowComment() { return $this->get('allow_comment') == 'Y' || !$this->isExists() ? true : false; } @@ -119,12 +123,14 @@ function getContentText() { if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret'); + $_SESSION['accessible'][$this->document_srl] = true; return htmlspecialchars($this->get('content')); } function getContent() { if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret'); + $_SESSION['accessible'][$this->document_srl] = true; return sprintf('%s', $this->document_srl, $this->get('member_srl'), $this->get('content'), $this->document_srl, $this->get('member_srl')); } diff --git a/modules/document/document.view.php b/modules/document/document.view.php index 28c81f22e..049f47e41 100644 --- a/modules/document/document.view.php +++ b/modules/document/document.view.php @@ -18,9 +18,6 @@ * 해당 글만 찾아서 그냥 출력해버린다;; **/ function dispDocumentPrint() { - // 권한 체크 - if(!$this->grant->view) return new Object(-1,'msg_not_permitted'); - // 목록 구현에 필요한 변수들을 가져온다 $document_srl = Context::get('document_srl'); @@ -31,12 +28,15 @@ $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager); if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request'); + // 권한 체크 + if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted'); + // 브라우저 타이틀 설정 Context::setBrowserTitle($oDocument->getTitleText()); Context::set('oDocument', $oDocument); - $this->module_info->layout_srl = null; + Context::set('layout','none'); $this->setTemplatePath($this->module_path.'tpl'); $this->setTemplateFile('print_page'); } diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 5dd98bb19..9eda8a509 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -1,8 +1,15 @@ -

{$oDocument->getTitleText()}


-{$oDocument->getContent()} +

{$oDocument->getTitleText()}

+ +
{$oDocument->get('nick_name')}
+
{$oDocument->getRegdate()}
+ +
+ +
{$oDocument->getContent()}
+