amber/AvocadoAmber
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix codes

Browse source
This commit is contained in:
Amberstone 2024-09-30 01:20:40 +09:00
parent 6a34711e5d
commit 31958f6c73
Signed by: amber
GPG key ID: 094B0E55F98D8BF1
2 changed files with 69 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
AvocadoEdition_Light/classes/menucategory/menucategory.class.php
View file

@ -49,48 +49,46 @@ class MenuCategory extends Menu
} }
public function buildHtml() public function buildHtml()
{ {
global $g5, $is_admin, $auth, $menu, $auth_menu; global $is_admin;
$sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $_SERVER["SCRIPT_NAME"]));
$str = ""; $sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $_SERVER['SCRIPT_NAME']));
foreach ($this->childmenu as $key => $menu) {
if ($is_admin != 'super') $str = '';
$gnb_grp_style = false;
foreach ($this->childmenu as $menu) {
if ($is_admin != 'super' || !$menu->display) {
continue; continue;
}
if (!$menu->display) $gnb_grp_div = (($menu->gnb_grp_div == 1 && !$gnb_grp_style) || ($menu->gnb_grp_div != 1 && $gnb_grp_style)) ? 'gnb_grp_div' : '';
continue; $gnb_grp_style = $menu->gnb_grp_div == 1 ? 'gnb_grp_style' : '';
if (($menu->gnb_grp_div == 1 && $gnb_grp_style == false) || ($menu->gnb_grp_div != 1 && $gnb_grp_style == true)) $menu_url = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $menu->url));
$gnb_grp_div = 'gnb_grp_div'; $check_gnb_grp_style = '';
else
$gnb_grp_div = '';
if ($menu->gnb_grp_div == 1)
$gnb_grp_style = 'gnb_grp_style';
else
$gnb_grp_style = '';
$check_gnb_grp_style = "";
$menu_url = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $menu->url));
if ( if (
$menu_url == $sub_menu || in_array($sub_menu, array_map(function ($url) { $menu_url == $sub_menu || in_array($sub_menu, array_map(function ($url) {
return preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $url)); return preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, '/adm'], ['', ''], $url));
}, $menu->suburl)) }, $menu->suburl))
) { ) {
$check_gnb_grp_style = "check"; $check_gnb_grp_style = 'check';
$this->selected = true; $this->selected = true;
} }
$str .= '<li class="gnb_2dli ' . $check_gnb_grp_style . '"><a href="' . $menu->url . '" class="gnb_2da ' . $gnb_grp_style . ' ' . $gnb_grp_div . '" data-text="' . $menu->name . '" style="--icon:\'' . $menu->icon . '\'">' . $menu->name . '</a></li>'; $str .= sprintf(
} '<li class="gnb_2dli %s"><a href="%s" class="gnb_2da %s %s" data-text="%s" style="--icon:\'%s\'">%s</a></li>',
$str .= "</ul>"; $check_gnb_grp_style,
$menu->url,
if ($this->selected) { $gnb_grp_style,
$str = "<ul class=\"gnb_2dul\" style=\"display: block\">{$str}"; $gnb_grp_div,
} else { $menu->name,
$str = "<ul class=\"gnb_2dul\">{$str}"; $menu->icon,
$menu->name
);
} }
return $str; $ul_class = $this->selected ? 'gnb_2dul" style="display: block"' : 'gnb_2dul"';
return "<ul class=\"{$ul_class}\">{$str}</ul>";
} }
} }

36
AvocadoEdition_Light/classes/setting/setting.class.php
View file

@ -49,50 +49,56 @@ class Setting
$this->html = ""; $this->html = "";
$this->extrahtml = ""; $this->extrahtml = "";
$this->is_value_added = false; $this->is_value_added = false;
if ($init) { if ($init) {
$this->init(); $this->init();
} }
if (!empty($data)) { if (!empty($data)) {
foreach ($data as $val) { foreach ($data as $val) {
switch ($val["type"]) { $this->addSetting($val);
}
}
}
public function addSetting($set)
{
switch ($set["type"]) {
case "desc": case "desc":
$this->addDescription($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addDescription($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "text": case "text":
$this->addTextSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("placeholder", $val) ? $val["placeholder"] : ""); $this->addTextSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("placeholder", $set) ? $set["placeholder"] : "");
break; break;
case "textarea": case "textarea":
$this->addTextareaSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("placeholder", $val) ? $val["placeholder"] : ""); $this->addTextareaSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("placeholder", $set) ? $set["placeholder"] : "");
break; break;
case "editor": case "editor":
$this->addEditorSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("js", $val) ? $val["js"] : true); $this->addEditorSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("js", $set) ? $set["js"] : true);
break; break;
case "image": case "image":
$this->addImageSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addImageSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "select": case "select":
$this->addSelectSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : [], array_key_exists("values", $val) ? $val["values"] : ""); $this->addSelectSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : [], array_key_exists("values", $set) ? $set["values"] : "");
break; break;
case "color": case "color":
$this->addColorSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addColorSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "color2": case "color2":
$this->addColor2Setting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addColor2Setting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "border": case "border":
$this->addBorderSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addBorderSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "rect": case "rect":
$this->addRectSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addRectSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
case "radius": case "radius":
$this->addRadiusSetting($val["desc"], array_key_exists("default", $val) ? (is_array($val["default"]) ? $val["default"] : []) : []); $this->addRadiusSetting($set["desc"], array_key_exists("default", $set) ? (is_array($set["default"]) ? $set["default"] : []) : []);
break; break;
} }
} }
}
}
public static function getSettingList() public static function getSettingList()
{ {
@ -420,7 +426,7 @@ class Setting
public function getSettingHtml() public function getSettingHtml()
{ {
$html = ""; $html = "";
foreach ($this->settings as $idx => $val) { foreach ($this->settings as $val) {
if ($html == "") { if ($html == "") {
$html .= $this->addHeader(); $html .= $this->addHeader();
} else { } else {