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

fix exam filter empty

Browse Source
This commit is contained in:
xiaomlove
2023-05-10 02:25:26 +08:00
parent e1dd469d21
commit 4684640dcd
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Repositories/ExamRepository.php
+4 -4
View File
@@ -251,21 +251,21 @@ class ExamRepository extends BaseRepository
$filters = $exam->filters; $filters = $exam->filters;
$filter = Exam::FILTER_USER_CLASS; $filter = Exam::FILTER_USER_CLASS;
$filterValues = $filters[$filter]; $filterValues = $filters[$filter] ?? [];
if (!empty($filterValues) && !in_array($user->class, $filterValues)) { if (!empty($filterValues) && !in_array($user->class, $filterValues)) {
do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filterValues)); do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filterValues));
return false; return false;
} }
$filter = Exam::FILTER_USER_DONATE; $filter = Exam::FILTER_USER_DONATE;
$filterValues = $filters[$filter]; $filterValues = $filters[$filter] ?? [];
if (!empty($filterValues) && !in_array($user->donate_status, $filterValues)) { if (!empty($filterValues) && !in_array($user->donate_status, $filterValues)) {
do_log("$logPrefix, user donate status: {$user->donate_status} not in: " . json_encode($filterValues)); do_log("$logPrefix, user donate status: {$user->donate_status} not in: " . json_encode($filterValues));
return false; return false;
} }
$filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE;
$filterValues = $filters[$filter]; $filterValues = $filters[$filter] ?? [];
$added = $user->added->toDateTimeString(); $added = $user->added->toDateTimeString();
$registerTimeBegin = isset($filterValues[0]) ? Carbon::parse($filterValues[0])->toDateTimeString() : ''; $registerTimeBegin = isset($filterValues[0]) ? Carbon::parse($filterValues[0])->toDateTimeString() : '';
$registerTimeEnd = isset($filterValues[1]) ? Carbon::parse($filterValues[1])->toDateTimeString() : ''; $registerTimeEnd = isset($filterValues[1]) ? Carbon::parse($filterValues[1])->toDateTimeString() : '';
@@ -868,7 +868,7 @@ class ExamRepository extends BaseRepository
} }
$filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE;
$range = $filters[$filter]; $range = $filters[$filter] ?? [];
if (!empty($range)) { if (!empty($range)) {
if (!empty($range[0])) { if (!empty($range[0])) {
$baseQuery->where("$userTable.added", ">=", Carbon::parse($range[0])->toDateTimeString()); $baseQuery->where("$userTable.added", ">=", Carbon::parse($range[0])->toDateTimeString());
include/constants.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php <?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.2'); defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.3');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-05-08'); defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-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");
public/delacctadmin.php
+1
View File
@@ -1,6 +1,7 @@
<?php <?php
require "../include/bittorrent.php"; require "../include/bittorrent.php";
dbconn(); dbconn();
loggedinorreturn();
user_can('user-delete', true); user_can('user-delete', true);
if ($_SERVER["REQUEST_METHOD"] == "POST") if ($_SERVER["REQUEST_METHOD"] == "POST")