uidaho / smartsettia

app/Http/Controllers/HomeController.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 class HomeController extends Controller
 {
     /**

app/Notifications/InvoicePaid.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\NexmoMessage;
 
 class InvoicePaid extends Notification

app/Http/Controllers/ImageController.php

Unused Use Statements -2 removed lines

@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Intervention\Image\Facades\Image as Image;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
 
 class ImageController extends Controller

app/Notifications/DeviceRegister.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\NexmoMessage;
 
 class DeviceRegister extends Notification

app/Http/Controllers/DeviceController.php

Unused Use Statements -2 removed lines

@@ -3,10 +3,8 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\EditDevice;
-use Validator;
 use Illuminate\Http\Request;
 use App\DataTables\DevicesDataTable;
-use Illuminate\Support\Facades\Route;
 use App\Device;
 use App\Site;
 use App\Location;

Braces +38 added lines, -28 removed lines

@@ -116,8 +116,9 @@ 
                 //Create a new site
                 $site = Site::create(['name' => $request->input('new_site_name')]);
                 $site_id = $site->id;
-            } else
-                $site_id = $request->input('site_id');
+            } else {
+                            $site_id = $request->input('site_id');
+            }
     
             //Get the location id of the old or newly created location
             if (!empty($request->input('new_location_name')))
@@ -125,53 +126,63 @@ 
                 //Create a new location
                 $location = Location::create(['name' => $request->input('new_location_name'), 'site_id' => $site_id]);
                 $location_id = $location->id;
-            } else
-                $location_id = $request->input('location_id');
+            } else {
+                            $location_id = $request->input('location_id');
+            }
     
             //Update the device
             $device->location_id = $location_id;
         }
         
         //Update the device
-        if ($request->input('name') != null)
-            $device->name = $request->input('name');
-        if ($request->input('open_time') != null)
-            $device->open_time = $request->input('open_time');
-        if ($request->input('close_time') != null)
-            $device->close_time = $request->input('close_time');
-        if ($request->input('update_rate') != null)
-            $device->update_rate = $request->input('update_rate');
-        if ($request->input('image_rate') != null)
-            $device->image_rate = $request->input('image_rate');
-        if ($request->input('sensor_rate') != null)
-            $device->sensor_rate = $request->input('sensor_rate');
+        if ($request->input('name') != null) {
+                    $device->name = $request->input('name');
+        }
+        if ($request->input('open_time') != null) {
+                    $device->open_time = $request->input('open_time');
+        }
+        if ($request->input('close_time') != null) {
+                    $device->close_time = $request->input('close_time');
+        }
+        if ($request->input('update_rate') != null) {
+                    $device->update_rate = $request->input('update_rate');
+        }
+        if ($request->input('image_rate') != null) {
+                    $device->image_rate = $request->input('image_rate');
+        }
+        if ($request->input('sensor_rate') != null) {
+                    $device->sensor_rate = $request->input('sensor_rate');
+        }
         //Check if the cover_command needs to be updated
         if ($request->input('command') != null)
         {
             //If device is currently opening, closing or in an error state don't update command
-            if (!$device->isReadyForCommand())
-                return response()->json("Device is currently in use.", 403);
+            if (!$device->isReadyForCommand()) {
+                            return response()->json("Device is currently in use.", 403);
+            }
     
             $command = $request->input('command');
             
             //If command is to unlock the device then check if the device should be open or closed based on the schedule
             if ($request->command === 'unlock')
             {
-                if ($device->isDuringScheduleOpen())
-                    $command =  'open';
-                else
-                    $command =  'close';
+                if ($device->isDuringScheduleOpen()) {
+                                    $command =  'open';
+                } else {
+                                    $command =  'close';
+                }
             }
             $device->cover_command = $command;
         }
         
         $device->save();
     
-        if (\Request::ajax())
-            return response()->json(['success' => 'Device updated successfully']);
-        else
-            return redirect()->route('device.show', $id)
+        if (\Request::ajax()) {
+                    return response()->json(['success' => 'Device updated successfully']);
+        } else {
+                    return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**
@@ -188,8 +199,7 @@ 
         {
             //If the device was already deleted then permanently delete it
             $device->forceDelete($device->id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $device->location_id = null;

app/Http/Controllers/ActivityLogController.php

Unused Use Statements -3 removed lines

@@ -2,11 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use Validator;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\DataTables\ActivityLogDataTable;
-use App\User;
 
 class ActivityLogController extends Controller
 {

app/DataTables/DevicesDataTable.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace App\DataTables;
 
 use App\Device;
-use App\Site;
 use Yajra\DataTables\Services\DataTable;
 
 class DevicesDataTable extends DataTable

app/Http/Controllers/UserController.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Validator;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\DataTables\UsersDataTable;

app/Http/Controllers/LocationController.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\DataTables\LocationDataTable;
 use App\Location;
 use App\Site;

Braces +4 added lines, -4 removed lines

@@ -54,9 +54,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        else
-            $site_id = $request->input('site');
     
         $location = Location::create(['name' => $request->input('name'), 'site_id' => $site_id]);
     
@@ -107,9 +107,9 @@ 
             //Create a new site
             $site = Site::create(['name' => $request->input('new_site_name')]);
             $site_id = $site->id;
+        } else {
+                    $site_id = $request->input('site');
         }
-        else
-            $site_id = $request->input('site');
         
         //Update the location with the supplied name and the site
         Location::findOrFail($id)->update(['name' => $request->input('name'), 'site_id' => $site_id]);