From 2c4c48ad6fc0f78afb59ebc2d42ae00daf85f663 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Dec 2016 12:11:39 +0100
Subject: [PATCH] Better fix to add server name into email id.
---
htdocs/core/class/CMailFile.class.php | 2 +-
htdocs/core/class/smtps.class.php | 2 +-
htdocs/core/lib/functions.lib.php | 15 +++++++++------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index cd9e47f8a78..db9bf8e1ad0 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -680,7 +680,7 @@ class CMailFile
global $conf;
$out = "";
- $host = dol_getprefix();
+ $host = dol_getprefix('email');
// Sender
//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index a46672443ac..6731b46fe0f 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1126,7 +1126,7 @@ class SMTPs
$host=preg_replace('@tcp://@i','',$host); // Remove prefix
$host=preg_replace('@ssl://@i','',$host); // Remove prefix
- $host=dol_getprefix().'-'.$host;
+ $host=dol_getprefix('email').'-'.$host;
//NOTE: Message-ID should probably contain the username of the user who sent the msg
$_header .= 'Subject: ' . $this->getSubject() . "\r\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bce67604ee7..8c810b76b97 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -286,19 +286,22 @@ function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL)
* This prefix is unique for instance and avoid conflict between multi-instances,
* even when having two instances with one root dir or two instances in virtual servers
*
+ * @param string $mode '' or 'email'
* @return string A calculated prefix
*/
-function dol_getprefix()
+function dol_getprefix($mode='')
{
global $conf;
+ // If MAIL_PREFIX_FOR_EMAIL_ID is set and prefix is for email
+ if ($mode == 'email' && ! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
+ {
+ if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+ else if (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+ }
+
if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
{
- if (! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
- {
- if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID == 'SERVER_NAME') return $_SERVER["SERVER_NAME"];
- return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
- }
return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
// Use this for a "clear" cookie name
//return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
--
GitLab