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

Merge branch 'php8' into section

Browse Source
This commit is contained in:
xiaomlove
2022-10-27 22:14:37 +08:00
parent ce5d99c16a f22067d221
commit 410aed39cf
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/HitAndRunRepository.php
View File

@@ -112,7 +112,7 @@ class HitAndRunRepository extends BaseRepository
private function doCronjobUpdateStatus(array $setting, $uid = null, $torrentId = null, $ignoreTime = false) private function doCronjobUpdateStatus(array $setting, $uid = null, $torrentId = null, $ignoreTime = false)
{ {
do_log("uid: $uid, torrentId: $torrentId, ignoreTime: " . var_export($ignoreTime, true)); do_log("setting: " . json_encode($setting) . ", uid: $uid, torrentId: $torrentId, ignoreTime: " . var_export($ignoreTime, true));
$size = 1000; $size = 1000;
$page = 1; $page = 1;
if (empty($setting['mode'])) { if (empty($setting['mode'])) {
@@ -340,6 +340,7 @@ class HitAndRunRepository extends BaseRepository
private function checkAndDisableUser(array $setting): void private function checkAndDisableUser(array $setting): void
{ {
$logPrefix = "setting: " . json_encode($setting);
$disableCounts = HitAndRun::getConfig('ban_user_when_counts_reach', $setting['search_box_id']); $disableCounts = HitAndRun::getConfig('ban_user_when_counts_reach', $setting['search_box_id']);
$query = HitAndRun::query() $query = HitAndRun::query()
->selectRaw("count(*) as counts, uid") ->selectRaw("count(*) as counts, uid")
@@ -354,13 +355,14 @@ class HitAndRunRepository extends BaseRepository
} }
$result = $query->get(); $result = $query->get();
if ($result->isEmpty()) { if ($result->isEmpty()) {
do_log("No user to disable"); do_log("$logPrefix, No user to disable: " . last_query());
return; return;
} }
$users = User::query() $users = User::query()
->with('language') ->with('language')
->where('enabled', User::ENABLED_YES) ->where('enabled', User::ENABLED_YES)
->find($result->pluck('id')->toArray(), ['id', 'username', 'lang']); ->find($result->pluck('uid')->toArray(), ['id', 'username', 'lang']);
do_log("$logPrefix, Going to disable user: " . json_encode($users->toArray()));
foreach ($users as $user) { foreach ($users as $user) {
$locale = $user->locale; $locale = $user->locale;
$comment = nexus_trans('hr.unreached_disable_comment', [], $locale); $comment = nexus_trans('hr.unreached_disable_comment', [], $locale);
@@ -370,7 +372,7 @@ class HitAndRunRepository extends BaseRepository
'added' => Carbon::now()->toDateTimeString(), 'added' => Carbon::now()->toDateTimeString(),
'subject' => $comment, 'subject' => $comment,
'msg' => nexus_trans('hr.unreached_disable_message_content', [ 'msg' => nexus_trans('hr.unreached_disable_message_content', [
'ban_user_when_counts_reach' => Setting::get('hr.ban_user_when_counts_reach'), 'ban_user_when_counts_reach' => $disableCounts,
], $locale), ], $locale),
]; ];
Message::query()->insert($message); Message::query()->insert($message);
@@ -405,7 +407,7 @@ class HitAndRunRepository extends BaseRepository
$out = []; $out = [];
foreach (SearchBox::listSections() as $key => $info) { foreach (SearchBox::listSections() as $key => $info) {
$out[] = sprintf( $out[] = sprintf(
'%s: %s/%s/%s', '%s: %s/<font color="red">%s</font>/%s',
$info['text'], $info['text'],
$grouped[$info['mode']][HitAndRun::STATUS_INSPECTING] ?? 0, $grouped[$info['mode']][HitAndRun::STATUS_INSPECTING] ?? 0,
$grouped[$info['mode']][HitAndRun::STATUS_UNREACHED] ?? 0, $grouped[$info['mode']][HitAndRun::STATUS_UNREACHED] ?? 0,
@@ -421,7 +423,7 @@ class HitAndRunRepository extends BaseRepository
foreach (SearchBox::listSections() as $key => $info) { foreach (SearchBox::listSections() as $key => $info) {
if ($key == SearchBox::SECTION_BROWSE) { if ($key == SearchBox::SECTION_BROWSE) {
return sprintf( return sprintf(
'%s/%s/%s', '%s/<font color="red">%s</font>/%s',
$grouped[HitAndRun::STATUS_INSPECTING] ?? 0, $grouped[HitAndRun::STATUS_INSPECTING] ?? 0,
$grouped[HitAndRun::STATUS_UNREACHED] ?? 0, $grouped[HitAndRun::STATUS_UNREACHED] ?? 0,
HitAndRun::getConfig('ban_user_when_counts_reach', $info['mode']) HitAndRun::getConfig('ban_user_when_counts_reach', $info['mode'])

2
include/constants.php
View File

@@ -1,6 +1,6 @@
<?php <?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.30'); defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.30');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-24'); defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-10-27');
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");