fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-19 19:29:56 +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

4
modules/point/lang/lang.xml
View file

@ -254,6 +254,10 @@
<value xml:lang="tr"><![CDATA[Sadece makalelerdeki/yorumlardaki/eklerdeki/katılımlardaki tüm puanlar sıfırlanacaktır.<br />Sıfırlamadan sonra sadece, website aktiviteleri yapan üyeler, giriş puanı alacaklardır.<br />Lütfen bu özelliği sadece veri taşıma veya cidden gerekliliği olduğu durumlarda kullanınız.]]></value>
<value xml:lang="vi"><![CDATA[Điểm chỉ có thể có được khi gửi bài, bình luận, đính kèm và khi đăng kí.<br />Chỉ có thể thiết lập lại điểm của những thành viên đã đăng kí là thành viên.<br />Xin hãy chỉ sử dụng chức năng này khi bạn chuyển nội dung của Website qua một Website khác.]]></value>
</item>
<item name="default_group">
<value xml:lang="ko"><![CDATA[기본 그룹]]></value>
<value xml:lang="en"><![CDATA[Default Group]]></value>
</item>
<item name="point_link_group">
<value xml:lang="ko"><![CDATA[그룹 연동]]></value>
<value xml:lang="en"><![CDATA[Group Change by Level]]></value>

1
modules/point/point.admin.view.php
View file

@ -39,7 +39,6 @@
$selected_group_list = array();
if(count($group_list)) {
foreach($group_list as $key => $val) {
if($val->is_admin == 'Y' || $val->is_default == 'Y') continue;
$selected_group_list[$key] = $val;
}
}

8
modules/point/point.class.php
View file

@ -112,6 +112,9 @@
// 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;
return false;
}
@ -155,6 +158,11 @@
// 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');
}
return new Object(0, 'success_updated');
}

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);
}
}
}
}
?>

3
modules/point/tpl/config.html
View file

@ -106,7 +106,8 @@
<tbody>
<tr loop="$group_list => $key,$val">
<td><label for="point_group_{$key}">{$val->title}</label></td>
<td><input type="text" value="{$config->point_group[$key]}" name="point_group_{$key}" id="point_group_{$key}" style="width:30px" /></td>
<td cond="$val->is_default != 'Y'"><input type="text" value="{$config->point_group[$key]}" name="point_group_{$key}" id="point_group_{$key}" style="width:30px" /></td>
<td cond="$val->is_default == 'Y'"><span>{$lang->default_group}</span></td>
</tr>
</tbody>
</table>