From c86c3a16de1b4cdb04d69c840d3a49978230f2a9 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 13:11:21 +0900 Subject: [PATCH 01/13] Implement _getModulePointConfig() and clean up read/download triggers --- modules/point/point.controller.php | 244 +++++++++++++++-------------- 1 file changed, 124 insertions(+), 120 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index d2712989e..5de7dc2e3 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -10,14 +10,14 @@ class pointController extends point /** * @brief Initialization */ - function init() + public function init() { } /** * @brief Membership point application trigger */ - function triggerInsertMember(&$obj) + public function triggerInsertMember($obj) { // Get the point module information $oModuleModel = getModel('module'); @@ -39,7 +39,7 @@ class pointController extends point /** * @brief A trigger to add points to the member for login */ - function triggerAfterLogin(&$obj) + public function triggerAfterLogin($obj) { $member_srl = $obj->member_srl; if(!$member_srl) return new Object(); @@ -63,7 +63,7 @@ class pointController extends point /** * @brief Member group deletion trigger */ - function triggerDeleteGroup(&$obj) + public function triggerDeleteGroup($obj) { // Get the point module config $config = getModel('module')->getModuleConfig('point'); @@ -82,7 +82,7 @@ class pointController extends point /** * @brief A trigger to add points to the member for creating a post */ - function triggerInsertDocument(&$obj) + public function triggerInsertDocument($obj) { $oDocumentModel = getModel('document'); if($obj->status != $oDocumentModel->getConfigStatus('temp')) @@ -118,7 +118,7 @@ class pointController extends point * @brief The trigger to give points for normal saving the temporarily saved document * Temporary storage at the point in 1.2.3 changed to avoid payment */ - function triggerUpdateDocument(&$obj) + public function triggerUpdateDocument($obj) { $oDocumentModel = getModel('document'); $document_srl = $obj->document_srl; @@ -153,7 +153,7 @@ class pointController extends point /** * @brief The trigger which deducts the points related to post comments before deleting the post itself */ - function triggerBeforeDeleteDocument(&$obj) + public function triggerBeforeDeleteDocument($obj) { $document_srl = $obj->document_srl; $member_srl = $obj->member_srl; @@ -204,7 +204,7 @@ class pointController extends point /** * @brief A trigger to give points for deleting the post */ - function triggerDeleteDocument(&$obj) + public function triggerDeleteDocument($obj) { $oDocumentModel = getModel('document'); @@ -244,7 +244,7 @@ class pointController extends point /** * @brief A trigger which gives points for entering a comment */ - function triggerInsertComment(&$obj) + public function triggerInsertComment($obj) { $module_srl = $obj->module_srl; $member_srl = $obj->member_srl; @@ -282,7 +282,7 @@ class pointController extends point /** * @brief A trigger which gives points for deleting a comment */ - function triggerDeleteComment(&$obj) + public function triggerDeleteComment($obj) { $oModuleModel = getModel('module'); $oPointModel = getModel('point'); @@ -317,7 +317,7 @@ class pointController extends point * @brief Add the file registration trigger * To prevent taking points for invalid file registration this method wlil return a null object */ - function triggerInsertFile(&$obj) + public function triggerInsertFile($obj) { return new Object(); } @@ -326,7 +326,7 @@ class pointController extends point * @brief A trigger to give points for deleting a file * Remove points only in case an invalid file is being deleted */ - function triggerDeleteFile(&$obj) + public function triggerDeleteFile($obj) { if($obj->isvalid != 'Y') return new Object(); @@ -353,93 +353,60 @@ class pointController extends point /** * @brief The trigger called before a file is downloaded */ - function triggerBeforeDownloadFile(&$obj) + public function triggerBeforeDownloadFile($obj) { $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; $module_srl = $obj->module_srl; - if(!$module_srl) return new Object(); - // Pass if it is your file - if($member_srl && abs($obj->member_srl) == $member_srl) return new Object(); - - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); - if (isset($module_config['download_file'])) + if ($member_srl && abs($obj->member_srl) == $member_srl) { - $point = intval($module_config['download_file']); - } - else - { - $point = intval($config->download_file); + return new Object(); } - // If the user is not logged in and download requires points, deny access. - if(!Context::get('is_logged')) + $point = $this->_getModulePointConfig($module_srl, 'download_file'); + if (!$point) { - if($config->disable_download == 'Y' && $point) - { - return new Object(-1,'msg_not_permitted_download'); - } - else - { - return new Object(); - } + return new Object(); } - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); + // Get current points. + $cur_point = $member_srl ? getModel('point')->getPoint($member_srl, true) : 0; - // If the member does not have enough points, deny access. + // If the user (member or guest) does not have enough points, deny access. + $config = getModel('module')->getModuleConfig('point'); if ($config->disable_download == 'Y' && $cur_point + $point < 0) { - return new Object(-1,'msg_cannot_download'); + return new Object(-1, 'msg_cannot_download'); } - // Otherwise, points will be adjusted after downloading (triggerDownloadFile). + // Points will be adjusted after downloading (triggerDownloadFile). return new Object(); } /** * @brief The trigger to give or take points for downloading the file */ - function triggerDownloadFile(&$obj) + public function triggerDownloadFile($obj) { - // Run only when logged in $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) return new Object(); - $module_srl = $obj->module_srl; $member_srl = $logged_info->member_srl; - if(!$module_srl) return new Object(); + $module_srl = $obj->module_srl; - // Pass if it is your file - if($member_srl && abs($obj->member_srl) == $member_srl) return new Object(); - - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); - if (isset($module_config['download_file'])) + if (!$member_srl || abs($obj->member_srl) == $member_srl) { - $point = intval($module_config['download_file']); - } - else - { - $point = intval($config->download_file); + return new Object(); } - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - // Increase or decrease points. - if ($point) + $point = $this->_getModulePointConfig($module_srl, 'download_file'); + if (!$point) { - $this->setPoint($member_srl, $cur_point += $point); + return new Object(); } - + + $cur_point = getModel('point')->getPoint($member_srl, true); + $this->setPoint($member_srl, $cur_point + $point); + return new Object(); } @@ -447,67 +414,70 @@ class pointController extends point * @brief Give points for hits increase * Run it even if there are no points */ - function triggerUpdateReadedCount(&$obj) + public function triggerUpdateReadedCount($obj) { - $oModuleModel = getModel('module'); - $oPointModel = getModel('point'); - // Get visitor information $logged_info = Context::get('logged_info'); $member_srl = $logged_info->member_srl; - // Get the original author number + $module_srl = $obj->get('module_srl'); $target_member_srl = abs($obj->get('member_srl')); - // Pass without increasing the hits if the viewer is the same as the author - if($target_member_srl == $member_srl) return new Object(); - // Get the point information for each module - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl')); - // Get hits points - $point = $module_config['read_document']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document; - // Pass if there are no requested points - if(!$point) return new Object(); - // In case of a registered member, if it is read but cannot just pass, then get the current points - $args = new stdClass(); - if($member_srl) + if ($member_srl && $target_member_srl == $member_srl) { + return new Object(); + } + + $point = $this->_getModulePointConfig($module_srl, 'read_document'); + if (!$point) + { + return new Object(); + } + + // If the current member has already read this document, do not adjust points again. + if ($member_srl) + { + $args = new stdClass(); $args->member_srl = $member_srl; $args->document_srl = $obj->document_srl; $output = executeQuery('document.getDocumentReadedLogInfo', $args); - if($output->data->count) return new Object(); - $cur_point = $oPointModel->getPoint($member_srl, true); + if ($output->data->count) + { + return new Object(); + } } - else - { - $cur_point = 0; - } - // Get the defaul configurations of the Point Module - $config = $oModuleModel->getModuleConfig('point'); - // When the requested points are negative, compared it with the current point - $_SESSION['banned_document'][$obj->document_srl] = false; - if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point) + + // Get current points. + $cur_point = $member_srl ? getModel('point')->getPoint($member_srl, true) : 0; + + // If the user (member or guest) does not have enough points, deny access. + $config = getModel('module')->getModuleConfig('point'); + if($config->disable_read_document == 'Y' && $cur_point + $point < 0) { $message = sprintf(lang('msg_disallow_by_point'), abs($point), $cur_point); $obj->add('content', $message); $_SESSION['banned_document'][$obj->document_srl] = true; return new Object(-1, $message); } - // If not logged in, pass - if(!$logged_info->member_srl) return new Object(); - // Pass, if there are no requested points - if(!$point) return new Object(); - // If the read record is missing, leave it - $output = executeQuery('document.insertDocumentReadedLog', $args); - // Increase the point - $cur_point += $point; - $this->setPoint($member_srl,$cur_point); - + else + { + $_SESSION['banned_document'][$obj->document_srl] = false; + } + + // Adjust points for member. + if ($member_srl) + { + $args = new stdClass(); + $args->member_srl = $member_srl; + $args->document_srl = $obj->document_srl; + $output = executeQuery('document.insertDocumentReadedLog', $args); + $this->setPoint($member_srl, $cur_point + $point); + } + return new Object(); } /** * @brief Points for voting up or down */ - function triggerUpdateVotedCount(&$obj) + public function triggerUpdateVotedCount($obj) { $module_srl = $obj->module_srl; $member_srl = $obj->member_srl; @@ -567,10 +537,28 @@ class pointController extends point return new Object(); } + /** + * @brief Copy point settings when copying module + */ + public function triggerCopyModule($obj) + { + $oModuleModel = getModel('module'); + $pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl); + + $oModuleController = getController('module'); + if(is_array($obj->moduleSrlList)) + { + foreach($obj->moduleSrlList AS $key=>$moduleSrl) + { + $oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig); + } + } + } + /** * @brief Set points */ - function setPoint($member_srl, $point, $mode = null) + public function setPoint($member_srl, $point, $mode = null) { $member_srl = abs($member_srl); $mode_arr = array('add', 'minus', 'update', 'signup'); @@ -737,20 +725,36 @@ class pointController extends point return $output; } - - function triggerCopyModule(&$obj) + + /** + * Get point configuration for module, falling back to defaults if not set. + * + * @param int $module_srl + * @param string $config_key + * @return int + */ + protected function _getModulePointConfig($module_srl, $config_key) { - $oModuleModel = getModel('module'); - $pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl); - - $oModuleController = getController('module'); - if(is_array($obj->moduleSrlList)) + $module_srl = intval($module_srl); + $config_key = strval($config_key); + if (!$module_srl || !$config_key) { - foreach($obj->moduleSrlList AS $key=>$moduleSrl) - { - $oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig); - } + return 0; } + + $oModuleModel = getModel('module'); + $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + if (isset($module_config[$config_key]) && $module_config[$config_key] !== '') + { + $point = $module_config[$config_key]; + } + else + { + $default_config = $oModuleModel->getModuleConfig('point'); + $point = $default_config->{$config_key}; + } + + return intval($point); } } /* End of file point.controller.php */ From d4ccf4222d9f71cf635aa789ee8711f7fae305ef Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 14:15:04 +0900 Subject: [PATCH 02/13] Refactor triggerUpdateVotedCount() --- modules/point/point.controller.php | 74 ++++++++++++------------------ 1 file changed, 29 insertions(+), 45 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 5de7dc2e3..2a6bad7b2 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -479,61 +479,45 @@ class pointController extends point */ public function triggerUpdateVotedCount($obj) { + $logged_info = Context::get('logged_info'); + $logged_member_srl = $logged_info->member_srl; $module_srl = $obj->module_srl; - $member_srl = $obj->member_srl; - if(!$module_srl || !$member_srl) return new Object(); - - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); - - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - if( $obj->point > 0 ) + $member_srl = abs($obj->member_srl); + if ($logged_member_srl && $logged_member_srl == $member_srl) { - if($obj->comment_srl) - { - $point = $module_config['voted_comment']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->voted_comment; - } - else - { - $point = $module_config['voted']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->voted; - } + return new Object(); + } + elseif (!$member_srl) + { + return new Object(); + } + + // Get current points. + $cur_point = getModel('point')->getPoint($member_srl, true); + + // Get adjustment amount. + if ($obj->point > 0) + { + $config_key = (isset($obj->comment_srl) && $obj->comment_srl) ? 'voted_comment' : 'voted'; } else { - if($obj->comment_srl) - { - $point = $module_config['blamed_comment']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed_comment; - } - else - { - $point = $module_config['blamed']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed; - } + $config_key = (isset($obj->comment_srl) && $obj->comment_srl) ? 'blamed_comment' : 'blamed'; } - - - if(!$point) return new Object(); - // Increase the point - if($obj->cancel > 0) + + $point = $this->_getModulePointConfig($module_srl, $config_key); + if (!$point) { - $cur_point -= $point; + return new Object(); } - else if($obj->cancel == null) + + if (isset($obj->cancel) && $obj->cancel) { - $cur_point += $point; + $point = -1 * $point; } - else - { - $cur_point += $point; - } - $this->setPoint($member_srl,$cur_point); - + + $this->setPoint($member_srl, $cur_point + $point); + return new Object(); } From d4136f9081a4b3105ec066a1dc248ce047b8bca1 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 14:57:43 +0900 Subject: [PATCH 03/13] Refactor triggerInsertMember() and triggerAfterLogin() --- modules/point/point.controller.php | 82 ++++++++++++++++++------------ 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 2a6bad7b2..03d8817cb 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -19,20 +19,22 @@ class pointController extends point */ public function triggerInsertMember($obj) { - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - // Get the member_srl of the newly registered member $member_srl = $obj->member_srl; - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $config->signup_point; - // Increase the point - $cur_point += $point; - $this->setPoint($member_srl,$cur_point, 'signup'); - + if (!$member_srl) + { + return new Object(); + } + + $config = getModel('module')->getModuleConfig('point'); + $point = intval($config->signup_point); + if (!$point) + { + return new Object(); + } + + $cur_point = getModel('point')->getPoint($member_srl, true); + $this->setPoint($member_srl, $cur_point + $point, 'signup'); + return new Object(); } @@ -42,21 +44,27 @@ class pointController extends point public function triggerAfterLogin($obj) { $member_srl = $obj->member_srl; - if(!$member_srl) return new Object(); - // If the last login is not today, give the points - if(substr($obj->last_login,0,8)==date("Ymd")) return new Object(); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $config->login_point; - // Increase the point - $cur_point += $point; - $this->setPoint($member_srl,$cur_point); - + if (!$member_srl) + { + return new Object(); + } + + // Points are given only once a day. + if (substr($obj->last_login, 0, 8) === date('Ymd')) + { + return new Object(); + } + + $config = getModel('module')->getModuleConfig('point'); + $point = intval($config->login_point); + if (!$point) + { + return new Object(); + } + + $cur_point = getModel('point')->getPoint($member_srl, true); + $this->setPoint($member_srl, $cur_point + $point); + return new Object(); } @@ -65,10 +73,9 @@ class pointController extends point */ public function triggerDeleteGroup($obj) { - // Get the point module config - $config = getModel('module')->getModuleConfig('point'); - // Get the group_srl of the deleted group $group_srl = $obj->group_srl; + $config = getModel('module')->getModuleConfig('point'); + // Exclude deleted group from point/level/group integration if($config->point_group && isset($config->point_group[$group_srl])) { @@ -721,13 +728,22 @@ class pointController extends point { $module_srl = intval($module_srl); $config_key = strval($config_key); - if (!$module_srl || !$config_key) + if (!$config_key) { return 0; } $oModuleModel = getModel('module'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + + if ($module_srl) + { + $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + } + else + { + $module_config = null; + } + if (isset($module_config[$config_key]) && $module_config[$config_key] !== '') { $point = $module_config[$config_key]; From 0b71f425ed21ded72f84176b805241cc583a937c Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 15:03:45 +0900 Subject: [PATCH 04/13] Cache module config in point triggers --- modules/point/point.class.php | 17 +++++++++++++++++ modules/point/point.controller.php | 25 +++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 305e6a094..1d2e9eb0a 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -7,6 +7,23 @@ */ class point extends ModuleObject { + /** + * @brief Configuration cache + */ + protected static $_config = null; + + /** + * @brief Shortcut to getting module configuration + */ + public function getConfig() + { + if (self::$_config === null) + { + self::$_config = getModel('module')->getModuleConfig('point'); + } + return self::$_config; + } + /** * @brief Additional tasks required to accomplish during the installation */ diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 03d8817cb..1ba9b3cc1 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -7,6 +7,11 @@ */ class pointController extends point { + /** + * @brief Cache module point config + */ + protected static $_module_point_config = array(); + /** * @brief Initialization */ @@ -25,7 +30,7 @@ class pointController extends point return new Object(); } - $config = getModel('module')->getModuleConfig('point'); + $config = $this->getConfig(); $point = intval($config->signup_point); if (!$point) { @@ -55,7 +60,7 @@ class pointController extends point return new Object(); } - $config = getModel('module')->getModuleConfig('point'); + $config = $this->getConfig(); $point = intval($config->login_point); if (!$point) { @@ -74,7 +79,7 @@ class pointController extends point public function triggerDeleteGroup($obj) { $group_srl = $obj->group_srl; - $config = getModel('module')->getModuleConfig('point'); + $config = $this->getConfig(); // Exclude deleted group from point/level/group integration if($config->point_group && isset($config->point_group[$group_srl])) @@ -381,7 +386,7 @@ class pointController extends point $cur_point = $member_srl ? getModel('point')->getPoint($member_srl, true) : 0; // If the user (member or guest) does not have enough points, deny access. - $config = getModel('module')->getModuleConfig('point'); + $config = $this->getConfig(); if ($config->disable_download == 'Y' && $cur_point + $point < 0) { return new Object(-1, 'msg_cannot_download'); @@ -455,7 +460,7 @@ class pointController extends point $cur_point = $member_srl ? getModel('point')->getPoint($member_srl, true) : 0; // If the user (member or guest) does not have enough points, deny access. - $config = getModel('module')->getModuleConfig('point'); + $config = $this->getConfig(); if($config->disable_read_document == 'Y' && $cur_point + $point < 0) { $message = sprintf(lang('msg_disallow_by_point'), abs($point), $cur_point); @@ -737,11 +742,15 @@ class pointController extends point if ($module_srl) { - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + if (!isset(self::$_module_point_config[$module_srl])) + { + self::$_module_point_config[$module_srl] = $oModuleModel->getModulePartConfig('point', $module_srl); + } + $module_config = self::$_module_point_config[$module_srl]; } else { - $module_config = null; + $module_config = array(); } if (isset($module_config[$config_key]) && $module_config[$config_key] !== '') @@ -750,7 +759,7 @@ class pointController extends point } else { - $default_config = $oModuleModel->getModuleConfig('point'); + $default_config = $this->getConfig(); $point = $default_config->{$config_key}; } From 590b11aa23cb6bb0e151824c9a034be2dd1269d3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:09:38 +0900 Subject: [PATCH 05/13] Refactor all remaining triggers in Point module --- modules/point/point.controller.php | 372 ++++++++++++++++------------- 1 file changed, 200 insertions(+), 172 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 1ba9b3cc1..7c5fbdcb0 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -96,33 +96,39 @@ class pointController extends point */ public function triggerInsertDocument($obj) { - $oDocumentModel = getModel('document'); - if($obj->status != $oDocumentModel->getConfigStatus('temp')) + $module_srl = $obj->module_srl; + $member_srl = abs($obj->member_srl); + if (!$module_srl || !$member_srl) { - $module_srl = $obj->module_srl; - $member_srl = $obj->member_srl; - if(!$module_srl || !$member_srl) return new Object(); - // The fix to disable giving points for saving the document temporarily - if($module_srl == $member_srl) return new Object(); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point',$module_srl); - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $module_config['insert_document']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document; - $cur_point += $point; - // Add points for attaching a file - $point = $module_config['upload_file']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file; - if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count; - // Increase the point - $this->setPoint($member_srl,$cur_point); + return new Object(); } + + // The fix to disable giving points for saving the document temporarily + if ($module_srl == $member_srl) + { + return new Object(); + } + if ($obj->status === getModel('document')->getConfigStatus('temp')) + { + return new Object(); + } + + // Get the points of the member + $cur_point = getModel('point')->getPoint($member_srl, true); + // Add points for the document. + $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); + $cur_point += $document_point; + + // Add points for attached files. + if ($obj->uploaded_count > 0) + { + $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + $cur_point += $attached_files_point * $obj->uploaded_count; + } + + // Increase the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } @@ -133,32 +139,37 @@ class pointController extends point public function triggerUpdateDocument($obj) { $oDocumentModel = getModel('document'); - $document_srl = $obj->document_srl; - $oDocument = $oDocumentModel->getDocument($document_srl); - - // if status is TEMP or PUBLIC... give not point, only status is empty - if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp')) + $oDocument = $oDocumentModel->getDocument($obj->document_srl); + + $module_srl = $oDocument->get('module_srl'); + $member_srl = abs($oDocument->get('member_srl')); + if (!$module_srl || !$member_srl) { - $oModuleModel = getModel('module'); - - // Get the point module information - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl); - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true); - - $point = $module_config['insert_document']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document; - $cur_point += $point; - // Add points for attaching a file - $point = $module_config['upload_file']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file; - if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count; - // Increase the point - $this->setPoint($oDocument->get('member_srl'), $cur_point); + return new Object(); + } + + // 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')) + { + return new Object(); } + // Get the points of the member + $cur_point = getModel('point')->getPoint($member_srl, true); + + // Add points for the document. + $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); + $cur_point += $document_point; + + // Add points for attached files. + if ($obj->uploaded_count > 0) + { + $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + $cur_point += $attached_files_point * $obj->uploaded_count; + } + + // Increase the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } @@ -168,48 +179,57 @@ class pointController extends point public function triggerBeforeDeleteDocument($obj) { $document_srl = $obj->document_srl; - $member_srl = $obj->member_srl; - - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); - if(!$oDocument->isExists()) return new Object(); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl')); - // The process related to clearing the post comments - $comment_point = $module_config['insert_comment']; - if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment; - // If there are comment points, attempt to deduct - if($comment_point>0) return new Object(); - // Get all the comments related to this post + $oDocument = getModel('document')->getDocument($document_srl); + if (!$oDocument->isExists()) + { + return new Object(); + } + if (!$oDocument->get('comment_count')) + { + return new Object(); + } + + $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); + if (!$comment_point) + { + return new Object(); + } + + // Find out which members wrote how many comments on this document. $cp_args = new stdClass(); $cp_args->document_srl = $document_srl; $output = executeQueryArray('point.getCommentUsers', $cp_args); - // Return if there is no object - if(!$output->data) return new Object(); - // Organize the member number - $member_srls = array(); - $cnt = count($output->data); - for($i=0;$i<$cnt;$i++) + if (!$output->data) { - if($output->data[$i]->member_srl<1) continue; - $member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count; + return new Object(); } - // Remove the member number who has written the original post - if($member_srl) unset($member_srls[abs($member_srl)]); - if(!count($member_srls)) return new Object(); - // Remove all the points for each member + + $member_srls = array(); + foreach ($output->data as $data) + { + if ($data->member_srl && abs($data->member_srl) != abs($oDocument->get('member_srl'))) + { + if (!isset($member_srls[abs($data->member_srl)])) + { + $member_srls[abs($data->member_srl)] = 0; + } + $member_srls[abs($data->member_srl)] += $data->count; + } + } + if (!count($member_srls)) + { + return new Object(); + } + + // Remove points from each member. $oPointModel = getModel('point'); - // Get the points - $point = $module_config['download_file']; - foreach($member_srls as $member_srl => $cnt) + foreach ($member_srls as $member_srl => $count) { $cur_point = $oPointModel->getPoint($member_srl, true); - $cur_point -= $cnt * $comment_point; - $this->setPoint($member_srl,$cur_point); + $cur_point -= $count * $comment_point; + $this->setPoint($member_srl, $cur_point); } - + return new Object(); } @@ -218,38 +238,45 @@ class pointController extends point */ public function triggerDeleteDocument($obj) { - $oDocumentModel = getModel('document'); - - if($obj->status != $oDocumentModel->getConfigStatus('temp')) + $module_srl = $obj->module_srl; + $member_srl = abs($obj->member_srl); + if (!$module_srl || !$member_srl) { - $module_srl = $obj->module_srl; - $member_srl = $obj->member_srl; - // The process related to clearing the post object - if(!$module_srl || !$member_srl) return new Object(); - // Run only when logged in - $logged_info = Context::get('logged_info'); - if(!$logged_info->member_srl) return new Object(); - // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); - - $point = $module_config['insert_document']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document; - // if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article - if($point < 0) return new Object(); - $cur_point -= $point; - // Add points related to deleting an attachment - $point = $module_config['upload_file']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file; - if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count; - // Increase the point - $this->setPoint($member_srl,$cur_point); + return new Object(); } + + // The fix to disable giving points for saving the document temporarily + if ($module_srl == $member_srl) + { + return new Object(); + } + if ($obj->status === getModel('document')->getConfigStatus('temp')) + { + return new Object(); + } + + // Get the points of the member + $cur_point = getModel('point')->getPoint($member_srl, true); + // Subtract points for the document. + $document_point = $this->_getModulePointConfig($module_srl, 'insert_document'); + if ($document_point > 0) + { + $cur_point -= $document_point; + } + + // Subtract points for attached files. + if ($obj->uploaded_count > 0) + { + $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + if ($attached_files_point > 0) + { + $cur_point -= $attached_files_point * $obj->uploaded_count; + } + } + + // Increase the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } @@ -259,35 +286,35 @@ class pointController extends point public function triggerInsertComment($obj) { $module_srl = $obj->module_srl; - $member_srl = $obj->member_srl; - if(!$module_srl || !$member_srl) return new Object(); - // Do not increase the points if the member is the author of the post - $document_srl = $obj->document_srl; - $oDocumentModel = getModel('document'); - $oDocument = $oDocumentModel->getDocument($document_srl); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - if($config->no_point_date > 0) + $member_srl = abs($obj->member_srl); + if (!$module_srl || !$member_srl) { - if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$config->no_point_date.' day'))) - { - return new Object(); - } + return new Object(); } - if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object(); - - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + + // Abort if the comment and the document have the same author. + $oDocument = getModel('document')->getDocument($obj->document_srl); + if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == $member_srl) + { + return new Object(); + } + + // Abort if the document is older than a configured limit. + $config = $this->getConfig(); + if ($config->no_point_date > 0 && ztime($oDocument->get('regdate')) < time() - ($config->no_point_date * 86400)) + { + return new Object(); + } + // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $module_config['insert_comment']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment; - // Increase the point - $cur_point += $point; - $this->setPoint($member_srl,$cur_point); + $cur_point = getModel('point')->getPoint($member_srl, true); + // Add points for the comment. + $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); + $cur_point += $comment_point; + + // Increase the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } @@ -296,32 +323,36 @@ class pointController extends point */ public function triggerDeleteComment($obj) { - $oModuleModel = getModel('module'); - $oPointModel = getModel('point'); - $oDocumentModel = getModel('document'); - $module_srl = $obj->module_srl; $member_srl = abs($obj->member_srl); - $document_srl = $obj->document_srl; - if(!$module_srl || !$member_srl) return new Object(); - // Get the original article (if the original article is missing or if the member is its author, do not apply the points) - $oDocument = $oDocumentModel->getDocument($document_srl); - if(!$oDocument->isExists()) return new Object(); - if($oDocument->get('member_srl')==$member_srl) return new Object(); - // Get the point module information - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + if (!$module_srl || !$member_srl) + { + return new Object(); + } + + // Abort if the comment and the document have the same author. + $oDocument = getModel('document')->getDocument($obj->document_srl); + if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == $member_srl) + { + return new Object(); + } + + // Abort if the document is older than a configured limit. + $config = $this->getConfig(); + if ($config->no_point_date > 0 && ztime($oDocument->get('regdate')) < ztime($obj->regdate) - ($config->no_point_date * 86400)) + { + return new Object(); + } + // Get the points of the member - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $module_config['insert_comment']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment; - // if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment - if($point < 0) return new Object(); - // Increase the point - $cur_point -= $point; - $this->setPoint($member_srl,$cur_point); + $cur_point = getModel('point')->getPoint($member_srl, true); + // Add points for the comment. + $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); + $cur_point -= $comment_point; + + // Increase the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } @@ -340,25 +371,22 @@ class pointController extends point */ public function triggerDeleteFile($obj) { - if($obj->isvalid != 'Y') return new Object(); - $module_srl = $obj->module_srl; - $member_srl = $obj->member_srl; - if(!$module_srl || !$member_srl) return new Object(); - // Get the point module information - $oModuleModel = getModel('module'); - $config = $oModuleModel->getModuleConfig('point'); - $module_config = $oModuleModel->getModulePartConfig('point', $module_srl); + $member_srl = abs($obj->member_srl); + if (!$module_srl || !$member_srl || $obj->isvalid !== 'Y') + { + return new Object(); + } + // Get the points of the member - $oPointModel = getModel('point'); - $cur_point = $oPointModel->getPoint($member_srl, true); - - $point = $module_config['upload_file']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file; - // Increase the point - $cur_point -= $point; - $this->setPoint($member_srl,$cur_point); + $cur_point = getModel('point')->getPoint($member_srl, true); + // Subtract points for the file. + $file_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + $cur_point -= $file_point; + + // Update the point. + $this->setPoint($member_srl, $cur_point); return new Object(); } From da2be81260ced6503e5e51d9dcf9990efa69ebba Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:30:57 +0900 Subject: [PATCH 06/13] Add and subtract points for comment attachments --- modules/point/point.controller.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 7c5fbdcb0..c30285771 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -313,6 +313,13 @@ class pointController extends point $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); $cur_point += $comment_point; + // Add points for attached files. + if ($obj->uploaded_count > 0) + { + $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + $cur_point += $attached_files_point * $obj->uploaded_count; + } + // Increase the point. $this->setPoint($member_srl, $cur_point); return new Object(); @@ -351,6 +358,16 @@ class pointController extends point $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); $cur_point -= $comment_point; + // Subtract points for attached files. + if ($obj->uploaded_count > 0) + { + $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); + if ($attached_files_point > 0) + { + $cur_point -= $attached_files_point * $obj->uploaded_count; + } + } + // Increase the point. $this->setPoint($member_srl, $cur_point); return new Object(); From 0d2db40e02eb17e8d0c027cfef72ab0f74483c3d Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:35:35 +0900 Subject: [PATCH 07/13] Don't double-subtract points when deleting document or comment with attached files --- modules/point/point.controller.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index c30285771..36a6aa657 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -265,16 +265,6 @@ class pointController extends point $cur_point -= $document_point; } - // Subtract points for attached files. - if ($obj->uploaded_count > 0) - { - $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); - if ($attached_files_point > 0) - { - $cur_point -= $attached_files_point * $obj->uploaded_count; - } - } - // Increase the point. $this->setPoint($member_srl, $cur_point); return new Object(); @@ -358,16 +348,6 @@ class pointController extends point $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); $cur_point -= $comment_point; - // Subtract points for attached files. - if ($obj->uploaded_count > 0) - { - $attached_files_point = $this->_getModulePointConfig($module_srl, 'upload_file'); - if ($attached_files_point > 0) - { - $cur_point -= $attached_files_point * $obj->uploaded_count; - } - } - // Increase the point. $this->setPoint($member_srl, $cur_point); return new Object(); From 5b22b0399c6d2836404195d013a5754e5318d587 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:45:15 +0900 Subject: [PATCH 08/13] Fix double-deduction of comment points on document deletion --- modules/point/point.controller.php | 52 ------------------------------ 1 file changed, 52 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 36a6aa657..d0a3c5046 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -178,58 +178,6 @@ class pointController extends point */ public function triggerBeforeDeleteDocument($obj) { - $document_srl = $obj->document_srl; - $oDocument = getModel('document')->getDocument($document_srl); - if (!$oDocument->isExists()) - { - return new Object(); - } - if (!$oDocument->get('comment_count')) - { - return new Object(); - } - - $comment_point = $this->_getModulePointConfig($module_srl, 'insert_comment'); - if (!$comment_point) - { - return new Object(); - } - - // Find out which members wrote how many comments on this document. - $cp_args = new stdClass(); - $cp_args->document_srl = $document_srl; - $output = executeQueryArray('point.getCommentUsers', $cp_args); - if (!$output->data) - { - return new Object(); - } - - $member_srls = array(); - foreach ($output->data as $data) - { - if ($data->member_srl && abs($data->member_srl) != abs($oDocument->get('member_srl'))) - { - if (!isset($member_srls[abs($data->member_srl)])) - { - $member_srls[abs($data->member_srl)] = 0; - } - $member_srls[abs($data->member_srl)] += $data->count; - } - } - if (!count($member_srls)) - { - return new Object(); - } - - // Remove points from each member. - $oPointModel = getModel('point'); - foreach ($member_srls as $member_srl => $count) - { - $cur_point = $oPointModel->getPoint($member_srl, true); - $cur_point -= $count * $comment_point; - $this->setPoint($member_srl, $cur_point); - } - return new Object(); } From e370ba680f8d5e8a836c43cabbdcb7e425633e76 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:52:33 +0900 Subject: [PATCH 09/13] Improve shared caching and invalidation of member points --- modules/point/point.class.php | 10 ++++++++++ modules/point/point.controller.php | 12 ++++-------- modules/point/point.model.php | 31 ++++++++++++++++-------------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 1d2e9eb0a..cc17b6cbc 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -12,6 +12,16 @@ class point extends ModuleObject */ protected static $_config = null; + /** + * @brief Module configuration cache + */ + protected static $_module_config_cache = array(); + + /** + * @brief Member point cache + */ + protected static $_member_point_cache = array(); + /** * @brief Shortcut to getting module configuration */ diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index d0a3c5046..51f6cacdb 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -7,11 +7,6 @@ */ class pointController extends point { - /** - * @brief Cache module point config - */ - protected static $_module_point_config = array(); - /** * @brief Initialization */ @@ -691,6 +686,7 @@ class pointController extends point FileHandler::writeFile($cache_filename, $point); getController('member')->_clearMemberCache($member_srl); + unset(self::$_member_point_cache[$member_srl]); return $output; } @@ -715,11 +711,11 @@ class pointController extends point if ($module_srl) { - if (!isset(self::$_module_point_config[$module_srl])) + if (!isset(self::$_module_config_cache[$module_srl])) { - self::$_module_point_config[$module_srl] = $oModuleModel->getModulePartConfig('point', $module_srl); + self::$_module_config_cache[$module_srl] = $oModuleModel->getModulePartConfig('point', $module_srl); } - $module_config = self::$_module_point_config[$module_srl]; + $module_config = self::$_module_config_cache[$module_srl]; } else { diff --git a/modules/point/point.model.php b/modules/point/point.model.php index 28bfcfacd..ccbdaa48e 100644 --- a/modules/point/point.model.php +++ b/modules/point/point.model.php @@ -7,8 +7,6 @@ */ class pointModel extends point { - var $pointList = array(); - /** * @brief Initialization */ @@ -36,29 +34,34 @@ class pointModel extends point $member_srl = abs($member_srl); // Get from instance memory - if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl]; + if (!$from_db && isset(self::$_member_point_cache[$member_srl]) + { + return self::$_member_point_cache[$member_srl]; + } // Get from file cache - $path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl)); - $cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl); - - if(!$from_db && file_exists($cache_filename)) - return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename)); + $cache_path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s', getNumberingPath($member_srl)); + $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl); + if (!$from_db && file_exists($cache_filename)) + { + return self::$_member_point_cache[$member_srl] = trim(FileHandler::readFile($cache_filename)); + } // Get from the DB $args = new stdClass; $args->member_srl = $member_srl; $output = executeQuery('point.getPoint', $args); - - if(isset($output->data->member_srl)) + if (isset($output->data->member_srl)) { - $point = (int)$output->data->point; - $this->pointList[$member_srl] = $point; - if(!is_dir($path)) FileHandler::makeDir($path); + $point = intval($output->data->point); + self::$_member_point_cache[$member_srl] = $point; FileHandler::writeFile($cache_filename, $point); return $point; } - return 0; + else + { + return 0; + } } /** From 33d36f7a51304caf6340af29c85ba148170d6953 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 16:56:19 +0900 Subject: [PATCH 10/13] General cleanup of point.model.php --- modules/point/point.model.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/point/point.model.php b/modules/point/point.model.php index ccbdaa48e..b39f8a076 100644 --- a/modules/point/point.model.php +++ b/modules/point/point.model.php @@ -34,7 +34,7 @@ class pointModel extends point $member_srl = abs($member_srl); // Get from instance memory - if (!$from_db && isset(self::$_member_point_cache[$member_srl]) + if (!$from_db && isset(self::$_member_point_cache[$member_srl])) { return self::$_member_point_cache[$member_srl]; } @@ -70,11 +70,19 @@ class pointModel extends point function getLevel($point, $level_step) { $level_count = count($level_step); - for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break; - $level --; - return $level; + for ($level = 0; $level <= $level_count; $level++) + { + if ($point < $level_step[$level]) + { + break; + } + } + return $level - 1; } + /** + * @deprecated + */ function getMembersPointInfo() { $member_srls = Context::get('member_srls'); @@ -114,7 +122,6 @@ class pointModel extends point $this->add('point_info',$info); } - /** * @brief Get a list of points members list */ From 9791808b87fc6ca112e793c846e95d0fd0a7359c Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 17:13:27 +0900 Subject: [PATCH 11/13] General cleanup of trigger handling in point.class.php --- modules/point/point.class.php | 280 ++++++++++++++-------------------- 1 file changed, 113 insertions(+), 167 deletions(-) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index cc17b6cbc..c53d835fa 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -8,20 +8,52 @@ class point extends ModuleObject { /** - * @brief Configuration cache + * Cache for the point module's own configuration. */ protected static $_config = null; /** - * @brief Module configuration cache + * Cache for other modules' point configuration. */ protected static $_module_config_cache = array(); /** - * @brief Member point cache + * Cache for member points. */ protected static $_member_point_cache = array(); + /** + * Triggers to insert. + */ + protected static $_insert_triggers = array( + array('member.insertMember', 'after', 'controller', 'triggerInsertMember'), + array('member.doLogin', 'after', 'controller', 'triggerAfterLogin'), + array('member.deleteGroup', 'after', 'controller', 'triggerDeleteGroup'), + array('document.insertDocument', 'after', 'controller', 'triggerInsertDocument'), + array('document.updateDocument', 'before', 'controller', 'triggerUpdateDocument'), + array('document.deleteDocument', 'after', 'controller', 'triggerDeleteDocument'), + array('comment.insertComment', 'after', 'controller', 'triggerInsertComment'), + array('comment.deleteComment', 'after', 'controller', 'triggerDeleteComment'), + array('file.deleteFile', 'after', 'controller', 'triggerDeleteFile'), + array('file.downloadFile', 'before', 'controller', 'triggerBeforeDownloadFile'), + array('file.downloadFile', 'after', 'controller', 'triggerDownloadFile'), + array('document.updateReadedCount', 'after', 'controller', 'triggerUpdateReadedCount'), + array('document.updateVotedCount', 'after', 'controller', 'triggerUpdateVotedCount'), + array('document.updateVotedCountCancel', 'after', 'controller', 'triggerUpdateVotedCount'), + array('comment.updateVotedCount', 'after', 'controller', 'triggerUpdateVotedCount'), + array('comment.updateVotedCountCancel', 'after', 'controller', 'triggerUpdateVotedCount'), + array('module.procModuleAdminCopyModule', 'after', 'controller', 'triggerCopyModule'), + array('module.dispAdditionSetup', 'after', 'view', 'triggerDispPointAdditionSetup'), + ); + + /** + * Triggers to delete. + */ + protected static $_delete_triggers = array( + array('document.deleteDocument', 'before', 'controller', 'triggerBeforeDeleteDocument'), + array('file.insertFile', 'after', 'controller', 'triggerInsertFile'), + ); + /** * @brief Shortcut to getting module configuration */ @@ -34,95 +66,96 @@ class point extends ModuleObject return self::$_config; } + /** + * Check triggers. + * + * @return bool + */ + public function checkTriggers() + { + $oModuleModel = getModel('module'); + foreach (self::$_insert_triggers as $trigger) + { + if (!$oModuleModel->getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) + { + return true; + } + } + foreach (self::$_delete_triggers as $trigger) + { + if ($oModuleModel->getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) + { + return true; + } + } + return false; + } + + /** + * Register triggers. + * + * @return object + */ + public function registerTriggers() + { + $oModuleModel = getModel('module'); + $oModuleController = getController('module'); + foreach (self::$_insert_triggers as $trigger) + { + if (!$oModuleModel->getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) + { + $oModuleController->insertTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1]); + } + } + foreach (self::$_delete_triggers as $trigger) + { + if ($oModuleModel->getTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1])) + { + $oModuleController->deleteTrigger($trigger[0], $this->module, $trigger[2], $trigger[3], $trigger[1]); + } + } + return new Object(0, 'success_updated'); + } + /** * @brief Additional tasks required to accomplish during the installation */ function moduleInstall() { - // Registration in action forward (for using in the administrator mode) - $oModuleController = getController('module'); - // Create a directory to store points information - FileHandler::makeDir('./files/member_extra_info/point'); - - $oModuleController = getController('module'); - // The highest level + // Define default configuration. $config = new stdClass; - // default, point module is OFF $config->able_module = 'N'; - $config->max_level = 30; - // Per-level score - for($i=1;$i<=30;$i++) - { - $config->level_step[$i] = pow($i,2)*90; - } - // Points for registration - $config->signup_point = 10; - // Login points - $config->login_point = 5; - // Point's name $config->point_name = 'point'; - // Level icon directory - $config->level_icon = "default"; - // Prevent downloads if there are no scores - $config->disable_download = false; - - /** - * Define the default points per module as well as all actions (as we do not know if it is forum or blogs, specify "act") - */ - // Insert document + $config->level_icon = 'default'; + $config->disable_read_document = 'N'; + $config->disable_download = 'N'; + $config->max_level = 30; + for ($i = 1; $i <= 30; $i++) + { + $config->level_step[$i] = pow($i, 2) * 90; + } + + // Define default points. + $config->signup_point = 10; + $config->login_point = 5; $config->insert_document = 10; - - $config->insert_document_act = 'procBoardInsertDocument'; - $config->delete_document_act = 'procBoardDeleteDocument'; - // Insert comment $config->insert_comment = 5; - - $config->insert_comment_act = 'procBoardInsertComment,procBlogInsertComment'; - $config->delete_comment_act = 'procBoardDeleteComment,procBlogDeleteComment'; - // Upload $config->upload_file = 5; - - $config->upload_file_act = 'procFileUpload'; - $config->delete_file_act = 'procFileDelete'; - // Download $config->download_file = -5; - $config->download_file_act = 'procFileDownload'; - // View $config->read_document = 0; - // Vote up / Vote down $config->voted = 0; $config->blamed = 0; - // Comment Vote up / Comment Vote down $config->voted_comment = 0; $config->blamed_comment = 0; - // Save configurations - $oModuleController->insertModuleConfig('point', $config); - // Cash act list for faster execution - $oPointController = getAdminController('point'); - $oPointController->cacheActList(); - // Add a trigger for registration/insert document/insert comment/upload a file/download - $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after'); - $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after'); - $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before'); - $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after'); - $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after'); - $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after'); - $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after'); - $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after'); - $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before'); - $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after'); - $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'); - $oModuleController->insertTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after'); - $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after'); - $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after'); - // Add a trigger for voting up and down 2008.05.13 haneul - $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero - $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before'); - // Add a trigger for comment voting up and down 2014.08.30 sejin7940 - $oModuleController->insertTrigger('comment.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - $oModuleController->insertTrigger('document.updateVotedCountCancel', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - return new Object(); + + // Save module config. + getController('module')->insertModuleConfig('point', $config); + + // Create a directory to store points information. + FileHandler::makeDir('./files/member_extra_info/point'); + + // Register triggers. + return $this->registerTriggers(); } /** @@ -130,41 +163,11 @@ class point extends ModuleObject */ function checkUpdate() { - // Get the information of the point module - $oModuleModel = getModel('module'); - - $config = $oModuleModel->getModuleConfig('point'); - // check if module is abled - if($config->able_module != 'N') + $config = $this->getConfig(); + if ($config->able_module === 'Y') { - // Add a trigger for registration/insert document/insert comment/upload a file/download - if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true; - if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true; - if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true; - if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true; - if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true; - if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true; - if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true; - if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true; - if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true; - if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true; - if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true; - if(!$oModuleModel->getTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after')) return true; - if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true; - if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true; - // Add a trigger for voting up and down 2008.05.13 haneul - if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true; - // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero - if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true; - - // 2012. 08. 29 Add a trigger to copy additional setting when the module is copied - if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true; - - // Add a trigger for comment voting up and down 2014.08.30 sejin7940 - if(!$oModuleModel->getTrigger('comment.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true; - if(!$oModuleModel->getTrigger('document.updateVotedCountCancel', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true; + return $this->checkTriggers(); } - return false; } /** @@ -172,62 +175,7 @@ class point extends ModuleObject */ function moduleUpdate() { - // Get the information of the point module - $oModuleModel = getModel('module'); - $oModuleController = getController('module'); - // Add a trigger for registration/insert document/insert comment/upload a file/download - if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) - $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after'); - if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) - $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after'); - if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) - $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before'); - if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) - $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after'); - if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) - $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after'); - if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) - $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after'); - if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) - $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after'); - if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) - $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after'); - if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) - $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before'); - if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) - $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after'); - if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) - $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'); - if(!$oModuleModel->getTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after')) - $oModuleController->insertTrigger('member.deleteGroup', 'point', 'controller', 'triggerDeleteGroup', 'after'); - if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) - $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after'); - if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) - $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after'); - // Add a trigger for voting up and down 2008.05.13 haneul - if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) - $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - if(!$oModuleModel->getTrigger('document.updateVotedCountCancel', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) - $oModuleController->insertTrigger('document.updateVotedCountCancel', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero - if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) - $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before'); - // 2012. 08. 29 Add a trigger to copy additional setting when the module is copied - if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) - { - $oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'); - } - // Add a trigger for comment voting up and down 2014.08.30 sejin7940 - if(!$oModuleModel->getTrigger('comment.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) - { - $config = $oModuleModel->getModuleConfig('point'); - $config->voted_comment = 0; - $config->blamed_comment = 0; - $oModuleController->insertModuleConfig('point', $config); - $oModuleController->insertTrigger('comment.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'); - } - - return new Object(0, 'success_updated'); + return $this->registerTriggers(); } /** @@ -235,9 +183,7 @@ class point extends ModuleObject */ function recompileCache() { - // redefine point action file - $oPointAdminController = getAdminController('point'); - $oPointAdminController->cacheActList(); + } } /* End of file point.class.php */ From dafbfadc93e818f822502c7ffd9ec137be3fa218 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 17:47:50 +0900 Subject: [PATCH 12/13] Add option to keep existing group when point is reduced #610 --- modules/point/lang/en.php | 8 ++++++-- modules/point/lang/ko.php | 8 ++++++-- modules/point/point.admin.controller.php | 1 + modules/point/point.class.php | 2 ++ modules/point/point.controller.php | 18 +++++++++++++----- modules/point/tpl/config.html | 22 +++++++++++++++++----- 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/modules/point/lang/en.php b/modules/point/lang/en.php index cc2b61ecc..900a4a486 100644 --- a/modules/point/lang/en.php +++ b/modules/point/lang/en.php @@ -25,8 +25,12 @@ $lang->cmd_point_recal = 'Reset Point'; $lang->about_cmd_point_recal = 'All point will be initialized only with articles/comments/attachments/join points. Only members who do website activities will get signup points after reset. Please use this function when complete initialization is required in case of data transferring or other situations.'; $lang->default_group = 'Default Group'; $lang->point_link_group = 'Group Change by Level'; -$lang->point_group_reset_and_add = 'Reset adjusted groups and add new groups'; -$lang->point_group_add_only = 'Only to new groups'; +$lang->point_group_reset_type = 'Change Type'; +$lang->point_group_reset_and_add = 'Remove from other groups and add new group'; +$lang->point_group_add_only = 'Keep other groups and add new group'; +$lang->point_group_ratchet = 'Change on Point Reduction'; +$lang->point_group_ratchet_yes = 'Maintain current group if point is reduced'; +$lang->point_group_ratchet_no = 'Move to lower group if point is reduced'; $lang->about_point_link_group = 'If you specify level for a specific group, users are assigned into the group when they advance to the level by getting points.'; $lang->about_module_point = 'You can set point for each module, and modules which don\'t have any value will use the default point. All points will be restored on acting reverse.'; $lang->point_signup = 'Sign up'; diff --git a/modules/point/lang/ko.php b/modules/point/lang/ko.php index a64c2163f..4b26c5b77 100644 --- a/modules/point/lang/ko.php +++ b/modules/point/lang/ko.php @@ -25,8 +25,12 @@ $lang->cmd_point_recal = '포인트 초기화'; $lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화합니다. 회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다. 데이터 이전 등을 하여 포인트를 완전히 초기화해야 할 경우에만 사용하세요.'; $lang->default_group = '기본 그룹'; $lang->point_link_group = '그룹 연동'; -$lang->point_group_reset_and_add = '설정된 그룹 초기화 후 새 그룹 부여'; -$lang->point_group_add_only = '새 그룹만 부여'; +$lang->point_group_reset_type = '그룹 연동 방식'; +$lang->point_group_reset_and_add = '예전 그룹을 제거하고 새 그룹을 추가'; +$lang->point_group_add_only = '예전 그룹을 유지하며 새 그룹을 추가'; +$lang->point_group_ratchet = '포인트 감소 처리 방식'; +$lang->point_group_ratchet_yes = '포인트가 감소하더라도 기존 그룹을 유지'; +$lang->point_group_ratchet_no = '포인트가 감소하면 하위 그룹으로 이동'; $lang->about_point_link_group = '그룹에 원하는 레벨을 지정하면, 회원의 포인트가 해당 레벨의 포인트에 도달할 때 그룹이 변경됩니다.'; $lang->about_module_point = '모듈별 포인트를 지정할 수 있으며 지정되지 않은 모듈은 기본 포인트를 이용합니다. 모든 점수는 반대 행동을 하였을 경우 원상복구 됩니다.'; $lang->point_signup = '가입'; diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 59f5c825f..73fd1c6af 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -99,6 +99,7 @@ class pointAdminController extends point } $config->group_reset = $args->group_reset; + $config->group_ratchet = $args->group_ratchet; // Per-level point configurations unset($config->level_step); for($i=1;$i<=$config->max_level;$i++) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index c53d835fa..4c2570b45 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -129,6 +129,8 @@ class point extends ModuleObject $config->level_icon = 'default'; $config->disable_read_document = 'N'; $config->disable_download = 'N'; + $config->group_reset = 'Y'; + $config->group_ratchet = 'N'; $config->max_level = 30; for ($i = 1; $i <= 30; $i++) { diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 51f6cacdb..84597c076 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -585,7 +585,18 @@ class pointController extends point $level = $oPointModel->getLevel($point, $config->level_step); // If existing level and a new one are different attempt to set a point group - if($level != $current_level) + $new_group_list = array(); + $del_group_list = array(); + if ($config->group_ratchet === 'Y') + { + $change_group = ($level > $current_level); + } + else + { + $change_group = ($level != $current_level); + } + + if ($change_group) { // Check if the level, for which the current points are prepared, is calculate and set the correct group $point_group = $config->point_group; @@ -594,11 +605,8 @@ class pointController extends point { // Get the default group $default_group = $oMemberModel->getDefaultGroup(); - // Get the removed group and the newly granted group - $del_group_list = array(); - $new_group_list = array(); - asort($point_group); + // Reset group after initialization if($config->group_reset != 'N') { diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index 5d6720d87..3c831e9d4 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -105,11 +105,23 @@

{$lang->point_link_group}

-
-

{$lang->about_point_link_group}

-
- - +

{$lang->about_point_link_group}

+
+ +
+ +
+
+
+ +
+
From 87648f49d40bf25ab4fd529b2163afc2d5487e1e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 Mar 2017 18:03:14 +0900 Subject: [PATCH 13/13] Fix point for attached files when updating document --- modules/point/point.class.php | 1 + modules/point/point.controller.php | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 4c2570b45..45f36e9fa 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -33,6 +33,7 @@ class point extends ModuleObject array('document.updateDocument', 'before', 'controller', 'triggerUpdateDocument'), array('document.deleteDocument', 'after', 'controller', 'triggerDeleteDocument'), array('comment.insertComment', 'after', 'controller', 'triggerInsertComment'), + array('comment.updateComment', 'after', 'controller', 'triggerUpdateComment'), array('comment.deleteComment', 'after', 'controller', 'triggerDeleteComment'), array('file.deleteFile', 'after', 'controller', 'triggerDeleteFile'), array('file.downloadFile', 'before', 'controller', 'triggerBeforeDownloadFile'), diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 84597c076..78dbb81a0 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -146,6 +146,13 @@ 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->uploaded_count > $oDocument->get('uploaded_count')) + { + $cur_point = getModel('point')->getPoint($member_srl, true); + $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); + } return new Object(); } @@ -258,6 +265,14 @@ class pointController extends point return new Object(); } + /** + * @brief A trigger which gives points for uploaded file changes to a comment + */ + public function triggerUpdateComment($obj) + { + return new Object(); + } + /** * @brief A trigger which gives points for deleting a comment */