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

Remove trailing whitespace

Browse source
This commit is contained in:
Kijin Sung 2023-01-30 21:43:21 +09:00
parent c5267b42fd
commit 37b0d3a1e6
71 changed files with 806 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,7 +239,7 @@ class menuAdminController extends menu
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
$this->setRedirectUrl($returnUrl);
}
/**
* Change the menu design (layout)
*/
@ -253,7 +253,7 @@ class menuAdminController extends menu
{
return;
}
$args = new stdClass;
$args->menu_srl = $menu_srl;
$output = executeQueryArray('layout.getLayoutModules', $args);
@ -285,7 +285,7 @@ class menuAdminController extends menu
return $output;
}
}
Rhymix\Framework\Cache::clearGroup('site_and_module');
}
}
@ -1653,10 +1653,10 @@ class menuAdminController extends menu
$oModuleModel = getModel('module');
//$info = $oModuleModel->getModuleInfoXml($moduleName);
$info = $oModuleModel->getModuleActionXml($moduleName);
$args = new stdClass();
$args->url = 'index.php?module=admin';
if($info->menu->{$menuName}->index)
{
$args->url .= '&act=' . $info->menu->{$menuName}->index;
@ -1665,7 +1665,7 @@ class menuAdminController extends menu
{
$args->url .= '&act=' . $info->admin_index_act;
}
$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;
@ -1730,7 +1730,7 @@ class menuAdminController extends menu
{
$exposure = implode(',', $exposure);
}
if(in_array($exposure, array('-1','-3')))
{
$args->group_srls = $exposure;
@ -1835,7 +1835,7 @@ class menuAdminController extends menu
FileHandler::writeFile($xml_file, '<root />');
FileHandler::writeFile($php_file, '<?php if(!defined("__XE__")) exit(); ?>');
return $xml_file;
}
}
$site_srl = 0;
$domain = null;
@ -1947,7 +1947,7 @@ class menuAdminController extends menu
{
$child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
}
// List variables
$names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
$name_arr_str = '';
@ -1976,11 +1976,11 @@ class menuAdminController extends menu
$normal_btn = strval($node->normal_btn);
if($normal_btn && strncasecmp('./files/attach/menu_button', $normal_btn, 26) === 0) $normal_btn = escape($normal_btn);
else $normal_btn = '';
$hover_btn = strval($node->hover_btn);
if($hover_btn && strncasecmp('./files/attach/menu_button', $hover_btn, 26) === 0) $hover_btn = escape($hover_btn);
else $hover_btn = '';
$active_btn = strval($node->active_btn);
if($active_btn && strncasecmp('./files/attach/menu_button', $active_btn, 26) === 0) $active_btn = escape($active_btn);
else $active_btn = '';

16
modules/menu/menu.admin.model.php
View file

@ -74,10 +74,10 @@ class menuAdminModel extends menu
$menu_info->php_file = sprintf('./files/cache/menu/%d.php',$menu_srl);
return $menu_info;
}
/**
* Get actual menu info data
*
*
* @param int $menu_srl
* @return object
*/
@ -85,7 +85,7 @@ class menuAdminModel extends menu
{
$menu = new stdClass;
$menu->list = [];
$filename = sprintf('./files/cache/menu/%d.php', $menu_srl);
if (!FileHandler::exists($filename))
{
@ -95,7 +95,7 @@ class menuAdminModel extends menu
{
include $filename;
}
return $menu;
}
@ -350,7 +350,7 @@ class menuAdminModel extends menu
$oAutoinstallAdminModel = getAdminModel('autoinstall');
$config = $oAutoinstallAdminModel->getAutoInstallAdminModuleConfig();
foreach($_allModules as $module_name)
{
$module = $oModuleModel->getModuleInfoXml($module_name);
@ -489,7 +489,7 @@ class menuAdminModel extends menu
$oModuleModel = getModel('module');
$oMenuAdminController = getAdminController('menu');
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');
$start_module_list = executeQuery('module.getDomainInfo', new stdClass);
$start_module = $start_module_list->data;
@ -503,7 +503,7 @@ class menuAdminModel extends menu
{
include($php_file);
}
else
else
{
$oMenuAdminController->makeXmlFile($menuSrl);
}
@ -663,7 +663,7 @@ class menuAdminModel extends menu
{
$start_module = $start_module ? array($start_module) : array();
}
// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
if(!$menu['url'] && $menu['is_shortcut'] == 'N')
{

6
modules/menu/menu.admin.view.php
View file

@ -21,7 +21,7 @@ class menuAdminView extends menu
$this->setTemplatePath($this->module_path.'tpl');
}
/**
* Site map admin menu index page
* @return void
@ -40,7 +40,7 @@ class menuAdminView extends menu
$oMenuController = getAdminController('menu');
$oMenuController->linkAllModuleInstancesToSitemap();
}
// get installed module list
$oPageController = getController('page'); //for lang
$oMenuAdminModel = getAdminModel('menu');
@ -79,7 +79,7 @@ class menuAdminView extends menu
}
}
Context::set('group_list', $groupList);
// Get layout instance list
$oLayoutModel = getModel('layout');
$layouts_P = $oLayoutModel->getLayoutList(0, 'P') ?: [];

12
modules/menu/menu.class.php
View file

@ -27,19 +27,19 @@ class menu extends ModuleObject
function checkUpdate()
{
$oDB = DB::getInstance();
// 2015. 06. 15 add column desc
if(!$oDB->isColumnExists('menu_item', 'desc'))
{
return true;
}
// 2021. 01. 20 add column icon
if(!$oDB->isColumnExists('menu_item', 'icon'))
{
return true;
}
return false;
}
@ -50,13 +50,13 @@ class menu extends ModuleObject
function moduleUpdate()
{
$oDB = DB::getInstance();
// 2015. 06. 15 add column desc
if(!$oDB->isColumnExists('menu_item', 'desc'))
{
$oDB->addColumn('menu_item', 'desc', 'varchar', 250, null, false, 'name');
}
// 2021. 01. 20 add column icon
if(!$oDB->isColumnExists('menu_item', 'icon'))
{
@ -116,4 +116,4 @@ class menu extends ModuleObject
}
}
/* End of file menu.class.php */
/* Location: ./modules/menu/menu.class.php */
/* Location: ./modules/menu/menu.class.php */

2
modules/menu/menu.mobile.php
View file

@ -67,7 +67,7 @@ class menuMobile extends moduleObject
}
}
Context::set('menu', $this->result);
Context::set('menu', $this->result);
$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
$this->setTemplateFile('menu.html');