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

Change method calls to static in many core modules

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

116
modules/comment/comment.controller.php
View file

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

26
modules/comment/comment.model.php
View file

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

13
modules/comment/comment.view.php
View file

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

183
modules/document/document.controller.php
View file

@ -33,7 +33,7 @@ class documentController extends document
$module_info = $this->module_info; $module_info = $this->module_info;
if(!$module_info->module_srl) if(!$module_info->module_srl)
{ {
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl); $module_info = ModuleModel::getModuleInfoByDocumentSrl($document_srl);
} }
if($module_info->non_login_vote !== 'Y') if($module_info->non_login_vote !== 'Y')
@ -44,13 +44,11 @@ class documentController extends document
} }
} }
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document',$module_srl);
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_up=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled; if($document_config->use_vote_up=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled;
$point = 1; $point = 1;
@ -74,7 +72,7 @@ class documentController extends document
$module_info = $this->module_info; $module_info = $this->module_info;
if(!$module_info->module_srl) if(!$module_info->module_srl)
{ {
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl); $module_info = ModuleModel::getModuleInfoByDocumentSrl($document_srl);
} }
if($module_info->non_login_vote !== 'Y') if($module_info->non_login_vote !== 'Y')
@ -90,8 +88,7 @@ class documentController extends document
throw new Rhymix\Framework\Exception('failed_voted_cancel'); throw new Rhymix\Framework\Exception('failed_voted_cancel');
} }
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
if($oDocument->get('voted_count') <= 0) if($oDocument->get('voted_count') <= 0)
{ {
throw new Rhymix\Framework\Exception('failed_voted_canceled'); throw new Rhymix\Framework\Exception('failed_voted_canceled');
@ -144,13 +141,11 @@ class documentController extends document
$document_srl = Context::get('target_srl'); $document_srl = Context::get('target_srl');
if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document',$module_srl);
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($document_config->use_vote_down=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled; if($document_config->use_vote_down=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled;
$point = -1; $point = -1;
@ -181,8 +176,7 @@ class documentController extends document
$document_srl = Context::get('target_srl'); $document_srl = Context::get('target_srl');
if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
if($oDocument->get('blamed_count') >= 0) if($oDocument->get('blamed_count') >= 0)
{ {
throw new Rhymix\Framework\Exception('failed_blamed_canceled'); throw new Rhymix\Framework\Exception('failed_blamed_canceled');
@ -328,16 +322,14 @@ class documentController extends document
} }
$document_srl = intval(Context::get('target_srl')); $document_srl = intval(Context::get('target_srl'));
$oDocument = getModel('document')->getDocument($document_srl); $oDocument = DocumentModel::getDocument($document_srl);
if(!$oDocument->isExists()) if(!$oDocument->isExists())
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl); $module_info = ModuleModel::getModuleInfoByDocumentSrl($document_srl);
if($module_info->cancel_vote !== 'Y') if($module_info->cancel_vote !== 'Y')
{ {
throw new Rhymix\Framework\Exception('failed_declared_cancel'); throw new Rhymix\Framework\Exception('failed_declared_cancel');
@ -427,7 +419,7 @@ class documentController extends document
*/ */
function addGrant($document_srl) function addGrant($document_srl)
{ {
$oDocument = getModel('document')->getDocument($document_srl); $oDocument = DocumentModel::getDocument($document_srl);
if ($oDocument->isExists()) if ($oDocument->isExists())
{ {
$oDocument->setGrant(); $oDocument->setGrant();
@ -526,10 +518,9 @@ class documentController extends document
} }
// Set to 0 if the category_srl doesn't exist // Set to 0 if the category_srl doesn't exist
$oDocumentModel = getModel('document');
if($obj->category_srl) if($obj->category_srl)
{ {
$category_list = $oDocumentModel->getCategoryList($obj->module_srl); $category_list = DocumentModel::getCategoryList($obj->module_srl);
if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant) if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
{ {
return new BaseObject(-1, 'msg_not_permitted'); return new BaseObject(-1, 'msg_not_permitted');
@ -545,7 +536,7 @@ class documentController extends document
// Check the status of password hash for manually inserting. Apply hashing for otherwise. // Check the status of password hash for manually inserting. Apply hashing for otherwise.
if($obj->password && !$obj->password_is_hashed) if($obj->password && !$obj->password_is_hashed)
{ {
$obj->password = getModel('member')->hashPassword($obj->password); $obj->password = MemberModel::hashPassword($obj->password);
} }
// Insert member's information only if the member is logged-in and not manually registered. // Insert member's information only if the member is logged-in and not manually registered.
@ -613,7 +604,7 @@ class documentController extends document
// Insert extra variables if the document successfully inserted. // Insert extra variables if the document successfully inserted.
$extra_vars = array(); $extra_vars = array();
$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl); $extra_keys = DocumentModel::getExtraKeys($obj->module_srl);
if(count($extra_keys)) if(count($extra_keys))
{ {
foreach($extra_keys as $idx => $extra_item) foreach($extra_keys as $idx => $extra_item)
@ -731,8 +722,7 @@ class documentController extends document
if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl'); if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document', $obj->module_srl);
$document_config = $oModuleModel->getModulePartConfig('document', $obj->module_srl);
if(!$document_config) if(!$document_config)
{ {
$document_config = new stdClass(); $document_config = new stdClass();
@ -793,10 +783,9 @@ class documentController extends document
unset($obj->_saved_doc_message); unset($obj->_saved_doc_message);
// Set the category_srl to 0 if the changed category is not exsiting. // Set the category_srl to 0 if the changed category is not exsiting.
$oDocumentModel = getModel('document');
if($source_obj->get('category_srl')!=$obj->category_srl) if($source_obj->get('category_srl')!=$obj->category_srl)
{ {
$category_list = $oDocumentModel->getCategoryList($obj->module_srl); $category_list = DocumentModel::getCategoryList($obj->module_srl);
if(!$category_list[$obj->category_srl]) $obj->category_srl = 0; if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
} }
@ -806,7 +795,7 @@ class documentController extends document
// Hash the password if it exists // Hash the password if it exists
if($obj->password) if($obj->password)
{ {
$obj->password = getModel('member')->hashPassword($obj->password); $obj->password = MemberModel::hashPassword($obj->password);
} }
// If an author is identical to the modifier or history is used, use the logged-in user's information. // If an author is identical to the modifier or history is used, use the logged-in user's information.
@ -910,7 +899,7 @@ class documentController extends document
{ {
$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType()); $this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
// Insert extra variables if the document successfully inserted. // Insert extra variables if the document successfully inserted.
$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl); $extra_keys = DocumentModel::getExtraKeys($obj->module_srl);
if(count($extra_keys)) if(count($extra_keys))
{ {
foreach($extra_keys as $idx => $extra_item) foreach($extra_keys as $idx => $extra_item)
@ -1037,15 +1026,12 @@ class documentController extends document
if(!$isEmptyTrash) if(!$isEmptyTrash)
{ {
// get model object of the document
$oDocumentModel = getModel('document');
// Check if the documnet exists // Check if the documnet exists
$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin); $oDocument = DocumentModel::getDocument($document_srl, $is_admin);
} }
else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists'); else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
$oMemberModel = getModel('member'); $member_info = MemberModel::getMemberInfoByMemberSrl($oDocument->get('member_srl'));
$member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl'));
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
@ -1156,11 +1142,9 @@ class documentController extends document
if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence(); if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
else $trash_args->trash_srl = $obj->trash_srl; else $trash_args->trash_srl = $obj->trash_srl;
// Get its module_srl which the document belongs to // Get its module_srl which the document belongs to
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($obj->document_srl);
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$oMemberModel = getModel('member'); $member_info = MemberModel::getMemberInfoByMemberSrl($oDocument->get('member_srl'));
$member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl'));
if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y')
{ {
return new BaseObject(-1, 'msg_admin_document_no_move_to_trash'); return new BaseObject(-1, 'msg_admin_document_no_move_to_trash');
@ -1283,8 +1267,7 @@ class documentController extends document
'none' => true, 'none' => true,
); );
$oDocumentModel = getModel('document'); $config = DocumentModel::getDocumentConfig();
$config = $oDocumentModel->getDocumentConfig();
if (!$config->view_count_option || !isset($valid_options[$config->view_count_option])) if (!$config->view_count_option || !isset($valid_options[$config->view_count_option]))
{ {
$config->view_count_option = 'once'; $config->view_count_option = 'once';
@ -1524,8 +1507,7 @@ class documentController extends document
} }
// Get the original document // Get the original document
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's. // Pass if the author's IP address is as same as visitor's.
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@ -1534,9 +1516,8 @@ class documentController extends document
return new BaseObject(-1, $failed_voted); return new BaseObject(-1, $failed_voted);
} }
// Create a member model object // Get current member_srl
$oMemberModel = getModel('member'); $member_srl = MemberModel::getLoggedMemberSrl();
$member_srl = $oMemberModel->getLoggedMemberSrl();
// Check if document's author is a member. // Check if document's author is a member.
if($oDocument->get('member_srl')) if($oDocument->get('member_srl'))
@ -1673,8 +1654,7 @@ class documentController extends document
} }
// Get the original document // Get the original document
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's. // Pass if the author's IP address is as same as visitor's.
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@ -1753,8 +1733,7 @@ class documentController extends document
// Send message to admin // Send message to admin
$message_targets = array(); $message_targets = array();
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document', $module_srl);
$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
if ($document_config->declared_message && in_array('admin', $document_config->declared_message)) if ($document_config->declared_message && in_array('admin', $document_config->declared_message))
{ {
$output = executeQueryArray('member.getAdmins', new stdClass); $output = executeQueryArray('member.getAdmins', new stdClass);
@ -1809,8 +1788,7 @@ class documentController extends document
} }
// Get the original document // Get the original document
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl, false, false);
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();
@ -1872,8 +1850,7 @@ class documentController extends document
$message_targets = array(); $message_targets = array();
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document', $module_srl);
$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
if ($document_config->declared_message && in_array('admin', $document_config->declared_message)) if ($document_config->declared_message && in_array('admin', $document_config->declared_message))
{ {
$output = executeQueryArray('member.getAdmins', new stdClass); $output = executeQueryArray('member.getAdmins', new stdClass);
@ -1968,8 +1945,7 @@ class documentController extends document
if($obj->parent_srl) if($obj->parent_srl)
{ {
// Get its parent category // Get its parent category
$oDocumentModel = getModel('document'); $parent_category = DocumentModel::getCategory($obj->parent_srl);
$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
$obj->list_order = $parent_category->list_order; $obj->list_order = $parent_category->list_order;
$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1); $this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
if(!$obj->category_srl) $obj->category_srl = getNextSequence(); if(!$obj->category_srl) $obj->category_srl = getNextSequence();
@ -2013,8 +1989,10 @@ class documentController extends document
function updateCategoryCount($module_srl, $category_srl, $document_count = 0) function updateCategoryCount($module_srl, $category_srl, $document_count = 0)
{ {
// Create a document model object // Create a document model object
$oDocumentModel = getModel('document'); if(!$document_count)
if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl); {
$document_count = DocumentModel::getCategoryDocumentCount($module_srl,$category_srl);
}
$args = new stdClass; $args = new stdClass;
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
@ -2046,8 +2024,7 @@ class documentController extends document
{ {
$args = new stdClass(); $args = new stdClass();
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
$oDocumentModel = getModel('document'); $category_info = DocumentModel::getCategory($category_srl);
$category_info = $oDocumentModel->getCategory($category_srl);
// Display an error that the category cannot be deleted if it has a child // Display an error that the category cannot be deleted if it has a child
$output = executeQuery('document.getChildCategoryCount', $args); $output = executeQuery('document.getChildCategoryCount', $args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -2108,7 +2085,6 @@ class documentController extends document
*/ */
function moveCategoryUp($category_srl) function moveCategoryUp($category_srl)
{ {
$oDocumentModel = getModel('document');
// Get information of the selected category // Get information of the selected category
$args = new stdClass; $args = new stdClass;
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
@ -2118,7 +2094,7 @@ class documentController extends document
$list_order = $category->list_order; $list_order = $category->list_order;
$module_srl = $category->module_srl; $module_srl = $category->module_srl;
// Seek a full list of categories // Seek a full list of categories
$category_list = $oDocumentModel->getCategoryList($module_srl); $category_list = DocumentModel::getCategoryList($module_srl);
$category_srl_list = array_keys($category_list); $category_srl_list = array_keys($category_list);
if(count($category_srl_list)<2) return new BaseObject(); if(count($category_srl_list)<2) return new BaseObject();
@ -2155,7 +2131,6 @@ class documentController extends document
*/ */
function moveCategoryDown($category_srl) function moveCategoryDown($category_srl)
{ {
$oDocumentModel = getModel('document');
// Get information of the selected category // Get information of the selected category
$args = new stdClass; $args = new stdClass;
$args->category_srl = $category_srl; $args->category_srl = $category_srl;
@ -2165,7 +2140,7 @@ class documentController extends document
$list_order = $category->list_order; $list_order = $category->list_order;
$module_srl = $category->module_srl; $module_srl = $category->module_srl;
// Seek a full list of categories // Seek a full list of categories
$category_list = $oDocumentModel->getCategoryList($module_srl); $category_list = DocumentModel::getCategoryList($module_srl);
$category_srl_list = array_keys($category_list); $category_srl_list = array_keys($category_list);
if(count($category_srl_list)<2) return new BaseObject(); if(count($category_srl_list)<2) return new BaseObject();
@ -2200,8 +2175,7 @@ class documentController extends document
*/ */
function addXmlJsFilter($module_srl) function addXmlJsFilter($module_srl)
{ {
$oDocumentModel = getModel('document'); $extra_keys = DocumentModel::getExtraKeys($module_srl);
$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
if(!count($extra_keys)) return; if(!count($extra_keys)) return;
$js_code = array(); $js_code = array();
@ -2251,10 +2225,9 @@ class documentController extends document
$args->module_srl = $this->module_srl; $args->module_srl = $this->module_srl;
} }
// Check permissions // Check permissions
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
if($args->expand !="Y") $args->expand = "N"; if($args->expand !="Y") $args->expand = "N";
@ -2262,14 +2235,12 @@ class documentController extends document
else $args->group_srls = implode(',', $args->group_srls); else $args->group_srls = implode(',', $args->group_srls);
$args->parent_srl = (int)$args->parent_srl; $args->parent_srl = (int)$args->parent_srl;
$oDocumentModel = getModel('document');
$oDB = &DB::getInstance(); $oDB = &DB::getInstance();
$oDB->begin(); $oDB->begin();
// Check if already exists // Check if already exists
if($args->category_srl) if($args->category_srl)
{ {
$category_info = $oDocumentModel->getCategory($args->category_srl); $category_info = DocumentModel::getCategory($args->category_srl);
if($category_info->category_srl != $args->category_srl) $args->category_srl = null; if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
} }
// Update if exists // Update if exists
@ -2318,20 +2289,18 @@ class documentController extends document
// If target_srl exists, be a sibling // If target_srl exists, be a sibling
$target_category_srl = Context::get('target_srl'); $target_category_srl = Context::get('target_srl');
$oDocumentModel = getModel('document'); $source_category = DocumentModel::getCategory($source_category_srl);
$source_category = $oDocumentModel->getCategory($source_category_srl);
// Check permissions // Check permissions
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
// First child of the parent_category_srl // First child of the parent_category_srl
$source_args = new stdClass; $source_args = new stdClass;
if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0)) if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
{ {
$parent_category = $oDocumentModel->getCategory($parent_category_srl); $parent_category = DocumentModel::getCategory($parent_category_srl);
$args = new stdClass; $args = new stdClass;
$args->module_srl = $source_category->module_srl; $args->module_srl = $source_category->module_srl;
@ -2352,7 +2321,7 @@ class documentController extends document
} }
else if($target_category_srl > 0) else if($target_category_srl > 0)
{ {
$target_category = $oDocumentModel->getCategory($target_category_srl); $target_category = DocumentModel::getCategory($target_category_srl);
// Move all siblings of the $target_category down // Move all siblings of the $target_category down
$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1); $output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -2382,18 +2351,16 @@ class documentController extends document
$oDB = &DB::getInstance(); $oDB = &DB::getInstance();
$oDB->begin(); $oDB->begin();
// Check permissions // Check permissions
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
$oDocumentModel = getModel('document');
// Get original information // Get original information
$category_info = $oDocumentModel->getCategory($args->category_srl); $category_info = DocumentModel::getCategory($args->category_srl);
if($category_info->parent_srl) $parent_srl = $category_info->parent_srl; if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
// Display an error that the category cannot be deleted if it has a child node // Display an error that the category cannot be deleted if it has a child node
if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child'); if(DocumentModel::getCategoryChlidCount($args->category_srl)) return new BaseObject(-1, 'msg_cannot_delete_for_child');
// Remove from the DB // Remove from the DB
$output = $this->deleteCategory($args->category_srl); $output = $this->deleteCategory($args->category_srl);
if(!$output->toBool()) if(!$output->toBool())
@ -2423,10 +2390,9 @@ class documentController extends document
// Check input values // Check input values
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
// Check permissions // Check permissions
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
$xml_file = $this->makeCategoryFile($module_srl); $xml_file = $this->makeCategoryFile($module_srl);
@ -2445,9 +2411,8 @@ class documentController extends document
$module_srl = intval($module_srl); $module_srl = intval($module_srl);
if(!$module_srl) return false; if(!$module_srl) return false;
// Get module information (to obtain mid) // Get module information (to obtain mid)
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'mid', 'site_srl'); $columnList = array('module_srl', 'mid', 'site_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList);
$mid = $module_info->mid; $mid = $module_info->mid;
if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category'); if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
@ -2784,12 +2749,11 @@ class documentController extends document
if(!$document_srls || !count($document_srls)) return new BaseObject(); if(!$document_srls || !count($document_srls)) return new BaseObject();
// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents) // Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
$oModuleModel = getModel('module');
$module_srls = array_keys($document_srls); $module_srls = array_keys($document_srls);
for($i=0;$i<count($module_srls);$i++) for($i=0;$i<count($module_srls);$i++)
{ {
$module_srl = $module_srls[$i]; $module_srl = $module_srls[$i];
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y') if($logged_info->is_admin != 'Y')
{ {
@ -2798,7 +2762,7 @@ class documentController extends document
unset($document_srls[$module_srl]); unset($document_srls[$module_srl]);
continue; continue;
} }
$grant = $oModuleModel->getGrant($module_info, $logged_info); $grant = ModuleModel::getGrant($module_info, $logged_info);
if(!$grant->manager) if(!$grant->manager)
{ {
unset($document_srls[$module_srl]); unset($document_srls[$module_srl]);
@ -2843,12 +2807,12 @@ class documentController extends document
// Check permission of target module // Check permission of target module
if($obj->target_module_srl) if($obj->target_module_srl)
{ {
$module_info = getModel('module')->getModuleInfoByModuleSrl($obj->target_module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($obj->target_module_srl);
if (!$module_info->module_srl) if (!$module_info->module_srl)
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$module_grant = getModel('module')->getGrant($module_info, $logged_info); $module_grant = ModuleModel::getGrant($module_info, $logged_info);
if (!$module_grant->manager) if (!$module_grant->manager)
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -2864,7 +2828,7 @@ class documentController extends document
$obj->document_srl_list = array_unique(array_map('intval', $cart)); $obj->document_srl_list = array_unique(array_map('intval', $cart));
// Set document list // Set document list
$obj->document_list = getModel('document')->getDocuments($obj->document_srl_list, false, false); $obj->document_list = DocumentModel::getDocuments($obj->document_srl_list, false, false);
if(empty($obj->document_list)) if(empty($obj->document_list))
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
@ -3015,18 +2979,17 @@ Content;
$target_module_srl = array_map('trim', explode(',', $target_module_srl)); $target_module_srl = array_map('trim', explode(',', $target_module_srl));
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$module_srl = array(); $module_srl = array();
$oModuleModel = getModel('module');
foreach ($target_module_srl as $srl) foreach ($target_module_srl as $srl)
{ {
if (!$srl) continue; if (!$srl) continue;
$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($srl);
if (!$module_info->module_srl) if (!$module_info->module_srl)
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; 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) if (!$module_grant->manager)
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -3085,8 +3048,7 @@ Content;
unset($obj->title_bold); unset($obj->title_bold);
} }
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($obj->document_srl);
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
// Update if already exists // Update if already exists
if($oDocument->isExists()) if($oDocument->isExists())
@ -3108,7 +3070,7 @@ Content;
{ {
$output = $this->insertDocument($obj); $output = $this->insertDocument($obj);
$oDocument = $oDocumentModel->getDocument($output->get('document_srl')); $oDocument = DocumentModel::getDocument($output->get('document_srl'));
} }
// Set the attachment to be invalid state // Set the attachment to be invalid state
@ -3140,15 +3102,13 @@ Content;
if(count($documentSrlList) > 0) if(count($documentSrlList) > 0)
{ {
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'title', 'nick_name', 'status'); $columnList = array('document_srl', 'title', 'nick_name', 'status');
$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList); $documentList = DocumentModel::getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
} }
else else
{ {
global $lang;
$documentList = array(); $documentList = array();
$this->setMessage($lang->no_documents); $this->setMessage(lang(no_documents));
} }
$oSecurity = new Security($documentList); $oSecurity = new Security($documentList);
$oSecurity->encodeHTML('..variables.'); $oSecurity->encodeHTML('..variables.');
@ -3201,7 +3161,6 @@ Content;
return; return;
} }
$oFileModel = getModel('file');
$document_srl_list = array_unique($document_srl_list); $document_srl_list = array_unique($document_srl_list);
foreach($document_srl_list as $document_srl) foreach($document_srl_list as $document_srl)
@ -3213,14 +3172,14 @@ Content;
$args = new stdClass; $args = new stdClass;
$args->document_srl = $document_srl; $args->document_srl = $document_srl;
$args->uploaded_count = $oFileModel->getFilesCount($document_srl); $args->uploaded_count = FileModel::getFilesCount($document_srl);
executeQuery('document.updateUploadedCount', $args); executeQuery('document.updateUploadedCount', $args);
} }
} }
function triggerAfterDeleteFile($file) function triggerAfterDeleteFile($file)
{ {
$oDocument = getModel('document')->getDocument($file->upload_target_srl, false, false); $oDocument = DocumentModel::getDocument($file->upload_target_srl, false, false);
if(!$oDocument->isExists()) if(!$oDocument->isExists())
{ {
return; return;
@ -3236,8 +3195,7 @@ Content;
*/ */
function triggerCopyModuleExtraKeys(&$obj) function triggerCopyModuleExtraKeys(&$obj)
{ {
$oDocumentModel = getModel('document'); $documentExtraKeys = DocumentModel::getExtraKeys($obj->originModuleSrl);
$documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl);
if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList)) if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
{ {
@ -3254,8 +3212,7 @@ Content;
function triggerCopyModule(&$obj) function triggerCopyModule(&$obj)
{ {
$oModuleModel = getModel('module'); $documentConfig = ModuleModel::getModulePartConfig('document', $obj->originModuleSrl);
$documentConfig = $oModuleModel->getModulePartConfig('document', $obj->originModuleSrl);
$oModuleController = getController('module'); $oModuleController = getController('module');
if(is_array($obj->moduleSrlList)) if(is_array($obj->moduleSrlList))

39
modules/document/document.model.php
View file

@ -449,15 +449,13 @@ class documentModel extends document
// Members must be a possible feature // Members must be a possible feature
if($this->user->member_srl) if($this->user->member_srl)
{ {
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress'); $columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); $oDocument = self::getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
$member_srl = $oDocument->get('member_srl'); $member_srl = $oDocument->get('member_srl');
if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document',$module_srl);
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
$oDocumentisVoted = $oDocument->getMyVote(); $oDocumentisVoted = $oDocument->getMyVote();
if($document_config->use_vote_up!='N' && $member_srl!=$this->user->member_srl) if($document_config->use_vote_up!='N' && $member_srl!=$this->user->member_srl)
{ {
@ -518,8 +516,7 @@ class documentModel extends document
// If you are managing to find posts by ip // If you are managing to find posts by ip
if($this->user->is_admin == 'Y') if($this->user->is_admin == 'Y')
{ {
$oDocumentModel = getModel('document'); $oDocument = self::getDocument($document_srl); //before setting document recycle
$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
if($oDocument->isExists()) if($oDocument->isExists())
{ {
@ -837,8 +834,7 @@ class documentModel extends document
{ {
if($obj->mid) if($obj->mid)
{ {
$oModuleModel = getModel('module'); $obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid);
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid); unset($obj->mid);
} }
// Module_srl passed the array may be a check whether the array // Module_srl passed the array may be a check whether the array
@ -863,8 +859,7 @@ class documentModel extends document
{ {
if($obj->mid) if($obj->mid)
{ {
$oModuleModel = getModel('module'); $obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid);
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
unset($obj->mid); unset($obj->mid);
} }
// Module_srl passed the array may be a check whether the array // Module_srl passed the array may be a check whether the array
@ -949,8 +944,7 @@ class documentModel extends document
Context::loadJavascriptPlugin('ui.tree'); Context::loadJavascriptPlugin('ui.tree');
// Get a list of member groups // Get a list of member groups
$oMemberModel = getModel('member'); $group_list = MemberModel::getGroups();
$group_list = $oMemberModel->getGroups();
Context::set('group_list', $group_list); Context::set('group_list', $group_list);
$security = new Security(); $security = new Security();
@ -968,13 +962,11 @@ class documentModel extends document
*/ */
public function getDocumentCategoryTplInfo() public function getDocumentCategoryTplInfo()
{ {
$oModuleModel = getModel('module');
$oMemberModel = getModel('member');
// Get information on the menu for the parameter settings // Get information on the menu for the parameter settings
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
// Check permissions // Check permissions
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted;
$category_srl = Context::get('category_srl'); $category_srl = Context::get('category_srl');
@ -1168,14 +1160,12 @@ class documentModel extends document
$point = Context::get('point'); $point = Context::get('point');
if($point != -1) $point = 1; if($point != -1) $point = 1;
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl'); $columnList = array('document_srl', 'module_srl');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); $oDocument = self::getDocument($document_srl, false, false, $columnList);
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module'); $document_config = ModuleModel::getModulePartConfig('document',$module_srl);
$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
if($point == -1) if($point == -1)
{ {
if($document_config->use_vote_down!='S') throw new Rhymix\Framework\Exceptions\FeatureDisabled; if($document_config->use_vote_down!='S') throw new Rhymix\Framework\Exceptions\FeatureDisabled;
@ -1192,12 +1182,11 @@ class documentModel extends document
$output = executeQueryArray('document.getVotedMemberList',$args); $output = executeQueryArray('document.getVotedMemberList',$args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$oMemberModel = getModel('member');
if($output->data) if($output->data)
{ {
foreach($output->data as $k => $d) 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; $output->data[$k]->src = $profile_image->src;
} }
} }
@ -1296,7 +1285,7 @@ class documentModel extends document
// get directly module_srl by mid // get directly module_srl by mid
if($searchOpt->mid) if($searchOpt->mid)
{ {
$args->module_srl = getModel('module')->getModuleSrlByMid($searchOpt->mid); $args->module_srl = ModuleModel::getModuleSrlByMid($searchOpt->mid);
} }
// add subcategories // add subcategories
@ -1398,8 +1387,8 @@ class documentModel extends document
// exclude secret documents in searching if current user does not have privilege // exclude secret documents in searching if current user does not have privilege
if(!$args->member_srl || !Context::get('is_logged') || $args->member_srl !== Context::get('logged_info')->member_srl) if(!$args->member_srl || !Context::get('is_logged') || $args->member_srl !== Context::get('logged_info')->member_srl)
{ {
$module_info = getModel('module')->getModuleInfoByModuleSrl($args->module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl);
if(!getModel('module')->getGrant($module_info, Context::get('logged_info'))->manager) if(!ModuleModel::getGrant($module_info, Context::get('logged_info'))->manager)
{ {
$args->comment_is_secret = 'N'; $args->comment_is_secret = 'N';
$args->statusList = array(self::getConfigStatus('public')); $args->statusList = array(self::getConfigStatus('public'));

31
modules/document/document.view.php
View file

@ -28,14 +28,8 @@ class documentView extends document
// Bring a list of variables needed to implement // Bring a list of variables needed to implement
$document_srl = Context::get('document_srl'); $document_srl = Context::get('document_srl');
// module_info not use in UI
//$oModuleModel = getModel('module');
//$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
// Create the document object. If the document module of basic data structures, write it all works .. -_-;
$oDocumentModel = getModel('document');
// Creates an object for displaying the selected document // Creates an object for displaying the selected document
$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager); $oDocument = DocumentModel::getDocument($document_srl, $this->grant->manager);
if(!$oDocument->isExists()) throw new Rhymix\Framework\Exceptions\TargetNotFound; if(!$oDocument->isExists()) throw new Rhymix\Framework\Exceptions\TargetNotFound;
// Check permissions // Check permissions
if(!$oDocument->isAccessible()) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!$oDocument->isAccessible()) throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -71,7 +65,7 @@ class documentView extends document
// Editor converter // Editor converter
$obj = new stdClass; $obj = new stdClass;
$obj->content = $content; $obj->content = $content;
$obj->module_srl = getModel('module')->getModuleInfoByMid(Context::get('mid'))->module_srl; $obj->module_srl = ModuleModel::getModuleInfoByMid(Context::get('mid'))->module_srl;
$content = getModel('editor')->converter($obj, 'document'); $content = getModel('editor')->converter($obj, 'document');
$content = sprintf('<div class="document_0_%d xe_content">%s</div>', Context::get('logged_info')->member_srl, $content); $content = sprintf('<div class="document_0_%d xe_content">%s</div>', Context::get('logged_info')->member_srl, $content);
Context::set('content', $content); Context::set('content', $content);
@ -102,8 +96,7 @@ class documentView extends document
if(count($document_srl_list)) if(count($document_srl_list))
{ {
$oDocumentModel = getModel('document'); $document_list = DocumentModel::getDocuments($document_srl_list, $this->grant->is_admin);
$document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
Context::set('document_list', $document_list); Context::set('document_list', $document_list);
} }
else else
@ -113,7 +106,7 @@ class documentView extends document
$module_srl = intval(Context::get('module_srl')); $module_srl = intval(Context::get('module_srl'));
Context::set('module_srl',$module_srl); Context::set('module_srl',$module_srl);
$module_info = getModel('module')->getModuleInfoByModuleSrl($module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
Context::set('mid',$module_info->mid); Context::set('mid',$module_info->mid);
Context::set('browser_title',$module_info->browser_title); Context::set('browser_title',$module_info->browser_title);
@ -144,10 +137,9 @@ class documentView extends document
if(!$current_module_srl) return new BaseObject(); if(!$current_module_srl) return new BaseObject();
} }
$oModuleModel = getModel('module');
if($current_module_srl) if($current_module_srl)
{ {
$document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl); $document_config = ModuleModel::getModulePartConfig('document', $current_module_srl);
} }
if(!$document_config) if(!$document_config)
{ {
@ -171,9 +163,8 @@ class documentView extends document
{ {
$this->setLayoutFile('popup_layout'); $this->setLayoutFile('popup_layout');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) if(!$this->user->member_srl)
{ {
throw new Rhymix\Framework\Exceptions\MustLogin; throw new Rhymix\Framework\Exceptions\MustLogin;
} }
@ -185,8 +176,7 @@ class documentView extends document
$args->page = (int)Context::get('page'); $args->page = (int)Context::get('page');
$args->list_count = 10; $args->list_count = 10;
$oDocumentModel = getModel('document'); $output = DocumentModel::getDocumentList($args, true);
$output = $oDocumentModel->getDocumentList($args, true);
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page); Context::set('total_page', $output->total_page);
Context::set('page', $output->page); Context::set('page', $output->page);
@ -206,17 +196,14 @@ class documentView extends document
$this->setLayoutFile('popup_layout'); $this->setLayoutFile('popup_layout');
$document_srl = Context::get('target_srl'); $document_srl = Context::get('target_srl');
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) if(!$this->user->member_srl)
{ {
throw new Rhymix\Framework\Exceptions\MustLogin; throw new Rhymix\Framework\Exceptions\MustLogin;
} }
// Create the document object. If the document module of basic data structures, write it all works .. -_-;
$oDocumentModel = getModel('document');
// Creates an object for displaying the selected document // Creates an object for displaying the selected document
$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager, FALSE); $oDocument = DocumentModel::getDocument($document_srl, $this->grant->manager, FALSE);
if(!$oDocument->isExists()) if(!$oDocument->isExists())
{ {
throw new Rhymix\Framework\Exceptions\TargetNotFound; throw new Rhymix\Framework\Exceptions\TargetNotFound;

70
modules/file/file.controller.php
View file

@ -32,7 +32,6 @@ class fileController extends file
if(!$file_info || !is_uploaded_file($file_info['tmp_name'])) exit(); if(!$file_info || !is_uploaded_file($file_info['tmp_name'])) exit();
// Basic variables setting // Basic variables setting
$oFileModel = getModel('file');
$editor_sequence = Context::get('editor_sequence'); $editor_sequence = Context::get('editor_sequence');
$module_srl = $this->module_srl; $module_srl = $this->module_srl;
@ -88,7 +87,7 @@ class fileController extends file
$is_admin = (Context::get('logged_info')->is_admin === 'Y'); $is_admin = (Context::get('logged_info')->is_admin === 'Y');
if (!$is_admin) if (!$is_admin)
{ {
$module_config = getModel('file')->getFileConfig($module_srl); $module_config = FileModel::getFileConfig($module_srl);
$allowed_attach_size = $module_config->allowed_attach_size * 1024 * 1024; $allowed_attach_size = $module_config->allowed_attach_size * 1024 * 1024;
$allowed_filesize = $module_config->allowed_filesize * 1024 * 1024; $allowed_filesize = $module_config->allowed_filesize * 1024 * 1024;
if ($total_size > $allowed_filesize) if ($total_size > $allowed_filesize)
@ -155,11 +154,11 @@ class fileController extends file
$this->add('original_type', $output->get('original_type')); $this->add('original_type', $output->get('original_type'));
if ($output->get('direct_download') === 'Y') if ($output->get('direct_download') === 'Y')
{ {
$this->add('download_url', $oFileModel->getDirectFileUrl($output->get('uploaded_filename'))); $this->add('download_url', FileModel::getDirectFileUrl($output->get('uploaded_filename')));
} }
else else
{ {
$this->add('download_url', $oFileModel->getDownloadUrl($output->get('file_srl'), $output->get('sid'), $module_srl)); $this->add('download_url', FileModel::getDownloadUrl($output->get('file_srl'), $output->get('sid'), $module_srl));
} }
} }
@ -187,10 +186,8 @@ class fileController extends file
$file_srl = Context::get('file_srl'); $file_srl = Context::get('file_srl');
if($file_srl) if($file_srl)
{ {
$oFileModel = getModel('file'); $file_info = FileModel::getFile($file_srl);
$logged_info = Context::get('logged_info'); if($file_info->file_srl == $file_srl && FileModel::isDeletable($file_info))
$file_info = $oFileModel->getFile($file_srl);
if($file_info->file_srl == $file_srl && $oFileModel->isDeletable($file_info))
{ {
$this->deleteFile($file_srl); $this->deleteFile($file_srl);
} }
@ -225,8 +222,7 @@ class fileController extends file
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$oFileModel = getModel('file'); $fileInfo = FileModel::getFile($file_srl);
$fileInfo = $oFileModel->getFile($file_srl);
if(!$fileInfo || $fileInfo->direct_download != 'Y') if(!$fileInfo || $fileInfo->direct_download != 'Y')
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
@ -284,8 +280,6 @@ class fileController extends file
*/ */
function procFileDownload() function procFileDownload()
{ {
$oFileModel = getModel('file');
if(isset($this->grant->access) && $this->grant->access !== true) if(isset($this->grant->access) && $this->grant->access !== true)
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -295,7 +289,7 @@ class fileController extends file
$sid = Context::get('sid'); $sid = Context::get('sid');
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Get file information from the DB // Get file information from the DB
$file_obj = $oFileModel->getFile($file_srl); $file_obj = FileModel::getFile($file_srl);
// If the requested file information is incorrect, an error that file cannot be found appears // If the requested file information is incorrect, an error that file cannot be found appears
if($file_obj->file_srl != $file_srl || $file_obj->sid !== $sid) if($file_obj->file_srl != $file_srl || $file_obj->sid !== $sid)
{ {
@ -303,7 +297,7 @@ class fileController extends file
} }
// File name // File name
$filename = $file_obj->source_filename; $filename = $file_obj->source_filename;
$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl); $file_module_config = FileModel::getFileModuleConfig($file_obj->module_srl);
// Not allow the file outlink // Not allow the file outlink
if($file_module_config->allow_outlink == 'N' && $_SERVER["HTTP_REFERER"]) if($file_module_config->allow_outlink == 'N' && $_SERVER["HTTP_REFERER"])
{ {
@ -356,7 +350,7 @@ class fileController extends file
} }
// Check if the file is downloadable // Check if the file is downloadable
if(!$oFileModel->isDownloadable($file_obj)) if(!FileModel::isDownloadable($file_obj))
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted('msg_not_permitted_download'); throw new Rhymix\Framework\Exceptions\NotPermitted('msg_not_permitted_download');
} }
@ -406,14 +400,13 @@ class fileController extends file
public function procFileOutput() public function procFileOutput()
{ {
// Get requsted file info // Get requsted file info
$oFileModel = getModel('file');
$file_srl = Context::get('file_srl'); $file_srl = Context::get('file_srl');
$file_key = Context::get('file_key'); $file_key = Context::get('file_key');
$filename_arg = Context::get('filename'); $filename_arg = Context::get('filename');
$columnList = array('source_filename', 'uploaded_filename', 'file_size'); $columnList = array('source_filename', 'uploaded_filename', 'file_size');
$file_obj = $oFileModel->getFile($file_srl, $columnList); $file_obj = FileModel::getFile($file_srl, $columnList);
$file_config = $oFileModel->getFileConfig($file_obj->module_srl ?: null); $file_config = FileModel::getFileConfig($file_obj->module_srl ?: null);
$filesize = $file_obj->file_size; $filesize = $file_obj->file_size;
$filename = preg_replace('/\.\.+/', '.', $file_obj->source_filename); $filename = preg_replace('/\.\.+/', '.', $file_obj->source_filename);
$etag = md5($file_srl . $file_key . \RX_CLIENT_IP); $etag = md5($file_srl . $file_key . \RX_CLIENT_IP);
@ -570,9 +563,6 @@ class fileController extends file
$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl; $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
$logged_info = Context::get('logged_info');
$oFileModel = getModel('file');
$srls = explode(',',$file_srl); $srls = explode(',',$file_srl);
if(!count($srls)) return; if(!count($srls)) return;
@ -588,7 +578,7 @@ class fileController extends file
$file_info = $output->data; $file_info = $output->data;
if(!$file_info) continue; if(!$file_info) continue;
if(!$oFileModel->isDeletable($file_info)) continue; if(!FileModel::isDeletable($file_info)) continue;
if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl); if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
} }
} }
@ -606,7 +596,7 @@ class fileController extends file
} }
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->is_admin !== 'Y' && !getModel('module')->isSiteAdmin($logged_info)) if($logged_info->is_admin !== 'Y' && !ModuleModel::isSiteAdmin($logged_info))
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
} }
@ -617,8 +607,7 @@ class fileController extends file
global $lang; global $lang;
if(count($fileSrlList) > 0) if(count($fileSrlList) > 0)
{ {
$oFileModel = getModel('file'); $fileList = FileModel::getFile($fileSrlList);
$fileList = $oFileModel->getFile($fileSrlList);
$fileSizeTotal = 0; $fileSizeTotal = 0;
if(!is_array($fileList)) $fileList = array($fileList); if(!is_array($fileList)) $fileList = array($fileList);
@ -656,8 +645,7 @@ class fileController extends file
if(!$document_srl) return; if(!$document_srl) return;
// Get numbers of attachments // Get numbers of attachments
$oFileModel = getModel('file'); $obj->uploaded_count = FileModel::getFilesCount($document_srl);
$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
// TODO: WTF are we doing with uploaded_count anyway? // TODO: WTF are we doing with uploaded_count anyway?
} }
@ -702,8 +690,7 @@ class fileController extends file
$comment_srl = $obj->comment_srl; $comment_srl = $obj->comment_srl;
if(!$comment_srl) return; if(!$comment_srl) return;
// Get numbers of attachments // Get numbers of attachments
$oFileModel = getModel('file'); $obj->uploaded_count = FileModel::getFilesCount($comment_srl);
$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
} }
/** /**
@ -874,8 +861,7 @@ class fileController extends file
} }
// Get file module configuration // Get file module configuration
$oFileModel = getModel('file'); $config = FileModel::getFileConfig($module_srl);
$config = $oFileModel->getFileConfig($module_srl);
// Check file extension // Check file extension
if(!$manual_insert && !$this->user->isAdmin()) if(!$manual_insert && !$this->user->isAdmin())
@ -1355,7 +1341,7 @@ class fileController extends file
return new BaseObject(); return new BaseObject();
} }
$config = getModel('file')->getFileConfig(); $config = FileModel::getFileConfig();
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();
@ -1367,7 +1353,7 @@ class fileController extends file
{ {
continue; continue;
} }
$file = getModel('file')->getFile($file_srl); $file = FileModel::getFile($file_srl);
} }
if(empty($file->file_srl)) if(empty($file->file_srl))
@ -1432,8 +1418,7 @@ class fileController extends file
function deleteFiles($upload_target_srl) function deleteFiles($upload_target_srl)
{ {
// Get a list of attachements // Get a list of attachements
$oFileModel = getModel('file'); $file_list = FileModel::getFiles($upload_target_srl);
$file_list = $oFileModel->getFiles($upload_target_srl);
// Success returned if no attachement exists // Success returned if no attachement exists
if(empty($file_list)) if(empty($file_list))
@ -1478,13 +1463,12 @@ class fileController extends file
{ {
if($source_srl == $target_srl) return; if($source_srl == $target_srl) return;
$oFileModel = getModel('file'); $file_list = FileModel::getFiles($source_srl);
$file_list = $oFileModel->getFiles($source_srl);
if(!$file_list) return; if(!$file_list) return;
$file_count = count($file_list); $file_count = count($file_list);
$config = $oFileModel->getFileConfig($module_srl); $config = FileModel::getFileConfig($module_srl);
$oDB = DB::getInstance(); $oDB = DB::getInstance();
$oDB->begin(); $oDB->begin();
@ -1579,7 +1563,7 @@ class fileController extends file
{ {
if(!is_array($source_file_list)) if(!is_array($source_file_list))
{ {
$source_file_list = getModel('file')->getFiles($source_file_list, array(), 'file_srl', true); $source_file_list = FileModel::getFiles($source_file_list, array(), 'file_srl', true);
} }
foreach($source_file_list as $source_file) foreach($source_file_list as $source_file)
@ -1597,8 +1581,7 @@ class fileController extends file
$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl; $upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
$oFileModel = getModel('file'); $file_info = FileModel::getFile($vars->file_srl);
$file_info = $oFileModel->getFile($vars->file_srl);
if(!$file_info) throw new Rhymix\Framework\Exceptions\TargetNotFound; if(!$file_info) throw new Rhymix\Framework\Exceptions\TargetNotFound;
@ -1652,7 +1635,7 @@ class fileController extends file
* @param bool $absolute_path * @param bool $absolute_path
* @return string * @return string
*/ */
public function getStoragePath($file_type, $file_srl, $module_srl = 0, $upload_target_srl = 0, $regdate = '', $absolute_path = true) public static function getStoragePath($file_type, $file_srl, $module_srl = 0, $upload_target_srl = 0, $regdate = '', $absolute_path = true)
{ {
// 변수 확인 및 넘어오지 않은 변수 기본값 지정 // 변수 확인 및 넘어오지 않은 변수 기본값 지정
$file_srl = intval($file_srl); $file_srl = intval($file_srl);
@ -1721,8 +1704,7 @@ class fileController extends file
function triggerCopyModule(&$obj) function triggerCopyModule(&$obj)
{ {
$oModuleModel = getModel('module'); $fileConfig = ModuleModel::getModulePartConfig('file', $obj->originModuleSrl);
$fileConfig = $oModuleModel->getModulePartConfig('file', $obj->originModuleSrl);
$oModuleController = getController('module'); $oModuleController = getController('module');
if(is_array($obj->moduleSrlList)) if(is_array($obj->moduleSrlList))

26
modules/file/file.model.php
View file

@ -36,22 +36,19 @@ class fileModel extends file
// Get uploaded files // Get uploaded files
if($upload_target_srl) if($upload_target_srl)
{ {
$oModuleModel = getModel('module'); $oDocument = DocumentModel::getDocument($upload_target_srl);
$oCommentModel = getModel('comment');
$oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($upload_target_srl);
// Check permissions of the comment // Check permissions of the comment
if(!$oDocument->isExists()) if(!$oDocument->isExists())
{ {
$oComment = $oCommentModel->getComment($upload_target_srl); $oComment = CommentModel::getComment($upload_target_srl);
if($oComment->isExists()) if($oComment->isExists())
{ {
if(!$oComment->isAccessible()) if(!$oComment->isAccessible())
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
} }
$oDocument = $oDocumentModel->getDocument($oComment->get('document_srl')); $oDocument = DocumentModel::getDocument($oComment->get('document_srl'));
} }
} }
@ -64,12 +61,12 @@ class fileModel extends file
// Check permissions of the module // Check permissions of the module
if($module_srl = isset($oComment) ? $oComment->get('module_srl') : $oDocument->get('module_srl')) if($module_srl = isset($oComment) ? $oComment->get('module_srl') : $oDocument->get('module_srl'))
{ {
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl);
if(empty($module_info->module_srl)) if(empty($module_info->module_srl))
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
} }
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->access) if(!$grant->access)
{ {
throw new Rhymix\Framework\Exceptions\NotPermitted; throw new Rhymix\Framework\Exceptions\NotPermitted;
@ -161,7 +158,7 @@ class fileModel extends file
} }
if(!isset($member_info->group_list)) if(!isset($member_info->group_list))
{ {
$member_info->group_list = getModel('member')->getMemberGroups($member_info->member_srl); $member_info->group_list = MemberModel::getMemberGroups($member_info->member_srl);
} }
$is_group = false; $is_group = false;
foreach($config->download_groups as $group_srl) foreach($config->download_groups as $group_srl)
@ -204,27 +201,26 @@ class fileModel extends file
} }
// Check permissions of the module // Check permissions of the module
$oModuleModel = getModel('module'); $module_info = ModuleModel::getModuleInfoByModuleSrl($file_info->module_srl);
$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_info->module_srl);
if(empty($module_info->module_srl)) if(empty($module_info->module_srl))
{ {
return false; return false;
} }
$grant = $oModuleModel->getGrant($module_info, $member_info); $grant = ModuleModel::getGrant($module_info, $member_info);
if($grant->manager) if($grant->manager)
{ {
return true; return true;
} }
// Check permissions of the document // Check permissions of the document
$oDocument = getModel('document')->getDocument($file_info->upload_target_srl); $oDocument = DocumentModel::getDocument($file_info->upload_target_srl);
if($oDocument->isExists() && $oDocument->isGranted()) if($oDocument->isExists() && $oDocument->isGranted())
{ {
return true; return true;
} }
// Check permissions of the comment // Check permissions of the comment
$oComment = getModel('comment')->getComment($file_info->upload_target_srl); $oComment = CommentModel::getComment($file_info->upload_target_srl);
if($oComment->isExists() && $oComment->isGranted()) if($oComment->isExists() && $oComment->isGranted())
{ {
return true; return true;
@ -406,7 +402,7 @@ class fileModel extends file
$config = self::getFileConfig(Context::get('module_srl') ?: Context::get('current_module_info')->module_srl); $config = self::getFileConfig(Context::get('module_srl') ?: Context::get('current_module_info')->module_srl);
if (Rhymix\Framework\Session::isAdmin()) if (Rhymix\Framework\Session::isAdmin())
{ {
$module_config = getModel('module')->getModuleConfig('file'); $module_config = ModuleModel::getModuleConfig('file');
$config->allowed_filesize = max($config->allowed_filesize, $module_config->allowed_filesize); $config->allowed_filesize = max($config->allowed_filesize, $module_config->allowed_filesize);
$config->allowed_attach_size = max($config->allowed_attach_size, $module_config->allowed_attach_size); $config->allowed_attach_size = max($config->allowed_attach_size, $module_config->allowed_attach_size);
$config->allowed_extensions = []; $config->allowed_extensions = [];

6
modules/file/file.view.php
View file

@ -35,14 +35,12 @@ class fileView extends file
} }
// Get file configurations of the module // Get file configurations of the module
$oFileModel = getModel('file'); $config = FileModel::getFileConfig($current_module_srl);
$config = $oFileModel->getFileConfig($current_module_srl);
Context::set('config', $config); Context::set('config', $config);
Context::set('is_ffmpeg', function_exists('exec') && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) && Rhymix\Framework\Storage::isExecutable($config->ffprobe_command)); Context::set('is_ffmpeg', function_exists('exec') && Rhymix\Framework\Storage::isExecutable($config->ffmpeg_command) && Rhymix\Framework\Storage::isExecutable($config->ffprobe_command));
// Get a permission for group setting // Get a permission for group setting
$oMemberModel = getModel('member'); $group_list = MemberModel::getGroups();
$group_list = $oMemberModel->getGroups();
Context::set('group_list', $group_list); Context::set('group_list', $group_list);
// Set a template file // Set a template file

284
modules/member/member.controller.php
View file

@ -48,8 +48,7 @@ class memberController extends member
$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false); $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
if (!$output->toBool()) return $output; if (!$output->toBool()) return $output;
$oModuleModel = getModel('module'); $config = ModuleModel::getModuleConfig('member');
$config = $oModuleModel->getModuleConfig('member');
$member_info = Context::get('logged_info'); $member_info = Context::get('logged_info');
// Check change_password_date // Check change_password_date
@ -102,8 +101,7 @@ class memberController extends member
$output = new BaseObject(); $output = new BaseObject();
$oModuleModel = getModel('module'); $config = ModuleModel::getModuleConfig('member');
$config = $oModuleModel->getModuleConfig('member');
if($config->after_logout_url) if($config->after_logout_url)
{ {
$output->redirect_url = $config->after_logout_url; $output->redirect_url = $config->after_logout_url;
@ -125,8 +123,7 @@ class memberController extends member
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl);
$oDocument = $oDocumentModel->getDocument($document_srl);
// Check document // Check document
if(!$oDocument->isAccessible()) if(!$oDocument->isAccessible())
@ -134,11 +131,10 @@ class memberController extends member
throw new Rhymix\Framework\Exception('msg_is_secret'); throw new Rhymix\Framework\Exception('msg_is_secret');
} }
$oModuleModel = getModel('module'); $module_info = ModuleModel::getModuleInfoByModuleSrl($oDocument->get('module_srl'));
$module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl'));
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$grant = $oModuleModel->getGrant($module_info, $logged_info); $grant = ModuleModel::getGrant($module_info, $logged_info);
// Check access to module of the document // Check access to module of the document
if(!$grant->access) if(!$grant->access)
@ -453,13 +449,12 @@ class memberController extends member
$document_srl = (int)Context::get('document_srl'); $document_srl = (int)Context::get('document_srl');
if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oDocumentModel = getModel('document'); $oDocument = DocumentModel::getDocument($document_srl);
$oDocument = $oDocumentModel->getDocument($document_srl);
if ($oDocument->get('member_srl') != $logged_info->member_srl) if ($oDocument->get('member_srl') != $logged_info->member_srl)
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$configStatusList = $oDocumentModel->getStatusList(); $configStatusList = DocumentModel::getStatusList();
if ($oDocument->get('status') != $configStatusList['temp']) if ($oDocument->get('status') != $configStatusList['temp'])
{ {
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
@ -527,8 +522,7 @@ class memberController extends member
$value = Context::get('value'); $value = Context::get('value');
if(!$value) return; if(!$value) return;
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// Check if logged-in // Check if logged-in
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
@ -537,33 +531,33 @@ class memberController extends member
{ {
case 'user_id' : case 'user_id' :
// Check denied ID // Check denied ID
if($oMemberModel->isDeniedID($value)) return new BaseObject(0,'denied_user_id'); if(MemberModel::isDeniedID($value)) return new BaseObject(0,'denied_user_id');
// Check if duplicated // Check if duplicated
$member_srl = $oMemberModel->getMemberSrlByUserID($value); $member_srl = MemberModel::getMemberSrlByUserID($value);
if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id'); if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_user_id');
break; break;
case 'nick_name' : case 'nick_name' :
// Check denied ID // Check denied ID
if($oMemberModel->isDeniedNickName($value)) if(MemberModel::isDeniedNickName($value))
{ {
return new BaseObject(0,'denied_nick_name'); return new BaseObject(0,'denied_nick_name');
} }
// Check if duplicated // Check if duplicated
if($config->allow_duplicate_nickname !== 'Y') if($config->allow_duplicate_nickname !== 'Y')
{ {
$member_srl = $oMemberModel->getMemberSrlByNickName($value); $member_srl = MemberModel::getMemberSrlByNickName($value);
if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name'); if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_nick_name');
} }
break; break;
case 'email_address' : case 'email_address' :
// Check managed Email Host // Check managed Email Host
if($oMemberModel->isDeniedEmailHost($value)) if(MemberModel::isDeniedEmailHost($value))
{ {
$emailhost_check = $config->emailhost_check; $emailhost_check = $config->emailhost_check;
$managed_email_host = lang('managed_email_host'); $managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts(); $email_hosts = MemberModel::getManagedEmailHosts();
foreach ($email_hosts as $host) foreach ($email_hosts as $host)
{ {
$hosts[] = $host->email_host; $hosts[] = $host->email_host;
@ -573,7 +567,7 @@ class memberController extends member
} }
// Check if duplicated // Check if duplicated
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value); $member_srl = MemberModel::getMemberSrlByEmailAddress($value);
if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address'); if($member_srl && $logged_info->member_srl != $member_srl ) return new BaseObject(0,'msg_exists_email_address');
break; break;
} }
@ -591,8 +585,7 @@ class memberController extends member
throw new Rhymix\Framework\Exceptions\SecurityViolation; throw new Rhymix\Framework\Exceptions\SecurityViolation;
} }
$oMemberModel = &getModel ('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// call a trigger (before) // call a trigger (before)
$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config); $trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
@ -698,7 +691,7 @@ class memberController extends member
if($args->password1) $args->password = $args->password1; if($args->password1) $args->password = $args->password1;
// check password strength // check password strength
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength))
{ {
$message = lang('about_password_strength'); $message = lang('about_password_strength');
throw new Rhymix\Framework\Exception($message[$config->password_strength]); throw new Rhymix\Framework\Exception($message[$config->password_strength]);
@ -792,7 +785,7 @@ class memberController extends member
if($site_module_info->site_srl > 0) if($site_module_info->site_srl > 0)
{ {
$columnList = array('site_srl', 'group_srl'); $columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList); $default_group = MemberModel::getDefaultGroup($site_module_info->site_srl, $columnList);
if($default_group->group_srl) if($default_group->group_srl)
{ {
$this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl); $this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
@ -866,16 +859,14 @@ class memberController extends member
throw new Rhymix\Framework\Exceptions\InvalidRequest; throw new Rhymix\Framework\Exceptions\InvalidRequest;
} }
$oMemberModel = getModel('member');
// Get information of logged-in user // Get information of logged-in user
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$columnList = array('member_srl', 'password'); $columnList = array('member_srl', 'password');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Verify the current password // Verify the current password
if(!$oMemberModel->isValidPassword($member_info->password, $password)) if(!MemberModel::isValidPassword($member_info->password, $password))
{ {
throw new Rhymix\Framework\Exception('invalid_password'); throw new Rhymix\Framework\Exception('invalid_password');
} }
@ -912,8 +903,7 @@ class memberController extends member
unset($_SESSION['rechecked_password_step']); unset($_SESSION['rechecked_password_step']);
// Get current module config and user info // Get current module config and user info
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Check phone number // Check phone number
@ -1065,7 +1055,7 @@ class memberController extends member
$this->putSignature($args->member_srl, $signature); $this->putSignature($args->member_srl, $signature);
// Get user_id information // Get user_id information
$member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); $member_info = MemberModel::getMemberInfoByMemberSrl($args->member_srl);
// Call a trigger after successfully modified (after) // Call a trigger after successfully modified (after)
ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $member_info); ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $member_info);
@ -1096,14 +1086,12 @@ class memberController extends member
// Get information of logged-in user // Get information of logged-in user
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
// Create a member model object
$oMemberModel = getModel('member');
// Get information of member_srl // Get information of member_srl
$columnList = array('member_srl', 'password'); $columnList = array('member_srl', 'password');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Verify the cuttent password // Verify the cuttent password
if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) throw new Rhymix\Framework\Exception('invalid_password'); if(!MemberModel::isValidPassword($member_info->password, $current_password, $member_srl)) throw new Rhymix\Framework\Exception('invalid_password');
// Check if a new password is as same as the previous password // Check if a new password is as same as the previous password
if($current_password == $password) throw new Rhymix\Framework\Exception('invalid_new_password'); if($current_password == $password) throw new Rhymix\Framework\Exception('invalid_new_password');
@ -1116,8 +1104,7 @@ class memberController extends member
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// Log out all other sessions. // Log out all other sessions.
$oModuleModel = getModel('module'); $member_config = ModuleModel::getModuleConfig('member');
$member_config = $oModuleModel->getModuleConfig('member');
if ($member_config->password_change_invalidate_other_sessions === 'Y') if ($member_config->password_change_invalidate_other_sessions === 'Y')
{ {
Rhymix\Framework\Session::destroyOtherSessions($member_srl); Rhymix\Framework\Session::destroyOtherSessions($member_srl);
@ -1143,13 +1130,11 @@ class memberController extends member
// Get information of logged-in user // Get information of logged-in user
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
// Create a member model object
$oMemberModel = getModel('member');
// Get information of member_srl // Get information of member_srl
$columnList = array('member_srl', 'password'); $columnList = array('member_srl', 'password');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Verify the cuttent password // Verify the cuttent password
if(!$oMemberModel->isValidPassword($member_info->password, $password)) throw new Rhymix\Framework\Exception('invalid_password'); if(!MemberModel::isValidPassword($member_info->password, $password)) throw new Rhymix\Framework\Exception('invalid_password');
$output = $this->deleteMember($member_srl); $output = $this->deleteMember($member_srl);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
@ -1180,8 +1165,7 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_profile_image'); if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_profile_image');
// Return if member module is set not to use an image name or the user is not an administrator ; // Return if member module is set not to use an image name or the user is not an administrator ;
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_profile_image'); if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_profile_image');
$output = $this->insertProfileImage($member_srl, $file['tmp_name']); $output = $this->insertProfileImage($member_srl, $file['tmp_name']);
@ -1201,8 +1185,7 @@ class memberController extends member
*/ */
function insertProfileImage($member_srl, $target_file) function insertProfileImage($member_srl, $target_file)
{ {
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// Get an image size // Get an image size
$max_width = $config->profile_image_max_width; $max_width = $config->profile_image_max_width;
@ -1285,8 +1268,7 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_image_name'); if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_image_name');
// Return if member module is set not to use an image name or the user is not an administrator ; // Return if member module is set not to use an image name or the user is not an administrator ;
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_image_name'); if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_image_name');
$output = $this->insertImageName($member_srl, $file['tmp_name']); $output = $this->insertImageName($member_srl, $file['tmp_name']);
@ -1309,8 +1291,7 @@ class memberController extends member
*/ */
function insertImageName($member_srl, $target_file) function insertImageName($member_srl, $target_file)
{ {
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// Get an image size // Get an image size
$max_width = $config->image_name_max_width; $max_width = $config->image_name_max_width;
@ -1385,8 +1366,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl)) if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{ {
$oMemberModel = getModel('member'); $profile_image = MemberModel::getProfileImage($member_srl);
$profile_image = $oMemberModel->getProfileImage($member_srl);
FileHandler::removeFile($profile_image->file); FileHandler::removeFile($profile_image->file);
Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($profile_image->file)), true); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($profile_image->file)), true);
$this->_clearMemberCache($member_srl); $this->_clearMemberCache($member_srl);
@ -1411,8 +1391,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl)) if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{ {
$oMemberModel = getModel('member'); $image_name = MemberModel::getImageName($member_srl);
$image_name = $oMemberModel->getImageName($member_srl);
FileHandler::removeFile($image_name->file); FileHandler::removeFile($image_name->file);
Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_name->file)), true); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_name->file)), true);
} }
@ -1436,8 +1415,7 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_image_mark'); if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) throw new Rhymix\Framework\Exception('msg_not_uploaded_image_mark');
// Membership in the images mark the module using the ban was set by an administrator or return; // Membership in the images mark the module using the ban was set by an administrator or return;
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_image_mark'); if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') throw new Rhymix\Framework\Exception('msg_not_uploaded_image_mark');
$this->insertImageMark($member_srl, $file['tmp_name']); $this->insertImageMark($member_srl, $file['tmp_name']);
@ -1457,8 +1435,7 @@ class memberController extends member
*/ */
function insertImageMark($member_srl, $target_file) function insertImageMark($member_srl, $target_file)
{ {
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// Get an image size // Get an image size
$max_width = $config->image_mark_max_width; $max_width = $config->image_mark_max_width;
@ -1532,8 +1509,7 @@ class memberController extends member
if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl)) if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
{ {
$oMemberModel = getModel('member'); $image_mark = MemberModel::getImageMark($member_srl);
$image_mark = $oMemberModel->getImageMark($member_srl);
FileHandler::removeFile($image_mark->file); FileHandler::removeFile($image_mark->file);
Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_mark->file)), true); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($image_mark->file)), true);
} }
@ -1550,16 +1526,13 @@ class memberController extends member
$email_address = Context::get('email_address'); $email_address = Context::get('email_address');
if(!$email_address) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$email_address) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oMemberModel = getModel('member');
$oModuleModel = getModel('module');
// Check if a member having the same email address exists // Check if a member having the same email address exists
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); $member_srl = MemberModel::getMemberSrlByEmailAddress($email_address);
if(!$member_srl) throw new Rhymix\Framework\Exception('msg_email_not_exists'); if(!$member_srl) throw new Rhymix\Framework\Exception('msg_email_not_exists');
// Get information of the member // Get information of the member
$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name'); $columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
// Check if possible to find member's ID and password // Check if possible to find member's ID and password
if($member_info->denied == 'Y') if($member_info->denied == 'Y')
@ -1583,7 +1556,7 @@ class memberController extends member
// Get content of the email to send a member // Get content of the email to send a member
Context::set('auth_args', $args); Context::set('auth_args', $args);
$member_config = $oModuleModel->getModuleConfig('member'); $member_config = ModuleModel::getModuleConfig('member');
$memberInfo = array(); $memberInfo = array();
global $lang; global $lang;
if(is_array($member_config->signupForm)) if(is_array($member_config->signupForm))
@ -1621,8 +1594,7 @@ class memberController extends member
$content = $oTemplate->compile($tpl_path, 'find_member_account_mail'); $content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
// Get information of the Webmaster // Get information of the Webmaster
$oModuleModel = getModel('module'); $member_config = ModuleModel::getModuleConfig('member');
$member_config = $oModuleModel->getModuleConfig('member');
// Send a mail // Send a mail
$oMail = new \Rhymix\Framework\Mail(); $oMail = new \Rhymix\Framework\Mail();
@ -1659,8 +1631,7 @@ class memberController extends member
*/ */
function procMemberAuthAccount() function procMemberAuthAccount()
{ {
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
// Test user_id and authkey // Test user_id and authkey
$member_srl = Context::get('member_srl'); $member_srl = Context::get('member_srl');
@ -1710,7 +1681,7 @@ class memberController extends member
} }
else else
{ {
$args->password = $oMemberModel->hashPassword($output->data->new_password); $args->password = MemberModel::hashPassword($output->data->new_password);
} }
$output = executeQuery('member.updateMemberPassword', $args); $output = executeQuery('member.updateMemberPassword', $args);
@ -1746,18 +1717,16 @@ class memberController extends member
$email_address = Context::get('email_address'); $email_address = Context::get('email_address');
if(!$email_address) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$email_address) throw new Rhymix\Framework\Exceptions\InvalidRequest;
// Log test by using email_address // Log test by using email_address
$oMemberModel = getModel('member');
$args = new stdClass; $args = new stdClass;
$args->email_address = $email_address; $args->email_address = $email_address;
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); $member_srl = MemberModel::getMemberSrlByEmailAddress($email_address);
if(!$member_srl) if(!$member_srl)
{ {
throw new Rhymix\Framework\Exception('msg_not_exists_member'); throw new Rhymix\Framework\Exception('msg_not_exists_member');
} }
$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address'); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
if(!$member_info || !$member_info->member_srl) if(!$member_info || !$member_info->member_srl)
{ {
throw new Rhymix\Framework\Exception('msg_not_exists_member'); throw new Rhymix\Framework\Exception('msg_not_exists_member');
@ -1767,8 +1736,7 @@ class memberController extends member
throw new Rhymix\Framework\Exception('msg_activation_not_needed'); throw new Rhymix\Framework\Exception('msg_activation_not_needed');
} }
$oModuleModel = getModel('module'); $member_config = ModuleModel::getModuleConfig('member');
$member_config = $oModuleModel->getModuleConfig('member');
if(!$member_config->skin) $member_config->skin = "default"; if(!$member_config->skin) $member_config->skin = "default";
if(!$member_config->colorset) $member_config->colorset = "white"; if(!$member_config->colorset) $member_config->colorset = "white";
@ -1847,8 +1815,7 @@ class memberController extends member
function _sendAuthMail($auth_args, $member_info) function _sendAuthMail($auth_args, $member_info)
{ {
$oMemberModel = getModel('member'); $member_config = MemberModel::getMemberConfig();
$member_config = $oMemberModel->getMemberConfig();
// Get content of the email to send a member // Get content of the email to send a member
Context::set('auth_args', $auth_args); Context::set('auth_args', $auth_args);
@ -1908,9 +1875,8 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oMemberModel = getModel('member');
$columnList = array('site_srl', 'group_srl', 'title'); $columnList = array('site_srl', 'group_srl', 'title');
$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList); $default_group = MemberModel::getDefaultGroup($site_module_info->site_srl, $columnList);
$this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl); $this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
$groups[$default_group->group_srl] = $default_group->title; $groups[$default_group->group_srl] = $default_group->title;
$logged_info->group_list = $groups; $logged_info->group_list = $groups;
@ -1989,7 +1955,7 @@ class memberController extends member
// Editor converter // Editor converter
$obj = new stdClass; $obj = new stdClass;
$config = getModel('member')->getMemberConfig(); $config = MemberModel::getMemberConfig();
if($config->signature_html == 'N') if($config->signature_html == 'N')
{ {
$obj->converter = 'text'; $obj->converter = 'text';
@ -2168,18 +2134,16 @@ class memberController extends member
$trigger_obj->password = $password; $trigger_obj->password = $password;
$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj); $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
if(!$trigger_output->toBool()) return $trigger_output; if(!$trigger_output->toBool()) return $trigger_output;
// Create a member model object
$oMemberModel = getModel('member');
// check IP access count. // check IP access count.
$config = $oMemberModel->getMemberConfig(); $config = MemberModel::getMemberConfig();
$args = new stdClass(); $args = new stdClass();
$args->ipaddress = $_SERVER['REMOTE_ADDR']; $args->ipaddress = $_SERVER['REMOTE_ADDR'];
// check identifier // check identifier
if((!$config->identifiers || in_array('email_address', $config->identifiers)) && strpos($user_id, '@') !== false) if((!$config->identifiers || in_array('email_address', $config->identifiers)) && strpos($user_id, '@') !== false)
{ {
$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id); $member_info = MemberModel::getMemberInfoByEmailAddress($user_id);
if(!$user_id || strtolower($member_info->email_address) !== strtolower($user_id)) if(!$user_id || strtolower($member_info->email_address) !== strtolower($user_id))
{ {
return $this->recordLoginError(-1, 'invalid_email_address'); return $this->recordLoginError(-1, 'invalid_email_address');
@ -2212,7 +2176,7 @@ class memberController extends member
} }
$user_id = preg_replace('/[^0-9]/', '', $user_id); $user_id = preg_replace('/[^0-9]/', '', $user_id);
$member_info = $oMemberModel->getMemberInfoByPhoneNumber($user_id, $phone_country); $member_info = MemberModel::getMemberInfoByPhoneNumber($user_id, $phone_country);
if(!$user_id || strtolower($member_info->phone_number) !== $user_id) if(!$user_id || strtolower($member_info->phone_number) !== $user_id)
{ {
return $this->recordLoginError(-1, 'invalid_user_id'); return $this->recordLoginError(-1, 'invalid_user_id');
@ -2220,7 +2184,7 @@ class memberController extends member
} }
elseif(!$config->identifiers || in_array('user_id', $config->identifiers)) elseif(!$config->identifiers || in_array('user_id', $config->identifiers))
{ {
$member_info = $oMemberModel->getMemberInfoByUserID($user_id); $member_info = MemberModel::getMemberInfoByUserID($user_id);
if(!$user_id || strtolower($member_info->user_id) !== strtolower($user_id)) if(!$user_id || strtolower($member_info->user_id) !== strtolower($user_id))
{ {
return $this->recordLoginError(-1, 'invalid_user_id'); return $this->recordLoginError(-1, 'invalid_user_id');
@ -2255,7 +2219,7 @@ class memberController extends member
} }
// Password Check // Password Check
if($password && !$oMemberModel->isValidPassword($member_info->password, $password, $member_info->member_srl)) if($password && !MemberModel::isValidPassword($member_info->password, $password, $member_info->member_srl))
{ {
return $this->recordMemberLoginError(-1, 'invalid_password', $member_info); return $this->recordMemberLoginError(-1, 'invalid_password', $member_info);
} }
@ -2378,7 +2342,7 @@ class memberController extends member
Context::set('logged_info', $member_info); Context::set('logged_info', $member_info);
// Only the menu configuration of the user (such as an add-on to the menu can be changed) // Only the menu configuration of the user (such as an add-on to the menu can be changed)
$config = getModel('member')->getMemberConfig(); $config = MemberModel::getMemberConfig();
$this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info'); $this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
if ($config->features['scrapped_documents'] !== false) if ($config->features['scrapped_documents'] !== false)
{ {
@ -2451,8 +2415,7 @@ class memberController extends member
$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args); $output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// Terms and Conditions portion of the information set up by members reaffirmed // Terms and Conditions portion of the information set up by members reaffirmed
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// limit_date format is YYYYMMDD // limit_date format is YYYYMMDD
@ -2507,7 +2470,7 @@ class memberController extends member
if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog; if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
$extend_form_list = $oMemberModel->getJoinFormlist(); $extend_form_list = MemberModel::getJoinFormlist();
$security = new Security($extend_form_list); $security = new Security($extend_form_list);
$security->encodeHTML('..column_title', '..description', '..default_value.'); $security->encodeHTML('..column_title', '..description', '..default_value.');
if($config->signupForm) { if($config->signupForm) {
@ -2549,35 +2512,32 @@ class memberController extends member
} }
} }
// Create a model object
$oMemberModel = getModel('member');
// Check password strength // Check password strength
if($args->password && !$password_is_hashed) if($args->password && !$password_is_hashed)
{ {
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength))
{ {
$message = lang('about_password_strength'); $message = lang('about_password_strength');
return new BaseObject(-1, $message[$config->password_strength]); return new BaseObject(-1, $message[$config->password_strength]);
} }
$args->password = $oMemberModel->hashPassword($args->password); $args->password = MemberModel::hashPassword($args->password);
} }
// Check if ID is prohibited // Check if ID is prohibited
if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedID($args->user_id)) if($logged_info->is_admin !== 'Y' && MemberModel::isDeniedID($args->user_id))
{ {
return new BaseObject(-1, 'denied_user_id'); return new BaseObject(-1, 'denied_user_id');
} }
// Check if ID is duplicate // Check if ID is duplicate
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); $member_srl = MemberModel::getMemberSrlByUserID($args->user_id);
if($member_srl) if($member_srl)
{ {
return new BaseObject(-1, 'msg_exists_user_id'); return new BaseObject(-1, 'msg_exists_user_id');
} }
// Check if nickname is prohibited // Check if nickname is prohibited
if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedNickName($args->nick_name)) if($logged_info->is_admin !== 'Y' && MemberModel::isDeniedNickName($args->nick_name))
{ {
return new BaseObject(-1, 'denied_nick_name'); return new BaseObject(-1, 'denied_nick_name');
} }
@ -2585,7 +2545,7 @@ class memberController extends member
// Check if nickname is duplicate // Check if nickname is duplicate
if($config->allow_duplicate_nickname !== 'Y') if($config->allow_duplicate_nickname !== 'Y')
{ {
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); $member_srl = MemberModel::getMemberSrlByNickName($args->nick_name);
if($member_srl) if($member_srl)
{ {
return new BaseObject(-1, 'msg_exists_nick_name'); return new BaseObject(-1, 'msg_exists_nick_name');
@ -2593,12 +2553,12 @@ class memberController extends member
} }
// Check managed Email Host // Check managed Email Host
if($logged_info->is_admin !== 'Y' && $oMemberModel->isDeniedEmailHost($args->email_address)) if($logged_info->is_admin !== 'Y' && MemberModel::isDeniedEmailHost($args->email_address))
{ {
$emailhost_check = $config->emailhost_check; $emailhost_check = $config->emailhost_check;
$managed_email_host = lang('managed_email_host'); $managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts(); $email_hosts = MemberModel::getManagedEmailHosts();
foreach ($email_hosts as $host) foreach ($email_hosts as $host)
{ {
$hosts[] = $host->email_host; $hosts[] = $host->email_host;
@ -2634,7 +2594,7 @@ class memberController extends member
} }
// Check if email address is duplicate // Check if email address is duplicate
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); $member_srl = MemberModel::getMemberSrlByEmailAddress($args->email_address);
if($member_srl) if($member_srl)
{ {
return new BaseObject(-1, 'msg_exists_email_address'); return new BaseObject(-1, 'msg_exists_email_address');
@ -2643,7 +2603,7 @@ class memberController extends member
// Check if phone number is duplicate // Check if phone number is duplicate
if ($config->phone_number_allow_duplicate !== 'Y' && $args->phone_number) if ($config->phone_number_allow_duplicate !== 'Y' && $args->phone_number)
{ {
$member_srl = $oMemberModel->getMemberSrlByPhoneNumber($args->phone_number, $args->phone_country); $member_srl = MemberModel::getMemberSrlByPhoneNumber($args->phone_number, $args->phone_country);
if($member_srl) if($member_srl)
{ {
return new BaseObject(-1, 'msg_exists_phone_number'); return new BaseObject(-1, 'msg_exists_phone_number');
@ -2672,7 +2632,7 @@ class memberController extends member
if(!$args->group_srl_list) if(!$args->group_srl_list)
{ {
$columnList = array('site_srl', 'group_srl'); $columnList = array('site_srl', 'group_srl');
$default_group = $oMemberModel->getDefaultGroup(0, $columnList); $default_group = MemberModel::getDefaultGroup(0, $columnList);
if($default_group) if($default_group)
{ {
// Add to the default group // Add to the default group
@ -2738,13 +2698,12 @@ class memberController extends member
$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args); $output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// Create a model object // Create a model object
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Get what you want to modify the original information // Get what you want to modify the original information
$orgMemberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl); $orgMemberInfo = MemberModel::getMemberInfoByMemberSrl($args->member_srl);
// Control of essential parameters // Control of essential parameters
if($args->allow_mailing!='Y') $args->allow_mailing = 'N'; if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
@ -2791,7 +2750,7 @@ class memberController extends member
} }
} }
$extend_form_list = $oMemberModel->getJoinFormlist(); $extend_form_list = MemberModel::getJoinFormlist();
$security = new Security($extend_form_list); $security = new Security($extend_form_list);
$security->encodeHTML('..column_title', '..description', '..default_value.'); $security->encodeHTML('..column_title', '..description', '..default_value.');
if($config->signupForm){ if($config->signupForm){
@ -2860,12 +2819,12 @@ class memberController extends member
} }
// Check managed Email Host // Check managed Email Host
if($logged_info->is_admin !== 'Y' && $logged_info->email_address !== $args->email_address && $oMemberModel->isDeniedEmailHost($args->email_address)) if($logged_info->is_admin !== 'Y' && $logged_info->email_address !== $args->email_address && MemberModel::isDeniedEmailHost($args->email_address))
{ {
$emailhost_check = $config->emailhost_check; $emailhost_check = $config->emailhost_check;
$managed_email_host = lang('managed_email_host'); $managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts(); $email_hosts = MemberModel::getManagedEmailHosts();
foreach ($email_hosts as $host) foreach ($email_hosts as $host)
{ {
$hosts[] = $host->email_host; $hosts[] = $host->email_host;
@ -2877,7 +2836,7 @@ class memberController extends member
// Check if email address or user ID is duplicate // Check if email address or user ID is duplicate
if($config->identifier == 'email_address') if($config->identifier == 'email_address')
{ {
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); $member_srl = MemberModel::getMemberSrlByEmailAddress($args->email_address);
if($member_srl && $args->member_srl != $member_srl) if($member_srl && $args->member_srl != $member_srl)
{ {
return new BaseObject(-1, 'msg_exists_email_address'); return new BaseObject(-1, 'msg_exists_email_address');
@ -2886,7 +2845,7 @@ class memberController extends member
} }
else else
{ {
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); $member_srl = MemberModel::getMemberSrlByUserID($args->user_id);
if($member_srl && $args->member_srl != $member_srl) if($member_srl && $args->member_srl != $member_srl)
{ {
return new BaseObject(-1, 'msg_exists_user_id'); return new BaseObject(-1, 'msg_exists_user_id');
@ -2898,7 +2857,7 @@ class memberController extends member
// Check if phone number is duplicate // Check if phone number is duplicate
if ($config->phone_number_allow_duplicate !== 'Y' && $args->phone_number) if ($config->phone_number_allow_duplicate !== 'Y' && $args->phone_number)
{ {
$member_srl = $oMemberModel->getMemberSrlByPhoneNumber($args->phone_number, $args->phone_country); $member_srl = MemberModel::getMemberSrlByPhoneNumber($args->phone_number, $args->phone_country);
if ($member_srl && $args->member_srl != $member_srl) if ($member_srl && $args->member_srl != $member_srl)
{ {
return new BaseObject(-1, 'msg_exists_phone_number'); return new BaseObject(-1, 'msg_exists_phone_number');
@ -2906,7 +2865,7 @@ class memberController extends member
} }
// Check if ID is prohibited // Check if ID is prohibited
if($logged_info->is_admin !== 'Y' && $args->user_id && $oMemberModel->isDeniedID($args->user_id)) if($logged_info->is_admin !== 'Y' && $args->user_id && MemberModel::isDeniedID($args->user_id))
{ {
return new BaseObject(-1, 'denied_user_id'); return new BaseObject(-1, 'denied_user_id');
} }
@ -2914,7 +2873,7 @@ class memberController extends member
// Check if ID is duplicate // Check if ID is duplicate
if($args->user_id) if($args->user_id)
{ {
$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); $member_srl = MemberModel::getMemberSrlByUserID($args->user_id);
if($member_srl && $args->member_srl != $member_srl) if($member_srl && $args->member_srl != $member_srl)
{ {
return new BaseObject(-1, 'msg_exists_user_id'); return new BaseObject(-1, 'msg_exists_user_id');
@ -2922,7 +2881,7 @@ class memberController extends member
} }
// Check if nickname is prohibited // Check if nickname is prohibited
if($logged_info->is_admin !== 'Y' && $args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name)) if($logged_info->is_admin !== 'Y' && $args->nick_name && MemberModel::isDeniedNickName($args->nick_name))
{ {
return new BaseObject(-1, 'denied_nick_name'); return new BaseObject(-1, 'denied_nick_name');
} }
@ -2930,7 +2889,7 @@ class memberController extends member
// Check if nickname is duplicate // Check if nickname is duplicate
if($config->allow_duplicate_nickname !== 'Y') if($config->allow_duplicate_nickname !== 'Y')
{ {
$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); $member_srl = MemberModel::getMemberSrlByNickName($args->nick_name);
if($member_srl && $args->member_srl != $member_srl) if($member_srl && $args->member_srl != $member_srl)
{ {
return new BaseObject(-1, 'msg_exists_nick_name'); return new BaseObject(-1, 'msg_exists_nick_name');
@ -2945,12 +2904,12 @@ class memberController extends member
// Check password strength // Check password strength
if($args->password) if($args->password)
{ {
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength))
{ {
$message = lang('about_password_strength'); $message = lang('about_password_strength');
return new BaseObject(-1, $message[$config->password_strength]); return new BaseObject(-1, $message[$config->password_strength]);
} }
$args->password = $oMemberModel->hashPassword($args->password); $args->password = MemberModel::hashPassword($args->password);
} }
else else
{ {
@ -3069,16 +3028,15 @@ class memberController extends member
if($args->password) if($args->password)
{ {
// check password strength // check password strength
$oMemberModel = getModel('member'); $config = MemberModel::getMemberConfig();
$config = $oMemberModel->getMemberConfig();
if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength))
{ {
$message = lang('about_password_strength'); $message = lang('about_password_strength');
return new BaseObject(-1, $message[$config->password_strength]); return new BaseObject(-1, $message[$config->password_strength]);
} }
$args->password = $oMemberModel->hashPassword($args->password); $args->password = MemberModel::hashPassword($args->password);
} }
else if($args->hashed_password) else if($args->hashed_password)
{ {
@ -3107,11 +3065,9 @@ class memberController extends member
$trigger_obj->member_srl = $member_srl; $trigger_obj->member_srl = $member_srl;
$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj); $output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// Create a model object
$oMemberModel = getModel('member');
// Bringing the user's information // Bringing the user's information
$columnList = array('member_srl', 'is_admin'); $columnList = array('member_srl', 'is_admin');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
if(!$member_info) return new BaseObject(-1, 'msg_not_exists_member'); if(!$member_info) return new BaseObject(-1, 'msg_not_exists_member');
// If managers can not be deleted // If managers can not be deleted
if($member_info->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin'); if($member_info->is_admin == 'Y') return new BaseObject(-1, 'msg_cannot_delete_admin');
@ -3196,8 +3152,7 @@ class memberController extends member
function _updatePointByGroup($memberSrl, $groupSrlList) function _updatePointByGroup($memberSrl, $groupSrlList)
{ {
$oModuleModel = getModel('module'); $pointModuleConfig = ModuleModel::getModuleConfig('point');
$pointModuleConfig = $oModuleModel->getModuleConfig('point');
$pointGroup = $pointModuleConfig->point_group; $pointGroup = $pointModuleConfig->point_group;
$levelGroup = array(); $levelGroup = array();
@ -3213,8 +3168,7 @@ class memberController extends member
if($maxLevel > 0) if($maxLevel > 0)
{ {
$oPointModel = getModel('point'); $originPoint = PointModel::getPoint($memberSrl);
$originPoint = $oPointModel->getPoint($memberSrl);
if($pointModuleConfig->level_step[$maxLevel] > $originPoint) if($pointModuleConfig->level_step[$maxLevel] > $originPoint)
{ {
@ -3233,15 +3187,14 @@ class memberController extends member
if(!$newEmail) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!$newEmail) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oMemberModel = getModel('member');
// Check managed Email Host // Check managed Email Host
if($oMemberModel->isDeniedEmailHost($newEmail)) if(MemberModel::isDeniedEmailHost($newEmail))
{ {
$config = $oMemberModel->getMemberConfig(); $config = MemberModel::getMemberConfig();
$emailhost_check = $config->emailhost_check; $emailhost_check = $config->emailhost_check;
$managed_email_host = lang('managed_email_host'); $managed_email_host = lang('managed_email_host');
$email_hosts = $oMemberModel->getManagedEmailHosts(); $email_hosts = MemberModel::getManagedEmailHosts();
foreach ($email_hosts as $host) foreach ($email_hosts as $host)
{ {
$hosts[] = $host->email_host; $hosts[] = $host->email_host;
@ -3251,7 +3204,7 @@ class memberController extends member
} }
// Check if the e-mail address is already registered // Check if the e-mail address is already registered
$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail); $member_srl = MemberModel::getMemberSrlByEmailAddress($newEmail);
if($member_srl) throw new Rhymix\Framework\Exception('msg_exists_email_address'); if($member_srl) throw new Rhymix\Framework\Exception('msg_exists_email_address');
if($_SESSION['rechecked_password_step'] != 'INPUT_DATA') if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
@ -3275,8 +3228,7 @@ class memberController extends member
return $output; return $output;
} }
$oModuleModel = getModel('module'); $member_config = ModuleModel::getModuleConfig('member');
$member_config = $oModuleModel->getModuleConfig('member');
$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin); $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default'); if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
@ -3351,7 +3303,7 @@ class memberController extends member
function procMemberSendVerificationSMS() function procMemberSendVerificationSMS()
{ {
$config = getModel('member')->getMemberConfig(); $config = MemberModel::getMemberConfig();
if ($config->phone_number_verify_by_sms !== 'Y') if ($config->phone_number_verify_by_sms !== 'Y')
{ {
throw new Rhymix\Framework\Exceptions\FeatureDisabled; throw new Rhymix\Framework\Exceptions\FeatureDisabled;
@ -3411,7 +3363,7 @@ class memberController extends member
function procMemberConfirmVerificationSMS() function procMemberConfirmVerificationSMS()
{ {
$config = getModel('member')->getMemberConfig(); $config = MemberModel::getMemberConfig();
if ($config->phone_number_verify_by_sms !== 'Y') if ($config->phone_number_verify_by_sms !== 'Y')
{ {
throw new Rhymix\Framework\Exceptions\FeatureDisabled; throw new Rhymix\Framework\Exceptions\FeatureDisabled;
@ -3447,14 +3399,13 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$document_srl = Context::get('target_srl'); $document_srl = Context::get('target_srl');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress'); $columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); $oDocument = DocumentModel::getDocument($document_srl, false, false, $columnList);
$member_srl = $oDocument->get('member_srl'); $member_srl = $oDocument->get('member_srl');
$module_srl = $oDocument->get('module_srl'); $module_srl = $oDocument->get('module_srl');
if(!$member_srl) return; if(!$member_srl || $member_srl == $logged_info->member_srl) return;
if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return; if(!ModuleModel::getGrant(ModuleModel::getModuleInfoByModuleSrl($module_srl), $logged_info)->manager) return;
$oDocumentController = getController('document'); $oDocumentController = getController('document');
$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@ -3475,14 +3426,13 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$comment_srl = Context::get('target_srl'); $comment_srl = Context::get('target_srl');
$oCommentModel = getModel('comment');
$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress'); $columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
$oComment = $oCommentModel->getComment($comment_srl, FALSE, $columnList); $oComment = CommentModel::getComment($comment_srl, FALSE, $columnList);
$module_srl = $oComment->get('module_srl'); $module_srl = $oComment->get('module_srl');
$member_srl = $oComment->get('member_srl'); $member_srl = $oComment->get('member_srl');
if(!$member_srl) return; if(!$member_srl || $member_srl == $logged_info->member_srl) return;
if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return; if(!ModuleModel::getGrant(ModuleModel::getModuleInfoByModuleSrl($module_srl), $logged_info)->manager) return;
$oCommentController = getController('comment'); $oCommentController = getController('comment');
$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
@ -3508,18 +3458,14 @@ class memberController extends member
$isMoveToTrash = false; $isMoveToTrash = false;
// check grant // check grant
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, $logged_info); $grant = ModuleModel::getGrant($module_info, $logged_info);
if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted;
$proc_msg = ""; $proc_msg = "";
$oDocumentModel = getModel('document');
$oCommentModel = getModel('comment');
// delete or trash destination // delete or trash destination
// proc member // proc member
if($cnt_loop == 1) if($cnt_loop == 1)
@ -3529,8 +3475,8 @@ class memberController extends member
$this->_spammerDocuments($member_srl, $isMoveToTrash); $this->_spammerDocuments($member_srl, $isMoveToTrash);
// get destination count // get destination count
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl);
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl);
$total_count = Context::get('total_count'); $total_count = Context::get('total_count');
$remain_count = $cnt_document + $cnt_comment; $remain_count = $cnt_document + $cnt_comment;
@ -3564,15 +3510,12 @@ class memberController extends member
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$spam_description = trim( Context::get('spam_description') ); $spam_description = trim( Context::get('spam_description') );
$oMemberModel = getModel('member');
$columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description'); $columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description');
// get member current infomation // get member current infomation
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
$oDocumentModel = getModel('document'); $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl);
$oCommentModel = getModel('comment'); $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl);
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
$total_count = $cnt_comment + $cnt_document; $total_count = $cnt_comment + $cnt_document;
$args = new stdClass(); $args = new stdClass();
@ -3601,22 +3544,21 @@ class memberController extends member
* *
* @return object * @return object
**/ **/
private function _spammerDocuments($member_srl, $isMoveToTrash) { private function _spammerDocuments($member_srl, $isMoveToTrash)
{
$oDocumentController = getController('document'); $oDocumentController = getController('document');
$oDocumentModel = getModel('document');
$oCommentController = getController('comment'); $oCommentController = getController('comment');
$oCommentModel = getModel('comment');
// delete count by one request // delete count by one request
$getContentsCount = 10; $getContentsCount = 10;
// 1. proc comment, 2. proc document // 1. proc comment, 2. proc document
$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl);
$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl);
if($cnt_comment > 0) if($cnt_comment > 0)
{ {
$columnList = array(); $columnList = array();
$commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); $commentList = CommentModel::getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
if($commentList) { if($commentList) {
foreach($commentList as $v) { foreach($commentList as $v) {
$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash); $oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
@ -3624,7 +3566,7 @@ class memberController extends member
} }
} elseif($cnt_document > 0) { } elseif($cnt_document > 0) {
$columnList = array(); $columnList = array();
$documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); $documentList = DocumentModel::getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
if($documentList) { if($documentList) {
foreach($documentList as $v) { foreach($documentList as $v) {
if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v); if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);

19
modules/member/member.model.php
View file

@ -34,8 +34,7 @@ class memberModel extends member
} }
// Get member configuration stored in the DB // Get member configuration stored in the DB
$oModuleModel = getModel('module'); $config = ModuleModel::getModuleConfig('member');
$config = $oModuleModel->getModuleConfig('member');
if(!$config->signupForm || !is_array($config->signupForm)) if(!$config->signupForm || !is_array($config->signupForm))
{ {
@ -131,7 +130,7 @@ class memberModel extends member
/** /**
* @brief Display menus of the member * @brief Display menus of the member
*/ */
public static function getMemberMenu() public function getMemberMenu()
{ {
// Get member_srl of he target member and logged info of the current user // Get member_srl of he target member and logged info of the current user
$member_srl = Context::get('target_srl'); $member_srl = Context::get('target_srl');
@ -154,7 +153,7 @@ class memberModel extends member
ModuleHandler::triggerCall('member.getMemberMenu', 'before', $member_info); ModuleHandler::triggerCall('member.getMemberMenu', 'before', $member_info);
$oMemberController = getController('member'); $oMemberController = MemberController::getInstance();
// Display member information (Don't display to non-logged user) // Display member information (Don't display to non-logged user)
if($logged_info->member_srl) if($logged_info->member_srl)
{ {
@ -178,7 +177,7 @@ class memberModel extends member
// Send an email only if email address is public // Send an email only if email address is public
if($email_config->isPublic == 'Y' && $member_info->email_address) if($email_config->isPublic == 'Y' && $member_info->email_address)
{ {
$oCommunicationModel = getModel('communication'); $oCommunicationModel = CommunicationModel::getInstance();
if($logged_info->is_admin == 'Y' || $oCommunicationModel->isFriend($member_info->member_srl)) if($logged_info->is_admin == 'Y' || $oCommunicationModel->isFriend($member_info->member_srl))
{ {
$url = 'mailto:'.escape($member_info->email_address); $url = 'mailto:'.escape($member_info->email_address);
@ -549,7 +548,7 @@ class memberModel extends member
if (!count($group_list)) if (!count($group_list))
{ {
$default_group = self::getDefaultGroup($site_srl); $default_group = self::getDefaultGroup($site_srl);
getController('member')->addMemberToGroup($member_srl, $default_group->group_srl, $site_srl); MemberController::getInstance()->addMemberToGroup($member_srl, $default_group->group_srl, $site_srl);
$group_list[$default_group->group_srl] = $default_group->title; $group_list[$default_group->group_srl] = $default_group->title;
} }
//insert in cache //insert in cache
@ -1065,8 +1064,7 @@ class memberModel extends member
{ {
if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
{ {
$oModuleModel = getModel('module'); $config = ModuleModel::getModuleConfig('member');
$config = $oModuleModel->getModuleConfig('member');
if($config->group_image_mark!='Y') if($config->group_image_mark!='Y')
{ {
return null; return null;
@ -1125,7 +1123,7 @@ class memberModel extends member
if($config->signature_html_retroact == 'Y' && $config->signature_html == 'N' && preg_match('/<[^br]+>/i', $signature)) if($config->signature_html_retroact == 'Y' && $config->signature_html == 'N' && preg_match('/<[^br]+>/i', $signature))
{ {
$signature = preg_replace('/(\r?\n)+/', "\n", $signature); $signature = preg_replace('/(\r?\n)+/', "\n", $signature);
return getController('member')->putSignature($member_srl, $signature); return MemberController::getInstance()->putSignature($member_srl, $signature);
} }
$GLOBALS['__member_info__']['signature'][$member_srl] = $signature; $GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
@ -1200,8 +1198,7 @@ class memberModel extends member
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
$args->hashed_password = self::hashPassword($password_text, $required_algorithm); $args->hashed_password = self::hashPassword($password_text, $required_algorithm);
$oMemberController = getController('member'); MemberController::getInstance()->updateMemberPassword($args);
$oMemberController->updateMemberPassword($args);
} }
} }

70
modules/member/member.view.php
View file

@ -17,8 +17,7 @@ class memberView extends member
function init() function init()
{ {
// Get the member configuration // Get the member configuration
$oMemberModel = getModel('member'); $this->member_config = MemberModel::getMemberConfig();
$this->member_config = $oMemberModel->getMemberConfig();
Context::set('member_config', $this->member_config); Context::set('member_config', $this->member_config);
$oSecurity = new Security(); $oSecurity = new Security();
$oSecurity->encodeHTML('member_config.signupForm..'); $oSecurity->encodeHTML('member_config.signupForm..');
@ -46,8 +45,7 @@ class memberView extends member
// Template path // Template path
$this->setTemplatePath($template_path); $this->setTemplatePath($template_path);
$oLayoutModel = getModel('layout'); $layout_info = LayoutModel::getInstance()->getLayout($this->member_config->layout_srl);
$layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl);
if($layout_info) if($layout_info)
{ {
$this->module_info->layout_srl = $this->member_config->layout_srl; $this->module_info->layout_srl = $this->member_config->layout_srl;
@ -60,7 +58,6 @@ class memberView extends member
*/ */
function dispMemberInfo() function dispMemberInfo()
{ {
$oMemberModel = getModel('member');
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
// Don't display member info to non-logged user // Don't display member info to non-logged user
if(!$logged_info->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin; if(!$logged_info->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
@ -77,7 +74,7 @@ class memberView extends member
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$columnList = array('member_srl', 'user_id', 'email_address', 'user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login', 'extra_vars'); $columnList = array('member_srl', 'user_id', 'email_address', 'user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login', 'extra_vars');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
unset($member_info->password); unset($member_info->password);
unset($member_info->email_id); unset($member_info->email_id);
unset($member_info->email_host); unset($member_info->email_host);
@ -93,7 +90,7 @@ class memberView extends member
Context::set('memberInfo', get_object_vars($member_info)); Context::set('memberInfo', get_object_vars($member_info));
$extendForm = $oMemberModel->getCombineJoinForm($member_info); $extendForm = MemberModel::getCombineJoinForm($member_info);
unset($extendForm->find_member_account); unset($extendForm->find_member_account);
unset($extendForm->find_member_answer); unset($extendForm->find_member_answer);
Context::set('extend_form_list', $extendForm); Context::set('extend_form_list', $extendForm);
@ -207,9 +204,8 @@ class memberView extends member
$member_config = $this->member_config; $member_config = $this->member_config;
$oMemberModel = getModel('member');
// Get the member information if logged-in // Get the member information if logged-in
if($oMemberModel->isLogged()) throw new Rhymix\Framework\Exception('msg_already_logged'); if($this->user->member_srl) throw new Rhymix\Framework\Exception('msg_already_logged');
// call a trigger (before) // call a trigger (before)
$trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config); $trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config);
if(!$trigger_output->toBool()) return $trigger_output; if(!$trigger_output->toBool()) return $trigger_output;
@ -259,8 +255,7 @@ class memberView extends member
function dispMemberModifyInfoBefore() function dispMemberModifyInfoBefore()
{ {
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$oMemberModel = getModel('member'); if(!$logged_info->member_srl)
if(!$oMemberModel->isLogged() || empty($logged_info))
{ {
throw new Rhymix\Framework\Exceptions\MustLogin; throw new Rhymix\Framework\Exceptions\MustLogin;
} }
@ -303,16 +298,15 @@ class memberView extends member
$member_config = $this->member_config; $member_config = $this->member_config;
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) throw new Rhymix\Framework\Exceptions\MustLogin; if(!$this->user->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address', 'find_account_answer', 'homepage', 'blog', 'birthday', 'allow_mailing'); $columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address', 'find_account_answer', 'homepage', 'blog', 'birthday', 'allow_mailing');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::etMemberInfoByMemberSrl($member_srl, 0, $columnList);
$member_info->signature = $oMemberModel->getSignature($member_srl); $member_info->signature = MemberModel::getSignature($member_srl);
Context::set('member_info', $member_info); Context::set('member_info', $member_info);
$formTags = getAdminView('member')->_getMemberInputTag($member_info); $formTags = getAdminView('member')->_getMemberInputTag($member_info);
@ -385,9 +379,8 @@ class memberView extends member
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$args->statusList = array('PUBLIC', 'SECRET'); $args->statusList = array('PUBLIC', 'SECRET');
$oDocumentModel = getModel('document');
$columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status'); $columnList = array('document_srl', 'module_srl', 'category_srl', 'member_srl', 'title', 'nick_name', 'comment_count', 'trackback_count', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status');
$output = $oDocumentModel->getDocumentList($args, false, false, $columnList); $output = DocumentModel::getDocumentList($args, false, false, $columnList);
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page); Context::set('total_page', $output->total_page);
Context::set('page', $output->page); Context::set('page', $output->page);
@ -429,8 +422,7 @@ class memberView extends member
$args->module_srl = intval(Context::get('selected_module_srl')) ?: null; $args->module_srl = intval(Context::get('selected_module_srl')) ?: null;
$args->sort_index = 'list_order'; $args->sort_index = 'list_order';
$oCommentModel = getModel('comment'); $output = CommentModel::getTotalCommentList($args);
$output = $oCommentModel->getTotalCommentList($args);
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page); Context::set('total_page', $output->total_page);
Context::set('page', $output->page); Context::set('page', $output->page);
@ -468,7 +460,7 @@ class memberView extends member
$folders = $output->data; $folders = $output->data;
if(!count($folders)) if(!count($folders))
{ {
$output = getController('member')->migrateMemberScrappedDocuments($logged_info->member_srl); $output = MemberController::getInstance()->migrateMemberScrappedDocuments($logged_info->member_srl);
if($output && !$output->toBool()) if($output && !$output->toBool())
{ {
return $output; return $output;
@ -548,18 +540,16 @@ class memberView extends member
throw new Rhymix\Framework\Exceptions\FeatureDisabled; throw new Rhymix\Framework\Exceptions\FeatureDisabled;
} }
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) throw new Rhymix\Framework\Exceptions\MustLogin;
// Get the saved document(module_srl is set to member_srl instead)
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
if(!$logged_info->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
// Get the saved document(module_srl is set to member_srl instead)
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $logged_info->member_srl; $args->member_srl = $logged_info->member_srl;
$args->page = Context::get('page'); $args->page = Context::get('page');
$args->statusList = array('TEMP'); $args->statusList = array('TEMP');
$output = DocumentModel::getDocumentList($args, true);
$oDocumentModel = getModel('document');
$output = $oDocumentModel->getDocumentList($args, true);
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);
Context::set('total_page', $output->total_page); Context::set('total_page', $output->total_page);
Context::set('page', $output->page); Context::set('page', $output->page);
@ -610,7 +600,6 @@ class memberView extends member
} }
// get member module configuration. // get member module configuration.
$oMemberModel = getModel('member');
$config = $this->member_config; $config = $this->member_config;
Context::set('identifier', $config->identifier); Context::set('identifier', $config->identifier);
@ -633,9 +622,8 @@ class memberView extends member
*/ */
function dispMemberModifyPassword() function dispMemberModifyPassword()
{ {
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) throw new Rhymix\Framework\Exceptions\MustLogin; if(!$this->user->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
$memberConfig = $this->member_config; $memberConfig = $this->member_config;
@ -643,7 +631,7 @@ class memberView extends member
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$columnList = array('member_srl', 'user_id'); $columnList = array('member_srl', 'user_id');
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList);
Context::set('member_info',$member_info); Context::set('member_info',$member_info);
if($memberConfig->identifier == 'user_id') if($memberConfig->identifier == 'user_id')
@ -665,16 +653,15 @@ class memberView extends member
*/ */
function dispMemberLeave() function dispMemberLeave()
{ {
$oMemberModel = getModel('member');
// A message appears if the user is not logged-in // A message appears if the user is not logged-in
if(!$oMemberModel->isLogged()) throw new Rhymix\Framework\Exceptions\MustLogin; if(!$this->user->member_srl) throw new Rhymix\Framework\Exceptions\MustLogin;
$memberConfig = $this->member_config; $memberConfig = $this->member_config;
$logged_info = Context::get('logged_info'); $logged_info = Context::get('logged_info');
$member_srl = $logged_info->member_srl; $member_srl = $logged_info->member_srl;
$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl);
Context::set('member_info',$member_info); Context::set('member_info',$member_info);
if($memberConfig->identifier == 'user_id') if($memberConfig->identifier == 'user_id')
@ -696,8 +683,7 @@ class memberView extends member
*/ */
function dispMemberLogout() function dispMemberLogout()
{ {
$oMemberController = getController('member'); $output = MemberController::getInstance()->procMemberLogout();
$output = $oMemberController->procMemberLogout();
if(!$output->redirect_url) if(!$output->redirect_url)
$this->setRedirectUrl(getNotEncodedUrl('act', '')); $this->setRedirectUrl(getNotEncodedUrl('act', ''));
else else
@ -766,8 +752,7 @@ class memberView extends member
*/ */
function addExtraFormValidatorMessage() function addExtraFormValidatorMessage()
{ {
$oMemberModel = getModel('member'); $extraList = MemberModel::getUsedJoinFormList();
$extraList = $oMemberModel->getUsedJoinFormList();
$js_code = array(); $js_code = array();
$js_code[] = '<script>//<![CDATA['; $js_code[] = '<script>//<![CDATA[';
@ -811,17 +796,14 @@ class memberView extends member
$module_srl = Context::get('module_srl'); $module_srl = Context::get('module_srl');
// check grant // check grant
$oModuleModel = getModel('module');
$columnList = array('module_srl', 'module'); $columnList = array('module_srl', 'module');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList);
$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); $grant = ModuleModel::getGrant($module_info, Context::get('logged_info'));
if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted; if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted;
$oMemberModel = getModel('member');
Context::loadLang('modules/document/lang/'); Context::loadLang('modules/document/lang/');
Context::set('spammer_info', $oMemberModel->getMemberInfoByMemberSrl($member_srl)); Context::set('spammer_info', MemberModel::getMemberInfoByMemberSrl($member_srl));
Context::set('module_srl', $module_srl); Context::set('module_srl', $module_srl);
// Select Pop-up layout // Select Pop-up layout
@ -858,7 +840,7 @@ class memberView extends member
} }
$page = Context::get('page'); $page = Context::get('page');
$output = getModel('member')->getMemberModifyNicknameLog($page, $member_srl); $output = MemberModel::getMemberModifyNicknameLog($page, $member_srl);
Context::set('total_count', $output->page_navigation->total_count); Context::set('total_count', $output->page_navigation->total_count);
Context::set('total_page', $output->page_navigation->total_page); Context::set('total_page', $output->page_navigation->total_page);

57
modules/module/module.controller.php
View file

@ -185,7 +185,7 @@ class moduleController extends module
function updateModuleConfig($module, $config, $site_srl = 0) function updateModuleConfig($module, $config, $site_srl = 0)
{ {
$origin_config = getModel('module')->getModuleConfig($module, $site_srl); $origin_config = ModuleModel::getModuleConfig($module, $site_srl);
foreach($config as $key => $val) foreach($config as $key => $val)
{ {
@ -197,7 +197,7 @@ class moduleController extends module
function updateModulePartConfig($module, $module_srl, $config) function updateModulePartConfig($module, $module_srl, $config)
{ {
$origin_config = getModel('module')->getModulePartConfig($module, $module_srl); $origin_config = ModuleModel::getModulePartConfig($module, $module_srl);
foreach($config as $key => $val) foreach($config as $key => $val)
{ {
@ -256,8 +256,7 @@ class moduleController extends module
{ {
if(isSiteID($domain)) if(isSiteID($domain))
{ {
$oModuleModel = getModel('module'); if(ModuleModel::isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
} }
else else
{ {
@ -271,8 +270,7 @@ class moduleController extends module
$args->default_language = Context::getLangType(); $args->default_language = Context::getLangType();
$columnList = array('modules.site_srl'); $columnList = array('modules.site_srl');
$oModuleModel = getModel('module'); $output = ModuleModel::getSiteInfoByDomain($args->domain, $columnList);
$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
if($output) return new BaseObject(-1,'msg_already_registed_vid'); if($output) return new BaseObject(-1,'msg_already_registed_vid');
$output = executeQuery('module.insertSite', $args); $output = executeQuery('module.insertSite', $args);
@ -287,9 +285,8 @@ class moduleController extends module
*/ */
function updateSite($args) function updateSite($args)
{ {
$oModuleModel = getModel('module');
$columnList = array('sites.site_srl', 'sites.domain'); $columnList = array('sites.site_srl', 'sites.domain');
$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList); $site_info = ModuleModel::getSiteInfo($args->site_srl, $columnList);
if(!$args->domain && $site_info->site_srl == $args->site_srl) if(!$args->domain && $site_info->site_srl == $args->site_srl)
{ {
@ -298,9 +295,9 @@ class moduleController extends module
if($site_info->domain != $args->domain) if($site_info->domain != $args->domain)
{ {
$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList); $info = ModuleModel::getSiteInfoByDomain($args->domain, $columnList);
if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain'); if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain');
if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid'); if(isSiteID($args->domain) && ModuleModel::isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid');
if($args->domain && !isSiteID($args->domain)) if($args->domain && !isSiteID($args->domain))
{ {
@ -312,7 +309,7 @@ class moduleController extends module
if($args->site_srl == 0) $vid=''; if($args->site_srl == 0) $vid='';
else $vid=$args->domain; else $vid=$args->domain;
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl); $module_info = ModuleModel::getModuleInfoByModuleSrl($args->index_module_srl);
$mid = $module_info->mid; $mid = $module_info->mid;
Rhymix\Framework\Cache::clearGroup('site_and_module'); Rhymix\Framework\Cache::clearGroup('site_and_module');
@ -376,15 +373,14 @@ class moduleController extends module
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
// Check whether the module name already exists // Check whether the module name already exists
if(!$args->site_srl) $args->site_srl = 0; if(!$args->site_srl) $args->site_srl = 0;
$oModuleModel = getModel('module'); if(ModuleModel::isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
// begin transaction // begin transaction
$oDB = &DB::getInstance(); $oDB = &DB::getInstance();
$oDB->begin(); $oDB->begin();
// Get colorset from the skin information // Get colorset from the skin information
$module_path = ModuleHandler::getModulePath($args->module); $module_path = ModuleHandler::getModulePath($args->module);
$skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin); $skin_info = ModuleModel::loadSkinInfo($module_path, $args->skin);
$skin_vars = new stdClass(); $skin_vars = new stdClass();
$skin_vars->colorset = $skin_info->colorset[0]->name; $skin_vars->colorset = $skin_info->colorset[0]->name;
// Arrange variables and then execute a query // Arrange variables and then execute a query
@ -436,8 +432,6 @@ class moduleController extends module
// if menu is not created, create menu also. and does not supported that in virtual site. // if menu is not created, create menu also. and does not supported that in virtual site.
if(!$menuOutput->data && !$args->site_srl) if(!$menuOutput->data && !$args->site_srl)
{ {
$oMenuAdminModel = getAdminModel('menu');
$oMenuAdminController = getAdminController('menu'); $oMenuAdminController = getAdminController('menu');
$menuSrl = $oMenuAdminController->getUnlinkedMenu(); $menuSrl = $oMenuAdminController->getUnlinkedMenu();
@ -502,9 +496,7 @@ class moduleController extends module
$oDB = &DB::getInstance(); $oDB = &DB::getInstance();
$oDB->begin(); $oDB->begin();
$oModuleModel = getModel('module'); $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl);
$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
if(!$args->site_srl || !$args->browser_title) if(!$args->site_srl || !$args->browser_title)
{ {
@ -645,8 +637,7 @@ class moduleController extends module
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$oModuleModel = getModel('module'); $output = ModuleModel::getModuleInfoByModuleSrl($module_srl);
$output = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$args = new stdClass(); $args = new stdClass();
$args->url = $output->mid; $args->url = $output->mid;
@ -707,9 +698,8 @@ class moduleController extends module
if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request'); if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
// check start module // check start module
$oModuleModel = getModel('module');
$columnList = array('sites.index_module_srl'); $columnList = array('sites.index_module_srl');
$start_module = $oModuleModel->getSiteInfo(0, $columnList); $start_module = ModuleModel::getSiteInfo(0, $columnList);
if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule'); if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
// Call a trigger (before) // Call a trigger (before)
@ -803,13 +793,12 @@ class moduleController extends module
*/ */
function insertAdminId($module_srl, $admin_id) function insertAdminId($module_srl, $admin_id)
{ {
$oMemberModel = getModel('member'); $member_config = MemberModel::getMemberConfig();
$member_config = $oMemberModel->getMemberConfig();
if($member_config->identifier == 'email_address') if($member_config->identifier == 'email_address')
$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id); $member_info = MemberModel::getMemberInfoByEmailAddress($admin_id);
else else
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id); $member_info = MemberModel::getMemberInfoByUserID($admin_id);
if(!$member_info->member_srl) return; if(!$member_info->member_srl) return;
@ -831,8 +820,7 @@ class moduleController extends module
if($admin_id) if($admin_id)
{ {
$oMemberModel = getModel('member'); $member_info = MemberModel::getMemberInfoByUserID($admin_id);
$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
if($member_info->member_srl) $args->member_srl = $member_info->member_srl; if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
} }
@ -1156,11 +1144,10 @@ class moduleController extends module
// have file // have file
if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name'])) if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
{ {
$oModuleModel = getModel('module'); $output = ModuleModel::getModuleFileBox($vars->module_filebox_srl);
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename); FileHandler::removeFile($output->data->filename);
$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl); $path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path); FileHandler::makeDir($path);
$random = Rhymix\Framework\Security::getRandom(32, 'hex'); $random = Rhymix\Framework\Security::getRandom(32, 'hex');
@ -1196,8 +1183,7 @@ class moduleController extends module
$vars->module_filebox_srl = getNextSequence(); $vars->module_filebox_srl = getNextSequence();
// get file path // get file path
$oModuleModel = getModel('module'); $path = ModuleModel::getModuleFileBoxPath($vars->module_filebox_srl);
$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
FileHandler::makeDir($path); FileHandler::makeDir($path);
$random = Rhymix\Framework\Security::getRandom(32, 'hex'); $random = Rhymix\Framework\Security::getRandom(32, 'hex');
@ -1252,8 +1238,7 @@ class moduleController extends module
function deleteModuleFileBox($vars) function deleteModuleFileBox($vars)
{ {
// delete real file // delete real file
$oModuleModel = getModel('module'); $output = ModuleModel::getModuleFileBox($vars->module_filebox_srl);
$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
FileHandler::removeFile($output->data->filename); FileHandler::removeFile($output->data->filename);
$args = new stdClass(); $args = new stdClass();

15
modules/module/module.model.php
View file

@ -2190,15 +2190,15 @@ class moduleModel extends module
{ {
if($type == 'document') if($type == 'document')
{ {
$target_srl = getModel('document')->getDocument($target_srl, false, false)->get('module_srl'); $target_srl = DocumentModel::getDocument($target_srl, false, false)->get('module_srl');
} }
else if($type == 'comment') else if($type == 'comment')
{ {
$target_srl = getModel('comment')->getComment($target_srl)->get('module_srl'); $target_srl = CommentModel::getComment($target_srl)->get('module_srl');
} }
else if($type == 'file') else if($type == 'file')
{ {
$target_srl = getModel('file')->getFile($target_srl)->module_srl; $target_srl = FileModel::getFile($target_srl)->module_srl;
} }
else if($type == 'module') else if($type == 'module')
{ {
@ -2340,8 +2340,7 @@ class moduleModel extends module
if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget); if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple); Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
$oModuleModel = getModel('module'); $output = self::getModuleFileBoxList();
$output = $oModuleModel->getModuleFileBoxList();
Context::set('filebox_list', $output->data); Context::set('filebox_list', $output->data);
$page = Context::get('page'); $page = Context::get('page');
@ -2360,7 +2359,7 @@ class moduleModel extends module
public static function getModuleFileBoxPath($module_filebox_srl) public static function getModuleFileBoxPath($module_filebox_srl)
{ {
return getController('file')->getStoragePath('filebox', 0, $module_filebox_srl, 0, '', false); return FileController::getStoragePath('filebox', 0, $module_filebox_srl, 0, '', false);
} }
/** /**
@ -2444,9 +2443,7 @@ class moduleModel extends module
$langCode = Context::get('langCode'); $langCode = Context::get('langCode');
if (!$langCode) return; if (!$langCode) return;
$oModuleController = getController('module'); ModuleController::getInstance()->replaceDefinedLangCode($langCode);
$oModuleController->replaceDefinedLangCode($langCode);
$this->add('lang', $langCode); $this->add('lang', $langCode);
} }
} }

11
modules/module/module.view.php
View file

@ -31,8 +31,7 @@ class moduleView extends module
$skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin); $skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
if(!file_exists($skin_info_xml)) throw new Rhymix\Framework\Exceptions\InvalidRequest; if(!file_exists($skin_info_xml)) throw new Rhymix\Framework\Exceptions\InvalidRequest;
$oModuleModel = getModel('module'); $skin_info = ModuleModel::loadSkinInfo($module_path, $skin);
$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
Context::set('skin_info',$skin_info); Context::set('skin_info',$skin_info);
$this->setLayoutFile("popup_layout"); $this->setLayoutFile("popup_layout");
@ -49,11 +48,10 @@ class moduleView extends module
$output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args); $output = executeQueryArray(isset($query_id) ? $query_id : 'module.getSiteModules', $args);
$mid_list = array(); $mid_list = array();
$oModuleModel = getModel('module');
foreach($output->data as $key => $val) foreach($output->data as $key => $val)
{ {
if(!$oModuleModel->getGrant($val, Context::get('logged_info'))->manager) if(!ModuleModel::getGrant($val, Context::get('logged_info'))->manager)
{ {
continue; continue;
} }
@ -69,7 +67,7 @@ class moduleView extends module
$obj->browser_title = $val->browser_title; $obj->browser_title = $val->browser_title;
$mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj; $mid_list[$val->module]->list[$val->category ?: 0][$val->mid] = $obj;
$mid_list[$val->module]->title = $oModuleModel->getModuleInfoXml($val->module)->title; $mid_list[$val->module]->title = ModuleModel::getModuleInfoXml($val->module)->title;
} }
Context::set('mid_list', $mid_list); Context::set('mid_list', $mid_list);
@ -118,8 +116,7 @@ class moduleView extends module
//]]></script>',$input_name); //]]></script>',$input_name);
Context::addHtmlHeader($addscript); Context::addHtmlHeader($addscript);
$oModuleModel = getModel('module'); $output = ModuleModel::getModuleFileBoxList();
$output = $oModuleModel->getModuleFileBoxList();
Context::set('filebox_list', $output->data); Context::set('filebox_list', $output->data);
$filter = Context::get('filter'); $filter = Context::get('filter');