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

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/menu/menu.admin.controller.php
View file

@ -606,16 +606,24 @@
//$info = $oModuleModel->getModuleInfoXml($moduleName);
$info = $oModuleModel->getModuleActionXml($moduleName);
$url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->admin_index_act);
if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin');
$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
$dbInfo = Context::getDBInfo();
$args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl;
$args->parent_srl = $requestArgs->parent_srl;
$args->menu_srl = $requestArgs->menu_srl;
$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
$args->url = str_replace($dbInfo->default_url, '', $url);
//if now page is https...
if(strpos($url, 'https') !== false)
{
$args->url = str_replace('https'.substr($dbInfo->default_url, 4), '', $url);
}
else
{
$args->url = str_replace($dbInfo->default_url, '', $url);
}
$args->open_window = 'N';
$args->expand = 'N';
$args->normal_btn = '';
@ -722,6 +730,7 @@
$xml_buff = sprintf(
'<?php '.
'define(\'__ZBXE__\', true); '.
'define(\'__XE__\', true); '.
'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
'$oContext = &Context::getInstance(); '.
'$oContext->init(); '.
@ -743,6 +752,7 @@
$php_buff = sprintf(
'<?php '.
'if(!defined("__ZBXE__")) exit(); '.
'if(!defined("__XE__")) exit(); '.
'%s; '.
'%s; '.
'$menu->list = array(%s); '.