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

Fix: Pb affichage log install

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-09 23:28:27 +00:00
parent b1c721ca4e
commit d74fc064b2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/install/etape5.php
View File

@ -38,7 +38,7 @@ $langs->load("install");
$success=0; $success=0;
dolibarr_install_syslog("etape5: Entering etape5.php page"); dolibarr_install_syslog("etape5: Entering etape5.php page", LOG_INFO);
if ($_POST["action"] == "set" || $_POST["action"] == "upgrade") if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
@ -65,11 +65,6 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
} }
} }
// If upgrade
if ($_POST["action"] == "upgrade")
{
}
pHeader($langs->trans("SetupEnd"),"etape5"); pHeader($langs->trans("SetupEnd"),"etape5");
@ -92,7 +87,8 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
// Active module user // Active module user
$modName='modUser'; $modName='modUser';
$file = $modName . ".class.php"; $file = $modName . ".class.php";
include_once("../includes/modules/$file"); dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/includes/modules/".$file, LOG_INFO);
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/".$file);
$objMod = new $modName($db); $objMod = new $modName($db);
$objMod->init(); $objMod->init();
@ -108,6 +104,8 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
$sql.= ",'".($conf->password_encrypted?md5($_POST["pass"]):$_POST["pass"])."'"; $sql.= ",'".($conf->password_encrypted?md5($_POST["pass"]):$_POST["pass"])."'";
$sql.= ",1,'Administrateur')"; $sql.= ",1,'Administrateur')";
//print "sql=".$sql." ".mysql_errno($db->db); //print "sql=".$sql." ".mysql_errno($db->db);
dolibarr_install_syslog('install/etape5.php sql='.$sql, LOG_INFO);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
@ -118,11 +116,13 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
{ {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{ {
dolibarr_install_syslog('install/etape5.php DB_ERROR_RECORD_ALREADY_EXISTS', LOG_WARNING);
print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>"; print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."</div><br>";
$success = 1; $success = 1;
} }
else else
{ {
dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin', LOG_ERR);
print '<br>'.$langs->trans("FailedToCreateAdminLogin").'<br><br>'; print '<br>'.$langs->trans("FailedToCreateAdminLogin").'<br><br>';
} }
} }
@ -188,7 +188,7 @@ print $langs->trans("GoToSetupArea");
print '</a>'; print '</a>';
dolibarr_install_syslog("Dolibarr install/setup finished"); dolibarr_install_syslog("Dolibarr install/setup finished", LOG_INFO);
pFooter(1,$setuplang); pFooter(1,$setuplang);

4
htdocs/install/inc.php
View File

@ -181,10 +181,10 @@ function pFooter($nonext=0,$setuplang='')
} }
function dolibarr_install_syslog($message) function dolibarr_install_syslog($message, $level=LOG_DEBUG)
{ {
if (! defined('LOG_DEBUG')) define('LOG_DEBUG',6); if (! defined('LOG_DEBUG')) define('LOG_DEBUG',6);
dolibarr_syslog($message,constant('LOG_DEBUG')); dolibarr_syslog($message,$level);
} }
?> ?>

2
htdocs/lib/functions.inc.php
View File

@ -170,7 +170,7 @@ function sanitize_string($str)
fautes de protection mémoire. Pour résoudre, utiliser le loggage fichier, fautes de protection mémoire. Pour résoudre, utiliser le loggage fichier,
au lieu du loggage syslog (configuration du module). au lieu du loggage syslog (configuration du module).
Si SYSLOG_FILE_NO_ERROR défini, on ne gère pas erreur ecriture log Si SYSLOG_FILE_NO_ERROR défini, on ne gère pas erreur ecriture log
\remarks On windows LOG_ERROR=4, LOG_WARNING=5, LOG_NOTICE=LOG_DEBUG=6 \remarks On windows LOG_ERROR=4, LOG_WARNING=5, LOG_NOTICE=LOG_DEBUG=LOG_INFO=6
*/ */
function dolibarr_syslog($message, $level=LOG_INFO) function dolibarr_syslog($message, $level=LOG_INFO)
{ {