Skip to content

Commit 8f541cb

Browse files
committed
Change order of logged register/email sent events
1 parent 20a55fe commit 8f541cb

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

src/controllers/User/Register.php

+19-20
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,25 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
172172

173173
}
174174

175-
if ($success) {
175+
if (!$success) {
176+
$model->error = 'INTERNAL_ERROR';
177+
} else {
178+
$model->error = false;
179+
180+
Logger::logEvent(
181+
EventTypes::USER_CREATED,
182+
$user_id,
183+
getenv("REMOTE_ADDR"),
184+
json_encode([
185+
"error" => $model->error,
186+
"requirements" => $req,
187+
"email" => $email,
188+
"username" => $username,
189+
"display_name" => null,
190+
"options_bitmask" => 0,
191+
])
192+
);
193+
176194
$state = new StdClass();
177195

178196
$mail = new PHPMailer( true ); // true enables exceptions
@@ -239,25 +257,6 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
239257
$model->error = "EMAIL_FAILURE";
240258
}
241259
}
242-
243-
if (!$success) {
244-
$model->error = "INTERNAL_ERROR";
245-
} else {
246-
$model->error = false;
247-
}
248-
Logger::logEvent(
249-
EventTypes::USER_CREATED,
250-
$user_id,
251-
getenv("REMOTE_ADDR"),
252-
json_encode([
253-
"error" => $model->error,
254-
"requirements" => $req,
255-
"email" => $email,
256-
"username" => $username,
257-
"display_name" => null,
258-
"options_bitmask" => 0,
259-
])
260-
);
261260
}
262261

263262
}

0 commit comments

Comments
 (0)