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

Fix #95 #626 #853 #1278 display login form if board action is not permitted and the user is not logged in

Browse source
This commit is contained in:
Kijin Sung 2022-12-19 20:41:36 +09:00
parent 539b548509
commit b1b25cac40
2 changed files with 57 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ class boardView extends board
**/
if(!$this->grant->access || !$this->grant->list)
{
return $this->dispBoardMessage('msg_not_permitted');
$this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
/**
@ -180,6 +180,10 @@ class boardView extends board
$this->setRedirectUrl($output->getPermanentUrl());
return;
}
if ($this->getHttpStatusCode() > 200)
{
return;
}
// list config, columnList setting
$this->listConfig = BoardModel::getListConfig($this->module_info->module_srl);
@ -285,8 +289,8 @@ class boardView extends board
else
{
// if the document is not existed, then alert a warning message
Context::set('document_srl','',true);
$this->alertMessage('msg_not_founded', 404);
Context::set('document_srl', null, true);
$this->dispBoardMessage('msg_not_founded', 404);
}
/**
@ -306,8 +310,8 @@ class boardView extends board
if(!$this->grant->view && !$oDocument->isGranted())
{
$oDocument = DocumentModel::getDocument(0);
Context::set('document_srl','',true);
$this->alertMessage('msg_not_permitted', 403);
Context::set('document_srl', null, true);
$this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
else
{
@ -778,7 +782,7 @@ class boardView extends board
// check grant
if(!$this->grant->write_document)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
/**
@ -964,7 +968,7 @@ class boardView extends board
// check grant
if(!$this->grant->write_document)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
// get the document_srl from request
@ -1035,14 +1039,14 @@ class boardView extends board
// check grant
if(!$this->grant->write_comment)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
// get the document information
$oDocument = DocumentModel::getDocument($document_srl);
if(!$oDocument->isExists())
{
return $this->dispBoardMessage('msg_not_founded');
return $this->dispBoardMessage('msg_not_founded', 404);
}
// Check allow comment
@ -1077,7 +1081,7 @@ class boardView extends board
// check grant
if(!$this->grant->write_comment)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
// get the parent comment ID
@ -1095,11 +1099,11 @@ class boardView extends board
// if the comment is not existed, opoup an error message
if(!$oSourceComment->isExists())
{
return $this->dispBoardMessage('msg_not_founded');
return $this->dispBoardMessage('msg_not_founded', 404);
}
if(Context::get('document_srl') && $oSourceComment->get('document_srl') != Context::get('document_srl'))
{
return $this->dispBoardMessage('msg_not_founded');
return $this->dispBoardMessage('msg_not_founded', 404);
}
// Check allow comment
@ -1135,7 +1139,7 @@ class boardView extends board
// check grant
if(!$this->grant->write_comment)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
// get the document_srl and comment_srl
@ -1212,7 +1216,7 @@ class boardView extends board
// check grant
if(!$this->grant->write_comment)
{
return $this->dispBoardMessage('msg_not_permitted');
return $this->dispBoardMessage($this->user->isMember() ? 'msg_not_permitted' : 'msg_not_logged');
}
// get the comment_srl to be deleted
@ -1311,17 +1315,6 @@ class boardView extends board
$this->setTemplateFile('delete_trackback_form');
}
/**
* @brief display board message
**/
function dispBoardMessage($msg_code)
{
Context::set('message', lang($msg_code));
$this->setHttpStatusCode(403);
$this->setTemplateFile('message');
}
function dispBoardUpdateLog()
{
if($this->grant->update_view !== true)
@ -1448,21 +1441,47 @@ class boardView extends board
$this->setTemplateFile('vote_log');
}
/**
* Default 404 Handler.
*/
function dispBoardNotFound()
{
$this->alertMessage('msg_not_founded', 404);
$this->dispBoardMessage('msg_not_founded', 404);
}
/**
* @brief the method for displaying the warning messages
* display an error message if it has not a special design
**/
function alertMessage($message, $code = 403)
* Display an error page.
*
* @param string $msg_code
* @param int $http_code
* @return void
*/
function dispBoardMessage($msg_code, $http_code = 403)
{
$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', lang($message));
//Context::set('message', lang($msg_code));
//$this->setTemplateFile('message');
$oMessageObject = MessageView::getInstance();
$oMessageObject->setMessage($msg_code);
$oMessageObject->dispMessage();
$this->setTemplatePath($oMessageObject->getTemplatePath());
$this->setTemplateFile($oMessageObject->getTemplateFile());
$this->setHttpStatusCode($http_code);
}
/**
* Display an alert window on top of the page.
*
* @deprecated
*
* @param string $msg_code
* @param int $http_code
* @return void
*/
function alertMessage($msg_code, $http_code = 403)
{
$script = sprintf('<script> jQuery(function(){ alert(%s); } );</script>', json_encode(lang($msg_code)));
Context::addHtmlFooter($script);
$this->setHttpStatusCode($code);
$this->setHttpStatusCode($http_code);
}
}