@@ -57,7 +57,7 @@ |
||
57 | 57 | // Add country data to each user based on their host IP |
58 | 58 | foreach ($results as $user) { |
59 | 59 | $position = null; |
60 | - if (! empty($user->host) && filter_var($user->host, FILTER_VALIDATE_IP)) { |
|
60 | + if (!empty($user->host) && filter_var($user->host, FILTER_VALIDATE_IP)) { |
|
61 | 61 | $position = Location::get($user->host); |
62 | 62 | } |
63 | 63 | $user->country_name = $position ? $position->countryName : null; |
@@ -50,14 +50,14 @@ |
||
50 | 50 | try { |
51 | 51 | // Create a cookie instance with proper settings for persistence |
52 | 52 | $cookie = cookie( |
53 | - '2fa_trusted_device', // name |
|
54 | - $cookieValue, // value |
|
55 | - 60 * 24 * 30, // minutes (30 days) |
|
56 | - '/', // path |
|
57 | - null, // domain (null = current domain) |
|
58 | - null, // secure (auto) |
|
59 | - false, // httpOnly - allow JS access |
|
60 | - false, // raw |
|
53 | + '2fa_trusted_device', // name |
|
54 | + $cookieValue, // value |
|
55 | + 60 * 24 * 30, // minutes (30 days) |
|
56 | + '/', // path |
|
57 | + null, // domain (null = current domain) |
|
58 | + null, // secure (auto) |
|
59 | + false, // httpOnly - allow JS access |
|
60 | + false, // raw |
|
61 | 61 | 'lax' // sameSite |
62 | 62 | ); |
63 | 63 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | $rememberMe = $request->has('rememberme') && $request->input('rememberme') === 'on'; |
86 | 86 | |
87 | - if (! $user->isVerified() || $user->isPendingVerification()) { |
|
87 | + if (!$user->isVerified() || $user->isPendingVerification()) { |
|
88 | 88 | $request->session()->flash('message', 'You have not verified your email address!'); |
89 | 89 | |
90 | 90 | return redirect()->to('login'); |
@@ -204,14 +204,14 @@ discard block |
||
204 | 204 | if ($remainingMinutes > 0) { |
205 | 205 | // Create a cookie with proper settings for persistence |
206 | 206 | $cookie = cookie( |
207 | - '2fa_trusted_device', // name |
|
208 | - $trustedDeviceCookie, // value |
|
209 | - $remainingMinutes, // minutes remaining |
|
210 | - '/', // path |
|
207 | + '2fa_trusted_device', // name |
|
208 | + $trustedDeviceCookie, // value |
|
209 | + $remainingMinutes, // minutes remaining |
|
210 | + '/', // path |
|
211 | 211 | config('session.domain'), // use session domain config |
212 | 212 | config('session.secure'), // use session secure config |
213 | - false, // httpOnly |
|
214 | - false, // raw |
|
213 | + false, // httpOnly |
|
214 | + false, // raw |
|
215 | 215 | config('session.same_site', 'lax') // use session same_site config |
216 | 216 | ); |
217 | 217 |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | try { |
36 | 36 | $data = @json_decode($cookie, true); |
37 | 37 | |
38 | - if (! is_array($data)) { |
|
38 | + if (!is_array($data)) { |
|
39 | 39 | return false; |
40 | 40 | } |
41 | 41 | |
42 | 42 | // Validate all required fields |
43 | - if (! isset($data['user_id'], $data['token'], $data['expires_at'])) { |
|
43 | + if (!isset($data['user_id'], $data['token'], $data['expires_at'])) { |
|
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | |
@@ -63,13 +63,13 @@ discard block |
||
63 | 63 | |
64 | 64 | protected function canPassWithoutCheckingOTP(): bool |
65 | 65 | { |
66 | - if (! $this->getUser()->passwordSecurity) { |
|
66 | + if (!$this->getUser()->passwordSecurity) { |
|
67 | 67 | return true; |
68 | 68 | } |
69 | 69 | |
70 | 70 | return |
71 | - ! $this->getUser()->passwordSecurity->google2fa_enable || |
|
72 | - ! $this->isEnabled() || |
|
71 | + !$this->getUser()->passwordSecurity->google2fa_enable || |
|
72 | + !$this->isEnabled() || |
|
73 | 73 | $this->noUserIsAuthenticated() || |
74 | 74 | $this->twoFactorAuthStillValid() || |
75 | 75 | $this->isDeviceTrusted(); |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $cookie = request()->cookie('2fa_trusted_device'); |
85 | 85 | $user = $this->getUser(); |
86 | 86 | |
87 | - if (! $cookie) { |
|
87 | + if (!$cookie) { |
|
88 | 88 | return false; |
89 | 89 | } |
90 | 90 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | // Validate the required fields silently |
99 | - if (! isset($data['user_id'], $data['token'], $data['expires_at'])) { |
|
99 | + if (!isset($data['user_id'], $data['token'], $data['expires_at'])) { |
|
100 | 100 | return false; |
101 | 101 | } |
102 | 102 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $this->info(' |
@@ -88,16 +88,16 @@ discard block |
||
88 | 88 | { |
89 | 89 | $steps = 3; // prepare, finalize, cleanup |
90 | 90 | |
91 | - if (! $this->option('skip-git')) { |
|
91 | + if (!$this->option('skip-git')) { |
|
92 | 92 | $steps++; |
93 | 93 | } |
94 | - if (! $this->option('skip-composer')) { |
|
94 | + if (!$this->option('skip-composer')) { |
|
95 | 95 | $steps++; |
96 | 96 | } |
97 | - if (! $this->option('skip-npm')) { |
|
97 | + if (!$this->option('skip-npm')) { |
|
98 | 98 | $steps += 2; |
99 | 99 | } // install + build |
100 | - if (! $this->option('skip-db')) { |
|
100 | + if (!$this->option('skip-db')) { |
|
101 | 101 | $steps++; |
102 | 102 | } |
103 | 103 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | // Check if app is in maintenance mode |
118 | 118 | $this->wasInMaintenance = App::isDownForMaintenance(); |
119 | - if (! $this->wasInMaintenance) { |
|
119 | + if (!$this->wasInMaintenance) { |
|
120 | 120 | $this->call('down', [ |
121 | 121 | '--render' => 'errors::maintenance', |
122 | 122 | '--retry' => 120, |
@@ -140,22 +140,22 @@ discard block |
||
140 | 140 | private function executeUpdateSteps(): void |
141 | 141 | { |
142 | 142 | // Git operations |
143 | - if (! $this->option('skip-git')) { |
|
143 | + if (!$this->option('skip-git')) { |
|
144 | 144 | $this->performGitUpdate(); |
145 | 145 | } |
146 | 146 | |
147 | 147 | // Composer operations |
148 | - if (! $this->option('skip-composer')) { |
|
148 | + if (!$this->option('skip-composer')) { |
|
149 | 149 | $this->performComposerUpdate(); |
150 | 150 | } |
151 | 151 | |
152 | 152 | // Database migrations |
153 | - if (! $this->option('skip-db')) { |
|
153 | + if (!$this->option('skip-db')) { |
|
154 | 154 | $this->performDatabaseUpdate(); |
155 | 155 | } |
156 | 156 | |
157 | 157 | // NPM operations |
158 | - if (! $this->option('skip-npm')) { |
|
158 | + if (!$this->option('skip-npm')) { |
|
159 | 159 | $this->performNpmOperations(); |
160 | 160 | } |
161 | 161 | |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | { |
219 | 219 | // Check if package.json has changed |
220 | 220 | $packageLockExists = File::exists(base_path('package-lock.json')); |
221 | - $shouldInstall = ! $packageLockExists || $this->option('force'); |
|
221 | + $shouldInstall = !$packageLockExists || $this->option('force'); |
|
222 | 222 | |
223 | 223 | if ($shouldInstall) { |
224 | 224 | $this->info(' |
@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | $this->checkSystemResources(); |
44 | 44 | |
45 | 45 | // Check if session already exists |
46 | - if (! $this->option('force') && $this->isSessionRunning($tmuxSession)) { |
|
46 | + if (!$this->option('force') && $this->isSessionRunning($tmuxSession)) { |
|
47 | 47 | $this->error("❌ Tmux session '$tmuxSession' is already running"); |
48 | 48 | |
49 | - if (! $this->confirm('Would you like to restart the session?')) { |
|
49 | + if (!$this->confirm('Would you like to restart the session?')) { |
|
50 | 50 | return Command::FAILURE; |
51 | 51 | } |
52 | 52 | |
@@ -79,13 +79,13 @@ discard block |
||
79 | 79 | { |
80 | 80 | $recommendations = UpdatePerformanceHelper::checkSystemResources(); |
81 | 81 | |
82 | - if (! empty($recommendations)) { |
|
82 | + if (!empty($recommendations)) { |
|
83 | 83 | $this->warn('⚠️ System resource warnings:'); |
84 | 84 | foreach ($recommendations as $recommendation) { |
85 | 85 | $this->line(" • $recommendation"); |
86 | 86 | } |
87 | 87 | |
88 | - if (! $this->confirm('Continue despite warnings?')) { |
|
88 | + if (!$this->confirm('Continue despite warnings?')) { |
|
89 | 89 | throw new \Exception('Aborted due to system resource concerns'); |
90 | 90 | } |
91 | 91 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | |
111 | 111 | $runScript = base_path('misc/update/tmux/run.php'); |
112 | 112 | |
113 | - if (! file_exists($runScript)) { |
|
113 | + if (!file_exists($runScript)) { |
|
114 | 114 | throw new \Exception("Tmux run script not found: $runScript"); |
115 | 115 | } |
116 | 116 | |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $this->info(' |
@@ -42,14 +42,14 @@ |
||
42 | 42 | $this->info(' |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | // Check database connection and detect database type |
32 | 32 | $dbType = $this->checkDatabaseConnection(); |
33 | - if (! $dbType) { |
|
33 | + if (!$dbType) { |
|
34 | 34 | $this->error('Database connection failed'); |
35 | 35 | |
36 | 36 | return Command::FAILURE; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | $this->warn("⚠️ Rolling back $steps migrations..."); |
125 | 125 | |
126 | - if (! $this->confirm('Are you sure you want to rollback migrations? This may cause data loss.')) { |
|
126 | + if (!$this->confirm('Are you sure you want to rollback migrations? This may cause data loss.')) { |
|
127 | 127 | $this->info('Rollback cancelled'); |
128 | 128 | |
129 | 129 | return Command::SUCCESS; |