@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | // Add country data to each user based on their host IP |
| 61 | 61 | foreach ($results as $user) { |
| 62 | 62 | $position = null; |
| 63 | - if (! empty($user->host) && filter_var($user->host, FILTER_VALIDATE_IP)) { |
|
| 63 | + if (!empty($user->host) && filter_var($user->host, FILTER_VALIDATE_IP)) { |
|
| 64 | 64 | $position = Location::get($user->host); |
| 65 | 65 | } |
| 66 | 66 | $user->country_name = $position ? $position->countryName : null; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | // This must happen BEFORE role change so the new expiry applies to the old role |
| 183 | 183 | if ($request->has('rolechangedate')) { |
| 184 | 184 | $roleChangeDate = $request->input('rolechangedate'); |
| 185 | - if (! empty($roleChangeDate)) { |
|
| 185 | + if (!empty($roleChangeDate)) { |
|
| 186 | 186 | User::updateUserRoleChangeDate($editedUser->id, $roleChangeDate); |
| 187 | 187 | $editedUser->refresh(); |
| 188 | 188 | } else { |
@@ -257,13 +257,13 @@ |
||
| 257 | 257 | UserRoleHistory::recordRoleChange( |
| 258 | 258 | userId: $user->id, |
| 259 | 259 | oldRoleId: $oldRole ? $oldRole->id : null, |
| 260 | - newRoleId: $pendingRole ? $pendingRole->id : $user->roles_id, |
|
| 261 | - oldExpiryDate: null, |
|
| 262 | - newExpiryDate: null, |
|
| 263 | - effectiveDate: $now, |
|
| 264 | - isStacked: true, |
|
| 265 | - changeReason: 'manual_activation', |
|
| 266 | - changedBy: null |
|
| 260 | + newRoleId : $pendingRole ? $pendingRole->id : $user->roles_id, |
|
| 261 | + oldExpiryDate : null, |
|
| 262 | + newExpiryDate : null, |
|
| 263 | + effectiveDate : $now, |
|
| 264 | + isStacked : true, |
|
| 265 | + changeReason : 'manual_activation', |
|
| 266 | + changedBy : null |
|
| 267 | 267 | ); |
| 268 | 268 | |
| 269 | 269 | $this->info(sprintf( |