From d8bd1006ebff5da2915ecade103725077fe37b3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 26 Oct 2009 01:41:47 +0000
Subject: [PATCH] Qual: Better support for other databases
---
htdocs/admin/system/database-tables.php | 17 ++++++++---------
htdocs/admin/system/database.php | 2 +-
htdocs/langs/en_US/admin.lang | 1 +
htdocs/langs/fr_FR/admin.lang | 1 +
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index dfa5f8df46f..bc589677e81 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -20,9 +20,9 @@
*/
/**
- \file htdocs/admin/system/database-tables.php
- \brief Page d'infos des tables de la base
- \version $Id$
+ * \file htdocs/admin/system/database-tables.php
+ * \brief Page d'infos des tables de la base
+ * \version $Id$
*/
require("./pre.inc.php");
@@ -134,15 +134,14 @@ else
if ($base == 2)
{
- print '<br>';
print '<table class="noborder">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("TableName").'</td>';
- print '<td>Nombre de tuples lu</td>';
+ print '<td>Nb of tuples</td>';
print '<td>Nb index fetcher.</td>';
- print '<td>Nbre de tuples inserer</td>';
- print '<td>Nbre de tuple modifier</td>';
- print '<td>Nbre de tuple supprimer</td>';
+ print '<td>Nb tuples insert</td>';
+ print '<td>Nb tuples modify</td>';
+ print '<td>Nb tuples delete</td>';
print "</tr>\n";
$sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;";
@@ -157,7 +156,7 @@ else
$row = $db->fetch_row($resql);
$var=!$var;
print "<tr $bc[$var]>";
- print '<td align="right">'.$row[0].'</td>';
+ print '<td>'.$row[0].'</td>';
print '<td align="right">'.$row[1].'</td>';
print '<td align="right">'.$row[2].'</td>';
print '<td align="right">'.$row[3].'</td>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index dbd68c399bb..066aecdfc83 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -48,7 +48,7 @@ print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup');
// Database
print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td colspan=\"2\">".$langs->trans("Database")."</td></tr>\n";
-print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" . $db->getVersion() . "</td></tr>\n";
+print "<tr $bc[0]><td width=\"280\">".$langs->trans("Version")."</td><td>" . $db->getLabel()." ".$db->getVersion() . "</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("DatabaseServer")."</td><td>" . $conf->db->host . "</td></tr>\n";
print "<tr $bc[0]><td>".$langs->trans("DatabasePort")."</td><td>" . $conf->db->port . "</td></tr>\n";
print "<tr $bc[1]><td>".$langs->trans("DatabaseName")."</td><td>" . $conf->db->name . "</td></tr>\n";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a76735adc72..bb009eb4e26 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -605,6 +605,7 @@ PhpWebLink=Web-Php link
Pear=Pear
PearPackages=Pear Packages
Database=Database
+DatabaseServer=Database host
DatabaseName=Database name
DatabasePort=Database port
DatabaseConfiguration=Database setup
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 39aab1be46a..cd3a04796a7 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -605,6 +605,7 @@ PhpWebLink = Lien Web-Php
Pear = Pear
PearPackages = Packages Pear
Database = Base de données
+DatabaseServer=Host de la base de données
DatabaseName = Nom de la base de données
DatabasePort = Port de la base de données
DatabaseConfiguration = Configuration de la base de données
--
GitLab