diff --git a/include/cleanup.php b/include/cleanup.php index 97968e9b..2e519821 100644 --- a/include/cleanup.php +++ b/include/cleanup.php @@ -567,13 +567,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/public/torrentrss.php b/public/torrentrss.php index 89e2a14a..55084e35 100644 --- a/public/torrentrss.php +++ b/public/torrentrss.php @@ -111,9 +111,13 @@ if (!$hasSticky) { //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") {