← All changes | back/Controllers/Forms/Edition.php +12 -17 10.0.1 → 11.1.0 View file →

		@@ -5,9 +5,9 @@
5	5	use AcyMailing\Classes\FormClass;
6	6
7	7	trait Edition
8	8	{
9		- public function newForm()
	9	+ public function newForm(): void
10	10	{
11	11	acym_setVar('layout', 'new_form');
12	12
13	13	if (ACYM_CMS === 'joomla') {
		@@ -39,18 +39,18 @@
39	39
40	40	parent::display($data);
41	41	}
42	42
43		- public function edit()
	43	+ public function edit(): void
44	44	{
45	45	acym_setVar('layout', 'edit');
46	46	$formClass = new FormClass();
47	47	$id = acym_getVar('int', 'id', 0);
48	48	$type = acym_getVar('string', 'type', ACYM_CMS === 'wordpress' ? FormClass::SUB_FORM_TYPE_SHORTCODE : FormClass::SUB_FORM_TYPE_POPUP);
49		- if (!acym_level(ACYM_ENTERPRISE) && in_array(
50		- $type,
51		- [FormClass::SUB_FORM_TYPE_POPUP, FormClass::SUB_FORM_TYPE_HEADER, FormClass::SUB_FORM_TYPE_FOOTER]
52		- )) {
	49	+ if (
	50	+ !acym_level(ACYM_ENTERPRISE)
	51	+ && in_array($type, [FormClass::SUB_FORM_TYPE_POPUP, FormClass::SUB_FORM_TYPE_HEADER, FormClass::SUB_FORM_TYPE_FOOTER])
	52	+ ) {
53	53	acym_enqueueMessage(acym_translation('ACYM_NOT_ALLOWED_CREATE_TYPE_FORM'), 'info');
54	54	$this->listing();
55	55
56	56	return;
		@@ -60,9 +60,9 @@
60	60	$form = $formClass->initEmptyForm($type);
61	61	$this->breadcrumb[acym_translation('ACYM_NEW_FORM')] = acym_completeLink('forms&task=edit&id=0&type='.$type);
62	62	} else {
63	63	$form = $formClass->getOneById($id);
64		- $form = $formClass->getFormWithMissingParams($form);
	64	+ $form = $formClass->getFormWithMissingParams(get_object_vars($form));
65	65	$this->breadcrumb[$form->name] = acym_completeLink('forms&task=edit&id='.$id);
66	66	}
67	67
68	68	if (empty($form)) {
		@@ -83,16 +83,14 @@
83	83	$data = [
84	84	'all_languages' => $languagesName,
85	85	'form' => $form,
86	86	'all_pages' => $allPagesCMS,
87		- 'menu_render_settings' => $formClass->prepareMenuHtml($form, 'options'),
88		- 'menu_render_style' => $formClass->prepareMenuHtml($form, 'styles'),
89	87	];
90	88
91	89	parent::display($data);
92	90	}
93	91
94		- public function updateFormPreview()
	92	+ public function updateFormPreview(): void
95	93	{
96	94	$formArray = acym_getVar('array', 'form');
97	95	if (empty($formArray)) {
98	96	acym_sendAjaxResponse(acym_translation('ACYM_COULD_NOT_GET_FORM_INFORMATION'), [], false);
		@@ -99,11 +97,8 @@
99	97	}
100	98
101	99	$formClass = new FormClass();
102	100	$form = $formClass->getFormWithMissingParams($formArray);
103		- if (empty($form)) {
104		- acym_sendAjaxResponse(acym_translation('ACYM_COULD_NOT_GET_FORM_INFORMATION'), [], false);
105		- }
106	101
107	102	$data = [
108	103	'html' => $formClass->renderForm($form, true),
109	104	];
		@@ -114,11 +109,11 @@
114	109
115	110	acym_sendAjaxResponse('', $data);
116	111	}
117	112
118		- public function saveAjax()
	113	+ public function saveAjax(): void
119	114	{
120		- acym_checkToken();
	115	+ wp_verify_nonce(acym_getVar('cmd', '_wpnonce'), 'acymnonce') || die('Invalid Token');
121	116	$formArray = acym_getVar('array', 'form');
122	117	if (empty($formArray)) {
123	118	acym_sendAjaxResponse(acym_translation('ACYM_COULD_NOT_GET_FORM_INFORMATION'), [], false);
124	119	}
		@@ -140,9 +135,9 @@
140	135	acym_sendAjaxResponse(acym_translation('ACYM_FORM_WELL_SAVED'), ['id' => $id]);
141	136	}
142	137	}
143	138
144		- public function getArticles()
	139	+ public function getArticles(): void
145	140	{
146	141	$searchedTerm = acym_getVar('string', 'searchedterm', '');
147	142
148	143	echo json_encode(acym_getArticles($searchedTerm));
		@@ -148,9 +143,9 @@
148	143	echo json_encode(acym_getArticles($searchedTerm));
149	144	exit;
150	145	}
151	146
152		- public function getArticlesById()
	147	+ public function getArticlesById(): void
153	148	{
154	149	$id = acym_getVar('int', 'article_id', 0);
155	150
156	151	echo json_encode(acym_getArticleById($id));