lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 20:40:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7' into php8

Browse Source
This commit is contained in:
xiaomlove
2023-01-16 23:57:45 +08:00
parent 3bed01a03c 3e7522ceca
commit b29f321b01
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/cleanup.php
View File

@@ -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) {

6
public/torrentrss.php
View File

@@ -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")
{