diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php index dab387a07b8..f2739e781ed 100644 --- a/htdocs/admin/system/database-tables-contraintes.php +++ b/htdocs/admin/system/database-tables-contraintes.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier +/* Copyright (C) 2003 Rodolphe Quiedeville + * 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 @@ -22,9 +22,10 @@ * $Source$ */ -/*! \file htdocs/admin/system/database-tables-contraintes.php - \brief Page d'info des contraintes de la base - \version $Revision$ +/** + \file htdocs/admin/system/database-tables-contraintes.php + \brief Page d'info des contraintes de la base + \version $Revision$ */ require("./pre.inc.php"); @@ -34,7 +35,7 @@ $langs->load("admin"); if (!$user->admin) - accessforbidden(); +accessforbidden(); llxHeader(); @@ -44,14 +45,14 @@ print_titre($langs->trans("Constraints")); if ($conf->db->type == 'mysql') { - $sql = "SHOW TABLE STATUS"; - $base=1; + $sql = "SHOW TABLE STATUS"; + $base=1; } if ($conf->db->type == 'pgsql') { - $sql = "SELECT conname,contype FROM pg_constraint;"; - $base=2; + $sql = "SELECT conname, contype FROM pg_constraint;"; + $base=2; } print '
'; @@ -60,52 +61,48 @@ print ''; if($base==1) { - print ''.$langs->trans("Tables").''; - print ''.$langs->trans("Type").''; - print ''.$langs->trans("Constraints").''; + print ''.$langs->trans("Tables").''; + print ''.$langs->trans("Type").''; + print ''.$langs->trans("Constraints").''; } else { - print ''.$langs->trans("Constraints").''; - print ''.$langs->trans("ConstraintsType").''; + print ''.$langs->trans("Constraints").''; + print ''.$langs->trans("ConstraintsType").''; } print "\n"; $result = $db->query($sql); -if ($result) +if ($result) { - $num = $db->num_rows(); - $var=True; - $i=0; - while ($i < $num) + $num = $db->num_rows($result); + $var=True; + $i=0; + while ($i < $num) { - $row = $db->fetch_row($i); - $var=!$var; - print ""; + $obj = $db->fetch_object($rsult); + $var=!$var; + print ""; - if ($base==1) - { - print ''.$row[0].''; - } - else - { - print ''.$row[0].''; - } + if ($base==1) + { + print ''.$obj->Name.''; + print ''.$obj->Engine.''; + print ''.$obj->Comment.''; + } + else + { + print ''.$obj->conname.''; + print ''.$obj->contype.''; + } - print ''.$row[1].''; - - if ($base==1) - { - print ''.$row[14].''; - } - - print ''; - $i++; + print ''; + $i++; } } print ''; -llxFooter(); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 89035c47dad..4b31e7fbff8 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -1,8 +1,8 @@ - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier +/* Copyright (C) 2003 Rodolphe Quiedeville + * 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 @@ -55,12 +55,13 @@ if($conf->db->type == 'mysql') print ''; print ''.$langs->trans("TableName").''; print ''.$langs->trans("Type").''; - print ''.$langs->trans("TableLineFormat").''; + print ''.$langs->trans("Format").''; print ''.$langs->trans("NbOfRecord").''; print 'Avg_row_length'; print 'Data_length'; print 'Max_Data_length'; print 'Index_length'; + print 'Increment'; print 'Last check'; print "\n"; @@ -69,32 +70,33 @@ if($conf->db->type == 'mysql') $result = $db->query($sql); if ($result) { - $num = $db->num_rows(); + $num = $db->num_rows($result); $var=True; $i=0; while ($i < $num) { - $row = $db->fetch_row($i); + $obj = $db->fetch_object($result); $var=!$var; print ""; - print ''.$row[0].''; - print ''.$row[1].''; + print ''.$obj->Name.''; + print ''.$obj->Engine.''; if ($row[1] == "MyISAM") { - print 'Convertir'; + print ''.$langs->trans("Convert").''; } else { - print '-'; + print ' '; } - print ''.$row[2].''; - print ''.$row[3].''; - print ''.$row[4].''; - print ''.$row[5].''; - print ''.$row[6].''; - print ''.$row[7].''; - print ''.$row[12].''; + print ''.$obj->Row_format.''; + print ''.$obj->Rows.''; + print ''.$obj->Avg_row_length.''; + print ''.$obj->Data_length.''; + print ''.$obj->Max_data_length.''; + print ''.$obj->Index_length.''; + print ''.$obj->Auto_increment.''; + print ''.$obj->Check_time.''; print ''; $i++; } @@ -140,5 +142,7 @@ if($conf->db->type == 'pgsql') print ''; } -llxFooter(); + +llxFooter('$Date$ - $Revision$'); + ?> diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index 0bd48f24665..9bf7898de7a 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -91,5 +91,5 @@ if ($title) print "$chaine\n"; // Ne pas centrer la réponse php car certains tableau du bas très large rendent ceux du haut complètement à droite print "
\n"; -llxfooter(); +llxfooter('$Date$ - $Revision$'); ?>