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

Add: ajout d'un rpertoire par dfaut pour les logs dans /documents/entity_1/logs

Browse Source 
cr  l'activation du module syslog, on peut toujours modifier le chemin si on souhaite
 mettre ce fichier  un autre endroit.
This commit is contained in:
Regis Houssin 2009-04-29 15:02:40 +00:00
parent 18a1b9188d
commit 8a1d511da4
9 changed files with 76 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/initdemo/initdemo.sql
View File

File diff suppressed because one or more lines are too long

33
htdocs/admin/syslog.php
View File

@ -62,11 +62,25 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set')
print '<div class="error">'.$langs->trans("ErrorUnknownSyslogConstant",$_POST["facility"]).'</div>'; print '<div class="error">'.$langs->trans("ErrorUnknownSyslogConstant",$_POST["facility"]).'</div>';
} }
} }
if ($optionlogoutput == "file") if ($optionlogoutput == "file")
{ {
$filelog=$_POST["filename"]; $filelog = $_POST["filename"];
$filelog=eregi_replace('DOL_DATA_ROOT',DOL_DATA_ROOT,$filelog);
if (eregi('(^[A-Za-z0-9_\-\\/:]+[\\/]+)([A-Za-z0-9_\-]+[.]?[A-Za-z0-9]+)?$', $filelog))
{
if (eregi('DOL_DATA_ROOT', $filelog))
{
$filelog = eregi_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $filelog);
}
}
else if ($conf->syslog->dir_output)
{
$filelog = $conf->syslog->dir_output."/".$filelog;
}
$file=fopen($filelog,"a+"); $file=fopen($filelog,"a+");
if ($file) if ($file)
{ {
fclose($file); fclose($file);
@ -88,14 +102,16 @@ if (! empty($_POST["action"]) && $_POST["action"] == 'set')
llxHeader(); llxHeader();
$html=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup'); print_fiche_titre($langs->trans("SyslogSetup"),$linkback,'setup');
print '<br>'; print '<br>';
$def = array(); $def = array();
$syslogfacility=$defaultsyslogfacility=dolibarr_get_const($db,"SYSLOG_FACILITY"); $syslogfacility=$defaultsyslogfacility=dolibarr_get_const($db,"SYSLOG_FACILITY",$conf->entity);
$syslogfile=$defaultsyslogfile=dolibarr_get_const($db,"SYSLOG_FILE"); $syslogfile=$defaultsyslogfile=dolibarr_get_const($db,"SYSLOG_FILE",$conf->entity);
if (! $defaultsyslogfacility) $defaultsyslogfacility='LOG_USER'; if (! $defaultsyslogfacility) $defaultsyslogfacility='LOG_USER';
if (! $defaultsyslogfile) $defaultsyslogfile='dolibarr.log'; if (! $defaultsyslogfile) $defaultsyslogfile='dolibarr.log';
@ -109,19 +125,20 @@ print '<input type="hidden" name="action" value="set">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Parameter").'</td>'; print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Parameter").'</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>'; print '<td align="right" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;
$var=!$var; $var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlogoutput\" value=\"syslog\" ".($syslogfacility?" checked":"")."> ".$langs->trans("SyslogSyslog")."</td>"; print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlogoutput\" value=\"syslog\" ".($syslogfacility?" checked":"")."> ".$langs->trans("SyslogSyslog")."</td>";
print '<td colspan="2">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" value="'.$defaultsyslogfacility.'">'; print '<td colspan="3">'.$langs->trans("SyslogFacility").': <input type="text" class="flat" name="facility" value="'.$defaultsyslogfacility.'">';
print ' '.img_info('Only LOG_USER supported on Windows'); print ' '.img_info('Only LOG_USER supported on Windows');
print '</td></tr>'; print '</td></tr>';
$var=!$var; $var=!$var;
print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlogoutput\" value=\"file\"".($syslogfile?" checked":"")."> ".$langs->trans("SyslogSimpleFile")."</td>"; print "<tr ".$bc[$var]."><td width=\"140\"><input ".$bc[$var]." type=\"radio\" name=\"optionlogoutput\" value=\"file\"".($syslogfile?" checked":"")."> ".$langs->trans("SyslogSimpleFile")."</td>";
print '<td colspan="2">'.$langs->trans("SyslogFilename").': <input type="text" class="flat" name="filename" size="60" value="'.$defaultsyslogfile.'">'; print '<td width="250" nowrap>'.$langs->trans("SyslogFilename").': <input type="text" class="flat" name="filename" size="60" value="'.$defaultsyslogfile.'"></td>';
print ' '.img_info($langs->trans("YouCanUseDOL_DATA_ROOT")); $htmltext = $langs->trans("SyslogFilenameDesc",$conf->syslog->dir_output);
print "<td align=\"left\">".$html->textwithhelp('',$htmltext);
print '</td></tr>'; print '</td></tr>';
print "</table>\n"; print "</table>\n";

2
htdocs/core/conf.class.php
View File

@ -109,7 +109,7 @@ class Conf
{ {
$module=strtolower($reg[1]); $module=strtolower($reg[1]);
$dir_name="dir_".strtolower($reg[2]); $dir_name="dir_".strtolower($reg[2]);
$this->$module->$dir_name = DOL_DATA_ROOT."/entity_".$this->entity."/".$value; $this->$module->$dir_name = DOL_DATA_ROOT."/entity_".$this->entity.$value;
} }
// If this is a module constant // If this is a module constant
if (eregi('^MAIN_MODULE_([A-Z]+)$',$key,$reg) && $value) if (eregi('^MAIN_MODULE_([A-Z]+)$',$key,$reg) && $value)

6
htdocs/includes/modules/modSyslog.class.php
View File

@ -56,8 +56,12 @@ class modSyslog extends DolibarrModules
$this->special = 2; $this->special = 2;
//$this->picto='phoning'; //$this->picto='phoning';
// Dir // Data directories to create when module is enabled
$this->dirs = array(); $this->dirs = array();
$r=0;
$this->dirs[$r][0] = "output";
$this->dirs[$r][1] = "/logs";
// Config pages // Config pages
$this->config_page_url = array("syslog.php"); $this->config_page_url = array("syslog.php");

2
htdocs/langs/en_US/admin.lang
View File

@ -925,7 +925,7 @@ SyslogFacility=Facility
SyslogLevel=Level SyslogLevel=Level
SyslogSimpleFile=File SyslogSimpleFile=File
SyslogFilename=File name and path SyslogFilename=File name and path
YouCanUseDOL_DATA_ROOT=You can user DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr documents directory. SyslogFilenameDesc = This log file is located by default in the directory:<br><b>%s</b><br><br>You can set a different path to store this file.
ErrorUnknownSyslogConstant=Constant %s is not a known syslog constant ErrorUnknownSyslogConstant=Constant %s is not a known syslog constant
##### Donations ##### ##### Donations #####
DonationsSetup=Donation module setup DonationsSetup=Donation module setup

2
htdocs/langs/fr_FR/admin.lang
View File

@ -924,7 +924,7 @@ SyslogFacility = Facility
SyslogLevel = Niveau SyslogLevel = Niveau
SyslogSimpleFile = Fichier SyslogSimpleFile = Fichier
SyslogFilename = Nom et chemin du fichier SyslogFilename = Nom et chemin du fichier
YouCanUseDOL_DATA_ROOT = Vous pouvez utiliser DOL_DATA_ROOT/dolibarr.log pour une log dans le répertoire 'documents' de Dolibarr. SyslogFilenameDesc = Ce fichier de log est situé par défaut dans le répertoire:<br><b>%s</b><br><br>Vous pouvez néanmoins définir un chemin différent pour stocker ce fichier.
ErrorUnknownSyslogConstant = La constante %s n'est pas une constante syslog connue ErrorUnknownSyslogConstant = La constante %s n'est pas une constante syslog connue
##### Donations ##### = undefined ##### Donations ##### = undefined
DonationsSetup = Configuration du module Dons DonationsSetup = Configuration du module Dons

24
htdocs/lib/functions.lib.php
View File

@ -183,8 +183,22 @@ function dol_syslog($message, $level=LOG_INFO)
// Check if log is to a file (SYSLOG_FILE defined) or to syslog // Check if log is to a file (SYSLOG_FILE defined) or to syslog
if (defined("SYSLOG_FILE") && SYSLOG_FILE) if (defined("SYSLOG_FILE") && SYSLOG_FILE)
{ {
$filelog=SYSLOG_FILE; if (eregi('(^[A-Za-z0-9_\-\\/:]+[\\/]+)([A-Za-z0-9_\-]+[.]?[A-Za-z0-9]+)?$', SYSLOG_FILE))
$filelog=eregi_replace('DOL_DATA_ROOT',DOL_DATA_ROOT,$filelog); {
if (eregi('DOL_DATA_ROOT', SYSLOG_FILE))
{
$filelog = eregi_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $filelog);
}
else
{
$filelog = SYSLOG_FILE;
}
}
else if ($conf->syslog->dir_output)
{
$filelog = $conf->syslog->dir_output."/".SYSLOG_FILE;
}
if (defined("SYSLOG_FILE_NO_ERROR")) $file=@fopen($filelog,"a+"); if (defined("SYSLOG_FILE_NO_ERROR")) $file=@fopen($filelog,"a+");
else $file=fopen($filelog,"a+"); else $file=fopen($filelog,"a+");
@ -2615,10 +2629,10 @@ function dol_textishtml($msg,$option=0)
} }
/** /**
* \brief Effectue les substitutions des mots cl<EFBFBD>s par les donn<EFBFBD>es en fonction du tableau * \brief Effectue les substitutions des mots cles par les donnees en fonction du tableau
* \param chaine Chaine dans laquelle faire les substitutions * \param chaine Chaine dans laquelle faire les substitutions
* \param substitutionarray Tableau cl<EFBFBD> substitution => valeur a mettre * \param substitutionarray Tableau cle substitution => valeur a mettre
* \return string Chaine avec les substitutions effectu<EFBFBD>es * \return string Chaine avec les substitutions effectuees
*/ */
function make_substitutions($chaine,$substitutionarray) function make_substitutions($chaine,$substitutionarray)
{ {

44
htdocs/translate.class.php
View File

@ -347,30 +347,30 @@ class Translate {
*/ */
function trans($key, $param1='', $param2='', $param3='', $param4='', $maxsize=0) function trans($key, $param1='', $param2='', $param3='', $param4='', $maxsize=0)
{ {
if ($this->getTransFromTab($key)) if ($this->getTransFromTab($key))
{ {
// Translation is available // Translation is available
$str=sprintf($this->tab_translate[$key],$param1,$param2,$param3,$param4); $str=sprintf($this->tab_translate[$key],$param1,$param2,$param3,$param4);
if ($maxsize) $str=dol_trunc($str,$maxsize); if ($maxsize) $str=dol_trunc($str,$maxsize);
// On remplace les tags HTML par __xx__ pour eviter traduction par htmlentities // On remplace les tags HTML par __xx__ pour eviter traduction par htmlentities
$newstr=ereg_replace('<','__lt__',$str); $newstr=ereg_replace('<','__lt__',$str);
$newstr=ereg_replace('>','__gt__',$newstr); $newstr=ereg_replace('>','__gt__',$newstr);
$newstr=ereg_replace('"','__quot__',$newstr); $newstr=ereg_replace('"','__quot__',$newstr);
$newstr=$this->convToOutputCharset($newstr); // Convert string to $this->charset_output
$newstr=$this->convToOutputCharset($newstr); // Convert string to $this->charset_output // Cryptage en html de la chaine
// $newstr est une chaine stockee en memoire au format $this->charset_output
$newstr=htmlentities($newstr,ENT_QUOTES,$this->charset_output);
// Cryptage en html de la chaine // On restaure les tags HTML
// $newstr est une chaine stockee en memoire au format $this->charset_output $newstr=ereg_replace('__lt__','<',$newstr);
$newstr=htmlentities($newstr,ENT_QUOTES,$this->charset_output); $newstr=ereg_replace('__gt__','>',$newstr);
$newstr=ereg_replace('__quot__','"',$newstr);
// On restaure les tags HTML return $newstr;
$newstr=ereg_replace('__lt__','<',$newstr); }
$newstr=ereg_replace('__gt__','>',$newstr); else
$newstr=ereg_replace('__quot__','"',$newstr); {
return $newstr;
}
else
{
// Translation is not available // Translation is not available
$newstr=$key; $newstr=$key;
if (eregi('CurrencyShort([A-Z]+)$',$key,$reg)) if (eregi('CurrencyShort([A-Z]+)$',$key,$reg))

2
mysql/data/data.sql
View File

@ -59,7 +59,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTA
insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0);
insert into llx_const (name, value, type, note, visible) values ('MAIN_POPUP_CALENDAR','eldy','chaine','Popup calendar module',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_POPUP_CALENDAR','eldy','chaine','Popup calendar module',0);
insert into llx_const (name, value, type, note, visible) values ('SYSLOG_FILE','DOL_DATA_ROOT/dolibarr.log','chaine','Directory where to write log file',0); insert into llx_const (name, value, type, note, visible) values ('SYSLOG_FILE','dolibarr.log','chaine','Directory where to write log file',0);
insert into llx_const (name, value, type, note, visible) values ('SYSLOG_LEVEL','6','chaine','Level of debug info to show',0); insert into llx_const (name, value, type, note, visible) values ('SYSLOG_LEVEL','6','chaine','Level of debug info to show',0);
insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0);