lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-09-05 19:25:20 +02:00
commit 67f0313802
6 changed files with 5 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
htdocs/admin/system/database-tables-contraintes.php
View File

@ -1,117 +0,0 @@
<?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
*
* 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 <http://www.gnu.org/licenses/>.
*/
/**
* \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 '<table class="noborder">';
print '<tr class="liste_titre">';
if ($base==1)
{
print '<td>'.$langs->trans("Tables").'</td>';
print '<td>'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Constraints").'</td>';
}
if ($base==2)
{
print '<td>'.$langs->trans("Constraints").'</td>';
print '<td>'.$langs->trans("ConstraintsType").'</td>';
}
print "</tr>\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 "<tr $bc[$var]>";
if ($base==1)
{
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
print '<td>'.$obj->Engine.'</td>';
print '<td>'.$obj->Comment.'</td>';
}
if ($base==2)
{
print '<td>'.$obj->conname.'</td>';
print '<td>'.$obj->contype.'</td>';
}
print '</tr>';
$i++;
}
}
print '</table>';
}
llxFooter();
?>

7
htdocs/admin/tools/index.php
View File

@ -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").'<br>';
print "<br>";

1
htdocs/core/menus/init_menu_auguria.sql
View File

@ -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__);

1
htdocs/core/menus/init_menu_smartphone.sql
View File

@ -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__);

1
htdocs/core/menus/standard/eldy.lib.php
View File

@ -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');

BIN
htdocs/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB