From f8ac11bda6781c1b9760bba0641f467daf01bb4a Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Tue, 12 Dec 2017 13:23:45 +0900
Subject: [PATCH] =?UTF-8?q?isAccessible()=EB=A1=9C=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/module/ModuleHandler.class.php     | 7 ++-----
 modules/board/board.view.php               | 5 ++---
 modules/board/m.skins/default/read.html    | 2 +-
 modules/board/m.skins/simpleGray/read.html | 2 +-
 modules/board/skins/default/_read.html     | 4 ++--
 modules/board/skins/xedition/_read.html    | 4 ++--
 modules/comment/comment.model.php          | 2 +-
 modules/document/tpl/print_page.html       | 6 ++----
 modules/file/file.model.php                | 4 ++--
 modules/member/member.controller.php       | 2 +-
 10 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 473f5e4e7..788700463 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -228,12 +228,9 @@ class ModuleHandler extends Handler
 			{
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument($this->document_srl);
-				if($oDocument->isSecret() || $oDocument->get('status') === $oDocumentModel->getConfigStatus('temp'))
+				if(!$oDocument->isAccessible())
 				{
-					if(!$oDocument->isGranted() && !$oDocument->isAccessible())
-					{
-						$this->httpStatusCode = '403';
-					}
+					$this->httpStatusCode = '403';
 				}
 			}
 		}
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index fc143777b..2ff089812 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -328,13 +328,12 @@ class boardView extends board
 				));
 
 				// update the document view count (if the document is not secret)
-				if(!$oDocument->isSecret() || $oDocument->isGranted())
+				if($oDocument->isAccessible())
 				{
 					$oDocument->updateReadedCount();
 				}
-
 				// disappear the document if it is secret
-				if($oDocument->isSecret() && !$oDocument->isGranted())
+				else
 				{
 					$oDocument->add('content',lang('thisissecret'));
 				}
diff --git a/modules/board/m.skins/default/read.html b/modules/board/m.skins/default/read.html
index 8edf5975e..00cb61c47 100644
--- a/modules/board/m.skins/default/read.html
+++ b/modules/board/m.skins/default/read.html
@@ -8,7 +8,7 @@
 	<a href="{getUrl('act','dispBoardWrite','document_srl','')}" class="write">{$lang->cmd_write}</a>
 </div>
 <div class="co">
-		<!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+		<!--@if(!$oDocument->isAccessible())-->
 		<form action="./" method="get" class="ff" onsubmit="return procFilter(this, input_password)">
 		<input type="hidden" name="mid" value="{$mid}" />
 		<input type="hidden" name="page" value="{$page}" />
diff --git a/modules/board/m.skins/simpleGray/read.html b/modules/board/m.skins/simpleGray/read.html
index cfe1ba937..320d2e779 100644
--- a/modules/board/m.skins/simpleGray/read.html
+++ b/modules/board/m.skins/simpleGray/read.html
@@ -9,7 +9,7 @@
 			<span>{$oDocument->getRegdate()}</span>
 		</div>
 		<div class="co">
-                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                <!--@if(!$oDocument->isAccessible())-->
                     <div class="secretContent">
                         <form action="./" method="get" onsubmit="return procFilter(this, input_password)">
                         <input type="hidden" name="mid" value="{$mid}" />
diff --git a/modules/board/skins/default/_read.html b/modules/board/skins/default/_read.html
index 7615cf8c8..91b4316cb 100644
--- a/modules/board/skins/default/_read.html
+++ b/modules/board/skins/default/_read.html
@@ -20,7 +20,7 @@
 	</div>
 	<!-- /READ HEADER -->
 	<!-- Extra Output -->
-	<div class="exOut" cond="$oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted())">
+	<div class="exOut" cond="$oDocument->isExtraVarsExists() && $oDocument->isAccessible()">
 		<table border="1" cellspacing="0" summary="Extra Form Output">
 			<tr loop="$oDocument->getExtraVars() => $key,$val">
 				<th scope="row">{$val->name}</th>
@@ -31,7 +31,7 @@
 	<!-- /Extra Output -->
 	<!-- READ BODY -->
 	<div class="read_body">
-		<!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+		<!--@if(!$oDocument->isAccessible())-->
 		<form action="./" method="get" onsubmit="return procFilter(this, input_password)">
 			<input type="hidden" name="mid" value="{$mid}" />
 			<input type="hidden" name="page" value="{$page}" />
diff --git a/modules/board/skins/xedition/_read.html b/modules/board/skins/xedition/_read.html
index 239d18661..776a0ac22 100644
--- a/modules/board/skins/xedition/_read.html
+++ b/modules/board/skins/xedition/_read.html
@@ -24,7 +24,7 @@
 	</div>
 	<!-- /READ HEADER -->
 	<!-- Extra Output -->
-	<div class="exOut" cond="$oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted())">
+	<div class="exOut" cond="$oDocument->isExtraVarsExists() && $oDocument->isAccessible()">
 		<table border="1" cellspacing="0" summary="Extra Form Output">
 			<tr loop="$oDocument->getExtraVars() => $key,$val">
 				<th scope="row">{$val->name}</th>
@@ -35,7 +35,7 @@
 	<!-- /Extra Output -->
 	<!-- READ BODY -->
 	<div class="read_body">
-		<!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+		<!--@if(!$oDocument->isAccessible())-->
 		<form action="./" method="get" onsubmit="return procFilter(this, input_password)" class="secretForm">
 			<input type="hidden" name="mid" value="{$mid}" />
 			<input type="hidden" name="page" value="{$page}" />
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index e80c943eb..ab8b9fdaa 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -297,7 +297,7 @@ class commentModel extends comment
 	 * @param bool $published
 	 * @return int
 	 */
-	function getCommentAllCount($module_srl, $published = null)
+	function getCommentAllCount($module_srl, $published = false)
 	{
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html
index 0fc174353..56961e537 100644
--- a/modules/document/tpl/print_page.html
+++ b/modules/document/tpl/print_page.html
@@ -2,14 +2,12 @@
 <h1 class="h1">{$oDocument->getTitleText()}</h1>
 <a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->get('nick_name')}</a>
 {$oDocument->getRegdate()}
-<!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
+<!--@if($oDocument->isExtraVarsExists() && $oDocument->isAccessible())-->
 <!--@foreach($oDocument->getExtraVars() as $key => $val)-->    
 {$val->name}: {$val->getValueHtml()}
 <!--@end-->
 <!--@end-->    
 {$oDocument->getContent(false, false)} 
 <script>
-//<![CDATA[
-    jQuery(window).load(function() { window.print(); } );
-//]]>
+jQuery(window).load(function() { window.print(); } );
 </script>
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index 9a41b0b66..cf0958fc0 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -43,7 +43,7 @@ class fileModel extends file
 			if(!$oDocument->isExists())
 			{
 				$oComment = $oCommentModel->getComment($upload_target_srl);
-				if($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
+				if($oComment->isExists() && !$oComment->isAccessible())
 				{
 					return $this->setError('msg_not_permitted');
 				}
@@ -52,7 +52,7 @@ class fileModel extends file
 			}
 
 			// document 권한 확인
-			if($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
+			if($oDocument->isExists() && !$oDocument->isAccessible())
 			{
 				return $this->setError('msg_not_permitted');
 			}
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index ddcba0857..51b8642f5 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -130,7 +130,7 @@ class memberController extends member
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		
 		// Check document
-		if($oDocument->isSecret() && !$oDocument->isGranted())
+		if(!$oDocument->isAccessible())
 		{
 			return $this->setError('msg_is_secret');
 		}