From 6a34711e5d65cd28caf6cda893c8c3bd0dfcf140 Mon Sep 17 00:00:00 2001
From: Arcturus <github@drk.st>
Date: Sun, 29 Sep 2024 09:51:50 +0900
Subject: [PATCH] load proc and admin menu gen fix

---
 .../classes/menucategory/menucategory.class.php           | 8 +++++++-
 AvocadoEdition_Light/common.php                           | 4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
index 0ee251a..b1295e5 100644
--- a/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
+++ b/AvocadoEdition_Light/classes/menucategory/menucategory.class.php
@@ -52,7 +52,7 @@ class MenuCategory extends Menu
     global $g5, $is_admin, $auth, $menu, $auth_menu;
     $sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $_SERVER["SCRIPT_NAME"]));
 
-    $str = "<ul class=\"gnb_2dul\">";
+    $str = "";
     foreach ($this->childmenu as $key => $menu) {
       if ($is_admin != 'super')
         continue;
@@ -85,6 +85,12 @@ class MenuCategory extends Menu
     }
     $str .= "</ul>";
 
+    if ($this->selected) {
+      $str = "<ul class=\"gnb_2dul\" style=\"display: block\">{$str}";
+    } else {
+      $str = "<ul class=\"gnb_2dul\">{$str}";
+    }
+
     return $str;
   }
 }
diff --git a/AvocadoEdition_Light/common.php b/AvocadoEdition_Light/common.php
index 81bc31a..23e6e8a 100644
--- a/AvocadoEdition_Light/common.php
+++ b/AvocadoEdition_Light/common.php
@@ -10,6 +10,7 @@ header('P3P: CP="ALL CURa ADMa DEVa TAIa OUR BUS IND PHY ONL UNI PUR FIN COM NAV
 if (!defined('G5_SET_TIME_LIMIT')) {
   define('G5_SET_TIME_LIMIT', 0);
 }
+define("__ADVDIR__", __DIR__);
 
 @set_time_limit(G5_SET_TIME_LIMIT);
 
@@ -249,9 +250,6 @@ include_once $g5_path['path'] . '/config.php';
 $_system = new stdClass;
 $_system->g5_path = $g5_path;
 $_system->classes = load_libs(__DIR__ . "/classes", "class");
-
-define("__ADVDIR__", __DIR__);
-
 $_system->addons = load_libs(__DIR__ . "/addons", "addon");
 // future update... maybe
 // $_system->modules = load_libs(__DIR__ . "/modules", "model");