From faff54b4b0e494aff69e8b48536360fdd68b5849 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 24 Apr 2019 12:23:28 +0200
Subject: [PATCH] FEAT #10394 TIME 0:15 Maileva Enabled
---
src/app/attachment/controllers/AttachmentController.php | 8 +++++++-
src/core/models/CoreConfigModel.php | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index fa726022d11..d5c8431de51 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -155,7 +155,13 @@ class AttachmentController
}
}
- return $response->withJson(['attachments' => $attachments]);
+ $mailevaConfig = CoreConfigModel::getMailevaConfiguration();
+ $mailevaEnabled = false;
+ if (!empty($mailevaConfig) && $mailevaConfig['enabled']) {
+ $mailevaEnabled = true;
+ }
+
+ return $response->withJson(['attachments' => $attachments, 'mailevaEnabled' => $mailevaEnabled]);
}
public function setInSignatureBook(Request $request, Response $response, array $aArgs)
diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php
index 0116319ff72..ba3cd7cf692 100755
--- a/src/core/models/CoreConfigModel.php
+++ b/src/core/models/CoreConfigModel.php
@@ -193,6 +193,7 @@ class CoreConfigModel
$mailevaConfig = [];
if ($loadedXml) {
+ $mailevaConfig['enabled'] = filter_var((string)$loadedXml->ENABLED, FILTER_VALIDATE_BOOLEAN);
$mailevaConfig['connectionUri'] = (string)$loadedXml->CONNECTION_URI;
$mailevaConfig['uri'] = (string)$loadedXml->URI;
$mailevaConfig['clientId'] = (string)$loadedXml->CLIENT_ID;
--
GitLab