From e74f4c1f87fc7e3a463eaed96eee44877fae76d5 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:42:22 +0900 Subject: [PATCH 1/8] Update point.class.php --- modules/point/point.class.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/point/point.class.php b/modules/point/point.class.php index 54818be74..4019969b4 100644 --- a/modules/point/point.class.php +++ b/modules/point/point.class.php @@ -63,6 +63,9 @@ 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 @@ -86,7 +89,8 @@ class point extends ModuleObject $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(); } @@ -118,7 +122,8 @@ 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; } @@ -168,6 +173,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'); } From 6ca19f0decbba2f70f70299421dda78b3dcba97b Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:44:14 +0900 Subject: [PATCH 2/8] Update config.html --- modules/point/tpl/config.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html index 0f64c8994..8ddad6bc3 100644 --- a/modules/point/tpl/config.html +++ b/modules/point/tpl/config.html @@ -51,6 +51,12 @@
: +
+ : + +
+ : +
From 717ab0a8ab7bd72de8459a650cf27c0ccbfd1c8c Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:48:12 +0900 Subject: [PATCH 3/8] Update point.controller.php --- modules/point/point.controller.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php index b3f32b9a3..abbefbdb1 100644 --- a/modules/point/point.controller.php +++ b/modules/point/point.controller.php @@ -456,15 +456,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; From c9533d81b67713569f43bf6e764e27c908e9c465 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:51:25 +0900 Subject: [PATCH 4/8] Update point_module_config.html --- modules/point/tpl/point_module_config.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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']} +
+
From 4b7fe3f43b2b9c954e60afe54476de1a192e225a Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:52:57 +0900 Subject: [PATCH 5/8] Update point.admin.controller.php --- modules/point/point.admin.controller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index 7391c9b3f..b40fab691 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -37,6 +37,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; From dcf7c74e391a54fd253ecd6f8d25065657645401 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:54:01 +0900 Subject: [PATCH 6/8] Update point.view.php --- modules/point/point.view.php | 2 ++ 1 file changed, 2 insertions(+) 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; } } From ac4a4cee75539992f892410be765eb1d62fb610e Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 20:58:10 +0900 Subject: [PATCH 7/8] Update module_config.html --- modules/point/tpl/module_config.html | 4 ++++ 1 file changed, 4 insertions(+) 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} From 54eb8a63457f38f9bb78b01d2263c70155db5ae6 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Sat, 30 Aug 2014 21:06:47 +0900 Subject: [PATCH 8/8] Update point.admin.controller.php --- modules/point/point.admin.controller.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php index b40fab691..72b6c5381 100644 --- a/modules/point/point.admin.controller.php +++ b/modules/point/point.admin.controller.php @@ -99,7 +99,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})) @@ -153,6 +153,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); }