fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix #1347 관리페이지의 상단에 사이트 주소를 표시하지 못하는 문제 수정

Browse source
This commit is contained in:
bnu 2015-03-26 13:42:20 +09:00
parent 2029c11e99
commit 86b3caa28f
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/admin/admin.admin.view.php
View file

@ -24,6 +24,21 @@ class adminAdminView extends admin
*/ */
var $easyinstallCheckFile = './files/env/easyinstall_last'; var $easyinstallCheckFile = './files/env/easyinstall_last';
function __construct()
{
$db_info = Context::getDBInfo();
if(strpos($db_info->default_url, 'xn--') !== FALSE)
{
$xe_default_url = Context::decodeIdna($db_info->default_url);
}
else
{
$xe_default_url = $db_info->default_url;
}
Context::set('xe_default_url', $xe_default_url);
}
/** /**
* Initilization * Initilization
* @return void * @return void
@ -68,16 +83,6 @@ class adminAdminView extends admin
Context::set('https_port', $db_info->https_port); Context::set('https_port', $db_info->https_port);
} }
if(strpos($db_info->default_url, 'xn--') !== FALSE)
{
$xe_default_url = Context::decodeIdna($db_info->default_url);
}
else
{
$xe_default_url = $db_info->default_url;
}
Context::set('xe_default_url', $xe_default_url);
$this->showSendEnv(); $this->showSendEnv();
$this->checkEasyinstall(); $this->checkEasyinstall();
} }
@ -156,7 +161,7 @@ class adminAdminView extends admin
$moduleActionInfo = $oModuleModel->getModuleActionXml($module); $moduleActionInfo = $oModuleModel->getModuleActionXml($module);
$currentAct = Context::get('act'); $currentAct = Context::get('act');
$subMenuTitle = ''; $subMenuTitle = '';
foreach((array) $moduleActionInfo->menu as $key => $value) foreach((array) $moduleActionInfo->menu as $key => $value)
{ {
if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts)) if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
@ -437,7 +442,7 @@ class adminAdminView extends admin
Context::set('use_sitelock', $db_info->use_sitelock); Context::set('use_sitelock', $db_info->use_sitelock);
Context::set('sitelock_title', $db_info->sitelock_title); Context::set('sitelock_title', $db_info->sitelock_title);
Context::set('sitelock_message', htmlspecialchars($db_info->sitelock_message, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); Context::set('sitelock_message', htmlspecialchars($db_info->sitelock_message, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
$whitelist = implode("\r\n", $db_info->sitelock_whitelist); $whitelist = implode("\r\n", $db_info->sitelock_whitelist);
Context::set('sitelock_whitelist', $whitelist); Context::set('sitelock_whitelist', $whitelist);
@ -582,7 +587,7 @@ class adminAdminView extends admin
$str = urldecode($arr[1]); $str = urldecode($arr[1]);
$arrModuleName = explode("|", $str); $arrModuleName = explode("|", $str);
$oModuleModel = getModel("module"); $oModuleModel = getModel("module");
$mInfo = array(); $mInfo = array();
foreach($arrModuleName as $moduleName) { foreach($arrModuleName as $moduleName) {
$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName); $moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
$mInfo[] = "{$moduleName}({$moduleInfo->version})"; $mInfo[] = "{$moduleName}({$moduleInfo->version})";
@ -592,7 +597,7 @@ class adminAdminView extends admin
$str = urldecode($arr[1]); $str = urldecode($arr[1]);
$arrAddonName = explode("|", $str); $arrAddonName = explode("|", $str);
$oAddonModel = getAdminModel("addon"); $oAddonModel = getAdminModel("addon");
$mInfo = array(); $mInfo = array();
foreach($arrAddonName as $addonName) { foreach($arrAddonName as $addonName) {
$addonInfo = $oAddonModel->getAddonInfoXml($addonName); $addonInfo = $oAddonModel->getAddonInfoXml($addonName);
$mInfo[] = "{$addonName}({$addonInfo->version})"; $mInfo[] = "{$addonName}({$addonInfo->version})";
@ -602,7 +607,7 @@ class adminAdminView extends admin
$str = urldecode($arr[1]); $str = urldecode($arr[1]);
$arrWidgetName = explode("|", $str); $arrWidgetName = explode("|", $str);
$oWidgetModel = getModel("widget"); $oWidgetModel = getModel("widget");
$mInfo = array(); $mInfo = array();
foreach($arrWidgetName as $widgetName) { foreach($arrWidgetName as $widgetName) {
$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName); $widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
$mInfo[] = "{$widgetName}({$widgetInfo->version})"; $mInfo[] = "{$widgetName}({$widgetInfo->version})";
@ -612,7 +617,7 @@ class adminAdminView extends admin
$str = urldecode($arr[1]); $str = urldecode($arr[1]);
$arrWidgetstyleName = explode("|", $str); $arrWidgetstyleName = explode("|", $str);
$oWidgetModel = getModel("widget"); $oWidgetModel = getModel("widget");
$mInfo = array(); $mInfo = array();
foreach($arrWidgetstyleName as $widgetstyleName) { foreach($arrWidgetstyleName as $widgetstyleName) {
$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName); $widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})"; $mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
@ -623,7 +628,7 @@ class adminAdminView extends admin
$str = urldecode($arr[1]); $str = urldecode($arr[1]);
$arrLayoutName = explode("|", $str); $arrLayoutName = explode("|", $str);
$oLayoutModel = getModel("layout"); $oLayoutModel = getModel("layout");
$mInfo = array(); $mInfo = array();
foreach($arrLayoutName as $layoutName) { foreach($arrLayoutName as $layoutName) {
$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName); $layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
$mInfo[] = "{$layoutName}({$layoutInfo->version})"; $mInfo[] = "{$layoutName}({$layoutInfo->version})";