diff --git a/site/app_controller.php b/site/app_controller.php index 1762e4e..c250efb 100644 --- a/site/app_controller.php +++ b/site/app_controller.php @@ -311,21 +311,33 @@ class AppController extends Controller { $this->params['admin'] = false; } - foreach ($this->sidemenu['areas'] AS &$area) { + foreach ($this->sidemenu['areas'] AS $aname => &$area) { if (empty($area['enable'])) $area = array(); if (empty($area['subareas'])) continue; ksort($area['subareas']); - foreach ($area['subareas'] AS &$subarea) { + foreach ($area['subareas'] AS $sname => &$subarea) { if (empty($subarea['enable'])) $subarea = array(); if (empty($subarea['priorities'])) continue; ksort($subarea['priorities']); + + foreach ($subarea['priorities'] AS $pname => &$priority) { + if (empty($priority)) + unset($subarea['priorities'][$pname]); + } + unset($priority); + + if (empty($subarea['priorities'])) + unset($area['subareas'][$sname]); } unset($subarea); + + if (empty($area['subareas'])) + unset($this->sidemenu['areas'][$aname]); } unset($area); @@ -339,6 +351,37 @@ class AppController extends Controller { $this->sideMenuAreaActivate($area_name); } +/* // Activate a default section (unless already specified) */ +/* foreach (array_reverse($this->sidemenu['areas']) AS $area_name => $area) { */ +/* if (empty($area['subareas'])) */ +/* continue; */ + +/* foreach ($area['subareas'] AS $subarea_name => $subarea) { */ +/* if (empty($subarea['priorities'])) */ +/* continue; */ + +/* foreach ($subarea['priorities'] AS $priority) { */ +/* if (empty($priority)) */ +/* continue; */ + +/* if (empty($this->sidemenu['active']['area'])) */ +/* $act_area = null; */ +/* else */ +/* $act_area = $this->sidemenu['active']['area']; */ + +/* if (empty($this->sidemenu['active']['subarea'])) */ +/* $act_subarea = null; */ +/* else */ +/* $act_subarea = $this->sidemenu['active']['subarea']; */ + +/* if (empty($this->sidemenu['active']) || */ +/* empty($this->sidemenu['areas'][$act_area]) || */ +/* empty($this->sidemenu['areas'][$act_area]['subareas'][$act_subarea])) */ +/* $this->sideMenuAreaActivate($area_name, $subarea_name); */ +/* } */ +/* } */ +/* } */ + //pr($this->sidemenu); $this->set('sidemenu', $this->sidemenu); }