From cedd9ec437065d2b14d7014faedabe30644858ac Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Fri, 26 Aug 2022 01:23:50 +0800
Subject: [PATCH] improve torrent-approval notice

---
 include/constants.php |  2 +-
 include/functions.php | 25 +++++++++++++------------
 public/torrents.php   |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index 0a1a4681..69efea4a 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.23');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-25');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-26');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/include/functions.php b/include/functions.php
index 2a6693ea..2b5a4260 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2770,20 +2770,21 @@ if ($msgalert)
         msgalert("staffbox.php",$text, "blue");
     }
 
+    //torrent approval
+    if (user_can('torrent-approval') && get_setting('torrent.approval_status_none_visible') == 'no') {
+        $cacheKey = 'TORRENT_APPROVAL_NONE';
+        $toApprovalCounts = $Cache->get_value($cacheKey);
+        if ($toApprovalCounts === false) {
+            $toApprovalCounts = get_row_count('torrents', 'where approval_status = 0');
+            $Cache->cache_value($cacheKey, $toApprovalCounts, 60);
+        }
+        if ($toApprovalCounts) {
+            msgalert('torrents.php?approval_status=0', sprintf($lang_functions['text_torrent_to_approval'], is_or_are($toApprovalCounts), $toApprovalCounts, add_s($toApprovalCounts)), 'darkred');
+        }
+    }
+
 	if (user_can('staffmem'))
 	{
-	    //torrent approval
-        if (get_setting('torrent.approval_status_none_visible') == 'no') {
-            $cacheKey = 'TORRENT_APPROVAL_NONE';
-            $toApprovalCounts = $Cache->get_value($cacheKey);
-            if ($toApprovalCounts === false) {
-                $toApprovalCounts = get_row_count('torrents', 'where approval_status = 0');
-                $Cache->cache_value($cacheKey, $toApprovalCounts, 60);
-            }
-            if ($toApprovalCounts) {
-                msgalert('torrents.php?approval_status=0', sprintf($lang_functions['text_torrent_to_approval'], is_or_are($toApprovalCounts), $toApprovalCounts, add_s($toApprovalCounts)), 'darkred');
-            }
-        }
 
         if(($complaints = $Cache->get_value('COMPLAINTS_COUNT_CACHE')) === false){
             $complaints = get_row_count('complains', 'WHERE answered = 0');
diff --git a/public/torrents.php b/public/torrents.php
index 7ecae413..bb4ec2c5 100644
--- a/public/torrents.php
+++ b/public/torrents.php
@@ -812,7 +812,7 @@ $approvalStatusIconEnabled = get_setting('torrent.approval_status_icon_enabled')
 $approvalStatus = null;
 $showApprovalStatusFilter = false;
 //when enable approval status icon, all user can use this filter, otherwise only staff member and approval none visible is 'no' can use
-if ($approvalStatusIconEnabled == 'yes' || (user_can('staffmem') && $approvalStatusNoneVisible == 'no')) {
+if ($approvalStatusIconEnabled == 'yes' || (user_can('torrent-approval') && $approvalStatusNoneVisible == 'no')) {
     $showApprovalStatusFilter = true;
 }
 //when user can use approval status filter, and pass `approval_status` parameter, will affect
@@ -820,7 +820,7 @@ if ($approvalStatusIconEnabled == 'yes' || (user_can('staffmem') && $approvalSta
 if ($showApprovalStatusFilter && isset($_REQUEST['approval_status']) && is_numeric($_REQUEST['approval_status'])) {
     $approvalStatus = intval($_REQUEST['approval_status']);
     $wherea[] = "torrents.approval_status = $approvalStatus";
-} elseif ($approvalStatusNoneVisible == 'no' && !user_can('staffmem')) {
+} elseif ($approvalStatusNoneVisible == 'no' && !user_can('torrent-approval')) {
     $wherea[] = "torrents.approval_status = " . \App\Models\Torrent::APPROVAL_STATUS_ALLOW;
 }