diff --git a/ChangeLog b/ChangeLog
index 9509d17c800f1ca220c263bb41690724b97c4c0f..811660a00b0911815c33678652e627d28ee94d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,8 @@ For developers:
- Function plimit of databases drivers accept -1 as value (it means default value set
into conf->liste_limit).
- New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page.
-
+- New: dol_syslog method accept a suffix to use different log files for log.
+
For translators:
- Update language files.
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 99f7560a15eb8f84193ecd30058970afe1cf6f14..08202a597ec544e749851e52589ce37fa3b6799e 100755
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -99,7 +99,7 @@ class box_contacts extends ModeleBoxes
'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
- 'text' => $contactstatic->getFullName($langs,1),
+ 'text' => $contactstatic->getFullName($langs,0),
'url' => DOL_URL_ROOT."/contact/fiche.php?id=".$objp->rowid);
$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 36cf943c51ba7c66b280f61f5c6c364e3c3821ee..99df1e73053623ce8a10bee8700ded2e34798909 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -485,15 +485,16 @@ function dol_strtoupper($utf8_string)
* This function works only if syslog module is enabled.
* This must not use any call to other function calling dol_syslog (avoid infinite loop).
*
- * @param string $message Line to log. Ne doit pas etre traduit si level = LOG_ERR
- * @param int $level Log level
- * 0=Show nothing
- * On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr
- * On Linux LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7
- * @param int $ident 1=Increase ident of 1, -1=Decrease ident of 1
+ * @param string $message Line to log. Ne doit pas etre traduit si level = LOG_ERR
+ * @param int $level Log level
+ * 0=Show nothing
+ * On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr
+ * On Linux LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7
+ * @param int $ident 1=Increase ident of 1, -1=Decrease ident of 1
+ * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return void
*/
-function dol_syslog($message, $level = LOG_INFO, $ident = 0)
+function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename='')
{
global $conf, $user;
@@ -543,7 +544,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0)
// Loop on each log handler and send output
foreach ($conf->loghandlers as $loghandlerinstance)
{
- $loghandlerinstance->export($data);
+ $loghandlerinstance->export($data,$suffixinfilename);
}
unset($data);
}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 0742df8ac4ef31fd698c9929305c84e61a9a9eb6..35e8500e74698872e26962dbfceac5c9b2e303f0 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -36,10 +36,12 @@ class MenuManager
/**
* Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB $db Database handler
+ * @param int $type_user Type of user
*/
- function __construct($db)
+ function __construct($db, $type_user)
{
+ $this->type_user=$type_user;
$this->db=$db;
}
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index b0e1bd550b428f42efd5bcd3bfcd773beae02324..f5315f064ae364dcf7e691e33c09b5069795ba22 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -96,22 +96,25 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
/**
* Return the parsed logfile path
*
- * @return string
+ * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
+ * @return string
*/
- private function getFilename()
+ private function getFilename($suffixinfilename='')
{
- return str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, SYSLOG_FILE);
+ $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, SYSLOG_FILE);
+ return $suffixinfilename?preg_replace('/\.log$/i', $suffixinfilename.'.log', $tmp):$tmp;
}
/**
* Export the message
*
- * @param array $content Array containing the info about the message
+ * @param array $content Array containing the info about the message
+ * @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return void
*/
- public function export($content)
+ public function export($content, $suffixinfilename='')
{
- $logfile = $this->getFilename();
+ $logfile = $this->getFilename($suffixinfilename);
if (defined("SYSLOG_FILE_NO_ERROR")) $filefd = @fopen($logfile, 'a+');
else $filefd = fopen($logfile, 'a+');
diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php
index ec5c915b7896830264e718b8030a2333d291e52c..0b6635fa3903eabd813262511a3957e98fbb38fc 100644
--- a/htdocs/public/paybox/paymentko.php
+++ b/htdocs/public/paybox/paymentko.php
@@ -56,7 +56,11 @@ $langs->load("paypal");
* View
*/
-dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]));
+dol_syslog("Callback url when a PayBox payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
llxHeaderPayBox($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php
index 41fc96c19d6ad4692eecfcc9f4009f15093a11f5..d46ae4f33a71b2112c03e5a3aaf3ea98d1737159 100644
--- a/htdocs/public/paybox/paymentok.php
+++ b/htdocs/public/paybox/paymentok.php
@@ -55,7 +55,11 @@ $langs->load("paypal");
* View
*/
-dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]));
+dol_syslog("Callback url when a PayBox payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paybox');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
llxHeaderPayBox($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php
index 3af51addec90c139d05597c7a686c5bc9979b163..610e68c93e399fa8fc0f81573e52331ffe0b8b53 100755
--- a/htdocs/public/paypal/paymentko.php
+++ b/htdocs/public/paypal/paymentko.php
@@ -64,7 +64,12 @@ $langs->load("paypal");
* View
*/
-dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]));
+dol_syslog("Callback url when a PayPal payment was canceled. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paypal');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
+
llxHeaderPaypal($langs->trans("PaymentForm"));
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index 3a0b56f62a1e96961907aca5d1b2c7c04ece372a..45cd6f460147614eba769e25d438fbc881ebf337 100755
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -92,7 +92,12 @@ if (empty($PAYPAL_API_SIGNATURE))
* View
*/
-dol_syslog("Callback url when a PayPal payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]));
+dol_syslog("Callback url when a PayPal payment was done. query_string=".(empty($_SERVER["QUERY_STRING"])?'':$_SERVER["QUERY_STRING"])." script_uri=".(empty($_SERVER["SCRIPT_URI"])?'':$_SERVER["SCRIPT_URI"]), LOG_DEBUG, 0, '_paypal');
+
+$tracepost = "";
+foreach($_POST as $k => $v) $tracepost .= "{$k} - {$v}\n";
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
+
llxHeaderPaypal($langs->trans("PaymentForm"));