← All changes | classes/models/FrmTableHTMLGenerator.php +30 -180 6.26 → 5.0 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,17 +27,14 @@
30	27	private $use_inline_style = true;
31	28
32	29	/**
33	30	* @var string
34		- *
35	31	* @since 2.04
36		- * @since 5.0.16 Changed scope from `private` to `protected`.
37	32	*/
38		- protected $direction = 'ltr';
	33	+ private $direction = 'ltr';
39	34
40	35	/**
41	36	* @var bool
42		- *
43	37	* @since 2.04
44	38	*/
45	39	private $odd = true;
46	40
		@@ -45,66 +39,27 @@
45	39	private $odd = true;
46	40
47	41	/**
48	42	* @var string
49		- *
50	43	* @since 2.04
51		- * @since 5.0.16 Changed scope from `private` to `protected`.
52	44	*/
53		- protected $table_style = '';
	45	+ private $table_style = '';
54	46
55	47	/**
56	48	* @var string
57		- *
58	49	* @since 2.04
59		- * @since 5.0.16 Changed scope from `private` to `protected`.
60	50	*/
61		- protected $td_style = '';
	51	+ private $td_style = '';
62	52
63	53	/**
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		- * Used to add a class in tables. Set in Pro.
83		- *
84		- * @var bool
85		- *
86		- * @since 5.4.2
87		- */
88		- public $is_child = false;
89		-
90		- /**
91	54	* FrmTableHTMLGenerator constructor.
92	55	*
93	56	* @param string $type
94		- * @param array $atts
	57	+ * @param array $atts
95	58	*/
96	59	public function __construct( $type, $atts = array() ) {
97		- $this->type = $type;
98	60
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		-
	61	+ $this->type = (string) $type;
107	62	$this->init_style_settings( $atts );
108	63	$this->init_use_inline_style( $atts );
109	64	$this->init_direction( $atts );
110	65	$this->init_table_style();
		@@ -116,10 +71,8 @@
116	71	*
117	72	* @since 2.04
118	73	*
119	74	* @param array $atts
120		- *
121		- * @return void
122	75	*/
123	76	private function init_style_settings( $atts ) {
124	77	$style_settings = array(
125	78	'border_color' => 'dddddd',
		@@ -140,9 +93,9 @@
140	93	$this->style_settings[ $key ] = $this->get_color_markup( $this->style_settings[ $key ] );
141	94	}
142	95	}
143	96
144		- $this->style_settings['class'] = $atts['class'] ?? '';
	97	+ $this->style_settings['class'] = isset( $atts['class'] ) ? $atts['class'] : '';
145	98	}
146	99
147	100	/**
148	101	* Set the use_inline_style property
		@@ -149,10 +102,8 @@
149	102	*
150	103	* @since 2.04
151	104	*
152	105	* @param array $atts
153		- *
154		- * @return void
155	106	*/
156	107	private function init_use_inline_style( $atts ) {
157	108	if ( isset( $atts['inline_style'] ) && ! $atts['inline_style'] ) {
158	109	$this->use_inline_style = false;
		@@ -164,10 +115,8 @@
164	115	*
165	116	* @since 2.04
166	117	*
167	118	* @param array $atts
168		- *
169		- * @return void
170	119	*/
171	120	private function init_direction( $atts ) {
172	121	if ( isset( $atts['direction'] ) && $atts['direction'] === 'rtl' ) {
173	122	$this->direction = 'rtl';
		@@ -177,15 +126,13 @@
177	126	/**
178	127	* Set the table_style property
179	128	*
180	129	* @since 2.04
181		- *
182		- * @return void
183	130	*/
184	131	private function init_table_style() {
185	132	if ( $this->use_inline_style === true ) {
186	133
187		- $this->table_style = ' style="' . esc_attr( 'border-spacing:0;font-size:' . $this->style_settings['font_size'] . ';line-height:135%;' );
	134	+ $this->table_style = ' style="' . esc_attr( 'font-size:' . $this->style_settings['font_size'] . ';line-height:135%;' );
188	135	$this->table_style .= esc_attr( 'border-bottom:' . $this->style_settings['border_width'] . ' solid ' . $this->style_settings['border_color'] . ';' ) . '"';
189	136
190	137	}
191	138
		@@ -191,12 +138,8 @@
191	138
192	139	if ( ! empty( $this->style_settings['class'] ) ) {
193	140	$this->table_style .= ' class="' . esc_attr( $this->style_settings['class'] ) . '"';
194	141	}
195		-
196		- if ( ! empty( $this->width ) ) {
197		- $this->table_style .= ' width="' . esc_attr( $this->width ) . '"';
198		- }
199	142	}
200	143
201	144	/**
202	145	* Set the td_style property
		@@ -201,51 +144,28 @@
201	144	/**
202	145	* Set the td_style property
203	146	*
204	147	* @since 2.04
205		- *
206		- * @return void
207	148	*/
208	149	private function init_td_style() {
209	150	if ( $this->use_inline_style === true ) {
210	151
211		- $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;';
	152	+ $td_style_attributes = 'text-align:' . ( $this->direction == 'rtl' ? 'right' : 'left' ) . ';';
	153	+ $td_style_attributes .= 'color:' . $this->style_settings['text_color'] . ';padding:7px 9px;vertical-align:top;';
213	154	$td_style_attributes .= 'border-top:' . $this->style_settings['border_width'] . ' solid ' . $this->style_settings['border_color'] . ';';
214	155
215		- $this->td_style = ' style="' . esc_attr( $td_style_attributes ) . '"';
	156	+ $this->td_style = ' style="' . $td_style_attributes . '"';
216	157	}
217	158	}
218	159
219	160	/**
220		- * Removes border CSS from HTML.
	161	+ * Determine if setting is for a color, e.g. text color, background color, or border color
221	162	*
222		- * @since 6.25
	163	+ * @param string $setting_key name of setting
223	164	*
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		- * Determine if setting is for a color, e.g. text color, background color, or border color
242		- *
243	165	* @since 2.05
244	166	*
245		- * @param string $setting_key Name of setting.
246		- *
247		- * @return bool
	167	+ * @return boolean
248	168	*/
249	169	private function is_color_setting( $setting_key ) {
250	170	return strpos( $setting_key, 'color' ) !== false;
251	171	}
		@@ -252,19 +172,19 @@
252	172
253	173	/**
254	174	* Get color markup from color setting value
255	175	*
	176	+ * @param string $color_markup value of a color setting, with format #FFFFF, FFFFFF, or white.
	177	+ *
256	178	* @since 2.05
257	179	*
258		- * @param string $color_markup value of a color setting, with format #FFFFF, FFFFFF, or white.
259		- *
260	180	* @return string
261	181	*/
262	182	private function get_color_markup( $color_markup ) {
263	183	$color_markup = trim( $color_markup );
264	184
265		- // Check if each character in string is valid hex digit
266		- if ( FrmAppHelper::ctype_xdigit( $color_markup ) ) {
	185	+ //check if each character in string is valid hex digit
	186	+ if ( ctype_xdigit( $color_markup ) ) {
267	187	$color_markup = '#' . $color_markup;
268	188	}
269	189
270	190	return $color_markup;
		@@ -284,14 +204,12 @@
284	204	/**
285	205	* Get the table row style
286	206	*
287	207	* @since 2.04
288		- * @since 5.0.16 Changed scope from `private` to `protected`.
289		- * @since 6.25 Changed scope from `protected` to `public`.
290	208	*
291	209	* @return string
292	210	*/
293		- public function tr_style() {
	211	+ private function tr_style() {
294	212
295	213	if ( $this->type === 'shortcode' ) {
296	214	$tr_style = ' style="[frm-alt-color]"';
297	215	} elseif ( $this->use_inline_style ) {
		@@ -303,38 +221,13 @@
303	221	return $tr_style;
304	222	}
305	223
306	224	/**
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	225	* Switch the odd property from true to false or false to true
330	226	*
331	227	* @since 2.04
332		- * @since 5.0.16 Changed scope from `private` to `protected`.
333		- *
334		- * @return void
335	228	*/
336		- protected function switch_odd() {
	229	+ private function switch_odd() {
337	230	if ( $this->type !== 'shortcode' ) {
338	231	$this->odd = ! $this->odd;
339	232	}
340	233	}
		@@ -346,9 +239,9 @@
346	239	*
347	240	* @return string
348	241	*/
349	242	public function generate_table_header() {
350		- return '<table cellspacing="0"' . $this->table_style . '><tbody>' . "\r\n";
	243	+ return '<table cellspacing="0" ' . $this->table_style . '><tbody>' . "\r\n";
351	244	}
352	245
353	246	/**
354	247	* Generate a table footer
		@@ -365,21 +258,22 @@
365	258	* Generate a two cell row for an HTML table
366	259	*
367	260	* @since 2.04
368	261	*
369		- * @param string $label The label.
370		- * @param string $value The value.
371		- * @param array $args Additional arguments. May include "field_type" string.
	262	+ * @param string $label
	263	+ * @param string $value
372	264	*
373	265	* @return string
374	266	*/
375		- public function generate_two_cell_table_row( $label, $value, $args = array() ) {
376		- $row = '<tr' . $this->tr_style();
377		- $row .= $this->add_row_class( $value === '' );
	267	+ public function generate_two_cell_table_row( $label, $value ) {
	268	+ $row = '<tr' . $this->tr_style();
	269	+ if ( $value === '' ) {
	270	+ $row .= ' class="frm-empty-row"';
	271	+ }
378	272	$row .= '>';
379	273
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>';
	274	+ $label = '<th' . $this->td_style . '>' . wp_kses_post( $label ) . '</th>';
	275	+ $value = '<td' . $this->td_style . '>' . wp_kses_post( $value ) . '</td>';
382	276
383	277	if ( 'rtl' == $this->direction ) {
384	278	$row .= $value;
385	279	$row .= $label;
		@@ -395,23 +289,8 @@
395	289	return $row;
396	290	}
397	291
398	292	/**
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	293	* Generate a single cell row for an HTML table
415	294	*
416	295	* @since 2.04
417	296	*
		@@ -419,11 +298,9 @@
419	298	*
420	299	* @return string
421	300	*/
422	301	public function generate_single_cell_table_row( $value ) {
423		- $row = '<tr' . $this->tr_style();
424		- $row .= $this->add_row_class();
425		- $row .= '>';
	302	+ $row = '<tr' . $this->tr_style() . '>';
426	303	$row .= '<td colspan="2"' . $this->td_style . '>' . $value . '</td>';
427	304	$row .= '</tr>' . "\r\n";
428	305
429	306	$this->switch_odd();
		@@ -428,33 +305,6 @@
428	305
429	306	$this->switch_odd();
430	307
431	308	return $row;
432		- }
433		-
434		- /**
435		- * Add classes to the tr.
436		- *
437		- * @since 5.4.2
438		- *
439		- * @param bool $empty If the value in the row is blank.
440		- *
441		- * @return string
442		- */
443		- protected function add_row_class( $empty = false ) {
444		- $class = '';
445		-
446		- if ( $empty ) {
447		- // Only add this class on two cell rows.
448		- $class .= ' frm-empty-row';
449		- }
450		-
451		- if ( $this->is_child ) {
452		- $class .= ' frm-child-row';
453		- }
454		-
455		- if ( $class ) {
456		- $class = ' class="' . trim( $class ) . '"';
457		- }
458		- return $class;
459	309	}
460	310	}