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

load proc and admin menu gen fix

Browse source
This commit is contained in:
Amberstone 2024-09-29 09:51:50 +09:00
parent a1bc96cf1d
commit 6a34711e5d
Signed by: amber
GPG key ID: 094B0E55F98D8BF1
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ class MenuCategory extends Menu
global $g5, $is_admin, $auth, $menu, $auth_menu; global $g5, $is_admin, $auth, $menu, $auth_menu;
$sub_menu = preg_replace('/^.*\/([^\/]+\.php)$/', '/$1', str_replace([G5_ADMIN_URL, "/adm"], ["", ""], $_SERVER["SCRIPT_NAME"])); $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) { foreach ($this->childmenu as $key => $menu) {
if ($is_admin != 'super') if ($is_admin != 'super')
continue; continue;
@ -85,6 +85,12 @@ class MenuCategory extends Menu
} }
$str .= "</ul>"; $str .= "</ul>";
if ($this->selected) {
$str = "<ul class=\"gnb_2dul\" style=\"display: block\">{$str}";
} else {
$str = "<ul class=\"gnb_2dul\">{$str}";
}
return $str; return $str;
} }
} }

4
AvocadoEdition_Light/common.php
View file

@ -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')) { if (!defined('G5_SET_TIME_LIMIT')) {
define('G5_SET_TIME_LIMIT', 0); define('G5_SET_TIME_LIMIT', 0);
} }
define("__ADVDIR__", __DIR__);
@set_time_limit(G5_SET_TIME_LIMIT); @set_time_limit(G5_SET_TIME_LIMIT);
@ -249,9 +250,6 @@ include_once $g5_path['path'] . '/config.php';
$_system = new stdClass; $_system = new stdClass;
$_system->g5_path = $g5_path; $_system->g5_path = $g5_path;
$_system->classes = load_libs(__DIR__ . "/classes", "class"); $_system->classes = load_libs(__DIR__ . "/classes", "class");
define("__ADVDIR__", __DIR__);
$_system->addons = load_libs(__DIR__ . "/addons", "addon"); $_system->addons = load_libs(__DIR__ . "/addons", "addon");
// future update... maybe // future update... maybe
// $_system->modules = load_libs(__DIR__ . "/modules", "model"); // $_system->modules = load_libs(__DIR__ . "/modules", "model");