diff --git a/php/menu.php b/php/menu.php index 3b99b655..781308bb 100644 --- a/php/menu.php +++ b/php/menu.php @@ -27,9 +27,7 @@ class Menu { public $html=array(); - public $name=''; public $title='Error'; - public $path=''; public $first_key=array(); function __construct($_REALPATH,$uri) @@ -37,11 +35,8 @@ class Menu $realpath_public=$_REALPATH.'/public/'; # /usr/home/web/cp/clonos/public/ $lang = new Locale($realpath_public); $menu_config = Config::$menu; - if(!empty($menu_config)){ - reset($menu_config); - $this->first_key=key($menu_config); - } - + $this->first_key = array_key_first($menu_config); + if(getenv('APPLICATION_ENV') != 'development'){ unset($menu_config['sqlite']); } @@ -51,19 +46,16 @@ class Menu //$qstr=trim($_SERVER['REQUEST_URI'],'/'); $qstr=''; $uri_chunks=Utils::gen_uri_chunks($uri); - if(isset($uri_chunks[0])) - $qstr=trim($uri_chunks[0],'/'); - $this->path=$qstr; //$_MENU_PATH - if(!empty($menu_config))foreach($menu_config as $key=>$val){ + if(isset($uri_chunks[0])){ + $qstr=trim($uri_chunks[0],'/'); + } + if(!empty($menu_config))foreach($menu_config as $link=>$val){ $mname=$lang->translate($val['name']); $mtitle=$lang->translate($val['title']); - - $link=$key; $sel=''; - if($qstr==$key){ + if($qstr==$link){ $sel=' class="sel"'; $this->title=$mtitle; //$_TITLE - $this->name=$mname; //$_MENU_NAME } $icon='empty'; @@ -72,8 +64,7 @@ class Menu $this->html.='