composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 00:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°4947 Fix Email always picking "production" env config file (#331)

Browse Source 
Note that the code was duplicated in both Email* impl, this is refactored : LoadConfig and m_oConfig are pulled up in Email, and SetRecipientFrom() calls are also refactored in Email
This commit is contained in:
Pierre Goiffon
2022-09-14 15:33:48 +02:00
committed by GitHub
parent 7512f721e9
commit d431811725
3 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/Core/Email/EmailLaminas.php
View File

@@ -45,25 +45,21 @@ class EMailLaminas extends Email
// Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
protected static $m_oConfig = null;
protected $m_aData; // For storing data to serialize
public static function LoadConfig($sConfigFile = ITOP_DEFAULT_CONFIG_FILE)
{
if (is_null(self::$m_oConfig)) {
self::$m_oConfig = new Config($sConfigFile);
}
}
protected $m_oMessage;
/** @noinspection PhpMissingParentConstructorInspection */
/**
* @noinspection PhpMissingParentConstructorInspection
* @noinspection MagicMethodsValidityInspection
*/
public function __construct()
{
$this->m_aData = array();
$this->m_oMessage = new Message();
$this->m_oMessage->setEncoding('UTF-8');
$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
$this->InitRecipientFrom();
}
/**