diff --git a/core/menu/app_config.php b/core/menu/app_config.php
index 516d2c66b1..8036328120 100644
--- a/core/menu/app_config.php
+++ b/core/menu/app_config.php
@@ -193,10 +193,10 @@
$apps[$x]['db'][$y]['fields'][$z]['search'] = "true";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
- $apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_protected";
- $apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
- $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
- $z++;
+ //$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_protected";
+ //$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+ //$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+ //$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_order";
$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php
index c9b33c6c9e..5a96ba6467 100644
--- a/core/menu/menu_item_edit.php
+++ b/core/menu/menu_item_edit.php
@@ -53,7 +53,7 @@
$menu_item_icon = '';
$menu_item_icon_color = '';
$menu_item_description = '';
- $menu_item_protected = '';
+ //$menu_item_protected = '';
$menu_item_parent_uuid = null;
$menu_item_order = null;
@@ -105,7 +105,7 @@
$menu_item_icon = $_POST["menu_item_icon"] ?? '';
$menu_item_icon_color = $_POST["menu_item_icon_color"] ?? '';
$menu_item_description = $_POST["menu_item_description"] ?? '';
- $menu_item_protected = $_POST["menu_item_protected"] ?? '';
+ //$menu_item_protected = $_POST["menu_item_protected"] ?? '';
$menu_item_parent_uuid = $_POST["menu_item_parent_uuid"] ?? null;
$menu_item_order = $_POST["menu_item_order"] ?? '';
}
@@ -177,7 +177,7 @@
$array['menu_items'][0]['menu_item_icon'] = $menu_item_icon;
$array['menu_items'][0]['menu_item_icon_color'] = $menu_item_icon_color;
$array['menu_items'][0]['menu_item_description'] = $menu_item_description;
- $array['menu_items'][0]['menu_item_protected'] = $menu_item_protected;
+ //$array['menu_items'][0]['menu_item_protected'] = $menu_item_protected;
$array['menu_items'][0]['menu_item_uuid'] = $menu_item_uuid;
if (!is_uuid($menu_item_parent_uuid)) {
$array['menu_items'][0]['menu_item_parent_uuid'] = null;
@@ -203,7 +203,7 @@
$array['menu_items'][0]['menu_item_icon'] = $menu_item_icon;
$array['menu_items'][0]['menu_item_icon_color'] = $menu_item_icon_color;
$array['menu_items'][0]['menu_item_description'] = $menu_item_description;
- $array['menu_items'][0]['menu_item_protected'] = $menu_item_protected;
+ //$array['menu_items'][0]['menu_item_protected'] = $menu_item_protected;
$array['menu_items'][0]['menu_item_uuid'] = $menu_item_uuid;
if (!is_uuid($menu_item_parent_uuid)) {
$array['menu_items'][0]['menu_item_parent_uuid'] = null;
@@ -221,13 +221,13 @@
}
//update child menu items to protected true or false
- $sql = "update v_menu_items ";
- $sql .= "set menu_item_protected = :menu_item_protected ";
- $sql .= "where menu_item_parent_uuid = :menu_item_parent_uuid ";
- $parameters['menu_item_parent_uuid'] = $menu_item_uuid;
- $parameters['menu_item_protected'] = $menu_item_protected;
- $database->execute($sql, $parameters);
- unset($parameters);
+ //$sql = "update v_menu_items ";
+ //$sql .= "set menu_item_protected = :menu_item_protected ";
+ //$sql .= "where menu_item_parent_uuid = :menu_item_parent_uuid ";
+ //$parameters['menu_item_parent_uuid'] = $menu_item_uuid;
+ //$parameters['menu_item_protected'] = $menu_item_protected;
+ //$database->execute($sql, $parameters);
+ //unset($parameters);
//add a group to the menu
if (!empty($group_uuid_name) && permission_exists('menu_add')) {
@@ -319,7 +319,7 @@
$menu_item_icon = $row["menu_item_icon"];
$menu_item_icon_color = $row["menu_item_icon_color"];
$menu_item_description = $row["menu_item_description"];
- $menu_item_protected = $row["menu_item_protected"];
+ //$menu_item_protected = $row["menu_item_protected"];
$menu_item_parent_uuid = $row["menu_item_parent_uuid"];
$menu_item_order = $row["menu_item_order"];
$menu_item_add_user = $row["menu_item_add_user"];
@@ -535,29 +535,29 @@
echo " ";
echo " ";
- echo "
\n";
- echo "| \n";
- echo " ".$text['label-protected']."\n";
- echo " | \n";
- echo "\n";
- echo " \n";
- echo $text['description-protected']." \n";
- echo "\n";
- echo " | \n";
- echo "
\n";
+ //echo "\n";
+ //echo "| \n";
+ //echo " ".$text['label-protected']."\n";
+ //echo " | \n";
+ //echo "\n";
+ //echo " \n";
+ //echo $text['description-protected']." \n";
+ //echo "\n";
+ //echo " | \n";
+ //echo "
\n";
if (!empty($action) && $action == "update") {
if (empty($menu_item_parent_uuid)) {
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index 5ed02fb2b5..71aca78c78 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -111,7 +111,7 @@
//set the db values as php variables
$menu_item_uuid = $row2['menu_item_uuid'];
$menu_item_category = $row2['menu_item_category'];
- $menu_item_protected = $row2['menu_item_protected'];
+ //$menu_item_protected = $row2['menu_item_protected'];
$menu_item_parent_uuid = $row2['menu_item_parent_uuid'];
$menu_item_order = $row2['menu_item_order'];
$menu_item_title = $row2['menu_item_title'];
@@ -187,15 +187,15 @@
echo "".$menu_item_link." | \n";
echo "".$group_list." | ";
echo "".$menu_item_category." | ";
- if (permission_exists('menu_item_edit')) {
- echo " \n";
- echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
- }
- else {
- echo " | \n";
- echo $text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')];
- }
- echo " | \n";
+ //if (permission_exists('menu_item_edit')) {
+ // echo " \n";
+ // echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
+ //}
+ //else {
+ // echo " | \n";
+ // echo $text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')];
+ //}
+ //echo " | \n";
echo " | ";
//echo "";
@@ -313,7 +313,7 @@
echo " | ".$text['label-link']." | ";
echo " ".$text['label-groups']." | ";
echo " ".$text['label-category']." | ";
- echo " ".$text['label-protected']." | ";
+ //echo " ".$text['label-protected']." | ";
echo " ".$text['label-menu_order']." | ";
if (permission_exists('menu_item_edit') && $list_row_edit_button) {
echo " | \n";
@@ -330,7 +330,7 @@
$menu_item_link = $row['menu_item_link'];
$menu_item_icon = $row['menu_item_icon'];
$menu_item_icon_color = $row['menu_item_icon_color'];
- $menu_item_protected = $row['menu_item_protected'];
+ //$menu_item_protected = $row['menu_item_protected'];
//get the groups that have been assigned to the menu
$sql = "select ";
@@ -399,15 +399,15 @@
echo "".$menu_item_link." | \n";
echo "".($group_list ?? '')." | \n";
echo "".$menu_item_category." | \n";
- if (permission_exists('menu_item_edit')) {
- echo "\n";
- echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
- }
- else {
- echo " | \n";
- echo $text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')];
- }
- echo " | \n";
+ //if (permission_exists('menu_item_edit')) {
+ // echo "\n";
+ // echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
+ //}
+ //else {
+ // echo " | \n";
+ // echo $text['label-'.($menu_item_protected == 'true' ? 'true' : 'false')];
+ //}
+ //echo " | \n";
echo "".$row['menu_item_order']." | \n";
//echo "";
diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php
index df0c5f3c1a..50bba6aac9 100644
--- a/core/menu/menu_restore_default.php
+++ b/core/menu/menu_restore_default.php
@@ -54,7 +54,7 @@
$menu = new menu;
$menu->menu_uuid = $menu_uuid;
$menu->menu_language = $menu_language;
- $menu->delete_unprotected();
+ $menu->delete();
$menu->restore();
unset($menu);
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 9908827f7a..a778fd1f20 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -315,9 +315,9 @@
}
/**
- * delete items in the menu that are not protected
+ * delete items in the menu
*/
- public function delete_unprotected() {
+ public function delete() {
//remove existing menu languages
$sql = "delete from v_menu_languages ";
$sql .= "where menu_uuid = :menu_uuid ";
@@ -325,38 +325,38 @@
$sql .= " select menu_item_uuid ";
$sql .= " from v_menu_items ";
$sql .= " where menu_uuid = :menu_uuid ";
- $sql .= " and ( ";
- $sql .= " menu_item_protected <> 'true' ";
- $sql .= " or menu_item_protected is null ";
- $sql .= " ) ";
+ //$sql .= " and ( ";
+ //$sql .= " menu_item_protected <> 'true' ";
+ //$sql .= " or menu_item_protected is null ";
+ //$sql .= " ) ";
$sql .= ") ";
$parameters['menu_uuid'] = $this->menu_uuid;
$this->database->execute($sql, $parameters);
unset($sql, $parameters);
- //remove existing unprotected menu item groups
+ //remove existing menu item groups
$sql = "delete from v_menu_item_groups ";
$sql .= "where menu_uuid = :menu_uuid ";
$sql .= "and menu_item_uuid in ( ";
$sql .= " select menu_item_uuid ";
$sql .= " from v_menu_items ";
$sql .= " where menu_uuid = :menu_uuid ";
- $sql .= " and ( ";
- $sql .= " menu_item_protected <> 'true' ";
- $sql .= " or menu_item_protected is null ";
- $sql .= " ) ";
+ //$sql .= " and ( ";
+ //$sql .= " menu_item_protected <> 'true' ";
+ //$sql .= " or menu_item_protected is null ";
+ //$sql .= " ) ";
$sql .= ") ";
$parameters['menu_uuid'] = $this->menu_uuid;
$this->database->execute($sql, $parameters);
unset($sql, $parameters);
- //remove existing unprotected menu items
+ //remove existing menu items
$sql = "delete from v_menu_items ";
$sql .= "where menu_uuid = :menu_uuid ";
- $sql .= "and ( ";
- $sql .= " menu_item_protected <> 'true' ";
- $sql .= " or menu_item_protected is null ";
- $sql .= ") ";
+ //$sql .= "and ( ";
+ //$sql .= " menu_item_protected <> 'true' ";
+ //$sql .= " or menu_item_protected is null ";
+ //$sql .= ") ";
$parameters['menu_uuid'] = $this->menu_uuid;
$this->database->execute($sql, $parameters);
unset($sql, $parameters);
@@ -434,7 +434,7 @@
//execute save
$database = new database;
$database->app_name = $this->app_name;
- $database->app_uuid = $this->app_uuid;
+ $database->app_uuid = $this->app_uuid;
$database->save($array);
unset($array);
//set message
@@ -786,7 +786,8 @@
$menu_items = $menu_field['menu_items'];
//prepare the protected menus
- $menu_item_title = ($menu_field['menu_item_protected'] == "true") ? $menu_field['menu_item_title'] : $menu_field['menu_language_title'];
+ //$menu_item_title = ($menu_field['menu_item_protected'] == "true") ? $menu_field['menu_item_title'] : $menu_field['menu_language_title'];
+ $menu_item_title = $menu_field['menu_language_title'];
//prepare the menu_tags according to the category
$menu_tags = '';
@@ -867,7 +868,8 @@
$menu_items = $submenu_field['menu_items'];
//prepare the protected menus
- $menu_item_title = ($submenu_field['menu_item_protected'] == "true") ? $submenu_field['menu_item_title'] : $submenu_field['menu_language_title'];
+ //$menu_item_title = ($submenu_field['menu_item_protected'] == "true") ? $submenu_field['menu_item_title'] : $submenu_field['menu_language_title'];
+ $menu_item_title = $submenu_field['menu_language_title'];
//prepare the menu_tags according to the category
switch ($menu_item_category) {
@@ -922,8 +924,8 @@
//get the menu from the database
$sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, ";
- $sql .= "i.menu_item_title, i.menu_item_protected, i.menu_item_category, ";
- $sql .= "i.menu_item_icon, i.menu_item_icon_color, i.menu_item_uuid, i.menu_item_parent_uuid ";
+ $sql .= "i.menu_item_title, i.menu_item_category, i.menu_item_icon, ";
+ $sql .= "i.menu_item_icon_color, 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 = :menu_language ";
@@ -992,7 +994,9 @@
}
//get the child menu from the database
- $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_icon, i.menu_item_icon_color, i.menu_item_uuid, i.menu_item_parent_uuid ";
+ $sql = "select i.menu_item_link, l.menu_item_title as menu_language_title, ";
+ $sql .= "i.menu_item_title, i.menu_item_category, i.menu_item_icon, ";
+ $sql .= "i.menu_item_icon_color, 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 = :menu_language ";
@@ -1039,13 +1043,13 @@
//add the row to the array
$a[$x] = $row;
- //prepare the protected menus
- if ($row['menu_item_protected'] == "true") {
- $a[$x]['menu_item_title'] = $row['menu_item_title'];
- }
- else {
- $a[$x]['menu_item_title'] = $row['menu_language_title'];
- }
+ //prepare the menus
+ //if ($row['menu_item_protected'] == "true") {
+ // $a[$x]['menu_item_title'] = $row['menu_item_title'];
+ //}
+ //else {
+ $a[$x]['menu_item_title'] = $row['menu_language_title'];
+ //}
//get sub menu for children
if (!empty($menu_item_uuid)) {
|