uidaho / smartsettia

app/Http/Controllers/SiteController.php

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

Braces +5 added lines, -4 removed lines

@@ -65,10 +65,11 @@
     {
         $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 ]);
+        }
     }
     
     /**

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