Completed
Push — master ( ae7a17...a23113 )
by Sherif
14:07
created
src/Modules/Acl/Repositories/UserRepository.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $user        = \Core::users()->find(\Auth::id(), $relations);
29 29
         foreach ($user->groups()->get() as $group)
30 30
         {
31
-            $group->permissions->each(function ($permission) use (&$permissions){
31
+            $group->permissions->each(function($permission) use (&$permissions){
32 32
                 $permissions[$permission->model][$permission->id] = $permission->name;
33 33
             });
34 34
         }
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         $user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
52 52
         $permissions = [];
53 53
 
54
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
54
+        $user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
55 55
             $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
56 56
         });
57 57
         
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function assignGroups($userId, $group_ids)
82 82
     {
83
-        \DB::transaction(function () use ($userId, $group_ids) {
83
+        \DB::transaction(function() use ($userId, $group_ids) {
84 84
             $user = $this->find($userId);
85 85
             $user->groups()->detach();
86 86
             $user->groups()->attach($group_ids);
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
      */
251 251
     public function resetPassword($credentials)
252 252
     {
253
-        $response = \Password::reset($credentials, function ($user, $password) {
253
+        $response = \Password::reset($credentials, function($user, $password) {
254 254
             $user->password = $password;
255 255
             $user->save();
256 256
         });
Please login to merge, or discard this patch.
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -102,20 +102,16 @@  discard block
 block discarded – undo
102 102
         if ( ! $user = $this->first(['email' => $credentials['email']])) 
103 103
         {
104 104
             \ErrorHandler::loginFailed();
105
-        }
106
-        else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
105
+        } else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
107 106
         {
108 107
             \ErrorHandler::loginFailed();
109
-        }
110
-        else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
108
+        } else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
111 109
         {
112 110
             \ErrorHandler::loginFailed();
113
-        }
114
-        else if ($user->blocked)
111
+        } else if ($user->blocked)
115 112
         {
116 113
             \ErrorHandler::userIsBlocked();
117
-        }
118
-        else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
114
+        } else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
119 115
         {
120 116
             \ErrorHandler::emailNotConfirmed();
121 117
         }
@@ -165,8 +161,7 @@  discard block
 block discarded – undo
165 161
         {
166 162
             $user->confirmed = 1;
167 163
             $user->save();
168
-        }
169
-        else if ( ! config('skeleton.disable_confirm_email'))  
164
+        } else if ( ! config('skeleton.disable_confirm_email'))  
170 165
         {
171 166
             $this->sendConfirmationEmail($user->email);
172 167
         }
@@ -189,12 +184,10 @@  discard block
 block discarded – undo
189 184
         if ( ! $this->hasGroup(['Admin']))
190 185
         {
191 186
             \ErrorHandler::noPermissions();
192
-        }
193
-        else if (\Auth::id() == $userId)
187
+        } else if (\Auth::id() == $userId)
194 188
         {
195 189
             \ErrorHandler::noPermissions();
196
-        }
197
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
190
+        } else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
198 191
         {
199 192
             \ErrorHandler::noPermissions();
200 193
         }
Please login to merge, or discard this patch.