mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/13740] Implement navigation sorting

Browse Source 
PHPBB3-13740
This commit is contained in:
Mate Bartus
2015-07-14 23:14:35 +02:00
parent 051b7d1867
commit c5c98b7ca2
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
phpBB/phpbb/install/controller/helper.php
View File

@@ -158,8 +158,7 @@ class helper
{ {
// Get navigation items // Get navigation items
$nav_array = $this->navigation_provider->get(); $nav_array = $this->navigation_provider->get();
$nav_array = $this->sort_navigation_level($nav_array);
// @todo Sort navs by order
$active_main_menu = $this->get_active_main_menu($nav_array); $active_main_menu = $this->get_active_main_menu($nav_array);
@@ -174,7 +173,7 @@ class helper
if (is_array($entry[0]) && $active_main_menu === $key) if (is_array($entry[0]) && $active_main_menu === $key)
{ {
// @todo Sort navs by order $entry[0] = $this->sort_navigation_level($entry[0]);
foreach ($entry[0] as $name => $sub_entry) foreach ($entry[0] as $name => $sub_entry)
{ {
@@ -220,6 +219,7 @@ class helper
protected function render_language_select() protected function render_language_select()
{ {
$langs = $this->lang_helper->get_available_languages(); $langs = $this->lang_helper->get_available_languages();
// @todo
} }
/** /**
@@ -246,7 +246,7 @@ class helper
{ {
foreach ($nav_options[0] as $sub_menus) foreach ($nav_options[0] as $sub_menus)
{ {
if (isset($sub_menus['route']) &&$sub_menus['route'] === $active_route) if (isset($sub_menus['route']) && $sub_menus['route'] === $active_route)
{ {
return $current_menu; return $current_menu;
} }
@@ -256,4 +256,31 @@ class helper
return false; return false;
} }
/**
* Sorts the top level of navigation array
*
* @param array $nav_array Navigation array
*
* @return array
*/
protected function sort_navigation_level($nav_array)
{
$sorted = array();
foreach ($nav_array as $nav)
{
$order = (isset($nav['order'])) ? $nav['order'] : 0;
$sorted[$order][] = $nav;
}
// Linearization of navigation array
$nav_array = array();
ksort($sorted);
foreach ($sorted as $nav)
{
$nav_array = array_merge($nav_array, $nav);
}
return $nav_array;
}
} }