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

Merge branch '1.7' into php8

Browse Source
This commit is contained in:
xiaomlove
2022-11-10 04:08:05 +08:00
parent ecddf836b7 c6762f60db
commit 463c4ecf96
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Repositories/HitAndRunRepository.php
+16 -9
View File
@@ -95,18 +95,21 @@ class HitAndRunRepository extends BaseRepository
$diffInSection = HitAndRun::diffInSection(); $diffInSection = HitAndRun::diffInSection();
$browseMode = Setting::get('main.browsecat'); $browseMode = Setting::get('main.browsecat');
$setting = HitAndRun::getConfig('*', $browseMode); $setting = HitAndRun::getConfig('*', $browseMode);
$setting['diff_in_section'] = $diffInSection; if ($setting['mode'] != HitAndRun::MODE_DISABLED) {
$setting['search_box_id'] = $browseMode; $setting['diff_in_section'] = $diffInSection;
$this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime); $setting['search_box_id'] = $browseMode;
$this->checkAndDisableUser($setting); $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
$this->checkAndDisableUser($setting);
}
$specialMode = Setting::get('main.specialcat'); $specialMode = Setting::get('main.specialcat');
if ($diffInSection && $browseMode != $specialMode) { if ($diffInSection && $browseMode != $specialMode) {
$setting = HitAndRun::getConfig('*', $specialMode); $setting = HitAndRun::getConfig('*', $specialMode);
$setting['diff_in_section'] = $diffInSection; if ($setting['mode'] != HitAndRun::MODE_DISABLED) {
$setting['search_box_id'] = $specialMode; $setting['diff_in_section'] = $diffInSection;
$this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime); $setting['search_box_id'] = $specialMode;
$this->checkAndDisableUser($setting); $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
$this->checkAndDisableUser($setting);
}
} }
} }
@@ -342,6 +345,10 @@ class HitAndRunRepository extends BaseRepository
{ {
$logPrefix = "setting: " . json_encode($setting); $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']);
if ($disableCounts <= 0) {
do_log("$logPrefix, disableCounts: $disableCounts <= 0, invalid, return", 'error');
return;
}
$query = HitAndRun::query() $query = HitAndRun::query()
->selectRaw("count(*) as counts, uid") ->selectRaw("count(*) as counts, uid")
->where('status', HitAndRun::STATUS_UNREACHED) ->where('status', HitAndRun::STATUS_UNREACHED)
public/catmanage.php
+8 -11
View File
@@ -7,6 +7,8 @@ loggedinorreturn();
if (get_user_class() < UC_ADMINISTRATOR) if (get_user_class() < UC_ADMINISTRATOR)
permissiondenied(); permissiondenied();
$perpage = 50;
$pagerParam = '?action=view&type=' . ($_GET['type'] ?? 'searchbox') . '&';
function return_category_db_table_name($type) function return_category_db_table_name($type)
{ {
switch($type) switch($type)
@@ -153,14 +155,13 @@ function check_valid_type($type)
} }
function print_sub_category_list($type) function print_sub_category_list($type)
{ {
global $lang_catmanage; global $lang_catmanage, $perpage, $pagerParam;
$dbtablename = return_category_db_table_name($type); $dbtablename = return_category_db_table_name($type);
$perpage = 50;
$num = get_row_count($dbtablename); $num = get_row_count($dbtablename);
if (!$num) if (!$num)
print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>"); print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
else{ else{
list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?"); list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, $pagerParam);
$res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id DESC ".$limit) or sqlerr(__FILE__, __LINE__); $res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id DESC ".$limit) or sqlerr(__FILE__, __LINE__);
?> ?>
<table border="1" cellspacing="0" cellpadding="5" width="97%"> <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -406,13 +407,12 @@ if ($action == 'view')
} }
elseif ($type=='searchbox') elseif ($type=='searchbox')
{ {
$perpage = 50;
$dbtablename=return_category_db_table_name($type); $dbtablename=return_category_db_table_name($type);
$num = get_row_count($dbtablename); $num = get_row_count($dbtablename);
if (!$num) if (!$num)
print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>"); print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
else{ else{
list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?"); list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, $pagerParam);
$res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__); $res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
?> ?>
<table border="1" cellspacing="0" cellpadding="5" width="97%"> <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -460,13 +460,12 @@ print($pagerbottom);
} }
elseif($type=='caticon') elseif($type=='caticon')
{ {
$perpage = 50;
$dbtablename=return_category_db_table_name($type); $dbtablename=return_category_db_table_name($type);
$num = get_row_count($dbtablename); $num = get_row_count($dbtablename);
if (!$num) if (!$num)
print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>"); print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
else{ else{
list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?"); list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, $pagerParam);
$res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__); $res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
?> ?>
<table border="1" cellspacing="0" cellpadding="5" width="97%"> <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -513,13 +512,12 @@ print($pagerbottom);
$allProcessing = \App\Models\Processing::query()->get()->keyBy('id'); $allProcessing = \App\Models\Processing::query()->get()->keyBy('id');
$allTeam = \App\Models\Team::query()->get()->keyBy('id'); $allTeam = \App\Models\Team::query()->get()->keyBy('id');
$allAudioCodec = \App\Models\AudioCodec::query()->get()->keyBy('id'); $allAudioCodec = \App\Models\AudioCodec::query()->get()->keyBy('id');
$perpage = 50;
$dbtablename=return_category_db_table_name($type); $dbtablename=return_category_db_table_name($type);
$num = get_row_count($dbtablename); $num = get_row_count($dbtablename);
if (!$num) if (!$num)
print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>"); print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
else{ else{
list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?"); list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, $pagerParam);
$res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__); $res = sql_query("SELECT * FROM ".$dbtablename." ORDER BY id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
?> ?>
<table border="1" cellspacing="0" cellpadding="5" width="97%"> <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -565,13 +563,12 @@ print($pagerbottom);
} }
elseif($type=='category') elseif($type=='category')
{ {
$perpage = 50;
$dbtablename=return_category_db_table_name($type); $dbtablename=return_category_db_table_name($type);
$num = get_row_count($dbtablename); $num = get_row_count($dbtablename);
if (!$num) if (!$num)
print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>"); print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
else{ else{
list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, "?"); list($pagertop, $pagerbottom, $limit) = pager($perpage, $num, $pagerParam);
$res = sql_query("SELECT ".$dbtablename.".*, searchbox.name AS catmodename, caticons.name as icon_name FROM ".$dbtablename." LEFT JOIN searchbox ON ".$dbtablename.".mode=searchbox.id left join caticons on caticons.id = $dbtablename.icon_id ORDER BY ".$dbtablename.".mode ASC, ".$dbtablename.".id ASC ".$limit) or sqlerr(__FILE__, __LINE__); $res = sql_query("SELECT ".$dbtablename.".*, searchbox.name AS catmodename, caticons.name as icon_name FROM ".$dbtablename." LEFT JOIN searchbox ON ".$dbtablename.".mode=searchbox.id left join caticons on caticons.id = $dbtablename.icon_id ORDER BY ".$dbtablename.".mode ASC, ".$dbtablename.".id ASC ".$limit) or sqlerr(__FILE__, __LINE__);
?> ?>