diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 38355d119..3265b385a 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -50,6 +50,8 @@ class pointAdminController extends point $config->download_file = (int)$args->download_file; $config->voted = (int)$args->voted; $config->blamed = (int)$args->blamed; + $config->voted_comment = (int)$args->voted_comment; + $config->blamed_comment = (int)$args->blamed_comment; // The highest level $config->max_level = $args->max_level; if($config->max_level>1000) $config->max_level = 1000; @@ -62,10 +64,10 @@ class pointAdminController extends point // Check if reading a document is not allowed if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y'; else $config->disable_read_document = 'N'; - + $oMemberModel = getModel('member'); $group_list = $oMemberModel->getGroups(); - + // Per-level group configurations foreach($group_list as $group) { @@ -132,7 +134,7 @@ class pointAdminController extends point { $args = Context::getRequestVars(); - $configTypeList = array('insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', 'voted', 'blamed'); + $configTypeList = array('insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', 'voted', 'blamed', 'voted_comment', 'blamed_comment'); foreach($configTypeList AS $config) { if(is_array($args->{$config})) @@ -186,6 +188,8 @@ class pointAdminController extends point $config['read_document'] = (int)Context::get('read_document'); $config['voted'] = (int)Context::get('voted'); $config['blamed'] = (int)Context::get('blamed'); + $config['voted_comment'] = (int)Context::get('voted_comment'); + $config['blamed_comment'] = (int)Context::get('blamed_comment'); $oModuleController->insertModulePartConfig('point', $srl, $config); } diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 7894854f8..2fbc28999 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -65,12 +65,34 @@ class point extends ModuleObject // 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('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'); return new Object(); } @@ -107,8 +129,10 @@ class point extends ModuleObject // 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; + } return false; } @@ -158,6 +182,15 @@ class point extends ModuleObject { $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'); } diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index 3337b5514..afad25ef1 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -459,15 +459,32 @@ class pointController extends point if( $obj->point > 0 ) { - $point = $module_config['voted']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->voted; + 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; + } } else { - $point = $module_config['blamed']; - if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed; + 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; + } } + if(!$point) return new Object(); // Increase the point $cur_point += $point; diff --git a/modules/point/point.view.php b/modules/point/point.view.php index 2fc1bb312..089323630 100644 --- a/modules/point/point.view.php +++ b/modules/point/point.view.php @@ -48,6 +48,8 @@ class pointView extends point $module_config['read_document'] = $config->read_document; $module_config['voted'] = $config->voted; $module_config['blamed'] = $config->blamed; + $module_config['voted_comment'] = $config->voted_comment; + $module_config['blamed_comment'] = $config->blamed_comment; } } diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index b9a79cb68..3394da675 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -58,6 +58,12 @@
: +
+ : + +
+ : +
@@ -190,4 +196,4 @@ jQuery(function($){ } }); }); - \ No newline at end of file + diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html index 07ee02cba..2f67facf9 100644 --- a/modules/point/tpl/module_config.html +++ b/modules/point/tpl/module_config.html @@ -18,6 +18,8 @@ {$lang->point_read_document} {$lang->point_voted} {$lang->point_blamed} + {$lang->comment} {$lang->point_voted} + {$lang->comment} {$lang->point_blamed} @@ -30,6 +32,8 @@ {$config->point_name} {$config->point_name} {$config->point_name} + {$config->point_name} + {$config->point_name} diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html index 81273df1c..0fda279e4 100644 --- a/modules/point/tpl/point_module_config.html +++ b/modules/point/tpl/point_module_config.html @@ -50,6 +50,18 @@ {$module_config['point_name']}
+
+ +
+ {$module_config['point_name']} +
+
+
+ +
+ {$module_config['point_name']} +
+