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

issue 87 update site grant

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8806 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-08-18 08:32:10 +00:00
parent 853c37ca4b
commit bc70424fba
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/module/module.controller.php
View file

@ -589,6 +589,11 @@
static $lang = null;
if(is_null($lang)) {
$site_module_info = Context::get('site_module_info');
if(!$site_module_info){
$oModuleModel = &getModel('module');
$site_module_info = $oModuleModel->getDefaultMid();
Context::set('site_module_info', $site_module_info);
}
$cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
if(!file_exists($cache_file)) {
$oModuleAdminController = &getAdminController('module');

9
modules/module/module.model.php
View file

@ -566,11 +566,14 @@
foreach($menu_list as $menu) {
$menu_name = $menu->attrs->name;
$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
$menu_type = $menu->attrs->type;
$info->menu->{$menu_name}->title = $menu_title;
$info->menu->{$menu_name}->acts = array();
$info->menu->{$menu_name}->type = $menu_type;
$buff .= sprintf('$info->menu->%s->title=\'%s\';', $menu_name, $menu_title);
$buff .= sprintf('$info->menu->%s->type=\'%s\';', $menu_name, $menu_type);
}
}
@ -1252,12 +1255,12 @@
// If module_srl doesn't exist(if unable to set permissions)
if(!$module_srl) {
$grant->access = true;
if($this->isSiteAdmin($member_info)) $grant->access = $grant->is_admin = $grant->manager = true;
if($this->isSiteAdmin($member_info, $module_info->site_srl)) $grant->access = $grant->is_admin = $grant->manager = $grant->is_site_admin = true;
else $grant->is_admin = $grant->manager = $member_info->is_admin=='Y'?true:false;
// If module_srl exists
} else {
// Get a type of granted permission
$grant->access = $grant->is_admin = $grant->manager = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info))?true:false;
$grant->access = $grant->is_admin = $grant->manager = $grant->is_site_admin = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info, $module_info->site_srl))?true:false;
// If a just logged-in member is, check if the member is a module administrator
if(!$grant->manager && $member_info->member_srl) {
$args->module_srl = $module_srl;
@ -1355,8 +1358,6 @@
return $grant;
}
function getModuleFileBox($module_filebox_srl){
$args->module_filebox_srl = $module_filebox_srl;
return executeQuery('module.getModuleFileBox', $args);