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

Add icon option to menu item

Browse source
This commit is contained in:
Kijin Sung 2021-01-20 22:43:14 +09:00
parent 537a500dbf
commit 2944bfc71a
9 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -552,8 +552,8 @@ class menuAdminController extends menu
$args->url = '#';
}
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
$args->icon = trim($request->menu_icon ?? '') ?: '';
$args->desc = trim($request->menu_desc ?? '') ?: '';
$args->menu_item_srl = getNextSequence();
$args->listorder = -1*$args->menu_item_srl;
@ -587,8 +587,8 @@ class menuAdminController extends menu
if($request->menu_name_key) $args->name = $request->menu_name_key;
else $args->name = $request->menu_name;
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
$args->icon = trim($request->menu_icon ?? '') ?: '';
$args->desc = trim($request->menu_desc ?? '') ?: '';
if($request->module_id && strncasecmp('http', $request->module_id, 4) === 0)
{
@ -773,8 +773,8 @@ class menuAdminController extends menu
$args->name = $request->menu_name;
}
if($request->menu_desc) $args->desc = $request->menu_desc;
else $args->desc = '';
$args->icon = trim($request->menu_icon ?? '') ?: '';
$args->desc = trim($request->menu_desc ?? '') ?: '';
unset($args->group_srls);
$args->open_window = $request->menu_open_window;
@ -1959,6 +1959,7 @@ class menuAdminController extends menu
$name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
$url = escape($node->url);
$icon = escape($node->icon, false);
$desc = escape($node->desc, false);
if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url))
{
@ -2006,7 +2007,7 @@ class menuAdminController extends menu
}
$attribute = sprintf(
'node_srl="%d" parent_srl="%d" menu_name_key=%s text="<?php if(%s) { %s }?>" url="<?php print(%s?%s:"")?>" href="<?php print(%s?%s:"")?>" is_shortcut=%s desc=%s open_window=%s expand=%s normal_btn=%s hover_btn=%s active_btn=%s link="<?php if(%s) {?>%s<?php }?>"',
'node_srl="%d" parent_srl="%d" menu_name_key=%s text="<?php if(%s) { %s }?>" url="<?php print(%s?%s:"")?>" href="<?php print(%s?%s:"")?>" is_shortcut=%s icon=%s desc=%s open_window=%s expand=%s normal_btn=%s hover_btn=%s active_btn=%s link="<?php if(%s) {?>%s<?php }?>"',
$menu_item_srl,
($node->parent_srl) ? $node->parent_srl : '',
var_export(($node->name) ? $node->name : '', true),
@ -2017,6 +2018,7 @@ class menuAdminController extends menu
$group_check_code,
$href,
var_export($is_shortcut, true),
var_export($icon, true),
var_export($desc, true),
var_export($open_window, true),
var_export($expand, true),
@ -2102,7 +2104,8 @@ class menuAdminController extends menu
// List variables
$href = escape($node->href ?? '', false);
$url = escape($node->url ?? '', false);
$desc = escape($node->desc ?? '', false);
$icon = Rhymix\Framework\Filters\HTMLFilter::clean($node->icon ?? '', true);
$desc = Rhymix\Framework\Filters\HTMLFilter::clean($node->desc ?? '', true);
if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url))
{
$href = "getSiteUrl('$domain', '','mid','$node->url')";
@ -2162,6 +2165,7 @@ class menuAdminController extends menu
"href" => (%s ? %s : ""),
"url" => (%s ? %s : ""),
"is_shortcut" => %s,
"icon" => %s,
"desc" => %s,
"open_window" => %s,
"normal_btn" => %s,
@ -2182,6 +2186,7 @@ class menuAdminController extends menu
$group_check_code,
var_export($url, true),
var_export($is_shortcut, true),
var_export($icon, true),
var_export($desc, true),
var_export($open_window, true),
var_export($normal_btn, true),