Fix: ID session pour permettre install multiples

This commit is contained in:
Laurent Destailleur 2005-07-08 20:51:19 +00:00
parent 932f695fc0
commit a1953b0f09
3 changed files with 64 additions and 63 deletions

View File

@ -1,8 +1,8 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,9 +22,10 @@
* $Source$ * $Source$
*/ */
/*! \file htdocs/admin/system/database-tables-contraintes.php /**
\brief Page d'info des contraintes de la base \file htdocs/admin/system/database-tables-contraintes.php
\version $Revision$ \brief Page d'info des contraintes de la base
\version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -34,7 +35,7 @@ $langs->load("admin");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
llxHeader(); llxHeader();
@ -44,14 +45,14 @@ print_titre($langs->trans("Constraints"));
if ($conf->db->type == 'mysql') if ($conf->db->type == 'mysql')
{ {
$sql = "SHOW TABLE STATUS"; $sql = "SHOW TABLE STATUS";
$base=1; $base=1;
} }
if ($conf->db->type == 'pgsql') if ($conf->db->type == 'pgsql')
{ {
$sql = "SELECT conname,contype FROM pg_constraint;"; $sql = "SELECT conname, contype FROM pg_constraint;";
$base=2; $base=2;
} }
print '<br>'; print '<br>';
@ -60,52 +61,48 @@ print '<tr class="liste_titre">';
if($base==1) if($base==1)
{ {
print '<td>'.$langs->trans("Tables").'</td>'; print '<td>'.$langs->trans("Tables").'</td>';
print '<td>'.$langs->trans("Type").'</td>'; print '<td>'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Constraints").'</td>'; print '<td>'.$langs->trans("Constraints").'</td>';
} }
else else
{ {
print '<td>'.$langs->trans("Constraints").'</td>'; print '<td>'.$langs->trans("Constraints").'</td>';
print '<td>'.$langs->trans("ConstraintsType").'</td>'; print '<td>'.$langs->trans("ConstraintsType").'</td>';
} }
print "</tr>\n"; print "</tr>\n";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$var=True; $var=True;
$i=0; $i=0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $obj = $db->fetch_object($rsult);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
if ($base==1) if ($base==1)
{ {
print '<td><a href="dbtable.php?table='.$row[0].'">'.$row[0].'</a></td>'; print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
} print '<td>'.$obj->Engine.'</td>';
else print '<td>'.$obj->Comment.'</td>';
{ }
print '<td>'.$row[0].'</td>'; else
} {
print '<td>'.$obj->conname.'</td>';
print '<td>'.$obj->contype.'</td>';
}
print '<td>'.$row[1].'</td>'; print '</tr>';
$i++;
if ($base==1)
{
print '<td align="left">'.$row[14].'</td>';
}
print '</tr>';
$i++;
} }
} }
print '</table>'; print '</table>';
llxFooter(); llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -1,8 +1,8 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -55,12 +55,13 @@ if($conf->db->type == 'mysql')
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("TableName").'</td>'; print '<td>'.$langs->trans("TableName").'</td>';
print '<td colspan="2">'.$langs->trans("Type").'</td>'; print '<td colspan="2">'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("TableLineFormat").'</td>'; print '<td>'.$langs->trans("Format").'</td>';
print '<td>'.$langs->trans("NbOfRecord").'</td>'; print '<td>'.$langs->trans("NbOfRecord").'</td>';
print '<td>Avg_row_length</td>'; print '<td>Avg_row_length</td>';
print '<td>Data_length</td>'; print '<td>Data_length</td>';
print '<td>Max_Data_length</td>'; print '<td>Max_Data_length</td>';
print '<td>Index_length</td>'; print '<td>Index_length</td>';
print '<td>Increment</td>';
print '<td>Last check</td>'; print '<td>Last check</td>';
print "</tr>\n"; print "</tr>\n";
@ -69,32 +70,33 @@ if($conf->db->type == 'mysql')
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows($result);
$var=True; $var=True;
$i=0; $i=0;
while ($i < $num) while ($i < $num)
{ {
$row = $db->fetch_row($i); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td>'.$row[0].'</td>'; print '<td>'.$obj->Name.'</td>';
print '<td>'.$row[1].'</td>'; print '<td>'.$obj->Engine.'</td>';
if ($row[1] == "MyISAM") if ($row[1] == "MyISAM")
{ {
print '<td><a href="database-tables.php?action=convert&amp;table='.$row[0].'">Convertir</a></td>'; print '<td><a href="database-tables.php?action=convert&amp;table='.$row[0].'">'.$langs->trans("Convert").'</a></td>';
} }
else else
{ {
print '<td>-</td>'; print '<td>&nbsp;</td>';
} }
print '<td>'.$row[2].'</td>'; print '<td>'.$obj->Row_format.'</td>';
print '<td align="right">'.$row[3].'</td>'; print '<td align="right">'.$obj->Rows.'</td>';
print '<td align="right">'.$row[4].'</td>'; print '<td align="right">'.$obj->Avg_row_length.'</td>';
print '<td align="right">'.$row[5].'</td>'; print '<td align="right">'.$obj->Data_length.'</td>';
print '<td align="right">'.$row[6].'</td>'; print '<td align="right">'.$obj->Max_data_length.'</td>';
print '<td align="right">'.$row[7].'</td>'; print '<td align="right">'.$obj->Index_length.'</td>';
print '<td align="right">'.$row[12].'</td>'; print '<td align="right">'.$obj->Auto_increment.'</td>';
print '<td align="right">'.$obj->Check_time.'</td>';
print '</tr>'; print '</tr>';
$i++; $i++;
} }
@ -140,5 +142,7 @@ if($conf->db->type == 'pgsql')
print '</table>'; print '</table>';
} }
llxFooter();
llxFooter('$Date$ - $Revision$');
?> ?>

View File

@ -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 "$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 "<br>\n"; print "<br>\n";
llxfooter(); llxfooter('$Date$ - $Revision$');
?> ?>