From 34e9ccf8e973f5f4102667ebae73f16cdf67c618 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 30 Apr 2020 17:19:00 +0100
Subject: [PATCH] FIX #13676 TIME 0:10 Set globals id in sendEmail script
---
src/app/email/controllers/EmailController.php | 6 ------
src/app/email/scripts/sendEmail.php | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php
index a4e9dbafa43..20e0e8abf27 100644
--- a/src/app/email/controllers/EmailController.php
+++ b/src/app/email/controllers/EmailController.php
@@ -643,17 +643,11 @@ class EmailController
$phpmailer->SMTPDebug = 1;
$phpmailer->Debugoutput = function ($str) {
if (strpos($str, 'SMTP ERROR') !== false) {
- if (!empty($GLOBALS['id'])) {
- $user = $GLOBALS['id'];
- } else {
- $user = UserModel::get(['select' => ['id'], 'orderBy' => ["user_id='superadmin' desc"], 'limit' => 1])[0]['id'];
- }
HistoryController::add([
'tableName' => 'emails',
'recordId' => 'email',
'eventType' => 'ERROR',
'eventId' => 'sendEmail',
- 'userId' => $user,
'info' => $str
]);
}
diff --git a/src/app/email/scripts/sendEmail.php b/src/app/email/scripts/sendEmail.php
index aa8b6cddffb..570bf0eaba7 100644
--- a/src/app/email/scripts/sendEmail.php
+++ b/src/app/email/scripts/sendEmail.php
@@ -40,6 +40,7 @@ class EmailScript
$currentUser = UserModel::getById(['id' => $args['userId'], 'select' => ['user_id']]);
$GLOBALS['login'] = $currentUser['user_id'];
+ $GLOBALS['id'] = $args['userId'];
$_SERVER['MAARCH_ENCRYPT_KEY'] = $args['encryptKey'];
$isSent = EmailController::sendEmail(['emailId' => $args['emailId'], 'userId' => $args['userId']]);
--
GitLab