starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 01:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to bul restore users

Browse Source
This commit is contained in:
DariusIII
2025-08-22 21:31:53 +02:00
parent 1710400b12
commit 50552e3482
3 changed files with 349 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/DeletedUsersController.php
+101 -30
View File
@@ -4,36 +4,78 @@ namespace App\Http\Controllers\Admin;
use App\Http\Controllers\BasePageController;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
class DeletedUsersController extends BasePageController
{
/**
* Display a listing of soft-deleted users.
* Display a listing of soft-deleted users with filtering, sorting and pagination.
*/
public function index(Request $request)
{
$this->setAdminPrefs();
$username = $request->has('username') ? $request->input('username') : '';
$email = $request->has('email') ? $request->input('email') : '';
$host = $request->has('host') ? $request->input('host') : '';
$orderBy = $request->has('ob') && ! empty($request->input('ob')) ? $request->input('ob') : 'deleted_at_desc';
// Filters
$username = $request->input('username', '');
$email = $request->input('email', '');
$host = $request->input('host', '');
$orderBy = $request->filled('ob') ? $request->input('ob') : 'deleted_at_desc';
$createdFrom = $request->input('created_from', '');
$createdTo = $request->input('created_to', '');
$deletedFrom = $request->input('deleted_from', '');
$deletedTo = $request->input('deleted_to', '');
$deletedUsers = User::onlyTrashed()
->when($username !== '', function ($query) use ($username) {
return $query->where('username', 'like', '%'.$username.'%');
->when($username !== '', fn ($q) => $q->where('username', 'like', "%$username%"))
->when($email !== '', fn ($q) => $q->where('email', 'like', "%$email%"))
->when($host !== '', fn ($q) => $q->where('host', 'like', "%$host%"))
// Created date filters
->when($createdFrom !== '' || $createdTo !== '', function ($q) use ($createdFrom, $createdTo) {
try {
if ($createdFrom !== '' && $createdTo !== '') {
$from = Carbon::createFromFormat('Y-m-d', $createdFrom)->startOfDay();
$to = Carbon::createFromFormat('Y-m-d', $createdTo)->endOfDay();
$q->whereBetween('created_at', [$from, $to]);
} elseif ($createdFrom !== '') {
$from = Carbon::createFromFormat('Y-m-d', $createdFrom)->startOfDay();
$q->where('created_at', '>=', $from);
} elseif ($createdTo !== '') {
$to = Carbon::createFromFormat('Y-m-d', $createdTo)->endOfDay();
$q->where('created_at', '<=', $to);
}
} catch (\Exception $e) {
// ignore invalid dates
}
})
->when($email !== '', function ($query) use ($email) {
return $query->where('email', 'like', '%'.$email.'%');
})
->when($host !== '', function ($query) use ($host) {
return $query->where('host', 'like', '%'.$host.'%');
// Deleted date filters
->when($deletedFrom !== '' || $deletedTo !== '', function ($q) use ($deletedFrom, $deletedTo) {
try {
if ($deletedFrom !== '' && $deletedTo !== '') {
$from = Carbon::createFromFormat('Y-m-d', $deletedFrom)->startOfDay();
$to = Carbon::createFromFormat('Y-m-d', $deletedTo)->endOfDay();
$q->whereBetween('deleted_at', [$from, $to]);
} elseif ($deletedFrom !== '') {
$from = Carbon::createFromFormat('Y-m-d', $deletedFrom)->startOfDay();
$q->where('deleted_at', '>=', $from);
} elseif ($deletedTo !== '') {
$to = Carbon::createFromFormat('Y-m-d', $deletedTo)->endOfDay();
$q->where('deleted_at', '<=', $to);
}
} catch (\Exception $e) {
// ignore invalid dates
}
});
// Determine sort order
// Sorting
[$orderField, $orderSort] = $this->getSortOrder($orderBy);
$deletedUsers = $deletedUsers->orderBy($orderField, $orderSort)->paginate(25);
$deletedUsers = $deletedUsers->orderBy($orderField, $orderSort)
->paginate(25)
->appends($request->except('page'));
// Build query string (exclude ordering + pagination) for sort links
$qsParams = $request->except(['ob', 'page']);
$queryString = http_build_query(array_filter($qsParams, fn ($v) => $v !== '' && $v !== null));
$this->smarty->assign([
'deletedusers' => $deletedUsers,
@@ -41,6 +83,12 @@ class DeletedUsersController extends BasePageController
'email' => $email,
'host' => $host,
'orderby' => $orderBy,
'created_from' => $createdFrom,
'created_to' => $createdTo,
'deleted_from' => $deletedFrom,
'deleted_to' => $deletedTo,
'csrf_token' => csrf_token(),
'queryString' => $queryString,
]);
$meta_title = 'Deleted Users';
@@ -54,49 +102,72 @@ class DeletedUsersController extends BasePageController
}
/**
* Restore a soft-deleted user.
* Bulk restore or permanent delete.
*/
public function bulkAction(Request $request)
{
$action = $request->input('action');
$userIds = $request->input('user_ids', []);
if (! in_array($action, ['restore', 'delete'], true) || empty($userIds) || ! is_array($userIds)) {
return redirect()->route('admin.deleted.users.index')->with('error', 'Invalid bulk action request.');
}
$userIds = array_filter(array_map('intval', $userIds));
if (empty($userIds)) {
return redirect()->route('admin.deleted.users.index')->with('error', 'No valid users selected.');
}
if ($action === 'restore') {
$count = User::onlyTrashed()->whereIn('id', $userIds)->restore();
return redirect()->route('admin.deleted.users.index')->with('success', $count.' user(s) restored successfully.');
}
$count = User::onlyTrashed()->whereIn('id', $userIds)->forceDelete();
return redirect()->route('admin.deleted.users.index')->with('success', $count.' user(s) permanently deleted.');
}
/**
* Restore single user.
*/
public function restore($id)
{
$user = User::onlyTrashed()->find($id);
if ($user) {
$user->restore();
return redirect()->route('admin.deleted.users.index')
->with('success', "User '{$user->username}' has been restored successfully.");
return redirect()->route('admin.deleted.users.index')->with('success', "User '{$user->username}' has been restored successfully.");
}
return redirect()->route('admin.deleted.users.index')
->with('error', 'User not found.');
return redirect()->route('admin.deleted.users.index')->with('error', 'User not found.');
}
/**
* Permanently delete a soft-deleted user.
* Permanently delete single user.
*/
public function permanentDelete($id)
{
$user = User::onlyTrashed()->find($id);
if ($user) {
$username = $user->username;
$user->forceDelete();
return redirect()->route('admin.deleted.users.index')
->with('success', "User '{$username}' has been permanently deleted.");
return redirect()->route('admin.deleted.users.index')->with('success', "User '{$username}' has been permanently deleted.");
}
return redirect()->route('admin.deleted.users.index')
->with('error', 'User not found.');
return redirect()->route('admin.deleted.users.index')->with('error', 'User not found.');
}
/**
* Parse sort order from the orderBy parameter.
* Parse and validate sort order.
*/
private function getSortOrder($orderBy): array
private function getSortOrder(string $orderBy): array
{
$orderArr = explode('_', $orderBy);
$orderField = match ($orderArr[0]) {
$fieldKey = $orderArr[0] ?? 'deletedat';
$orderField = match ($fieldKey) {
'email' => 'email',
'host' => 'host',
'createdat' => 'created_at',
@@ -107,7 +178,7 @@ class DeletedUsersController extends BasePageController
'role' => 'roles_id',
default => 'username',
};
$orderSort = (isset($orderArr[1]) && preg_match('/^asc|desc$/i', $orderArr[1])) ? $orderArr[1] : 'desc';
$orderSort = (isset($orderArr[1]) && preg_match('/^(asc|desc)$/i', $orderArr[1])) ? strtolower($orderArr[1]) : 'desc';
return [$orderField, $orderSort];
}