@@ -109,7 +109,8 @@ |
||
109 | 109 | */ |
110 | 110 | public function detachRole(Administrator $administrator, Permission $permission = null, Role $role = null) |
111 | 111 | { |
112 | - if ( ! is_null($role)) |
|
113 | - return ! $role->isLocked(); |
|
112 | + if ( ! is_null($role)) { |
|
113 | + return ! $role->isLocked(); |
|
114 | + } |
|
114 | 115 | } |
115 | 116 | } |
@@ -147,8 +147,9 @@ discard block |
||
147 | 147 | */ |
148 | 148 | public function show(Administrator $administrator, Administrator $model = null) |
149 | 149 | { |
150 | - if ($model && $model->isSuperAdmin() && ! $administrator->isSuperAdmin()) |
|
151 | - return false; |
|
150 | + if ($model && $model->isSuperAdmin() && ! $administrator->isSuperAdmin()) { |
|
151 | + return false; |
|
152 | + } |
|
152 | 153 | } |
153 | 154 | |
154 | 155 | /** |
@@ -186,14 +187,17 @@ discard block |
||
186 | 187 | */ |
187 | 188 | public function activate(Administrator $administrator, Administrator $model = null) |
188 | 189 | { |
189 | - if ( ! is_null($model) && $model->isActive()) |
|
190 | - return false; |
|
190 | + if ( ! is_null($model) && $model->isActive()) { |
|
191 | + return false; |
|
192 | + } |
|
191 | 193 | |
192 | - if ($administrator->is($model)) |
|
193 | - return false; |
|
194 | + if ($administrator->is($model)) { |
|
195 | + return false; |
|
196 | + } |
|
194 | 197 | |
195 | - if ( ! is_null($model) && $model->isSuperAdmin()) |
|
196 | - return false; |
|
198 | + if ( ! is_null($model) && $model->isSuperAdmin()) { |
|
199 | + return false; |
|
200 | + } |
|
197 | 201 | } |
198 | 202 | |
199 | 203 | /** |
@@ -206,14 +210,17 @@ discard block |
||
206 | 210 | */ |
207 | 211 | public function deactivate(Administrator $administrator, Administrator $model = null) |
208 | 212 | { |
209 | - if ( ! is_null($model) && ! $model->isActive()) |
|
210 | - return false; |
|
213 | + if ( ! is_null($model) && ! $model->isActive()) { |
|
214 | + return false; |
|
215 | + } |
|
211 | 216 | |
212 | - if ($administrator->is($model)) |
|
213 | - return false; |
|
217 | + if ($administrator->is($model)) { |
|
218 | + return false; |
|
219 | + } |
|
214 | 220 | |
215 | - if ( ! is_null($model) && $model->isSuperAdmin()) |
|
216 | - return false; |
|
221 | + if ( ! is_null($model) && $model->isSuperAdmin()) { |
|
222 | + return false; |
|
223 | + } |
|
217 | 224 | } |
218 | 225 | |
219 | 226 | /** |
@@ -226,11 +233,13 @@ discard block |
||
226 | 233 | */ |
227 | 234 | public function delete(Administrator $administrator, Administrator $model = null) |
228 | 235 | { |
229 | - if ($administrator->is($model)) |
|
230 | - return false; |
|
236 | + if ($administrator->is($model)) { |
|
237 | + return false; |
|
238 | + } |
|
231 | 239 | |
232 | - if ( ! is_null($model)) |
|
233 | - return $model->isDeletable(); |
|
240 | + if ( ! is_null($model)) { |
|
241 | + return $model->isDeletable(); |
|
242 | + } |
|
234 | 243 | } |
235 | 244 | |
236 | 245 | /** |
@@ -243,8 +252,9 @@ discard block |
||
243 | 252 | */ |
244 | 253 | public function forceDelete(Administrator $administrator, Administrator $model = null) |
245 | 254 | { |
246 | - if ( ! is_null($model)) |
|
247 | - return $model->isDeletable(); |
|
255 | + if ( ! is_null($model)) { |
|
256 | + return $model->isDeletable(); |
|
257 | + } |
|
248 | 258 | } |
249 | 259 | |
250 | 260 | /** |
@@ -257,7 +267,8 @@ discard block |
||
257 | 267 | */ |
258 | 268 | public function restore(Administrator $administrator, Administrator $model = null) |
259 | 269 | { |
260 | - if ( ! is_null($model)) |
|
261 | - return $model->trashed(); |
|
270 | + if ( ! is_null($model)) { |
|
271 | + return $model->trashed(); |
|
272 | + } |
|
262 | 273 | } |
263 | 274 | } |
@@ -129,8 +129,9 @@ discard block |
||
129 | 129 | */ |
130 | 130 | public function show(Administrator $administrator, Role $role = null) |
131 | 131 | { |
132 | - if ($role && $role->isAdministrator() && ! $administrator->isSuperAdmin()) |
|
133 | - return false; |
|
132 | + if ($role && $role->isAdministrator() && ! $administrator->isSuperAdmin()) { |
|
133 | + return false; |
|
134 | + } |
|
134 | 135 | } |
135 | 136 | |
136 | 137 | /** |
@@ -155,8 +156,9 @@ discard block |
||
155 | 156 | */ |
156 | 157 | public function update(Administrator $administrator, Role $role = null) |
157 | 158 | { |
158 | - if (static::isRoleLocked($role)) |
|
159 | - return false; |
|
159 | + if (static::isRoleLocked($role)) { |
|
160 | + return false; |
|
161 | + } |
|
160 | 162 | } |
161 | 163 | |
162 | 164 | /** |
@@ -169,11 +171,13 @@ discard block |
||
169 | 171 | */ |
170 | 172 | public function activate(Administrator $administrator, Role $role = null) |
171 | 173 | { |
172 | - if (static::isRoleLocked($role)) |
|
173 | - return false; |
|
174 | + if (static::isRoleLocked($role)) { |
|
175 | + return false; |
|
176 | + } |
|
174 | 177 | |
175 | - if ( ! is_null($role) && $role->isActive()) |
|
176 | - return false; |
|
178 | + if ( ! is_null($role) && $role->isActive()) { |
|
179 | + return false; |
|
180 | + } |
|
177 | 181 | } |
178 | 182 | |
179 | 183 | /** |
@@ -186,11 +190,13 @@ discard block |
||
186 | 190 | */ |
187 | 191 | public function deactivate(Administrator $administrator, Role $role = null) |
188 | 192 | { |
189 | - if (static::isRoleLocked($role)) |
|
190 | - return false; |
|
193 | + if (static::isRoleLocked($role)) { |
|
194 | + return false; |
|
195 | + } |
|
191 | 196 | |
192 | - if ( ! is_null($role) && ! $role->isActive()) |
|
193 | - return false; |
|
197 | + if ( ! is_null($role) && ! $role->isActive()) { |
|
198 | + return false; |
|
199 | + } |
|
194 | 200 | } |
195 | 201 | |
196 | 202 | /** |
@@ -203,8 +209,9 @@ discard block |
||
203 | 209 | */ |
204 | 210 | public function delete(Administrator $administrator, Role $role = null) |
205 | 211 | { |
206 | - if ( ! is_null($role)) |
|
207 | - return $role->isDeletable(); |
|
212 | + if ( ! is_null($role)) { |
|
213 | + return $role->isDeletable(); |
|
214 | + } |
|
208 | 215 | } |
209 | 216 | |
210 | 217 | /** |
@@ -218,8 +225,9 @@ discard block |
||
218 | 225 | */ |
219 | 226 | public function detachAdministrator(Administrator $administrator, Role $role = null, Administrator $model = null) |
220 | 227 | { |
221 | - if ( ! $administrator->isSuperAdmin() && $model->isSuperAdmin()) |
|
222 | - return false; |
|
228 | + if ( ! $administrator->isSuperAdmin() && $model->isSuperAdmin()) { |
|
229 | + return false; |
|
230 | + } |
|
223 | 231 | } |
224 | 232 | |
225 | 233 | /** |
@@ -233,8 +241,9 @@ discard block |
||
233 | 241 | */ |
234 | 242 | public function detachPermission(Administrator $administrator, Role $role = null, Permission $model = null) |
235 | 243 | { |
236 | - if (static::isRoleLocked($role)) |
|
237 | - return false; |
|
244 | + if (static::isRoleLocked($role)) { |
|
245 | + return false; |
|
246 | + } |
|
238 | 247 | } |
239 | 248 | |
240 | 249 | /* ----------------------------------------------------------------- |
@@ -28,8 +28,9 @@ |
||
28 | 28 | */ |
29 | 29 | public function setPasswordAttribute($password) |
30 | 30 | { |
31 | - if (is_null($password)) |
|
32 | - return; |
|
31 | + if (is_null($password)) { |
|
32 | + return; |
|
33 | + } |
|
33 | 34 | |
34 | 35 | $this->attributes['password'] = Hash::make($password); |
35 | 36 | } |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function getDisplayNameAttribute(): string |
36 | 36 | { |
37 | - if ($this->hasName()) |
|
38 | - return $this->getFullNameAttribute(); |
|
37 | + if ($this->hasName()) { |
|
38 | + return $this->getFullNameAttribute(); |
|
39 | + } |
|
39 | 40 | |
40 | 41 | return $this->username; |
41 | 42 | } |
@@ -57,8 +58,9 @@ discard block |
||
57 | 58 | */ |
58 | 59 | public function setFirstNameAttribute($firstName) |
59 | 60 | { |
60 | - if (is_null($firstName)) |
|
61 | - return; |
|
61 | + if (is_null($firstName)) { |
|
62 | + return; |
|
63 | + } |
|
62 | 64 | |
63 | 65 | $this->attributes['first_name'] = Str::title(Str::lower($firstName)); |
64 | 66 | } |
@@ -70,8 +72,9 @@ discard block |
||
70 | 72 | */ |
71 | 73 | public function setLastNameAttribute($lastName) |
72 | 74 | { |
73 | - if (is_null($lastName)) |
|
74 | - return; |
|
75 | + if (is_null($lastName)) { |
|
76 | + return; |
|
77 | + } |
|
75 | 78 | |
76 | 79 | $this->attributes['last_name'] = Str::upper($lastName); |
77 | 80 | } |
@@ -135,8 +138,9 @@ discard block |
||
135 | 138 | */ |
136 | 139 | public function getLastActivityAttribute(): string |
137 | 140 | { |
138 | - if (is_null($this->last_activity_at)) |
|
139 | - return __('No recent activity'); |
|
141 | + if (is_null($this->last_activity_at)) { |
|
142 | + return __('No recent activity'); |
|
143 | + } |
|
140 | 144 | |
141 | 145 | return $this->last_activity_at->diffForHumans(); |
142 | 146 | } |
@@ -170,8 +170,9 @@ discard block |
||
170 | 170 | */ |
171 | 171 | public function attachPermission(&$permission, bool $reload = true) |
172 | 172 | { |
173 | - if ($this->hasPermission($permission)) |
|
174 | - return; |
|
173 | + if ($this->hasPermission($permission)) { |
|
174 | + return; |
|
175 | + } |
|
175 | 176 | |
176 | 177 | event(new AttachingPermission($this, $permission)); |
177 | 178 | $permission = $this->permissions()->save($permission); |
@@ -192,8 +193,9 @@ discard block |
||
192 | 193 | { |
193 | 194 | $permission = $this->getPermissionById($id); |
194 | 195 | |
195 | - if ($permission !== null) |
|
196 | - $this->attachPermission($permission, $reload); |
|
196 | + if ($permission !== null) { |
|
197 | + $this->attachPermission($permission, $reload); |
|
198 | + } |
|
197 | 199 | |
198 | 200 | return $permission; |
199 | 201 | } |
@@ -225,8 +227,9 @@ discard block |
||
225 | 227 | */ |
226 | 228 | public function detachPermission(&$permission, bool $reload = true) |
227 | 229 | { |
228 | - if ( ! $this->hasPermission($permission)) |
|
229 | - return; |
|
230 | + if ( ! $this->hasPermission($permission)) { |
|
231 | + return; |
|
232 | + } |
|
230 | 233 | |
231 | 234 | $permission = $this->getPermissionFromGroup($permission); |
232 | 235 | |
@@ -247,8 +250,9 @@ discard block |
||
247 | 250 | */ |
248 | 251 | public function detachPermissionById($id, bool $reload = true) |
249 | 252 | { |
250 | - if ( ! is_null($permission = $this->getPermissionById($id))) |
|
251 | - $this->detachPermission($permission, $reload); |
|
253 | + if ( ! is_null($permission = $this->getPermissionById($id))) { |
|
254 | + $this->detachPermission($permission, $reload); |
|
255 | + } |
|
252 | 256 | |
253 | 257 | return $permission; |
254 | 258 | } |
@@ -296,8 +300,9 @@ discard block |
||
296 | 300 | */ |
297 | 301 | public function hasPermission($id) |
298 | 302 | { |
299 | - if ($id instanceof Model) |
|
300 | - $id = $id->getKey(); |
|
303 | + if ($id instanceof Model) { |
|
304 | + $id = $id->getKey(); |
|
305 | + } |
|
301 | 306 | |
302 | 307 | return $this->getPermissionFromGroup($id) !== null; |
303 | 308 | } |
@@ -316,8 +321,9 @@ discard block |
||
316 | 321 | */ |
317 | 322 | private function getPermissionFromGroup($id) |
318 | 323 | { |
319 | - if ($id instanceof Model) |
|
320 | - $id = $id->getKey(); |
|
324 | + if ($id instanceof Model) { |
|
325 | + $id = $id->getKey(); |
|
326 | + } |
|
321 | 327 | |
322 | 328 | $this->loadPermissions(); |
323 | 329 |
@@ -273,8 +273,9 @@ discard block |
||
273 | 273 | */ |
274 | 274 | public function attachUser($administrator, bool $reload = true): void |
275 | 275 | { |
276 | - if ($this->hasAdministrator($administrator)) |
|
277 | - return; |
|
276 | + if ($this->hasAdministrator($administrator)) { |
|
277 | + return; |
|
278 | + } |
|
278 | 279 | |
279 | 280 | event(new AttachingAdministrator($this, $administrator)); |
280 | 281 | $this->administrators()->attach($administrator); |
@@ -314,8 +315,9 @@ discard block |
||
314 | 315 | */ |
315 | 316 | public function attachPermission($permission, bool $reload = true): void |
316 | 317 | { |
317 | - if ($this->hasPermission($permission)) |
|
318 | - return; |
|
318 | + if ($this->hasPermission($permission)) { |
|
319 | + return; |
|
320 | + } |
|
319 | 321 | |
320 | 322 | event(new AttachingPermission($this, $permission)); |
321 | 323 | $this->permissions()->attach($permission); |
@@ -366,8 +368,9 @@ discard block |
||
366 | 368 | */ |
367 | 369 | public function can(string $ability): bool |
368 | 370 | { |
369 | - if ( ! $this->isActive()) |
|
370 | - return false; |
|
371 | + if ( ! $this->isActive()) { |
|
372 | + return false; |
|
373 | + } |
|
371 | 374 | |
372 | 375 | return $this->permissions->filter(function (Permission $permission) use ($ability) { |
373 | 376 | return $permission->hasAbility($ability); |
@@ -287,8 +287,9 @@ discard block |
||
287 | 287 | */ |
288 | 288 | public function canImpersonate(): bool |
289 | 289 | { |
290 | - if ( ! impersonator()->isEnabled()) |
|
291 | - return false; |
|
290 | + if ( ! impersonator()->isEnabled()) { |
|
291 | + return false; |
|
292 | + } |
|
292 | 293 | |
293 | 294 | return $this->isSuperAdmin(); |
294 | 295 | } |
@@ -300,8 +301,9 @@ discard block |
||
300 | 301 | */ |
301 | 302 | public function canBeImpersonated(): bool |
302 | 303 | { |
303 | - if ( ! impersonator()->isEnabled()) |
|
304 | - return false; |
|
304 | + if ( ! impersonator()->isEnabled()) { |
|
305 | + return false; |
|
306 | + } |
|
305 | 307 | |
306 | 308 | return false; |
307 | 309 | } |
@@ -151,8 +151,9 @@ |
||
151 | 151 | public function getValidRecoveryCode(string $code) |
152 | 152 | { |
153 | 153 | foreach ($this->decrypted_recovery_codes as $recoveryCode) { |
154 | - if (hash_equals($code, $recoveryCode)) |
|
155 | - return $recoveryCode; |
|
154 | + if (hash_equals($code, $recoveryCode)) { |
|
155 | + return $recoveryCode; |
|
156 | + } |
|
156 | 157 | } |
157 | 158 | |
158 | 159 | return null; |