uidaho / smartsettia

app/Http/Controllers/DashboardController.php

Braces +21 added lines, -17 removed lines

@@ -34,8 +34,7 @@ 
             //Todo use the users preferred device
             //Get the first device that doesn't have a null location_id
             $device = Device::publicDashData()->where('location_id', '!=', 'null')->orderBy('id', 'ASC')->first();
-        }
-        catch(ModelNotFoundException $e)
+        } catch(ModelNotFoundException $e)
         {
             //If no device is found then redirect the user to the home page and display a message about registering a device
             return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -85,14 +84,15 @@ 
         //Get the given device if it is still at the same location
         $device = Device::publicDashData()->where('location_id', '=', $request->location_id)->find($request->device_id);
         
-        if (empty($site))                 //Check if the site still exists
+        if (empty($site)) {
+            //Check if the site still exists
         {
             try
             {
                 //Get the first site and if no sites exist throw an error
                 $site = Site::select('id', 'name')->firstOrFail();
-            }
-            catch(ModelNotFoundException $e)
+        }
+            } catch(ModelNotFoundException $e)
             {
                 //If no device is found then redirect the user to the home page and display a message about registering a device
                 return redirect('home')->with('no_devices', 'To access the dashboard page there must be at least one registered device assigned to a location.');
@@ -102,19 +102,21 @@ 
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($location))        //Check if the location still exists
+        } else if (empty($location)) {
+            //Check if the location still exists
         {
             //Get the first location from the given site
             $location = $site->locations()->select('id', 'name', 'site_id')->firstOrFail();
+        }
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
-        }
-        else if (empty($device))        //Check if the device still exists at the given location
+        } else if (empty($device)) {
+            //Check if the device still exists at the given location
         {
             //Get the first device from the location
             $device = $location->devices()->publicDashData()->firstOrFail();
         }
+        }
         
         $data = $this->dashData($site, $location, $device);
         
@@ -199,8 +201,9 @@ 
         ])->validate();
         
         //Check that device isn't currently in use or has an error
-        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error')
-            return response()->json("Device is currently in use.", 403);
+        if ($device->cover_status === 'opening' || $device->cover_status === 'closing' || $device->cover_status === 'error') {
+                    return response()->json("Device is currently in use.", 403);
+        }
         
         //1 = open, 2 = close, 3 = lock
         switch($request->command)
@@ -238,13 +241,14 @@ 
             $time_now = Carbon::now(Auth::user()->timezone);
             
             //Check if the current time is during the open schedule or not
-            if (($time_now > $open_time) && ($time_now < $close_time))
-                $command =  'open';
-            else
-                $command =  'close';
+            if (($time_now > $open_time) && ($time_now < $close_time)) {
+                            $command =  'open';
+            } else {
+                            $command =  'close';
+            }
+        } else {
+                    $command =  'lock';
         }
-        else
-            $command =  'lock';
         
         return $command;
     }

app/Http/Controllers/DeviceController.php

Braces +16 added lines, -16 removed lines

@@ -84,8 +84,7 @@ 
             $sites->prepend($location->site);
             //Add the current location to the front of the collection of locations
             $locations->prepend($location);
-        }
-        else
+        } else
         {
             //Set locations to null since there is no site or location attached to the selected device
             $locations = null;
@@ -93,10 +92,11 @@ 
             $sites = Site::all();
         }
         
-        if (\Request::ajax())
-            return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
-        else
-            return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        if (\Request::ajax()) {
+                    return response()->json([ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        } else {
+                    return view('device.edit', [ 'device' => $device, 'locations' => $locations, 'sites' => $sites ]);
+        }
     }
     
     /**
@@ -110,8 +110,9 @@ 
     {
         $locations = Location::bySite($site_id)->select('id', 'name', 'site_id')->get();
         
-        if ($locations->isEmpty())
-            $locations = null;
+        if ($locations->isEmpty()) {
+                    $locations = null;
+        }
     
         return response()->json($locations);
     }
@@ -151,8 +152,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = Site::createSite($siteName)->id;
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -166,8 +166,7 @@ 
             //Create a new location
             $locationName = $request->input('new_location_name');
             $location_id = Location::createLocation($locationName, $site_id)->id;
-        }
-        else
+        } else
         {
             $location_id = $request->input('location');
         }
@@ -188,11 +187,12 @@ 
         //Remove any unused sites or locations
         $this->RemoveUnusedSiteLoc();
     
-        if (\Request::ajax())
-            return response()->json("Success");
-        else
-            return redirect()->route('device.show', $id)
+        if (\Request::ajax()) {
+                    return response()->json("Success");
+        } else {
+                    return redirect()->route('device.show', $id)
                 ->with('success', 'Device updated successfully');
+        }
     }
 
     /**

app/Http/Controllers/LocationController.php

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

app/Device.php

Braces +10 added lines, -8 removed lines

@@ -107,8 +107,9 @@ 
         $time = new Carbon($value, 'UTC');
         
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
 
         return $time->format('H:i');
     }
@@ -126,8 +127,9 @@ 
         $time = new Carbon($value, 'UTC');
     
         //If the user is logged in then use there preferred timezone
-        if (Auth::check())
-            $time = $time->setTimezone(Auth::user()->timezone);
+        if (Auth::check()) {
+                    $time = $time->setTimezone(Auth::user()->timezone);
+        }
         
         return $time->format('H:i');
     }
@@ -147,9 +149,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['open_time'] = $time->format('H:i:s');
     }
@@ -169,9 +171,9 @@ 
         {
             $time = new Carbon($value, Auth::user()->timezone);
             $time = $time->setTimezone('UTC');
+        } else {
+                    $time = new Carbon($value, 'UTC');
         }
-        else
-            $time = new Carbon($value, 'UTC');
         
         $this->attributes['close_time'] = $time->format('H:i:s');
     }