From 8ba380bcaeda1b5626acb9600fba7304e92ae88b Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 8 Mar 2019 18:06:38 +0100
Subject: [PATCH] FEAT #9105 M2M review
---
.../external/exportSeda/controllers/AdapterEmailController.php | 3 ++-
.../external/exportSeda/controllers/AdapterWSController.php | 2 +-
.../external/exportSeda/controllers/SendMessageController.php | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/app/external/exportSeda/controllers/AdapterEmailController.php b/src/app/external/exportSeda/controllers/AdapterEmailController.php
index 7293a95b7d5..38c7ca46492 100755
--- a/src/app/external/exportSeda/controllers/AdapterEmailController.php
+++ b/src/app/external/exportSeda/controllers/AdapterEmailController.php
@@ -15,6 +15,7 @@
namespace ExportSeda\controllers;
use Sendmail\Models\MailModel;
+use SrcCore\models\CoreConfigModel;
use MessageExchange\models\MessageExchangeModel;
class AdapterEmailController
@@ -24,7 +25,7 @@ class AdapterEmailController
$res['status'] = 0;
$res['content'] = '';
- $xml = simplexml_load_file('../xml' . DIRECTORY_SEPARATOR . "config.xml");
+ $xml = CoreConfigModel::getXmlLoaded(['path' => 'modules/export_seda/xml/config.xml']);
$gec = strtolower($xml->M2M->gec);
if ($gec == 'maarch_courrier') {
diff --git a/src/app/external/exportSeda/controllers/AdapterWSController.php b/src/app/external/exportSeda/controllers/AdapterWSController.php
index 938f72c4a32..0b44197c3b3 100755
--- a/src/app/external/exportSeda/controllers/AdapterWSController.php
+++ b/src/app/external/exportSeda/controllers/AdapterWSController.php
@@ -18,7 +18,7 @@ use MessageExchange\models\MessageExchangeModel;
class AdapterWSController
{
- public function send($messageId, $type)
+ public function send($messageObject, $messageId, $type)
{
$message = MessageExchangeModel::getMessageByIdentifier(['messageId' => $messageId]);
$res = TransferController::transfer('maarchcourrier', $message[0]['reference'], $type);
diff --git a/src/app/external/exportSeda/controllers/SendMessageController.php b/src/app/external/exportSeda/controllers/SendMessageController.php
index bc87ca88a9d..748c8b6bf0f 100755
--- a/src/app/external/exportSeda/controllers/SendMessageController.php
+++ b/src/app/external/exportSeda/controllers/SendMessageController.php
@@ -31,7 +31,7 @@ class SendMessageController
return false;
}
- $res = $adapter->send($messageId, $type);
+ $res = $adapter->send($messageObject, $messageId, $type);
return $res;
}
--
GitLab