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

2012-06-18 Sergio Martin <sergio.martin@artica.es> 

* include/functions_menu.php: Added missed sec2 to the menu 
	structure data. The main sec2 (not subsection). Clean code
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-06-18 15:39:52 +00:00
parent a9637c201f
commit ee7084bf5a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added missed sec2 to the menu
structure data. The main sec2 (not subsection). Clean code
Merged from 4.0.2
2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/ajax/menu.ajax.php: Added an ajax file to the functions

10
pandora_console/include/functions_menu.php
View File

@ -368,7 +368,11 @@ function menu_get_sec_pages($sec,$menu_hash = false) {
else {
$menu = json_decode(base64_decode($menu_hash),true);
}
// Get the sec2 of the main section
$sec2_array[$menu[$sec]['sec2']] = $menu[$sec]['text'];
// 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)) {
@ -393,11 +397,9 @@ function menu_get_sec_pages($sec,$menu_hash = false) {
*
* @return true if the page is in section, false otherwise
*/
function menu_sec2_in_sec($sec,$sec2) {
if($sec != 'estado') return false;
function menu_sec2_in_sec($sec,$sec2) {
$sec2_array = menu_get_sec_pages($sec);
// If this value has various parameters, we only get the first
$sec2 = explode('&',$sec2);
$sec2 = $sec2[0];