← All changes | classes/models/FrmStyle.php +9 -9 6.25 → 6.14 View file →

		@@ -27,9 +27,9 @@
27	27	*/
28	28	public $id = 0;
29	29
30	30	/**
31		- * @param int|string $id The id of the stylesheet or 'default'.
	31	+ * @param int|string $id The id of the stylsheet or 'default'.
32	32	*/
33	33	public function __construct( $id = 0 ) {
34	34	$this->id = $id;
35	35	}
		@@ -42,9 +42,9 @@
42	42
43	43	$max_slug_value = 2147483647;
44	44	// We want to have at least 2 characters in the slug.
45	45	$min_slug_value = 37;
46		- $key = base_convert( random_int( $min_slug_value, $max_slug_value ), 10, 36 );
	46	+ $key = base_convert( rand( $min_slug_value, $max_slug_value ), 10, 36 );
47	47
48	48	$style = array(
49	49	'post_type' => FrmStylesController::$post_type,
50	50	'ID' => '',
		@@ -99,9 +99,9 @@
99	99	}
100	100
101	101	// Custom CSS is no longer used from the default style, but it is still checked if the Global Setting is missing.
102	102	// Preserve the previous value in case Custom CSS has not been saved as a Global Setting yet.
103		- $custom_css = $new_instance['post_content']['custom_css'] ?? '';
	103	+ $custom_css = isset( $new_instance['post_content']['custom_css'] ) ? $new_instance['post_content']['custom_css'] : '';
104	104
105	105	// phpcs:ignore WordPress.Security.NonceVerification.Missing
106	106	if ( ! empty( $_POST['frm_style_setting']['post_title'] ) ) {
107	107	// The nonce check happens in FrmStylesController::save_style before this is called.
		@@ -210,9 +210,9 @@
210	210	$new_value = floatval( $value );
211	211	}
212	212	}//end if
213	213
214		- $new_color_values[] = $new_value;
	214	+ $new_color_values[] = null === $new_value ? $value : $new_value;
215	215	}//end foreach
216	216
217	217	// add more 0s and 1 (if alpha position) if needed.
218	218	$missing_values = $length_of_color_codes - count( $new_color_values );
		@@ -619,9 +619,9 @@
619	619	'form_align' => 'left',
620	620	'direction' => is_rtl() ? 'rtl' : 'ltr',
621	621	'fieldset' => '0px',
622	622	'fieldset_color' => '000000',
623		- 'fieldset_padding' => '0px 0px 15px 0px',
	623	+ 'fieldset_padding' => '0 0 15px 0',
624	624	'fieldset_bg_color' => '',
625	625
626	626	'title_size' => '40px',
627	627	'title_color' => '444444',
		@@ -630,9 +630,9 @@
630	630	'form_desc_size' => '14px',
631	631	'form_desc_color' => '98A2B3',
632	632	'form_desc_margin_top' => '10px',
633	633	'form_desc_margin_bottom' => '25px',
634		- 'form_desc_padding' => '0px',
	634	+ 'form_desc_padding' => '0',
635	635
636	636	'font' => '',
637	637	'font_size' => '15px',
638	638	'label_color' => '344054',
		@@ -641,9 +641,9 @@
641	641	'align' => 'left',
642	642	'width' => '150px',
643	643	'required_color' => 'F04438',
644	644	'required_weight' => 'bold',
645		- 'label_padding' => '0px 0px 5px 0px',
	645	+ 'label_padding' => '0 0 5px 0',
646	646
647	647	'description_font_size' => '12px',
648	648	'description_color' => '667085',
649	649	'description_weight' => 'normal',
		@@ -648,9 +648,9 @@
648	648	'description_color' => '667085',
649	649	'description_weight' => 'normal',
650	650	'description_style' => 'normal',
651	651	'description_align' => 'left',
652		- 'description_margin' => '0px',
	652	+ 'description_margin' => '0',
653	653
654	654	'field_font_size' => '14px',
655	655	'field_height' => '36px',
656	656	'line_height' => 'normal',
		@@ -688,9 +688,9 @@
688	688
689	689	'section_font_size' => '18px',
690	690	'section_color' => '344054',
691	691	'section_weight' => 'bold',
692		- 'section_pad' => '32px 0px 3px 0px',
	692	+ 'section_pad' => '32px 0 3px 0',
693	693	'section_mar_top' => '30px',
694	694	'section_mar_bottom' => '30px',
695	695	'section_bg_color' => '',
696	696	'section_border_color' => 'EAECF0',