idevelopment / timecontrol

app/Http/Controllers/StaffController.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
 
         $injectionData = ['user' => $user, 'password' => $mail_password];
         
-        Mail::send('emails.new_user', $injectionData, function ($m) use ($user, $mailbox) {
+        Mail::send('emails.new_user', $injectionData, function($m) use ($user, $mailbox) {
             $m->from($mailbox);
             $m->to($user->email)->subject('Your user credentials!');
         });
@@ -261,11 +261,11 @@ 
     public function update(Request $request)
     {
         // TODO: Add validation - Tjoosten
-<<<<<<< Updated upstream
+<< << << < Updated upstream
         
-=======
+=== === =
 
->>>>>>> Stashed changes
+>> >> >> > Stashed changes
         $user = User::findOrFail(auth()->user()->id);
         $user->fname = $request->get('email');
         $user->name = $request->get('name');
@@ -275,8 +275,8 @@ 
 
         if (Input::file()) {
             $image = Input::file('avatar');
-            $filename = time() . '.' . $image->getClientOriginalExtension();
-            $path = public_path('profilepics/' . $filename);
+            $filename = time().'.'.$image->getClientOriginalExtension();
+            $path = public_path('profilepics/'.$filename);
 
             Image::make($image->getRealPath())->resize(200, 200)->save($path);
             $user->image = $filename;
@@ -295,7 +295,7 @@ 
      */
     public function destroy($id)
     {
-        if (! Auth::user()->is('Administrator')) {
+        if (!Auth::user()->is('Administrator')) {
             return Redirect::back();
         }