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

FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of

Browse Source 
tracking email.
This commit is contained in:
Laurent Destailleur 2016-12-14 10:36:11 +01:00
parent 530d3503f5
commit 56b3f2c011
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/functions.lib.php
View File

@ -294,10 +294,10 @@ function dol_getprefix()
if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"]))
{ {
if (! empty($conf->gobal->MAIL_PREFIX_FOR_EMAIL_ID)) if (! empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))
{ {
if ($conf->gobal->MAIL_PREFIX_FOR_EMAIL_ID == 'SERVER_NAME') return $_SERVER["SERVER_NAME"]; if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID == 'SERVER_NAME') return $_SERVER["SERVER_NAME"];
return $conf->gobal->MAIL_PREFIX_FOR_EMAIL_ID; return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
} }
return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT); return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
// Use this for a "clear" cookie name // Use this for a "clear" cookie name