From 3e7522cecac137e760af545d541c4d0dbcaa0e60 Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Mon, 16 Jan 2023 23:56:56 +0800
Subject: [PATCH] cleanup delete unconfirmred accounts + rss check special
 section permission

---
 include/cleanup.php   | 14 +++++++-------
 include/constants.php |  2 +-
 public/torrentrss.php |  6 +++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/include/cleanup.php b/include/cleanup.php
index 8b312a02..2ca3f5fe 100644
--- a/include/cleanup.php
+++ b/include/cleanup.php
@@ -531,13 +531,13 @@ function docleanup($forceAll = 0, $printProgress = false) {
 
 	//3.delete unconfirmed accounts
 	$deadtime = time() - $signup_timeout;
-//	sql_query("DELETE FROM users WHERE status = 'pending' AND added < FROM_UNIXTIME($deadtime) AND last_login < FROM_UNIXTIME($deadtime) AND last_access < FROM_UNIXTIME($deadtime)") or sqlerr(__FILE__, __LINE__);
-	$query = \App\Models\User::query()
-        ->where('status', 'pending')
-        ->whereRaw("added < FROM_UNIXTIME($deadtime)")
-        ->whereRaw("last_login < FROM_UNIXTIME($deadtime)")
-        ->whereRaw("last_access < FROM_UNIXTIME($deadtime)");
-    disable_user($query, "cleanup.disable_user_unconfirmed");
+	sql_query("DELETE FROM users WHERE status = 'pending' AND added < FROM_UNIXTIME($deadtime) AND last_login < FROM_UNIXTIME($deadtime) AND last_access < FROM_UNIXTIME($deadtime)") or sqlerr(__FILE__, __LINE__);
+//	$query = \App\Models\User::query()
+//        ->where('status', 'pending')
+//        ->whereRaw("added < FROM_UNIXTIME($deadtime)")
+//        ->whereRaw("last_login < FROM_UNIXTIME($deadtime)")
+//        ->whereRaw("last_access < FROM_UNIXTIME($deadtime)");
+//    disable_user($query, "cleanup.disable_user_unconfirmed");
     $log = "delete unconfirmed accounts";
 	do_log($log);
 	if ($printProgress) {
diff --git a/include/constants.php b/include/constants.php
index acd44c99..10bff6f1 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.34');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-12-24');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-01-16');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/public/torrentrss.php b/public/torrentrss.php
index 06c9edb9..c1bfc416 100644
--- a/public/torrentrss.php
+++ b/public/torrentrss.php
@@ -87,9 +87,13 @@ $limit .= $showrows;
 
 //approval status
 $approvalStatusNoneVisible = get_setting('torrent.approval_status_none_visible');
-if ($approvalStatusNoneVisible == 'no' && !user_can('staffmem')) {
+if ($approvalStatusNoneVisible == 'no' && !user_can('staffmem', false, $user['id'])) {
     $where .= ($where ? " AND " : "") . "torrents.approval_status = " . \App\Models\Torrent::APPROVAL_STATUS_ALLOW;
 }
+//check special section permission
+if (get_setting('main.spsct') == 'yes' && !user_can('view_special_torrent', false, $user['id'])) {
+    $where .= ($where ? " AND " : "") . "categories.mode = " . get_setting('main.browsecat');
+}
 
 function get_where($tablename = "sources", $itemname = "source", $getname = "sou")
 {