diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 46edf2926e..17f7142516 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -243,118 +243,84 @@ //create the menu - function build_html($sql, $menu_item_level) { + function build_html($menu_item_level = 0) { $db = $this->db; - $db_menu_full = ''; + $menu_html_full = ''; + + $menu_array = $this->menu_array(); if (!isset($_SESSION['groups'])) { $_SESSION['groups'][0]['group_name'] = 'public'; } - if (strlen($sql) == 0) { //default sql for base of the menu - $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, i.menu_item_title, i.menu_item_protected, i.menu_item_category, i.menu_item_uuid, i.menu_item_parent_uuid "; - $sql .= "from v_menu_items as i, v_menu_languages as l "; - $sql .= "where i.menu_item_uuid = l.menu_item_uuid "; - $sql .= "and l.menu_language = '".$_SESSION['domain']['language']['code']."' "; - $sql .= "and l.menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and i.menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and i.menu_item_parent_uuid is null "; - $sql .= "and i.menu_item_uuid in "; - $sql .= "(select menu_item_uuid from v_menu_item_groups where menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and ( "; - if (!isset($_SESSION['groups'])) { - $sql .= "group_name = 'public' "; - } - else { - $x = 0; - foreach($_SESSION['groups'] as $row) { - if ($x == 0) { - $sql .= "group_name = '".$row['group_name']."' "; - } - else { - $sql .= "or group_name = '".$row['group_name']."' "; - } - $x++; - } - } - $sql .= ") "; - $sql .= "and menu_item_uuid is not null "; - $sql .= ") "; - $sql .= "order by i.menu_item_order asc "; - } - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - foreach($result as $field) { - - $menu_tags = ''; - switch ($field['menu_item_category']) { - case "internal": - $menu_tags = "href='".PROJECT_PATH.$field['menu_item_link']."'"; - break; - case "external": - if (substr($field['menu_item_link'], 0,1) == "/") { - $field['menu_item_link'] = PROJECT_PATH . $field['menu_item_link']; - } - $menu_tags = "href='".$field['menu_item_link']."' target='_blank'"; - break; - case "email": - $menu_tags = "href='mailto:".$field['menu_item_link']."'"; - break; - } + foreach($menu_array as $menu_field) { + //set the variables + $menu_item_link = $menu_field['menu_item_link']; + $menu_item_category = $menu_field['menu_item_category']; + $menu_items = $menu_field['menu_items']; //prepare the protected menus - if ($field['menu_item_protected'] == "true") { - $menu_item_title = $field['menu_item_title']; - } - else { - $menu_item_title = $field['menu_language_title']; - } + $menu_item_title = ($menu_field['menu_item_protected'] == "true") ? $menu_field['menu_item_title'] : $menu_field['menu_language_title']; - if ($menu_item_level == "main") { - $db_menu = "\n\n"; } - $db_menu_full .= $db_menu; + $menu_html_full .= $menu_html; } //end for each - unset($prep_statement, $sql, $result); - return $db_menu_full; + return $menu_html_full; } //create the sub menus - function build_child_html($menu_item_level, $menu_item_uuid) { + function build_child_html($menu_item_level, $submenu_array) { $db = $this->db; $menu_item_level = $menu_item_level+1; @@ -363,55 +329,18 @@ $_SESSION['groups'][0]['group_name'] = 'public'; } - $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, i.menu_item_title, i.menu_item_protected, i.menu_item_category, i.menu_item_uuid, i.menu_item_parent_uuid "; - $sql .= "from v_menu_items as i, v_menu_languages as l "; - $sql .= "where i.menu_item_uuid = l.menu_item_uuid "; - $sql .= "and l.menu_language = '".$_SESSION['domain']['language']['code']."' "; - $sql .= "and l.menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and i.menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and i.menu_item_parent_uuid = '$menu_item_uuid' "; - $sql .= "and i.menu_item_uuid in "; - $sql .= "(select menu_item_uuid from v_menu_item_groups where menu_uuid = '".$this->menu_uuid."' "; - $sql .= "and ( "; - if (count($_SESSION['groups']) == 0) { - $sql .= "group_name = 'public' "; - } - else { - $x = 0; - foreach($_SESSION['groups'] as $row) { - if ($x == 0) { - $sql .= "group_name = '".$row['group_name']."' "; - } - else { - $sql .= "or group_name = '".$row['group_name']."' "; - } - $x++; - } - } - $sql .= ") "; - $sql .= ") "; - $sql .= "order by l.menu_item_title, i.menu_item_order asc "; - $prep_statement_2 = $db->prepare($sql); - $prep_statement_2->execute(); - $result_2 = $prep_statement_2->fetchAll(PDO::FETCH_NAMED); - if (count($result_2) > 0) { + if (count($submenu_array) > 0) { //child menu found - $db_menu_sub = "\n"; + + return $submenu_html; } - unset($prep_statement_2, $sql); } //create the menu array function menu_array($sql, $menu_item_level) { $db = $this->db; - $db_menu_full = ''; if (!isset($_SESSION['groups'])) { $_SESSION['groups'][0]['group_name'] = 'public'; @@ -580,7 +509,7 @@ //get sub menu for children if (strlen($menu_item_uuid) > 0) { $a[$x]['menu_items'] = $this->menu_child_array($menu_item_level, $menu_item_uuid); - //$str_child_menu = + //$str_child_menu = } //increment the row diff --git a/resources/menu.php b/resources/menu.php index bb79e1af04..051e3cbf37 100644 --- a/resources/menu.php +++ b/resources/menu.php @@ -65,7 +65,7 @@ require_once "resources/require.php"; $menu = new menu; $menu->db = $db; $menu->menu_uuid = $_SESSION['domain']['menu']['uuid']; - $v_menu .= $menu->build_html("", "main"); + $v_menu .= $menu->build_html(); unset($menu); $v_menu .= "\n";