mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-15 01:09:57 +09:00
merge from branch luminous (version 1.5.4.2, ~r12561)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
2263200ce4
commit
cc47d2b247
196 changed files with 3655 additions and 2033 deletions
|
|
@ -50,11 +50,51 @@
|
|||
return $output;
|
||||
}
|
||||
|
||||
function getSelectedManageHTML($grantList)
|
||||
{
|
||||
// Grant virtual permission for access and manager
|
||||
$grantList->access->title = Context::getLang('grant_access');
|
||||
$grantList->access->default = 'guest';
|
||||
if(count($grantList))
|
||||
{
|
||||
foreach($grantList as $key => $val) {
|
||||
if(!$val->default) $val->default = 'guest';
|
||||
if($val->default == 'root') $val->default = 'manager';
|
||||
$grant_list->{$key} = $val;
|
||||
}
|
||||
}
|
||||
$grant_list->manager->title = Context::getLang('grant_manager');
|
||||
$grant_list->manager->default = 'manager';
|
||||
Context::set('grant_list', $grant_list);
|
||||
|
||||
// Get a list of groups
|
||||
$oMemberModel = &getModel('member');
|
||||
$group_list = $oMemberModel->getGroups(0);
|
||||
Context::set('group_list', $group_list);
|
||||
|
||||
Context::set('module_srls', 'dummy');
|
||||
$content = '';
|
||||
// Call a trigger for additional settings
|
||||
// Considering uses in the other modules, trigger name cen be publicly used
|
||||
$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
|
||||
$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
|
||||
Context::set('setup_content', $content);
|
||||
|
||||
// Get information of module_grants
|
||||
$oTemplate = &TemplateHandler::getInstance();
|
||||
return $oTemplate->compile($this->module_path.'tpl', 'include.manage_selected.html');
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Common:: module's permission displaying page in the module
|
||||
* Available when using module instance in all the modules
|
||||
**/
|
||||
function getModuleGrantHTML($module_srl, $source_grant_list) {
|
||||
if(!$module_srl)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// get member module's config
|
||||
$oMemberModel = &getModel('member');
|
||||
$member_config = $oMemberModel->getMemberConfig();
|
||||
|
|
@ -169,15 +209,24 @@
|
|||
$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
|
||||
}
|
||||
|
||||
if(count($skin_info->extra_vars)) {
|
||||
foreach($skin_info->extra_vars as $key => $val) {
|
||||
if(count($skin_info->extra_vars))
|
||||
{
|
||||
foreach($skin_info->extra_vars as $key => $val)
|
||||
{
|
||||
$group = $val->group;
|
||||
$name = $val->name;
|
||||
$type = $val->type;
|
||||
if($skin_vars[$name]) $value = $skin_vars[$name]->value;
|
||||
if($skin_vars[$name])
|
||||
{
|
||||
$value = $skin_vars[$name]->value;
|
||||
}
|
||||
else $value = '';
|
||||
if($type=="checkbox") $value = $value?unserialize($value):array();
|
||||
|
||||
if($type=="checkbox")
|
||||
{
|
||||
$value = $value?unserialize($value):array();
|
||||
}
|
||||
|
||||
$value = empty($value) ? $val->default : $value;
|
||||
$skin_info->extra_vars[$key]->value= $value;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue