deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Rework service, change module_method configuration

Browse Source
This commit is contained in:
Deon George
2013-06-04 21:50:41 +10:00
parent 2ac7389223
commit f4ddea3586
35 changed files with 780 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/classes/Menu.php
View File

@@ -13,17 +13,17 @@ class Menu {
private static function collapse(array $array) {
$result = array();
foreach ($array as $item) {
if (isset($result[$item->module->name])) {
if (! is_array($result[$item->module->name]))
$result[$item->module->name] = array($result[$item->module->name]);
foreach ($array as $mmo) {
if (isset($result[$mmo->module->name])) {
if (! is_array($result[$mmo->module->name]))
$result[$mmo->module->name] = array($result[$mmo->module->name]);
array_push($result[$item->module->name],$item);
array_push($result[$mmo->module->name],$mmo);
continue;
} else {
$result[$item->module->name] = $item;
$result[$mmo->module->name] = $mmo;
}
}
@@ -36,10 +36,10 @@ class Menu {
if (empty(URL::$method_directory[$type]))
return NULL;
$uo = Auth::instance()->get_user();
$ao = Auth::instance()->get_user();
foreach ($uo->methods() as $mmo)
if ($mmo->menu_display AND preg_match('/^'.$type.'_/',$mmo->name))
foreach ($ao->methods() as $mmo)
if ($mmo->menu_display AND $type == $mmo->directory())
if (empty($result[$mmo->id]))
$result[$mmo->id] = $mmo;