tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed PHP warnings in the function 'menu_get_sec_pages'

This commit is contained in:
mdtrooper 2014-10-13 11:33:14 +02:00
parent c3db528040
commit 67899fc60e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pandora_console/include/functions_menu.php
View File

@ -521,7 +521,7 @@ function menu_get_sec($with_categories = false) {
* *
* @return array Sections list * @return array Sections list
*/ */
function menu_get_sec_pages($sec,$menu_hash = false) { function menu_get_sec_pages($sec, $menu_hash = false) {
if ($menu_hash === false) { if ($menu_hash === false) {
$menu = menu_get_full_sec(); $menu = menu_get_full_sec();
} }
@ -529,21 +529,30 @@ function menu_get_sec_pages($sec,$menu_hash = false) {
$menu = json_decode(base64_decode($menu_hash),true); $menu = json_decode(base64_decode($menu_hash),true);
} }
// Get the sec2 of the main section $sec2_array = array();
$sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text'];
// Get the sec2 of the subsections if (isset($sec)) {
foreach ($menu[$sec]['sub'] as $k => $v) {
// Avoid special cases of standalone windows // Get the sec2 of the main section
if (preg_match('/^javascript:/',$k) || preg_match('/\.php/',$k)) { $sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text'];
continue;
// Get the sec2 of the subsections
foreach ($menu[$sec]['sub'] as $k => $v) {
// Avoid special cases of standalone windows
if (preg_match('/^javascript:/', $k) || preg_match('/\.php/', $k)) {
continue;
}
// If this value has various parameters, we only get the first
$k = explode('&',$k);
$k = $k[0];
$sec2_array[$k] = $v['text'];
} }
// If this value has various parameters, we only get the first
$k = explode('&',$k);
$k = $k[0];
$sec2_array[$k] = $v['text'];
} }
return $sec2_array; return $sec2_array;