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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2026-04-01 12:04:22 +09:00 • committed by GitHub
commit dd8fc890f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 396 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/board/board.api.php
View file

@ -56,12 +56,19 @@ class BoardAPI extends Board
public function dispBoardContentView($oModule)
{
$oDocument = Context::get('oDocument');
if($oDocument->isGranted())
if ($oDocument->isExists() && $oDocument->isAccessible())
{
$extra_vars = $oDocument->getExtraVars() ?: [];
$oDocument->add('extra_vars', $this->_arrangeExtraVars($extra_vars));
if ($oDocument->isGranted())
{
$extra_vars = $oDocument->getExtraVars() ?: [];
$oDocument->add('extra_vars', $this->_arrangeExtraVars($extra_vars));
}
$oModule->add('oDocument', $this->_arrangeContent($oDocument, $oModule->grant));
}
else
{
$oModule->add('oDocument', null);
}
$oModule->add('oDocument', $this->_arrangeContent($oDocument, $oModule->grant));
}
/**
@ -70,13 +77,13 @@ class BoardAPI extends Board
public function dispBoardContentFileList($oModule)
{
$oDocument = Context::get('oDocument');
if($oDocument->isAccessible())
if ($oDocument->isExists() && $oDocument->isAccessible())
{
$oModule->add('file_list', $this->_arrangeFiles(Context::get('file_list') ?: []));
}
else
{
$oModule->add('file_list', array());
$oModule->add('file_list', []);
}
}
@ -93,12 +100,20 @@ class BoardAPI extends Board
**/
public function dispBoardContentCommentList($oModule)
{
$comment_list = Context::get('comment_list');
if (!is_array($comment_list))
$oDocument = Context::get('oDocument');
if ($oDocument->isExists() && $oDocument->isAccessible())
{
$comment_list = [];
$comment_list = Context::get('comment_list');
if (!is_array($comment_list))
{
$comment_list = [];
}
$oModule->add('comment_list', $this->_arrangeComments($comment_list));
}
else
{
$oModule->add('comment_list', []);
}
$oModule->add('comment_list', $this->_arrangeComments($comment_list));
}
/**

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

@ -30,7 +30,7 @@ class BoardView extends Board
$this->search_list_count = $m ? ($this->module_info->mobile_search_list_count ?? 20) : ($this->module_info->search_list_count ?? 20);
$this->page_count = $m ? ($this->module_info->mobile_page_count ?? 5) : ($this->module_info->page_count ?? 10);
$this->except_notice = ($this->module_info->except_notice ?? '') == 'N' ? FALSE : TRUE;
$this->include_modules = ($this->module_info->include_modules ?? []) ? explode(',', $this->module_info->include_modules) : [];
$this->include_modules = ($this->module_info->include_modules ?? []) ? array_map('intval', explode(',', $this->module_info->include_modules)) : [];
if (count($this->include_modules) && !in_array($this->module_info->module_srl, $this->include_modules))
{
$this->include_modules[] = $this->module_info->module_srl;
@ -318,6 +318,7 @@ class BoardView extends Board
{
if (abs($oDocument->get('member_srl')) != $this->user->member_srl)
{
$oDocument = DocumentModel::getBlankDocument($this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage('msg_not_founded', 404);
}
@ -326,6 +327,7 @@ class BoardView extends Board
// if the document is TEMP saved, pretend that it doesn't exist.
if($oDocument->getStatus() == 'TEMP')
{
$oDocument = DocumentModel::getBlankDocument($this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage('msg_not_founded', 404);
}
@ -343,8 +345,7 @@ class BoardView extends Board
*/
else
{
$oDocument = DocumentModel::getDocument(0);
$oDocument->add('module_srl', $this->module_srl);
$oDocument = DocumentModel::getBlankDocument($this->module_srl);
}
/**
@ -354,7 +355,7 @@ class BoardView extends Board
{
if(!$this->grant->view && !$oDocument->isGranted())
{
$oDocument = DocumentModel::getDocument(0);
$oDocument = DocumentModel::getBlankDocument($this->module_srl);
Context::set('document_srl', null, true);
$this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}