@@ -33,21 +33,21 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @var array |
35 | 35 | */ |
36 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
36 | + protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ]; |
|
37 | 37 | |
38 | 38 | /** |
39 | 39 | * The attributes that are mass assignable. |
40 | 40 | * |
41 | 41 | * @var array |
42 | 42 | */ |
43 | - protected $fillable = ['name', 'description', 'position', 'image_id']; |
|
43 | + protected $fillable = [ 'name', 'description', 'position', 'image_id' ]; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Columns to exclude from index |
47 | 47 | * |
48 | 48 | * @var array |
49 | 49 | */ |
50 | - protected $excludedFromIndex = ['image']; |
|
50 | + protected $excludedFromIndex = [ 'image' ]; |
|
51 | 51 | |
52 | 52 | /** |
53 | 53 | * Fields to search in fulltext mode |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * |
84 | 84 | * @return object |
85 | 85 | */ |
86 | - public function images(){ |
|
86 | + public function images() { |
|
87 | 87 | |
88 | 88 | return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', |
89 | 89 | 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param query $query |
98 | 98 | * @return query |
99 | 99 | */ |
100 | - public function scopeRelationships($query){ |
|
100 | + public function scopeRelationships($query) { |
|
101 | 101 | |
102 | 102 | return $query->with('images', 'images.imagecategories'); |
103 | 103 | } |
@@ -72,8 +72,7 @@ |
||
72 | 72 | { |
73 | 73 | if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){ |
74 | 74 | return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) ); |
75 | - } |
|
76 | - else{ |
|
75 | + } else{ |
|
77 | 76 | return $query; |
78 | 77 | } |
79 | 78 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * |
36 | 36 | * @return \Illuminate\Database\Eloquent\Builder |
37 | 37 | */ |
38 | - public function scopeFulltextAllColumns(Builder $query){ |
|
38 | + public function scopeFulltextAllColumns(Builder $query) { |
|
39 | 39 | |
40 | 40 | return Helpers::virtualFulltextSearchColumns($query, request('search'), $this->fulltextFields); |
41 | 41 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * |
46 | 46 | * @return \Illuminate\Database\Eloquent\Builder |
47 | 47 | */ |
48 | - public function scopeOrderByColumns(Builder $query){ |
|
48 | + public function scopeOrderByColumns(Builder $query) { |
|
49 | 49 | |
50 | 50 | return Helpers::orderByColumns($query, $this->defaultOrderBy); |
51 | 51 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function scopeExcludeFromIndex(Builder $query) |
59 | 59 | { |
60 | - return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex) ); |
|
60 | + return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function scopeExcludeFromFind(Builder $query) |
69 | 69 | { |
70 | - if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){ |
|
71 | - return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) ); |
|
70 | + if (isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE) { |
|
71 | + return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind)); |
|
72 | 72 | } |
73 | - else{ |
|
73 | + else { |
|
74 | 74 | return $query; |
75 | 75 | } |
76 | 76 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * |
81 | 81 | * @return \Illuminate\Database\Eloquent\Builder |
82 | 82 | */ |
83 | - public function scopeRelationships(Builder $query){ |
|
83 | + public function scopeRelationships(Builder $query) { |
|
84 | 84 | |
85 | 85 | return $query; |
86 | 86 | } |
@@ -90,30 +90,30 @@ discard block |
||
90 | 90 | * |
91 | 91 | * @return \Illuminate\Database\Eloquent\Builder |
92 | 92 | */ |
93 | - public function scopeExternalTablesFilter(Builder $query){ |
|
93 | + public function scopeExternalTablesFilter(Builder $query) { |
|
94 | 94 | |
95 | - if(Request::input('relation')){ |
|
95 | + if (Request::input('relation')) { |
|
96 | 96 | |
97 | - $allTables = []; |
|
97 | + $allTables = [ ]; |
|
98 | 98 | |
99 | 99 | $relations = explode(',', Request::input('relation')); |
100 | 100 | |
101 | - foreach ($relations as $relation){ |
|
101 | + foreach ($relations as $relation) { |
|
102 | 102 | |
103 | 103 | $keyvalue = explode(':', $relation); |
104 | 104 | |
105 | - $key = trim($keyvalue[0]); |
|
106 | - $value = trim($keyvalue[1]); |
|
105 | + $key = trim($keyvalue[ 0 ]); |
|
106 | + $value = trim($keyvalue[ 1 ]); |
|
107 | 107 | |
108 | - $allTables[$key] = $value; |
|
108 | + $allTables[ $key ] = $value; |
|
109 | 109 | |
110 | - if(is_numeric($value) == TRUE){ |
|
110 | + if (is_numeric($value) == TRUE) { |
|
111 | 111 | |
112 | - $query->where(strtolower($key)."_id", '=', $value); |
|
112 | + $query->where(strtolower($key) . "_id", '=', $value); |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | |
116 | - request()->merge(['external_tables_filter' => $allTables]); |
|
116 | + request()->merge([ 'external_tables_filter' => $allTables ]); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return $query; |
@@ -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 | } |
@@ -20,8 +20,6 @@ |
||
20 | 20 | use Illuminate\Support\Facades\View; |
21 | 21 | use App\Http\Controllers\Controller; |
22 | 22 | use Illuminate\Database\Eloquent\Builder; |
23 | -use Illuminate\Support\Facades\DB; |
|
24 | -use Carbon\Carbon; |
|
25 | 23 | use App\Transaction; |
26 | 24 | use App\User; |
27 | 25 |
@@ -202,8 +202,7 @@ discard block |
||
202 | 202 | if ($this->paginateRows == NULL) { |
203 | 203 | |
204 | 204 | return env('ADMIN_PAGINATE', 10); |
205 | - } |
|
206 | - else{ |
|
205 | + } else{ |
|
207 | 206 | |
208 | 207 | return $this->paginateRows; |
209 | 208 | } |
@@ -281,8 +280,7 @@ discard block |
||
281 | 280 | */ |
282 | 281 | if(method_exists($arResults, 'getMedia')){ |
283 | 282 | $media = $arResults->getMedia(); |
284 | - } |
|
285 | - else{ |
|
283 | + } else{ |
|
286 | 284 | $media = null; |
287 | 285 | } |
288 | 286 | |
@@ -292,8 +290,7 @@ discard block |
||
292 | 290 | */ |
293 | 291 | if(empty($this->customView['index']) == TRUE){ |
294 | 292 | $view = $this->moduleBasicTemplatePath . '.index'; |
295 | - } |
|
296 | - else{ |
|
293 | + } else{ |
|
297 | 294 | $view = $this->customView; |
298 | 295 | } |
299 | 296 | |
@@ -315,8 +312,7 @@ discard block |
||
315 | 312 | */ |
316 | 313 | if(empty($this->customView['index']) == TRUE){ |
317 | 314 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
318 | - } |
|
319 | - else{ |
|
315 | + } else{ |
|
320 | 316 | $view = $this->customView; |
321 | 317 | } |
322 | 318 | |
@@ -365,16 +361,14 @@ discard block |
||
365 | 361 | if(in_array($name, $this->dateTimeLocalFields)){ |
366 | 362 | |
367 | 363 | $object->{$name} = str_replace('T', ' ', $request->input($name)). ':00'; |
368 | - } |
|
369 | - else { |
|
364 | + } else { |
|
370 | 365 | |
371 | 366 | /** |
372 | 367 | * Change to null if needed |
373 | 368 | */ |
374 | 369 | if(strlen($request->$name) < 1){ |
375 | 370 | $object->{$name} = null; |
376 | - } |
|
377 | - else { |
|
371 | + } else { |
|
378 | 372 | $object->{$name} = $request->input($name); |
379 | 373 | } |
380 | 374 | } |
@@ -407,8 +401,7 @@ discard block |
||
407 | 401 | */ |
408 | 402 | if(!empty($request->custom_route)){ |
409 | 403 | return redirect($request->custom_route); |
410 | - } |
|
411 | - else { |
|
404 | + } else { |
|
412 | 405 | return redirect(route($this->moduleBasicRoute . '.index')); |
413 | 406 | } |
414 | 407 | } |
@@ -447,8 +440,7 @@ discard block |
||
447 | 440 | */ |
448 | 441 | if(empty($this->customView['index']) == TRUE){ |
449 | 442 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
450 | - } |
|
451 | - else{ |
|
443 | + } else{ |
|
452 | 444 | $view = $this->customView; |
453 | 445 | } |
454 | 446 | |
@@ -525,8 +517,7 @@ discard block |
||
525 | 517 | */ |
526 | 518 | if(in_array($name, $this->binaryFields)){ |
527 | 519 | |
528 | - } |
|
529 | - else{ |
|
520 | + } else{ |
|
530 | 521 | |
531 | 522 | /** |
532 | 523 | * Empty exception |
@@ -539,13 +530,10 @@ discard block |
||
539 | 530 | if(in_array($name, $this->dateTimeLocalFields)){ |
540 | 531 | |
541 | 532 | $arResults->$name = str_replace('T', ' ', $request->input($name)). ':00'; |
542 | - } |
|
543 | - else { |
|
533 | + } else { |
|
544 | 534 | $arResults->$name = $request->input($name); |
545 | 535 | } |
546 | - } |
|
547 | - |
|
548 | - else{ |
|
536 | + } else{ |
|
549 | 537 | |
550 | 538 | /** |
551 | 539 | * Numeric zero ? |
@@ -553,9 +541,7 @@ discard block |
||
553 | 541 | if(isset($request->$name) && is_numeric($request->input($name)) == TRUE){ |
554 | 542 | |
555 | 543 | $arResults->$name = $request->input($name); |
556 | - } |
|
557 | - |
|
558 | - else{ |
|
544 | + } else{ |
|
559 | 545 | $arResults->$name = NULL; |
560 | 546 | } |
561 | 547 | } |
@@ -580,8 +566,7 @@ discard block |
||
580 | 566 | |
581 | 567 | if (empty($request->$value) == FALSE) { |
582 | 568 | $arResults->$value = $request->$value; |
583 | - } |
|
584 | - else{ |
|
569 | + } else{ |
|
585 | 570 | $arResults->$value = NULL; |
586 | 571 | } |
587 | 572 | } |
@@ -602,8 +587,7 @@ discard block |
||
602 | 587 | */ |
603 | 588 | if(!empty($request->custom_route)){ |
604 | 589 | return redirect($request->custom_route); |
605 | - } |
|
606 | - else { |
|
590 | + } else { |
|
607 | 591 | return redirect(route($this->moduleBasicRoute . '.index')); |
608 | 592 | } |
609 | 593 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | /** |
152 | 152 | * Runs after store |
153 | 153 | * |
154 | - * @param $request |
|
154 | + * @param Request $request |
|
155 | 155 | */ |
156 | 156 | protected function afterStore($request, $model){ |
157 | 157 | |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | /** |
161 | 161 | * Runs after update |
162 | 162 | * |
163 | - * @param $request |
|
163 | + * @param Request $request |
|
164 | 164 | */ |
165 | 165 | protected function afterUpdate($request, $model){ |
166 | 166 | |
@@ -169,8 +169,6 @@ discard block |
||
169 | 169 | /** |
170 | 170 | * Save transaction |
171 | 171 | * |
172 | - * @param int $typeId |
|
173 | - * @param string $text |
|
174 | 172 | * @param $userId |
175 | 173 | * @param $amount |
176 | 174 | */ |
@@ -260,7 +258,7 @@ discard block |
||
260 | 258 | * Change ar result if necessary |
261 | 259 | * |
262 | 260 | * @param $arResult |
263 | - * @return mixed |
|
261 | + * @return string|null |
|
264 | 262 | */ |
265 | 263 | public function changeEditResultField($arResult){ |
266 | 264 | return $arResult; |
@@ -348,7 +346,7 @@ discard block |
||
348 | 346 | * Store a newly created resource in storage. |
349 | 347 | * |
350 | 348 | * @param Request $request |
351 | - * @return Response |
|
349 | + * @return \Illuminate\Http\RedirectResponse |
|
352 | 350 | */ |
353 | 351 | public function store(Request $request) { |
354 | 352 | |
@@ -498,7 +496,7 @@ discard block |
||
498 | 496 | * |
499 | 497 | * @param Request $request |
500 | 498 | * @param int $id |
501 | - * @return Response |
|
499 | + * @return \Illuminate\Http\RedirectResponse |
|
502 | 500 | */ |
503 | 501 | public function update(Request $request, $id) { |
504 | 502 | |
@@ -640,7 +638,7 @@ discard block |
||
640 | 638 | * Remove the specified resource from storage. |
641 | 639 | * |
642 | 640 | * @param int $id |
643 | - * @return Response |
|
641 | + * @return \Illuminate\Http\RedirectResponse |
|
644 | 642 | */ |
645 | 643 | |
646 | 644 | public function destroy($id) { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | use App\Transaction; |
26 | 26 | use App\User; |
27 | 27 | |
28 | -class AdminModuleController extends Controller{ |
|
28 | +class AdminModuleController extends Controller { |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * Module name |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * Module name for blade |
145 | 145 | */ |
146 | 146 | $temp = explode('.', $this->moduleBasicRoute); |
147 | - View::share('moduleNameBlade', strtolower($temp[0] . "_module_" . $temp[1])); |
|
147 | + View::share('moduleNameBlade', strtolower($temp[ 0 ] . "_module_" . $temp[ 1 ])); |
|
148 | 148 | |
149 | 149 | } |
150 | 150 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * |
154 | 154 | * @param $request |
155 | 155 | */ |
156 | - protected function afterStore($request, $model){ |
|
156 | + protected function afterStore($request, $model) { |
|
157 | 157 | |
158 | 158 | } |
159 | 159 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * |
163 | 163 | * @param $request |
164 | 164 | */ |
165 | - protected function afterUpdate($request, $model){ |
|
165 | + protected function afterUpdate($request, $model) { |
|
166 | 166 | |
167 | 167 | } |
168 | 168 | |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | * @param $amount |
176 | 176 | */ |
177 | 177 | protected function _saveTransation($status_id = 1, $user_id, $amount, |
178 | - $campaign_id = null, $payment_id = null, $recommendation_id = null){ |
|
178 | + $campaign_id = null, $payment_id = null, $recommendation_id = null) { |
|
179 | 179 | |
180 | 180 | /** |
181 | 181 | * Save transaction |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | * @param boolean $update |
206 | 206 | * @return boolean |
207 | 207 | */ |
208 | - public function saveMediaToStorage($object, $request, $update = FALSE){ |
|
208 | + public function saveMediaToStorage($object, $request, $update = FALSE) { |
|
209 | 209 | |
210 | 210 | return FALSE; |
211 | 211 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | |
222 | 222 | return env('ADMIN_PAGINATE', 10); |
223 | 223 | } |
224 | - else{ |
|
224 | + else { |
|
225 | 225 | |
226 | 226 | return $this->paginateRows; |
227 | 227 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * @param object $object |
234 | 234 | * @param Request $request |
235 | 235 | */ |
236 | - public function associateRelationships($object, Request $request){ |
|
236 | + public function associateRelationships($object, Request $request) { |
|
237 | 237 | |
238 | 238 | } |
239 | 239 | |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * @param object $object |
244 | 244 | * @param Request $request |
245 | 245 | */ |
246 | - public function associateRelationshipsWithID($object, Request $request){ |
|
246 | + public function associateRelationshipsWithID($object, Request $request) { |
|
247 | 247 | |
248 | 248 | } |
249 | 249 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * |
253 | 253 | * @param object $object |
254 | 254 | */ |
255 | - public function resetCache($object){ |
|
255 | + public function resetCache($object) { |
|
256 | 256 | |
257 | 257 | } |
258 | 258 | |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @param $arResult |
263 | 263 | * @return mixed |
264 | 264 | */ |
265 | - public function changeEditResultField($arResult){ |
|
265 | + public function changeEditResultField($arResult) { |
|
266 | 266 | return $arResult; |
267 | 267 | } |
268 | 268 | |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | /** |
298 | 298 | * Get media |
299 | 299 | */ |
300 | - if(method_exists($arResults, 'getMedia')){ |
|
300 | + if (method_exists($arResults, 'getMedia')) { |
|
301 | 301 | $media = $arResults->getMedia(); |
302 | 302 | } |
303 | - else{ |
|
303 | + else { |
|
304 | 304 | $media = null; |
305 | 305 | } |
306 | 306 | |
@@ -308,17 +308,17 @@ discard block |
||
308 | 308 | /** |
309 | 309 | * Choose the view |
310 | 310 | */ |
311 | - if(empty($this->customView['index']) == TRUE){ |
|
311 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
312 | 312 | $view = $this->moduleBasicTemplatePath . '.index'; |
313 | 313 | } |
314 | - else{ |
|
314 | + else { |
|
315 | 315 | $view = $this->customView; |
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
319 | 319 | * Return page |
320 | 320 | */ |
321 | - return view($view, ['results' => $arResults, 'media' => $media]); |
|
321 | + return view($view, [ 'results' => $arResults, 'media' => $media ]); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | /** |
@@ -331,10 +331,10 @@ discard block |
||
331 | 331 | /** |
332 | 332 | * Choose the view |
333 | 333 | */ |
334 | - if(empty($this->customView['index']) == TRUE){ |
|
334 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
335 | 335 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
336 | 336 | } |
337 | - else{ |
|
337 | + else { |
|
338 | 338 | $view = $this->customView; |
339 | 339 | } |
340 | 340 | |
@@ -356,8 +356,8 @@ discard block |
||
356 | 356 | * Change the validation array |
357 | 357 | */ |
358 | 358 | foreach ($this->arValidationArray as $name => $value) { |
359 | - if(strpos($this->arValidationArray[$name], 'unique') > 0){ |
|
360 | - $this->arValidationArray[$name] = $value . ',NULL,id,deleted_at,NULL'; |
|
359 | + if (strpos($this->arValidationArray[ $name ], 'unique') > 0) { |
|
360 | + $this->arValidationArray[ $name ] = $value . ',NULL,id,deleted_at,NULL'; |
|
361 | 361 | } |
362 | 362 | } |
363 | 363 | |
@@ -380,16 +380,16 @@ discard block |
||
380 | 380 | /** |
381 | 381 | * Datetime |
382 | 382 | */ |
383 | - if(in_array($name, $this->dateTimeLocalFields)){ |
|
383 | + if (in_array($name, $this->dateTimeLocalFields)) { |
|
384 | 384 | |
385 | - $object->{$name} = str_replace('T', ' ', $request->input($name)). ':00'; |
|
385 | + $object->{$name} = str_replace('T', ' ', $request->input($name)) . ':00'; |
|
386 | 386 | } |
387 | 387 | else { |
388 | 388 | |
389 | 389 | /** |
390 | 390 | * Change to null if needed |
391 | 391 | */ |
392 | - if(strlen($request->$name) < 1){ |
|
392 | + if (strlen($request->$name) < 1) { |
|
393 | 393 | $object->{$name} = null; |
394 | 394 | } |
395 | 395 | else { |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | /** |
429 | 429 | * Redirect to index |
430 | 430 | */ |
431 | - if(!empty($request->custom_route)){ |
|
431 | + if (!empty($request->custom_route)) { |
|
432 | 432 | return redirect($request->custom_route); |
433 | 433 | } |
434 | 434 | else { |
@@ -457,21 +457,21 @@ discard block |
||
457 | 457 | */ |
458 | 458 | if (empty($arResults)) { |
459 | 459 | |
460 | - return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors(['edit' => trans('validation.row_not_exist')]); |
|
460 | + return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors([ 'edit' => trans('validation.row_not_exist') ]); |
|
461 | 461 | } |
462 | 462 | |
463 | 463 | /** |
464 | 464 | * Set the put method for update |
465 | 465 | */ |
466 | - $arResults['_method'] = 'PUT'; |
|
466 | + $arResults[ '_method' ] = 'PUT'; |
|
467 | 467 | |
468 | 468 | /** |
469 | 469 | * Choose the view |
470 | 470 | */ |
471 | - if(empty($this->customView['index']) == TRUE){ |
|
471 | + if (empty($this->customView[ 'index' ]) == TRUE) { |
|
472 | 472 | $view = $this->moduleBasicTemplatePath . '.create_edit'; |
473 | 473 | } |
474 | - else{ |
|
474 | + else { |
|
475 | 475 | $view = $this->customView; |
476 | 476 | } |
477 | 477 | |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | /** |
481 | 481 | * Return page |
482 | 482 | */ |
483 | - return view($view, ['results' => $arResults]); |
|
483 | + return view($view, [ 'results' => $arResults ]); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | /** |
@@ -508,8 +508,8 @@ discard block |
||
508 | 508 | */ |
509 | 509 | foreach ($this->arValidationArray as $name => $value) { |
510 | 510 | |
511 | - if(strpos($this->arValidationArray[$name], 'unique') > 0){ |
|
512 | - $this->arValidationArray[$name] = $value . ','.$id.',id,deleted_at,NULL'; |
|
511 | + if (strpos($this->arValidationArray[ $name ], 'unique') > 0) { |
|
512 | + $this->arValidationArray[ $name ] = $value . ',' . $id . ',id,deleted_at,NULL'; |
|
513 | 513 | } |
514 | 514 | } |
515 | 515 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | */ |
530 | 530 | if ($arResults == FALSE) { |
531 | 531 | |
532 | - return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors(['edit' => trans('validation.row_not_exist')]); |
|
532 | + return redirect(route($this->moduleBasicRoute . '.index'))->withInput()->withErrors([ 'edit' => trans('validation.row_not_exist') ]); |
|
533 | 533 | } |
534 | 534 | |
535 | 535 | /** |
@@ -546,10 +546,10 @@ discard block |
||
546 | 546 | * Binary fields will not be updated if empty |
547 | 547 | * |
548 | 548 | */ |
549 | - if(in_array($name, $this->binaryFields)){ |
|
549 | + if (in_array($name, $this->binaryFields)) { |
|
550 | 550 | |
551 | 551 | } |
552 | - else{ |
|
552 | + else { |
|
553 | 553 | |
554 | 554 | /** |
555 | 555 | * Empty exception |
@@ -559,26 +559,26 @@ discard block |
||
559 | 559 | /** |
560 | 560 | * Datetime |
561 | 561 | */ |
562 | - if(in_array($name, $this->dateTimeLocalFields)){ |
|
562 | + if (in_array($name, $this->dateTimeLocalFields)) { |
|
563 | 563 | |
564 | - $arResults->$name = str_replace('T', ' ', $request->input($name)). ':00'; |
|
564 | + $arResults->$name = str_replace('T', ' ', $request->input($name)) . ':00'; |
|
565 | 565 | } |
566 | 566 | else { |
567 | 567 | $arResults->$name = $request->input($name); |
568 | 568 | } |
569 | 569 | } |
570 | 570 | |
571 | - else{ |
|
571 | + else { |
|
572 | 572 | |
573 | 573 | /** |
574 | 574 | * Numeric zero ? |
575 | 575 | */ |
576 | - if(isset($request->$name) && is_numeric($request->input($name)) == TRUE){ |
|
576 | + if (isset($request->$name) && is_numeric($request->input($name)) == TRUE) { |
|
577 | 577 | |
578 | 578 | $arResults->$name = $request->input($name); |
579 | 579 | } |
580 | 580 | |
581 | - else{ |
|
581 | + else { |
|
582 | 582 | $arResults->$name = NULL; |
583 | 583 | } |
584 | 584 | } |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | /** |
597 | 597 | * Save media to storage |
598 | 598 | */ |
599 | - if($this->saveMediaToStorage($arResults, $request, TRUE) == TRUE){ |
|
599 | + if ($this->saveMediaToStorage($arResults, $request, TRUE) == TRUE) { |
|
600 | 600 | |
601 | 601 | // Update binary fields |
602 | 602 | foreach ($this->binaryFields as $name => $value) { |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | if (empty($request->$value) == FALSE) { |
605 | 605 | $arResults->$value = $request->$value; |
606 | 606 | } |
607 | - else{ |
|
607 | + else { |
|
608 | 608 | $arResults->$value = NULL; |
609 | 609 | } |
610 | 610 | } |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | /** |
629 | 629 | * Redirect to index |
630 | 630 | */ |
631 | - if(!empty($request->custom_route)){ |
|
631 | + if (!empty($request->custom_route)) { |
|
632 | 632 | return redirect($request->custom_route); |
633 | 633 | } |
634 | 634 | else { |
@@ -67,6 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | /** |
69 | 69 | * Reset all session fields |
70 | + * @param \Illuminate\Http\Request $request |
|
70 | 71 | */ |
71 | 72 | protected function _resetSessionFields($request){ |
72 | 73 | |
@@ -130,6 +131,9 @@ discard block |
||
130 | 131 | return Page::findOrFail($id); |
131 | 132 | } |
132 | 133 | |
134 | + /** |
|
135 | + * @param integer $id |
|
136 | + */ |
|
133 | 137 | protected function _getSettings($id){ |
134 | 138 | |
135 | 139 | $settings = Settings::find($id); |
@@ -145,8 +149,6 @@ discard block |
||
145 | 149 | /** |
146 | 150 | * Save transaction |
147 | 151 | * |
148 | - * @param int $typeId |
|
149 | - * @param string $text |
|
150 | 152 | * @param $userId |
151 | 153 | * @param $amount |
152 | 154 | */ |
@@ -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 | } |
@@ -15,7 +15,6 @@ |
||
15 | 15 | namespace App\Http\Controllers\Frontend; |
16 | 16 | |
17 | 17 | |
18 | -use App\Application; |
|
19 | 18 | use App\Campaign; |
20 | 19 | use App\Payment; |
21 | 20 | use App\Transaction; |
@@ -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' |
@@ -19,7 +19,6 @@ |
||
19 | 19 | /** |
20 | 20 | * Register any application authentication / authorization services. |
21 | 21 | * |
22 | - * @param \Illuminate\Contracts\Auth\Access\Gate $gate |
|
23 | 22 | * @return void |
24 | 23 | */ |
25 | 24 | public function boot() |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Providers; |
4 | 4 | |
5 | -use Illuminate\Contracts\Auth\Access\Gate as GateContract; |
|
6 | 5 | use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; |
7 | 6 | |
8 | 7 | class AuthServiceProvider extends ServiceProvider |
@@ -21,7 +21,6 @@ |
||
21 | 21 | /** |
22 | 22 | * Register any other events for your application. |
23 | 23 | * |
24 | - * @param \Illuminate\Contracts\Events\Dispatcher $events |
|
25 | 24 | * @return void |
26 | 25 | */ |
27 | 26 | public function boot() |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Providers; |
4 | 4 | |
5 | -use Illuminate\Contracts\Events\Dispatcher as DispatcherContract; |
|
6 | 5 | use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; |
7 | 6 | |
8 | 7 | class EventServiceProvider extends ServiceProvider |