← All changes | back/Partial/editor/context.php +168 -138 10.0.1 → 11.1.0 View file →

		@@ -1,24 +1,33 @@
	1	+<?php
	2	+// phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound -- View file, its variables are local to the include scope, not true globals.
	3	+defined('ABSPATH') || die('Restricted Access');
	4	+?>
1	5	<div id="acym__wysid__right__toolbar__current-block" style="display: none;" class="grid-padding-x cell acym__wysid__right__toolbar--menu">
2		- <p class="acym__wysid__right__toolbar__current-block__empty cell text-center margin-top-1"><?php echo acym_translation('ACYM_NO_BLOCK_SELECTED'); ?></p>
	6	+ <p class="acym__wysid__right__toolbar__current-block__empty cell text-center margin-top-1"><?php echo esc_html(acym_translation('ACYM_NO_BLOCK_SELECTED')); ?></p>
3	7	<div id="acym__wysid__context__block" class="grid-x cell acym__wysid__context__modal padding-1 padding-bottom-2" style="display: none">
4		- <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo acym_translation('ACYM_BACKGROUND'); ?><i class="acymicon-keyboard-arrow-up"></i></p>
	8	+ <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo esc_html(acym_translation('ACYM_BACKGROUND')); ?><i class="acymicon-keyboard-arrow-up"></i></p>
5	9	<div class="cell grid-x acym__wysid__context__modal__container">
6	10	<div class="cell grid-x acym_vcenter">
7		- <label class="cell small-6"><?php echo acym_translation('ACYM_BACKGROUND_COLOR'); ?></label>
	11	+ <label class="cell small-6"><?php echo esc_html(acym_translation('ACYM_BACKGROUND_COLOR')); ?></label>
8	12	<input type="text" id="acym__wysid__context__block__background-color">
9	13	</div>
10	14	<div class="cell grid-x acym_vcenter">
11		- <label class="cell small-6"><?php echo acym_translation('ACYM_BACKGROUND_IMAGE'); ?></label>
	15	+ <label class="cell small-6"><?php echo esc_html(acym_translation('ACYM_BACKGROUND_IMAGE')); ?></label>
12	16	<i class="acymicon-insert-photo acym__color__light-blue cursor-pointer" id="acym__wysid__context__block__background-image"></i>
13	17	<i class="acymicon-close acym__color__red cursor-pointer" style="display: none" id="acym__wysid__context__block__background-image__remove"></i>
14	18	</div>
15	19	<div class="cell grid-x acym_vcenter">
16		- <?php echo acym_switch('transparent_background', 0, acym_translation('ACYM_TRANSPARENT_BACKGROUND'), [], 'small-6 acym__wysid__context__block__transparent__bg');
	20	+ <?php acym_switch([
	21	+ 'name' => 'transparent_background',
	22	+ 'value' => 0,
	23	+ 'label' => acym_translation('ACYM_TRANSPARENT_BACKGROUND'),
	24	+ 'labelClass' => 'small-6 acym__wysid__context__block__transparent__bg',
	25	+ ]);
17	26	?>
18	27	</div>
19	28	</div>
20		- <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo acym_translation('ACYM_PADDING'); ?><i class="acymicon-keyboard-arrow-up"></i></p>
	29	+ <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo esc_html(acym_translation('ACYM_PADDING')); ?><i class="acymicon-keyboard-arrow-up"></i></p>
21	30	<div class="cell grid-x acym__wysid__context__modal__container">
22	31	<div class="cell grid-x align-center margin-bottom-1">
23	32	<input type="number" min="0" class="cell small-2 acym__wysid__context__block__padding" data-block-padding="top">
24	33	</div>
		@@ -30,15 +39,17 @@
30	39	<div class="cell grid-x align-center">
31	40	<input type="number" min="0" class="cell small-2 acym__wysid__context__block__padding" data-block-padding="bottom">
32	41	</div>
33	42	</div>
34		- <p class="cell acym__wysid__right__toolbar__p acym__wysid__context__modal__container--structure acym__title"><?php echo acym_translation('ACYM_STRUCTURE'); ?>
	43	+ <p class="cell acym__wysid__right__toolbar__p acym__wysid__context__modal__container--structure acym__title"><?php echo esc_html(
	44	+ acym_translation('ACYM_STRUCTURE')
	45	+ ); ?>
35	46	<i class="acymicon-keyboard-arrow-up"></i></p>
36	47	<div class="cell grid-x acym__wysid__context__modal__container acym__wysid__context__modal__container--structure acym__wysid__context__modal__container--structure--container">
37	48	<div class="cell grid-x grid-margin-x acym_vcenter">
38		- <h6 class="cell shrink"><?php echo acym_translation('ACYM_RESIZE_COLUMNS_OF_ROW'); ?></h6>
	49	+ <h6 class="cell shrink"><?php echo esc_html(acym_translation('ACYM_RESIZE_COLUMNS_OF_ROW')); ?></h6>
39	50	<div class="cell auto hide-for-medium-only hide-for-small-only"></div>
40		- <a href="<?php echo ACYM_DOCUMENTATION; ?>" target="_blank"><i class="acymicon-book"></i></a>
	51	+ <a href="<?php echo esc_url(ACYM_DOCUMENTATION); ?>" target="_blank"><i class="acymicon-book"></i></a>
41	52	</div>
42	53	<div class="grid-x cell acym__wysid__context__modal__container__block-settings grid-margin-y acym-grid-margin-x">
43	54	</div>
44	55	<div class="cell grid-x acym__wysid__context__modal__block-background acym_vcenter margin-top-1">
		@@ -47,37 +58,41 @@
47	58	</div>
48	59	<div class="cell grid-x acym__wysid__context__modal__block-padding">
49	60	</div>
50	61	</div>
51		- <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo acym_translation('ACYM_BORDER'); ?><i class="acymicon-keyboard-arrow-up"></i></p>
	62	+ <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo esc_html(acym_translation('ACYM_BORDER')); ?><i class="acymicon-keyboard-arrow-up"></i></p>
52	63	<div class="cell grid-x acym__wysid__context__modal__container">
53	64	<div class="cell grid-x">
54		- <label class="cell small-5"><?php echo acym_translation('ACYM_RADIUS'); ?></label>
	65	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_RADIUS')); ?></label>
55	66	<input type="number" max="20" min="0" class="cell small-2 acym__wysid__context__block__border__actions" data-css="border-radius">
56	67	</div>
57	68	<div class="cell grid-x">
58		- <label class="cell small-5"><?php echo acym_translation('ACYM_WIDTH'); ?></label>
	69	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_WIDTH')); ?></label>
59	70	<input type="number" max="10" min="0" class="cell small-2 acym__wysid__context__block__border__actions" data-css="border-width"">
60	71	</div>
61	72	<div class="cell grid-x acym_vcenter">
62		- <label class="cell small-5"><?php echo acym_translation('ACYM_COLOR'); ?></label>
	73	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_COLOR')); ?></label>
63	74	<input type="number" max="20" min="0" class="cell small-2" id="acym__wysid__context__block__border__color">
64	75	</div>
65	76	</div>
66		- <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo acym_translation('ACYM_ADVANCED_OPTIONS'); ?><i class="acymicon-keyboard-arrow-up"></i></p>
	77	+ <p class="cell acym__wysid__right__toolbar__p acym__title"><?php echo esc_html(acym_translation('ACYM_ADVANCED_OPTIONS')); ?>
	78	+ <i class="acymicon-keyboard-arrow-up"></i></p>
67	79	<div class="cell grid-x acym__wysid__context__modal__container">
68		- <label class="cell small-5"><?php echo acym_translation('ACYM_HTML_ID').acym_info('ACYM_HTML_ID_DESC'); ?></label>
	80	+ <label class="cell small-5">
	81	+ <?php echo esc_html(acym_translation('ACYM_HTML_ID'));
	82	+ acym_info(['textShownInTooltip' => 'ACYM_HTML_ID_DESC']); ?></label>
69	83	<input type="text"
70		- class="cell small-6"
71		- id="acym__wysid__context__block__custom_id"
72		- placeholder="<?php echo acym_escape(acym_translation('ACYM_HTML_ID')); ?>">
	84	+ class="cell small-6"
	85	+ id="acym__wysid__context__block__custom_id"
	86	+ placeholder="<?php echo esc_attr(acym_translation('ACYM_HTML_ID')); ?>">
73	87	<div class="cell grid-x acym__wysid__context__block__code-source">
74	88	<label class="cell small-5 acym_vcenter">
75		- <?php echo acym_translation('ACYM_EDIT_BLOCK_HTML').acym_info('ACYM_BECAREFUL_EDITING_SOURCE_CODE'); ?>
	89	+ <?php echo esc_html(acym_translation('ACYM_EDIT_BLOCK_HTML'));
	90	+ acym_info(['textShownInTooltip' => 'ACYM_BECAREFUL_EDITING_SOURCE_CODE']); ?>
76	91	</label>
77	92	<div class="cell shrink acym_vcenter">
78	93	<button type="button" class="button button-secondary" id="acym__wysid__context__block__edit-html">
79		- <?php echo acym_translation('ACYM_EDIT_HTML'); ?>
	94	+ <?php echo esc_html(acym_translation('ACYM_EDIT_HTML')); ?>
80	95	</button>
81	96	</div>
82	97	</div>
83	98	</div>
		@@ -84,18 +99,18 @@
84	99	</div>
85	100	<?php include acym_getPartial('editor', 'context_text'); ?>
86	101	<div id="acym__wysid__context__button" class="grid-x padding-1 acym__wysid__context__modal" style="display: none">
87	102	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
88		- <?php echo acym_translation('ACYM_BUTTON_TYPE'); ?>
	103	+ <?php echo esc_html(acym_translation('ACYM_BUTTON_TYPE')); ?>
89	104	<i class="acymicon-keyboard-arrow-up"></i>
90	105	</p>
91	106	<div class="grid-x cell acym__wysid__context__modal__container grid-margin-x">
92	107	<button type="button"
93		- class="button-radio cell medium-4 acym__wysid__context__button--type"
94		- acym-button-radio-group="buttonType"
95		- acym-data-type="call-action"><?php echo acym_translation('ACYM_CALL_TO_ACTION'); ?></button>
	108	+ class="button-radio cell medium-4 acym__wysid__context__button--type"
	109	+ acym-button-radio-group="buttonType"
	110	+ acym-data-type="call-action"><?php echo esc_html(acym_translation('ACYM_CALL_TO_ACTION')); ?></button>
96	111	<?php
97		- echo acym_tooltip(
	112	+ acym_tooltip(
98	113	[
99	114	'hoveredText' => '<button type="button"
100	115	class="button-radio cell acym__wysid__context__button--type"
101	116	acym-button-radio-group="buttonType"
		@@ -104,9 +119,9 @@
104	119	'classContainer' => 'cell medium-4 grid-x',
105	120	]
106	121	);
107	122
108		- echo acym_tooltip(
	123	+ acym_tooltip(
109	124	[
110	125	'hoveredText' => '<button type="button"
111	126	class="button-radio cell acym__wysid__context__button--type"
112	127	acym-button-radio-group="buttonType"
		@@ -117,42 +132,50 @@
117	132	);
118	133	?>
119	134	</div>
120	135	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
121		- <?php echo acym_translation('ACYM_CONTENT'); ?><i class="acymicon-keyboard-arrow-up"></i>
	136	+ <?php echo esc_html(acym_translation('ACYM_CONTENT')); ?><i class="acymicon-keyboard-arrow-up"></i>
122	137	</p>
123	138	<div class="cell grid-x acym__wysid__context__modal__container">
124	139	<div class="grid-x cell acym__wysid__context__button__text__container">
125		- <label class="cell small-5"><?php echo acym_translation('ACYM_TEXT'); ?></label>
126		- <input id="acym__wysid__context__button__text" class="auto cell" type="text" placeholder="<?php echo acym_translation('ACYM_MY_BUTTON'); ?>">
	140	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_TEXT')); ?></label>
	141	+ <input id="acym__wysid__context__button__text" class="auto cell" type="text" placeholder="<?php echo esc_attr(acym_translation('ACYM_MY_BUTTON')); ?>">
127	142	</div>
128	143	<div class="grid-x cell acym__wysid__context__button__link__container">
129	144	<div class="cell grid-x">
130		- <label class="cell small-5" for="acym__wysid__context__button__link"><?php echo acym_translation('ACYM_LINK'); ?></label>
	145	+ <label class="cell small-5" for="acym__wysid__context__button__link"><?php echo esc_html(acym_translation('ACYM_LINK')); ?></label>
131	146	<input id="acym__wysid__context__button__link" class="input-group-field cell auto" type="text" placeholder="https://www.example.com">
132	147	</div>
133	148	</div>
	149	+ <div class="grid-x cell acym__wysid__context__button__redirection__container">
	150	+ <div class="cell grid-x">
	151	+ <label class="cell small-5" for="acym__wysid__context__button__redirection"><?php echo esc_html(acym_translation('ACYM_REDIRECTION_URL')); ?></label>
	152	+ <input id="acym__wysid__context__button__redirection" class="input-group-field cell auto" type="text" placeholder="https://www.example.com">
	153	+ </div>
	154	+ </div>
134	155	<div class="grid-x cell acym__wysid__context__button__link__file">
135	156	<div class="cell grid-x">
136	157	<label class="cell small-5">
137		- <?php echo acym_translation('ACYM_FILE'); ?>
138		- <?php echo acym_info('ACYM_FILE_GENERATE_LINK_BUTTON_EDITOR'); ?>
	158	+ <?php echo esc_html(acym_translation('ACYM_FILE')); ?>
	159	+ <?php acym_info(['textShownInTooltip' => 'ACYM_FILE_GENERATE_LINK_BUTTON_EDITOR']); ?>
139	160	</label>
140		- <button id="acym__wysid__context__button__file" type="button" class="button button-secondary"><?php echo acym_translation('ACYM_SELECT_FILE'); ?></button>
	161	+ <button id="acym__wysid__context__button__file" type="button" class="button button-secondary"><?php echo esc_html(
	162	+ acym_translation('ACYM_SELECT_FILE')
	163	+ ); ?></button>
141	164	</div>
142	165	</div>
143	166	</div>
144	167	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
145		- <?php echo acym_translation('ACYM_FONT'); ?><i class="acymicon-keyboard-arrow-up"></i>
	168	+ <?php echo esc_html(acym_translation('ACYM_FONT')); ?><i class="acymicon-keyboard-arrow-up"></i>
146	169	</p>
147	170	<div class="grid-x cell acym__wysid__context__modal__container">
148	171	<div class="cell grid-x">
149		- <label class="cell small-5"><?php echo acym_translation('ACYM_FORMATTING'); ?></label>
	172	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_FORMATTING')); ?></label>
150	173	<i id="acym__wysid__context__button__italic" class="acymicon-format-italic small-1 cell acym__wysid__context__button__actions-i"></i>
151	174	<i id="acym__wysid__context__button__bold" class="acymicon-format-bold small-1 cell acym__wysid__context__button__actions-i"></i>
152	175	</div>
153	176	<div class="cell grid-x">
154		- <label for="acym__wysid__context__button__font" class="cell small-5"><?php echo acym_translation('ACYM_FONT_FAMILY'); ?></label>
	177	+ <label for="acym__wysid__context__button__font" class="cell small-5"><?php echo esc_html(acym_translation('ACYM_FONT_FAMILY')); ?></label>
155	178	<select id="acym__wysid__context__button__font-family" class="auto cell">
156	179	<option style="font-family: 'Andale Mono'">Andale Mono</option>
157	180	<option style="font-family: 'Arial'">Arial</option>
158	181	<option style="font-family: 'Book Antiqua'">Book Antiqua</option>
		@@ -166,9 +189,9 @@
166	189	<option style="font-family: 'Verdana'">Verdana</option>
167	190	</select>
168	191	</div>
169	192	<div class="cell grid-x">
170		- <label for="acym__wysid__context__button__font" class="cell small-5"><?php echo acym_translation('ACYM_SIZE'); ?></label>
	193	+ <label for="acym__wysid__context__button__font" class="cell small-5"><?php echo esc_html(acym_translation('ACYM_SIZE')); ?></label>
171	194	<select id="acym__wysid__context__button__font-size" class="small-5 cell">
172	195	<option>10</option>
173	196	<option>12</option>
174	197	<option>14</option>
		@@ -182,18 +205,18 @@
182	205	<option>36</option>
183	206	</select>
184	207	</div>
185	208	<div class="cell grid-x">
186		- <label for="acym__wysid__context__button__background" class="cell small-5"><?php echo acym_translation('ACYM_COLOR'); ?></label>
	209	+ <label for="acym__wysid__context__button__background" class="cell small-5"><?php echo esc_html(acym_translation('ACYM_COLOR')); ?></label>
187	210	<input type="text" id="acym__wysid__context__button__color" class="small-2 cell">
188	211	</div>
189	212	</div>
190	213	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
191		- <?php echo acym_translation('ACYM_BORDER'); ?><i class="acymicon-keyboard-arrow-up"></i>
	214	+ <?php echo esc_html(acym_translation('ACYM_BORDER')); ?><i class="acymicon-keyboard-arrow-up"></i>
192	215	</p>
193	216	<div class="cell grid-x acym__wysid__context__modal__container">
194	217	<div class="grid-x cell">
195		- <label class="cell small-5"><?php echo acym_translation('ACYM_WIDTH'); ?></label>
	218	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_WIDTH')); ?></label>
196	219	<select id="acym__wysid__context__button__border-width" class="small-5 cell">
197	220	<option>0</option>
198	221	<option>1</option>
199	222	<option>2</option>
		@@ -202,9 +225,9 @@
202	225	<option>5</option>
203	226	</select>
204	227	</div>
205	228	<div class="grid-x cell">
206		- <label class="small-5 cell"><?php echo acym_translation('ACYM_RADIUS'); ?></label>
	229	+ <label class="small-5 cell"><?php echo esc_html(acym_translation('ACYM_RADIUS')); ?></label>
207	230	<select id="acym__wysid__context__button__border-radius" class="small-5 cell">
208	231	<option>0</option>
209	232	<option>5</option>
210	233	<option>10</option>
		@@ -213,25 +236,26 @@
213	236	<option>25</option>
214	237	</select>
215	238	</div>
216	239	<div class="cell grid-x">
217		- <label class="cell small-5"><?php echo acym_translation('ACYM_COLOR'); ?></label>
	240	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_COLOR')); ?></label>
218	241	<input type="text" id="acym__wysid__context__button__border-color" class="small-5 cell">
219	242	</div>
220	243	</div>
221	244	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
222		- <?php echo acym_translation('ACYM_OTHER'); ?><i class="acymicon-keyboard-arrow-up"></i>
	245	+ <?php echo esc_html(acym_translation('ACYM_OTHER')); ?><i class="acymicon-keyboard-arrow-up"></i>
223	246	</p>
224	247	<div class="cell grid-x acym__wysid__context__modal__container">
225	248	<div class="cell grid-x">
226	249	<label for="acym__wysid__context__button__background-color" class="cell small-5">
227		- <?php echo acym_translation('ACYM_BACKGROUND_COLOR').acym_info('ACYM_BACKGROUND_COLOR_BUTTON_DESC'); ?>
	250	+ <?php echo esc_html(acym_translation('ACYM_BACKGROUND_COLOR'));
	251	+ acym_info(['textShownInTooltip' => 'ACYM_BACKGROUND_COLOR_BUTTON_DESC']); ?>
228	252	</label>
229	253	<input type="text" id="acym__wysid__context__button__background-color" class="small-5 cell">
230	254	</div>
231	255	<div class="grid-x cell">
232	256	<div class="cell grid-x">
233		- <label class="cell small-5"><?php echo acym_translation('ACYM_ALIGNMENT'); ?></label>
	257	+ <label class="cell small-5"><?php echo esc_html(acym_translation('ACYM_ALIGNMENT')); ?></label>
234	258	<i class="acymicon-format-align-left cell shrink acym__wysid__context__button__align" id="acym__wysid__context__button__align__left" data-align="left"></i>
235	259	<i class="acymicon-format-align-center cell shrink acym__wysid__context__button__align"
236	260	id="acym__wysid__context__button__align__center"
237	261	data-align="center"></i>
		@@ -239,36 +263,33 @@
239	263	</div>
240	264	</div>
241	265	<div class="cell grid-x margin-top-1 acym_vcenter margin-bottom-1">
242	266	<?php
243		- echo acym_switch(
244		- 'full_width',
245		- 0,
246		- acym_tooltip(
247		- [
248		- 'hoveredText' => acym_translation('ACYM_FULL_WIDTH'),
249		- 'textShownInTooltip' => acym_translation('ACYM_FULL_WIDTH_DESC'),
250		- ]
251		- ),
252		- [],
253		- 'small-5'
254		- );
	267	+ acym_switch([
	268	+ 'name' => 'full_width',
	269	+ 'value' => 0,
	270	+ 'tooltip' => [
	271	+ 'hoveredText' => acym_translation('ACYM_FULL_WIDTH'),
	272	+ 'textShownInTooltip' => acym_translation('ACYM_FULL_WIDTH_DESC'),
	273	+ ],
	274	+ 'labelClass' => 'small-5',
	275	+ ]);
255	276	?>
256	277	<div class="cell grid-x acym__button__padding">
257	278	<div class="cell grid-x">
258	279	<div class="cell grid-x small-12">
259		- <label class="cell small-3"><?php echo acym_translation('ACYM_PADDING'); ?></label>
	280	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_PADDING')); ?></label>
260	281	<div class="small-6 padding-right-1 padding-left-1 cell acym__wysid__context__button__slider" data-output="slider__output__button__width">
261	282	<div class="slider" data-slider="" data-end="100" data-initial-start="25">
262	283	<span class="slider-handle"
263		- data-slider-handle=""
264		- role="slider"
265		- tabindex="0"
266		- aria-controls="slider__output__button__width"
267		- aria-valuemax="50"
268		- data-valuenow="25"
269		- aria-valuemin="10"
270		- style="left: 44%"></span>
	284	+ data-slider-handle=""
	285	+ role="slider"
	286	+ tabindex="0"
	287	+ aria-controls="slider__output__button__width"
	288	+ aria-valuemax="50"
	289	+ data-valuenow="25"
	290	+ aria-valuemin="10"
	291	+ style="left: 44%"></span>
271	292	<span class="slider-fill" data-slider-fill="" style="width: 44%;"></span>
272	293	</div>
273	294	</div>
274	295	<div class="small-2 cell" id="acym__wysid__context__space__input">
		@@ -281,9 +302,9 @@
281	302	<span class="slider-handle" data-slider-handle role="slider" tabindex="0" aria-controls="slider__output__button__height"></span>
282	303	<span class="slider-fill" data-slider-fill></span>
283	304	</div>
284	305	</div>
285		- <div class="cell small-7 acym__button__padding__shape align-center acym_vcenter"><?php echo acym_translation('ACYM_BUTTON'); ?></div>
	306	+ <div class="cell small-7 acym__button__padding__shape align-center acym_vcenter"><?php echo esc_html(acym_translation('ACYM_BUTTON')); ?></div>
286	307	<div class="cell grid-x">
287	308	<input type="number" class="cell small-2" id="slider__output__button__height" max="50" min="10" step="1">
288	309	</div>
289	310	</div>
		@@ -292,21 +313,21 @@
292	313	</div>
293	314	</div>
294	315	</div>
295	316	<div id="acym__wysid__context__space" style="display: none" class="grid-x padding-1 acym__wysid__context__modal">
296		- <label class="cell small-3"><?php echo acym_translation('ACYM_HEIGHT'); ?></label>
	317	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_HEIGHT')); ?></label>
297	318	<div class="small-6 padding-right-1 cell" id="acym__wysid__context__space__slider">
298	319	<div class="slider" data-slider="" data-initial-start="50" data-start="10" data-e="2mf38c-e">
299	320	<span class="slider-handle"
300		- data-slider-handle=""
301		- role="slider"
302		- tabindex="0"
303		- aria-controls="sliderOutput1"
304		- aria-valuemax="100"
305		- aria-valuemin="10"
306		- aria-valuenow="50"
307		- aria-orientation="horizontal"
308		- style="left: 44%;"></span>
	321	+ data-slider-handle=""
	322	+ role="slider"
	323	+ tabindex="0"
	324	+ aria-controls="sliderOutput1"
	325	+ aria-valuemax="100"
	326	+ aria-valuemin="10"
	327	+ aria-valuenow="50"
	328	+ aria-orientation="horizontal"
	329	+ style="left: 44%;"></span>
309	330	<span class="slider-fill" data-slider-fill="" style="width: 44%;"></span>
310	331	</div>
311	332	</div>
312	333	<div class="small-2 cell" id="acym__wysid__context__space__input">
		@@ -314,12 +335,12 @@
314	335	</div>
315	336	</div>
316	337	<div id="acym__wysid__context__image" style="display: none" class="grid-x padding-1 acym__wysid__context__modal">
317	338	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
318		- <?php echo acym_translation('ACYM_POSITION'); ?><i class="acymicon-keyboard-arrow-up"></i></p>
	339	+ <?php echo esc_html(acym_translation('ACYM_POSITION')); ?><i class="acymicon-keyboard-arrow-up"></i></p>
319	340	<div class="cell grid-x acym__wysid__context__modal__container">
320	341	<div class="cell grid-x">
321		- <label class="cell small-3"><?php echo acym_translation('ACYM_ALIGNMENT'); ?></label>
	342	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_ALIGNMENT')); ?></label>
322	343	<div class="cell auto grid-x">
323	344	<i class="acymicon-format-align-left cell shrink acym__wysid__context__image__align"
324	345	id="acym__wysid__context__image__align__left"
325	346	data-float="left"
		@@ -324,13 +345,13 @@
324	345	id="acym__wysid__context__image__align__left"
325	346	data-float="left"
326	347	data-css='{"float": "left"}'></i>
327	348	<i class="acymicon-format-align-center cell shrink acym__wysid__context__image__align"
328		- id="acym__wysid__context__image__align__left"
	349	+ id="acym__wysid__context__image__align__center"
329	350	data-float="none"
330		- data-css='{"marginRight": "auto", "marginLeft": "auto", "float": "none"}'></i>
	351	+ data-css='{"marginRight": "auto", "marginLeft": "auto", "float": "none", "display": "inline-block"}'></i>
331	352	<i class="acymicon-format-align-right cell shrink acym__wysid__context__image__align"
332		- id="acym__wysid__context__image__align__left"
	353	+ id="acym__wysid__context__image__align__right"
333	354	data-float="right"
334	355	data-css='{"float": "right"}'></i>
335	356	</div>
336	357	</div>
		@@ -335,69 +356,71 @@
335	356	</div>
336	357	</div>
337	358	</div>
338	359	<div class="cell grid-x">
339		- <label class="cell small-3"><?php echo acym_translation('ACYM_WIDTH'); ?></label>
	360	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_WIDTH')); ?></label>
340	361	<div class="cell auto grid-x">
341	362	<input class="intext_input acym_context_image_size_input" id="acym__wysid__context__image__width" name="contextImageWidth" type="number" />
342	363	</div>
343	364	</div>
344	365	<div class="cell grid-x">
345		- <label class="cell small-3"><?php echo acym_translation('ACYM_HEIGHT'); ?></label>
	366	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_HEIGHT')); ?></label>
346	367	<div class="cell auto grid-x">
347	368	<input class="intext_input acym_context_image_size_input" id="acym__wysid__context__image__height" name="contextImageHeight" type="number" />
348	369	</div>
349	370	</div>
350	371	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
351		- <?php echo acym_translation('ACYM_IMAGE_URL'); ?><i class="acymicon-keyboard-arrow-up"></i>
	372	+ <?php echo esc_html(acym_translation('ACYM_IMAGE_URL')); ?><i class="acymicon-keyboard-arrow-up"></i>
352	373	</p>
353	374	<div class="cell grid-x acym__wysid__context__modal__container align-center">
354		- <label for="acym__wysid__context__image__url" class="cell small-4"><?php echo acym_translation('ACYM_URL'); ?></label>
	375	+ <label for="acym__wysid__context__image__url" class="cell small-4"><?php echo esc_html(acym_translation('ACYM_URL')); ?></label>
355	376	<input type="text"
356		- name="image_url"
357		- value=""
358		- id="acym__wysid__context__image__url"
359		- placeholder="https://www.example.com/image.png"
360		- class="cell small-8">
	377	+ name="image_url"
	378	+ value=""
	379	+ id="acym__wysid__context__image__url"
	380	+ placeholder="https://www.example.com/image.png"
	381	+ class="cell small-8">
361	382	<label for="acym__upload__context__image__alt" class="cell small-4">
362		- <?php echo acym_translation('ACYM_IMAGE_ALT').acym_info('ACYM_IMAGE_ALT_DESCRIPTION'); ?>
	383	+ <?php echo esc_html(acym_translation('ACYM_IMAGE_ALT'));
	384	+ acym_info(['textShownInTooltip' => 'ACYM_IMAGE_ALT_DESCRIPTION']); ?>
363	385	</label>
364	386	<input type="text"
365		- name="image_alt"
366		- value=""
367		- id="acym__upload__context__image__alt"
368		- class="cell small-8">
	387	+ name="image_alt"
	388	+ value=""
	389	+ id="acym__upload__context__image__alt"
	390	+ class="cell small-8">
369	391	<label for="acym__upload_context__image__title" class="cell small-4">
370		- <?php echo acym_translation('ACYM_IMAGE_TITLE').acym_info('ACYM_IMAGE_TITLE_DESCRIPTION'); ?>
	392	+ <?php echo esc_html(acym_translation('ACYM_IMAGE_TITLE'));
	393	+ acym_info(['textShownInTooltip' => 'ACYM_IMAGE_TITLE_DESCRIPTION']); ?>
371	394	</label>
372	395	<input type="text"
373		- name="image_title"
374		- value=""
375		- id="acym__upload_context__image__title"
376		- class="cell small-8">
	396	+ name="image_title"
	397	+ value=""
	398	+ id="acym__upload_context__image__title"
	399	+ class="cell small-8">
377	400	<label for="acym__upload__context__image__caption" class="cell small-4">
378		- <?php echo acym_translation('ACYM_CAPTION'); ?>
	401	+ <?php echo esc_html(acym_translation('ACYM_CAPTION')); ?>
379	402	</label>
380	403	<input type="text"
381		- name="image_caption"
382		- value=""
383		- id="acym__upload__context__image__caption"
384		- class="cell small-8">
	404	+ name="image_caption"
	405	+ value=""
	406	+ id="acym__upload__context__image__caption"
	407	+ class="cell small-8">
385	408	<button type="button" class="cell shrink button button-secondary margin-top-1" id="acym__wysid__context__image__change">
386		- <?php echo acym_translation('ACYM_MEDIA_MANAGE'); ?>
	409	+ <?php echo esc_html(acym_translation('ACYM_MEDIA_MANAGE')); ?>
387	410	</button>
388	411	</div>
389	412	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
390		- <?php echo acym_translation('ACYM_LINK'); ?><i class="acymicon-keyboard-arrow-up"></i>
	413	+ <?php echo esc_html(acym_translation('ACYM_LINK')); ?><i class="acymicon-keyboard-arrow-up"></i>
391	414	</p>
392	415	<div class="cell grid-x acym__wysid__context__modal__container">
393		- <label for="acym__wysid__context__image__link" class="cell small-4"><?php echo acym_translation('ACYM_LINK'); ?></label>
	416	+ <label for="acym__wysid__context__image__link" class="cell small-4"><?php echo esc_html(acym_translation('ACYM_LINK')); ?></label>
394	417	<input type="text" name="image_link" value="" id="acym__wysid__context__image__link" placeholder="https://www.example.com" class="cell small-8">
395	418	</div>
396	419	</div>
397	420	<div id="acym__wysid__context__separator" class="grid-x padding-1 acym__wysid__context__modal" style="display: none">
398	421	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
399		- <?php echo acym_translation('ACYM_STYLE'); ?><i class="acymicon-keyboard-arrow-up"></i>
	422	+ <?php echo esc_html(acym_translation('ACYM_STYLE')); ?><i class="acymicon-keyboard-arrow-up"></i>
400	423	</p>
401	424	<div class="cell grid-x acym__wysid__context__modal__container">
402	425	<div class="cell grid-x grid-margin-x">
403	426	<div class="acym__wysid__context__separator__kind cell small-3 separator-selected">
		@@ -413,30 +436,30 @@
413	436	<hr data-kind="double" style="border-bottom: 3px double black">
414	437	</div>
415	438	</div>
416	439	<label class="cell small-11 grid-x grid-margin-x margin-top-1">
417		- <label class="cell small-3 acym__color__light-blue"><?php echo acym_translation('ACYM_COLOR'); ?></label>
	440	+ <label class="cell small-3 acym__color__light-blue"><?php echo esc_html(acym_translation('ACYM_COLOR')); ?></label>
418	441	<input type="text" id="acym__wysid__context__separator__color">
419	442	</label>
420	443	</div>
421	444	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
422		- <?php echo acym_translation('ACYM_SIZE'); ?><i class="acymicon-keyboard-arrow-up"></i>
	445	+ <?php echo esc_html(acym_translation('ACYM_SIZE')); ?><i class="acymicon-keyboard-arrow-up"></i>
423	446	</p>
424	447	<div class="cell grid-x acym__wysid__context__modal__container">
425	448	<div class="cell grid-x">
426		- <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo acym_translation('ACYM_HEIGHT'); ?></label>
	449	+ <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo esc_html(acym_translation('ACYM_HEIGHT')); ?></label>
427	450	<div class="small-6 padding-right-1 padding-left-1 cell" id="acym__wysid__context__separator__slide">
428	451	<div class="slider" data-slider data-initial-start="3" data-start="1" data-e="2mf38c-e">
429	452	<span class="slider-handle"
430		- data-slider-handle
431		- role="slider"
432		- tabindex="0"
433		- aria-controls="sliderOutput2"
434		- aria-valuemax="20"
435		- aria-valuemin="1"
436		- aria-valuenow="3"
437		- aria-orientation="horizontal"
438		- style="left: 44%;"></span>
	453	+ data-slider-handle
	454	+ role="slider"
	455	+ tabindex="0"
	456	+ aria-controls="sliderOutput2"
	457	+ aria-valuemax="20"
	458	+ aria-valuemin="1"
	459	+ aria-valuenow="3"
	460	+ aria-orientation="horizontal"
	461	+ style="left: 44%;"></span>
439	462	<span class="slider-fill" data-slider-fill style="width: 44%;"></span>
440	463	</div>
441	464	</div>
442	465	<div class="small-2 cell margin-left-1" id="acym__wysid__context__separator__input__height">
		@@ -443,9 +466,9 @@
443	466	<input type="number" id="sliderOutput2" max="20" min="1" step="1" value="3">
444	467	</div>
445	468	</div>
446	469	<div class="cell grid-x">
447		- <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo acym_translation('ACYM_WIDTH'); ?></label>
	470	+ <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo esc_html(acym_translation('ACYM_WIDTH')); ?></label>
448	471	<div class="small-6 padding-right-1 padding-left-1 cell" id="acym__wysid__context__separator__slide__width">
449	472	<div class="slider" data-slider data-initial-start="100">
450	473	<span class="slider-handle" data-slider-handle role="slider" tabindex="1" aria-controls="sliderOutput3" style="left: 100%;"></span>
451	474	<span class="slider-fill" data-slider-fill style="width: 100%;"></span>
		@@ -455,9 +478,9 @@
455	478	<input type="number" id="sliderOutput3" max="100" min="0" step="1" value="100">
456	479	</div>
457	480	</div>
458	481	<div class="cell grid-x">
459		- <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo acym_translation('ACYM_SPACE'); ?></label>
	482	+ <label class="cell small-3 acym_vcenter acym__color__light-blue"><?php echo esc_html(acym_translation('ACYM_SPACE')); ?></label>
460	483	<div class="small-6 padding-right-1 padding-left-1 cell" id="acym__wysid__context__separator__slide__space">
461	484	<div class="slider" data-slider data-initial-start="10" data-options="end:50;">
462	485	<span class="slider-handle" data-slider-handle role="slider" tabindex="1" aria-controls="sliderOutput4" style="left: 100%;"></span>
463	486	<span class="slider-fill" data-slider-fill style="width: 100%;"></span>
		@@ -470,13 +493,13 @@
470	493	</div>
471	494	</div>
472	495	<div id="acym__wysid__context__follow" class="grid-x padding-1 acym__wysid__context__modal" style="display: none">
473	496	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
474		- <?php echo acym_translation('ACYM_LINKS'); ?><i class="acymicon-keyboard-arrow-up"></i>
	497	+ <?php echo esc_html(acym_translation('ACYM_LINKS')); ?><i class="acymicon-keyboard-arrow-up"></i>
475	498	</p>
476	499	<div class="cell grid-x acym__wysid__context__modal__container">
477	500	<div class="grid-x cell margin-bottom-1">
478		- <label class="cell small-3"><?php echo acym_translation('ACYM_ADD_NEW'); ?></label>
	501	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_ADD_NEW')); ?></label>
479	502	<div class="small-2 cell">
480	503	<select name="acym__wysid__context__follow__select" id="acym__wysid__context__follow__select">
481	504	</select>
482	505	</div>
		@@ -484,13 +507,13 @@
484	507	<div id="acym__wysid__context__follow__list" class="grid-x small-12 cell">
485	508	</div>
486	509	</div>
487	510	<p class="cell acym__wysid__right__toolbar__p__open acym__wysid__right__toolbar__p acym__title">
488		- <?php echo acym_translation('ACYM_OTHER'); ?><i class="acymicon-keyboard-arrow-up"></i>
	511	+ <?php echo esc_html(acym_translation('ACYM_OTHER')); ?><i class="acymicon-keyboard-arrow-up"></i>
489	512	</p>
490	513	<div class="cell grid-x acym__wysid__context__modal__container">
491	514	<div class="cell grid-x">
492		- <label class="small-3 cell"><?php echo acym_translation('ACYM_WIDTH'); ?></label>
	515	+ <label class="small-3 cell"><?php echo esc_html(acym_translation('ACYM_WIDTH')); ?></label>
493	516	<div class="small-6 padding-right-1 padding-left-1 cell" id="acym__wysid__context__social__width__slider">
494	517	<div class="slider" data-slider data-initial-start="40" data-options="start:30;end:80;">
495	518	<span class="slider-handle" data-slider-handle role="slider" tabindex="1" aria-controls="acym__wysid__context__social__width" style="left: 100%;"></span>
496	519	<span class="slider-fill" data-slider-fill style="width: 100%;"></span>
		@@ -501,9 +524,9 @@
501	524	</div>
502	525	</div>
503	526	<div class="grid-x cell margin-top-1">
504	527	<div class="cell grid-x grid-margin-x">
505		- <label class="cell small-3"><?php echo acym_translation('ACYM_ALIGNMENT'); ?></label>
	528	+ <label class="cell small-3"><?php echo esc_html(acym_translation('ACYM_ALIGNMENT')); ?></label>
506	529	<div class="cell auto grid-x">
507	530	<i class="acymicon-format-align-left cell shrink acym__wysid__context__follow__align" id="acym__wysid__context__follow__align__left" data-align="left"></i>
508	531	<i class="acymicon-format-align-center cell shrink acym__wysid__context__follow__align"
509	532	id="acym__wysid__context__follow__align__center"
		@@ -518,25 +541,27 @@
518	541	</div>
519	542	<?php if ($this->config->get('display_built_by', 0) == 1) { ?>
520	543	<div id="acym__wysid__context__poweredby" style="display: none" class="grid-x padding-1 acym__wysid__context__modal">
521	544	<?php if (!acym_level(ACYM_ESSENTIAL)) { ?>
522		- <h3 class="cell acym__title text-center"><?php echo acym_translation('ACYM_WANT_TO_REMOVE_THIS'); ?></h3>
	545	+ <h3 class="cell acym__title text-center"><?php echo esc_html(acym_translation('ACYM_WANT_TO_REMOVE_THIS')); ?></h3>
523	546	<div class="cell grid-x grid-margin-y text-center margin-bottom-1">
524		- <div class="cell"><?php echo acym_translation('ACYM_SEEING_THIS_AS_FREE_VERSION'); ?></div>
525		- <div class="cell"><?php echo acym_translation('ACYM_DISABLE_BY_GETTING_PRO'); ?></div>
526		- <div class="cell"><?php echo acym_translation('ACYM_PRICES_STARTS_AT'); ?></div>
	547	+ <div class="cell"><?php echo esc_html(acym_translation('ACYM_SEEING_THIS_AS_FREE_VERSION')); ?></div>
	548	+ <div class="cell"><?php echo esc_html(acym_translation('ACYM_DISABLE_BY_GETTING_PRO')); ?></div>
	549	+ <div class="cell"><?php echo esc_html(acym_translation('ACYM_PRICES_STARTS_AT')); ?></div>
527	550	</div>
528	551	<div class="cell text-center margin-bottom-1">
529	552	<a class="button button-secondary"
530	553	target="_blank"
531		- href="<?php echo ACYM_ACYMAILING_WEBSITE; ?>pricing/?utm_source=acymailing_plugin&utm_campaign=purchase&utm_medium=built_with_footer">
532		- <?php echo acym_translation('ACYM_SEE_PRO_VERSION_FEATURES'); ?>
	554	+ href="<?php echo esc_url(ACYM_ACYMAILING_WEBSITE); ?>pricing/?utm_source=acymailing_plugin&utm_campaign=purchase&utm_medium=built_with_footer">
	555	+ <?php echo esc_html(acym_translation('ACYM_SEE_PRO_VERSION_FEATURES')); ?>
533	556	</a>
534	557	</div>
535	558	<hr data-kind="solid" style="border-bottom: 1px solid black" class="cell margin-1">
536	559	<?php } ?>
537	560	<div class="grid-x small-12 cell">
538		- <label class="middle large-6 small-8 cell" for="acym__wysid__built-with__text__color"><?php echo acym_translation('ACYM_BUILT_WITH_IMAGE_TEXT_COLOR'); ?></label>
	561	+ <label class="middle large-6 small-8 cell" for="acym__wysid__built-with__text__color"><?php echo esc_html(
	562	+ acym_translation('ACYM_BUILT_WITH_IMAGE_TEXT_COLOR')
	563	+ ); ?></label>
539	564	<div class="cell large-6 small-4">
540	565	<?php
541	566	$brightness = [
542	567	'black' => acym_translation('ACYM_BLACK'),
		@@ -541,13 +566,18 @@
541	566	$brightness = [
542	567	'black' => acym_translation('ACYM_BLACK'),
543	568	'white' => acym_translation('ACYM_WHITE'),
544	569	];
545		- echo acym_select(
	570	+ acym_select(
546	571	$brightness,
547	572	'acym__wysid__built-with__text__color',
548	573	'black',
549		- ['class' => 'acym__select']
	574	+ ['class' => 'acym__select'],
	575	+ 'value',
	576	+ 'text',
	577	+ null,
	578	+ false,
	579	+ true
550	580	);
551	581	?>
552	582	</div>
553	583	</div>