diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php deleted file mode 100644 index a6b8d9fb944..00000000000 --- a/htdocs/admin/system/database-tables-contraintes.php +++ /dev/null @@ -1,117 +0,0 @@ - - * Copyright (C) 2004-2005 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/admin/system/database-tables-contraintes.php - * \brief Page d'info des contraintes de la base - */ - -require '../../main.inc.php'; - -$langs->load("admin"); - - -if (!$user->admin) accessforbidden(); - - -/* - * View - */ - -llxHeader(); - -print_fiche_titre($langs->trans("Constraints"),'','setup'); - - -// Define request to get table description -$base=0; -if (preg_match('/mysql/i',$conf->db->type)) -{ - $sql = "SHOW TABLE STATUS"; - $base=1; -} -else if ($conf->db->type == 'pgsql') -{ - $sql = "SELECT conname, contype FROM pg_constraint;"; - $base=2; -} -else if ($conf->db->type == 'mssql') -{ - //$sql = ""; - //$base=3; -} - -if (! $base) -{ - print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver"); -} -else -{ - print ''; - print ''; - - if ($base==1) - { - print ''; - print ''; - print ''; - } - if ($base==2) - { - print ''; - print ''; - } - - print "\n"; - - - $result = $db->query($sql); - if ($result) - { - $num = $db->num_rows($result); - $var=True; - $i=0; - while ($i < $num) - { - $obj = $db->fetch_object($result); - $var=!$var; - print ""; - - if ($base==1) - { - print ''; - print ''; - print ''; - } - if ($base==2) - { - print ''; - print ''; - } - - print ''; - $i++; - } - } - print '
'.$langs->trans("Tables").''.$langs->trans("Type").''.$langs->trans("Constraints").''.$langs->trans("Constraints").''.$langs->trans("ConstraintsType").'
'.$obj->Name.''.$obj->Engine.''.$obj->Comment.''.$obj->conname.''.$obj->contype.'
'; -} - -llxFooter(); -?> diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php index dfbd00d949e..e37be84afe1 100644 --- a/htdocs/admin/tools/index.php +++ b/htdocs/admin/tools/index.php @@ -35,11 +35,14 @@ if (! $user->admin) * View */ -llxHeader(); +$title=$langs->trans("SystemToolsArea"); +if (GETPOST('leftmenu') == 'modulesadmintools') $title=$langs->trans("ModulesSystemTools"); + +llxHeader(array(),$title); $form = new Form($db); -print_fiche_titre($langs->trans("SystemToolsArea"),'','setup'); +print_fiche_titre($title,'','setup'); print $langs->trans("SystemToolsAreaDesc").'
'; print "
"; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index afbd8ee4d13..481721947f2 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -45,7 +45,6 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=system', 'Php', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 210__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=system', 'Database', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 211__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables.php?leftmenu=system', 'Tables', 2, 'admin', '', '', 2, 0, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'system\'', __HANDLER__, 'left', 212__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables-contraintes.php?leftmenu=system', 'Constraints', 2, 'admin', '', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'admintools\'', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$leftmenu==\'admintools\'', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 1, 'admin', '', '', 2, 1, __ENTITY__); diff --git a/htdocs/core/menus/init_menu_smartphone.sql b/htdocs/core/menus/init_menu_smartphone.sql index 84591591dca..2b77557e4e9 100755 --- a/htdocs/core/menus/init_menu_smartphone.sql +++ b/htdocs/core/menus/init_menu_smartphone.sql @@ -42,7 +42,6 @@ insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 206__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/phpinfo.php?leftmenu=system', 'Php', 1, 'admin', '', '', 2, 3, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 210__+MAX_llx_menu__, 'home', '', 200__+MAX_llx_menu__, '/admin/system/database.php?leftmenu=system', 'Database', 1, 'admin', '', '', 2, 4, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 211__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables.php?leftmenu=system', 'Tables', 2, 'admin', '', '', 2, 0, __ENTITY__); -insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 212__+MAX_llx_menu__, 'home', '', 210__+MAX_llx_menu__, '/admin/system/database-tables-contraintes.php?leftmenu=system', 'Constraints', 2, 'admin', '', '', 2, 1, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 301__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_export.php?leftmenu=admintools', 'Backup', 1, 'admin', '', '', 2, 0, __ENTITY__); insert into llx_menu (enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('1', __HANDLER__, 'left', 302__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/tools/dolibarr_import.php?leftmenu=admintools', 'Restore', 1, 'admin', '', '', 2, 1, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 890d3fe1008..0d1ac9e17c9 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -700,7 +700,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1); $newmenu->add('/admin/system/database.php?mainmenu=home', $langs->trans('Database'), 1); $newmenu->add('/admin/system/database-tables.php?mainmenu=home', $langs->trans('Tables'), 2); - $newmenu->add('/admin/system/database-tables-contraintes.php?mainmenu=home', $langs->trans('Constraints'), 2); } // Admin tools $newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("SystemTools"), 0, 1, '', $mainmenu, 'admintools'); diff --git a/htdocs/favicon.ico b/htdocs/favicon.ico index 7d41c54d5bb..b93a86747d6 100644 Binary files a/htdocs/favicon.ico and b/htdocs/favicon.ico differ