|
@@ -157,13 +157,13 @@ class Menu
|
|
|
unset($menu[$k]);
|
|
|
continue;
|
|
|
}
|
|
|
- if ($auth && strpos($auth, $k . '.') === false) {
|
|
|
+ if ($auth && strpos($auth . '.', $k . '.') === false) {
|
|
|
unset($menu[$k]);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
$path = Dever::load('manage/project.path', $v['key']);
|
|
|
- if (strpos($path, 'http://') === 0) {
|
|
|
+ if ($path && strpos($path, 'http://') === 0) {
|
|
|
unset($menu[$k]);
|
|
|
continue;
|
|
|
}
|
|
@@ -189,7 +189,7 @@ class Menu
|
|
|
{
|
|
|
if (isset($child[$v['id']])) {
|
|
|
foreach ($child[$v['id']] as $i => $j) {
|
|
|
- if ($auth && strpos($auth, $i) === false) {
|
|
|
+ if ($auth && $i && strpos($auth, $i) === false) {
|
|
|
//unset($child[$parent][$i]);
|
|
|
//continue;
|
|
|
} else {
|