idevelopment / timecontrol

app/Http/Controllers/SickController.php

Indentation +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
             \Mail::send('emails.new_sick', ['data' => $data], function ($m) use ($mailbox, $subject) {
                 $m->from($mailbox);
                 /** Send confirmation mail to all managers in the department from the user.
-                *$m->to("")->subject("$subject");
-                */
+                 *$m->to("")->subject("$subject");
+                 */
             });
 
             return redirect('sick');

app/Http/Controllers/SettingsController.php

Indentation +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     'Y.m.d' => '2010.12.23',
     'd.m.Y' => '23.12.2010',
     'm.d.Y' => '12.23.2010',
-  );
+    );
 
     $time_formats = array (
     'H:i' => '23:00',
@@ -35,9 +35,9 @@ 
     'h:iA' => '11:00PM',
     'h:i a' => '11:00 pm',
     'h:i A' => '11:00 PM',
-  );
+    );
 
-     return view('settings/basic', ['date_formats' => $date_formats, 'time_formats' => $time_formats]);
+        return view('settings/basic', ['date_formats' => $date_formats, 'time_formats' => $time_formats]);
     }
 
     /**

app/Http/Controllers/TaskController.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function store(Request $request)
     {
-       //
+        //
     }
 
     /**

app/Http/Controllers/StaffController.php

Indentation +4 added lines, -4 removed lines

@@ -261,10 +261,10 @@
     public function update(Request $request)
     {
         /** TODO: Add validation - Tjoosten
-        *  <<<<<<< Updated upstream
-        *  =======
-        *  >>>>>>> Stashed changes 
-        */
+         *  <<<<<<< Updated upstream
+         *  =======
+         *  >>>>>>> Stashed changes 
+         */
         $user = User::findOrFail(auth()->user()->id);
         $user->fname = $request->get('email');
         $user->name = $request->get('name');