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/TeamsController.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function index()
     {
-        $teams = Teams::orderBy('name', 'asc')->paginate(10);;
+        $teams = Teams::orderBy('name', 'asc')->paginate(10); ;
         return view('teams/list', ['teams' => $teams]);
     }
 

app/Http/Controllers/SettingsController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller

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]);
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     'm.d.Y' => '12.23.2010',
   );
 
-    $time_formats = array (
+    $time_formats = array(
     'H:i' => '23:00',
     'h:ia' => '11:00pm',
     'h:iA' => '11:00PM',

app/Http/Controllers/BreakController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller

app/Http/Controllers/TaskController.php

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller

Indentation +1 added lines, -1 removed lines

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

app/Http/Controllers/DepartmentsController.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use App\Http\Requests;
 use App\Departments;
 use App\Department_members;
-use Mail;
 use App\User;
 
 class DepartmentsController extends Controller

app/Http/Controllers/TypesController.php

Doc Comments +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
@@ -85,7 +85,7 @@ 
      * Remove the specified resource from storage.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy($id)
     {

Unused Use Statements -2 removed lines

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-
-use App\Http\Requests;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller

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();
         }