uidaho / smartsettia

app/Http/Controllers/SiteController.php

Braces +5 added lines, -4 removed lines

@@ -66,10 +66,11 @@
         $site = Site::findOrFail($id);
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
     
-        if (\Request::ajax())
-            return response()->json(['site' => $site, 'locations' => $locations]);
-        else
-            return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
+        if (\Request::ajax()) {
+                    return response()->json(['site' => $site, 'locations' => $locations]);
+        } else {
+                    return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
+        }
     }
     
     /**

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $locations = $site->locations()->orderBy('name', 'ASC')->paginate(15);
     
         if (\Request::ajax())
-            return response()->json(['site' => $site, 'locations' => $locations]);
+            return response()->json([ 'site' => $site, 'locations' => $locations ]);
         else
             return view('site.show', [ 'site' => $site, 'locations' => $locations ]);
     }

app/Http/Controllers/DashboardController.php

Braces +9 added lines, -8 removed lines

@@ -42,13 +42,13 @@ 
             $location = $device->location ?? null;
             
             //If the location exists then set the pagination page to be where the device is located
-            if ($location != null)
-                $request->merge([ 'page' => $device->dashPageNum(4) ]);
+            if ($location != null) {
+                            $request->merge([ 'page' => $device->dashPageNum(4) ]);
+            }
             $site_id = $location->site_id ?? 0;
             $location_id = $location->id ?? 0;
             $device_id = $device->id ?? 0;
-        }
-        else
+        } else
         {
             //Get the active site, location, and device ids
             $site_id = $request->site_id ?? 0;
@@ -82,8 +82,9 @@ 
         {
             //If the original device with the given device id was not found
             //Then assign the the first device in the device list as the active device
-            if ($active_device == null)
-                $active_device = $devices[ 0 ];
+            if ($active_device == null) {
+                            $active_device = $devices[ 0 ];
+            }
         
             //Add an attribute to each device defining if it is stale
             $devices->transform(function($item)
@@ -97,9 +98,9 @@ 
                 {
                     $imageStaleMins = ceil(($item->image_rate * 3) / 60) + 1;
                     $item[ 'isImageStale' ] = ($item->image_updated_at <= Carbon::now()->subMinute($imageStaleMins)) ? true : false;
+                } else {
+                                    $item[ 'isImageStale' ] = false;
                 }
-                else
-                    $item[ 'isImageStale' ] = false;
                 
                 return $item;
             });

app/DataTables/ActivityLogDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -17,31 +17,31 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('causer_id', function ($activity) {
+            ->editColumn('causer_id', function($activity) {
                 if ($activity->causer_id && is_object($activity->causer)) {
-                    return '<a href="' . route($this->getRouteFromType($activity->causer_type), $activity->causer_id) . '">' . $activity->causer->name ?? '' . '</a>';
+                    return '<a href="'.route($this->getRouteFromType($activity->causer_type), $activity->causer_id).'">'.$activity->causer->name ?? ''.'</a>';
                 } else {
                     return '';
                 }
             })
-            ->editColumn('subject_id', function ($activity) {
+            ->editColumn('subject_id', function($activity) {
                 if ($activity->subject_id && is_object($activity->subject)) {
-                    return '<a href="' . route($this->getRouteFromType($activity->subject_type), $activity->subject_id) . '">' . $activity->subject->name ?? '' . '</a>';
+                    return '<a href="'.route($this->getRouteFromType($activity->subject_type), $activity->subject_id).'">'.$activity->subject->name ?? ''.'</a>';
                 } else {
                     return '';
                 }
             })
-            ->editColumn('properties', function ($activity) {
+            ->editColumn('properties', function($activity) {
                 return $activity->properties;
             })
-            ->editColumn('created_at', function ($activity) {
+            ->editColumn('created_at', function($activity) {
                 if ($activity->created_at->diffInDays() > 0) {
                                     return $activity->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
                 } else {
                                     return $activity->created_at->diffForHumans();
                 }
             })
-            ->rawColumns(['causer_id', 'subject_id', 'properties']);
+            ->rawColumns([ 'causer_id', 'subject_id', 'properties' ]);
     }
     
     public function getRouteFromType($type) {

app/Http/Controllers/ImageController.php

Braces +5 added lines, -4 removed lines

@@ -25,10 +25,11 @@
      */
     public function show($device_id)
     {
-        if (Storage::disk('private')->exists('deviceimage/'.$device_id))
-            $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id));
-        else
-            $image = Image::make('img/video_not_found.jpg');
+        if (Storage::disk('private')->exists('deviceimage/'.$device_id)) {
+                    $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id));
+        } else {
+                    $image = Image::make('img/video_not_found.jpg');
+        }
         
         return $image->response();
     }

app/Http/Controllers/UserController.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
             'email' => $request->input('email'),
             'password' => bcrypt($request->input('password')),
             'phone' => $request->input('phone'),
-            'role' => $request->input('role'),]);
+            'role' => $request->input('role'), ]);
 
         return redirect()->route('user.show', $user->id)
             ->with('success', 'User created successfully');

Braces +10 added lines, -8 removed lines

@@ -117,19 +117,21 @@
             $user->email = $request->input('email');
             $user->role = $request->input('role');
             $user->phone = $request->input('phone');
-            if ($request->input('password') != '')
-                $user->password = bcrypt($request->input('password'));
+            if ($request->input('password') != '') {
+                            $user->password = bcrypt($request->input('password'));
+            }
+        } else {
+                    $user->preferred_device_id = $request->input('preferred_device_id');
         }
-        else
-            $user->preferred_device_id = $request->input('preferred_device_id');
     
         $user->save();
     
-        if (\Request::ajax())
-            return response()->json([ 'success' => 'Preferred device updated successfully' ]);
-        else
-            return redirect()->route('user.show', $user->id)
+        if (\Request::ajax()) {
+                    return response()->json([ 'success' => 'Preferred device updated successfully' ]);
+        } else {
+                    return redirect()->route('user.show', $user->id)
                 ->with('success', 'User updated successfully');
+        }
     }
 
     /**

app/Http/Controllers/DeviceController.php

Braces +34 added lines, -24 removed lines

@@ -118,53 +118,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', $device->id)
+        if (\Request::ajax()) {
+                    return response()->json([ 'success' => 'Device updated successfully' ]);
+        } else {
+                    return redirect()->route('device.show', $device->id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**