uidaho / smartsettia

app/Http/Requests/EditDevice.php

Spacing +4 added lines, -4 removed lines

@@ -46,19 +46,19 @@
     {
         $validator = parent::getValidatorInstance();
     
-        $validator->sometimes('site_id', 'bail|integer|digits_between:1,10|exists:sites,id', function ($input) {
+        $validator->sometimes('site_id', 'bail|integer|digits_between:1,10|exists:sites,id', function($input) {
             return !$input->new_site_name && $input->site_id;
         });
     
-        $validator->sometimes('location_id', 'bail|integer|digits_between:1,10|exists:locations,id', function ($input) {
+        $validator->sometimes('location_id', 'bail|integer|digits_between:1,10|exists:locations,id', function($input) {
             return !$input->new_location_name && $input->location_id;
         });
     
-        $validator->sometimes('new_site_name', 'bail|min:2|max:190|name|unique:sites,name', function ($input) {
+        $validator->sometimes('new_site_name', 'bail|min:2|max:190|name|unique:sites,name', function($input) {
             return !$input->site_id && $input->name;
         });
     
-        $validator->sometimes('new_location_name', 'bail|min:2|max:190|name|unique:locations,name', function ($input) {
+        $validator->sometimes('new_location_name', 'bail|min:2|max:190|name|unique:locations,name', function($input) {
             return !$input->location_id && $input->name;
         });
         

app/DataTables/ActivityLogDataTable.php

Braces +5 added lines, -4 removed lines

@@ -27,10 +27,11 @@
                 return $activity->properties;
             })
             ->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();
+                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']);
     }

Spacing +8 added lines, -8 removed lines

@@ -17,30 +17,30 @@ 
     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) {
@@ -137,6 +137,6 @@ 
      */
     protected function filename()
     {
-        return 'activitylog_' . time();
+        return 'activitylog_'.time();
     }
 }

app/DataTables/DevicesDataTable.php

Spacing +7 added lines, -7 removed lines

@@ -16,19 +16,19 @@
     public function dataTable($query)
     {
         return datatables($query)
-            ->editColumn('name', function ($device) {
-                return '<a href="' . route('device.show', $device->id) . '">' . $device->name . '</a>';
+            ->editColumn('name', function($device) {
+                return '<a href="'.route('device.show', $device->id).'">'.$device->name.'</a>';
             })
-            ->addColumn('location', function ($device) {
+            ->addColumn('location', function($device) {
                 return ($device->location->name ?? 'null');
             })
-            ->addColumn('site', function ($device) {
+            ->addColumn('site', function($device) {
                 return ($device->location->site->name ?? 'null');
             })
-            ->addColumn('rates', function ($device) {
-                return $device->update_rate . '/' . $device->image_rate .'/' . $device->sensor_rate;
+            ->addColumn('rates', function($device) {
+                return $device->update_rate.'/'.$device->image_rate.'/'.$device->sensor_rate;
             })
-            ->editColumn('updated_at', function ($device) {
+            ->editColumn('updated_at', function($device) {
                 return (is_object($device->updated_at) ? $device->updatedAtHuman : 'null');
             })
             ->blacklist([ 'location', 'site', 'rates' ])

app/DataTables/UsersDataTable.php

Spacing +3 added lines, -3 removed lines

@@ -16,16 +16,16 @@
     {
         return datatables($query)
             ->editColumn('name', function(User $user) {
-                return '<a href="' . route('user.show', $user->id) . '">'. $user->name . '</a>';
+                return '<a href="'.route('user.show', $user->id).'">'.$user->name.'</a>';
             })
 
             ->editColumn('role', function(User $user) {
                 return $user->roleString();
             })
-            ->editColumn('updated_at', function ($user) {
+            ->editColumn('updated_at', function($user) {
                 return $user->updatedAtHuman;
             })
-            ->editColumn('created_at', function ($user) {
+            ->editColumn('created_at', function($user) {
                 return $user->createdAtHuman;
             })
             ->addColumn('action', 'user.action')

app/SensorData.php

Braces +10 added lines, -8 removed lines

@@ -145,10 +145,11 @@ 
      */
     public function getUpdatedAtHumanAttribute()
     {
-        if ($this->updated_at->diffInDays() > 0)
-            return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
-        else
-            return $this->updated_at->diffForHumans();
+        if ($this->updated_at->diffInDays() > 0) {
+                    return $this->updated_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
+        } else {
+                    return $this->updated_at->diffForHumans();
+        }
     }
     
     /**
@@ -163,9 +164,10 @@ 
      */
     public function getCreatedAtHumanAttribute()
     {
-        if ($this->created_at->diffInDays() > 0)
-            return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
-        else
-            return $this->created_at->diffForHumans();
+        if ($this->created_at->diffInDays() > 0) {
+                    return $this->created_at->setTimezone(Auth::user()->timezone)->format('M d, Y h:i a');
+        } else {
+                    return $this->created_at->diffForHumans();
+        }
     }
 }
\ No newline at end of file

app/Http/Controllers/Auth/RegisterController.php

Spacing +2 added lines, -2 removed lines

@@ -54,10 +54,10 @@
             'registration_password' => 'required|string|min:8',
         ]);
     
-        return $validator->after(function ($validator) {
+        return $validator->after(function($validator) {
             if (array_key_exists('registration_password', $validator->valid()))
             {
-                if ($validator->valid()['registration_password'] != env('REGISTRATION_CHALLENGE', 'temppass')) {
+                if ($validator->valid()[ 'registration_password' ] != env('REGISTRATION_CHALLENGE', 'temppass')) {
                     $validator->errors()->add('registration_password', 'Incorrect registration password.');
                 }
             }