@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | (array) config('backpack.base.web_middleware', 'web'), |
24 | 24 | (array) config('backpack.base.middleware_key', 'admin') |
25 | 25 | ), |
26 | -], function () { |
|
26 | +], function() { |
|
27 | 27 | Route::crud('formbuilder', \MedianetDev\BackpackForm\Http\Controllers\Admin\FormbuilderCrudController::class); |
28 | 28 | Route::crud('formbuilderentry', \MedianetDev\BackpackForm\Http\Controllers\Admin\FormbuilderEntryCrudController::class); |
29 | 29 | Route::crud('formbuilder/{id_form}/formbuilderentry', \MedianetDev\BackpackForm\Http\Controllers\Admin\FormbuilderEntryCrudController::class); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | (array) config('backpack.base.web_middleware', 'web') |
35 | 35 | )) |
36 | 36 | ->group( |
37 | - function () { |
|
37 | + function() { |
|
38 | 38 | Route::get('/add-entry/{id}', 'show')->name('showformbuilderentry'); |
39 | 39 | Route::post('/add-entry', 'store')->name('storeformbuilderentry'); |
40 | 40 | } |
@@ -35,12 +35,12 @@ |
||
35 | 35 | { |
36 | 36 | $this->crud->allowAccess('create'); |
37 | 37 | |
38 | - $this->crud->operation('create', function () { |
|
38 | + $this->crud->operation('create', function() { |
|
39 | 39 | $this->crud->loadDefaultOperationSettingsFromConfig(); |
40 | 40 | $this->crud->setupDefaultSaveActions(); |
41 | 41 | }); |
42 | 42 | |
43 | - $this->crud->operation('list', function () { |
|
43 | + $this->crud->operation('list', function() { |
|
44 | 44 | $this->crud->addButton('top', 'create', 'view', 'crud::buttons.create'); |
45 | 45 | }); |
46 | 46 | } |
@@ -32,9 +32,9 @@ |
||
32 | 32 | $id_form = Route::current()->parameter('id_form'); |
33 | 33 | if ($id_form) { |
34 | 34 | $this->crud->addClause('where', 'fb_form_id', '=', $id_form); |
35 | - CRUD::setRoute(config('backpack.base.route_prefix') . '/formbuilder/' . $id_form . '/formbuilderentry'); |
|
35 | + CRUD::setRoute(config('backpack.base.route_prefix').'/formbuilder/'.$id_form.'/formbuilderentry'); |
|
36 | 36 | } else { |
37 | - CRUD::setRoute(config('backpack.base.route_prefix') . '/formbuilderentry'); |
|
37 | + CRUD::setRoute(config('backpack.base.route_prefix').'/formbuilderentry'); |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 |
@@ -691,7 +691,7 @@ discard block |
||
691 | 691 | |
692 | 692 | |
693 | 693 | |
694 | - private function processFormStepsAndFields($form, $formComponents) |
|
694 | + private function processFormStepsAndFields($form, $formComponents) |
|
695 | 695 | { |
696 | 696 | $currentLocale = App::getLocale(); |
697 | 697 | $allFields = []; |
@@ -711,8 +711,8 @@ discard block |
||
711 | 711 | |
712 | 712 | // Delete standalone fields (without step association) |
713 | 713 | $standaloneFields = FormField::where('form_id', $form->id) |
714 | - ->whereNull('form_step_id') |
|
715 | - ->get(); |
|
714 | + ->whereNull('form_step_id') |
|
715 | + ->get(); |
|
716 | 716 | foreach ($standaloneFields as $field) { |
717 | 717 | FormFieldCondition::where('form_field_id', $field->id)->delete(); |
718 | 718 | $field->translation()->delete(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | public function setup() |
44 | 44 | { |
45 | 45 | CRUD::setModel(Formbuilder::class); |
46 | - CRUD::setRoute(config('backpack.base.route_prefix') . '/formbuilder'); |
|
46 | + CRUD::setRoute(config('backpack.base.route_prefix').'/formbuilder'); |
|
47 | 47 | CRUD::setEntityNameStrings( |
48 | 48 | __('medianet-dev.backpack-form::formbuilder.labels.entity_form'), |
49 | 49 | __('medianet-dev.backpack-form::formbuilder.labels.entities_form') |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | // \DB::commit(); |
620 | 620 | return $response; |
621 | 621 | } catch (\Exception $e) { |
622 | - \Log::error('Form creation failed: ' . $e->getMessage()); |
|
622 | + \Log::error('Form creation failed: '.$e->getMessage()); |
|
623 | 623 | return back()->withErrors(['message' => __('medianet-dev.backpack-form::formbuilder.validations.form_creation_failed')]); |
624 | 624 | } |
625 | 625 | } |
@@ -652,7 +652,7 @@ discard block |
||
652 | 652 | return $response; |
653 | 653 | } catch (\Exception $e) { |
654 | 654 | // \DB::rollBack(); |
655 | - \Log::error('Form update failed: ' . $e->getMessage()); |
|
655 | + \Log::error('Form update failed: '.$e->getMessage()); |
|
656 | 656 | return back()->withErrors(['message' => __('medianet-dev.backpack-form::formbuilder.validations.form_update_failed')]); |
657 | 657 | } |
658 | 658 | } |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | |
726 | 726 | foreach ($formComponents as $index => $component) { |
727 | 727 | if ($component->type === 'panel') { |
728 | - $panelComponents[] = (object)[ |
|
728 | + $panelComponents[] = (object) [ |
|
729 | 729 | 'component' => $component, |
730 | 730 | 'index' => $index |
731 | 731 | ]; |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | } |
47 | 47 | // validate Google ReCaptcha V3 |
48 | 48 | if (!empty(config('backpack-form.captcha_v3_site_key')) && !empty(config('backpack-form.captcha_v3_secret_key')) && !empty($orginalForm->display_captcha) && $request->has('g-recaptcha-response')) { |
49 | - if(!$this->verifyReCaptcha($request->input('g-recaptcha-response'))) { |
|
49 | + if (!$this->verifyReCaptcha($request->input('g-recaptcha-response'))) { |
|
50 | 50 | return Redirect::back()->withErrors(['message' => __('medianet-dev.backpack-form::formbuilder.validations.captcha_invalid')])->withInput(); |
51 | 51 | } |
52 | 52 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $fields = json_decode($orginalForm->form); |
59 | 59 | foreach ($fields as $field) { |
60 | 60 | // Escape no input form entry |
61 | - if(isset($field->name)) { |
|
61 | + if (isset($field->name)) { |
|
62 | 62 | $field->userData = [$request->input($field->name)]; |
63 | 63 | $fieldWithData[] = $field; |
64 | 64 | } |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | } |
77 | 77 | $data_admin = []; |
78 | 78 | if ($orginalForm->copy_user) { |
79 | - $data_user = []; |
|
79 | + $data_user = []; |
|
80 | 80 | $data_user['content_form'] = json_decode($newForm->structure_result); |
81 | 81 | $data_user['form_entry'] = $newForm; |
82 | 82 | $data_user['orginal_form'] = $orginalForm; |
83 | 83 | $mail_to = collect($data_user['content_form'])->where('name', $orginalForm->field_mail_name)->first(); |
84 | 84 | |
85 | - if(empty($mail_to) || empty($mail_to->userData[0]) || (!empty($mail_to->userData[0]) && !filter_var($mail_to->userData[0], FILTER_VALIDATE_EMAIL))) { |
|
85 | + if (empty($mail_to) || empty($mail_to->userData[0]) || (!empty($mail_to->userData[0]) && !filter_var($mail_to->userData[0], FILTER_VALIDATE_EMAIL))) { |
|
86 | 86 | $data_admin['error_mail_user'] = __('medianet-dev.backpack-form::formbuilder.emails.error_mail_user'); |
87 | 87 | } else { |
88 | 88 | Mail::to($mail_to->userData[0])->send(new MailFormBuilderEntry('medianet.backpack-form::emails.user_template', $data_user)); |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | * @param string $recaptchaCode the token in request input form |
108 | 108 | * @return true/false |
109 | 109 | */ |
110 | - private function verifyReCaptcha(string $recaptchaCode){ |
|
111 | - $postdata = http_build_query(["secret" => config('backpack-form.captcha_v3_secret_key'),"response" => $recaptchaCode]); |
|
110 | + private function verifyReCaptcha(string $recaptchaCode) { |
|
111 | + $postdata = http_build_query(["secret" => config('backpack-form.captcha_v3_secret_key'), "response" => $recaptchaCode]); |
|
112 | 112 | $opts = ['http' => |
113 | 113 | [ |
114 | 114 | 'method' => 'POST', |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | { |
27 | 27 | $locale = locale(); |
28 | 28 | return [ |
29 | - $locale .'.title' => 'required|min:3|max:255', |
|
30 | - $locale .'.text_button' => 'required|min:1|max:255', |
|
29 | + $locale.'.title' => 'required|min:3|max:255', |
|
30 | + $locale.'.text_button' => 'required|min:1|max:255', |
|
31 | 31 | 'intro' => 'nullable', |
32 | 32 | 'form' => 'nullable', |
33 | 33 | 'mail_to' => 'required_if:by_mail,1|max:255', |
@@ -43,12 +43,12 @@ discard block |
||
43 | 43 | public function attributes() |
44 | 44 | { |
45 | 45 | $language = default_language(); |
46 | - $attributes[$language . '.title'] = __('medianet-dev.backpack-form::formbuilder.labels.title') . ' ' . trans('medianet-dev.backpack-form::formbuilder.common.in_langue') . ' ' . trans('medianet-dev.backpack-form::formbuilder.languages.' . $language); |
|
47 | - $attributes['intro'] =__('medianet-dev.backpack-form::formbuilder.labels.intro'); |
|
48 | - $attributes['form'] = __('medianet-dev.backpack-form::formbuilder.labels.form'); |
|
49 | - $attributes['text_button'] = __('medianet-dev.backpack-form::formbuilder.labels.text_button'); |
|
50 | - $attributes['mail_to'] = __('medianet-dev.backpack-form::formbuilder.labels.mail_to'); |
|
51 | - $attributes['by_mail'] = __('medianet-dev.backpack-form::formbuilder.labels.by_mail'); |
|
46 | + $attributes[$language.'.title'] = __('medianet-dev.backpack-form::formbuilder.labels.title').' '.trans('medianet-dev.backpack-form::formbuilder.common.in_langue').' '.trans('medianet-dev.backpack-form::formbuilder.languages.'.$language); |
|
47 | + $attributes['intro'] = __('medianet-dev.backpack-form::formbuilder.labels.intro'); |
|
48 | + $attributes['form'] = __('medianet-dev.backpack-form::formbuilder.labels.form'); |
|
49 | + $attributes['text_button'] = __('medianet-dev.backpack-form::formbuilder.labels.text_button'); |
|
50 | + $attributes['mail_to'] = __('medianet-dev.backpack-form::formbuilder.labels.mail_to'); |
|
51 | + $attributes['by_mail'] = __('medianet-dev.backpack-form::formbuilder.labels.by_mail'); |
|
52 | 52 | return $attributes; |
53 | 53 | } |
54 | 54 |
@@ -15,7 +15,7 @@ |
||
15 | 15 | { |
16 | 16 | $locale = app()->getLocale(); |
17 | 17 | return [ |
18 | - // 'key' => 'required|string|unique:med_form_fields,key', |
|
18 | + // 'key' => 'required|string|unique:med_form_fields,key', |
|
19 | 19 | 'form_id' => 'required|exists:med_forms,id', |
20 | 20 | 'form_step_id' => 'required|exists:med_form_steps,id', |
21 | 21 | 'type' => 'required|string|in:textfield,textarea,number,password,checkbox,selectboxes,select,radio,button,email,url,phoneNumber,address,datetime,day,time,currency,signature,file,content,columns,fieldset,panel,table,tabs,well,hidden', |
@@ -18,13 +18,13 @@ discard block |
||
18 | 18 | $locale = locale(); |
19 | 19 | $id = request()->id; |
20 | 20 | return [ |
21 | - $locale . '.title' => 'required|min:3|max:255', |
|
22 | - $locale . '.description' => 'nullable', |
|
21 | + $locale.'.title' => 'required|min:3|max:255', |
|
22 | + $locale.'.description' => 'nullable', |
|
23 | 23 | 'is_active' => 'required|boolean', |
24 | 24 | 'order' => [ |
25 | 25 | 'required', |
26 | 26 | 'integer', |
27 | - Rule::unique('med_form_steps', 'order')->where(function ($query) { |
|
27 | + Rule::unique('med_form_steps', 'order')->where(function($query) { |
|
28 | 28 | return $query->where('form_id', request()->form_id); |
29 | 29 | })->ignore($id), |
30 | 30 | ], |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public function attributes() |
38 | 38 | { |
39 | 39 | $language = default_language(); |
40 | - $attributes[$language . '.title'] = __('medianet-dev.backpack-form::formbuilder.labels.title') . ' ' . trans('medianet-dev.backpack-form::formbuilder.common.in_langue') . ' ' . trans('medianet-dev.backpack-form::formbuilder.languages.' . $language); |
|
40 | + $attributes[$language.'.title'] = __('medianet-dev.backpack-form::formbuilder.labels.title').' '.trans('medianet-dev.backpack-form::formbuilder.common.in_langue').' '.trans('medianet-dev.backpack-form::formbuilder.languages.'.$language); |
|
41 | 41 | $attributes['order'] = __('medianet-dev.backpack-form::formbuilder.labels.order'); |
42 | 42 | return $attributes; |
43 | 43 | } |
@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | public function form() |
37 | 37 | { |
38 | - return $this->belongsTo(Formbuilder::class,'form_id'); |
|
38 | + return $this->belongsTo(Formbuilder::class, 'form_id'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /* |