← All changes | classes/models/FrmTableHTMLGenerator.php +10 -118 6.26 → 6.21 View file →

		@@ -9,9 +9,8 @@
9	9	class FrmTableHTMLGenerator {
10	10
11	11	/**
12	12	* @var string
13		- *
14	13	* @since 2.04
15	14	*/
16	15	private $type = '';
17	16
		@@ -16,9 +15,8 @@
16	15	private $type = '';
17	16
18	17	/**
19	18	* @var array
20		- *
21	19	* @since 2.04
22	20	*/
23	21	private $style_settings = array();
24	22
		@@ -23,9 +21,8 @@
23	21	private $style_settings = array();
24	22
25	23	/**
26	24	* @var bool
27		- *
28	25	* @since 2.04
29	26	*/
30	27	private $use_inline_style = true;
31	28
		@@ -30,9 +27,8 @@
30	27	private $use_inline_style = true;
31	28
32	29	/**
33	30	* @var string
34		- *
35	31	* @since 2.04
36	32	* @since 5.0.16 Changed scope from `private` to `protected`.
37	33	*/
38	34	protected $direction = 'ltr';
		@@ -38,9 +34,8 @@
38	34	protected $direction = 'ltr';
39	35
40	36	/**
41	37	* @var bool
42		- *
43	38	* @since 2.04
44	39	*/
45	40	private $odd = true;
46	41
		@@ -45,9 +40,8 @@
45	40	private $odd = true;
46	41
47	42	/**
48	43	* @var string
49		- *
50	44	* @since 2.04
51	45	* @since 5.0.16 Changed scope from `private` to `protected`.
52	46	*/
53	47	protected $table_style = '';
		@@ -53,9 +47,8 @@
53	47	protected $table_style = '';
54	48
55	49	/**
56	50	* @var string
57		- *
58	51	* @since 2.04
59	52	* @since 5.0.16 Changed scope from `private` to `protected`.
60	53	*/
61	54	protected $td_style = '';
		@@ -60,30 +53,11 @@
60	53	*/
61	54	protected $td_style = '';
62	55
63	56	/**
64		- * Cell padding.
65		- *
66		- * @since 6.25
67		- *
68		- * @var string
69		- */
70		- protected $cell_padding = '7px 9px';
71		-
72		- /**
73		- * Table width.
74		- *
75		- * @since 6.25
76		- *
77		- * @var string
78		- */
79		- protected $width = '';
80		-
81		- /**
82	57	* Used to add a class in tables. Set in Pro.
83	58	*
84	59	* @var bool
85		- *
86	60	* @since 5.4.2
87	61	*/
88	62	public $is_child = false;
89	63
		@@ -93,18 +67,10 @@
93	67	* @param string $type
94	68	* @param array $atts
95	69	*/
96	70	public function __construct( $type, $atts = array() ) {
97		- $this->type = $type;
98	71
99		- if ( isset( $atts['cell_padding'] ) ) {
100		- $this->cell_padding = $atts['cell_padding'];
101		- }
102		-
103		- if ( isset( $atts['width'] ) ) {
104		- $this->width = $atts['width'];
105		- }
106		-
	72	+ $this->type = (string) $type;
107	73	$this->init_style_settings( $atts );
108	74	$this->init_use_inline_style( $atts );
109	75	$this->init_direction( $atts );
110	76	$this->init_table_style();
		@@ -116,9 +82,8 @@
116	82	*
117	83	* @since 2.04
118	84	*
119	85	* @param array $atts
120		- *
121	86	* @return void
122	87	*/
123	88	private function init_style_settings( $atts ) {
124	89	$style_settings = array(
		@@ -140,9 +105,9 @@
140	105	$this->style_settings[ $key ] = $this->get_color_markup( $this->style_settings[ $key ] );
141	106	}
142	107	}
143	108
144		- $this->style_settings['class'] = $atts['class'] ?? '';
	109	+ $this->style_settings['class'] = isset( $atts['class'] ) ? $atts['class'] : '';
145	110	}
146	111
147	112	/**
148	113	* Set the use_inline_style property
		@@ -149,9 +114,8 @@
149	114	*
150	115	* @since 2.04
151	116	*
152	117	* @param array $atts
153		- *
154	118	* @return void
155	119	*/
156	120	private function init_use_inline_style( $atts ) {
157	121	if ( isset( $atts['inline_style'] ) && ! $atts['inline_style'] ) {
		@@ -164,9 +128,8 @@
164	128	*
165	129	* @since 2.04
166	130	*
167	131	* @param array $atts
168		- *
169	132	* @return void
170	133	*/
171	134	private function init_direction( $atts ) {
172	135	if ( isset( $atts['direction'] ) && $atts['direction'] === 'rtl' ) {
		@@ -177,15 +140,14 @@
177	140	/**
178	141	* Set the table_style property
179	142	*
180	143	* @since 2.04
181		- *
182	144	* @return void
183	145	*/
184	146	private function init_table_style() {
185	147	if ( $this->use_inline_style === true ) {
186	148
187		- $this->table_style = ' style="' . esc_attr( 'border-spacing:0;font-size:' . $this->style_settings['font_size'] . ';line-height:135%;' );
	149	+ $this->table_style = ' style="' . esc_attr( 'font-size:' . $this->style_settings['font_size'] . ';line-height:135%;' );
188	150	$this->table_style .= esc_attr( 'border-bottom:' . $this->style_settings['border_width'] . ' solid ' . $this->style_settings['border_color'] . ';' ) . '"';
189	151
190	152	}
191	153
		@@ -191,12 +153,8 @@
191	153
192	154	if ( ! empty( $this->style_settings['class'] ) ) {
193	155	$this->table_style .= ' class="' . esc_attr( $this->style_settings['class'] ) . '"';
194	156	}
195		-
196		- if ( ! empty( $this->width ) ) {
197		- $this->table_style .= ' width="' . esc_attr( $this->width ) . '"';
198		- }
199	157	}
200	158
201	159	/**
202	160	* Set the td_style property
		@@ -201,9 +159,8 @@
201	159	/**
202	160	* Set the td_style property
203	161	*
204	162	* @since 2.04
205		- *
206	163	* @return void
207	164	*/
208	165	private function init_td_style() {
209	166	if ( $this->use_inline_style === true ) {
		@@ -208,41 +165,19 @@
208	165	private function init_td_style() {
209	166	if ( $this->use_inline_style === true ) {
210	167
211	168	$td_style_attributes = 'text-align:' . ( $this->direction === 'rtl' ? 'right' : 'left' ) . ';';
212		- $td_style_attributes .= 'color:' . $this->style_settings['text_color'] . ';padding:' . $this->cell_padding . ';vertical-align:top;';
	169	+ $td_style_attributes .= 'color:' . $this->style_settings['text_color'] . ';padding:7px 9px;vertical-align:top;';
213	170	$td_style_attributes .= 'border-top:' . $this->style_settings['border_width'] . ' solid ' . $this->style_settings['border_color'] . ';';
214	171
215		- $this->td_style = ' style="' . esc_attr( $td_style_attributes ) . '"';
	172	+ $this->td_style = ' style="' . $td_style_attributes . '"';
216	173	}
217	174	}
218	175
219	176	/**
220		- * Removes border CSS from HTML.
221		- *
222		- * @since 6.25
223		- *
224		- * @param string $html The HTML.
225		- * @param string $position The border position. Default is `top`.
226		- *
227		- * @return string
228		- */
229		- public function remove_border( $html, $position = 'top' ) {
230		- $search = sprintf(
231		- 'border-%1$s:%2$s solid %3$s;',
232		- $position,
233		- $this->style_settings['border_width'],
234		- $this->style_settings['border_color']
235		- );
236		-
237		- return str_replace( $search, '', $html );
238		- }
239		-
240		- /**
241	177	* Determine if setting is for a color, e.g. text color, background color, or border color
242	178	*
243	179	* @since 2.05
244		- *
245	180	* @param string $setting_key Name of setting.
246	181	*
247	182	* @return bool
248	183	*/
		@@ -253,9 +188,8 @@
253	188	/**
254	189	* Get color markup from color setting value
255	190	*
256	191	* @since 2.05
257		- *
258	192	* @param string $color_markup value of a color setting, with format #FFFFF, FFFFFF, or white.
259	193	*
260	194	* @return string
261	195	*/
		@@ -285,13 +219,12 @@
285	219	* Get the table row style
286	220	*
287	221	* @since 2.04
288	222	* @since 5.0.16 Changed scope from `private` to `protected`.
289		- * @since 6.25 Changed scope from `protected` to `public`.
290	223	*
291	224	* @return string
292	225	*/
293		- public function tr_style() {
	226	+ protected function tr_style() {
294	227
295	228	if ( $this->type === 'shortcode' ) {
296	229	$tr_style = ' style="[frm-alt-color]"';
297	230	} elseif ( $this->use_inline_style ) {
		@@ -303,30 +236,8 @@
303	236	return $tr_style;
304	237	}
305	238
306	239	/**
307		- * Gets table style.
308		- *
309		- * @since 6.25
310		- *
311		- * @return string
312		- */
313		- public function get_table_style() {
314		- return $this->table_style;
315		- }
316		-
317		- /**
318		- * Gets td style.
319		- *
320		- * @since 6.25
321		- *
322		- * @return string
323		- */
324		- public function get_td_style() {
325		- return $this->td_style;
326		- }
327		-
328		- /**
329	240	* Switch the odd property from true to false or false to true
330	241	*
331	242	* @since 2.04
332	243	* @since 5.0.16 Changed scope from `private` to `protected`.
		@@ -346,9 +257,9 @@
346	257	*
347	258	* @return string
348	259	*/
349	260	public function generate_table_header() {
350		- return '<table cellspacing="0"' . $this->table_style . '><tbody>' . "\r\n";
	261	+ return '<table cellspacing="0" ' . $this->table_style . '><tbody>' . "\r\n";
351	262	}
352	263
353	264	/**
354	265	* Generate a table footer
		@@ -367,19 +278,18 @@
367	278	* @since 2.04
368	279	*
369	280	* @param string $label The label.
370	281	* @param string $value The value.
371		- * @param array $args Additional arguments. May include "field_type" string.
372	282	*
373	283	* @return string
374	284	*/
375		- public function generate_two_cell_table_row( $label, $value, $args = array() ) {
	285	+ public function generate_two_cell_table_row( $label, $value ) {
376	286	$row = '<tr' . $this->tr_style();
377	287	$row .= $this->add_row_class( $value === '' );
378	288	$row .= '>';
379	289
380		- $label = '<th scope="row"' . $this->td_style . '>' . wp_kses_post( $label ) . '</th>';
381		- $value = '<td' . $this->td_style . '>' . $this->filter_value_for_display( $value, $args ) . '</td>';
	290	+ $label = '<th' . $this->td_style . '>' . wp_kses_post( $label ) . '</th>';
	291	+ $value = '<td' . $this->td_style . '>' . wp_kses_post( $value ) . '</td>';
382	292
383	293	if ( 'rtl' == $this->direction ) {
384	294	$row .= $value;
385	295	$row .= $label;
		@@ -395,23 +305,8 @@
395	305	return $row;
396	306	}
397	307
398	308	/**
399		- * @param string $value
400		- * @param array $args
401		- *
402		- * @return string
403		- */
404		- private function filter_value_for_display( $value, $args ) {
405		- if ( empty( $args['field_type'] ) ) {
406		- return wp_kses_post( $value );
407		- }
408		-
409		- $field_object = FrmFieldFactory::get_field_type( $args['field_type'] );
410		- return $field_object->filter_value_for_table_html( $value );
411		- }
412		-
413		- /**
414	309	* Generate a single cell row for an HTML table
415	310	*
416	311	* @since 2.04
417	312	*
		@@ -441,18 +336,15 @@
441	336	* @return string
442	337	*/
443	338	protected function add_row_class( $empty = false ) {
444	339	$class = '';
445		-
446	340	if ( $empty ) {
447	341	// Only add this class on two cell rows.
448	342	$class .= ' frm-empty-row';
449	343	}
450		-
451	344	if ( $this->is_child ) {
452	345	$class .= ' frm-child-row';
453	346	}
454		-
455	347	if ( $class ) {
456	348	$class = ' class="' . trim( $class ) . '"';
457	349	}
458	350	return $class;