imporve cleanup_cli

This commit is contained in:
xiaomlove
2021-06-15 10:05:33 +08:00
parent 3fd591c6ae
commit e24a146841
2 changed files with 4 additions and 9 deletions
+2 -7
View File
@@ -197,7 +197,7 @@ function ban_user_with_leech_warning_expired()
function delete_user(\Illuminate\Database\Eloquent\Builder $query, $reasonKey) function delete_user(\Illuminate\Database\Eloquent\Builder $query, $reasonKey)
{ {
$results = $query->get(['id', 'username', 'modcomment']); $results = $query->where('enabled', \App\Models\User::ENABLED_YES)->get(['id', 'username', 'modcomment', 'language']);
if ($results->isEmpty()) { if ($results->isEmpty()) {
return []; return [];
} }
@@ -213,13 +213,8 @@ function delete_user(\Illuminate\Database\Eloquent\Builder $query, $reasonKey)
'reason' => nexus_trans($reasonKey, [], $user->locale), 'reason' => nexus_trans($reasonKey, [], $user->locale),
]; ];
} }
// $update = [
// 'enabled' => \App\Models\User::ENABLED_NO,
// 'modcomment' => DB::raw("concat_ws('\n', '[CLEANUP] $reasonKey', modcomment)"),
// ];
// \App\Models\User::query()->whereIn('id', $uidArr)->update($update);
$sql = sprintf( $sql = sprintf(
"update users set enabled = '%s', modcomment = concat_ws('\n', '%s - [CLEANUP] %s', modcomment) where id in (%s)", "update users set enabled = '%s', modcomment = concat_ws('\n', '%s [CLEANUP] %s', modcomment) where id in (%s)",
\App\Models\User::ENABLED_NO, date('Y-m-d'), addslashes($reasonKey), implode(', ', $uidArr) \App\Models\User::ENABLED_NO, date('Y-m-d'), addslashes($reasonKey), implode(', ', $uidArr)
); );
sql_query($sql); sql_query($sql);
+2 -2
View File
@@ -22,8 +22,8 @@ if (isset($_SERVER['argv'][1])) {
try { try {
if ($force) { if ($force) {
require_once($rootpath . 'include/cleanup.php'); require_once(ROOT_PATH . 'include/cleanup.php');
return docleanup(1, true); $result = docleanup(1, true);
} else { } else {
$result = autoclean(); $result = autoclean();
} }