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

Ajout Module Document

Browse Source 
Ajout Iceweasel dans la detection du browser
This commit is contained in:
Rodolphe Quiedeville 2007-04-07 11:54:20 +00:00
parent 0ff3195d0d
commit 444840c8cf
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/master.inc.php
View File

@ -1,5 +1,5 @@
<?PHP <?PHP
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com> * Copyright (C) 2003 Xavier Dutoit <doli@sydesy.com>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
@ -27,9 +27,9 @@
*/ */
/** /**
\file htdocs/master.inc.php \file htdocs/master.inc.php
\brief Fichier de preparation de l'environnement Dolibarr \brief Fichier de preparation de l'environnement Dolibarr
\version $Revision$ \version $Revision$
*/ */
define('DOL_VERSION','2.1-beta'); define('DOL_VERSION','2.1-beta');
@ -51,15 +51,15 @@ error_reporting(E_ALL ^ E_NOTICE);
// Test si install ok // Test si install ok
if (! @include_once("conf/conf.php")) if (! @include_once("conf/conf.php"))
{ {
Header("Location: install/index.php"); Header("Location: install/index.php");
exit; exit;
} }
else else
{ {
if (! isset($dolibarr_main_db_host)) if (! isset($dolibarr_main_db_host))
{ {
Header("Location: install/index.php"); Header("Location: install/index.php");
exit; exit;
} }
} }
@ -68,9 +68,9 @@ if (! isset($dolibarr_main_db_type))
$dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql' $dolibarr_main_db_type='mysql'; // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
} }
if (! $dolibarr_main_data_root) { if (! $dolibarr_main_data_root) {
// Si repertoire documents non defini, on utilise celui par defaut // 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=ereg_replace("/htdocs","",$dolibarr_main_document_root);
$dolibarr_main_data_root.="/documents"; $dolibarr_main_data_root.="/documents";
} }
define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem pages php (htdocs) define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); // Filesystem pages php (htdocs)
define('DOL_DATA_ROOT', $dolibarr_main_data_root); // Filesystem donnes (documents) define('DOL_DATA_ROOT', $dolibarr_main_data_root); // Filesystem donnes (documents)
@ -101,7 +101,8 @@ define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
// Detection browser // Detection browser
if (isset($_SERVER["HTTP_USER_AGENT"])) if (isset($_SERVER["HTTP_USER_AGENT"]))
{ {
if (eregi('firefox',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->firefox=1; if (eregi('firefox',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->firefox=1;
if (eregi('iceweasel',$_SERVER["HTTP_USER_AGENT"])) $conf->browser->firefox=1;
} }
// Chargement des includes principaux // Chargement des includes principaux
@ -116,8 +117,8 @@ require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->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);
if (! $db->connected) { if (! $db->connected) {
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.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
exit; exit;
} }
/* /*