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

merge 1.4.5.10

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9272 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-22 08:23:36 +00:00
commit 105e3f4843
66 changed files with 4864 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

17
classes/module/ModuleHandler.class.php
View file

@ -297,7 +297,10 @@
$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
}
$xml_info = $oModuleModel->getModuleActionXml($forward->module);
if($kind == "admin" && $type == "view")
$oMemberModel = &getModel('member');
$logged_info = $oMemberModel->getLoggedInfo();
if($this->module == "admin" && $type == "view")
{
$logged_info = Context::get('logged_info');
if($logged_info->is_admin=='Y'){
@ -317,6 +320,18 @@
return $oMessageObject;
}
}
if ($kind == 'admin'){
$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
if(!$grant->is_admin && !$grant->manager) {
$this->error = 'msg_is_not_manager';
$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
$oMessageObject->setError(-1);
$oMessageObject->setMessage($this->error);
$oMessageObject->dispMessage();
return $oMessageObject;
}
}
}
else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
{