diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f191d88c7f9..5dcf81d3a85 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.122 2011/07/30 10:23:26 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.122 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -263,6 +263,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`; $ret=`rm -f $BUILDROOT/$PROJECT/build/dolibarr-*.zip`; $ret=`rm -f $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; @@ -291,11 +292,6 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`; $ret=`rm -fr $BUILDROOT/$PROJECT/documents`; $ret=`rm -fr $BUILDROOT/$PROJECT/document`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`; @@ -306,6 +302,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php index a505843fcd8..a07b28bd2cf 100644 --- a/htdocs/admin/system/constall.php +++ b/htdocs/admin/system/constall.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ /** * \file htdocs/admin/system/constall.php * \brief Page to show all Dolibarr setup (config file and database constants) - * \version $Id$ + * \version $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $ */ require("../../main.inc.php"); @@ -44,7 +44,7 @@ llxHeader(); print_fiche_titre($langs->trans("SummaryConst"),'','setup'); -print_titre($langs->trans("ConfigurationFile")); +print_titre($langs->trans("ConfigurationFile").' ('.$conffiletoshowshort.')'); // Parameters in conf.php file $configfileparameters=array( // 'separator', @@ -112,7 +112,7 @@ $i=0; foreach($configfileparameters as $key) { $ignore=0; - + if ($key == 'dolibarr_main_url_root_alt' && empty(${$key})) $ignore=1; if ($key == 'dolibarr_main_document_root_alt' && empty(${$key})) $ignore=1; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index bd15e21b0ab..e6559c2ae2e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -23,9 +23,9 @@ /** * \file htdocs/core/class/conf.class.php * \ingroup core - * \brief Fichier de la classe de stockage de la config courante - * \remarks La config est stockee dans le fichier conf/conf.php - * \version $Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $ + * \brief File of class to manage storage of current setup + * Config is stored into file conf.php + * \version $Id: conf.class.php,v 1.62 2011/07/30 10:23:26 eldy Exp $ */ diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index c7e0858fe09..13a97bf54b3 100755 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -28,7 +28,7 @@ * \file htdocs/filefunc.inc.php * \ingroup core * \brief File that include conf.php file and functions.lib.php - * \version $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $ + * \version $Id: filefunc.inc.php,v 1.20 2011/07/30 10:23:24 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z) @@ -61,8 +61,17 @@ error_reporting(E_ALL ^ E_NOTICE); //error_reporting(E_ALL); +$conffiletoshowshort = "conf.php"; +# Define localization of conf file +$conffile = "conf/conf.php"; +$conffiletoshow = "htdocs/conf/conf.php"; +# For debian like systems +#$conffile = "/etc/dolibarr/conf.php"; +#$conffiletoshow = "/etc/dolibarr/conf.php"; + + // Include configuration -$result=@include_once("conf/conf.php"); +$result=@include_once($conffile); if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { header("Location: install/index.php"); diff --git a/htdocs/index.php b/htdocs/index.php index 5d371704e6b..5998094d362 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -21,7 +21,7 @@ /** * \file htdocs/index.php * \brief Dolibarr home page - * \version $Id: index.php,v 1.198 2011/07/08 15:35:08 eldy Exp $ + * \version $Id: index.php,v 1.199 2011/07/30 10:23:24 eldy Exp $ */ define('NOCSRFCHECK',1); // This is login page. We must be able to go on it from another web site. @@ -555,7 +555,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) } // Conf files must be in read only mode - if (is_writable(DOL_DOCUMENT_ROOT.'/conf/conf.php')) + if (is_writable($conffile)) { $langs->load("errors"); $langs->load("other"); @@ -574,7 +574,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) $db->close(); -llxFooter('$Date: 2011/07/08 15:35:08 $ - $Revision: 1.198 $'); +llxFooter('$Date: 2011/07/30 10:23:24 $ - $Revision: 1.199 $'); /** diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9de8cdf662d..374ebd4ebbf 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -23,7 +23,7 @@ * \file htdocs/install/check.php * \ingroup install * \brief Test if file conf can be modified and if does not exists, test if install process can create it - * \version $Id: check.php,v 1.84 2011/07/12 20:52:41 eldy Exp $ + * \version $Id: check.php,v 1.85 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -214,10 +214,9 @@ else // Si fichier absent et n'a pu etre cree if (! file_exists($conffile)) { - //print 'Error '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffile); - print 'Error '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",'conf.php'); + print 'Error '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffiletoshow); print "

"; - print $langs->trans("YouMustCreateWithPermission",'htdocs/conf/conf.php'); + print $langs->trans("YouMustCreateWithPermission",$conffiletoshow); print "

"; print $langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok'); @@ -230,14 +229,14 @@ else { if ($confexists) { - print 'Ok '.$langs->trans("ConfFileExists",'conf.php'); + print 'Ok '.$langs->trans("ConfFileExists",$conffiletoshow); } else { - print 'Ok '.$langs->trans("ConfFileCouldBeCreated",'conf.php'); + print 'Ok '.$langs->trans("ConfFileCouldBeCreated",$conffiletoshow); } print "
"; - print 'Warning '.$langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print 'Warning '.$langs->trans("ConfFileIsNotWritable",$conffiletoshow); print "
\n"; $allowinstall=0; @@ -247,14 +246,14 @@ else { if ($confexists) { - print 'Ok '.$langs->trans("ConfFileExists",'conf.php'); + print 'Ok '.$langs->trans("ConfFileExists",$conffiletoshow); } else { - print 'Ok '.$langs->trans("ConfFileCouldBeCreated",'conf.php'); + print 'Ok '.$langs->trans("ConfFileCouldBeCreated",$conffiletoshow); } print "
"; - print 'Ok '.$langs->trans("ConfFileIsWritable",'conf.php'); + print 'Ok '.$langs->trans("ConfFileIsWritable",$conffiletoshow); print "
\n"; $allowinstall=1; @@ -274,8 +273,8 @@ else { if (! file_exists($dolibarr_main_document_root."/lib/admin.lib.php")) { - print 'A conf.php file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the conf.php file.
'."\n"; - dol_syslog("A conf.php file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the conf.php file.", LOG_WARNING); + print 'A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to '.$dolibarr_main_document_root.' that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.
'."\n"; + dol_syslog("A '.$conffiletoshow.' file exists with a dolibarr_main_document_root to ".$dolibarr_main_document_root." that seems wrong. Try to fix or remove the '.$conffiletoshow.' file.", LOG_WARNING); } else { diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index 9988ca42ab2..f11fdb322b7 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -22,7 +22,7 @@ * \file htdocs/install/etape0.php * \ingroup install * \brief Show and ask charset for database - * \version $Id$ + * \version $Id: etape0.php,v 1.40 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -63,7 +63,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape1"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index fcde2204145..d430b8731df 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape1.php * \ingroup install * \brief Build conf file on disk - * \version $Id$ + * \version $Id: etape1.php,v 1.134 2011/07/30 10:23:25 eldy Exp $ */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php @@ -53,7 +53,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape2"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -542,7 +542,7 @@ function write_conf_file($conffile) fputs($fp,"# File generated by Dolibarr installer ".DOL_VERSION." on ".dol_print_date(dol_now(),'')); fputs($fp,"\n"); fputs($fp,"#\n"); - fputs($fp,"# Take a look at conf.php.example file for an example of conf.php file\n"); + fputs($fp,"# Take a look at conf.php.example file for an example of ".$conffiletoshowshort." file\n"); fputs($fp,"# and explanations for all possibles parameters.\n"); fputs($fp,"#\n"); diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index c7db541859f..e29a0b49221 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -21,7 +21,7 @@ * \file htdocs/install/etape2.php * \ingroup install * \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data - * \version $Id$ + * \version $Id: etape2.php,v 1.104 2011/07/30 10:23:25 eldy Exp $ */ include("./inc.php"); @@ -68,7 +68,7 @@ pHeader($langs->trans("CreateDatabaseObjects"),"etape4"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index 0ca30ba2bfc..80a2cf5f51d 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -23,7 +23,7 @@ * \file htdocs/install/etape4.php * \ingroup install * \brief Ask login and password of Dolibarr admin user - * \version $Id$ + * \version $Id: etape4.php,v 1.36 2011/07/30 10:23:25 eldy Exp $ */ @@ -59,7 +59,7 @@ pHeader($langs->trans("AdminAccountCreation"),"etape5"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 3c8d66f9472..af4df81ae1a 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.102 2011/07/17 18:13:44 eldy Exp $ + * \version $Id: etape5.php,v 1.103 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -109,7 +109,7 @@ pHeader($langs->trans("SetupEnd"),"etape5"); // Test if we can run a first install process if (! GETPOST("versionfrom") && ! GETPOST("versionto") && ! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -380,7 +380,7 @@ elseif (preg_match('/upgrade/i',$action)) } if (empty($createlock)) { - print '
'.$langs->trans("WarningRemoveInstallDir")."
"; + print '
'.$langs->trans("WarningRemoveInstallDir")."
"; } print "
"; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 204960aa824..6448a678189 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -25,7 +25,7 @@ * \file htdocs/install/fileconf.php * \ingroup install * \brief Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page) - * \version $Id: fileconf.php,v 1.91 2011/06/26 01:52:59 eldy Exp $ + * \version $Id: fileconf.php,v 1.92 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -69,7 +69,7 @@ pHeader($langs->trans("ConfigurationFile"),"etape0"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } @@ -195,10 +195,10 @@ if (empty($dolibarr_main_url_root)) $dolibarr_main_url_root=$proto."://".$serverport.$_SERVER["SCRIPT_NAME"]; } # Clean proposed URL - $dolibarr_main_url_root = preg_replace('/\/fileconf\.php$/','',$dolibarr_main_url_root); # Supprime le /fileconf.php - $dolibarr_main_url_root = preg_replace('/\/$/','',$dolibarr_main_url_root); # Supprime le / - $dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root); # Supprime le /index.php - $dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root); # Supprime le /install + $dolibarr_main_url_root = preg_replace('/\/fileconf\.php$/','',$dolibarr_main_url_root); # Remove the /fileconf.php + $dolibarr_main_url_root = preg_replace('/\/$/','',$dolibarr_main_url_root); # Remove the / + $dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root); # Remove the /index.php + $dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root); # Remove the /install } ?> diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index bb49200a208..3050d37833c 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -22,7 +22,7 @@ /** \file htdocs/install/inc.php * \ingroup core * \brief File that define environment for install pages - * \version $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $ + * \version $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $ */ define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z) @@ -69,7 +69,16 @@ else } $includeconferror=''; + + +$conffiletoshowshort = "conf.php"; +# Define localization of conf file $conffile = "../conf/conf.php"; +$conffiletoshow = "htdocs/conf/conf.php"; +# For debian like systems +#$conffile = "/etc/dolibarr/conf.php"; +#$conffiletoshow = "/etc/dolibarr/conf.php"; + if (! defined('DONOTLOADCONF') && file_exists($conffile)) { diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php index 62a8c7653a3..97810705926 100644 --- a/htdocs/install/licence.php +++ b/htdocs/install/licence.php @@ -21,7 +21,7 @@ * \file htdocs/install/licence.php * \ingroup install * \brief Page to show licence (Removed from install process to save time) - * \version $Id$ + * \version $Id: licence.php,v 1.19 2011/07/30 10:23:25 eldy Exp $ */ include_once("./inc.php"); @@ -47,7 +47,7 @@ pHeader($langs->trans("License"),"fileconf"); // Test if we can run a first install process if (! is_writable($conffile)) { - print $langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); + print $langs->trans("ConfFileIsNotWritable",$conffiletoshow); pFooter(1,$setuplang,'jscheckparam'); exit; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0a44842296f..49b67f9349a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -26,7 +26,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.754 2011/07/12 20:16:03 eldy Exp $ + * \version $Id: main.inc.php,v 1.755 2011/07/30 10:23:24 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -299,31 +299,6 @@ if (! empty($_SESSION["disablemodules"])) } } -// Init Smarty (used by some modules like multicompany) -if (sizeof($conf->need_smarty) > 0) -{ - // Usage of const in conf.php file (deprecated) can overwrite default dir. - $dolibarr_smarty_libs_dir=DOL_DOCUMENT_ROOT.'/includes/smarty/libs/'; - $dolibarr_smarty_compile=DOL_DATA_ROOT.'/smarty/templates/temp'; - $dolibarr_smarty_cache=DOL_DATA_ROOT.'/smarty/cache/temp'; - - // Create directory if not exist - if (! is_dir($dolibarr_smarty_compile)) create_exdir($dolibarr_smarty_compile); - if (! is_dir($dolibarr_smarty_cache)) create_exdir($dolibarr_smarty_cache); - - $smarty_libs = $dolibarr_smarty_libs_dir. "Smarty.class.php"; - if (@include_once($smarty_libs)) - { - $smarty = new Smarty(); - $smarty->compile_dir = $dolibarr_smarty_compile; - $smarty->cache_dir = $dolibarr_smarty_cache; - } - else - { - dol_print_error('',"Library Smarty ".$smarty_libs." not found."); - } -} - /* * Phase authentication / login diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 2c622c94511..03ef2767e40 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -29,8 +29,8 @@ * \file htdocs/master.inc.php * \ingroup core * \brief File that defines environment for all Dolibarr process (pages or scripts) - * This script reads the conf.php file, init $lang, $db and empty $user - * \version $Id: master.inc.php,v 1.349 2011/06/28 15:06:26 hregis Exp $ + * This script reads the conf file, init $lang, $db and and empty $user + * \version $Id: master.inc.php,v 1.350 2011/07/30 10:23:24 eldy Exp $ */ @@ -65,7 +65,7 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE' $conf->file->main_authentication = empty($dolibarr_main_authentication)?'':$dolibarr_main_authentication; // Force https $conf->file->main_force_https = empty($dolibarr_main_force_https)?'':$dolibarr_main_force_https; -// Define charset for HTML Output (can set hidden value force_charset in conf.php file) +// Define charset for HTML Output (can set hidden value force_charset in conf file) $conf->file->character_set_client=strtoupper($force_charset_do_notuse); // Cookie cryptkey $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;