lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-24 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/php8' into php8

Browse Source
This commit is contained in:
xiaomlove
2024-05-18 14:53:44 +08:00
parent 9ffd5d942a bc83be2985
commit 615bf19a3a
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Repositories/ExamRepository.php
+17 -11
View File
@@ -338,7 +338,13 @@ class ExamRepository extends BaseRepository
return false; return false;
} }
return true; try {
$user->checkIsNormal();
return true;
} catch (\Throwable $throwable) {
do_log("$logPrefix, user is not normal: " . $throwable->getMessage());
return false;
}
} }
@@ -1115,6 +1121,16 @@ class ExamRepository extends BaseRepository
do_log("$currentLogPrefix, [is_done]"); do_log("$currentLogPrefix, [is_done]");
$subjectTransKey = 'exam.checkout_pass_message_subject'; $subjectTransKey = 'exam.checkout_pass_message_subject';
$msgTransKey = 'exam.checkout_pass_message_content'; $msgTransKey = 'exam.checkout_pass_message_content';
if (!empty($exam->recurring) && $this->isExamMatchUser($exam, $examUser->user)) {
$examUserToInsert[] = [
'uid' => $examUser->user->id,
'exam_id' => $exam->id,
'begin' => $exam->getBeginForUser(),
'end' => $exam->getEndForUser(),
'created_at' => $now,
'updated_at' => $now,
];
}
} else { } else {
do_log("$currentLogPrefix, [will be banned]"); do_log("$currentLogPrefix, [will be banned]");
clear_user_cache($examUser->user->id, $examUser->user->passkey); clear_user_cache($examUser->user->id, $examUser->user->passkey);
@@ -1152,16 +1168,6 @@ class ExamRepository extends BaseRepository
'subject' => $subject, 'subject' => $subject,
'msg' => $msg 'msg' => $msg
]; ];
if (!empty($exam->recurring) && $this->isExamMatchUser($exam, $examUser->user)) {
$examUserToInsert[] = [
'uid' => $examUser->user->id,
'exam_id' => $exam->id,
'begin' => $exam->getBeginForUser(),
'end' => $exam->getEndForUser(),
'created_at' => $now,
'updated_at' => $now,
];
}
} }
DB::transaction(function () use ($uidToDisable, $messageToSend, $examUserIdArr, $examUserToInsert, $userBanLog, $userModcommentUpdate, $userTable, $logPrefix) { DB::transaction(function () use ($uidToDisable, $messageToSend, $examUserIdArr, $examUserToInsert, $userBanLog, $userModcommentUpdate, $userTable, $logPrefix) {
ExamUser::query()->whereIn('id', $examUserIdArr)->update(['status' => ExamUser::STATUS_FINISHED]); ExamUser::query()->whereIn('id', $examUserIdArr)->update(['status' => ExamUser::STATUS_FINISHED]);
include/constants.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12'); defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-05-08'); defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-05-10');
defined('IN_TRACKER') || define('IN_TRACKER', false); defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP"); defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org"); defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");