diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 413a099a9..992d452f8 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -41,16 +41,14 @@ class commentController extends comment throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); $module_srl = $oComment->get('module_srl'); if(!$module_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('comment', $module_srl); if($comment_config->use_vote_up == 'N') { throw new Rhymix\Framework\Exceptions\FeatureDisabled; @@ -75,8 +73,7 @@ class commentController extends comment $comment_srl = Context::get('target_srl'); if(!$comment_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); if($oComment->get('voted_count') <= 0) { throw new Rhymix\Framework\Exception('failed_voted_canceled'); @@ -111,16 +108,14 @@ class commentController extends comment throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); $module_srl = $oComment->get('module_srl'); if(!$module_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('comment', $module_srl); if($comment_config->use_vote_down == 'N') { throw new Rhymix\Framework\Exceptions\FeatureDisabled; @@ -145,8 +140,7 @@ class commentController extends comment $comment_srl = Context::get('target_srl'); if(!$comment_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); if($oComment->get('blamed_count') >= 0) { throw new Rhymix\Framework\Exception('failed_blamed_canceled'); @@ -300,7 +294,7 @@ class commentController extends comment */ function addGrant($comment_srl) { - $comment = getModel('comment')->getComment($comment_srl); + $comment = CommentModel::getComment($comment_srl); if ($comment->isExists()) { $comment->setGrant(); @@ -320,9 +314,8 @@ class commentController extends comment return FALSE; } - $oModuleModel = getModel('module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); - $module_part_config = $oModuleModel->getModulePartConfig('comment', $module_info->module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl); + $module_part_config = ModuleModel::getModulePartConfig('comment', $module_info->module_srl); $use_validation = FALSE; if(isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y") { @@ -412,22 +405,17 @@ class commentController extends comment { return new BaseObject(-1, 'msg_invalid_document'); } - - // creat the comment model object - $oCommentModel = getModel('comment'); - // get a object of document model - $oDocumentModel = getModel('document'); // even for manual_inserted if password exists, hash it. if($obj->password) { - $obj->password = getModel('member')->hashPassword($obj->password); + $obj->password = MemberModel::hashPassword($obj->password); } // get the original posting if(!$manual_inserted) { - $oDocument = $oDocumentModel->getDocument($document_srl); + $oDocument = DocumentModel::getDocument($document_srl); if($document_srl != $oDocument->document_srl) { @@ -599,7 +587,7 @@ class commentController extends comment $oDocumentController = getController('document'); // Update the number of comments in the post - $comment_count = $oCommentModel->getCommentCount($document_srl); + $comment_count = CommentModel::getCommentCount($document_srl); if($comment_count && (!$using_validation || $is_admin)) { $output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, $update_document); @@ -625,7 +613,7 @@ class commentController extends comment // send a message if notify_message option in enabled in the original comment if($obj->parent_srl) { - $oParent = $oCommentModel->getComment($obj->parent_srl); + $oParent = CommentModel::getComment($obj->parent_srl); if($oParent->get('member_srl') != $oDocument->get('member_srl')) { $oParent->notify(lang('comment'), $obj->content); @@ -650,14 +638,10 @@ class commentController extends comment { $using_validation = $this->isModuleUsingPublishValidation($obj->module_srl); - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($obj->document_srl); - - $oMemberModel = getModel("member"); - $is_logged = Context::get('is_logged'); + $oDocument = DocumentModel::getDocument($obj->document_srl); if(isset($obj->member_srl) && !is_null($obj->member_srl)) { - $member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl); + $member_info = MemberModel::getMemberInfoByMemberSrl($obj->member_srl); } else { @@ -668,9 +652,7 @@ class commentController extends comment $member_info->email_address = $obj->email_address; } - $oCommentModel = getModel("comment"); - $oModuleModel = getModel("module"); - $module_info = $oModuleModel->getModuleInfoByDocumentSrl($obj->document_srl); + $module_info = ModuleModel::getModuleInfoByDocumentSrl($obj->document_srl); // If there is no problem to register comment then send an email to all admin were set in module admin panel if($module_info->admin_mail && $member_info->is_admin != 'Y') @@ -681,7 +663,7 @@ class commentController extends comment $url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl; if($using_validation) { - $nr_comments_not_approved = $oCommentModel->getCommentAllCount(NULL, FALSE); + $nr_comments_not_approved = CommentModel::getCommentAllCount(NULL, FALSE); $url_approve = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N'); $url_trash = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true'); $mail_content = " @@ -777,11 +759,8 @@ class commentController extends comment return $output; } - // create a comment model object - $oCommentModel = getModel('comment'); - // get the original data - $source_obj = $oCommentModel->getComment($obj->comment_srl); + $source_obj = CommentModel::getComment($obj->comment_srl); if(!$source_obj->getMemberSrl()) { $obj->member_srl = $source_obj->get('member_srl'); @@ -799,7 +778,7 @@ class commentController extends comment if($obj->password) { - $obj->password = getModel('member')->hashPassword($obj->password); + $obj->password = MemberModel::hashPassword($obj->password); } if($obj->homepage) @@ -933,8 +912,7 @@ class commentController extends comment ModuleHandler::triggerCall('comment.deleteComment', 'after', $obj); // update the number of comments - $oCommentModel = getModel('comment'); - $comment_count = $oCommentModel->getCommentCount($obj->document_srl); + $comment_count = CommentModel::getCommentCount($obj->document_srl); // only document is exists if(isset($comment_count)) { @@ -979,8 +957,7 @@ class commentController extends comment } // update the number of comments - $oCommentModel = getModel('comment'); - $comment_count = $oCommentModel->getCommentCount($obj->document_srl); + $comment_count = CommentModel::getCommentCount($obj->document_srl); // only document is exists if(isset($comment_count)) { @@ -1011,20 +988,16 @@ class commentController extends comment */ function deleteComment($comment_srl, $is_admin = FALSE, $isMoveToTrash = FALSE, $childs = null) { - // create the comment model object - $oCommentModel = getModel('comment'); - $logged_info = Context::get('logged_info'); // check if comment already exists - $comment = $oCommentModel->getComment($comment_srl); + $comment = CommentModel::getComment($comment_srl); if($comment->comment_srl != $comment_srl) { return new BaseObject(-1, 'msg_invalid_request'); } - $oMemberModel = getModel('member'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($comment->member_srl); + $member_info = MemberModel::getMemberInfoByMemberSrl($comment->member_srl); $document_srl = $comment->document_srl; @@ -1045,7 +1018,7 @@ class commentController extends comment // check if child comment exists on the comment if(!$childs) { - $childs = $oCommentModel->getChildComments($comment_srl); + $childs = CommentModel::getChildComments($comment_srl); } if(count($childs) > 0) { @@ -1068,7 +1041,7 @@ class commentController extends comment $logged_info = Context::get('logged_info'); foreach($childs as $val) { - $c_member_info = $oMemberModel->getMemberInfoByMemberSrl($val->member_srl); + $c_member_info = MemberModel::getMemberInfoByMemberSrl($val->member_srl); if($c_member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { $deleteAdminComment = FALSE; @@ -1119,7 +1092,7 @@ class commentController extends comment $output = executeQuery('comment.deleteCommentList', $args); // update the number of comments - $comment_count = $oCommentModel->getCommentCount($document_srl); + $comment_count = CommentModel::getCommentCount($document_srl); // only document is exists if(isset($comment_count)) @@ -1182,11 +1155,9 @@ class commentController extends comment $trash_args->trash_srl = $obj->trash_srl; } - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($obj->comment_srl); + $oComment = CommentModel::getComment($obj->comment_srl); - $oMemberModel = getModel('member'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($oComment->get('member_srl')); + $member_info = MemberModel::getMemberInfoByMemberSrl($oComment->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { return new BaseObject(-1, 'msg_admin_comment_no_move_to_trash'); @@ -1244,7 +1215,7 @@ class commentController extends comment $output = executeQuery('comment.deleteCommentList', $args); // update the number of comments - $comment_count = $oCommentModel->getCommentCount($obj->document_srl); + $comment_count = CommentModel::getCommentCount($obj->document_srl); // only document is exists if(isset($comment_count)) @@ -1303,10 +1274,6 @@ class commentController extends comment */ function deleteComments($document_srl, $obj = NULL) { - // create the document model object - $oDocumentModel = getModel('document'); - $oCommentModel = getModel('comment'); - // check if permission is granted if(is_object($obj)) { @@ -1315,7 +1282,7 @@ class commentController extends comment } else { - $oDocument = $oDocumentModel->getDocument($document_srl); + $oDocument = DocumentModel::getDocument($document_srl); } if(!$oDocument->isGranted()) @@ -1414,8 +1381,7 @@ class commentController extends comment } // Get the original comment - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); // Pass if the author's IP address is as same as visitor's. if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) @@ -1425,8 +1391,7 @@ class commentController extends comment } // Create a member model object - $oMemberModel = getModel('member'); - $member_srl = $oMemberModel->getLoggedMemberSrl(); + $member_srl = MemberModel::getLoggedMemberSrl(); // if the comment author is a member if($oComment->get('member_srl')) @@ -1559,8 +1524,7 @@ class commentController extends comment } // get the original comment - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = CommentModel::getComment($comment_srl, FALSE, FALSE); // failed if both ip addresses between author's and the current user are same. if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) @@ -1639,8 +1603,7 @@ class commentController extends comment // Send message to admin $message_targets = array(); $module_srl = $oComment->get('module_srl'); - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('comment', $module_srl); if ($comment_config->declared_message && in_array('admin', $comment_config->declared_message)) { $output = executeQueryArray('member.getAdmins', new stdClass); @@ -1717,18 +1680,17 @@ class commentController extends comment $target_module_srl = array_map('trim', explode(',', $target_module_srl)); $logged_info = Context::get('logged_info'); $module_srl = array(); - $oModuleModel = getModel('module'); foreach ($target_module_srl as $srl) { if (!$srl) continue; - $module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($srl); if (!$module_info->module_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $module_grant = $oModuleModel->getGrant($module_info, $logged_info); + $module_grant = ModuleModel::getGrant($module_info, $logged_info); if (!$module_grant->manager) { throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -1821,8 +1783,7 @@ class commentController extends comment if(count($commentSrlList) > 0) { - $oCommentModel = getModel('comment'); - $commentList = $oCommentModel->getComments($commentSrlList); + $commentList = CommentModel::getComments($commentSrlList); if(is_array($commentList)) { @@ -1885,8 +1846,7 @@ class commentController extends comment function triggerCopyModule(&$obj) { - $oModuleModel = getModel('module'); - $commentConfig = $oModuleModel->getModulePartConfig('comment', $obj->originModuleSrl); + $commentConfig = ModuleModel::getModulePartConfig('comment', $obj->originModuleSrl); $oModuleController = getController('module'); if(is_array($obj->moduleSrlList)) diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php index df04759ab..1c232476a 100644 --- a/modules/comment/comment.model.php +++ b/modules/comment/comment.model.php @@ -16,7 +16,7 @@ class commentModel extends comment * Initialization * @return void */ - function init() + public function init() { } @@ -26,7 +26,7 @@ class commentModel extends comment * Print, scrap, vote-up(recommen), vote-down(non-recommend), report features added * @return void */ - function getCommentMenu() + public function getCommentMenu() { // get the post's id number and the current login information $comment_srl = Context::get('target_srl'); @@ -45,14 +45,12 @@ class commentModel extends comment // feature that only member can do if($logged_info->member_srl) { - $oCommentModel = getModel('comment'); $columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, $columnList); + $oComment = self::getComment($comment_srl, FALSE, $columnList); $module_srl = $oComment->get('module_srl'); $member_srl = $oComment->get('member_srl'); - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('document', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('document', $module_srl); if($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl) { @@ -86,8 +84,7 @@ class commentModel extends comment // find a comment by IP matching if an administrator. if($logged_info->is_admin == 'Y') { - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl); + $oComment = self::getComment($comment_srl); if($oComment->isExists()) { @@ -119,7 +116,7 @@ class commentModel extends comment * @param int $comment_srl * @return bool */ - function isGranted($comment_srl) + public static function isGranted($comment_srl) { return $_SESSION['granted_comment'][$comment_srl]; } @@ -129,7 +126,7 @@ class commentModel extends comment * @param int $comment_srl * @return int */ - function getChildCommentCount($comment_srl) + public static function getChildCommentCount($comment_srl) { $args = new stdClass(); $args->comment_srl = $comment_srl; @@ -142,7 +139,7 @@ class commentModel extends comment * @param int $comment_srl * @return int */ - function getChildComments($comment_srl) + public static function getChildComments($comment_srl) { $args = new stdClass(); $args->comment_srl = $comment_srl; @@ -157,7 +154,7 @@ class commentModel extends comment * @param array $columnList * @return commentItem */ - function getComment($comment_srl = 0, $is_admin = FALSE, $columnList = array()) + public static function getComment($comment_srl = 0, $is_admin = FALSE, $columnList = array()) { $oComment = new commentItem($comment_srl, $columnList); if($is_admin) @@ -174,7 +171,7 @@ class commentModel extends comment * @param array $columnList * @return array */ - function getComments($comment_srl_list, $columnList = array()) + public static function getComments($comment_srl_list, $columnList = array()) { if (!is_array($comment_srl_list)) { @@ -187,7 +184,7 @@ class commentModel extends comment // fetch from a database $args = new stdClass(); - $args->comment_srls = $comment_srls; + $args->comment_srls = $comment_srl_list; $output = executeQuery('comment.getComments', $args, $columnList); if(!$output->toBool()) { @@ -204,7 +201,6 @@ class commentModel extends comment $comment_list = array($comment_list); } - $comment_count = count($comment_list); foreach($comment_list as $key => $attribute) { if(!$attribute->comment_srl) @@ -212,7 +208,6 @@ class commentModel extends comment continue; } - $oComment = NULL; $oComment = new commentItem(); $oComment->setAttribute($attribute); @@ -226,16 +221,14 @@ class commentModel extends comment * @param int $document_srl * @return int */ - function getCommentCount($document_srl) + public static function getCommentCount($document_srl) { $args = new stdClass(); $args->document_srl = $document_srl; // get the number of comments on the document module - $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl'); - - $oDocument = $oDocumentModel->getDocument($document_srl, FALSE, TRUE, $columnList); + $oDocument = DocumentModel::getDocument($document_srl, FALSE, TRUE, $columnList); // return if no doc exists. if(!$oDocument->isExists()) @@ -249,7 +242,7 @@ class commentModel extends comment //check if module is using validation system $oCommentController = getController('comment'); $using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl); - $module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl); + $module_info = ModuleModel::getModuleInfoByDocumentSrl($document_srl); $use_comment_massage = $module_info->comment_delete_message; if($using_validation) @@ -273,7 +266,7 @@ class commentModel extends comment * @param array $moduleSrlList * @return int */ - function getCommentCountByDate($date = '', $moduleSrlList = array()) + public static function getCommentCountByDate($date = '', $moduleSrlList = array()) { $args = new stdClass(); if($date) @@ -301,7 +294,7 @@ class commentModel extends comment * @param bool $published * @return int */ - function getCommentAllCount($module_srl, $published = false) + public static function getCommentAllCount($module_srl, $published = false) { $args = new stdClass(); $args->module_srl = $module_srl; @@ -336,22 +329,24 @@ class commentModel extends comment /** * Get the module info without duplication + * + * @deprecated + * * @return array */ - function getDistinctModules() + public static function getDistinctModules() { return array(); /* $output = executeQueryArray('comment.getDistinctModules'); $module_srls = $output->data; - $oModuleModel = getModel('module'); $result = array(); if($module_srls) { foreach($module_srls as $module) { - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module->module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module->module_srl); $result[$module->module_srl] = $module_info->mid; } } @@ -366,7 +361,7 @@ class commentModel extends comment * @param array $columnList * @return array */ - function getNewestCommentList($obj, $columnList = array()) + public static function getNewestCommentList($obj, $columnList = array()) { $args = new stdClass(); @@ -377,8 +372,7 @@ class commentModel extends comment if($obj->mid) { - $oModuleModel = getModel('module'); - $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid); + $obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid); unset($obj->mid); } @@ -454,7 +448,7 @@ class commentModel extends comment * @param int $count * @return object */ - function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0) + public static function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0) { if(!$document_srl) { @@ -462,9 +456,8 @@ class commentModel extends comment } // get the number of comments on the document module - $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl', 'comment_count'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); + $oDocument = DocumentModel::getDocument($document_srl, false, false, $columnList); // return if no doc exists. if(!$oDocument->isExists()) @@ -484,7 +477,7 @@ class commentModel extends comment if(!$count) { - $comment_config = $this->getCommentConfig($module_srl); + $comment_config = self::getCommentConfig($module_srl); $comment_count = $comment_config->comment_count; $comment_page_count = $comment_config->comment_page_count; } @@ -525,10 +518,9 @@ class commentModel extends comment $trigger_output = ModuleHandler::triggerCall('comment.getCommentList', 'before', $args); if($trigger_output instanceof BaseObject && !$trigger_output->toBool()) { - return $output; + return $trigger_output; } - // If an alternate output is set, use it instead of running the default queries if (isset($args->use_alternate_output) && $args->use_alternate_output instanceof BaseObject) { @@ -546,7 +538,7 @@ class commentModel extends comment // insert data into CommentPageList table if the number of results is different from stored comments if(!$output->data) { - $this->fixCommentList($oDocument->get('module_srl'), $document_srl); + self::fixCommentList($oDocument->get('module_srl'), $document_srl); $output = executeQueryArray('comment.getCommentPageList', $args); if(!$output->toBool()) { @@ -568,12 +560,11 @@ class commentModel extends comment * @param int $count * @return int */ - function getCommentPage($document_srl, $comment_srl, $count = 0) + public static function getCommentPage($document_srl, $comment_srl, $count = 0) { // Check the document - $oDocumentModel = getModel('document'); $columnList = array('document_srl', 'module_srl', 'comment_count'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList); + $oDocument = DocumentModel::getDocument($document_srl, false, false, $columnList); if(!$oDocument->isExists()) { return 0; @@ -590,7 +581,7 @@ class commentModel extends comment if(!$count) { $module_srl = $oDocument->get('module_srl'); - $comment_config = $this->getCommentConfig($module_srl); + $comment_config = self::getCommentConfig($module_srl); $comment_count = $comment_config->comment_count; } else @@ -642,7 +633,7 @@ class commentModel extends comment * @param int $document_srl * @return void */ - function fixCommentList($module_srl, $document_srl) + public static function fixCommentList($module_srl, $document_srl) { // create a lock file to prevent repeated work when performing a batch job $lock_file = "./files/cache/tmp/lock." . $document_srl; @@ -702,7 +693,7 @@ class commentModel extends comment $root->child[] = &$list[$comment_srl]; } } - $this->_arrangeComment($comment_list, $root->child, 0, NULL); + self::_arrangeComment($comment_list, $root->child, 0, NULL); // insert values to the database if(count($comment_list)) @@ -734,7 +725,7 @@ class commentModel extends comment * @param object $parent * @return void */ - function _arrangeComment(&$comment_list, $list, $depth, $parent = NULL) + public static function _arrangeComment(&$comment_list, $list, $depth, $parent = NULL) { if(!count($list)) { @@ -758,7 +749,7 @@ class commentModel extends comment { $val->depth = $depth; $comment_list[$val->comment_srl] = $val; - $this->_arrangeComment($comment_list, $val->child, $depth + 1, $val); + self::_arrangeComment($comment_list, $val->child, $depth + 1, $val); unset($val->child); } else @@ -775,7 +766,7 @@ class commentModel extends comment * @param array $columnList * @return object */ - function getTotalCommentList($obj, $columnList = array()) + public static function getTotalCommentList($obj, $columnList = array()) { $query_id = 'comment.getTotalCommentList'; @@ -949,7 +940,7 @@ class commentModel extends comment * @param object $obj * @return int */ - function getTotalCommentCount($obj) + public static function getTotalCommentCount($obj) { $query_id = 'comment.getTotalCommentCountByGroupStatus'; @@ -1059,10 +1050,9 @@ class commentModel extends comment * @param int $module_srl * @return object */ - function getCommentConfig($module_srl) + public static function getCommentConfig($module_srl) { - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('comment', $module_srl); if(!is_object($comment_config)) { $comment_config = new stdClass(); @@ -1084,7 +1074,7 @@ class commentModel extends comment * Return a list of voting member * @return void */ - function getCommentVotedMemberList() + public function getCommentVotedMemberList() { $comment_srl = Context::get('comment_srl'); if(!$comment_srl) @@ -1098,16 +1088,14 @@ class commentModel extends comment $point = 1; } - $oCommentModel = getModel('comment'); - $oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE); + $oComment = self::getComment($comment_srl, FALSE, FALSE); $module_srl = $oComment->get('module_srl'); if(!$module_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oModuleModel = getModel('module'); - $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl); + $comment_config = ModuleModel::getModulePartConfig('comment', $module_srl); $args = new stdClass(); @@ -1137,12 +1125,11 @@ class commentModel extends comment return $output; } - $oMemberModel = getModel('member'); if($output->data) { foreach($output->data as $k => $d) { - $profile_image = $oMemberModel->getProfileImage($d->member_srl); + $profile_image = MemberModel::getProfileImage($d->member_srl); $output->data[$k]->src = $profile_image->src; } } @@ -1154,7 +1141,7 @@ class commentModel extends comment * Return a secret status by secret field * @return array */ - function getSecretNameList() + public static function getSecretNameList() { global $lang; @@ -1173,7 +1160,7 @@ class commentModel extends comment * @param int $member_srl * @return int */ - function getCommentCountByMemberSrl($member_srl) + public static function getCommentCountByMemberSrl($member_srl) { $args = new stdClass(); $args->member_srl = $member_srl; @@ -1191,7 +1178,7 @@ class commentModel extends comment * @param int $count * @return object */ - function getCommentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0) + public static function getCommentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0) { $args = new stdClass(); $args->member_srl = $member_srl; diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php index 85052b8f9..8cf1ab9d2 100644 --- a/modules/comment/comment.view.php +++ b/modules/comment/comment.view.php @@ -43,13 +43,11 @@ class commentView extends comment } // get the comment configuration - $oCommentModel = getModel('comment'); - $comment_config = $oCommentModel->getCommentConfig($current_module_srl); + $comment_config = CommentModel::getCommentConfig($current_module_srl); Context::set('comment_config', $comment_config); // get a group list - $oMemberModel = getModel('member'); - $group_list = $oMemberModel->getGroups(); + $group_list = MemberModel::getGroups(); Context::set('group_list', $group_list); // Set a template file @@ -69,17 +67,14 @@ class commentView extends comment $this->setLayoutFile('popup_layout'); $comment_srl = Context::get('target_srl'); - $oMemberModel = getModel('member'); // A message appears if the user is not logged-in - if(!$oMemberModel->isLogged()) + if(!$this->user->member_srl) { throw new Rhymix\Framework\Exceptions\MustLogin; } - // Create the comment object. - $oCommentModel = getModel('comment'); // Creates an object for displaying the selected comment - $oComment = $oCommentModel->getComment($comment_srl); + $oComment = CommentModel::getComment($comment_srl); if(!$oComment->isExists()) { throw new Rhymix\Framework\Exceptions\TargetNotFound; diff --git a/modules/document/document.class.php b/modules/document/document.class.php index 93dd26999..48153a975 100644 --- a/modules/document/document.class.php +++ b/modules/document/document.class.php @@ -16,12 +16,13 @@ class document extends ModuleObject * Search option to use in admin page * @var array */ - var $search_option = array('title','content','title_content','user_name',); // /< Search options + public $search_option = array('title', 'content', 'title_content', 'user_name'); + /** * Status list * @var array */ - var $statusList = array('private'=>'PRIVATE', 'public'=>'PUBLIC', 'secret'=>'SECRET', 'temp'=>'TEMP'); + public static $statusList = array('private' => 'PRIVATE', 'public' => 'PUBLIC', 'secret' => 'SECRET', 'temp' => 'TEMP'); /** * Implement if additional tasks are necessary when installing @@ -386,27 +387,27 @@ class document extends ModuleObject * Document Status List * @return array */ - function getStatusList() + public static function getStatusList() { - return $this->statusList; + return self::$statusList; } /** * Return default status * @return string */ - function getDefaultStatus() + public static function getDefaultStatus() { - return $this->statusList['public']; + return self::$statusList['public']; } /** * Return status by key * @return string */ - function getConfigStatus($key) + public static function getConfigStatus($key) { - return $this->statusList[$key]; + return self::$statusList[$key]; } } /* End of file document.class.php */ diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index af1a4c13d..b72a2ad46 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -33,7 +33,7 @@ class documentController extends document $module_info = $this->module_info; 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') @@ -44,13 +44,11 @@ class documentController extends document } } - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); $module_srl = $oDocument->get('module_srl'); if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); + $document_config = ModuleModel::getModulePartConfig('document',$module_srl); if($document_config->use_vote_up=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled; $point = 1; @@ -74,7 +72,7 @@ class documentController extends document $module_info = $this->module_info; 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') @@ -90,8 +88,7 @@ class documentController extends document throw new Rhymix\Framework\Exception('failed_voted_cancel'); } - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); if($oDocument->get('voted_count') <= 0) { throw new Rhymix\Framework\Exception('failed_voted_canceled'); @@ -144,13 +141,11 @@ class documentController extends document $document_srl = Context::get('target_srl'); if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); $module_srl = $oDocument->get('module_srl'); if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); + $document_config = ModuleModel::getModulePartConfig('document',$module_srl); if($document_config->use_vote_down=='N') throw new Rhymix\Framework\Exceptions\FeatureDisabled; $point = -1; @@ -181,8 +176,7 @@ class documentController extends document $document_srl = Context::get('target_srl'); if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); if($oDocument->get('blamed_count') >= 0) { throw new Rhymix\Framework\Exception('failed_blamed_canceled'); @@ -328,16 +322,14 @@ class documentController extends document } $document_srl = intval(Context::get('target_srl')); - - $oDocument = getModel('document')->getDocument($document_srl); - + + $oDocument = DocumentModel::getDocument($document_srl); if(!$oDocument->isExists()) { 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') { throw new Rhymix\Framework\Exception('failed_declared_cancel'); @@ -427,7 +419,7 @@ class documentController extends document */ function addGrant($document_srl) { - $oDocument = getModel('document')->getDocument($document_srl); + $oDocument = DocumentModel::getDocument($document_srl); if ($oDocument->isExists()) { $oDocument->setGrant(); @@ -526,10 +518,9 @@ class documentController extends document } // Set to 0 if the category_srl doesn't exist - $oDocumentModel = getModel('document'); 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) { 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. 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. @@ -613,7 +604,7 @@ class documentController extends document // Insert extra variables if the document successfully inserted. $extra_vars = array(); - $extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl); + $extra_keys = DocumentModel::getExtraKeys($obj->module_srl); if(count($extra_keys)) { 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'); - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document', $obj->module_srl); + $document_config = ModuleModel::getModulePartConfig('document', $obj->module_srl); if(!$document_config) { $document_config = new stdClass(); @@ -793,10 +783,9 @@ class documentController extends document unset($obj->_saved_doc_message); // 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) { - $category_list = $oDocumentModel->getCategoryList($obj->module_srl); + $category_list = DocumentModel::getCategoryList($obj->module_srl); if(!$category_list[$obj->category_srl]) $obj->category_srl = 0; } @@ -806,7 +795,7 @@ class documentController extends document // Hash the password if it exists 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. @@ -910,7 +899,7 @@ class documentController extends document { $this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType()); // 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)) { foreach($extra_keys as $idx => $extra_item) @@ -1037,15 +1026,12 @@ class documentController extends document if(!$isEmptyTrash) { - // get model object of the document - $oDocumentModel = getModel('document'); // 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'); - $oMemberModel = getModel('member'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl')); + $member_info = MemberModel::getMemberInfoByMemberSrl($oDocument->get('member_srl')); $logged_info = Context::get('logged_info'); 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(); else $trash_args->trash_srl = $obj->trash_srl; // Get its module_srl which the document belongs to - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($obj->document_srl); + $oDocument = DocumentModel::getDocument($obj->document_srl); - $oMemberModel = getModel('member'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($oDocument->get('member_srl')); + $member_info = MemberModel::getMemberInfoByMemberSrl($oDocument->get('member_srl')); if($member_info->is_admin == 'Y' && $logged_info->is_admin != 'Y') { return new BaseObject(-1, 'msg_admin_document_no_move_to_trash'); @@ -1283,8 +1267,7 @@ class documentController extends document 'none' => true, ); - $oDocumentModel = getModel('document'); - $config = $oDocumentModel->getDocumentConfig(); + $config = DocumentModel::getDocumentConfig(); if (!$config->view_count_option || !isset($valid_options[$config->view_count_option])) { $config->view_count_option = 'once'; @@ -1524,8 +1507,7 @@ class documentController extends document } // Get the original document - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); // Pass if the author's IP address is as same as visitor's. if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) @@ -1534,9 +1516,8 @@ class documentController extends document return new BaseObject(-1, $failed_voted); } - // Create a member model object - $oMemberModel = getModel('member'); - $member_srl = $oMemberModel->getLoggedMemberSrl(); + // Get current member_srl + $member_srl = MemberModel::getLoggedMemberSrl(); // Check if document's author is a member. if($oDocument->get('member_srl')) @@ -1673,8 +1654,7 @@ class documentController extends document } // Get the original document - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); // Pass if the author's IP address is as same as visitor's. if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) @@ -1753,8 +1733,7 @@ class documentController extends document // Send message to admin $message_targets = array(); $module_srl = $oDocument->get('module_srl'); - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document', $module_srl); + $document_config = ModuleModel::getModulePartConfig('document', $module_srl); if ($document_config->declared_message && in_array('admin', $document_config->declared_message)) { $output = executeQueryArray('member.getAdmins', new stdClass); @@ -1809,8 +1788,7 @@ class documentController extends document } // Get the original document - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl, false, false); + $oDocument = DocumentModel::getDocument($document_srl, false, false); $oDB = DB::getInstance(); $oDB->begin(); @@ -1872,8 +1850,7 @@ class documentController extends document $message_targets = array(); $module_srl = $oDocument->get('module_srl'); - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document', $module_srl); + $document_config = ModuleModel::getModulePartConfig('document', $module_srl); if ($document_config->declared_message && in_array('admin', $document_config->declared_message)) { $output = executeQueryArray('member.getAdmins', new stdClass); @@ -1968,8 +1945,7 @@ class documentController extends document if($obj->parent_srl) { // Get its parent category - $oDocumentModel = getModel('document'); - $parent_category = $oDocumentModel->getCategory($obj->parent_srl); + $parent_category = DocumentModel::getCategory($obj->parent_srl); $obj->list_order = $parent_category->list_order; $this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1); 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) { // Create a document model object - $oDocumentModel = getModel('document'); - if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl); + if(!$document_count) + { + $document_count = DocumentModel::getCategoryDocumentCount($module_srl,$category_srl); + } $args = new stdClass; $args->category_srl = $category_srl; @@ -2046,8 +2024,7 @@ class documentController extends document { $args = new stdClass(); $args->category_srl = $category_srl; - $oDocumentModel = getModel('document'); - $category_info = $oDocumentModel->getCategory($category_srl); + $category_info = DocumentModel::getCategory($category_srl); // Display an error that the category cannot be deleted if it has a child $output = executeQuery('document.getChildCategoryCount', $args); if(!$output->toBool()) return $output; @@ -2108,7 +2085,6 @@ class documentController extends document */ function moveCategoryUp($category_srl) { - $oDocumentModel = getModel('document'); // Get information of the selected category $args = new stdClass; $args->category_srl = $category_srl; @@ -2118,7 +2094,7 @@ class documentController extends document $list_order = $category->list_order; $module_srl = $category->module_srl; // 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); if(count($category_srl_list)<2) return new BaseObject(); @@ -2155,7 +2131,6 @@ class documentController extends document */ function moveCategoryDown($category_srl) { - $oDocumentModel = getModel('document'); // Get information of the selected category $args = new stdClass; $args->category_srl = $category_srl; @@ -2165,7 +2140,7 @@ class documentController extends document $list_order = $category->list_order; $module_srl = $category->module_srl; // 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); if(count($category_srl_list)<2) return new BaseObject(); @@ -2200,8 +2175,7 @@ class documentController extends document */ function addXmlJsFilter($module_srl) { - $oDocumentModel = getModel('document'); - $extra_keys = $oDocumentModel->getExtraKeys($module_srl); + $extra_keys = DocumentModel::getExtraKeys($module_srl); if(!count($extra_keys)) return; $js_code = array(); @@ -2251,10 +2225,9 @@ class documentController extends document $args->module_srl = $this->module_srl; } // Check permissions - $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); - $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); + $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl, $columnList); + $grant = ModuleModel::getGrant($module_info, Context::get('logged_info')); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); if($args->expand !="Y") $args->expand = "N"; @@ -2262,14 +2235,12 @@ class documentController extends document else $args->group_srls = implode(',', $args->group_srls); $args->parent_srl = (int)$args->parent_srl; - $oDocumentModel = getModel('document'); - $oDB = &DB::getInstance(); $oDB->begin(); // Check if already exists 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; } // Update if exists @@ -2318,20 +2289,18 @@ class documentController extends document // If target_srl exists, be a sibling $target_category_srl = Context::get('target_srl'); - $oDocumentModel = getModel('document'); - $source_category = $oDocumentModel->getCategory($source_category_srl); + $source_category = DocumentModel::getCategory($source_category_srl); // Check permissions - $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList); - $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); + $module_info = ModuleModel::getModuleInfoByModuleSrl($source_category->module_srl, $columnList); + $grant = ModuleModel::getGrant($module_info, Context::get('logged_info')); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); // First child of the parent_category_srl $source_args = new stdClass; 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->module_srl = $source_category->module_srl; @@ -2352,7 +2321,7 @@ class documentController extends document } 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 $output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1); if(!$output->toBool()) return $output; @@ -2382,18 +2351,16 @@ class documentController extends document $oDB = &DB::getInstance(); $oDB->begin(); // Check permissions - $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList); - $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); + $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl, $columnList); + $grant = ModuleModel::getGrant($module_info, Context::get('logged_info')); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); - $oDocumentModel = getModel('document'); // 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; // 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 $output = $this->deleteCategory($args->category_srl); if(!$output->toBool()) @@ -2423,10 +2390,9 @@ class documentController extends document // Check input values $module_srl = Context::get('module_srl'); // Check permissions - $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); - $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info')); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList); + $grant = ModuleModel::getGrant($module_info, Context::get('logged_info')); if(!$grant->manager) return new BaseObject(-1, 'msg_not_permitted'); $xml_file = $this->makeCategoryFile($module_srl); @@ -2445,9 +2411,8 @@ class documentController extends document $module_srl = intval($module_srl); if(!$module_srl) return false; // Get module information (to obtain mid) - $oModuleModel = getModel('module'); $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; 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(); // 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); for($i=0;$igetModuleInfoByModuleSrl($module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl); $logged_info = Context::get('logged_info'); if($logged_info->is_admin != 'Y') { @@ -2798,7 +2762,7 @@ class documentController extends document unset($document_srls[$module_srl]); continue; } - $grant = $oModuleModel->getGrant($module_info, $logged_info); + $grant = ModuleModel::getGrant($module_info, $logged_info); if(!$grant->manager) { unset($document_srls[$module_srl]); @@ -2843,12 +2807,12 @@ class documentController extends document // Check permission of target module 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) { 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) { throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -2864,7 +2828,7 @@ class documentController extends document $obj->document_srl_list = array_unique(array_map('intval', $cart)); // 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)) { throw new Rhymix\Framework\Exceptions\InvalidRequest; @@ -3015,18 +2979,17 @@ Content; $target_module_srl = array_map('trim', explode(',', $target_module_srl)); $logged_info = Context::get('logged_info'); $module_srl = array(); - $oModuleModel = getModel('module'); foreach ($target_module_srl as $srl) { if (!$srl) continue; - $module_info = $oModuleModel->getModuleInfoByModuleSrl($srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($srl); if (!$module_info->module_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $module_grant = $oModuleModel->getGrant($module_info, $logged_info); + $module_grant = ModuleModel::getGrant($module_info, $logged_info); if (!$module_grant->manager) { throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -3085,8 +3048,7 @@ Content; unset($obj->title_bold); } - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($obj->document_srl); + $oDocument = DocumentModel::getDocument($obj->document_srl); // Update if already exists if($oDocument->isExists()) @@ -3108,7 +3070,7 @@ Content; { $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 @@ -3140,15 +3102,13 @@ Content; if(count($documentSrlList) > 0) { - $oDocumentModel = getModel('document'); $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 { - global $lang; $documentList = array(); - $this->setMessage($lang->no_documents); + $this->setMessage(lang(no_documents)); } $oSecurity = new Security($documentList); $oSecurity->encodeHTML('..variables.'); @@ -3201,7 +3161,6 @@ Content; return; } - $oFileModel = getModel('file'); $document_srl_list = array_unique($document_srl_list); foreach($document_srl_list as $document_srl) @@ -3213,14 +3172,14 @@ Content; $args = new stdClass; $args->document_srl = $document_srl; - $args->uploaded_count = $oFileModel->getFilesCount($document_srl); + $args->uploaded_count = FileModel::getFilesCount($document_srl); executeQuery('document.updateUploadedCount', $args); } } 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()) { return; @@ -3236,8 +3195,7 @@ Content; */ function triggerCopyModuleExtraKeys(&$obj) { - $oDocumentModel = getModel('document'); - $documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl); + $documentExtraKeys = DocumentModel::getExtraKeys($obj->originModuleSrl); if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList)) { @@ -3254,8 +3212,7 @@ Content; function triggerCopyModule(&$obj) { - $oModuleModel = getModel('module'); - $documentConfig = $oModuleModel->getModulePartConfig('document', $obj->originModuleSrl); + $documentConfig = ModuleModel::getModulePartConfig('document', $obj->originModuleSrl); $oModuleController = getController('module'); if(is_array($obj->moduleSrlList)) diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 04ce31942..589a00bca 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -10,7 +10,7 @@ */ class documentModel extends document { - private $documentConfig = NULL; + protected static $_config; /** * Initialization @@ -25,7 +25,7 @@ class documentModel extends document * @param int $document_srl * @return void */ - function isGranted($document_srl) + public static function isGranted($document_srl) { return $_SESSION['granted_document'][$document_srl]; } @@ -35,7 +35,7 @@ class documentModel extends document * @param array $document_srls * @return object */ - function getDocumentExtraVarsFromDB($document_srls) + public static function getDocumentExtraVarsFromDB($document_srls) { $args = new stdClass; $args->document_srl = $document_srls; @@ -46,7 +46,7 @@ class documentModel extends document * Extra variables for each article will not be processed bulk select and apply the macro city * @return void */ - function setToAllDocumentExtraVars() + public static function setToAllDocumentExtraVars() { // get document list $_document_list = &$GLOBALS['XE_DOCUMENT_LIST']; @@ -78,7 +78,7 @@ class documentModel extends document // get extra values of documents $extra_values = array(); - $output = $this->getDocumentExtraVarsFromDB($document_srls); + $output = self::getDocumentExtraVarsFromDB($document_srls); foreach($output->data as $key => $val) { if(strval($val->value) === '') @@ -104,7 +104,7 @@ class documentModel extends document // get extra keys of the module if(!isset($module_extra_keys[$module_srl])) { - $module_extra_keys[$module_srl] = $this->getExtraKeys($module_srl); + $module_extra_keys[$module_srl] = self::getExtraKeys($module_srl); } // set extra variables of the document @@ -155,7 +155,7 @@ class documentModel extends document * @param array $columnList * @return documentItem */ - function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array()) + public static function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array()) { if(!$document_srl) { @@ -185,7 +185,7 @@ class documentModel extends document * @param array $columnList * @return array value type is documentItem */ - function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array()) + public static function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array()) { if (!is_array($document_srls)) { @@ -220,7 +220,7 @@ class documentModel extends document if($load_extra_vars) { - $this->setToAllDocumentExtraVars(); + self::setToAllDocumentExtraVars(); } return $documents; @@ -234,9 +234,9 @@ class documentModel extends document * @param array $columnList * @return Object */ - function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array()) + public static function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array()) { - $sort_check = $this->_setSortIndex($obj, $load_extra_vars); + $sort_check = self::_setSortIndex($obj, $load_extra_vars); $obj->sort_index = $sort_check->sort_index; $obj->isExtraVars = $sort_check->isExtraVars; $obj->except_notice = $except_notice; @@ -259,7 +259,7 @@ class documentModel extends document // execute query else { - $this->_setSearchOption($obj, $args, $query_id, $use_division); + self::_setSearchOption($obj, $args, $query_id, $use_division); $output = executeQueryArray($query_id, $args, $args->columnList); } @@ -287,7 +287,7 @@ class documentModel extends document if($load_extra_vars) { - $this->setToAllDocumentExtraVars(); + self::setToAllDocumentExtraVars(); } // Call trigger (after) @@ -302,7 +302,7 @@ class documentModel extends document * @param array $columnList * @return object|void */ - function getNoticeList($obj, $columnList = array()) + public static function getNoticeList($obj, $columnList = array()) { $args = new stdClass(); $args->module_srl = $obj->module_srl; @@ -324,7 +324,7 @@ class documentModel extends document $output->data[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl]; } - $this->setToAllDocumentExtraVars(); + self::setToAllDocumentExtraVars(); return $output; } @@ -335,7 +335,7 @@ class documentModel extends document * @param int $module_srl * @return array */ - function getExtraKeys($module_srl) + public static function getExtraKeys($module_srl) { if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl])) { @@ -414,12 +414,12 @@ class documentModel extends document * @param int $document_srl * @return array */ - function getExtraVars($module_srl, $document_srl) + public static function getExtraVars($module_srl, $document_srl) { if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) { - $this->getDocument($document_srl); - $this->setToAllDocumentExtraVars(); + self::getDocument($document_srl); + self::setToAllDocumentExtraVars(); } if(empty($GLOBALS['XE_EXTRA_VARS'][$document_srl]) || !is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) { @@ -436,7 +436,7 @@ class documentModel extends document * Printing, scrap, recommendations and negative, reported the Add Features * @return void */ - function getDocumentMenu() + public function getDocumentMenu() { // Post number and the current login information requested Wanted $document_srl = Context::get('target_srl'); @@ -449,15 +449,13 @@ class documentModel extends document // Members must be a possible feature if($this->user->member_srl) { - $oDocumentModel = getModel('document'); $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'); $member_srl = $oDocument->get('member_srl'); if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); + $document_config = ModuleModel::getModulePartConfig('document',$module_srl); $oDocumentisVoted = $oDocument->getMyVote(); 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($this->user->is_admin == 'Y') { - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle + $oDocument = self::getDocument($document_srl); //before setting document recycle if($oDocument->isExists()) { @@ -548,7 +545,7 @@ class documentModel extends document * @param object $search_obj * @return int */ - function getDocumentCount($module_srl, $search_obj = NULL) + public static function getDocumentCount($module_srl, $search_obj = NULL) { if(is_null($search_obj)) $search_obj = new stdClass(); $search_obj->module_srl = $module_srl; @@ -564,7 +561,7 @@ class documentModel extends document * @param object $search_obj * @return array */ - function getDocumentCountByGroupStatus($search_obj = NULL) + public static function getDocumentCountByGroupStatus($search_obj = NULL) { $output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj); if(!$output->toBool()) return array(); @@ -572,7 +569,7 @@ class documentModel extends document return $output->data; } - function getDocumentExtraVarsCount($module_srl, $search_obj = NULL) + public static function getDocumentExtraVarsCount($module_srl, $search_obj = NULL) { // Additional search options $args = new stdClass(); @@ -596,13 +593,13 @@ class documentModel extends document * @param object $opt * @return int */ - function getDocumentPage($oDocument, $opt) + public static function getDocumentPage($oDocument, $opt) { - $sort_check = $this->_setSortIndex($opt); + $sort_check = self::_setSortIndex($opt); $opt->sort_index = $sort_check->sort_index; $opt->isExtraVars = $sort_check->isExtraVars; - $this->_setSearchOption($opt, $args, $query_id, $use_division); + self::_setSearchOption($opt, $args, $query_id, $use_division); if($sort_check->isExtraVars || !$opt->list_count) { @@ -653,7 +650,7 @@ class documentModel extends document * @param array $columnList * @return object */ - function getCategory($category_srl, $columnList = array()) + public static function getCategory($category_srl, $columnList = array()) { $args =new stdClass(); $args->category_srl = $category_srl; @@ -681,7 +678,7 @@ class documentModel extends document * @param int $category_srl * @return bool */ - function getCategoryChlidCount($category_srl) + public static function getCategoryChlidCount($category_srl) { $args = new stdClass(); $args->category_srl = $category_srl; @@ -697,7 +694,7 @@ class documentModel extends document * @param array $columnList * @return array */ - function getCategoryList($module_srl, $columnList = array()) + public static function getCategoryList($module_srl, $columnList = array()) { // Category of the target module file swollen $module_srl = intval($module_srl); @@ -713,7 +710,7 @@ class documentModel extends document // Cleanup of category $document_category = array(); - $this->_arrangeCategory($document_category, $menu->list, 0); + self::_arrangeCategory($document_category, $menu->list, 0); return $document_category; } @@ -724,7 +721,7 @@ class documentModel extends document * @param int $depth * @return void */ - function _arrangeCategory(&$document_category, $list, $depth) + public static function _arrangeCategory(&$document_category, $list, $depth) { if(!countobj($list)) return; $idx = 0; @@ -773,7 +770,7 @@ class documentModel extends document $document_category[$key] = $obj; - if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1); + if(count($val['list'])) self::_arrangeCategory($document_category, $val['list'], $depth+1); } $document_category[$list_order[0]]->first = true; $document_category[$list_order[count($list_order)-1]]->last = true; @@ -785,7 +782,7 @@ class documentModel extends document * @param int $category_srl * @return int */ - function getCategoryDocumentCount($module_srl, $category_srl) + public static function getCategoryDocumentCount($module_srl, $category_srl) { $args = new stdClass; $args->module_srl = $module_srl; @@ -799,7 +796,7 @@ class documentModel extends document * @param int $module_srl * @return string */ - function getCategoryXmlFile($module_srl) + public static function getCategoryXmlFile($module_srl) { $module_srl = intval($module_srl); $xml_file = sprintf('files/cache/document_category/%d.xml.php',$module_srl); @@ -816,7 +813,7 @@ class documentModel extends document * @param int $module_srl * @return string */ - function getCategoryPhpFile($module_srl) + public static function getCategoryPhpFile($module_srl) { $module_srl = intval($module_srl); $php_file = sprintf('files/cache/document_category/%d.php',$module_srl); @@ -833,12 +830,11 @@ class documentModel extends document * @param object $obj * @return object */ - function getMonthlyArchivedList($obj) + public static function getMonthlyArchivedList($obj) { if($obj->mid) { - $oModuleModel = getModel('module'); - $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid); + $obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid); unset($obj->mid); } // Module_srl passed the array may be a check whether the array @@ -859,12 +855,11 @@ class documentModel extends document * @param object $obj * @return object */ - function getDailyArchivedList($obj) + public static function getDailyArchivedList($obj) { if($obj->mid) { - $oModuleModel = getModel('module'); - $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid); + $obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid); unset($obj->mid); } // Module_srl passed the array may be a check whether the array @@ -885,11 +880,11 @@ class documentModel extends document * Get a list for a particular module * @return void|Object */ - function getDocumentCategories() + public function getDocumentCategories() { if(!Context::get('is_logged')) throw new Rhymix\Framework\Exceptions\NotPermitted; $module_srl = intval(Context::get('module_srl')); - $categories= $this->getCategoryList($module_srl); + $categories= self::getCategoryList($module_srl); $lang = Context::get('lang'); // No additional category $output = "0,0,{$lang->none_category}\n"; @@ -907,20 +902,13 @@ class documentModel extends document * Wanted to set document information * @return object */ - function getDocumentConfig() + public static function getDocumentConfig() { - if ($this->documentConfig === NULL) + if (self::$_config === null) { - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('document'); - - if (!$config) - { - $config = new stdClass(); - } - $this->documentConfig = $config; + self::$_config = ModuleModel::getModuleConfig('document') ?: new stdClass;; } - return $this->documentConfig; + return self::$_config; } /** @@ -929,10 +917,10 @@ class documentModel extends document * @param int $module_srl * @return string */ - function getExtraVarsHTML($module_srl) + public function getExtraVarsHTML($module_srl) { // Bringing existing extra_keys - $extra_keys = $this->getExtraKeys($module_srl); + $extra_keys = self::getExtraKeys($module_srl); Context::set('extra_keys', $extra_keys); $security = new Security(); $security->encodeHTML('extra_keys..', 'selected_var_idx'); @@ -947,17 +935,16 @@ class documentModel extends document * @param int $module_srl * @return string */ - function getCategoryHTML($module_srl) + public function getCategoryHTML($module_srl) { - $category_xml_file = $this->getCategoryXmlFile($module_srl); + $category_xml_file = self::getCategoryXmlFile($module_srl); Context::set('category_xml_file', $category_xml_file); Context::loadJavascriptPlugin('ui.tree'); // Get a list of member groups - $oMemberModel = getModel('member'); - $group_list = $oMemberModel->getGroups(); + $group_list = MemberModel::getGroups(); Context::set('group_list', $group_list); $security = new Security(); @@ -973,19 +960,17 @@ class documentModel extends document * Manager on the page to add information about a particular menu from the server after compiling tpl compiled a direct return html * @return void|Object */ - function getDocumentCategoryTplInfo() + public function getDocumentCategoryTplInfo() { - $oModuleModel = getModel('module'); - $oMemberModel = getModel('member'); // Get information on the menu for the parameter settings $module_srl = Context::get('module_srl'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl); // 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; $category_srl = Context::get('category_srl'); - $category_info = $this->getCategory($category_srl); + $category_info = self::getCategory($category_srl); if(!$category_info) { throw new Rhymix\Framework\Exceptions\InvalidRequest; @@ -1000,7 +985,7 @@ class documentModel extends document * @param string $alias * @return int|void */ - function getDocumentSrlByAlias($mid, $alias) + public static function getDocumentSrlByAlias($mid, $alias) { if(!$mid || !$alias) return null; $site_module_info = Context::get('site_module_info'); @@ -1019,7 +1004,7 @@ class documentModel extends document * @param string $title * @return int|void */ - function getDocumentSrlByTitle($module_srl, $title) + public static function getDocumentSrlByTitle($module_srl, $title) { if(!$module_srl || !$title) return null; $args = new stdClass; @@ -1039,7 +1024,7 @@ class documentModel extends document * @param int $document_srl * @return string|void */ - function getAlias($document_srl) + public static function getAlias($document_srl) { if(!$document_srl) return null; $args = new stdClass; @@ -1057,7 +1042,7 @@ class documentModel extends document * @param int $page * @return object */ - function getHistories($document_srl, $list_count, $page) + public static function getHistories($document_srl, $list_count, $page) { $args = new stdClass; $args->list_count = $list_count; @@ -1072,7 +1057,7 @@ class documentModel extends document * @param int $history_srl * @return object */ - function getHistory($history_srl) + public static function getHistory($history_srl) { $args = new stdClass; $args->history_srl = $history_srl; @@ -1085,7 +1070,7 @@ class documentModel extends document * @param object $obj * @return object */ - function getTrashList($obj) + public static function getTrashList($obj) { // Variable check $args = new stdClass; @@ -1127,8 +1112,8 @@ class documentModel extends document break; case 'is_notice' : case 'is_secret' : - if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public')); - elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret')); + if($search_keyword=='N') $args->statusList = array(self::getConfigStatus('public')); + elseif($search_keyword=='Y') $args->statusList = array(self::getConfigStatus('secret')); break; case 'member_srl' : case 'readed_count' : @@ -1166,7 +1151,7 @@ class documentModel extends document * vote up, vote down member list in Document View page * @return void|Object */ - function getDocumentVotedMemberList() + public function getDocumentVotedMemberList() { $args = new stdClass; $document_srl = Context::get('document_srl'); @@ -1175,14 +1160,12 @@ class documentModel extends document $point = Context::get('point'); if($point != -1) $point = 1; - $oDocumentModel = getModel('document'); $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'); if(!$module_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oModuleModel = getModel('module'); - $document_config = $oModuleModel->getModulePartConfig('document',$module_srl); + $document_config = ModuleModel::getModulePartConfig('document',$module_srl); if($point == -1) { if($document_config->use_vote_down!='S') throw new Rhymix\Framework\Exceptions\FeatureDisabled; @@ -1199,12 +1182,11 @@ class documentModel extends document $output = executeQueryArray('document.getVotedMemberList',$args); if(!$output->toBool()) return $output; - $oMemberModel = getModel('member'); if($output->data) { foreach($output->data as $k => $d) { - $profile_image = $oMemberModel->getProfileImage($d->member_srl); + $profile_image = MemberModel::getProfileImage($d->member_srl); $output->data[$k]->src = $profile_image->src; } } @@ -1216,12 +1198,17 @@ class documentModel extends document * Return status name list * @return array */ - function getStatusNameList() + public static function getStatusNameList() { global $lang; if(!isset($lang->status_name_list)) - return array_flip($this->getStatusList()); - else return $lang->status_name_list; + { + return array_flip(self::getStatusList()); + } + else + { + return $lang->status_name_list; + } } /** @@ -1230,7 +1217,7 @@ class documentModel extends document * @param bool $load_extra_vars * @return object */ - function _setSortIndex($obj, $load_extra_vars = true) + public static function _setSortIndex($obj, $load_extra_vars = true) { $args = new stdClass; $args->sort_index = $obj->sort_index; @@ -1244,7 +1231,7 @@ class documentModel extends document } // check it can use extra variable - if(!$load_extra_vars || !$extra_keys = $this->getExtraKeys($obj->module_srl)) + if(!$load_extra_vars || !$extra_keys = self::getExtraKeys($obj->module_srl)) { $args->sort_index = 'list_order'; return $args; @@ -1277,7 +1264,7 @@ class documentModel extends document * @param bool $use_division * @return void */ - function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division) + public static function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division) { $args = new stdClass; $args->module_srl = $searchOpt->module_srl; @@ -1292,19 +1279,19 @@ class documentModel extends document $args->start_date = $searchOpt->start_date ?: null; $args->end_date = $searchOpt->end_date ?: null; $args->s_is_notice = $searchOpt->except_notice ? 'N' : null; - $args->statusList = $searchOpt->statusList ?: array($this->getConfigStatus('public'), $this->getConfigStatus('secret')); + $args->statusList = $searchOpt->statusList ?: array(self::getConfigStatus('public'), self::getConfigStatus('secret')); $args->columnList = $searchOpt->columnList ?: array(); // get directly module_srl by mid if($searchOpt->mid) { - $args->module_srl = getModel('module')->getModuleSrlByMid($searchOpt->mid); + $args->module_srl = ModuleModel::getModuleSrlByMid($searchOpt->mid); } // add subcategories if($args->category_srl) { - $category_list = $this->getCategoryList($args->module_srl); + $category_list = self::getCategoryList($args->module_srl); if(isset($category_list[$args->category_srl])) { $categories = $category_list[$args->category_srl]->childs; @@ -1376,15 +1363,15 @@ class documentModel extends document case 'is_secret' : if($search_keyword == 'N') { - $args->statusList = array($this->getConfigStatus('public')); + $args->statusList = array(self::getConfigStatus('public')); } elseif($search_keyword == 'Y') { - $args->statusList = array($this->getConfigStatus('secret')); + $args->statusList = array(self::getConfigStatus('secret')); } elseif($search_keyword == 'temp') { - $args->statusList = array($this->getConfigStatus('temp')); + $args->statusList = array(self::getConfigStatus('temp')); } break; default : @@ -1400,11 +1387,11 @@ class documentModel extends document // 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) { - $module_info = getModel('module')->getModuleInfoByModuleSrl($args->module_srl); - if(!getModel('module')->getGrant($module_info, Context::get('logged_info'))->manager) + $module_info = ModuleModel::getModuleInfoByModuleSrl($args->module_srl); + if(!ModuleModel::getGrant($module_info, Context::get('logged_info'))->manager) { $args->comment_is_secret = 'N'; - $args->statusList = array($this->getConfigStatus('public')); + $args->statusList = array(self::getConfigStatus('public')); } } } @@ -1484,7 +1471,7 @@ class documentModel extends document * @param int $member_srl * @return int */ - function getDocumentCountByMemberSrl($member_srl) + public static function getDocumentCountByMemberSrl($member_srl) { $args = new stdClass(); $args->member_srl = $member_srl; @@ -1501,7 +1488,7 @@ class documentModel extends document * @param int $count * @return object */ - function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 ) + public static function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0) { $args = new stdClass(); $args->member_srl = $member_srl; @@ -1515,7 +1502,7 @@ class documentModel extends document return $document_list; } - function getDocumentUpdateLog($document_srl) + public static function getDocumentUpdateLog($document_srl) { $args = new stdClass(); $args->document_srl = $document_srl; @@ -1524,17 +1511,17 @@ class documentModel extends document return $output; } - function getUpdateLog($update_id) + public static function getUpdateLog($update_id) { $args = new stdClass(); $args->update_id = $update_id; $output = exeCuteQuery('document.getUpdateLog', $args); - $updage_log = $output->data; + $update_log = $output->data; - return $updage_log; + return $update_log; } - function getUpdateLogAdminisExists($document_srl = null) + public static function getUpdateLogAdminisExists($document_srl = null) { if($document_srl == null) { @@ -1553,9 +1540,9 @@ class documentModel extends document return false; } - function getDocumentExtraImagePath() + public static function getDocumentExtraImagePath() { - $documentConfig = getModel('document')->getDocumentConfig(); + $documentConfig = self::getDocumentConfig(); if(Mobile::isFromMobilePhone()) { $iconSkin = $documentConfig->micons; diff --git a/modules/document/document.view.php b/modules/document/document.view.php index 202dd92b0..70f799efb 100644 --- a/modules/document/document.view.php +++ b/modules/document/document.view.php @@ -28,14 +28,8 @@ class documentView extends document // Bring a list of variables needed to implement $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 - $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; // Check permissions if(!$oDocument->isAccessible()) throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -71,7 +65,7 @@ class documentView extends document // Editor converter $obj = new stdClass; $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 = sprintf('
%s
', Context::get('logged_info')->member_srl, $content); Context::set('content', $content); @@ -102,8 +96,7 @@ class documentView extends document if(count($document_srl_list)) { - $oDocumentModel = getModel('document'); - $document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin); + $document_list = DocumentModel::getDocuments($document_srl_list, $this->grant->is_admin); Context::set('document_list', $document_list); } else @@ -113,7 +106,7 @@ class documentView extends document $module_srl = intval(Context::get('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('browser_title',$module_info->browser_title); @@ -144,10 +137,9 @@ class documentView extends document if(!$current_module_srl) return new BaseObject(); } - $oModuleModel = getModel('module'); if($current_module_srl) { - $document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl); + $document_config = ModuleModel::getModulePartConfig('document', $current_module_srl); } if(!$document_config) { @@ -171,9 +163,8 @@ class documentView extends document { $this->setLayoutFile('popup_layout'); - $oMemberModel = getModel('member'); // A message appears if the user is not logged-in - if(!$oMemberModel->isLogged()) + if(!$this->user->member_srl) { throw new Rhymix\Framework\Exceptions\MustLogin; } @@ -185,8 +176,7 @@ class documentView extends document $args->page = (int)Context::get('page'); $args->list_count = 10; - $oDocumentModel = getModel('document'); - $output = $oDocumentModel->getDocumentList($args, true); + $output = DocumentModel::getDocumentList($args, true); Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); Context::set('page', $output->page); @@ -206,17 +196,14 @@ class documentView extends document $this->setLayoutFile('popup_layout'); $document_srl = Context::get('target_srl'); - $oMemberModel = getModel('member'); // A message appears if the user is not logged-in - if(!$oMemberModel->isLogged()) + if(!$this->user->member_srl) { throw new Rhymix\Framework\Exceptions\MustLogin; } - // Create the 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 - $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager, FALSE); + $oDocument = DocumentModel::getDocument($document_srl, $this->grant->manager, FALSE); if(!$oDocument->isExists()) { throw new Rhymix\Framework\Exceptions\TargetNotFound; diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php index 40fbc655a..fc3aabd3e 100644 --- a/modules/file/file.controller.php +++ b/modules/file/file.controller.php @@ -32,7 +32,6 @@ class fileController extends file if(!$file_info || !is_uploaded_file($file_info['tmp_name'])) exit(); // Basic variables setting - $oFileModel = getModel('file'); $editor_sequence = Context::get('editor_sequence'); $module_srl = $this->module_srl; @@ -88,7 +87,7 @@ class fileController extends file $is_admin = (Context::get('logged_info')->is_admin === 'Y'); 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_filesize = $module_config->allowed_filesize * 1024 * 1024; if ($total_size > $allowed_filesize) @@ -155,11 +154,11 @@ class fileController extends file $this->add('original_type', $output->get('original_type')); 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 { - $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'); if($file_srl) { - $oFileModel = getModel('file'); - $logged_info = Context::get('logged_info'); - $file_info = $oFileModel->getFile($file_srl); - if($file_info->file_srl == $file_srl && $oFileModel->isDeletable($file_info)) + $file_info = FileModel::getFile($file_srl); + if($file_info->file_srl == $file_srl && FileModel::isDeletable($file_info)) { $this->deleteFile($file_srl); } @@ -225,8 +222,7 @@ class fileController extends file throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $oFileModel = getModel('file'); - $fileInfo = $oFileModel->getFile($file_srl); + $fileInfo = FileModel::getFile($file_srl); if(!$fileInfo || $fileInfo->direct_download != 'Y') { throw new Rhymix\Framework\Exceptions\InvalidRequest; @@ -284,8 +280,6 @@ class fileController extends file */ function procFileDownload() { - $oFileModel = getModel('file'); - if(isset($this->grant->access) && $this->grant->access !== true) { throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -295,7 +289,7 @@ class fileController extends file $sid = Context::get('sid'); $logged_info = Context::get('logged_info'); // 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($file_obj->file_srl != $file_srl || $file_obj->sid !== $sid) { @@ -303,7 +297,7 @@ class fileController extends file } // File name $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 if($file_module_config->allow_outlink == 'N' && $_SERVER["HTTP_REFERER"]) { @@ -356,7 +350,7 @@ class fileController extends file } // 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'); } @@ -406,14 +400,13 @@ class fileController extends file public function procFileOutput() { // Get requsted file info - $oFileModel = getModel('file'); $file_srl = Context::get('file_srl'); $file_key = Context::get('file_key'); $filename_arg = Context::get('filename'); $columnList = array('source_filename', 'uploaded_filename', 'file_size'); - $file_obj = $oFileModel->getFile($file_srl, $columnList); - $file_config = $oFileModel->getFileConfig($file_obj->module_srl ?: null); + $file_obj = FileModel::getFile($file_srl, $columnList); + $file_config = FileModel::getFileConfig($file_obj->module_srl ?: null); $filesize = $file_obj->file_size; $filename = preg_replace('/\.\.+/', '.', $file_obj->source_filename); $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; - $logged_info = Context::get('logged_info'); - $oFileModel = getModel('file'); - $srls = explode(',',$file_srl); if(!count($srls)) return; @@ -588,7 +578,7 @@ class fileController extends file $file_info = $output->data; 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); } } @@ -606,7 +596,7 @@ class fileController extends file } $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; } @@ -617,8 +607,7 @@ class fileController extends file global $lang; if(count($fileSrlList) > 0) { - $oFileModel = getModel('file'); - $fileList = $oFileModel->getFile($fileSrlList); + $fileList = FileModel::getFile($fileSrlList); $fileSizeTotal = 0; if(!is_array($fileList)) $fileList = array($fileList); @@ -656,8 +645,7 @@ class fileController extends file if(!$document_srl) return; // Get numbers of attachments - $oFileModel = getModel('file'); - $obj->uploaded_count = $oFileModel->getFilesCount($document_srl); + $obj->uploaded_count = FileModel::getFilesCount($document_srl); // TODO: WTF are we doing with uploaded_count anyway? } @@ -702,8 +690,7 @@ class fileController extends file $comment_srl = $obj->comment_srl; if(!$comment_srl) return; // Get numbers of attachments - $oFileModel = getModel('file'); - $obj->uploaded_count = $oFileModel->getFilesCount($comment_srl); + $obj->uploaded_count = FileModel::getFilesCount($comment_srl); } /** @@ -874,8 +861,7 @@ class fileController extends file } // Get file module configuration - $oFileModel = getModel('file'); - $config = $oFileModel->getFileConfig($module_srl); + $config = FileModel::getFileConfig($module_srl); // Check file extension if(!$manual_insert && !$this->user->isAdmin()) @@ -1355,7 +1341,7 @@ class fileController extends file return new BaseObject(); } - $config = getModel('file')->getFileConfig(); + $config = FileModel::getFileConfig(); $oDB = DB::getInstance(); $oDB->begin(); @@ -1367,7 +1353,7 @@ class fileController extends file { continue; } - $file = getModel('file')->getFile($file_srl); + $file = FileModel::getFile($file_srl); } if(empty($file->file_srl)) @@ -1432,8 +1418,7 @@ class fileController extends file function deleteFiles($upload_target_srl) { // Get a list of attachements - $oFileModel = getModel('file'); - $file_list = $oFileModel->getFiles($upload_target_srl); + $file_list = FileModel::getFiles($upload_target_srl); // Success returned if no attachement exists if(empty($file_list)) @@ -1478,13 +1463,12 @@ class fileController extends file { if($source_srl == $target_srl) return; - $oFileModel = getModel('file'); - $file_list = $oFileModel->getFiles($source_srl); + $file_list = FileModel::getFiles($source_srl); if(!$file_list) return; $file_count = count($file_list); - $config = $oFileModel->getFileConfig($module_srl); + $config = FileModel::getFileConfig($module_srl); $oDB = DB::getInstance(); $oDB->begin(); @@ -1579,7 +1563,7 @@ class fileController extends file { 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) @@ -1597,8 +1581,7 @@ class fileController extends file $upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl; - $oFileModel = getModel('file'); - $file_info = $oFileModel->getFile($vars->file_srl); + $file_info = FileModel::getFile($vars->file_srl); if(!$file_info) throw new Rhymix\Framework\Exceptions\TargetNotFound; @@ -1652,7 +1635,7 @@ class fileController extends file * @param bool $absolute_path * @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); @@ -1721,8 +1704,7 @@ class fileController extends file function triggerCopyModule(&$obj) { - $oModuleModel = getModel('module'); - $fileConfig = $oModuleModel->getModulePartConfig('file', $obj->originModuleSrl); + $fileConfig = ModuleModel::getModulePartConfig('file', $obj->originModuleSrl); $oModuleController = getController('module'); if(is_array($obj->moduleSrlList)) diff --git a/modules/file/file.model.php b/modules/file/file.model.php index 271dd325c..c85356f9f 100644 --- a/modules/file/file.model.php +++ b/modules/file/file.model.php @@ -10,7 +10,7 @@ class fileModel extends file * Initialization * @return void */ - function init() + public function init() { } @@ -22,7 +22,7 @@ class fileModel extends file * * @return void */ - function getFileList() + public function getFileList() { $file_list = []; $attached_size = 0; @@ -36,22 +36,19 @@ class fileModel extends file // Get uploaded files if($upload_target_srl) { - $oModuleModel = getModel('module'); - $oCommentModel = getModel('comment'); - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($upload_target_srl); + $oDocument = DocumentModel::getDocument($upload_target_srl); // Check permissions of the comment if(!$oDocument->isExists()) { - $oComment = $oCommentModel->getComment($upload_target_srl); + $oComment = CommentModel::getComment($upload_target_srl); if($oComment->isExists()) { if(!$oComment->isAccessible()) { 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 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)) { 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) { throw new Rhymix\Framework\Exceptions\NotPermitted; @@ -77,7 +74,7 @@ class fileModel extends file } // Set file list - foreach($this->getFiles($upload_target_srl) as $file_info) + foreach(self::getFiles($upload_target_srl) as $file_info) { $obj = new stdClass; $obj->file_srl = $file_info->file_srl; @@ -90,9 +87,9 @@ class fileModel extends file $obj->direct_download = $file_info->direct_download; $obj->cover_image = ($file_info->cover_image === 'Y') ? true : false; $obj->download_url = $file_info->download_url; - if($obj->direct_download === 'Y' && $this->isDownloadable($file_info)) + if($obj->direct_download === 'Y' && self::isDownloadable($file_info)) { - $obj->download_url = $this->getDirectFileUrl($file_info->uploaded_filename); + $obj->download_url = self::getDirectFileUrl($file_info->uploaded_filename); } $file_list[] = $obj; @@ -107,7 +104,7 @@ class fileModel extends file $this->add('upload_target_srl', $upload_target_srl); // Set upload config - $upload_config = $this->getUploadConfig(); + $upload_config = self::getUploadConfig(); if($this->user->isAdmin()) { $this->add('allowed_filesize', sprintf('%s (%s)', lang('common.unlimited'), lang('common.admin'))); @@ -123,7 +120,7 @@ class fileModel extends file // for compatibility $this->add('allowed_filetypes', $upload_config->allowed_filetypes); - $this->add('upload_status', $this->getUploadStatus($attached_size)); + $this->add('upload_status', self::getUploadStatus($attached_size)); $this->add('left_size', $upload_config->allowed_attach_size * 1024 * 1024 - $attached_size); } @@ -134,13 +131,13 @@ class fileModel extends file * @param object $member_info * @return bool */ - function isDownloadable($file_info, $member_info = null) + public static function isDownloadable($file_info, $member_info = null) { if(!$member_info) { - $member_info = $this->user; + $member_info = Rhymix\Framework\Session::getMemberInfo(); } - if($this->isDeletable($file_info, $member_info)) + if(self::isDeletable($file_info, $member_info)) { return true; } @@ -152,7 +149,7 @@ class fileModel extends file } // Check download groups - $config = $this->getFileConfig($file_info->module_srl); + $config = self::getFileConfig($file_info->module_srl); if($config->download_groups) { if(empty($member_info->member_srl)) @@ -161,7 +158,7 @@ class fileModel extends file } 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; foreach($config->download_groups as $group_srl) @@ -188,11 +185,11 @@ class fileModel extends file * @param object $member_info * @return bool */ - function isDeletable($file_info, $member_info = null) + public static function isDeletable($file_info, $member_info = null) { if(!$member_info) { - $member_info = $this->user; + $member_info = Rhymix\Framework\Session::getMemberInfo(); } if($member_info->is_admin === 'Y' || $member_info->member_srl == $file_info->member_srl) { @@ -204,27 +201,26 @@ class fileModel extends file } // Check permissions of the module - $oModuleModel = getModel('module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($file_info->module_srl); + $module_info = ModuleModel::getModuleInfoByModuleSrl($file_info->module_srl); if(empty($module_info->module_srl)) { return false; } - $grant = $oModuleModel->getGrant($module_info, $member_info); + $grant = ModuleModel::getGrant($module_info, $member_info); if($grant->manager) { return true; } // 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()) { return true; } // 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()) { return true; @@ -239,7 +235,7 @@ class fileModel extends file * @param int $upload_target_srl The sequence to get a number of files * @return int Returns a number of files */ - function getFilesCount($upload_target_srl) + public static function getFilesCount($upload_target_srl) { $args = new stdClass(); $args->upload_target_srl = $upload_target_srl; @@ -252,11 +248,12 @@ class fileModel extends file * * @param int $file_srl The sequence of file to get url * @param string $sid + * @param int $module_srl * @return string Returns a url */ - function getDownloadUrl($file_srl, $sid, $module_srl="") + public static function getDownloadUrl($file_srl, $sid, $module_srl = 0) { - return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl); + return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%d', 'file', 'procFileDownload', $file_srl, $sid, $module_srl); } /** @@ -265,7 +262,7 @@ class fileModel extends file * @param string $path * @return string */ - function getDirectFileUrl($path) + public static function getDirectFileUrl($path) { if(dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\') { @@ -281,13 +278,12 @@ class fileModel extends file * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration. * @return object Returns configuration. */ - function getFileConfig($module_srl = null) + public static function getFileConfig($module_srl = null) { - $oModuleModel = getModel('module'); - $config = clone $oModuleModel->getModuleConfig('file'); + $config = clone ModuleModel::getModuleConfig('file'); if($module_srl) { - $module_config = $oModuleModel->getModulePartConfig('file', $module_srl); + $module_config = ModuleModel::getModulePartConfig('file', $module_srl); foreach((array)$module_config as $key => $value) { $config->$key = $value; @@ -334,7 +330,7 @@ class fileModel extends file * @param array $columnList The list of columns to get from DB * @return Object|object|array If error returns an instance of Object. If result set is one returns a object that contins file information. If result set is more than one returns array of object. */ - function getFile($file_srl, $columnList = array()) + public static function getFile($file_srl, $columnList = array()) { $args = new stdClass(); $args->file_srl = $file_srl; @@ -345,7 +341,7 @@ class fileModel extends file if(count($output->data) == 1) { $file = $output->data[0]; - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); + $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); return $file; } @@ -358,7 +354,7 @@ class fileModel extends file foreach($output->data as $key=>$value) { $file = $value; - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); + $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); $fileList[] = $file; } } @@ -374,7 +370,7 @@ class fileModel extends file * @param string $sortIndex The column that used as sort index * @return array Returns array of object that contains file information. If no result returns null. */ - function getFiles($upload_target_srl, $columnList = array(), $sortIndex = 'file_srl', $ckValid = false) + public static function getFiles($upload_target_srl, $columnList = array(), $sortIndex = 'file_srl', $ckValid = false) { $args = new stdClass(); $args->upload_target_srl = $upload_target_srl; @@ -390,7 +386,7 @@ class fileModel extends file foreach ($output->data as $file) { $file->source_filename = escape($file->source_filename, false); - $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); + $file->download_url = self::getDownloadUrl($file->file_srl, $file->sid, $file->module_srl); $fileList[] = $file; } return $fileList; @@ -401,12 +397,12 @@ class fileModel extends file * * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types. */ - function getUploadConfig() + public static function getUploadConfig() { - $config = $this->getFileConfig(Context::get('module_srl') ?: Context::get('current_module_info')->module_srl); - if($this->user->is_admin === 'Y') + $config = self::getFileConfig(Context::get('module_srl') ?: Context::get('current_module_info')->module_srl); + 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_attach_size = max($config->allowed_attach_size, $module_config->allowed_attach_size); $config->allowed_extensions = []; @@ -421,9 +417,9 @@ class fileModel extends file * @param int $attached_size * @return string */ - function getUploadStatus($attached_size = 0) + public static function getUploadStatus($attached_size = 0) { - $file_config = $this->getUploadConfig(); + $file_config = self::getUploadConfig(); if (Context::get('allow_chunks') === 'Y') { $allowed_filesize = $file_config->allowed_filesize * 1024 * 1024; @@ -450,17 +446,17 @@ class fileModel extends file /** * method for compatibility */ - function getFileModuleConfig($module_srl) + public static function getFileModuleConfig($module_srl) { - return $this->getFileConfig($module_srl); + return self::getFileConfig($module_srl); } /** * method for compatibility */ - function getFileGrant($file_info, $member_info) + public static function getFileGrant($file_info, $member_info) { - return (object)['is_deletable' => $this->isDeletable($file_info, $member_info)]; + return (object)['is_deletable' => self::isDeletable($file_info, $member_info)]; } } /* End of file file.model.php */ diff --git a/modules/file/file.view.php b/modules/file/file.view.php index 3a6a9873c..06ca18278 100644 --- a/modules/file/file.view.php +++ b/modules/file/file.view.php @@ -35,14 +35,12 @@ class fileView extends file } // Get file configurations of the module - $oFileModel = getModel('file'); - $config = $oFileModel->getFileConfig($current_module_srl); + $config = FileModel::getFileConfig($current_module_srl); 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)); // Get a permission for group setting - $oMemberModel = getModel('member'); - $group_list = $oMemberModel->getGroups(); + $group_list = MemberModel::getGroups(); Context::set('group_list', $group_list); // Set a template file diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index b09e3e099..f3a64cc05 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -48,8 +48,7 @@ class memberController extends member $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false); if (!$output->toBool()) return $output; - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); + $config = ModuleModel::getModuleConfig('member'); $member_info = Context::get('logged_info'); // Check change_password_date @@ -102,8 +101,7 @@ class memberController extends member $output = new BaseObject(); - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); + $config = ModuleModel::getModuleConfig('member'); if($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; } - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); + $oDocument = DocumentModel::getDocument($document_srl); // Check document if(!$oDocument->isAccessible()) @@ -134,11 +131,10 @@ class memberController extends member throw new Rhymix\Framework\Exception('msg_is_secret'); } - $oModuleModel = getModel('module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')); + $module_info = ModuleModel::getModuleInfoByModuleSrl($oDocument->get('module_srl')); $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 if(!$grant->access) @@ -453,13 +449,12 @@ class memberController extends member $document_srl = (int)Context::get('document_srl'); if(!$document_srl) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); + $oDocument = DocumentModel::getDocument($document_srl); if ($oDocument->get('member_srl') != $logged_info->member_srl) { throw new Rhymix\Framework\Exceptions\InvalidRequest; } - $configStatusList = $oDocumentModel->getStatusList(); + $configStatusList = DocumentModel::getStatusList(); if ($oDocument->get('status') != $configStatusList['temp']) { throw new Rhymix\Framework\Exceptions\InvalidRequest; @@ -527,8 +522,7 @@ class memberController extends member $value = Context::get('value'); if(!$value) return; - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // Check if logged-in $logged_info = Context::get('logged_info'); @@ -537,33 +531,33 @@ class memberController extends member { case 'user_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 - $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'); break; case 'nick_name' : // Check denied ID - if($oMemberModel->isDeniedNickName($value)) + if(MemberModel::isDeniedNickName($value)) { return new BaseObject(0,'denied_nick_name'); } // Check if duplicated 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'); } break; case 'email_address' : // Check managed Email Host - if($oMemberModel->isDeniedEmailHost($value)) + if(MemberModel::isDeniedEmailHost($value)) { $emailhost_check = $config->emailhost_check; $managed_email_host = lang('managed_email_host'); - $email_hosts = $oMemberModel->getManagedEmailHosts(); + $email_hosts = MemberModel::getManagedEmailHosts(); foreach ($email_hosts as $host) { $hosts[] = $host->email_host; @@ -573,7 +567,7 @@ class memberController extends member } // 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'); break; } @@ -591,8 +585,7 @@ class memberController extends member throw new Rhymix\Framework\Exceptions\SecurityViolation; } - $oMemberModel = &getModel ('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // call a trigger (before) $trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config); @@ -698,7 +691,7 @@ class memberController extends member if($args->password1) $args->password = $args->password1; // check password strength - if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) + if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_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) { $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) { $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; } - $oMemberModel = getModel('member'); - // Get information of logged-in user $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; $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 - if(!$oMemberModel->isValidPassword($member_info->password, $password)) + if(!MemberModel::isValidPassword($member_info->password, $password)) { throw new Rhymix\Framework\Exception('invalid_password'); } @@ -912,8 +903,7 @@ class memberController extends member unset($_SESSION['rechecked_password_step']); // Get current module config and user info - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); $logged_info = Context::get('logged_info'); // Check phone number @@ -1065,7 +1055,7 @@ class memberController extends member $this->putSignature($args->member_srl, $signature); // 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) ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $member_info); @@ -1096,14 +1086,12 @@ class memberController extends member // Get information of logged-in user $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; - // Create a member model object - $oMemberModel = getModel('member'); // Get information of member_srl $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 - 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 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; // Log out all other sessions. - $oModuleModel = getModel('module'); - $member_config = $oModuleModel->getModuleConfig('member'); + $member_config = ModuleModel::getModuleConfig('member'); if ($member_config->password_change_invalidate_other_sessions === 'Y') { Rhymix\Framework\Session::destroyOtherSessions($member_srl); @@ -1143,13 +1130,11 @@ class memberController extends member // Get information of logged-in user $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; - // Create a member model object - $oMemberModel = getModel('member'); // Get information of member_srl $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 - 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); if(!$output->toBool()) return $output; @@ -1180,8 +1165,7 @@ class memberController extends member $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'); // Return if member module is set not to use an image name or the user is not an administrator ; - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); 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']); @@ -1201,8 +1185,7 @@ class memberController extends member */ function insertProfileImage($member_srl, $target_file) { - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // Get an image size $max_width = $config->profile_image_max_width; @@ -1285,8 +1268,7 @@ class memberController extends member $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'); // Return if member module is set not to use an image name or the user is not an administrator ; - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); 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']); @@ -1309,8 +1291,7 @@ class memberController extends member */ function insertImageName($member_srl, $target_file) { - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // Get an image size $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)) { - $oMemberModel = getModel('member'); - $profile_image = $oMemberModel->getProfileImage($member_srl); + $profile_image = MemberModel::getProfileImage($member_srl); FileHandler::removeFile($profile_image->file); Rhymix\Framework\Storage::deleteEmptyDirectory(dirname(FileHandler::getRealPath($profile_image->file)), true); $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)) { - $oMemberModel = getModel('member'); - $image_name = $oMemberModel->getImageName($member_srl); + $image_name = MemberModel::getImageName($member_srl); FileHandler::removeFile($image_name->file); 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'); 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; - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); 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']); @@ -1457,8 +1435,7 @@ class memberController extends member */ function insertImageMark($member_srl, $target_file) { - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // Get an image size $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)) { - $oMemberModel = getModel('member'); - $image_mark = $oMemberModel->getImageMark($member_srl); + $image_mark = MemberModel::getImageMark($member_srl); FileHandler::removeFile($image_mark->file); 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'); 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 - $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); + $member_srl = MemberModel::getMemberSrlByEmailAddress($email_address); if(!$member_srl) throw new Rhymix\Framework\Exception('msg_email_not_exists'); // Get information of the member $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 if($member_info->denied == 'Y') @@ -1583,7 +1556,7 @@ class memberController extends member // Get content of the email to send a member Context::set('auth_args', $args); - $member_config = $oModuleModel->getModuleConfig('member'); + $member_config = ModuleModel::getModuleConfig('member'); $memberInfo = array(); global $lang; if(is_array($member_config->signupForm)) @@ -1621,8 +1594,7 @@ class memberController extends member $content = $oTemplate->compile($tpl_path, 'find_member_account_mail'); // Get information of the Webmaster - $oModuleModel = getModel('module'); - $member_config = $oModuleModel->getModuleConfig('member'); + $member_config = ModuleModel::getModuleConfig('member'); // Send a mail $oMail = new \Rhymix\Framework\Mail(); @@ -1659,8 +1631,7 @@ class memberController extends member */ function procMemberAuthAccount() { - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); // Test user_id and authkey $member_srl = Context::get('member_srl'); @@ -1710,7 +1681,7 @@ class memberController extends member } else { - $args->password = $oMemberModel->hashPassword($output->data->new_password); + $args->password = MemberModel::hashPassword($output->data->new_password); } $output = executeQuery('member.updateMemberPassword', $args); @@ -1746,18 +1717,16 @@ class memberController extends member $email_address = Context::get('email_address'); if(!$email_address) throw new Rhymix\Framework\Exceptions\InvalidRequest; // Log test by using email_address - $oMemberModel = getModel('member'); - $args = new stdClass; $args->email_address = $email_address; - $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address); + $member_srl = MemberModel::getMemberSrlByEmailAddress($email_address); if(!$member_srl) { throw new Rhymix\Framework\Exception('msg_not_exists_member'); } $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) { 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'); } - $oModuleModel = getModel('module'); - $member_config = $oModuleModel->getModuleConfig('member'); + $member_config = ModuleModel::getModuleConfig('member'); if(!$member_config->skin) $member_config->skin = "default"; if(!$member_config->colorset) $member_config->colorset = "white"; @@ -1847,8 +1815,7 @@ class memberController extends member function _sendAuthMail($auth_args, $member_info) { - $oMemberModel = getModel('member'); - $member_config = $oMemberModel->getMemberConfig(); + $member_config = MemberModel::getMemberConfig(); // Get content of the email to send a member Context::set('auth_args', $auth_args); @@ -1908,9 +1875,8 @@ class memberController extends member $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; - $oMemberModel = getModel('member'); $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); $groups[$default_group->group_srl] = $default_group->title; $logged_info->group_list = $groups; @@ -1989,7 +1955,7 @@ class memberController extends member // Editor converter $obj = new stdClass; - $config = getModel('member')->getMemberConfig(); + $config = MemberModel::getMemberConfig(); if($config->signature_html == 'N') { $obj->converter = 'text'; @@ -2168,18 +2134,16 @@ class memberController extends member $trigger_obj->password = $password; $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj); if(!$trigger_output->toBool()) return $trigger_output; - // Create a member model object - $oMemberModel = getModel('member'); // check IP access count. - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); $args = new stdClass(); $args->ipaddress = $_SERVER['REMOTE_ADDR']; // check identifier 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)) { return $this->recordLoginError(-1, 'invalid_email_address'); @@ -2212,7 +2176,7 @@ class memberController extends member } $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) { return $this->recordLoginError(-1, 'invalid_user_id'); @@ -2220,7 +2184,7 @@ class memberController extends member } 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)) { return $this->recordLoginError(-1, 'invalid_user_id'); @@ -2255,7 +2219,7 @@ class memberController extends member } // 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); } @@ -2378,7 +2342,7 @@ class memberController extends member Context::set('logged_info', $member_info); // 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'); if ($config->features['scrapped_documents'] !== false) { @@ -2451,8 +2415,7 @@ class memberController extends member $output = ModuleHandler::triggerCall('member.insertMember', 'before', $args); if(!$output->toBool()) return $output; // Terms and Conditions portion of the information set up by members reaffirmed - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); $logged_info = Context::get('logged_info'); // 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; - $extend_form_list = $oMemberModel->getJoinFormlist(); + $extend_form_list = MemberModel::getJoinFormlist(); $security = new Security($extend_form_list); $security->encodeHTML('..column_title', '..description', '..default_value.'); if($config->signupForm) { @@ -2549,35 +2512,32 @@ class memberController extends member } } - // Create a model object - $oMemberModel = getModel('member'); - // Check password strength 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'); 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 - 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'); } // Check if ID is duplicate - $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); + $member_srl = MemberModel::getMemberSrlByUserID($args->user_id); if($member_srl) { return new BaseObject(-1, 'msg_exists_user_id'); } // 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'); } @@ -2585,7 +2545,7 @@ class memberController extends member // Check if nickname is duplicate if($config->allow_duplicate_nickname !== 'Y') { - $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name); + $member_srl = MemberModel::getMemberSrlByNickName($args->nick_name); if($member_srl) { return new BaseObject(-1, 'msg_exists_nick_name'); @@ -2593,12 +2553,12 @@ class memberController extends member } // 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; $managed_email_host = lang('managed_email_host'); - $email_hosts = $oMemberModel->getManagedEmailHosts(); + $email_hosts = MemberModel::getManagedEmailHosts(); foreach ($email_hosts as $host) { $hosts[] = $host->email_host; @@ -2634,7 +2594,7 @@ class memberController extends member } // Check if email address is duplicate - $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address); + $member_srl = MemberModel::getMemberSrlByEmailAddress($args->email_address); if($member_srl) { return new BaseObject(-1, 'msg_exists_email_address'); @@ -2643,7 +2603,7 @@ class memberController extends member // Check if phone number is duplicate 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) { return new BaseObject(-1, 'msg_exists_phone_number'); @@ -2672,7 +2632,7 @@ class memberController extends member if(!$args->group_srl_list) { $columnList = array('site_srl', 'group_srl'); - $default_group = $oMemberModel->getDefaultGroup(0, $columnList); + $default_group = MemberModel::getDefaultGroup(0, $columnList); if($default_group) { // Add to the default group @@ -2738,13 +2698,12 @@ class memberController extends member $output = ModuleHandler::triggerCall('member.updateMember', 'before', $args); if(!$output->toBool()) return $output; // Create a model object - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); $logged_info = Context::get('logged_info'); // 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 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->encodeHTML('..column_title', '..description', '..default_value.'); if($config->signupForm){ @@ -2860,12 +2819,12 @@ class memberController extends member } // 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; $managed_email_host = lang('managed_email_host'); - $email_hosts = $oMemberModel->getManagedEmailHosts(); + $email_hosts = MemberModel::getManagedEmailHosts(); foreach ($email_hosts as $host) { $hosts[] = $host->email_host; @@ -2877,7 +2836,7 @@ class memberController extends member // Check if email address or user ID is duplicate 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) { return new BaseObject(-1, 'msg_exists_email_address'); @@ -2886,7 +2845,7 @@ class memberController extends member } else { - $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id); + $member_srl = MemberModel::getMemberSrlByUserID($args->user_id); if($member_srl && $args->member_srl != $member_srl) { return new BaseObject(-1, 'msg_exists_user_id'); @@ -2898,7 +2857,7 @@ class memberController extends member // Check if phone number is duplicate 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) { return new BaseObject(-1, 'msg_exists_phone_number'); @@ -2906,7 +2865,7 @@ class memberController extends member } // 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'); } @@ -2914,7 +2873,7 @@ class memberController extends member // Check if ID is duplicate 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) { return new BaseObject(-1, 'msg_exists_user_id'); @@ -2922,7 +2881,7 @@ class memberController extends member } // 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'); } @@ -2930,7 +2889,7 @@ class memberController extends member // Check if nickname is duplicate 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) { return new BaseObject(-1, 'msg_exists_nick_name'); @@ -2945,12 +2904,12 @@ class memberController extends member // Check password strength if($args->password) { - if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) + if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_password_strength'); return new BaseObject(-1, $message[$config->password_strength]); } - $args->password = $oMemberModel->hashPassword($args->password); + $args->password = MemberModel::hashPassword($args->password); } else { @@ -3069,16 +3028,15 @@ class memberController extends member if($args->password) { // check password strength - $oMemberModel = getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); - if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength)) + if(!MemberModel::checkPasswordStrength($args->password, $config->password_strength)) { $message = lang('about_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) { @@ -3107,11 +3065,9 @@ class memberController extends member $trigger_obj->member_srl = $member_srl; $output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj); if(!$output->toBool()) return $output; - // Create a model object - $oMemberModel = getModel('member'); // Bringing the user's information $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 managers can not be deleted 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) { - $oModuleModel = getModel('module'); - $pointModuleConfig = $oModuleModel->getModuleConfig('point'); + $pointModuleConfig = ModuleModel::getModuleConfig('point'); $pointGroup = $pointModuleConfig->point_group; $levelGroup = array(); @@ -3213,8 +3168,7 @@ class memberController extends member if($maxLevel > 0) { - $oPointModel = getModel('point'); - $originPoint = $oPointModel->getPoint($memberSrl); + $originPoint = PointModel::getPoint($memberSrl); if($pointModuleConfig->level_step[$maxLevel] > $originPoint) { @@ -3233,15 +3187,14 @@ class memberController extends member if(!$newEmail) throw new Rhymix\Framework\Exceptions\InvalidRequest; - $oMemberModel = getModel('member'); // Check managed Email Host - if($oMemberModel->isDeniedEmailHost($newEmail)) + if(MemberModel::isDeniedEmailHost($newEmail)) { - $config = $oMemberModel->getMemberConfig(); + $config = MemberModel::getMemberConfig(); $emailhost_check = $config->emailhost_check; $managed_email_host = lang('managed_email_host'); - $email_hosts = $oMemberModel->getManagedEmailHosts(); + $email_hosts = MemberModel::getManagedEmailHosts(); foreach ($email_hosts as $host) { $hosts[] = $host->email_host; @@ -3251,7 +3204,7 @@ class memberController extends member } // 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($_SESSION['rechecked_password_step'] != 'INPUT_DATA') @@ -3275,8 +3228,7 @@ class memberController extends member return $output; } - $oModuleModel = getModel('module'); - $member_config = $oModuleModel->getModuleConfig('member'); + $member_config = ModuleModel::getModuleConfig('member'); $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'); @@ -3351,7 +3303,7 @@ class memberController extends member function procMemberSendVerificationSMS() { - $config = getModel('member')->getMemberConfig(); + $config = MemberModel::getMemberConfig(); if ($config->phone_number_verify_by_sms !== 'Y') { throw new Rhymix\Framework\Exceptions\FeatureDisabled; @@ -3411,7 +3363,7 @@ class memberController extends member function procMemberConfirmVerificationSMS() { - $config = getModel('member')->getMemberConfig(); + $config = MemberModel::getMemberConfig(); if ($config->phone_number_verify_by_sms !== 'Y') { throw new Rhymix\Framework\Exceptions\FeatureDisabled; @@ -3447,14 +3399,13 @@ class memberController extends member $logged_info = Context::get('logged_info'); $document_srl = Context::get('target_srl'); - $oDocumentModel = getModel('document'); $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'); $module_srl = $oDocument->get('module_srl'); - if(!$member_srl) return; - if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return; + if(!$member_srl || $member_srl == $logged_info->member_srl) return; + if(!ModuleModel::getGrant(ModuleModel::getModuleInfoByModuleSrl($module_srl), $logged_info)->manager) return; $oDocumentController = getController('document'); $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'); $comment_srl = Context::get('target_srl'); - $oCommentModel = getModel('comment'); $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'); $member_srl = $oComment->get('member_srl'); - if(!$member_srl) return; - if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return; + if(!$member_srl || $member_srl == $logged_info->member_srl) return; + if(!ModuleModel::getGrant(ModuleModel::getModuleInfoByModuleSrl($module_srl), $logged_info)->manager) return; $oCommentController = getController('comment'); $url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl); @@ -3508,18 +3458,14 @@ class memberController extends member $isMoveToTrash = false; // check grant - $oModuleModel = getModel('module'); $columnList = array('module_srl', 'module'); - $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList); - $grant = $oModuleModel->getGrant($module_info, $logged_info); + $module_info = ModuleModel::getModuleInfoByModuleSrl($module_srl, $columnList); + $grant = ModuleModel::getGrant($module_info, $logged_info); if(!$grant->manager) throw new Rhymix\Framework\Exceptions\NotPermitted; $proc_msg = ""; - $oDocumentModel = getModel('document'); - $oCommentModel = getModel('comment'); - // delete or trash destination // proc member if($cnt_loop == 1) @@ -3529,8 +3475,8 @@ class memberController extends member $this->_spammerDocuments($member_srl, $isMoveToTrash); // get destination count - $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); - $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); + $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl); + $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl); $total_count = Context::get('total_count'); $remain_count = $cnt_document + $cnt_comment; @@ -3564,15 +3510,12 @@ class memberController extends member $logged_info = Context::get('logged_info'); $spam_description = trim( Context::get('spam_description') ); - $oMemberModel = getModel('member'); $columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description'); // get member current infomation - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); + $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl, 0, $columnList); - $oDocumentModel = getModel('document'); - $oCommentModel = getModel('comment'); - $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); - $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); + $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl); + $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl); $total_count = $cnt_comment + $cnt_document; $args = new stdClass(); @@ -3601,22 +3544,21 @@ class memberController extends member * * @return object **/ - private function _spammerDocuments($member_srl, $isMoveToTrash) { + private function _spammerDocuments($member_srl, $isMoveToTrash) + { $oDocumentController = getController('document'); - $oDocumentModel = getModel('document'); $oCommentController = getController('comment'); - $oCommentModel = getModel('comment'); // delete count by one request $getContentsCount = 10; // 1. proc comment, 2. proc document - $cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl); - $cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl); + $cnt_comment = CommentModel::getCommentCountByMemberSrl($member_srl); + $cnt_document = DocumentModel::getDocumentCountByMemberSrl($member_srl); if($cnt_comment > 0) { $columnList = array(); - $commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); + $commentList = CommentModel::getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); if($commentList) { foreach($commentList as $v) { $oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash); @@ -3624,7 +3566,7 @@ class memberController extends member } } elseif($cnt_document > 0) { $columnList = array(); - $documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); + $documentList = DocumentModel::getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount); if($documentList) { foreach($documentList as $v) { if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v); diff --git a/modules/member/member.model.php b/modules/member/member.model.php index 82c16d4bf..cb2ebee7b 100644 --- a/modules/member/member.model.php +++ b/modules/member/member.model.php @@ -10,30 +10,31 @@ class memberModel extends member /** * @brief Keep data internally which may be frequently called ... */ - var $join_form_list = NULL; + protected static $_denied_id_list; + protected static $_join_form_list; + protected static $_managed_email_hosts; + protected static $_member_config; /** * @brief Initialization */ - function init() + public function init() { + } /** * @brief Return member's configuration */ - function getMemberConfig() + public static function getMemberConfig() { - static $member_config; - - if($member_config) + if (self::$_member_config) { - return $member_config; + return self::$_member_config; } // Get member configuration stored in the DB - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); + $config = ModuleModel::getModuleConfig('member'); if(!$config->signupForm || !is_array($config->signupForm)) { @@ -52,7 +53,7 @@ class memberModel extends member // Get terms of user if(!$config->agreements) { - $config->agreement = memberModel::_getAgreement(); + $config->agreement = self::_getAgreement(); $config->agreements[1] = new stdClass; $config->agreements[1]->title = lang('agreement'); $config->agreements[1]->content = $config->agreement; @@ -93,15 +94,13 @@ class memberModel extends member $config->redirect_url = getNotEncodedFullUrl('','mid',$config->redirect_mid); } - $member_config = $config; - - return $config; + return self::$_member_config = $config; } /** * @deprecated */ - function _getAgreement() + protected static function _getAgreement() { $agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt'; if(is_readable($agreement_file)) @@ -131,27 +130,30 @@ class memberModel extends member /** * @brief Display menus of the member */ - function getMemberMenu() + public function getMemberMenu() { // Get member_srl of he target member and logged info of the current user $member_srl = Context::get('target_srl'); $mid = Context::get('cur_mid'); $logged_info = Context::get('logged_info'); + $module_config = self::getMemberConfig(); $act = Context::get('cur_act'); // When click user's own nickname if($member_srl == $logged_info->member_srl) $member_info = $logged_info; // When click other's nickname - else $member_info = $this->getMemberInfoByMemberSrl($member_srl); + else $member_info = self::getMemberInfoByMemberSrl($member_srl); $member_srl = $member_info->member_srl; if(!$member_srl) return; + // List variables $user_id = $member_info->user_id; $user_name = $member_info->user_name; + $icon_path = ''; ModuleHandler::triggerCall('member.getMemberMenu', 'before', $member_info); - $oMemberController = getController('member'); + $oMemberController = MemberController::getInstance(); // Display member information (Don't display to non-logged user) if($logged_info->member_srl) { @@ -163,7 +165,7 @@ class memberModel extends member if($member_srl != $logged_info->member_srl && $logged_info->member_srl) { // Get email config - foreach($this->module_config->signupForm as $field) + foreach($module_config->signupForm as $field) { if($field->name == 'email_address') { @@ -175,7 +177,7 @@ class memberModel extends member // Send an email only if email address is public 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)) { $url = 'mailto:'.escape($member_info->email_address); @@ -194,7 +196,7 @@ class memberModel extends member } else { - foreach ($this->module_config->signupForm as $field) + foreach ($module_config->signupForm as $field) { if ($field->name === 'homepage' && $field->isPublic === 'Y') { @@ -250,7 +252,7 @@ class memberModel extends member /** * @brief Check if logged-in */ - function isLogged() + public static function isLogged() { return Rhymix\Framework\Session::getMemberSrl() ? true : false; } @@ -258,15 +260,17 @@ class memberModel extends member /** * @brief Return session information of the logged-in user */ - function getLoggedInfo() + public static function getLoggedInfo() { return Context::get('logged_info'); } /** * @brief Return member information with user_id + * + * @return object|null */ - function getMemberInfoByUserID($user_id) + public static function getMemberInfoByUserID($user_id) { if(!$user_id) return; @@ -276,15 +280,17 @@ class memberModel extends member if(!$output->toBool()) return $output; if(!$output->data) return; - $member_info = $this->arrangeMemberInfo($output->data); + $member_info = self::arrangeMemberInfo($output->data); return $member_info; } /** * @brief Return member information with email_address + * + * @return object|null */ - function getMemberInfoByEmailAddress($email_address) + public static function getMemberInfoByEmailAddress($email_address) { if(!$email_address) return; @@ -294,14 +300,16 @@ class memberModel extends member if(!$output->toBool()) return $output; if(!$output->data) return; - $member_info = $this->arrangeMemberInfo($output->data); + $member_info = self::arrangeMemberInfo($output->data); return $member_info; } /** * @brief Return member information with phone number + * + * @return object|null */ - function getMemberInfoByPhoneNumber($phone_number, $phone_country = null) + public static function getMemberInfoByPhoneNumber($phone_number, $phone_country = null) { if(!$phone_number) return; if($phone_country) @@ -323,14 +331,16 @@ class memberModel extends member if(!$output->toBool()) return $output; if(!$output->data) return; - $member_info = $this->arrangeMemberInfo($output->data); + $member_info = self::arrangeMemberInfo($output->data); return $member_info; } /** * @brief Return member information with member_srl + * + * @return object */ - function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) + public static function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) { if(!$member_srl) return new stdClass; @@ -348,7 +358,7 @@ class memberModel extends member return new stdClass; } - $member_info = $this->arrangeMemberInfo($output->data, $site_srl); + $member_info = self::arrangeMemberInfo($output->data, $site_srl); if($output->toBool()) { Rhymix\Framework\Cache::set($cache_key, $member_info); @@ -359,26 +369,36 @@ class memberModel extends member return $GLOBALS['__member_info__'][$member_srl]; } + /** + * @brief Shortcut to getMemberInfoByMemberSrl() + * + * @param int $member_srl + * @return object + */ + public static function getMemberInfo($member_srl) + { + return self::getMemberInfoByMemberSrl(intval($member_srl)); + } + /** * @brief Add member info from extra_vars and other information */ - function arrangeMemberInfo($info, $site_srl = 0) + public static function arrangeMemberInfo($info, $site_srl = 0) { if(!$GLOBALS['__member_info__'][$info->member_srl]) { - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); + $config = self::getMemberConfig(); - $info->profile_image = $this->getProfileImage($info->member_srl); - $info->image_name = $this->getImageName($info->member_srl); - $info->image_mark = $this->getImageMark($info->member_srl); + $info->profile_image = self::getProfileImage($info->member_srl); + $info->image_name = self::getImageName($info->member_srl); + $info->image_mark = self::getImageMark($info->member_srl); if($config->group_image_mark=='Y') { - $info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl); + $info->group_mark = self::getGroupImageMark($info->member_srl,$site_srl); } - $info->signature = $this->getSignature($info->member_srl); - $info->group_list = $this->getMemberGroups($info->member_srl, $site_srl); - $info->is_site_admin = $oModuleModel->isSiteAdmin($info) ? true : false; + $info->signature = self::getSignature($info->member_srl); + $info->group_list = self::getMemberGroups($info->member_srl, $site_srl); + $info->is_site_admin = ModuleModel::isSiteAdmin($info) ? true : false; $extra_vars = unserialize($info->extra_vars); unset($info->extra_vars); @@ -445,7 +465,7 @@ class memberModel extends member /** * @brief Get member_srl corresponding to userid */ - function getMemberSrlByUserID($user_id) + public static function getMemberSrlByUserID($user_id) { $args = new stdClass(); $args->user_id = $user_id; @@ -456,7 +476,7 @@ class memberModel extends member /** * @brief Get member_srl corresponding to EmailAddress */ - function getMemberSrlByEmailAddress($email_address) + public static function getMemberSrlByEmailAddress($email_address) { $args = new stdClass(); $args->email_address = $email_address; @@ -467,7 +487,7 @@ class memberModel extends member /** * @brief Get member_srl corresponding to phone number */ - function getMemberSrlByPhoneNumber($phone_number, $phone_country = null) + public static function getMemberSrlByPhoneNumber($phone_number, $phone_country = null) { $args = new stdClass(); $args->phone_number = $phone_number; @@ -479,7 +499,7 @@ class memberModel extends member /** * @brief Get member_srl corresponding to nickname */ - function getMemberSrlByNickName($nick_name) + public static function getMemberSrlByNickName($nick_name) { $args = new stdClass(); $args->nick_name = $nick_name; @@ -490,7 +510,7 @@ class memberModel extends member /** * @brief Return member_srl of the current logged-in user */ - function getLoggedMemberSrl() + public static function getLoggedMemberSrl() { return Rhymix\Framework\Session::getMemberSrl(); } @@ -498,17 +518,17 @@ class memberModel extends member /** * @brief Return user_id of the current logged-in user */ - function getLoggedUserID() + public static function getLoggedUserID() { - if(!$this->isLogged()) return; $logged_info = Context::get('logged_info'); + if (!$logged_info || !$logged_info->member_srl) return; return $logged_info->user_id; } /** * @brief Get a list of groups which the member_srl belongs to */ - function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false) + public static function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false) { static $member_groups = array(); @@ -527,8 +547,8 @@ class memberModel extends member $group_list = $output->data; if (!count($group_list)) { - $default_group = $this->getDefaultGroup($site_srl); - getController('member')->addMemberToGroup($member_srl, $default_group->group_srl, $site_srl); + $default_group = self::getDefaultGroup($site_srl); + MemberController::getInstance()->addMemberToGroup($member_srl, $default_group->group_srl, $site_srl); $group_list[$default_group->group_srl] = $default_group->title; } //insert in cache @@ -551,7 +571,7 @@ class memberModel extends member /** * @brief Get a list of groups which member_srls belong to */ - function getMembersGroups($member_srls, $site_srl = 0) + public static function getMembersGroups($member_srls, $site_srl = 0) { $args = new stdClass; $args->member_srls = implode(',',$member_srls); @@ -571,7 +591,7 @@ class memberModel extends member /** * @brief Get a default group */ - function getDefaultGroup($site_srl = 0) + public static function getDefaultGroup($site_srl = 0) { $cache_key = sprintf('member:default_group:site:%d', $site_srl); $default_group = Rhymix\Framework\Cache::get($cache_key); @@ -594,7 +614,7 @@ class memberModel extends member /** * @brief Get an admin group */ - function getAdminGroup($columnList = array()) + public static function getAdminGroup($columnList = array()) { $args = new stdClass; $output = executeQuery('member.getAdminGroup', $args, $columnList); @@ -604,7 +624,7 @@ class memberModel extends member /** * @brief Get group info corresponding to group_srl */ - function getGroup($group_srl, $columnList = array()) + public static function getGroup($group_srl, $columnList = array()) { $args = new stdClass; $args->group_srl = $group_srl; @@ -615,7 +635,7 @@ class memberModel extends member /** * @brief Get a list of groups */ - function getGroups($site_srl = 0) + public static function getGroups($site_srl = 0) { if(!$GLOBALS['__group_info__'][$site_srl]) { @@ -657,12 +677,14 @@ class memberModel extends member return $GLOBALS['__group_info__'][$site_srl]; } - public function getApiGroups() + /** + * @deprecated + */ + public static function getApiGroups() { $siteSrl = Context::get('siteSrl'); - $groupInfo = $this->getGroups($siteSrl); - - $this->add($groupInfo); + $groupInfo = self::getGroups($siteSrl); + //$this->add($groupInfo); } /** @@ -672,18 +694,18 @@ class memberModel extends member * To use as extend_filter, the argument should be boolean. * When the argument is true, it returns object result in type of filter. */ - function getJoinFormList($filter_response = false) + public static function getJoinFormList($filter_response = false) { global $lang; // Set to ignore if a super administrator. $logged_info = Context::get('logged_info'); - if(!$this->join_form_list) + if(!self::$_join_form_list) { // Argument setting to sort list_order column $args = new stdClass(); $args->sort_index = "list_order"; - $output = executeQuery('member.getJoinFormList', $args); + $output = executeQueryArray('member.getJoinFormList', $args); // NULL if output data deosn't exist $join_form_list = $output->data; if(!$join_form_list) return NULL; @@ -715,15 +737,15 @@ class memberModel extends member $list[$member_join_form_srl] = $join_form_list[$i]; } - $this->join_form_list = $list; + self::$_join_form_list = $list; } // Get object style if the filter_response is true - if($filter_response && count($this->join_form_list)) + if($filter_response && count(self::$_join_form_list)) { - foreach($this->join_form_list as $key => $val) + foreach(self::$_join_form_list as $key => $val) { if($val->is_active != 'Y') continue; - unset($obj); + $obj = new stdClass; $obj->type = $val->column_type; $obj->name = $val->column_name; $obj->lang = $val->column_title; @@ -731,7 +753,7 @@ class memberModel extends member else $obj->required = false; $filter_output[] = $obj; - unset($open_obj); + $open_obj = new stdClass; $open_obj->name = 'open_'.$val->column_name; $open_obj->required = false; $filter_output[] = $open_obj; @@ -740,7 +762,7 @@ class memberModel extends member return $filter_output; } // Return the result - return $this->join_form_list; + return self::$_join_form_list; } /** @@ -748,7 +770,7 @@ class memberModel extends member * * @return array $joinFormList */ - function getUsedJoinFormList() + public static function getUsedJoinFormList() { $args = new stdClass(); $args->sort_index = "list_order"; @@ -776,9 +798,9 @@ class memberModel extends member /** * @brief Combine extend join form and member information (used to modify member information) */ - function getCombineJoinForm($member_info) + public static function getCombineJoinForm($member_info) { - $extend_form_list = $this->getJoinFormlist(); + $extend_form_list = self::getJoinFormlist(); if(!$extend_form_list) return; // Member info is open only to an administrator and him/herself when is_private is true. $logged_info = Context::get('logged_info'); @@ -815,7 +837,7 @@ class memberModel extends member /** * @brief Get a join form */ - function getJoinForm($member_join_form_srl) + public static function getJoinForm($member_join_form_srl) { $args = new stdClass(); $args->member_join_form_srl = $member_join_form_srl; @@ -841,9 +863,9 @@ class memberModel extends member /** * @brief Get a list of denied IDs */ - function getDeniedIDList() + public static function getDeniedIDList() { - if(!$this->denied_id_list) + if(!isset(self::$_denied_id_list)) { $args = new stdClass(); $args->sort_index = "list_order"; @@ -851,20 +873,20 @@ class memberModel extends member $args->list_count = 40; $args->page_count = 10; - $output = executeQuery('member.getDeniedIDList', $args); - $this->denied_id_list = $output; + $output = executeQueryArray('member.getDeniedIDList', $args); + self::$_denied_id_list = $output; } - return $this->denied_id_list; + return self::$_denied_id_list; } - function getDeniedIDs() + public static function getDeniedIDs() { $output = executeQueryArray('member.getDeniedIDs'); if(!$output->toBool()) return array(); return $output->data; } - function getDeniedNickNames() + public static function getDeniedNickNames() { $output = executeQueryArray('member.getDeniedNickNames'); if(!$output->toBool()) @@ -875,24 +897,24 @@ class memberModel extends member return $output->data; } - function getManagedEmailHosts() + public static function getManagedEmailHosts() { - static $output; - if(isset($output->data)) return $output->data; + if(isset(self::$_managed_email_hosts)) { + return self::$_managed_email_hosts; + } $output = executeQueryArray('member.getManagedEmailHosts'); if(!$output->toBool()) { - $output->data = array(); - return array(); + return self::$_managed_email_hosts = array(); } - return $output->data; + return self::$_managed_email_hosts = $output->data; } /** * @brief Verify if ID is denied */ - function isDeniedID($user_id) + public static function isDeniedID($user_id) { $args = new stdClass(); $args->user_id = $user_id; @@ -904,7 +926,7 @@ class memberModel extends member /** * @brief Verify if nick name is denied */ - function isDeniedNickName($nickName) + public static function isDeniedNickName($nickName) { $args = new stdClass(); $args->nick_name = $nickName; @@ -920,13 +942,12 @@ class memberModel extends member /** * @brief Verify if email_host from email_address is denied */ - function isDeniedEmailHost($email_address) + public static function isDeniedEmailHost($email_address) { $email_address = trim($email_address); - $oMemberModel = &getModel('member'); - $config = $oMemberModel->getMemberConfig(); + $config = self::getMemberConfig(); $emailhost_check = $config->emailhost_check; - $managedHosts = $oMemberModel->getManagedEmailHosts(); + $managedHosts = self::getManagedEmailHosts(); if(count($managedHosts) < 1) return FALSE; static $return; @@ -962,7 +983,7 @@ class memberModel extends member /** * @brief Get information of the profile image */ - function getProfileImage($member_srl) + public static function getProfileImage($member_srl) { if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl])) { @@ -991,7 +1012,7 @@ class memberModel extends member /** * @brief Get the image name */ - function getImageName($member_srl) + public static function getImageName($member_srl) { if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl])) { @@ -1014,7 +1035,7 @@ class memberModel extends member /** * @brief Get the image mark */ - function getImageMark($member_srl) + public static function getImageMark($member_srl) { if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl])) { @@ -1039,18 +1060,17 @@ class memberModel extends member /** * @brief Get the image mark of the group */ - function getGroupImageMark($member_srl,$site_srl=0) + public static function getGroupImageMark($member_srl,$site_srl=0) { if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) { - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('member'); + $config = ModuleModel::getModuleConfig('member'); if($config->group_image_mark!='Y') { return null; } - $member_group = $this->getMemberGroups($member_srl,$site_srl); - $groups_info = $this->getGroups($site_srl); + $member_group = self::getMemberGroups($member_srl, $site_srl); + $groups_info = self::getGroups($site_srl); if(count($member_group) > 0 && is_array($member_group)) { $memberGroups = array_keys($member_group); @@ -1089,7 +1109,7 @@ class memberModel extends member /** * @brief Get user's signature */ - function getSignature($member_srl) + public static function getSignature($member_srl) { if(!isset($GLOBALS['__member_info__']['signature'][$member_srl])) { @@ -1099,11 +1119,11 @@ class memberModel extends member $signature = preg_replace('/<\?.*\?>/', '', FileHandler::readFile($filename)); // retroact - $config = getModel('member')->getMemberConfig(); + $config = self::getMemberConfig(); if($config->signature_html_retroact == 'Y' && $config->signature_html == 'N' && preg_match('/<[^br]+>/i', $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; @@ -1124,7 +1144,7 @@ class memberModel extends member * @param int $member_srl Set this to member_srl when comparing a member's password (optional) * @return bool */ - function isValidPassword($hashed_password, $password_text, $member_srl=null) + public static function isValidPassword($hashed_password, $password_text, $member_srl=null) { // False if no password in entered if(!$password_text) @@ -1151,7 +1171,7 @@ class memberModel extends member } // Update the encryption method if necessary - $config = $this->getMemberConfig(); + $config = self::getMemberConfig(); if($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N') { $required_algorithm = Rhymix\Framework\Password::getDefaultAlgorithm(); @@ -1177,9 +1197,8 @@ class memberModel extends member { $args = new stdClass(); $args->member_srl = $member_srl; - $args->hashed_password = $this->hashPassword($password_text, $required_algorithm); - $oMemberController = getController('member'); - $oMemberController->updateMemberPassword($args); + $args->hashed_password = self::hashPassword($password_text, $required_algorithm); + MemberController::getInstance()->updateMemberPassword($args); } } @@ -1192,19 +1211,19 @@ class memberModel extends member * @param string $algorithm The algorithm to use (optional, only set this when you want to use a non-default algorithm) * @return string */ - function hashPassword($password_text, $algorithm = null) + public static function hashPassword($password_text, $algorithm = null) { return Rhymix\Framework\Password::hashPassword($password_text, $algorithm); } - function checkPasswordStrength($password, $strength) + public static function checkPasswordStrength($password, $strength) { $logged_info = Context::get('logged_info'); if($logged_info->is_admin == 'Y') return true; if($strength == NULL) { - $config = $this->getMemberConfig(); + $config = self::getMemberConfig(); $strength = $config->password_strength?$config->password_strength:'normal'; } @@ -1227,10 +1246,10 @@ class memberModel extends member return true; } - function getAdminGroupSrl($site_srl = 0) + public static function getAdminGroupSrl($site_srl = 0) { $groupSrl = 0; - $output = $this->getGroups($site_srl); + $output = self::getGroups($site_srl); if(is_array($output)) { foreach($output AS $key=>$value) @@ -1245,7 +1264,7 @@ class memberModel extends member return $groupSrl; } - function getMemberModifyNicknameLog($page = 1, $member_srl = null) + public static function getMemberModifyNicknameLog($page = 1, $member_srl = null) { $args = new stdClass(); $args->member_srl = $member_srl; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index bd64b2a2c..ec720f81d 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -17,8 +17,7 @@ class memberView extends member function init() { // Get the member configuration - $oMemberModel = getModel('member'); - $this->member_config = $oMemberModel->getMemberConfig(); + $this->member_config = MemberModel::getMemberConfig(); Context::set('member_config', $this->member_config); $oSecurity = new Security(); $oSecurity->encodeHTML('member_config.signupForm..'); @@ -46,8 +45,7 @@ class memberView extends member // Template path $this->setTemplatePath($template_path); - $oLayoutModel = getModel('layout'); - $layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl); + $layout_info = LayoutModel::getInstance()->getLayout($this->member_config->layout_srl); if($layout_info) { $this->module_info->layout_srl = $this->member_config->layout_srl; @@ -60,7 +58,6 @@ class memberView extends member */ function dispMemberInfo() { - $oMemberModel = getModel('member'); $logged_info = Context::get('logged_info'); // Don't display member info to non-logged user 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'); $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->email_id); unset($member_info->email_host); @@ -93,7 +90,7 @@ class memberView extends member 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_answer); Context::set('extend_form_list', $extendForm); @@ -207,9 +204,8 @@ class memberView extends member $member_config = $this->member_config; - $oMemberModel = getModel('member'); // 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) $trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $member_config); if(!$trigger_output->toBool()) return $trigger_output; @@ -259,8 +255,7 @@ class memberView extends member function dispMemberModifyInfoBefore() { $logged_info = Context::get('logged_info'); - $oMemberModel = getModel('member'); - if(!$oMemberModel->isLogged() || empty($logged_info)) + if(!$logged_info->member_srl) { throw new Rhymix\Framework\Exceptions\MustLogin; } @@ -303,16 +298,15 @@ class memberView extends member $member_config = $this->member_config; - $oMemberModel = getModel('member'); // 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'); $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'); - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList); - $member_info->signature = $oMemberModel->getSignature($member_srl); + $member_info = MemberModel::etMemberInfoByMemberSrl($member_srl, 0, $columnList); + $member_info->signature = MemberModel::getSignature($member_srl); Context::set('member_info', $member_info); $formTags = getAdminView('member')->_getMemberInputTag($member_info); @@ -385,9 +379,8 @@ class memberView extends member $args->sort_index = 'list_order'; $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'); - $output = $oDocumentModel->getDocumentList($args, false, false, $columnList); + $output = DocumentModel::getDocumentList($args, false, false, $columnList); Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_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->sort_index = 'list_order'; - $oCommentModel = getModel('comment'); - $output = $oCommentModel->getTotalCommentList($args); + $output = CommentModel::getTotalCommentList($args); Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); Context::set('page', $output->page); @@ -468,7 +460,7 @@ class memberView extends member $folders = $output->data; if(!count($folders)) { - $output = getController('member')->migrateMemberScrappedDocuments($logged_info->member_srl); + $output = MemberController::getInstance()->migrateMemberScrappedDocuments($logged_info->member_srl); if($output && !$output->toBool()) { return $output; @@ -548,18 +540,16 @@ class memberView extends member throw new Rhymix\Framework\Exceptions\FeatureDisabled; } - $oMemberModel = getModel('member'); // 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'); + 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->member_srl = $logged_info->member_srl; $args->page = Context::get('page'); $args->statusList = array('TEMP'); - - $oDocumentModel = getModel('document'); - $output = $oDocumentModel->getDocumentList($args, true); + $output = DocumentModel::getDocumentList($args, true); Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); Context::set('page', $output->page); @@ -610,7 +600,6 @@ class memberView extends member } // get member module configuration. - $oMemberModel = getModel('member'); $config = $this->member_config; Context::set('identifier', $config->identifier); @@ -633,9 +622,8 @@ class memberView extends member */ function dispMemberModifyPassword() { - $oMemberModel = getModel('member'); // 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; @@ -643,7 +631,7 @@ class memberView extends member $member_srl = $logged_info->member_srl; $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); if($memberConfig->identifier == 'user_id') @@ -665,16 +653,15 @@ class memberView extends member */ function dispMemberLeave() { - $oMemberModel = getModel('member'); // 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; $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; - $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl); + $member_info = MemberModel::getMemberInfoByMemberSrl($member_srl); Context::set('member_info',$member_info); if($memberConfig->identifier == 'user_id') @@ -696,8 +683,7 @@ class memberView extends member */ function dispMemberLogout() { - $oMemberController = getController('member'); - $output = $oMemberController->procMemberLogout(); + $output = MemberController::getInstance()->procMemberLogout(); if(!$output->redirect_url) $this->setRedirectUrl(getNotEncodedUrl('act', '')); else @@ -766,8 +752,7 @@ class memberView extends member */ function addExtraFormValidatorMessage() { - $oMemberModel = getModel('member'); - $extraList = $oMemberModel->getUsedJoinFormList(); + $extraList = MemberModel::getUsedJoinFormList(); $js_code = array(); $js_code[] = '',$input_name); Context::addHtmlHeader($addscript); - $oModuleModel = getModel('module'); - $output = $oModuleModel->getModuleFileBoxList(); + $output = ModuleModel::getModuleFileBoxList(); Context::set('filebox_list', $output->data); $filter = Context::get('filter'); diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 815d49386..21e06f7ee 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -32,7 +32,7 @@ class pointController extends point return; } - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); $this->setPoint($member_srl, $cur_point + $point, 'signup'); } @@ -60,7 +60,7 @@ class pointController extends point return; } - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); $this->setPoint($member_srl, $cur_point + $point); } @@ -97,13 +97,13 @@ class pointController extends point { return; } - if ($obj->status === getModel('document')->getConfigStatus('temp')) + if ($obj->status === DocumentModel::getConfigStatus('temp')) { return; } // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Add points for the document. $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); @@ -126,8 +126,7 @@ class pointController extends point */ public function triggerUpdateDocument($obj) { - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($obj->document_srl); + $oDocument = DocumentModel::getDocument($obj->document_srl); $module_srl = $oDocument->get('module_srl'); $member_srl = abs($oDocument->get('member_srl')); @@ -137,11 +136,11 @@ class pointController extends point } // Only give points if the document is being updated from TEMP to another status such as PUBLIC. - if ($obj->status === $oDocumentModel->getConfigStatus('temp') || $oDocument->get('status') !== $oDocumentModel->getConfigStatus('temp')) + if ($obj->status === DocumentModel::getConfigStatus('temp') || $oDocument->get('status') !== DocumentModel::getConfigStatus('temp')) { if ($obj->uploaded_count > $oDocument->get('uploaded_count')) { - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); $cur_point += $attached_files_point * ($obj->uploaded_count - $oDocument->get('uploaded_count')); $this->setPoint($member_srl, $cur_point); @@ -150,7 +149,7 @@ class pointController extends point } // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Add points for the document. $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); @@ -203,13 +202,13 @@ class pointController extends point { return; } - if ($obj->status === getModel('document')->getConfigStatus('temp')) + if ($obj->status === DocumentModel::getConfigStatus('temp')) { return; } // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Subtract points for the document. $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); @@ -243,7 +242,7 @@ class pointController extends point } // Abort if the comment and the document have the same author. - $oDocument = getModel('document')->getDocument($obj->document_srl); + $oDocument = DocumentModel::getDocument($obj->document_srl); if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == $member_srl) { return; @@ -258,7 +257,7 @@ class pointController extends point } // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Add points for the comment. $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); @@ -307,7 +306,7 @@ class pointController extends point } // Abort if the comment and the document have the same author. - $oDocument = getModel('document')->getDocument($obj->document_srl); + $oDocument = DocumentModel::getDocument($obj->document_srl); if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == $member_srl) { return; @@ -324,7 +323,7 @@ class pointController extends point $module_srl = $oDocument->get('module_srl'); // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Add points for the comment. $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); @@ -372,7 +371,7 @@ class pointController extends point } // Get the points of the member - $cur_point = getModel('point')->getPoint($member_srl); + $cur_point = PointModel::getPoint($member_srl); // Subtract points for the file. $file_point = $this->_getModulePointConfig($module_srl, 'upload_file'); @@ -403,7 +402,7 @@ class pointController extends point } // Get current points. - $cur_point = $logged_member_srl ? getModel('point')->getPoint($logged_member_srl) : 0; + $cur_point = $logged_member_srl ? PointModel::getPoint($logged_member_srl) : 0; // If the user (member or guest) does not have enough points, deny access. $config = $this->getConfig(); @@ -435,7 +434,7 @@ class pointController extends point $point = $this->_getModulePointConfig($module_srl, 'download_file'); if ($point) { - $cur_point = getModel('point')->getPoint($logged_member_srl); + $cur_point = PointModel::getPoint($logged_member_srl); $this->setPoint($logged_member_srl, $cur_point + $point); } } @@ -446,7 +445,7 @@ class pointController extends point $point = $this->_getModulePointConfig($module_srl, 'download_file_author'); if ($point) { - $cur_point = getModel('point')->getPoint($author_member_srl); + $cur_point = PointModel::getPoint($author_member_srl); $this->setPoint($author_member_srl, $cur_point + $point); } } @@ -517,7 +516,7 @@ class pointController extends point if ($reader_point) { // Get current points. - $cur_point = $logged_member_srl ? getModel('point')->getPoint($logged_member_srl) : 0; + $cur_point = $logged_member_srl ? PointModel::getPoint($logged_member_srl) : 0; // If the reader does not have enough points, deny access. if ($cur_point + $reader_point < 0 && $config->disable_read_document == 'Y') @@ -554,7 +553,7 @@ class pointController extends point // Adjust points of the person who wrote the document. if ($author_point && $author_member_srl) { - $cur_point = getModel('point')->getPoint($author_member_srl); + $cur_point = PointModel::getPoint($author_member_srl); $this->setPoint($author_member_srl, $cur_point + $author_point); } } @@ -579,13 +578,13 @@ class pointController extends point $config = $this->getConfig(); if ($is_comment) { - $regdate = ztime(getModel('comment')->getComment($obj->comment_srl)->get('regdate')); + $regdate = ztime(CommentModel::getComment($obj->comment_srl)->get('regdate')); $logged_config_key = ($obj->point > 0) ? 'voter_comment_limit' : 'blamer_comment_limit'; $target_config_key = ($obj->point > 0) ? 'voted_comment_limit' : 'blamed_comment_limit'; } else { - $regdate = ztime(getModel('document')->getDocument($obj->document_srl)->get('regdate')); + $regdate = ztime(DocumentModel::getDocument($obj->document_srl)->get('regdate')); $logged_config_key = ($obj->point > 0) ? 'voter_limit' : 'blamer_limit'; $target_config_key = ($obj->point > 0) ? 'voted_limit' : 'blamed_limit'; } @@ -603,7 +602,7 @@ class pointController extends point { $point = -1 * $point; } - $cur_point = getModel('point')->getPoint($logged_member_srl); + $cur_point = PointModel::getPoint($logged_member_srl); $this->setPoint($logged_member_srl, $cur_point + $point); } } @@ -619,7 +618,7 @@ class pointController extends point { $point = -1 * $point; } - $cur_point = getModel('point')->getPoint($target_member_srl); + $cur_point = PointModel::getPoint($target_member_srl); $this->setPoint($target_member_srl, $cur_point + $point); } } @@ -630,8 +629,7 @@ class pointController extends point */ public function triggerCopyModule($obj) { - $oModuleModel = getModel('module'); - $pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl); + $pointConfig = ModuleModel::getModulePartConfig('point', $obj->originModuleSrl); $oModuleController = getController('module'); if(is_array($obj->moduleSrlList)) @@ -653,14 +651,11 @@ class pointController extends point if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update'; // Get configuration information - $oMemberModel = getModel('member'); - $oModuleModel = getModel('module'); - $oPointModel = getModel('point'); - $config = $oModuleModel->getModuleConfig('point'); + $config = ModuleModel::getModuleConfig('point'); // Get the default configuration information - $current_point = $oPointModel->getPoint($member_srl, false, $exists); - $current_level = $oPointModel->getLevel($current_point, $config->level_step); + $current_point = PointModel::getPoint($member_srl, false, $exists); + $current_level = PointModel::getLevel($current_point, $config->level_step); // Change points $args = new stdClass(); @@ -722,7 +717,7 @@ class pointController extends point } // Get a new level - $level = $oPointModel->getLevel($point, $config->level_step); + $level = PointModel::getLevel($point, $config->level_step); // If existing level and a new one are different attempt to set a point group $new_group_list = array(); @@ -744,7 +739,7 @@ class pointController extends point if($point_group && is_array($point_group) && count($point_group) ) { // Get the default group - $default_group = $oMemberModel->getDefaultGroup(); + $default_group = MemberModel::getDefaultGroup(); asort($point_group); // Reset group after initialization @@ -862,13 +857,11 @@ class pointController extends point return 0; } - $oModuleModel = getModel('module'); - if ($module_srl) { if (!isset(self::$_module_config_cache[$module_srl])) { - self::$_module_config_cache[$module_srl] = $oModuleModel->getModulePartConfig('point', $module_srl); + self::$_module_config_cache[$module_srl] = ModuleModel::getModulePartConfig('point', $module_srl); } $module_config = self::$_module_config_cache[$module_srl]; } diff --git a/modules/point/point.model.php b/modules/point/point.model.php index 8dae9c1aa..45191ddf5 100644 --- a/modules/point/point.model.php +++ b/modules/point/point.model.php @@ -10,14 +10,14 @@ class pointModel extends point /** * @brief Initialization */ - function init() + public function init() { } /** * @brief Check if there is points information */ - function isExistsPoint($member_srl) + public static function isExistsPoint($member_srl) { $args = new stdClass; $args->member_srl = abs($member_srl); @@ -29,7 +29,7 @@ class pointModel extends point /** * @brief Get the points */ - function getPoint($member_srl, $from_db = false, &$exists = null) + public static function getPoint($member_srl, $from_db = false, &$exists = null) { $member_srl = abs($member_srl); @@ -93,7 +93,7 @@ class pointModel extends point /** * @brief Get the level */ - function getLevel($point, $level_step) + public static function getLevel($point, $level_step) { $level_count = count($level_step); for ($level = 0; $level <= $level_count; $level++) @@ -109,7 +109,7 @@ class pointModel extends point /** * @deprecated */ - function getMembersPointInfo() + public function getMembersPointInfo() { $member_srls = Context::get('member_srls'); $member_srls = array_unique(explode(',', $member_srls)); @@ -123,7 +123,7 @@ class pointModel extends point { return; } - if (!getModel('module')->isSiteAdmin($logged_info)) + if (!ModuleModel::isSiteAdmin($logged_info)) { $member_srls = array_filter($member_srls, function($member_srl) use($logged_info) { return $member_srl == $logged_info->member_srl; }); if (!count($member_srls)) @@ -132,15 +132,14 @@ class pointModel extends point } } - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); + $config = ModuleModel::getModuleConfig('point'); $info = array(); foreach($member_srls as $v) { $obj = new stdClass; - $obj->point = $this->getPoint($v); - $obj->level = $this->getLevel($obj->point, $config->level_step); + $obj->point = self::getPoint($v); + $obj->level = self::getLevel($obj->point, $config->level_step); $obj->member_srl = $v; $info[] = $obj; } @@ -151,7 +150,7 @@ class pointModel extends point /** * @brief Get a list of points members list */ - function getMemberList($args = null, $columnList = array()) + public static function getMemberList($args = null, $columnList = array()) { // Arrange the search options $args->is_admin = Context::get('is_admin')=='Y'?'Y':''; @@ -212,12 +211,11 @@ class pointModel extends point if($output->total_count) { - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); + $config = ModuleModel::getModuleConfig('point'); foreach($output->data as $key => $val) { - $output->data[$key]->level = $this->getLevel($val->point, $config->level_step); + $output->data[$key]->level = self::getLevel($val->point, $config->level_step); } } diff --git a/modules/point/point.view.php b/modules/point/point.view.php index efcb1d2e9..949afb611 100644 --- a/modules/point/point.view.php +++ b/modules/point/point.view.php @@ -33,12 +33,11 @@ class pointView extends point if(!$current_module_srl) return; } // Get the configuration information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); + $config = ModuleModel::getModuleConfig('point'); if($current_module_srl) { - $module_config = $oModuleModel->getModulePartConfig('point', $current_module_srl); + $module_config = ModuleModel::getModulePartConfig('point', $current_module_srl); if(!$module_config) { $module_config['insert_document'] = $config->insert_document;