Merge branch 'rhymix:master' into develop

This commit is contained in:
Lastorder 2024-10-19 10:03:03 +09:00 committed by GitHub
commit af21a9fb8a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 36 additions and 53 deletions

View file

@ -917,7 +917,14 @@ class BoardView extends Board
// if the document is not granted, then back to the password input form
if($oDocument->isExists() && !$oDocument->isGranted())
{
return $this->setTemplateFile('input_password_form');
if ($oDocument->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if(!$oDocument->isExists())
@ -1033,7 +1040,14 @@ class BoardView extends Board
// if the document is not granted, then back to the password input form
if(!$oDocument->isGranted())
{
return $this->setTemplateFile('input_password_form');
if ($oDocument->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_document_regdate > 0 && $this->grant->manager == false)
@ -1220,7 +1234,14 @@ class BoardView extends Board
if(!$oComment->isGranted())
{
Context::set('document_srl', $oComment->get('document_srl'));
return $this->setTemplateFile('input_password_form');
if ($oComment->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_comment_regdate > 0 && $this->grant->manager == false)
@ -1297,7 +1318,14 @@ class BoardView extends Board
if(!$oComment->isGranted())
{
Context::set('document_srl', $oComment->get('document_srl'));
return $this->setTemplateFile('input_password_form');
if ($oComment->getMemberSrl())
{
return $this->dispBoardMessage('msg_not_permitted');
}
else
{
return $this->setTemplateFile('input_password_form');
}
}
if($this->module_info->protect_comment_regdate > 0 && $this->grant->manager == false)