Change method calls to static in many core modules

This commit is contained in:
Kijin Sung 2020-05-24 20:43:52 +09:00
parent 89ec44152e
commit c90d529c74
15 changed files with 361 additions and 605 deletions

View file

@ -41,16 +41,14 @@ class commentController extends comment
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
$comment_config = ModuleModel::getModulePartConfig('comment', $module_srl);
if($comment_config->use_vote_up == 'N')
{
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
@ -75,8 +73,7 @@ class commentController extends comment
$comment_srl = Context::get('target_srl');
if(!$comment_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
if($oComment->get('voted_count') <= 0)
{
throw new Rhymix\Framework\Exception('failed_voted_canceled');
@ -111,16 +108,14 @@ class commentController extends comment
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
$comment_config = ModuleModel::getModulePartConfig('comment', $module_srl);
if($comment_config->use_vote_down == 'N')
{
throw new Rhymix\Framework\Exceptions\FeatureDisabled;
@ -145,8 +140,7 @@ class commentController extends comment
$comment_srl = Context::get('target_srl');
if(!$comment_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
if($oComment->get('blamed_count') >= 0)
{
throw new Rhymix\Framework\Exception('failed_blamed_canceled');
@ -300,7 +294,7 @@ class commentController extends comment
*/
function addGrant($comment_srl)
{
$comment = getModel('comment')->getComment($comment_srl);
$comment = CommentModel::getComment($comment_srl);
if ($comment->isExists())
{
$comment->setGrant();
@ -320,9 +314,8 @@ class commentController extends comment
return FALSE;
}
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$module_part_config = $oModuleModel->getModulePartConfig('comment', $module_info->module_srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
$module_part_config = ModuleModel::getModulePartConfig('comment', $module_info->module_srl);
$use_validation = FALSE;
if(isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y")
{
@ -412,22 +405,17 @@ class commentController extends comment
{
return new BaseObject(-1, 'msg_invalid_document');
}
// creat the comment model object
$oCommentModel = getModel('comment');
// get a object of document model
$oDocumentModel = getModel('document');
// even for manual_inserted if password exists, hash it.
if($obj->password)
{
$obj->password = getModel('member')->hashPassword($obj->password);
$obj->password = MemberModel::hashPassword($obj->password);
}
// get the original posting
if(!$manual_inserted)
{
$oDocument = $oDocumentModel->getDocument($document_srl);
$oDocument = DocumentModel::getDocument($document_srl);
if($document_srl != $oDocument->document_srl)
{
@ -599,7 +587,7 @@ class commentController extends comment
$oDocumentController = getController('document');
// Update the number of comments in the post
$comment_count = $oCommentModel->getCommentCount($document_srl);
$comment_count = CommentModel::getCommentCount($document_srl);
if($comment_count && (!$using_validation || $is_admin))
{
$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, $update_document);
@ -625,7 +613,7 @@ class commentController extends comment
// send a message if notify_message option in enabled in the original comment
if($obj->parent_srl)
{
$oParent = $oCommentModel->getComment($obj->parent_srl);
$oParent = CommentModel::getComment($obj->parent_srl);
if($oParent->get('member_srl') != $oDocument->get('member_srl'))
{
$oParent->notify(lang('comment'), $obj->content);
@ -650,14 +638,10 @@ class commentController extends comment
{
$using_validation = $this->isModuleUsingPublishValidation($obj->module_srl);
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$oMemberModel = getModel("member");
$is_logged = Context::get('is_logged');
$oDocument = DocumentModel::getDocument($obj->document_srl);
if(isset($obj->member_srl) && !is_null($obj->member_srl))
{
$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
$member_info = MemberModel::getMemberInfoByMemberSrl($obj->member_srl);
}
else
{
@ -668,9 +652,7 @@ class commentController extends comment
$member_info->email_address = $obj->email_address;
}
$oCommentModel = getModel("comment");
$oModuleModel = getModel("module");
$module_info = $oModuleModel->getModuleInfoByDocumentSrl($obj->document_srl);
$module_info = ModuleModel::getModuleInfoByDocumentSrl($obj->document_srl);
// If there is no problem to register comment then send an email to all admin were set in module admin panel
if($module_info->admin_mail && $member_info->is_admin != 'Y')
@ -681,7 +663,7 @@ class commentController extends comment
$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
if($using_validation)
{
$nr_comments_not_approved = $oCommentModel->getCommentAllCount(NULL, FALSE);
$nr_comments_not_approved = CommentModel::getCommentAllCount(NULL, FALSE);
$url_approve = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
$url_trash = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true');
$mail_content = "
@ -777,11 +759,8 @@ class commentController extends comment
return $output;
}
// create a comment model object
$oCommentModel = getModel('comment');
// get the original data
$source_obj = $oCommentModel->getComment($obj->comment_srl);
$source_obj = CommentModel::getComment($obj->comment_srl);
if(!$source_obj->getMemberSrl())
{
$obj->member_srl = $source_obj->get('member_srl');
@ -799,7 +778,7 @@ class commentController extends comment
if($obj->password)
{
$obj->password = getModel('member')->hashPassword($obj->password);
$obj->password = MemberModel::hashPassword($obj->password);
}
if($obj->homepage)
@ -933,8 +912,7 @@ class commentController extends comment
ModuleHandler::triggerCall('comment.deleteComment', 'after', $obj);
// update the number of comments
$oCommentModel = getModel('comment');
$comment_count = $oCommentModel->getCommentCount($obj->document_srl);
$comment_count = CommentModel::getCommentCount($obj->document_srl);
// only document is exists
if(isset($comment_count))
{
@ -979,8 +957,7 @@ class commentController extends comment
}
// update the number of comments
$oCommentModel = getModel('comment');
$comment_count = $oCommentModel->getCommentCount($obj->document_srl);
$comment_count = CommentModel::getCommentCount($obj->document_srl);
// only document is exists
if(isset($comment_count))
{
@ -1011,20 +988,16 @@ class commentController extends comment
*/
function deleteComment($comment_srl, $is_admin = FALSE, $isMoveToTrash = FALSE, $childs = null)
{
// create the comment model object
$oCommentModel = getModel('comment');
$logged_info = Context::get('logged_info');
// check if comment already exists
$comment = $oCommentModel->getComment($comment_srl);
$comment = CommentModel::getComment($comment_srl);
if($comment->comment_srl != $comment_srl)
{
return new BaseObject(-1, 'msg_invalid_request');
}
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($comment->member_srl);
$member_info = MemberModel::getMemberInfoByMemberSrl($comment->member_srl);
$document_srl = $comment->document_srl;
@ -1045,7 +1018,7 @@ class commentController extends comment
// check if child comment exists on the comment
if(!$childs)
{
$childs = $oCommentModel->getChildComments($comment_srl);
$childs = CommentModel::getChildComments($comment_srl);
}
if(count($childs) > 0)
{
@ -1068,7 +1041,7 @@ class commentController extends comment
$logged_info = Context::get('logged_info');
foreach($childs as $val)
{
$c_member_info = $oMemberModel->getMemberInfoByMemberSrl($val->member_srl);
$c_member_info = MemberModel::getMemberInfoByMemberSrl($val->member_srl);
if($c_member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
{
$deleteAdminComment = FALSE;
@ -1119,7 +1092,7 @@ class commentController extends comment
$output = executeQuery('comment.deleteCommentList', $args);
// update the number of comments
$comment_count = $oCommentModel->getCommentCount($document_srl);
$comment_count = CommentModel::getCommentCount($document_srl);
// only document is exists
if(isset($comment_count))
@ -1182,11 +1155,9 @@ class commentController extends comment
$trash_args->trash_srl = $obj->trash_srl;
}
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($obj->comment_srl);
$oComment = CommentModel::getComment($obj->comment_srl);
$oMemberModel = getModel('member');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($oComment->get('member_srl'));
$member_info = MemberModel::getMemberInfoByMemberSrl($oComment->get('member_srl'));
if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
{
return new BaseObject(-1, 'msg_admin_comment_no_move_to_trash');
@ -1244,7 +1215,7 @@ class commentController extends comment
$output = executeQuery('comment.deleteCommentList', $args);
// update the number of comments
$comment_count = $oCommentModel->getCommentCount($obj->document_srl);
$comment_count = CommentModel::getCommentCount($obj->document_srl);
// only document is exists
if(isset($comment_count))
@ -1303,10 +1274,6 @@ class commentController extends comment
*/
function deleteComments($document_srl, $obj = NULL)
{
// create the document model object
$oDocumentModel = getModel('document');
$oCommentModel = getModel('comment');
// check if permission is granted
if(is_object($obj))
{
@ -1315,7 +1282,7 @@ class commentController extends comment
}
else
{
$oDocument = $oDocumentModel->getDocument($document_srl);
$oDocument = DocumentModel::getDocument($document_srl);
}
if(!$oDocument->isGranted())
@ -1414,8 +1381,7 @@ class commentController extends comment
}
// Get the original comment
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
// Pass if the author's IP address is as same as visitor's.
if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@ -1425,8 +1391,7 @@ class commentController extends comment
}
// Create a member model object
$oMemberModel = getModel('member');
$member_srl = $oMemberModel->getLoggedMemberSrl();
$member_srl = MemberModel::getLoggedMemberSrl();
// if the comment author is a member
if($oComment->get('member_srl'))
@ -1559,8 +1524,7 @@ class commentController extends comment
}
// get the original comment
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = CommentModel::getComment($comment_srl, FALSE, FALSE);
// failed if both ip addresses between author's and the current user are same.
if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@ -1639,8 +1603,7 @@ class commentController extends comment
// Send message to admin
$message_targets = array();
$module_srl = $oComment->get('module_srl');
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
$comment_config = ModuleModel::getModulePartConfig('comment', $module_srl);
if ($comment_config->declared_message && in_array('admin', $comment_config->declared_message))
{
$output = executeQueryArray('member.getAdmins', new stdClass);
@ -1717,18 +1680,17 @@ class commentController extends comment
$target_module_srl = array_map('trim', explode(',', $target_module_srl));
$logged_info = Context::get('logged_info');
$module_srl = array();
$oModuleModel = getModel('module');
foreach ($target_module_srl as $srl)
{
if (!$srl) continue;
$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($srl);
if (!$module_info->module_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
$module_grant = ModuleModel::getGrant($module_info, $logged_info);
if (!$module_grant->manager)
{
throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -1821,8 +1783,7 @@ class commentController extends comment
if(count($commentSrlList) > 0)
{
$oCommentModel = getModel('comment');
$commentList = $oCommentModel->getComments($commentSrlList);
$commentList = CommentModel::getComments($commentSrlList);
if(is_array($commentList))
{
@ -1885,8 +1846,7 @@ class commentController extends comment
function triggerCopyModule(&$obj)
{
$oModuleModel = getModel('module');
$commentConfig = $oModuleModel->getModulePartConfig('comment', $obj->originModuleSrl);
$commentConfig = ModuleModel::getModulePartConfig('comment', $obj->originModuleSrl);
$oModuleController = getController('module');
if(is_array($obj->moduleSrlList))

View file

@ -45,14 +45,12 @@ class commentModel extends comment
// feature that only member can do
if($logged_info->member_srl)
{
$oCommentModel = getModel('comment');
$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, $columnList);
$oComment = self::getComment($comment_srl, FALSE, $columnList);
$module_srl = $oComment->get('module_srl');
$member_srl = $oComment->get('member_srl');
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('document', $module_srl);
$comment_config = ModuleModel::getModulePartConfig('document', $module_srl);
if($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
{
@ -86,8 +84,7 @@ class commentModel extends comment
// find a comment by IP matching if an administrator.
if($logged_info->is_admin == 'Y')
{
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl);
$oComment = self::getComment($comment_srl);
if($oComment->isExists())
{
@ -245,7 +242,7 @@ class commentModel extends comment
//check if module is using validation system
$oCommentController = getController('comment');
$using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
$module_info = ModuleModel::getModuleInfoByDocumentSrl($document_srl);
$use_comment_massage = $module_info->comment_delete_message;
if($using_validation)
@ -344,13 +341,12 @@ class commentModel extends comment
/*
$output = executeQueryArray('comment.getDistinctModules');
$module_srls = $output->data;
$oModuleModel = getModel('module');
$result = array();
if($module_srls)
{
foreach($module_srls as $module)
{
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module->module_srl);
$module_info = ModuleModel::getModuleInfoByModuleSrl($module->module_srl);
$result[$module->module_srl] = $module_info->mid;
}
}
@ -567,9 +563,8 @@ class commentModel extends comment
public static function getCommentPage($document_srl, $comment_srl, $count = 0)
{
// Check the document
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'comment_count');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
$oDocument = DocumentModel::getDocument($document_srl, false, false, $columnList);
if(!$oDocument->isExists())
{
return 0;
@ -1093,16 +1088,14 @@ class commentModel extends comment
$point = 1;
}
$oCommentModel = getModel('comment');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
$oComment = self::getComment($comment_srl, FALSE, FALSE);
$module_srl = $oComment->get('module_srl');
if(!$module_srl)
{
throw new Rhymix\Framework\Exceptions\InvalidRequest;
}
$oModuleModel = getModel('module');
$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
$comment_config = ModuleModel::getModulePartConfig('comment', $module_srl);
$args = new stdClass();
@ -1132,12 +1125,11 @@ class commentModel extends comment
return $output;
}
$oMemberModel = getModel('member');
if($output->data)
{
foreach($output->data as $k => $d)
{
$profile_image = $oMemberModel->getProfileImage($d->member_srl);
$profile_image = MemberModel::getProfileImage($d->member_srl);
$output->data[$k]->src = $profile_image->src;
}
}

View file

@ -43,13 +43,11 @@ class commentView extends comment
}
// get the comment configuration
$oCommentModel = getModel('comment');
$comment_config = $oCommentModel->getCommentConfig($current_module_srl);
$comment_config = CommentModel::getCommentConfig($current_module_srl);
Context::set('comment_config', $comment_config);
// get a group list
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups();
$group_list = MemberModel::getGroups();
Context::set('group_list', $group_list);
// Set a template file
@ -69,17 +67,14 @@ class commentView extends comment
$this->setLayoutFile('popup_layout');
$comment_srl = Context::get('target_srl');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in
if(!$oMemberModel->isLogged())
if(!$this->user->member_srl)
{
throw new Rhymix\Framework\Exceptions\MustLogin;
}
// Create the comment object.
$oCommentModel = getModel('comment');
// Creates an object for displaying the selected comment
$oComment = $oCommentModel->getComment($comment_srl);
$oComment = CommentModel::getComment($comment_srl);
if(!$oComment->isExists())
{
throw new Rhymix\Framework\Exceptions\TargetNotFound;