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

New: Possibilit de dfinir $dolibarr_main_db_prefix dans le fichier de config

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-22 14:00:01 +00:00
parent 3607852e56
commit d7fe38fca6
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/main.inc.php
View File

@ -110,8 +110,18 @@ else
}
}
// Si user admin, on force droits sur les modules base
if ($user->admin)
{
$user->rights->user->user->lire=1;
$user->rights->user->user->creer=1;
$user->rights->user->user->password=1;
$user->rights->user->user->supprimer=1;
$user->rights->user->self->creer=1;
$user->rights->user->self->password=1;
}
/*
/**
* Overwrite configs global par configs perso
* ------------------------------------------
*/

21
htdocs/master.inc.php
View File

@ -93,16 +93,17 @@ define('DOL_URL_ROOT', $pos);
*/
require_once(DOL_DOCUMENT_ROOT."/conf/conf.class.php");
$conf = new Conf();
if (!strlen(getenv("LLX_DBNAME")))
{
$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;
$conf->db->type = $dolibarr_main_db_type;
}
if (! $conf->db->type) { $conf->db->type = 'mysql'; } // Pour compatibilit? avec anciennes configs, si non d?fini, on prend 'mysql'
define('MAIN_DB_PREFIX','llx_'); // A terme cette constante sera d?finie dans $conf
$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;
$conf->db->type = $dolibarr_main_db_type;
if (! $conf->db->type) { $conf->db->type = 'mysql'; } // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
// Defini prefix
if (isset($_SERVER["LLX_DBNAME"])) $dolibarr_main_db_prefix=$_SERVER["LLX_DBNAME"];
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
$conf->db->prefix = $dolibarr_main_db_prefix;
define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
/*
* Chargement des includes principaux