diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 907dd7cf093..4301dfc5f57 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -84,7 +84,7 @@ print "
\n"; // Database print ''; print "\n"; -$dblabel=$db->label; +$dblabel=$db->getLabel(); $dbversion=$db->getVersion(); print "\n"; print '
".$langs->trans("Database")."
".$langs->trans("Version")."" .$dblabel." ".$dbversion."
'; diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index 519152f4185..5b57f6a6e91 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -199,8 +199,17 @@ class DoliDb } /** - \brief Renvoie la version du serveur - \return string Chaine version + * \brief Return label of manager + * \return string Label + */ + function getLabel() + { + return $this->label; + } + + /** + * \brief Renvoie la version du serveur + * \return string Chaine version */ function getVersion() { @@ -211,8 +220,8 @@ class DoliDb /** - \brief Renvoie la version du serveur dans un tableau - \return array Tableau de chaque niveau de version + * \brief Renvoie la version du serveur dans un tableau + * \return array Tableau de chaque niveau de version */ function getVersionArray() { diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index f0cb2daabef..9d0432980cc 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -228,17 +228,26 @@ class DoliDb } /** - \brief Renvoie la version du serveur - \return string Chaine version - */ + * \brief Return label of manager + * \return string Label + */ + function getLabel() + { + return $this->label; + } + + /** + * \brief Renvoie la version du serveur + * \return string Chaine version + */ function getVersion() { return mysql_get_server_info($this->db); } /** - \brief Renvoie la version du serveur sous forme de nombre - \return string Chaine version + * \brief Renvoie la version du serveur sous forme de nombre + * \return string Chaine version */ function getIntVersion() { diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 25e2e85c414..fb229793666 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -232,6 +232,15 @@ class DoliDb return $this->db; } + /** + * \brief Return label of manager + * \return string Label + */ + function getLabel() + { + return $this->label; + } + /** * \brief Renvoie la version du serveur * \return string Chaine version diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 507bae6dcc3..9c5e257e857 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -305,6 +305,15 @@ class DoliDb return $this->db; } + /** + * \brief Return label of manager + * \return string Label + */ + function getLabel() + { + return $this->label; + } + /** * \brief Renvoie la version du serveur * \return string Chaine version