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

fixed admin layout

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9366 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-09-27 09:11:39 +00:00
parent 5b5dc62511
commit 4cb4047975
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -220,7 +220,6 @@
}
}
unset($logged_info);
// if(type == view, and case for using mobilephone)
if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
@ -246,6 +245,13 @@
return;
}
if($kind == 'admin' && $logged_info->is_admin == 'Y'){
$oAdminView = &getAdminView('admin');
$oAdminView->makeGnbUrl($forward->module);
$oModule->setLayoutPath("./modules/admin/tpl");
$oModule->setLayoutFile("layout.html");
}
// If there is no such action in the module object
if(!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
{
@ -298,11 +304,9 @@
}
$xml_info = $oModuleModel->getModuleActionXml($forward->module);
$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'){
if ($this->act != 'dispLayoutAdminLayoutModify')
{
@ -387,11 +391,11 @@
}
if($type == "view" && $kind != 'admin'){
$module_config= $oModuleModel->getModuleConfig('module');
if($module_config->htmlFooter){
Context::addHtmlFooter($module_config->htmlFooter);
}
}
$module_config= $oModuleModel->getModuleConfig('module');
if($module_config->htmlFooter){
Context::addHtmlFooter($module_config->htmlFooter);
}
}
// if failed message exists in session, set context
@ -427,6 +431,7 @@
$_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl;
}
unset($logged_info);
return $oModule;
}