diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 3a57f914dfe..7ba1ec65aec 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2004 Sebastien Di Cintio * @@ -20,11 +20,11 @@ */ /** - \file htdocs/install/etape1.php - \ingroup install - \brief Build conf file - \version $Id$ -*/ + * \file htdocs/install/etape1.php + * \ingroup install + * \brief Build conf file on disk + * \version $Id$ + */ define('DONOTLOADCONF',1); // To avoid loading conf by file inc..php @@ -420,7 +420,7 @@ if ($_POST["action"] == "set") print $langs->trans("OK"); print ""; - dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", bu user : ".$conf->db->user." has failed", LOG_ERR); + dolibarr_install_syslog("etape1: connexion to database ".$conf->db->name.", by user : ".$conf->db->user." has failed", LOG_ERR); print ""; print $langs->trans("DatabaseConnection")." : "; print $dolibarr_main_db_name; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e1cbd886f2d..44974268072 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -155,7 +155,7 @@ if (! defined('SYSLOG_FILE')) // To avoid warning on systems with constant alrea if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log'); else if (! empty($_ENV["TMP"]) && @is_writable($_ENV["TMP"])) define('SYSLOG_FILE',$_ENV["TMP"].'/dolibarr_install.log'); else if (! empty($_ENV["TEMP"]) && @is_writable($_ENV["TEMP"])) define('SYSLOG_FILE',$_ENV["TEMP"].'/dolibarr_install.log'); - else if (@is_writable('../../../../')) define('SYSLOG_FILE','../../../../dolibarr_install.log'); // For DoliWamp + else if (@is_writable('../../../../') && @file_exists('../../../../startdoliwamp.bat')) define('SYSLOG_FILE','../../../../dolibarr_install.log'); // For DoliWamp else if (@is_writable('../../')) define('SYSLOG_FILE','../../dolibarr_install.log'); // For others //print 'SYSLOG_FILE='.SYSLOG_FILE;exit; } diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 5cd12c3fb2b..5bb9a0d77b6 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -255,6 +255,7 @@ function dol_syslog($message, $level=LOG_INFO) { $filelog=SYSLOG_FILE; $filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog); + //print $filelog; if (defined("SYSLOG_FILE_NO_ERROR")) $file=@fopen($filelog,"a+"); else $file=fopen($filelog,"a+");