@@ -24,7 +24,7 @@ |
||
24 | 24 | * |
25 | 25 | * @var array |
26 | 26 | */ |
27 | - protected $hidden = ['token']; |
|
27 | + protected $hidden = [ 'token' ]; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * The attributes that are mass assignable. |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | if (Storage::disk('private')->exists('deviceimage/'.$device_id)) { |
31 | 31 | $image = Image::make(Storage::disk('private')->get('deviceimage/'.$device_id)); |
32 | 32 | } else { |
33 | - $image = Image::make(public_path() . '/img/video_not_found.jpg'); |
|
33 | + $image = Image::make(public_path().'/img/video_not_found.jpg'); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | return $image->response(); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function store($device_id, $binaryData) |
47 | 47 | { |
48 | - $storagePath = storage_path('app/private/deviceimage/') . $device_id; |
|
48 | + $storagePath = storage_path('app/private/deviceimage/').$device_id; |
|
49 | 49 | $image = Image::make($binaryData); |
50 | 50 | $image->save($storagePath, 75); |
51 | 51 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function index() |
20 | 20 | { |
21 | - return response()->json(['data' => 'SmartSettia API - Bad request type.'], 400); |
|
21 | + return response()->json([ 'data' => 'SmartSettia API - Bad request type.' ], 400); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | // If validation fails, send the validation error back with status 400. |
64 | 64 | if ($validator->fails()) { |
65 | - return response()->json(['data' => $validator->errors()], 400); |
|
65 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | // Get the device record. |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | // If token doesnt match then send 401 unauthorized. |
72 | 72 | if ($request->input('token') != $device->token) { |
73 | - return response()->json(['data' => 'Bad token.'], 401); |
|
73 | + return response()->json([ 'data' => 'Bad token.' ], 401); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | // Update the device. |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | //event(new Registered(true)); |
101 | 101 | |
102 | 102 | // Return the new device info including the token. |
103 | - return response()->json(['data' => $device->toArray()], 201); |
|
103 | + return response()->json([ 'data' => $device->toArray() ], 201); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | /** |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | // If validation fails, send the validation error back with status 400. |
121 | 121 | if ($validator->fails()) { |
122 | - return response()->json(['data' => $validator->errors()], 400); |
|
122 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
123 | 123 | } |
124 | 124 | |
125 | 125 | // If challenge string doesnt match then send 401 unauthorized. |
126 | 126 | if ($request->input('challenge') != env('API_CHALLENGE', 'temppass')) { |
127 | - return response()->json(['data' => 'Bad challenge.'], 401); |
|
127 | + return response()->json([ 'data' => 'Bad challenge.' ], 401); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | // If the uuid already exists then just send them the record. |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | 'uuid' => $device->uuid, |
135 | 135 | 'id' => $device->id, |
136 | 136 | 'token' => $device->token, |
137 | - ]], 200); |
|
137 | + ] ], 200); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | // Create the new device. |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | 'uuid' => $device->uuid, |
158 | 158 | 'id' => $device->id, |
159 | 159 | 'token' => $device->token, |
160 | - ]], 201); |
|
160 | + ] ], 201); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | /** |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | // If validation fails, send the validation error back with status 400. |
178 | 178 | if ($validator->fails()) { |
179 | - return response()->json(['data' => $validator->errors()], 400); |
|
179 | + return response()->json([ 'data' => $validator->errors() ], 400); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | // Get the device record. |
@@ -184,25 +184,25 @@ discard block |
||
184 | 184 | |
185 | 185 | // If token doesnt match then send 401 unauthorized. |
186 | 186 | if ($request->input('token') != $device->token) { |
187 | - return response()->json(['data' => 'Bad token.'], 401); |
|
187 | + return response()->json([ 'data' => 'Bad token.' ], 401); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | // Save the image to disk. |
191 | - $path = $request->file('image')->storeAs('deviceimage', $device['id'], 'private'); |
|
191 | + $path = $request->file('image')->storeAs('deviceimage', $device[ 'id' ], 'private'); |
|
192 | 192 | |
193 | 193 | // Update the url for the image. |
194 | 194 | $deviceimage = Deviceimage::updateOrCreate( |
195 | - ['device_id' => $device['id']], |
|
196 | - ['url' => $path] |
|
195 | + [ 'device_id' => $device[ 'id' ] ], |
|
196 | + [ 'url' => $path ] |
|
197 | 197 | ); |
198 | 198 | |
199 | 199 | // Force the updated_at timestamp to update as the url may not change. |
200 | 200 | $deviceimage->touch(); |
201 | 201 | |
202 | 202 | return response()->json([ 'data' => [ |
203 | - 'id' => $deviceimage['id'], |
|
203 | + 'id' => $deviceimage[ 'id' ], |
|
204 | 204 | 'url' => $path, |
205 | - ]], 201); |
|
205 | + ] ], 201); |
|
206 | 206 | } |
207 | 207 | } |
208 | 208 |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function getSitesExclude($id) |
44 | 44 | { |
45 | - $sites = self::select(['id', 'name']) |
|
45 | + $sites = self::select([ 'id', 'name' ]) |
|
46 | 46 | ->where('id', '!=', $id) |
47 | 47 | ->orderBy('name')->get(); |
48 | 48 | return $sites; |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function orderedSitesBy($id) |
58 | 58 | { |
59 | - $sites = self::query()->select(['id', 'name']) |
|
60 | - ->orderByRaw(DB::raw("(id = " . $id . ") DESC")) |
|
59 | + $sites = self::query()->select([ 'id', 'name' ]) |
|
60 | + ->orderByRaw(DB::raw("(id = ".$id.") DESC")) |
|
61 | 61 | ->get(); |
62 | 62 | return $sites; |
63 | 63 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | */ |
112 | 112 | public function details($id) |
113 | 113 | { |
114 | - $device = $this->device_m->select(['id', 'name', 'location_id', 'open_time', 'close_time']) |
|
114 | + $device = $this->device_m->select([ 'id', 'name', 'location_id', 'open_time', 'close_time' ]) |
|
115 | 115 | ->findOrFail($id); |
116 | 116 | |
117 | 117 | return $device; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | |
180 | 180 | if ($validator->fails()) { |
181 | 181 | if ($request->input('from') == 'modal') |
182 | - return response()->json(['errors'=>$validator->errors()], 422); |
|
182 | + return response()->json([ 'errors'=>$validator->errors() ], 422); |
|
183 | 183 | else |
184 | 184 | return redirect('device/'.$id.'/edit')->withErrors($validator)->withInput(); |
185 | 185 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | public function getLocsBasedOnSiteExclude($site_id, $location_id) |
56 | 56 | { |
57 | - return self::select(['id', 'name']) |
|
57 | + return self::select([ 'id', 'name' ]) |
|
58 | 58 | ->where('site_id', '=', $site_id) |
59 | 59 | ->where('id', '!=', $location_id) |
60 | 60 | ->orderBy('name')->get(); |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function orderedSiteLocationsBy($site_id, $location_id) |
72 | 72 | { |
73 | - $locations = self::query()->select(['id', 'name']) |
|
73 | + $locations = self::query()->select([ 'id', 'name' ]) |
|
74 | 74 | ->where('site_id', '=', $site_id) |
75 | - ->orderByRaw(DB::raw("(id = " . $location_id . ") DESC")) |
|
75 | + ->orderByRaw(DB::raw("(id = ".$location_id.") DESC")) |
|
76 | 76 | ->get(); |
77 | 77 | return $locations; |
78 | 78 | } |