| ";
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 64c282165fa..45c2767a19f 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -54,11 +54,12 @@ $err=0;
$conf = new Conf();
$conf->db->type = $dolibarr_main_db_type;
$conf->db->host = $dolibarr_main_db_host;
+$conf->db->port = $dolibarr_main_db_port;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
-$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$ok = 0;
if ($db->ok == 1)
{
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 4e38e84aa3f..a206a032c1d 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -77,11 +77,12 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
$conf->db->type = $dolibarr_main_db_type;
$conf->db->host = $dolibarr_main_db_host;
+ $conf->db->port = $dolibarr_main_db_port;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
- $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+ $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$ok = 0;
// Active module user
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index e1e61e9703a..82898e4fbc3 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -192,16 +192,6 @@ while (($file = readdir($handle))!==false)
if (is_readable($dir."/".$file) && eregi('^(.*)\.lib\.php',$file,$reg))
{
$type=$reg[1];
- $modName = 'DoliDb';
-
-# print "file=$file type=$type modName=$modName \n"; - -# include_once($dir."/".$file); -# $objMod = new $modName(); -# if ($objMod) -# { - -# } // Version min de la base $versionbasemin=array(); @@ -258,6 +248,19 @@ while (($file = readdir($handle))!==false) | ||
| +trans("Port"); ?> + | ++ + | ++trans("ServerPortDescription"); ?> + | + +
trans("DatabaseName"); ?>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 1a780293819..050d2c7308e 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -163,6 +163,7 @@ function conf($dolibarr_main_document_root)
global $conf;
global $dolibarr_main_db_type;
global $dolibarr_main_db_host;
+ global $dolibarr_main_db_port;
global $dolibarr_main_db_name;
global $dolibarr_main_db_user;
global $dolibarr_main_db_pass;
@@ -173,6 +174,7 @@ function conf($dolibarr_main_document_root)
$conf=new Conf();
$conf->db->type = trim($dolibarr_main_db_type);
$conf->db->host = trim($dolibarr_main_db_host);
+ $conf->db->port = trim($dolibarr_main_db_port);
$conf->db->name = trim($dolibarr_main_db_name);
$conf->db->user = trim($dolibarr_main_db_user);
$conf->db->pass = trim($dolibarr_main_db_pass);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 8d4eb5e2893..11f341baa83 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -83,11 +83,12 @@ if (! isset($_GET["action"]) || $_GET["action"] == "upgrade")
// $conf is already instancied inside inc.php
$conf->db->type = $dolibarr_main_db_type;
$conf->db->host = $dolibarr_main_db_host;
+ $conf->db->port = $dolibarr_main_db_port;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
- $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+ $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
if ($db->connected == 1)
{
print "| ";
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 514359898b3..1e6551eb56f 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -80,6 +80,7 @@ if (isset($_POST['action']) && $_POST['action'] == 'upgrade')
// $conf is already instancied inside inc.php
$conf->db->type = $dolibarr_main_db_type;
$conf->db->host = $dolibarr_main_db_host;
+ $conf->db->port = $dolibarr_main_db_port;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 56c9310f8ff..c800f99f18d 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -37,6 +37,7 @@ DatabaseType=Database type
DriverType=Driver type
Server=Server
ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server
+ServerPortDescription=Database server port. Keep empty if unknown.
DatabaseServer=Database server
DatabaseName=Database name
Login=Login
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 09f1e4852ea..f76abd7d0a8 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -39,6 +39,7 @@ DatabaseType=Type de la base de donn
DriverType=Type du driver
Server=Serveur
ServerAddressDescription=Nom ou adresse ip du serveur de base de données, généralement 'localhost' quand le serveur est installé sur la même machine que le serveur web
+ServerPortDescription=Port du serveur. Ne rien mettre si inconnu.
DatabaseServer=Serveur de la base de données
DatabaseName=Nom de la base de données
Login=Login
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index 7ecd67799a5..9a5f925005e 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -107,10 +107,10 @@ class DoliDb
\param user Nom de l'utilisateur autorisé
\param pass Mot de passe
\param name Nom de la database
- \param newlink ???
+ \param port Port of database server
\return int 1 en cas de succès, 0 sinon
*/
- function DoliDb($type='mssql', $host, $user, $pass, $name='', $newlink=0)
+ function DoliDb($type='mssql', $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
@@ -136,7 +136,7 @@ class DoliDb
}
// Essai connexion serveur
- $this->db = $this->connect($host, $user, $pass, $name, $newlink);
+ $this->db = $this->connect($host, $user, $pass, $name, $port);
if ($this->db)
{
// Si client connecté avec charset different de celui de la base Dolibarr
@@ -196,13 +196,16 @@ class DoliDb
\param login nom de l'utilisateur autoris
\param passwd mot de passe
\param name nom de la database (ne sert pas sous mysql, sert sous pgsql)
+ \param port Port of database server
\return resource handler d'accès à la base
\seealso close
*/
- function connect($host, $login, $passwd, $name)
+ function connect($host, $login, $passwd, $name, $port=0)
{
- dolibarr_syslog("DoliDB::connect host=$host, login=$login, passwd=--hidden--, name=$name");
- $this->db = @mssql_connect($host, $login, $passwd);
+ dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
+ $newhost=$host;
+ if ($port) $newhost.=':'.$port;
+ $this->db = @mssql_connect($newhost, $login, $passwd);
//force les enregistrement en latin1 si la base est en utf8 par défaut
// Supprimé car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
// les nouvelles version de Dolibarr car forcé par l'install Dolibarr.
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 8767d2f9140..a034edfff8e 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -108,10 +108,10 @@ class DoliDb
\param user Nom de l'utilisateur autorisé
\param pass Mot de passe
\param name Nom de la database
- \param newlink ???
+ \param port Port of database server
\return int 1 en cas de succès, 0 sinon
*/
- function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0)
+ function DoliDb($type='mysql', $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
@@ -156,7 +156,7 @@ class DoliDb
}
// Essai connexion serveur
- $this->db = $this->connect($host, $user, $pass, $name, $newlink);
+ $this->db = $this->connect($host, $user, $pass, $name, $port);
if ($this->db)
{
$this->connected = 1;
@@ -223,13 +223,16 @@ class DoliDb
\param login nom de l'utilisateur autoris
\param passwd mot de passe
\param name nom de la database (ne sert pas sous mysql, sert sous pgsql)
- \return resource handler d'accès à la base
+ \param port Port of database server
+ \return resource Handler d'accès à la base
\seealso close
*/
- function connect($host, $login, $passwd, $name)
+ function connect($host, $login, $passwd, $name, $port=0)
{
- dolibarr_syslog("DoliDB::connect host=$host, login=$login, passwd=--hidden--, name=$name");
- $this->db = @mysql_connect($host, $login, $passwd);
+ dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
+ $newhost=$host;
+ if ($port) $newhost.=':'.$port;
+ $this->db = @mysql_connect($newhost, $login, $passwd);
//force les enregistrement en latin1 si la base est en utf8 par défaut
// Supprimé car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
// les nouvelles version de Dolibarr car forcé par l'install Dolibarr.
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 3931ad54673..28361e7f866 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -107,10 +107,10 @@ class DoliDb
\param user Nom de l'utilisateur autorisé
\param pass Mot de passe
\param name Nom de la database
- \param newlink ???
+ \param port Port of database server
\return int 1 en cas de succès, 0 sinon
*/
- function DoliDb($type='mysqli', $host, $user, $pass, $name='', $newlink=0)
+ function DoliDb($type='mysqli', $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
@@ -157,7 +157,7 @@ class DoliDb
}
// Essai connexion serveur
- $this->db = $this->connect($host, $user, $pass, $name, $newlink);
+ $this->db = $this->connect($host, $user, $pass, $name, $port);
if ($this->db)
{
@@ -225,13 +225,16 @@ class DoliDb
\param login nom de l'utilisateur autoris
\param passwd mot de passe
\param name nom de la database (ne sert pas sous mysql, sert sous pgsql)
+ \param port Port of database server
\return resource handler d'accès à la base
\seealso close
*/
- function connect($host, $login, $passwd, $name)
+ function connect($host, $login, $passwd, $name, $port=0)
{
- dolibarr_syslog("DoliDB::connect host=$host, login=$login, passwd=--hidden--, name=$name");
- $this->db = @mysqli_connect($host, $login, $passwd);
+ dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
+ $newhost=$host;
+ if ($port) $newhost.=':'.$port;
+ $this->db = @mysqli_connect($newhost, $login, $passwd);
//force les enregistrement en latin1 si la base est en utf8 par défaut
// Supprimé car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
// les nouvelles version de Dolibarr car forcé par l'install Dolibarr.
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 4c448f4c9d7..c8b0409284c 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -65,9 +65,10 @@ class DoliDb
\param user nom de l'utilisateur autorisé
\param pass mot de passe
\param name nom de la database
+ \param port Port of database server
\return int 1 en cas de succès, 0 sinon
*/
- function DoliDb($type='pgsql', $host, $user, $pass, $name='')
+ function DoliDb($type='pgsql', $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
@@ -110,7 +111,7 @@ class DoliDb
}
// Essai connexion serveur
- $this->db = $this->connect($host, $user, $pass, $name);
+ $this->db = $this->connect($host, $user, $pass, $name, $port);
if ($this->db)
{
@@ -173,14 +174,15 @@ class DoliDb
\param login nom de l'utilisateur autoris
\param passwd mot de passe
\param name nom de la database (ne sert pas sous mysql, sert sous pgsql)
+ \param port Port of database server
\return resource handler d'accès à la base
*/
- function connect($host, $login, $passwd, $name)
+ function connect($host, $login, $passwd, $name, $port=0)
{
if (!$name){
$name="postgres";
}
- $con_string = "host=$host dbname=$name user=$login password=$passwd";
+ $con_string = "host=$host port=$port dbname=$name user=$login password=$passwd";
$this->db = pg_connect($con_string);
if ($this->db)
{
diff --git a/htdocs/mantis/mantis.class.php b/htdocs/mantis/mantis.class.php
index 278b6f8a160..ab59913a81c 100644
--- a/htdocs/mantis/mantis.class.php
+++ b/htdocs/mantis/mantis.class.php
@@ -57,13 +57,14 @@ class Mantis {
// Défini parametres mantis (avec substitution eventuelle)
$mantistype=eregi_replace('__dolibarr_main_db_type__',$dolibarr_main_db_type,$conf->mantis->db->type);
$mantishost=eregi_replace('__dolibarr_main_db_host__',$dolibarr_main_db_host,$conf->mantis->db->host);
+ $mantisport=eregi_replace('__dolibarr_main_db_port__',$dolibarr_main_db_port,$conf->mantis->db->port);
$mantisuser=eregi_replace('__dolibarr_main_db_user__',$dolibarr_main_db_user,$conf->mantis->db->user);
$mantispass=eregi_replace('__dolibarr_main_db_pass__',$dolibarr_main_db_pass,$conf->mantis->db->pass);
$mantisname=eregi_replace('__dolibarr_main_db_name__',$dolibarr_main_db_name,$conf->mantis->db->name);
// On initie la connexion à la base mantisendar
require_once (DOL_DOCUMENT_ROOT ."/lib/databases/".$mantistype.".lib.php");
- $this->localdb = new DoliDb($mantistype,$mantishost,$mantisuser,$mantispass,$mantisname);
+ $this->localdb = new DoliDb($mantistype,$mantishost,$mantisuser,$mantispass,$mantisname,$mantisport);
}
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 7229b3ae834..37d68725cd7 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -74,14 +74,12 @@ else
}
}
-if (! isset($dolibarr_main_db_type))
-{
- $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
-}
-if (empty($dolibarr_main_data_root)) {
- // Si repertoire documents non defini, on utilise celui par defaut
- $dolibarr_main_data_root=ereg_replace("/htdocs","",$dolibarr_main_document_root);
- $dolibarr_main_data_root.="/documents";
+if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
+if (empty($dolibarr_main_data_root))
+{
+ // Si repertoire documents non defini, on utilise celui par defaut
+ $dolibarr_main_data_root=ereg_replace("/htdocs","",$dolibarr_main_document_root);
+ $dolibarr_main_data_root.="/documents";
}
define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem pages php (htdocs)
define('DOL_DATA_ROOT', $dolibarr_main_data_root); // Filesystem donnes (documents)
@@ -120,10 +118,12 @@ require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");
$conf = new Conf();
// Identifiant propres au serveur base de donnee
$conf->db->host = $dolibarr_main_db_host;
+if (empty($dolibarr_main_db_port)) $dolibarr_main_db_port=0; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
+$conf->db->port = $dolibarr_main_db_port;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
-if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
+if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
$conf->db->type = $dolibarr_main_db_type;
if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set='latin1';
$conf->db->character_set=$dolibarr_main_db_character_set;
@@ -167,11 +167,11 @@ if (! defined('NOREQUIRETRAN'))
*/
if (! defined('NOREQUIREDB'))
{
- $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+ $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
if ($db->error)
{
- dolibarr_print_error($db,"host=".$conf->db->host.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
+ dolibarr_print_error($db,"host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
exit;
}
}
diff --git a/htdocs/phenix/phenix.class.php b/htdocs/phenix/phenix.class.php
index 0cf3b66f460..0fe5d95160e 100644
--- a/htdocs/phenix/phenix.class.php
+++ b/htdocs/phenix/phenix.class.php
@@ -57,13 +57,14 @@ class Phenix {
// Défini parametres phenix (avec substitution eventuelle)
$phenixtype=eregi_replace('__dolibarr_main_db_type__',$dolibarr_main_db_type,$conf->phenix->db->type);
$phenixhost=eregi_replace('__dolibarr_main_db_host__',$dolibarr_main_db_host,$conf->phenix->db->host);
+ $phenixport=eregi_replace('__dolibarr_main_db_port__',$dolibarr_main_db_port,$conf->phenix->db->port);
$phenixuser=eregi_replace('__dolibarr_main_db_user__',$dolibarr_main_db_user,$conf->phenix->db->user);
$phenixpass=eregi_replace('__dolibarr_main_db_pass__',$dolibarr_main_db_pass,$conf->phenix->db->pass);
$phenixname=eregi_replace('__dolibarr_main_db_name__',$dolibarr_main_db_name,$conf->phenix->db->name);
// On initie la connexion à la base Phenix
require_once (DOL_DOCUMENT_ROOT ."/lib/databases/".$phenixtype.".lib.php");
- $this->localdb = new DoliDb($phenixtype,$phenixhost,$phenixuser,$phenixpass,$phenixname);
+ $this->localdb = new DoliDb($phenixtype,$phenixhost,$phenixuser,$phenixpass,$phenixname,$phenixport);
}
// TODO : Modifier la suite....
diff --git a/htdocs/public/bplc/bplc.php b/htdocs/public/bplc/bplc.php
index cda1a50ceda..8bc8cdabb67 100644
--- a/htdocs/public/bplc/bplc.php
+++ b/htdocs/public/bplc/bplc.php
@@ -31,6 +31,7 @@ require("../../don.class.php");
$conf = new Conf();
$conf->db->type = $dolibarr_main_db_type;
+$conf->db->port = $dolibarr_main_db_port;
$conf->db->host = $dolibarr_main_db_host;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
@@ -42,7 +43,7 @@ if (! $conf->db->type) { $conf->db->type = 'mysql'; }
require_once(DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
-$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$retbplc = new Retourbplc($db);
diff --git a/htdocs/public/dons/therm.php b/htdocs/public/dons/therm.php
index 58bbe52776d..94332b80804 100644
--- a/htdocs/public/dons/therm.php
+++ b/htdocs/public/dons/therm.php
@@ -62,12 +62,13 @@ if (file_exists ($thermlib))
$conf = new Conf();
$conf->db->type = $dolibarr_main_db_type;
+ $conf->db->port = $dolibarr_main_db_port;
$conf->db->host = $dolibarr_main_db_host;
$conf->db->name = $dolibarr_main_db_name;
$conf->db->user = $dolibarr_main_db_user;
$conf->db->pass = $dolibarr_main_db_pass;
- $dbt = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name);
+ $dbt = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$dontherm = new Don($dbt);
diff --git a/htdocs/telephonie/stats/ProcessGraphClients.class.php b/htdocs/telephonie/stats/ProcessGraphClients.class.php
index 79c9bbdcc3d..899f6776736 100644
--- a/htdocs/telephonie/stats/ProcessGraphClients.class.php
+++ b/htdocs/telephonie/stats/ProcessGraphClients.class.php
@@ -55,7 +55,7 @@ class ProcessGraphClients
$this->ident = $ident;
$this->cpc = $cpc;
- $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,1);
+ $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
}
function go($id=0)
diff --git a/htdocs/telephonie/stats/ProcessGraphContrats.class.php b/htdocs/telephonie/stats/ProcessGraphContrats.class.php
index 54f0a8d8b1e..8215ecc3416 100644
--- a/htdocs/telephonie/stats/ProcessGraphContrats.class.php
+++ b/htdocs/telephonie/stats/ProcessGraphContrats.class.php
@@ -42,7 +42,7 @@ class ProcessGraphContrats
$this->ident = $ident;
$this->cpc = $cpc;
- $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,1);
+ $this->db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port);
$this->messages = array();
}
diff --git a/htdocs/webcal/webcal.class.php b/htdocs/webcal/webcal.class.php
index e305a3a1b2b..5f58daade8b 100644
--- a/htdocs/webcal/webcal.class.php
+++ b/htdocs/webcal/webcal.class.php
@@ -58,13 +58,14 @@ class Webcal {
// Défini parametres webcal (avec substitution eventuelle)
$webcaltype=eregi_replace('__dolibarr_main_db_type__',$dolibarr_main_db_type,$conf->webcal->db->type);
$webcalhost=eregi_replace('__dolibarr_main_db_host__',$dolibarr_main_db_host,$conf->webcal->db->host);
+ $webcalport=eregi_replace('__dolibarr_main_db_port__',$dolibarr_main_db_port,$conf->webcal->db->port);
$webcaluser=eregi_replace('__dolibarr_main_db_user__',$dolibarr_main_db_user,$conf->webcal->db->user);
$webcalpass=eregi_replace('__dolibarr_main_db_pass__',$dolibarr_main_db_pass,$conf->webcal->db->pass);
$webcalname=eregi_replace('__dolibarr_main_db_name__',$dolibarr_main_db_name,$conf->webcal->db->name);
// On initie la connexion à la base Webcalendar
require_once (DOL_DOCUMENT_ROOT ."/lib/databases/".$webcaltype.".lib.php");
- $this->localdb = new DoliDb($webcaltype,$webcalhost,$webcaluser,$webcalpass,$webcalname);
+ $this->localdb = new DoliDb($webcaltype,$webcalhost,$webcaluser,$webcalpass,$webcalname,$webcalport);
}
| |