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

FIx couple of issues with role stacking

Browse Source
This commit is contained in:
DariusIII
2025-11-30 19:08:01 +01:00
parent a58bd7f435
commit c9293f3969
4 changed files with 166 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/AdminUserController.php
+9 -2
View File
@@ -169,12 +169,17 @@ class AdminUserController extends BasePageController
$stackRole = $request->input('stack_role') ? true : false; // Check if checkbox is checked
$changedBy = auth()->check() ? auth()->id() : null;
// CRITICAL: Capture the ORIGINAL rolechangedate BEFORE any updates
// This is needed for accurate role history tracking
$originalRoleChangeDate = $editedUser->rolechangedate;
// Handle pending role cancellation
if ($request->has('cancel_pending_role') && $request->input('cancel_pending_role')) {
$editedUser->cancelPendingRole();
}
// Handle rolechangedate - BEFORE role change to ensure expiry is cleared if needed
// Handle rolechangedate - Update the expiry for the CURRENT role FIRST
// This must happen BEFORE role change so the new expiry applies to the old role
if ($request->has('rolechangedate')) {
$roleChangeDate = $request->input('rolechangedate');
if (! empty($roleChangeDate)) {
@@ -188,13 +193,15 @@ class AdminUserController extends BasePageController
}
// If role is changing, handle it with stacking logic
// Pass the original expiry so history records the correct old_expiry_date
if ($roleChanged && $request->input('role') !== null) {
User::updateUserRole(
$editedUser->id,
(int) $request->input('role'), // Cast to integer
true, // Apply promotions
$stackRole, // Stack role if requested
$changedBy
$changedBy,
$originalRoleChangeDate // Pass original expiry for history
);
$editedUser->refresh();
}