Merge branch 'master' of github.com:jeremykenedy/laravel-users

Author: jeremykenedy

src/App/Http/Controllers/UsersManagementController.php

@@ -4,8 +4,8 @@
 
 use App\Http\Controllers\Controller;
 use Auth;
-use Illuminate\Http\Response;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Validator;
 
 class UsersManagementController extends Controller
@@ -250,6 +250,7 @@ public function destroy($id)
 
         if ($currentUser->id != $user->id) {
             $user->delete();
+
             return redirect('users')->with('success', trans('laravelusers::laravelusers.messages.delete-success'));
         }
 
@@ -259,27 +260,27 @@ public function destroy($id)
     /**
      * Method to search the users.
      *
-     * @param  Request $request
+     * @param Request $request
      *
      * @return \Illuminate\Http\Response
      */
-    public function search(Request $request){
-
+    public function search(Request $request)
+    {
         $searchTerm = $request->input('user_search_box');
         $searchRules = [
             'user_search_box' => 'required|string|max:255',
         ];
         $searchMessages = [
             'user_search_box.required' => 'Search term is required',
-            'user_search_box.string' => 'Search term has invalid characters',
-            'user_search_box.max' => 'Search term has too many characters - 255 allowed',
+            'user_search_box.string'   => 'Search term has invalid characters',
+            'user_search_box.max'      => 'Search term has too many characters - 255 allowed',
         ];
 
         $validator = Validator::make($request->all(), $searchRules, $searchMessages);
 
         if ($validator->fails()) {
             return response()->json([
-                json_encode($validator)
+                json_encode($validator),
             ], Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
@@ -290,14 +291,13 @@ public function search(Request $request){
         // Attach roles to results
         foreach ($results as $result) {
             $roles = [
-                'roles' => $result->roles
+                'roles' => $result->roles,
             ];
             $result->push($roles);
         }
 
         return response()->json([
-            json_encode($results)
+            json_encode($results),
         ], Response::HTTP_OK);
     }
-
 }

src/resources/lang/en/forms.php

@@ -45,8 +45,8 @@
     'create_user_icon_bio'              => 'fa-pencil',
 
     'create_user_label_twitter_username' => 'User Twitter Username',
-    'create_user_ph_twitter_username'   => 'User Twitter Username',
-    'create_user_icon_twitter_username' => 'fa-twitter',
+    'create_user_ph_twitter_username'    => 'User Twitter Username',
+    'create_user_icon_twitter_username'  => 'fa-twitter',
 
     'create_user_label_github_username' => 'User GitHub Username',
     'create_user_ph_github_username'    => 'User GitHub Username',