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

Fix: The install log file was not in correct directory

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-04 22:55:39 +00:00
parent a5513d165e
commit 43a960a322
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/check.php
View File

@ -292,7 +292,7 @@ else
$conf->setValues($db); $conf->setValues($db);
// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE // Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
// Version to install is DOL_VERSION // Version to install is DOL_VERSION
$dolibarrlastupgradeversionarray=preg_split('/[\.-]/',isset($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_UPGRADE:$conf->global->MAIN_VERSION_LAST_INSTALL); $dolibarrlastupgradeversionarray=preg_split('/[\.-]/',isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL)?$conf->global->MAIN_VERSION_LAST_INSTALL:''));
$dolibarrversiontoinstallarray=versiondolibarrarray(); $dolibarrversiontoinstallarray=versiondolibarrarray();
} }

20
htdocs/install/etape2.php
View File

@ -176,9 +176,11 @@ if ($_POST["action"] == "set")
} }
dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) $resql=$db->query($buffer);
if ($resql)
{ {
// print "<td>OK requete ==== $buffer</td></tr>"; // print "<td>OK requete ==== $buffer</td></tr>";
$db->free($resql);
} }
else else
{ {
@ -312,9 +314,11 @@ if ($_POST["action"] == "set")
} }
dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) $resql=$db->query($buffer);
if ($resql)
{ {
//print "<td>OK requete ==== $buffer</td></tr>"; //print "<td>OK requete ==== $buffer</td></tr>";
$db->free($resql);
} }
else else
{ {
@ -399,9 +403,11 @@ if ($_POST["action"] == "set")
if ($buffer) if ($buffer)
{ {
dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) $resql=$db->query($buffer);
if ($resql)
{ {
$ok = 1; $ok = 1;
$db->free($resql);
} }
else else
{ {
@ -435,7 +441,7 @@ if ($_POST["action"] == "set")
/*************************************************************************************** /***************************************************************************************
* *
* Chargement fichier data.sql * Load files data/*.sql
* *
***************************************************************************************/ ***************************************************************************************/
if ($ok && $createdata) if ($ok && $createdata)
@ -479,13 +485,15 @@ if ($_POST["action"] == "set")
} }
//dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG); //dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
if ($db->query($buffer)) $resql=$db->query($buffer);
if ($resql)
{ {
$ok = 1; $ok = 1;
$db->free($resql);
} }
else else
{ {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
//print "<tr><td>Insertion ligne : $buffer</td><td>"; //print "<tr><td>Insertion ligne : $buffer</td><td>";
} }

3
htdocs/install/inc.php
View File

@ -66,7 +66,6 @@ else
define('LOG_DEBUG',7); define('LOG_DEBUG',7);
} }
$includeconferror=''; $includeconferror='';
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
@ -240,7 +239,7 @@ function conf($dolibarr_main_document_root)
if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log'); 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["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 (! 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 else if (@is_writable('../../')) define('SYSLOG_FILE','../../dolibarr_install.log'); // For others
//print 'SYSLOG_FILE='.SYSLOG_FILE;exit; //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
} }