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

Remplacement de conf.class.php3 par conf.class.php

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-06-24 14:09:55 +00:00
parent 4a86f360df
commit 17f783bf42
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/install.php
View File

@ -50,11 +50,6 @@ if ($action == "set")
include ("conf/conf.php");
}
if (! file_exists("conf/conf.class.php3"))
{
copy("conf/conf.class.php3.sample","conf/conf.class.php3");
}
print "<tr><td>Configuration enregistrée</td><td>OK</td>";
print '<tr><td colspan="2">Test des répertoires</td></tr>';
@ -107,7 +102,7 @@ if ($action == "set")
print '<tr><td colspan="2">test de connexion à la base de données</td></tr>';
require ($dolibarr_main_document_root . "/lib/mysql.lib.php3");
require ($dolibarr_main_document_root . "/conf/conf.class.php3");
require ($dolibarr_main_document_root . "/conf/conf.class.php");
$conf = new Conf();
$conf->db->host = $dolibarr_main_db_host;
$conf->db->name = $dolibarr_main_db_name;

5
htdocs/main.inc.php3
View File

@ -45,7 +45,7 @@ if ($pos == '/')
define('DOL_URL_ROOT', $pos);
//define('DOL_URL_ROOT', $dolibarr_main_url_root);
require (DOL_DOCUMENT_ROOT."/conf/conf.class.php3");
require (DOL_DOCUMENT_ROOT."/conf/conf.class.php");
/*
* Doit figurer aprés l'inclusion de conf.class.php3 pour overider certaines variables, à terme conf.class.php3 devra etre un fichier qui ne sera pas modifié par l'utilisateur
*/
@ -75,7 +75,8 @@ $user = new User($db);
$user->fetch($GLOBALS["REMOTE_USER"]);
if ($user->limite_liste <> $conf->liste_limit) {
if ($user->limite_liste <> $conf->liste_limit)
{
$conf->liste_limit = $user->limite_liste;
}
/*