diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 415678154f..516b940529 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -126,6 +126,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "where default_setting_uuid = '$default_setting_uuid'";
$db->exec(check_sql($sql));
unset($sql);
+
+ $sql = "update v_domain_settings set ";
+ $sql .= "domain_setting_value = '$default_setting_value' ";
+ $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+ $sql .= "and domain_setting_subcategory = 'menu' ";
+ $db->exec(check_sql($sql));
+ unset($sql);
require_once "includes/header.php";
echo "\n";
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 02608984fc..c48fcb8f65 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -179,7 +179,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
echo "| \n";
if (permission_exists('menu_restore')) {
- echo " ";
+ echo " ";
}
echo " | \n";
echo "\n";
diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php
index 0f9f529614..7c935d7050 100644
--- a/core/menu/menu_restore_default.php
+++ b/core/menu/menu_restore_default.php
@@ -36,12 +36,14 @@ else {
//get the http value and set as a php variable
$menu_uuid = check_str($_REQUEST["menu_uuid"]);
+ $menu_language = check_str($_REQUEST["menu_language"]);
//menu restore default
require_once "includes/classes/menu.php";
$menu = new menu;
$menu->db = $db;
$menu->menu_uuid = $menu_uuid;
+ $menu->menu_language = $menu_language;
$menu->delete();
$menu->restore();
diff --git a/includes/classes/menu.php b/includes/classes/menu.php
index e9ef02b1fb..335752f6e8 100644
--- a/includes/classes/menu.php
+++ b/includes/classes/menu.php
@@ -27,6 +27,7 @@
//define the follow me class
class menu {
public $menu_uuid;
+ public $menu_language;
//delete items in the menu that are not protected
function delete() {
@@ -58,66 +59,67 @@
foreach ($apps as $row) {
foreach ($row['menu'] as $menu) {
//set the variables
- $menu_item_title = $menu['title']['en'];
- $menu_item_language = 'en';
+ //$menu_item_title = $menu['title']['en'];
+ $menu_item_title = $menu['title'][$this->menu_language];
+ //$menu_item_language = 'en';
$menu_item_uuid = $menu['uuid'];
$menu_item_parent_uuid = $menu['parent_uuid'];
$menu_item_category = $menu['category'];
$menu_item_path = $menu['path'];
$menu_item_order = $menu['order'];
$menu_item_description = $menu['desc'];
-
- //if the item uuid is not currently in the db then add it
- $sql = "select * from v_menu_items ";
- $sql .= "where menu_uuid = '".$this->menu_uuid."' ";
- $sql .= "and menu_item_uuid = '$menu_item_uuid' ";
- $prep_statement = $db->prepare(check_sql($sql));
- if ($prep_statement) {
- $prep_statement->execute();
- $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
- if (count($result) == 0) {
- //insert the default menu into the database
- $sql = "insert into v_menu_items ";
- $sql .= "(";
- $sql .= "menu_item_uuid, ";
- $sql .= "menu_uuid, ";
- //$sql .= "menu_item_language, ";
- $sql .= "menu_item_title, ";
- $sql .= "menu_item_link, ";
- $sql .= "menu_item_category, ";
- if (strlen($menu_item_order) > 0) {
- $sql .= "menu_item_order, ";
- }
- if (strlen($menu_item_parent_uuid) > 0) {
- $sql .= "menu_item_parent_uuid, ";
- }
- $sql .= "menu_item_description ";
- $sql .= ") ";
- $sql .= "values ";
- $sql .= "(";
- $sql .= "'".$menu_item_uuid."', ";
- $sql .= "'".$this->menu_uuid."', ";
- //$sql .= "'$menu_item_language', ";
- $sql .= "'$menu_item_title', ";
- $sql .= "'$menu_item_path', ";
- $sql .= "'$menu_item_category', ";
- if (strlen($menu_item_order) > 0) {
- $sql .= "'$menu_item_order', ";
- }
- if (strlen($menu_item_parent_uuid) > 0) {
- $sql .= "'$menu_item_parent_uuid', ";
- }
- $sql .= "'$menu_item_description' ";
- $sql .= ")";
- if ($menu_item_uuid == $menu_item_parent_uuid) {
- //echo $sql."
\n";
- }
- else {
- $db->exec(check_sql($sql));
- }
- unset($sql);
- }
- }
+
+ //if the item uuid is not currently in the db then add it
+ $sql = "select * from v_menu_items ";
+ $sql .= "where menu_uuid = '".$this->menu_uuid."' ";
+ $sql .= "and menu_item_uuid = '$menu_item_uuid' ";
+ $prep_statement = $db->prepare(check_sql($sql));
+ if ($prep_statement) {
+ $prep_statement->execute();
+ $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
+ if (count($result) == 0) {
+ //insert the default menu into the database
+ $sql = "insert into v_menu_items ";
+ $sql .= "(";
+ $sql .= "menu_item_uuid, ";
+ $sql .= "menu_uuid, ";
+ //$sql .= "menu_item_language, ";
+ $sql .= "menu_item_title, ";
+ $sql .= "menu_item_link, ";
+ $sql .= "menu_item_category, ";
+ if (strlen($menu_item_order) > 0) {
+ $sql .= "menu_item_order, ";
+ }
+ if (strlen($menu_item_parent_uuid) > 0) {
+ $sql .= "menu_item_parent_uuid, ";
+ }
+ $sql .= "menu_item_description ";
+ $sql .= ") ";
+ $sql .= "values ";
+ $sql .= "(";
+ $sql .= "'".$menu_item_uuid."', ";
+ $sql .= "'".$this->menu_uuid."', ";
+ //$sql .= "'$menu_item_language', ";
+ $sql .= "'$menu_item_title', ";
+ $sql .= "'$menu_item_path', ";
+ $sql .= "'$menu_item_category', ";
+ if (strlen($menu_item_order) > 0) {
+ $sql .= "'$menu_item_order', ";
+ }
+ if (strlen($menu_item_parent_uuid) > 0) {
+ $sql .= "'$menu_item_parent_uuid', ";
+ }
+ $sql .= "'$menu_item_description' ";
+ $sql .= ")";
+ if ($menu_item_uuid == $menu_item_parent_uuid) {
+ //echo $sql."
\n";
+ }
+ else {
+ $db->exec(check_sql($sql));
+ }
+ unset($sql);
+ }
+ }
}
}
diff --git a/includes/header.php b/includes/header.php
index a7d92dbbaf..071ff0c9cb 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -26,6 +26,13 @@
include "root.php";
require_once "includes/require.php";
+require_once "includes/Logging.php";
+// Logging class initialization
+$log = new Logging();
+
+// set path and name of log file (optional)
+$log->lfile('/tmp/mylog.txt');
+
//if reloadxml then run the command
if (isset($_SESSION["reload_xml"])) {
if (strlen($_SESSION["reload_xml"]) > 0) {
@@ -72,7 +79,7 @@ require_once "includes/require.php";
else {
$content = '';
}
-
+$log->lwrite($_SESSION['domain']['menu']['uuid']);
//get the parent id
$sql = "select * from v_menu_items ";
$sql .= "where menu_uuid = '".$_SESSION['domain']['menu']['uuid']."' ";
diff --git a/install.php b/install.php
index f33c1c894e..0b557b0e9c 100644
--- a/install.php
+++ b/install.php
@@ -34,7 +34,7 @@ require_once "includes/lib_functions.php";
//add the menu uuid
$menu_uuid = 'b4750c3f-2a86-b00d-b7d0-345c14eca286';
-
+ $menu_uuid_pt = '1a2b789b-64a0-4a45-84eb-7ebf4f9c576b';
//error reporting
ini_set('display_errors', '1');
//error_reporting (E_ALL); // Report everything
@@ -671,6 +671,12 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
$tmp[$x]['subcategory'] = 'menu';
$tmp[$x]['enabled'] = 'true';
$x++;
+ /* $tmp[$x]['name'] = 'uuid';
+ $tmp[$x]['value'] = $menu_uuid_pt;
+ $tmp[$x]['category'] = 'domain';
+ $tmp[$x]['subcategory'] = 'menu';
+ $tmp[$x]['enabled'] = 'true';
+ $x++;*/
$tmp[$x]['name'] = 'name';
$tmp[$x]['category'] = 'domain';
$tmp[$x]['subcategory'] = 'time_zone';
@@ -833,6 +839,12 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
$tmp[$x]['subcategory'] = 'menu';
$tmp[$x]['enabled'] = 'true';
$x++;
+ /*$tmp[$x]['name'] = 'uuid';
+ $tmp[$x]['value'] = $menu_uuid_pt;
+ $tmp[$x]['category'] = 'domain';
+ $tmp[$x]['subcategory'] = 'menu';
+ $tmp[$x]['enabled'] = 'true';
+ $x++;*/
$tmp[$x]['name'] = 'name';
$tmp[$x]['value'] = $install_template_name;
$tmp[$x]['category'] = 'domain';
@@ -1133,37 +1145,52 @@ if ($_POST["install_step"] == "3" && count($_POST)>0 && strlen($_POST["persistfo
require "includes/require.php";
//set the defaults
- $menu_name = 'default';
- $menu_language = 'en';
- $menu_description = '';
+ $x = 0;
+ $tmp[$x]['menu_name'] = 'default';
+ $tmp[$x]['menu_language'] = 'en';
+ $tmp[$x]['menu_description'] = '';
+ $tmp[$x]['menu_uuid'] = $menu_uuid;
+ $x++;
+ $tmp[$x]['menu_name'] = 'portuguese';
+ $tmp[$x]['menu_language'] = 'pt-pt';
+ $tmp[$x]['menu_description'] = '';
+ $tmp[$x]['menu_uuid'] = $menu_uuid_pt;
+
+
//add the parent menu
- $sql = "insert into v_menus ";
- $sql .= "(";
- $sql .= "menu_uuid, ";
- $sql .= "menu_name, ";
- $sql .= "menu_language, ";
- $sql .= "menu_description ";
- $sql .= ") ";
- $sql .= "values ";
- $sql .= "(";
- $sql .= "'".$menu_uuid."', ";
- $sql .= "'$menu_name', ";
- $sql .= "'$menu_language', ";
- $sql .= "'$menu_description' ";
- $sql .= ");";
- if ($v_debug) {
- fwrite($fp, $sql."\n");
- }
- $db->exec(check_sql($sql));
- unset($sql);
+ foreach($tmp as $row) {
+ $sql = "insert into v_menus ";
+ $sql .= "(";
+ $sql .= "menu_uuid, ";
+ $sql .= "menu_name, ";
+ $sql .= "menu_language, ";
+ $sql .= "menu_description ";
+ $sql .= ") ";
+ $sql .= "values ";
+ $sql .= "(";
+ $sql .= "'".$row['menu_uuid']."', ";
+ $sql .= "'".$row['menu_name']."', ";
+ $sql .= "'".$row['menu_language']."', ";
+ $sql .= "'".$row['menu_description']."' ";
+ $sql .= ");";
+ if ($v_debug) {
+ fwrite($fp, $sql."\n");
+ }
+ $db->exec(check_sql($sql));
+ unset($sql);
+
+ //add the menu items
+ require_once "includes/classes/menu.php";
+ $menu = new menu;
+ $menu->db = $db;
+ $menu->menu_uuid = $row['menu_uuid'];
+ $menu->menu_language = $row['menu_language'];
+ $menu->restore();
+ unset($menu);
+ }
+ unset($tmp);
- //add the menu items
- require_once "includes/classes/menu.php";
- $menu = new menu;
- $menu->db = $db;
- $menu->menu_uuid = $menu_uuid;
- $menu->restore();
- unset($menu);
+
//setup the switch config directory if it exists
if ($switch_conf_dir != "/conf") {