diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index c4d5026ed4a..f27adbdbe21 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2007 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,21 +22,21 @@ /** \file htdocs/admin/menus/edit.php - \ingroup admin + \ingroup core,menudb \brief Edition des menus \version $Revision$ */ + +require("./pre.inc.php"); - require("./pre.inc.php"); - - - - if (!$user->admin) +if (!$user->admin) accessforbidden(); - +/* +* Actions +*/ if (isset($_GET["action"]) && $_GET["action"] == 'update') { @@ -44,7 +45,9 @@ if (isset($_GET["action"]) && $_GET["action"] == 'update') if(!$_POST['cancel']) { - $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m SET m.titre = '".$_POST['titre']."', m.leftmenu = '".$_POST['leftmenu']."', m.url = '".$_POST['url']."', m.langs = '".$_POST['langs']."', m.right = '".$_POST['right']."',m.target = '".$_POST['target']."', m.user = ".$_POST['user']." WHERE m.rowid = ".$_POST['menuId']; + $sql = "UPDATE ".MAIN_DB_PREFIX."menu as m"; + $sql.=" SET m.titre = '".$_POST['titre']."', m.leftmenu = '".$_POST['leftmenu']."', m.url = '".$_POST['url']."', m.langs = '".$_POST['langs']."', m.right = '".$_POST['right']."',m.target = '".$_POST['target']."', m.user = ".$_POST['user']; + $sql.=" WHERE m.rowid = ".$_POST['menuId']; $db->query($sql); } @@ -139,8 +142,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add') - $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu VALUES($rowid, '".$_POST['mainmenu']."','".$_POST['leftmenu']."',".$_GET['menuId'].",'".$_POST['url']."','".$_POST['titre']."',".$_POST['level'].",'".$_POST['langs']."','".$_POST['right']."','',".$_POST['user'].",".$order.")"; - $db->query($sql); + $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, right, target, user, order)"; + $sql.= + $sql.=" VALUES($rowid, '".$_POST['menu_hanlder']."','".$_POST['type']."','".$_POST['mainmenu']."','".$_POST['leftmenu']."',".$_GET['menuId'].",'".$_POST['url']."','".$_POST['titre']."',".$_POST['level'].",'".$_POST['langs']."','".$_POST['right']."','".$_POST['target']."',".$_POST['user'].",".$order.")"; + $result=$db->query($sql); header("location: edit.php?action=edit&menuId=".$rowid); } @@ -257,6 +262,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create') print ''; + // Id if($_GET['menuId'] == 0) { $parent_rowid = $_GET['menuId']; @@ -279,20 +285,11 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create') } } } - //Titre - print ''; - //Mainmenu - print ''; - //Level - print ''; - //URL - print ''; - //Leftmenu - print ''; - //Langs - print ''; - //Right - print ''; + + //Handler + print ''; + //Handler + print ''; //User print ''; print ''; print ''; - // target + //Level + print ''; + //Titre + print ''; + //Langs + print ''; + //URL + print ''; + //Target print ''; + //Right + print ''; + + //Mainmenu = group + print ''; + //Leftmenu + print ''; + + // Boutons print ''; print '
'.$langs->trans('Titre').''.$langs->trans('DetailTitre').'
'.$langs->trans('Mainmenu').''.$langs->trans('DetailMainmenu').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Leftmenu').''.$langs->trans('DetailLeftmenu').'
'.$langs->trans('Langs').''.$langs->trans('DetailLangs').'
'.$langs->trans('Right').''.$langs->trans('DetailRight').'
'.$langs->trans('MenuHandler').''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('Type').''.$langs->trans('DetailType').'
'.$langs->trans('User').''.$langs->trans('DetailUser').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('Langs').''.$langs->trans('DetailLangs').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Target').''.$langs->trans('DetailTarget').'
'.$langs->trans('Right').''.$langs->trans('DetailRight').'
'.$langs->trans('Group').''.$langs->trans('DetailMainmenu').'
'.$langs->trans('Leftmenu').''.$langs->trans('DetailLeftmenu').'
'; print ' '; print '
'; - - - - - - - print ''; - - } elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') @@ -333,7 +338,8 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') print ''; - $sql = "SELECT m.rowid, m.titre, m.mainmenu, m.leftmenu, m.fk_menu, m.url, m.langs, m.level, m.right, m.target, m.user, m.order FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; + $sql = "SELECT m.rowid, m.menu_handler, m.type, m.titre, m.mainmenu, m.leftmenu, m.fk_menu, m.url, m.langs, m.level, m.right, m.target, m.user, m.order"; + $sql.=" FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; $result = $db->query($sql); if ($result) { @@ -345,35 +351,48 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') $menu = $db->fetch_object($result); - // rowid + // Id print ''; print ''; - // titre - print ''; - // mainmenu - print ''; - // Niveau - print ''; - // url - print ''; - // Leftmenu - print ''; - // langs - print ''; - // right - print ''; + + // Handler + print ''; + // user print ''; - // target + + // Type + print ''; + + // Niveau + print ''; + + // Titre + print ''; + // Langs + print ''; + + // Url + print ''; + + // Target print ''; + // Right + print ''; + + // Leftmenu + print ''; + // Mainmenu = group + print ''; + // Bouton print '
'.$langs->trans('rowid').''.$menu->rowid.''.$langs->trans('DetailId').'
'.$langs->trans('Titre').''.$langs->trans('DetailTitre').'
'.$langs->trans('Mainmenu').''.$langs->trans('DetailMainmenu').'
'.$langs->trans('Level').''.$menu->level.''.$langs->trans('DetailLevel').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Leftmenu').''.$langs->trans('DetailLeftmenu').'
'.$langs->trans('Langs').''.$langs->trans('DetailLangs').'
'.$langs->trans('Right').''.$langs->trans('DetailRight').'
'.$langs->trans('MenuHandler').''.$menu->menu_handler.''.$langs->trans('DetailMenuHandler').'
'.$langs->trans('User').''.$langs->trans('DetailUser').'
'.$langs->trans('Type').''.$menu->type.''.$langs->trans('DetailType').'
'.$langs->trans('Level').''.$menu->level.''.$langs->trans('DetailLevel').'
'.$langs->trans('Title').''.$langs->trans('DetailTitre').'
'.$langs->trans('Langs').''.$langs->trans('DetailLangs').'
'.$langs->trans('URL').''.$langs->trans('DetailUrl').'
'.$langs->trans('Target').''.$langs->trans('DetailTarget').'
'.$langs->trans('Right').''.$langs->trans('DetailRight').'
'.$langs->trans('Leftmenu').''.$langs->trans('DetailLeftmenu').'
'.$langs->trans('Group').''.$langs->trans('DetailMainmenu').'
'; print ' '; diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index bb241a3af16..c1fcba91b35 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -21,7 +21,7 @@ /** \file htdocs/admin/menus/index.php - \ingroup admin + \ingroup core,menudb \brief Gestion des menus \version $Revision$ */ diff --git a/htdocs/admin/menus/module_menudb.php b/htdocs/admin/menus/module_menudb.php index 8d61ef39c1f..7c5e20ade44 100644 --- a/htdocs/admin/menus/module_menudb.php +++ b/htdocs/admin/menus/module_menudb.php @@ -22,7 +22,7 @@ /** \file htdocs/includes/modules/menudb/modules_menudb.php - \ingroup core + \ingroup menudb \brief Fichier contenant la classe mère d'affichage des menus DB \version $Revision$ */ diff --git a/mysql/data/data.sql b/mysql/data/data.sql index dabe7491433..4abde95c1d0 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -1122,7 +1122,6 @@ insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titr insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (107, 'home', '$leftmenu=="setup"', 100, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (108, 'home', '$leftmenu=="setup"', 100, '/admin/dict.php', 'DictionnarySetup', 1, 'admin', '', '', 2, 8); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (109, 'home', '$leftmenu=="setup"', 100, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (110, 'home', '$leftmenu=="setup"', 100, '/admin/menus/index.php', 'MenuConf', 1, 'admin', '$user->rights->menudb->creer', '', 2, 4); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (111, 'home', '$leftmenu=="setup"', 100, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 4); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (200, 'home', '', 1, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (201, 'home', '$leftmenu=="system"', 200, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0); diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 666615e36e8..dcf4b1e8722 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -130,7 +130,6 @@ insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titr insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (107, 'home', '$leftmenu=="setup"', 100, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (108, 'home', '$leftmenu=="setup"', 100, '/admin/dict.php', 'DictionnarySetup', 1, 'admin', '', '', 2, 8); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (109, 'home', '$leftmenu=="setup"', 100, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (110, 'home', '$leftmenu=="setup"', 100, '/admin/menus/index.php', 'MenuConf', 1, 'admin', '$user->rights->menudb->creer', '', 2, 4); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (111, 'home', '$leftmenu=="setup"', 100, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 4); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (200, 'home', '', 1, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1); insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (201, 'home', '$leftmenu=="system"', 200, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0);