@@ -126,8 +126,7 @@ |
||
126 | 126 | { |
127 | 127 | return round((($thisValue / ($lastValue / 100)) - 100), $round); |
128 | 128 | |
129 | - } |
|
130 | - else { |
|
129 | + } else { |
|
131 | 130 | |
132 | 131 | return 0; |
133 | 132 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @var array |
43 | 43 | */ |
44 | - protected $gaData = []; |
|
44 | + protected $gaData = [ ]; |
|
45 | 45 | |
46 | 46 | /** |
47 | 47 | * Constructor |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * Module name for blade |
59 | 59 | */ |
60 | 60 | $temp = explode('.', $this->moduleBasicRoute); |
61 | - View::share('moduleNameBlade', $temp[0] . "_module_" . $temp[1]); |
|
61 | + View::share('moduleNameBlade', $temp[ 0 ] . "_module_" . $temp[ 1 ]); |
|
62 | 62 | |
63 | 63 | |
64 | 64 | } |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | $ga = $this->getGAValues(); |
79 | 79 | } else { |
80 | 80 | |
81 | - $ga = []; |
|
81 | + $ga = [ ]; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | $statistics = [ |
85 | 85 | 'ga' => $ga |
86 | 86 | ]; |
87 | 87 | |
88 | - return view('admin.modules.dashboard.index', ['statistics' => $statistics]); |
|
88 | + return view('admin.modules.dashboard.index', [ 'statistics' => $statistics ]); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | /** |
101 | 101 | * Get the data |
102 | 102 | */ |
103 | - $data = \Analytics::getVisitorsAndPageViews($days); |
|
103 | + $data = \Analytics::getVisitorsAndPageViews($days); |
|
104 | 104 | |
105 | 105 | /** |
106 | 106 | * Calculate total |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $total = 0; |
109 | 109 | foreach ($data as $value) { |
110 | 110 | |
111 | - $total += $value[$type]; |
|
111 | + $total += $value[ $type ]; |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | return $total; |
@@ -24,5 +24,5 @@ |
||
24 | 24 | protected $arValidationArray = [ |
25 | 25 | 'name' => 'required|max:255|unique:settings,name', |
26 | 26 | 'value' => 'max:255', |
27 | - 'description' => 'max:255']; |
|
27 | + 'description' => 'max:255' ]; |
|
28 | 28 | } |
@@ -63,9 +63,9 @@ |
||
63 | 63 | protected function create(array $data) |
64 | 64 | { |
65 | 65 | return User::create([ |
66 | - 'name' => $data['name'], |
|
67 | - 'email' => $data['email'], |
|
68 | - 'password' => bcrypt($data['password']), |
|
66 | + 'name' => $data[ 'name' ], |
|
67 | + 'email' => $data[ 'email' ], |
|
68 | + 'password' => bcrypt($data[ 'password' ]), |
|
69 | 69 | ]); |
70 | 70 | } |
71 | 71 | } |
72 | 72 | \ No newline at end of file |
@@ -35,6 +35,6 @@ |
||
35 | 35 | */ |
36 | 36 | public function __construct() |
37 | 37 | { |
38 | - $this->middleware('guest', ['except' => 'logout']); |
|
38 | + $this->middleware('guest', [ 'except' => 'logout' ]); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * @param Request $request |
41 | 41 | * @return View|void |
42 | 42 | */ |
43 | - public function getHomepage(Request $request){ |
|
43 | + public function getHomepage(Request $request) { |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Load data |
@@ -50,22 +50,22 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Number of users |
52 | 52 | */ |
53 | - $this->_arViewData['users_no'] = User::count() + 135000; |
|
53 | + $this->_arViewData[ 'users_no' ] = User::count() + 135000; |
|
54 | 54 | |
55 | 55 | /** |
56 | 56 | * Number of campaigns |
57 | 57 | */ |
58 | - $this->_arViewData['campaigns_no'] = Campaign::count(); |
|
58 | + $this->_arViewData[ 'campaigns_no' ] = Campaign::count(); |
|
59 | 59 | |
60 | 60 | /** |
61 | 61 | * Number of payments total |
62 | 62 | */ |
63 | - $this->_arViewData['payments_no_total'] = Payment::sum('amount'); |
|
63 | + $this->_arViewData[ 'payments_no_total' ] = Payment::sum('amount'); |
|
64 | 64 | |
65 | 65 | /** |
66 | 66 | * Number of payments last month |
67 | 67 | */ |
68 | - $this->_arViewData['payments_no_last_month'] = Payment::where('created_at', '>=', Carbon::now()->subMonth())->count(); |
|
68 | + $this->_arViewData[ 'payments_no_last_month' ] = Payment::where('created_at', '>=', Carbon::now()->subMonth())->count(); |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Return view |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param Request $request |
80 | 80 | * @return View|void |
81 | 81 | */ |
82 | - public function getContact(Request $request){ |
|
82 | + public function getContact(Request $request) { |
|
83 | 83 | |
84 | 84 | /** |
85 | 85 | * Clear sessions |
@@ -103,12 +103,12 @@ discard block |
||
103 | 103 | * @param Request $request |
104 | 104 | * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector |
105 | 105 | */ |
106 | - public function registerEmail(Request $request){ |
|
106 | + public function registerEmail(Request $request) { |
|
107 | 107 | |
108 | 108 | /** |
109 | 109 | * Validate |
110 | 110 | */ |
111 | - if(env('RECAPTCHA_ENABLED') == 1){ |
|
111 | + if (env('RECAPTCHA_ENABLED') == 1) { |
|
112 | 112 | $this->validate($request, [ |
113 | 113 | 'email' => 'email|required|max:255', |
114 | 114 | 'g-recaptcha-response' => 'required|recaptcha' |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | /** |
144 | 144 | * User not exists |
145 | 145 | */ |
146 | - if(empty($user)){ |
|
146 | + if (empty($user)) { |
|
147 | 147 | |
148 | 148 | $login = $email; |
149 | 149 | $password = str_random(10); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | /** |
160 | 160 | * Save recommendation |
161 | 161 | */ |
162 | - if(Cache::has('recommendation_id')){ |
|
162 | + if (Cache::has('recommendation_id')) { |
|
163 | 163 | |
164 | 164 | $recommendation_id = Cache::get('recommendation_id'); |
165 | 165 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | /** |
178 | 178 | * If not , add to user |
179 | 179 | */ |
180 | - if(empty($test)){ |
|
180 | + if (empty($test)) { |
|
181 | 181 | $user->recommendation_id = $recommendation_id; |
182 | 182 | |
183 | 183 | } |
@@ -188,13 +188,13 @@ discard block |
||
188 | 188 | /** |
189 | 189 | * Send e-mail |
190 | 190 | */ |
191 | - Mail::send(['emails.html.registration', 'emails.plain.registration'], [ |
|
191 | + Mail::send([ 'emails.html.registration', 'emails.plain.registration' ], [ |
|
192 | 192 | 'user' => $user, |
193 | 193 | 'login' => $login, |
194 | 194 | 'password' => $password, |
195 | 195 | 'activation_code' => $activation_code |
196 | 196 | |
197 | - ], function ($message) { |
|
197 | + ], function($message) { |
|
198 | 198 | $message->from(env('MAIL_FROM_EMAIL', '[email protected]'), env('MAIL_FROM_NAME', 'Surimail.cz')); |
199 | 199 | $message->to(request('email'), request('email')); |
200 | 200 | $message->subject('Registrace na serveru Surimail.cz'); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | /** |
208 | 208 | * User exists - error |
209 | 209 | */ |
210 | - else{ |
|
210 | + else { |
|
211 | 211 | |
212 | 212 | $request->session()->flash('custom_error', 'Zadaný e-mail nebo IP již existuje'); |
213 | 213 | } |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | * @param Request $request |
224 | 224 | * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector |
225 | 225 | */ |
226 | - public function checkActivationCode($email, $activationCode, Request $request){ |
|
226 | + public function checkActivationCode($email, $activationCode, Request $request) { |
|
227 | 227 | |
228 | 228 | /** |
229 | 229 | * Check if user exists |
@@ -233,14 +233,14 @@ discard block |
||
233 | 233 | /** |
234 | 234 | * User not exists or code is not valid |
235 | 235 | */ |
236 | - if(empty($user)){ |
|
236 | + if (empty($user)) { |
|
237 | 237 | $request->session()->flash('custom_error', 'Zadaný e-mail neexistuje nebo je neplatný aktivační kód'); |
238 | 238 | } |
239 | 239 | |
240 | 240 | /** |
241 | 241 | * User exists - activate him |
242 | 242 | */ |
243 | - else{ |
|
243 | + else { |
|
244 | 244 | $user->active = true; |
245 | 245 | $user->activation_code = str_random(16); |
246 | 246 | $user->save(); |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | * Add reward for registration |
250 | 250 | */ |
251 | 251 | $rewardsCount = Transaction::where('transactionstatus_id', 5)->where('user_id', $user->id)->count(); |
252 | - if($rewardsCount < 1){ |
|
252 | + if ($rewardsCount < 1) { |
|
253 | 253 | |
254 | 254 | /** |
255 | 255 | * Save transaction |
@@ -261,25 +261,25 @@ discard block |
||
261 | 261 | * Add reward for recommedation |
262 | 262 | */ |
263 | 263 | |
264 | - if(!empty($user->recomendation_id) ){ |
|
264 | + if (!empty($user->recomendation_id)) { |
|
265 | 265 | |
266 | 266 | $recommendation = Recommendation::find($user->reccomendation_id); |
267 | 267 | |
268 | - if(!empty($recommendation)){ |
|
268 | + if (!empty($recommendation)) { |
|
269 | 269 | |
270 | 270 | /** |
271 | 271 | * Check transaction |
272 | 272 | */ |
273 | 273 | $transactionCount = Transaction::where('recommendation_id', $recommendation->id)->count(); |
274 | 274 | |
275 | - if($transactionCount < 1){ |
|
275 | + if ($transactionCount < 1) { |
|
276 | 276 | |
277 | 277 | /** |
278 | 278 | * Find user and save money |
279 | 279 | */ |
280 | 280 | $rUser = User::find($recommendation->user_id); |
281 | 281 | |
282 | - if(!empty($rUser)){ |
|
282 | + if (!empty($rUser)) { |
|
283 | 283 | |
284 | 284 | $this->_saveTransation(2, $rUser->id, $this->_getSettings(2)); |
285 | 285 | } |
@@ -288,12 +288,12 @@ discard block |
||
288 | 288 | } |
289 | 289 | |
290 | 290 | $request->session()->flash('success', 'Gratulujeme, váš účet byl úspěšně aktivován. Přihlásit se můžete zde: ' |
291 | - . '<br><a href="'.route('admin.dashboard.index').'">'.route('admin.dashboard.index').'</a>'); |
|
291 | + . '<br><a href="' . route('admin.dashboard.index') . '">' . route('admin.dashboard.index') . '</a>'); |
|
292 | 292 | |
293 | 293 | /** |
294 | 294 | * Save reward |
295 | 295 | */ |
296 | - if($user->recommendation_id != null && $user->recommendation_id > 0){ |
|
296 | + if ($user->recommendation_id != null && $user->recommendation_id > 0) { |
|
297 | 297 | |
298 | 298 | /** |
299 | 299 | * Load recommendation |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | * @param Request $request |
315 | 315 | * @return View|void |
316 | 316 | */ |
317 | - public function index($pageUrl, Request $request){ |
|
317 | + public function index($pageUrl, Request $request) { |
|
318 | 318 | |
319 | 319 | /** |
320 | 320 | * Clear sessions |
@@ -339,19 +339,19 @@ discard block |
||
339 | 339 | * @param Request $request |
340 | 340 | * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector |
341 | 341 | */ |
342 | - public function checkRecommmendation($id, Request $request){ |
|
342 | + public function checkRecommmendation($id, Request $request) { |
|
343 | 343 | |
344 | 344 | /** |
345 | 345 | * @todo Use validator |
346 | 346 | */ |
347 | - if(is_numeric($id)){ |
|
347 | + if (is_numeric($id)) { |
|
348 | 348 | |
349 | 349 | $recommendation = Recommendation::find($id); |
350 | 350 | |
351 | 351 | /** |
352 | 352 | * If exists, than remember |
353 | 353 | */ |
354 | - if(!empty($recommendation)){ |
|
354 | + if (!empty($recommendation)) { |
|
355 | 355 | Cache::forever('recommendation_id', $id); |
356 | 356 | } |
357 | 357 | } |
@@ -113,8 +113,7 @@ |
||
113 | 113 | 'email' => 'email|required|max:255', |
114 | 114 | 'g-recaptcha-response' => 'required|recaptcha' |
115 | 115 | ]); |
116 | - } |
|
117 | - else { |
|
116 | + } else { |
|
118 | 117 | |
119 | 118 | $this->validate($request, [ |
120 | 119 | 'email' => 'email|required|max:255' |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | * |
32 | 32 | * @var array |
33 | 33 | */ |
34 | - protected $_arViewData = []; |
|
34 | + protected $_arViewData = [ ]; |
|
35 | 35 | |
36 | - protected $_arViewGeneratedData = []; |
|
36 | + protected $_arViewGeneratedData = [ ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * Check if view exists, if so - return, if not throw 404 |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | * @param string $strView |
42 | 42 | * @return View|void |
43 | 43 | */ |
44 | - protected function _showViewOr404($strView){ |
|
44 | + protected function _showViewOr404($strView) { |
|
45 | 45 | |
46 | 46 | |
47 | 47 | if (view()->exists($strView)) { |
48 | 48 | return view($strView, $this->_arViewData); |
49 | 49 | } |
50 | - else{ |
|
50 | + else { |
|
51 | 51 | return abort(404); |
52 | 52 | } |
53 | 53 | } |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | * Save all inputs to session |
57 | 57 | * @param $request |
58 | 58 | */ |
59 | - protected function _saveSessionFields($request){ |
|
59 | + protected function _saveSessionFields($request) { |
|
60 | 60 | |
61 | - foreach ($request->all() as $key=>$value){ |
|
62 | - $arData[$key] = $value; |
|
61 | + foreach ($request->all() as $key=>$value) { |
|
62 | + $arData[ $key ] = $value; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | $request->session()->put('frontend_fields', $arData); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * Reset all session fields |
70 | 70 | */ |
71 | - protected function _resetSessionFields($request){ |
|
71 | + protected function _resetSessionFields($request) { |
|
72 | 72 | |
73 | 73 | $request->session()->forget('frontend_fields'); |
74 | 74 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * |
79 | 79 | * @param $request |
80 | 80 | */ |
81 | - protected function _calculatePrice($request){ |
|
81 | + protected function _calculatePrice($request) { |
|
82 | 82 | |
83 | 83 | return 0; |
84 | 84 | } |
@@ -89,24 +89,24 @@ discard block |
||
89 | 89 | * @param $request |
90 | 90 | * @return mixed |
91 | 91 | */ |
92 | - protected function _getSessionFields($request){ |
|
92 | + protected function _getSessionFields($request) { |
|
93 | 93 | |
94 | 94 | $fields = $request->session()->get('frontend_fields'); |
95 | 95 | |
96 | - if(isset($request->id)){ |
|
96 | + if (isset($request->id)) { |
|
97 | 97 | //$fields['price'] = $this->_calculatePrice($request); |
98 | 98 | } |
99 | 99 | |
100 | - if(isset($fields['city'])) { |
|
101 | - $arCityInfo = explode('|', $fields['city']); |
|
100 | + if (isset($fields[ 'city' ])) { |
|
101 | + $arCityInfo = explode('|', $fields[ 'city' ]); |
|
102 | 102 | |
103 | - $fields['citypart'] = @trim($arCityInfo[0]); |
|
104 | - $fields['citymain'] = @trim($arCityInfo[1]); |
|
105 | - $fields['county'] = @trim($arCityInfo[2]); |
|
106 | - $fields['zip'] = @trim($arCityInfo[3]); |
|
103 | + $fields[ 'citypart' ] = @trim($arCityInfo[ 0 ]); |
|
104 | + $fields[ 'citymain' ] = @trim($arCityInfo[ 1 ]); |
|
105 | + $fields[ 'county' ] = @trim($arCityInfo[ 2 ]); |
|
106 | + $fields[ 'zip' ] = @trim($arCityInfo[ 3 ]); |
|
107 | 107 | } |
108 | 108 | |
109 | - $this->_arViewData['fields'] = $fields; |
|
109 | + $this->_arViewData[ 'fields' ] = $fields; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | /** |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * @param $url |
116 | 116 | * @return mixed |
117 | 117 | */ |
118 | - protected function _loadPageByUrl($url){ |
|
118 | + protected function _loadPageByUrl($url) { |
|
119 | 119 | |
120 | 120 | return Page::where('url', $url)->firstOrFail(); |
121 | 121 | } |
@@ -126,18 +126,18 @@ discard block |
||
126 | 126 | * @param $id |
127 | 127 | * @return mixed |
128 | 128 | */ |
129 | - protected function _loadPageById($id){ |
|
129 | + protected function _loadPageById($id) { |
|
130 | 130 | return Page::findOrFail($id); |
131 | 131 | } |
132 | 132 | |
133 | - protected function _getSettings($id){ |
|
133 | + protected function _getSettings($id) { |
|
134 | 134 | |
135 | 135 | $settings = Settings::find($id); |
136 | 136 | |
137 | - if(!empty($settings)){ |
|
138 | - return $settings['value']; |
|
137 | + if (!empty($settings)) { |
|
138 | + return $settings[ 'value' ]; |
|
139 | 139 | } |
140 | - else{ |
|
140 | + else { |
|
141 | 141 | return NULL; |
142 | 142 | } |
143 | 143 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * @param $amount |
152 | 152 | */ |
153 | 153 | protected function _saveTransation($status_id = 1, $user_id, $amount, |
154 | - $campaign_id = null, $payment_id = null, $recommendation_id = null){ |
|
154 | + $campaign_id = null, $payment_id = null, $recommendation_id = null) { |
|
155 | 155 | |
156 | 156 | /** |
157 | 157 | * Save transaction |
@@ -46,8 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | if (view()->exists($strView)) { |
48 | 48 | return view($strView, $this->_arViewData); |
49 | - } |
|
50 | - else{ |
|
49 | + } else{ |
|
51 | 50 | return abort(404); |
52 | 51 | } |
53 | 52 | } |
@@ -136,8 +135,7 @@ discard block |
||
136 | 135 | |
137 | 136 | if(!empty($settings)){ |
138 | 137 | return $settings['value']; |
139 | - } |
|
140 | - else{ |
|
138 | + } else{ |
|
141 | 139 | return NULL; |
142 | 140 | } |
143 | 141 | } |
@@ -31,15 +31,15 @@ |
||
31 | 31 | public function handle(Request $request, Closure $next) |
32 | 32 | { |
33 | 33 | $intArgs = func_num_args(); |
34 | - for($a = 2; $a < $intArgs; $a++){ |
|
34 | + for ($a = 2; $a < $intArgs; $a++) { |
|
35 | 35 | |
36 | 36 | $model = func_get_arg($a); |
37 | - $modelWithNamespace = 'App\\'.$model; |
|
37 | + $modelWithNamespace = 'App\\' . $model; |
|
38 | 38 | |
39 | 39 | |
40 | - $array = ['other_tables' => |
|
40 | + $array = [ 'other_tables' => |
|
41 | 41 | [ |
42 | - $model => $modelWithNamespace::orderBy('id', 'desc')->get(['id', 'name', 'url', 'image_extension']) |
|
42 | + $model => $modelWithNamespace::orderBy('id', 'desc')->get([ 'id', 'name', 'url', 'image_extension' ]) |
|
43 | 43 | ] |
44 | 44 | ]; |
45 | 45 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | public function __construct() { |
28 | 28 | parent::__construct(); |
29 | 29 | |
30 | - $this->middleware('add.lookup.tables:ImageCategory', ['only' => ['index','create','edit']]); |
|
30 | + $this->middleware('add.lookup.tables:ImageCategory', [ 'only' => [ 'index', 'create', 'edit' ] ]); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | * |
46 | 46 | * @var array |
47 | 47 | */ |
48 | - protected $binaryFields = []; |
|
48 | + protected $binaryFields = [ ]; |
|
49 | 49 | |
50 | 50 | /** |
51 | 51 | * Get number of pagination rows |
52 | 52 | * |
53 | 53 | * @return integer |
54 | 54 | */ |
55 | - public function getRowsToPaginate(){ |
|
55 | + public function getRowsToPaginate() { |
|
56 | 56 | |
57 | 57 | return env('ADMIN_MEDIA_PAGINATE', 12); |
58 | 58 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * @param object $object |
64 | 64 | * @param Request $request |
65 | 65 | */ |
66 | - public function associateRelationships($object, Request $request){ |
|
66 | + public function associateRelationships($object, Request $request) { |
|
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Validate category ID, if failed set to default |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | /** |
84 | 84 | * Validator OK - save it |
85 | 85 | */ |
86 | - else{ |
|
86 | + else { |
|
87 | 87 | |
88 | 88 | $object->imagecategories()->associate($request->input('imagecategory_id')); |
89 | 89 | } |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | /** |
108 | 108 | * Image has an url |
109 | 109 | */ |
110 | - if(strlen($request->input('url') > 5)){ |
|
110 | + if (strlen($request->input('url') > 5)) { |
|
111 | 111 | $object->addMedia($request->file('image'))->toMediaCollection('images') |
112 | 112 | ->usingName($request->input('url')); |
113 | 113 | } |
114 | - else{ |
|
114 | + else { |
|
115 | 115 | $object->addMedia($request->file('image'))->toMediaCollection('images'); |
116 | 116 | } |
117 | 117 |
@@ -110,8 +110,7 @@ |
||
110 | 110 | if(strlen($request->input('url') > 5)){ |
111 | 111 | $object->addMedia($request->file('image'))->toMediaCollection('images') |
112 | 112 | ->usingName($request->input('url')); |
113 | - } |
|
114 | - else{ |
|
113 | + } else{ |
|
115 | 114 | $object->addMedia($request->file('image'))->toMediaCollection('images'); |
116 | 115 | } |
117 | 116 |
@@ -40,17 +40,17 @@ discard block |
||
40 | 40 | /** |
41 | 41 | * Get META information |
42 | 42 | */ |
43 | - $imageMeta = Image::where(['url' => $request->imageName])->first(); |
|
43 | + $imageMeta = Image::where([ 'url' => $request->imageName ])->first(); |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * File does not exist |
47 | 47 | */ |
48 | - if(empty($imageMeta) == TRUE){ |
|
48 | + if (empty($imageMeta) == TRUE) { |
|
49 | 49 | App::abort(404); |
50 | 50 | } |
51 | 51 | |
52 | 52 | $mediaItems = $imageMeta->getMedia(); |
53 | - $fullPathOnDisk = $mediaItems[0]->getPath(); |
|
53 | + $fullPathOnDisk = $mediaItems[ 0 ]->getPath(); |
|
54 | 54 | |
55 | 55 | |
56 | 56 | /** |
@@ -66,15 +66,15 @@ discard block |
||
66 | 66 | 'Content-Description' => 'File Transfer', |
67 | 67 | 'Content-Transfer-Encoding' => 'binary', |
68 | 68 | 'Pragma' => 'public', |
69 | - 'Expires' => Carbon::createFromTimestamp(time()+3600)->toRfc2822String(), |
|
69 | + 'Expires' => Carbon::createFromTimestamp(time() + 3600)->toRfc2822String(), |
|
70 | 70 | 'Last-Modified' => $imageMeta->updated_at->toRfc2822String() |
71 | 71 | ); |
72 | 72 | |
73 | 73 | /** |
74 | 74 | * Response code cached |
75 | 75 | */ |
76 | - if( (isset($_SERVER['HTTP_IF_NONE_MATCH']) && $_SERVER['HTTP_IF_NONE_MATCH'] == $imageMeta->image_etag) |
|
77 | - || (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $imageMeta->updated_at->toRfc2822String()) ){ |
|
76 | + if ((isset($_SERVER[ 'HTTP_IF_NONE_MATCH' ]) && $_SERVER[ 'HTTP_IF_NONE_MATCH' ] == $imageMeta->image_etag) |
|
77 | + || (isset($_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ]) && $_SERVER[ 'HTTP_IF_MODIFIED_SINCE' ] == $imageMeta->updated_at->toRfc2822String())) { |
|
78 | 78 | |
79 | 79 | $responseCode = 304; |
80 | 80 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | /** |
83 | 83 | * Response code not cached, but OK |
84 | 84 | */ |
85 | - else{ |
|
85 | + else { |
|
86 | 86 | |
87 | 87 | $responseCode = 200; |
88 | 88 | } |