From 251759848e55e0db010a15428f3522f4f35ffb96 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Wed, 9 Nov 2022 22:23:11 +0800
Subject: [PATCH 1/3] fix catmanage page pager

---
 include/constants.php |  4 ++--
 public/catmanage.php  | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index 880949ba..ab2e3bb0 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
-defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.30');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-11-05');
+defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.31');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-11-09');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/public/catmanage.php b/public/catmanage.php
index 9593e9cc..65650c29 100644
--- a/public/catmanage.php
+++ b/public/catmanage.php
@@ -7,6 +7,8 @@ loggedinorreturn();
 if (get_user_class() < UC_ADMINISTRATOR)
     permissiondenied();
 
+$perpage = 2;
+$pagerParam = '?action=view&type=' . ($_GET['type'] ?? 'searchbox') . '&';
 function return_category_db_table_name($type)
 {
 	switch($type)
@@ -153,14 +155,13 @@ function check_valid_type($type)
 }
 function print_sub_category_list($type)
 {
-	global $lang_catmanage;
+	global $lang_catmanage, $perpage, $pagerParam;
 	$dbtablename = return_category_db_table_name($type);
-	$perpage = 50;
 	$num = get_row_count($dbtablename);
 	if (!$num)
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	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__);
 ?>
 <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -406,13 +407,12 @@ if ($action == 'view')
 	}
 	elseif ($type=='searchbox')
 	{
-	$perpage = 50;
 	$dbtablename=return_category_db_table_name($type);
 	$num = get_row_count($dbtablename);
 	if (!$num)
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	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__);
 ?>
 <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -460,13 +460,12 @@ print($pagerbottom);
 	}
 	elseif($type=='caticon')
 	{
-	$perpage = 50;
 	$dbtablename=return_category_db_table_name($type);
 	$num = get_row_count($dbtablename);
 	if (!$num)
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	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__);
 ?>
 <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -513,13 +512,12 @@ print($pagerbottom);
 	    $allProcessing = \App\Models\Processing::query()->get()->keyBy('id');
 	    $allTeam = \App\Models\Team::query()->get()->keyBy('id');
 	    $allAudioCodec = \App\Models\AudioCodec::query()->get()->keyBy('id');
-	$perpage = 50;
 	$dbtablename=return_category_db_table_name($type);
 	$num = get_row_count($dbtablename);
 	if (!$num)
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	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__);
 ?>
 <table border="1" cellspacing="0" cellpadding="5" width="97%">
@@ -565,13 +563,12 @@ print($pagerbottom);
 	}
 	elseif($type=='category')
 	{
-	$perpage = 50;
 	$dbtablename=return_category_db_table_name($type);
 	$num = get_row_count($dbtablename);
 	if (!$num)
 		print("<p align=\"center\">".$lang_catmanage['text_no_record_yet']."</p>");
 	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__);
 
 ?>

From e64643a9bab8adc98e0c81b28eaa236019234a94 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Wed, 9 Nov 2022 22:24:36 +0800
Subject: [PATCH 2/3] catmanage perpage 50

---
 public/catmanage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/catmanage.php b/public/catmanage.php
index 65650c29..dac7429d 100644
--- a/public/catmanage.php
+++ b/public/catmanage.php
@@ -7,7 +7,7 @@ loggedinorreturn();
 if (get_user_class() < UC_ADMINISTRATOR)
     permissiondenied();
 
-$perpage = 2;
+$perpage = 50;
 $pagerParam = '?action=view&type=' . ($_GET['type'] ?? 'searchbox') . '&';
 function return_category_db_table_name($type)
 {

From c6762f60db4ce4c7133ee896e3beddd000471503 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Thu, 10 Nov 2022 04:06:58 +0800
Subject: [PATCH 3/3] fix H&R disable suer when mode = disable

---
 app/Repositories/HitAndRunRepository.php | 25 +++++++++++++++---------
 include/constants.php                    |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/Repositories/HitAndRunRepository.php b/app/Repositories/HitAndRunRepository.php
index ac61a67c..c97b59ec 100644
--- a/app/Repositories/HitAndRunRepository.php
+++ b/app/Repositories/HitAndRunRepository.php
@@ -95,18 +95,21 @@ class HitAndRunRepository extends BaseRepository
         $diffInSection = HitAndRun::diffInSection();
         $browseMode = Setting::get('main.browsecat');
         $setting = HitAndRun::getConfig('*', $browseMode);
-        $setting['diff_in_section'] = $diffInSection;
-        $setting['search_box_id'] = $browseMode;
-        $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
-        $this->checkAndDisableUser($setting);
-
+        if ($setting['mode'] != HitAndRun::MODE_DISABLED) {
+            $setting['diff_in_section'] = $diffInSection;
+            $setting['search_box_id'] = $browseMode;
+            $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
+            $this->checkAndDisableUser($setting);
+        }
         $specialMode = Setting::get('main.specialcat');
         if ($diffInSection && $browseMode != $specialMode) {
             $setting = HitAndRun::getConfig('*', $specialMode);
-            $setting['diff_in_section'] = $diffInSection;
-            $setting['search_box_id'] = $specialMode;
-            $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
-            $this->checkAndDisableUser($setting);
+            if ($setting['mode'] != HitAndRun::MODE_DISABLED) {
+                $setting['diff_in_section'] = $diffInSection;
+                $setting['search_box_id'] = $specialMode;
+                $this->doCronjobUpdateStatus($setting, $uid, $torrentId, $ignoreTime);
+                $this->checkAndDisableUser($setting);
+            }
         }
     }
 
@@ -342,6 +345,10 @@ class HitAndRunRepository extends BaseRepository
     {
         $logPrefix = "setting: " . json_encode($setting);
         $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()
             ->selectRaw("count(*) as counts, uid")
             ->where('status', HitAndRun::STATUS_UNREACHED)
diff --git a/include/constants.php b/include/constants.php
index ab2e3bb0..8dbf94c1 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.31');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-11-09');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-11-10');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");