fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 11:11:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

isAccessible()로 통일

Browse source
This commit is contained in:
conory 2017-12-12 13:23:45 +09:00
parent 81986c40a9
commit f8ac11bda6
10 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
classes/module/ModuleHandler.class.php
View file

@ -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';
}
}
}

5
modules/board/board.view.php
View file

@ -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'));
}

2
modules/board/m.skins/default/read.html
View file

@ -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}" />

2
modules/board/m.skins/simpleGray/read.html
View file

@ -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}" />

4
modules/board/skins/default/_read.html
View file

@ -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}" />

4
modules/board/skins/xedition/_read.html
View file

@ -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}" />

2
modules/comment/comment.model.php
View file

@ -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;

6
modules/document/tpl/print_page.html
View file

@ -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>

4
modules/file/file.model.php
View file

@ -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');
}

2
modules/member/member.controller.php
View file

@ -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');
}