lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Minor change to allow a new windows .exe setup wizard

Browse Source
This commit is contained in:
Laurent Destailleur 2008-03-17 01:10:31 +00:00
parent 60bd7f00ca
commit 26fa853d41
9 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/exe/doliwamp/doliwamp2.4.iss
View File

@ -400,6 +400,7 @@ if not FileExists (destFile) then
begin
LoadStringFromFile (srcFile, srcContents);
StringChange (srcContents, 'WAMPROOT', pathWithSlashes);
StringChange (srcContents, 'WAMPMYSQLPORT', mysqlPort);
StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', newPassword);

1
build/exe/doliwamp/install.forced.php.install
View File

@ -1,4 +1,5 @@
<?php
$force_install_main_data_root='WAMPROOT/dolibarr_documents';
$force_install_type='mysqli';
$force_install_port='WAMPMYSQLPORT';
$force_install_database='dolibarr';

1
htdocs/install/etape0.php
View File

@ -130,6 +130,7 @@ if (! $error)
$databasefortest='mssql';
}
}
//print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"];
$db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]);
dolibarr_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG);

4
htdocs/install/etape1.php
View File

@ -276,7 +276,7 @@ if ($_POST["action"] == "set")
{
dolibarr_install_syslog("etape1: Creation de l'utilisateur: ".$dolibarr_main_db_user);
//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass;
//print $conf->db->host." , ".$conf->db->name." , ".$conf->db->user." , ".$conf->db->pass." , ".$conf->db->port;
$databasefortest=$conf->db->name;
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
@ -430,7 +430,7 @@ if ($_POST["action"] == "set")
dolibarr_install_syslog("etape1: connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name);
//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
$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)
{

15
htdocs/install/fileconf.php
View File

@ -109,11 +109,18 @@ print $langs->trans("Examples").":<br>";
<?php print $langs->trans("DocumentsDirectory"); ?>
</b></td>
<?php
if(! isset($dolibarr_main_data_root) || strlen($dolibarr_main_data_root) == 0)
if (empty($dolibarr_main_data_root))
{
// Si le r<>pertoire documents non d<>fini, on en propose un par d<>faut
$dolibarr_main_data_root=ereg_replace("/htdocs$","",$dolibarr_main_document_root);
$dolibarr_main_data_root.="/documents";
// Si le repertoire documents non defini, on en propose un par defaut
if (empty($force_install_main_data_root))
{
$dolibarr_main_data_root=ereg_replace("/htdocs$","",$dolibarr_main_document_root);
$dolibarr_main_data_root.="/documents";
}
else
{
$dolibarr_main_data_root=$force_install_main_data_root;
}
}
?>
<td class="label" valign="top"><input type="text" size="60" value="<?php print $dolibarr_main_data_root; ?>" name="main_data_dir">

9
htdocs/lib/databases/mssql.lib.php
View File

@ -122,7 +122,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
dolibarr_syslog("DoliDB::DoliDB : MSsql PHP functions for using MSsql driver are not available in this version of PHP");
dolibarr_syslog("DoliDB::DoliDB : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
return $this->ok;
}
@ -131,7 +131,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error=$langs->trans("ErrorWrongHostParameter");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters",LOG_ERR);
return $this->ok;
}
@ -149,7 +149,8 @@ class DoliDb
// host, login ou password incorrect
$this->connected = 0;
$this->ok = 0;
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mssql_get_last_message=".mssql_get_last_message());
$this->error=mssql_get_last_message();
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
}
// Si connexion serveur ok et si connexion base demandée, on essaie connexion base
@ -167,7 +168,7 @@ class DoliDb
$this->database_name = '';
$this->ok = 0;
$this->error=$this->error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db");
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db ".$this->error,LOG_ERR);
}
}
else

13
htdocs/lib/databases/mysql.lib.php
View File

@ -142,7 +142,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error="Mysql PHP functions for using MySql driver are not available in this version of PHP";
dolibarr_syslog("DoliDB::DoliDB : Mysql PHP functions for using Mysql driver are not available in this version of PHP");
dolibarr_syslog("DoliDB::DoliDB : Mysql PHP functions for using Mysql driver are not available in this version of PHP",LOG_ERR);
return $this->ok;
}
@ -151,7 +151,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error=$langs->trans("ErrorWrongHostParameter");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters",LOG_ERR);
return $this->ok;
}
@ -168,7 +168,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error=mysql_error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mysql_error=".mysql_error());
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mysql_error=".$this->error,LOG_ERR);
}
// Si connexion serveur ok et si connexion base demandée, on essaie connexion base
@ -194,7 +194,7 @@ class DoliDb
$this->database_name = '';
$this->ok = 0;
$this->error=$this->error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db");
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db ".$this->error,LOG_ERR);
}
}
else
@ -220,7 +220,7 @@ class DoliDb
/**
\brief Connection vers le serveur
\param host addresse de la base de données
\param login nom de l'utilisateur autoris
\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
@ -230,8 +230,11 @@ class DoliDb
function connect($host, $login, $passwd, $name, $port=0)
{
dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
// With mysql, port must be in hostname
$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

21
htdocs/lib/databases/mysqli.lib.php
View File

@ -143,7 +143,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error="Mysqli PHP functions are not available in this version of PHP. Try to use another driver.";
dolibarr_syslog("DoliDB::DoliDB : Mysql PHP functions are not available in this version of PHP. Try to use another driver.");
dolibarr_syslog("DoliDB::DoliDB : Mysql PHP functions are not available in this version of PHP. Try to use another driver.",LOG_ERR);
return $this->ok;
}
@ -152,12 +152,12 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error=$langs->trans("ErrorWrongHostParameter");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters",LOG_ERR);
return $this->ok;
}
// Essai connexion serveur
$this->db = $this->connect($host, $user, $pass, $name, $port);
$this->db = $this->connect($host, $user, $pass, '', $port);
if ($this->db)
{
@ -169,8 +169,8 @@ class DoliDb
// host, login ou password incorrect
$this->connected = 0;
$this->ok = 0;
$this->error=mysql_error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mysql_error=".mysql_error());
$this->error=mysqli_connect_error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect mysqli_connect_error=".$this->error,LOG_ERR);
}
// Si connexion serveur ok et si connexion base demandée, on essaie connexion base
@ -222,7 +222,7 @@ class DoliDb
/**
\brief Connection vers le serveur
\param host addresse de la base de données
\param login nom de l'utilisateur autoris
\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
@ -232,9 +232,12 @@ class DoliDb
function connect($host, $login, $passwd, $name, $port=0)
{
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);
// With mysqli, port must be in connect parameters
$newport=$port;
if (! $newport) $newport=3306;
$this->db = @mysqli_connect($newhost, $login, $passwd, $name, $newport);
//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.

9
htdocs/lib/databases/pgsql.lib.php
View File

@ -97,7 +97,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error="Pgsql PHP functions are not available in this version of PHP";
dolibarr_syslog("DoliDB::DoliDB : Pgsql PHP functions are not available in this version of PHP");
dolibarr_syslog("DoliDB::DoliDB : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
return $this->ok;
}
@ -106,7 +106,7 @@ class DoliDb
$this->connected = 0;
$this->ok = 0;
$this->error=$langs->trans("ErrorWrongHostParameter");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters");
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect, wrong host parameters",LOG_ERR);
return $this->ok;
}
@ -123,7 +123,8 @@ class DoliDb
// host, login ou password incorrect
$this->connected = 0;
$this->ok = 0;
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect");
$this->error='Host, login or password incorrect';
dolibarr_syslog("DoliDB::DoliDB : Erreur Connect ".$this->error,LOG_ERR);
}
// Si connexion serveur ok et si connexion base demandée, on essaie connexion base
@ -141,7 +142,7 @@ class DoliDb
$this->database_name = '';
$this->ok = 0;
$this->error=$this->error();
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db");
dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db ".$this->error,LOG_ERR);
}
}
else