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

Clean up outdated way of referring to other classes from Board module'

Browse source
This commit is contained in:
Kijin Sung 2023-10-02 23:36:04 +09:00
parent f7ed3519ac
commit ad7e0b0c93
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/board/board.controller.php
View file

@ -103,7 +103,7 @@ class BoardController extends Board
$obj->is_admin = 'Y';
}
$oDocumentController = getController('document');
$oDocumentController = DocumentController::getInstance();
$secret_status = DocumentModel::getConfigStatus('secret');
$use_status = explode('|@|', $this->module_info->use_status);
@ -298,7 +298,7 @@ class BoardController extends Board
throw new Rhymix\Framework\Exception('msg_no_update_id');
}
$oDocumentController = getController('document');
$oDocumentController = DocumentController::getInstance();
$update_log = DocumentModel::getUpdateLog($update_id);
if($logged_info->is_admin != 'Y')
@ -382,7 +382,7 @@ class BoardController extends Board
}
}
// generate document module controller object
$oDocumentController = getController('document');
$oDocumentController = DocumentController::getInstance();
if($this->module_info->trash_use == 'Y')
{
$output = $oDocumentController->moveDocumentToTrash($oDocument);
@ -414,7 +414,7 @@ class BoardController extends Board
function procBoardVoteDocument()
{
// generate document module controller object
$oDocumentController = getController('document');
$oDocumentController = DocumentController::getInstance();
$document_srl = Context::get('document_srl');
return $oDocumentController->updateVotedCount($document_srl);
@ -503,7 +503,7 @@ class BoardController extends Board
}
// generate comment module controller object
$oCommentController = getController('comment');
$oCommentController = CommentController::getInstance();
// check the comment is existed
// if the comment is not existed, then generate a new sequence
@ -657,7 +657,7 @@ class BoardController extends Board
}
}
// generate comment controller object
$oCommentController = getController('comment');
$oCommentController = CommentController::getInstance();
if($this->module_info->comment_delete_message === 'yes' && $instant_delete != 'Y')
{
$output = $oCommentController->updateCommentByDelete($comment, $this->grant->manager);
@ -725,7 +725,6 @@ class BoardController extends Board
// generate trackback module controller object
$oTrackbackController = getController('trackback');
if(!$oTrackbackController) return;
$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
@ -811,7 +810,9 @@ class BoardController extends Board
}
$url = getUrl('', 'mid', $mid, 'member_srl', $obj->member_srl);
getController('member')->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document');
$oMemberController = MemberController::getInstance();
$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '', 'self', 'board_own_document');
}
/**

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

@ -710,13 +710,10 @@ class BoardView extends Board
return $this->dispBoardMessage('msg_not_permitted');
}
// generate the tag module model object
$oTagModel = getModel('tag');
$obj = new stdClass;
$obj->mid = $this->module_info->mid;
$obj->list_count = 10000;
$output = $oTagModel->getTagList($obj);
$output = TagModel::getInstance()->getTagList($obj);
// automatically order
if(count($output->data))
@ -905,7 +902,7 @@ class BoardView extends Board
{
return $this->dispBoardMessage('msg_not_permitted');
}
else if((getModel('point')->getPoint($this->user->member_srl) + $pointForInsert) < 0)
else if((PointModel::getPoint($this->user->member_srl) + $pointForInsert) < 0)
{
return $this->dispBoardMessage('msg_not_enough_point');
}
@ -921,11 +918,14 @@ class BoardView extends Board
Context::set('oDocument', $oDocument);
// apply xml_js_filter on header
$oDocumentController = getController('document');
$oDocumentController = DocumentController::getInstance();
$oDocumentController->addXmlJsFilter($this->module_info->module_srl);
// if the document exists, then setup extra variabels on context
if($oDocument->isExists() && !$savedDoc) Context::set('extra_keys', $oDocument->getExtraVars());
if ($oDocument->isExists() && !$savedDoc)
{
Context::set('extra_keys', $oDocument->getExtraVars());
}
/**
* add JS filters