uidaho / smartsettia

app/Http/Controllers/ImageController.php

Braces +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
         $storagePath = storage_path('app/images/devices/');
         $imagePath = glob($storagePath . $device_id . "*" . ".jpg");
         
-        if (!empty($imagePath))
-            $image = Image::make($imagePath[0]);
-        else
+        if (!empty($imagePath)) {
+                    $image = Image::make($imagePath[0]);
+        } else
         {
             $imagePath = public_path() . '/img/video_not_found.jpg';
             $image = Image::make($imagePath);

app/Http/Controllers/DeviceController.php

Braces +5 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
         {
             $sites = $this->site_m->orderedSitesBy($location->site_id);
             $locations = $this->location_m->orderedSiteLocationsBy($location->site_id, $device->location_id);
-        }
-        else
+        } else
         {
             $locations = null;
             $sites = $this->site_m->all();
@@ -141,8 +140,7 @@ 
             //Create a new site
             $siteName = $request->input('new_site_name');
             $site_id = $this->site_m->createSite($siteName);
-        }
-        else
+        } else
         {
             $site_id = $request->input('site');
         }
@@ -154,8 +152,7 @@ 
             //Create a new location
             $locationName = $request->input('new_location_name');
             $location_id = $this->location_m->createLocation($locationName, $site_id);
-        }
-        else
+        } else
         {
             $location_id = $request->input('location');
         }
@@ -185,8 +182,7 @@ 
         {
             //If the user was already deleted then permanently delete it
             $this->device_m->destroy($id);
-        }
-        else
+        } else
         {
             //Remove the location from the device
             $oldLocation_id = $device->location_id;
@@ -232,8 +228,7 @@ 
             {
                 //Get the site connected to the location and delete it
                 $this->site_m->findOrFail($site_id)->delete();
-            }
-            else
+            } else
             {
                 //Delete the location that isn't used anymore
                 $oldLocation->delete();

app/Http/Controllers/ApiController.php

Doc Comments +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
     /**
      * Creates a json response for all the devices.
      *
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function index()
     {
@@ -23,7 +23,7 @@ 
      * Creates a json response for a specifc device.
      *
      * @param  Device  $device
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */    
     public function show(Device $device)
     {
@@ -34,7 +34,7 @@ 
      * Updates the status of a device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Request $request)
     {
@@ -105,7 +105,7 @@ 
      * Registers a new device.
      *
      * @param  Request  $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function register(Request $request)
     {