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

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/point/point.controller.php
View file

@ -332,7 +332,7 @@
$point = $module_config['download_file'];
if(!isset($point)) $point = $config->download_file;
// If points are less than 0, and if downloading a file is not allowed in this case, give an errors
if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_not_permitted_download');
if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_cannot_download');
return new Object();
}
@ -533,8 +533,9 @@
}
// Delete the group of a level which is higher than the current level
foreach($point_group as $group_srl => $target_level) {
if($target_level > $level) $del_group_list[] = $group_srl;
if($target_level > $level) $del_group_list[] = $group_srl;
}
$del_group_list[] = $default_group->group_srl;
}
// Grant a new group
else {
@ -567,7 +568,33 @@
$cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl);
FileHandler::writeFile($cache_filename, $point);
$oCacheHandler = &CacheHandler::getInstance('object');
if($oCacheHandler->isSupport())
{
$cache_key = 'object:'.$member_srl;
$GLOBALS['__member_info__'][$member_srl] = null;
$oCacheHandler->delete($cache_key);
$gcache_key = 'object_member_groups:'.$member_srl.'_0';
$oCacheHandler->delete($gcache_key);
}
return $output;
}
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);
}
}
}
}
?>