blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into permissions

Browse Source
This commit is contained in:
Paolo
2018-04-18 17:35:33 +02:00
parent 88a7228555 5b68f54328
commit 9d5c9b443e
93 changed files with 6590 additions and 4328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/Navigation.php
+96 -14
View File
@@ -10,7 +10,7 @@ class Navigation extends FHC_Controller
const SESSION_NAME = 'NAVIGATION_MENU';
/**
*
* Constructor
*/
public function __construct()
{
@@ -23,12 +23,15 @@ class Navigation extends FHC_Controller
$this->config->load('navigation');
// Load session library
$this->load->library('session');
}
// Load session library
$this->load->library('session');
$this->load->library('ExtensionsLib');
}
/**
*
* This function creates the left Menu for each Page
* @param navigation_widget_called GET Parameter witch holds the currently called Page
* @return JSON object with the Menu Entries
*/
public function menu()
{
@@ -37,16 +40,33 @@ class Navigation extends FHC_Controller
if (isset($navigation_widget_called))
{
// Get Menu Entries of the Core
$navigationMenuArray = $this->config->item('navigation_menu');
$json = $this->wildcardsearch($navigationMenuArray, $navigation_widget_called);
if (isset($navigationMenuArray) && is_array($navigationMenuArray))
// Load Menu Entries of Extensions
$extensions = $this->extensionslib->getInstalledExtensions();
if(hasData($extensions))
{
if (isset($navigationMenuArray[$navigation_widget_called]))
$json_extension = array();
foreach($extensions->retval as $ext)
{
$json = $navigationMenuArray[$navigation_widget_called];
$filename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/navigation.php';
if (file_exists($filename))
{
unset($config);
include($filename);
if(isset($config['navigation_menu']) && is_array($config['navigation_menu']))
{
$json_extension = array_merge_recursive($json_extension, $this->wildcardsearch($config['navigation_menu'], $navigation_widget_called));
}
}
}
// Merge Extension Menuentries with the Core Entries
$json = array_merge_recursive($json, $json_extension);
}
// Load dynamic Menu Entries from Session
if (isset($_SESSION['navigation_menu']))
{
$navigationMenuSessionArray = $_SESSION['navigation_menu'];
@@ -55,7 +75,7 @@ class Navigation extends FHC_Controller
{
if (isset($navigationMenuSessionArray[$navigation_widget_called]))
{
$json = array_merge($json, $navigationMenuSessionArray[$navigation_widget_called]);
$json = array_merge_recursive($json, $navigationMenuSessionArray[$navigation_widget_called]);
}
}
}
@@ -65,7 +85,9 @@ class Navigation extends FHC_Controller
}
/**
*
* This function creates the Top Menu for each Page
* @param navigation_widget_called GET Parameter witch holds the currently called Page
* @return JSON object with the Menu Entries
*/
public function header()
{
@@ -74,16 +96,32 @@ class Navigation extends FHC_Controller
if (isset($navigation_widget_called))
{
// Load Header Entries of Core
$navigationHeaderArray = $this->config->item('navigation_header');
$json = $this->wildcardsearch($navigationHeaderArray, $navigation_widget_called);
if (isset($navigationHeaderArray) && is_array($navigationHeaderArray))
// Load Header Entries of Extensions
$extensions = $this->extensionslib->getInstalledExtensions();
if(hasData($extensions))
{
if (isset($navigationHeaderArray[$navigation_widget_called]))
$json_extension = array();
foreach($extensions->retval as $ext)
{
$json = $navigationHeaderArray[$navigation_widget_called];
$filename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/navigation.php';
if (file_exists($filename))
{
unset($config);
include($filename);
if(isset($config['navigation_header']) && is_array($config['navigation_header']))
{
$json_extension = array_merge_recursive($json_extension, $this->wildcardsearch($config['navigation_header'], $navigation_widget_called));
}
}
}
$json = array_merge_recursive($json, $json_extension);
}
// Load dynamic Header Entries from Session
if (isset($_SESSION['navigation_header']))
{
$navigationHeaderSessionArray = $_SESSION['navigation_header'];
@@ -92,7 +130,8 @@ class Navigation extends FHC_Controller
{
if (isset($navigationHeaderSessionArray[$navigation_widget_called]))
{
$json = array_merge($json, $navigationHeaderSessionArray[$navigation_widget_called]);
$jsontmp = $this->wildcardsearch($navigationHeaderSessionArray, $navigation_widget_called);
$json = array_merge_recursive($json, $jsontmp);
}
}
}
@@ -100,4 +139,47 @@ class Navigation extends FHC_Controller
$this->output->set_content_type('application/json')->set_output(json_encode($json));
}
/**
* Searches a Menuentry. If there is no exact entry it searches for Wildcard Entries with a Star
* Example:
* Searching for /system/foo/index will Match the following Menuentries:
* /system/foo/index
* /system/foo/*
* /system/*
* *
*
* @param $navigationArray Array to Search in.
* @param $navigation_widget_called Navigation to search for.
* @return Navigation Array if found, empty array otherwise
*/
private function wildcardsearch($navigationArray, $navigation_widget_called)
{
// Sort Navigation to have them in correct order
krsort($navigationArray);
// 100% match found
if(isset($navigationArray[$navigation_widget_called]))
{
return $navigationArray[$navigation_widget_called];
}
else
{
foreach($navigationArray as $key=>$row)
{
// Search for * Entries
if(mb_strpos($key, '*') === 0 || mb_strpos($key, '*') === mb_strlen($key) - 1)
{
// Take * Entry if Matches
$search = mb_substr($key, 0, -1);
if($search == '' || mb_strpos($navigation_widget_called, $search) === 0)
{
return $row;
}
}
}
}
return array();
}
}