diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php index a4e9dbafa4320c896421c0acffe4a261ae65d7d5..20e0e8abf2702c4e56cfeda5f8bbc20558f94624 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 aa8b6cddffb57ab7c5f65d1a506c44211ce6b821..570bf0eaba7dda649882fe382a833a39e135c218 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']]);