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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/point/point.admin.controller.php
View file

@ -47,14 +47,20 @@
// 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';
// Per-level group configurations
foreach($args as $key => $val) {
if(substr($key, 0, strlen('point_group_')) != 'point_group_') continue;
$group_srl = substr($key, strlen('point_group_'));
$level = $val;
if(!$level) unset($config->point_group[$group_srl]);
else $config->point_group[$group_srl] = $level;
}
foreach($config->point_group as $group_srl=>$level)
{
if($args->{'point_group_'.$group_srl})
{
$config->point_group[$group_srl] = $args->{'point_group_'.$group_srl};
}
else
{
unset($config->point_group[$group_srl]);
}
}
$config->group_reset = $args->group_reset;
// Per-level point configurations
unset($config->level_step);
@ -190,6 +196,18 @@
$module_config = $oModuleModel->getModulePartConfigs('point');
// A variable to store member's points
$member = array();
// Get member infomation
$output = executeQueryArray('point.getMemberCount');
if(!$output->toBool()) return $output;
if($output->data) {
foreach($output->data as $key => $val) {
if(!$val->member_srl) continue;
$member[$val->member_srl] = 0;
}
}
// Get post information
$output = executeQueryArray('point.getDocumentPoint');
if(!$output->toBool()) return $output;
@ -202,9 +220,10 @@
if(!$val->member_srl) continue;
$point = $insert_point * $val->count;
$member[$val->member_srl] += $point;
}
}
$output = null;
}
}
$output = null;
// Get comments information
$output = executeQueryArray('point.getCommentPoint');
if(!$output->toBool()) return $output;