← All changes | classes/models/FrmValidate.php +4 -15 6.25 → 6.8 View file →

		@@ -5,24 +5,18 @@
5	5
6	6	abstract class FrmValidate {
7	7
8	8	/**
9		- * @var int
	9	+ * @var int $form_id
10	10	*/
11	11	protected $form_id;
12	12
13	13	/**
14		- * @var object
	14	+ * @var object $form
15	15	*/
16	16	protected $form;
17	17
18	18	/**
19		- * @since 6.21
20		- * @var string
21		- */
22		- protected $option_type = 'form';
23		-
24		- /**
25	19	* @param int $form_id
26	20	*/
27	21	public function __construct( $form_id ) {
28	22	$this->form_id = $form_id;
		@@ -41,20 +35,15 @@
41	35	/**
42	36	* @return bool
43	37	*/
44	38	protected function is_option_on() {
45		- $key = $this->get_option_key();
46		- if ( 'global' === $this->option_type ) {
47		- $frm_settings = FrmAppHelper::get_settings();
48		- return ! empty( $frm_settings->$key );
49		- }
50		-
51	39	$form = $this->get_form();
	40	+ $key = $this->get_option_key();
52	41	return ! empty( $form->options[ $key ] ) && 'off' !== $form->options[ $key ];
53	42	}
54	43
55	44	/**
56		- * @return bool|string
	45	+ * @return bool
57	46	*/
58	47	abstract public function validate();
59	48
60	49	/**