Completed
Branch FIX/fix-datetime-picker-styles (49553a)
by
unknown
43:56 queued 35:31
created
core/libraries/form_sections/form_handlers/SequentialStepForm.php 2 patches
Indentation   +221 added lines, -221 removed lines patch added patch discarded remove patch
@@ -19,227 +19,227 @@
 block discarded – undo
19 19
 abstract class SequentialStepForm extends FormHandler implements SequentialStepFormInterface
20 20
 {
21 21
 
22
-    const REDIRECT_TO_NEXT_STEP    = 'redirect_to_next_step';
23
-
24
-    const REDIRECT_TO_CURRENT_STEP = 'redirect_to_current_step';
25
-
26
-    const REDIRECT_TO_PREV_STEP    = 'redirect_to_prev_step';
27
-
28
-    const REDIRECT_TO_OTHER        = 'redirect_to_other';
29
-
30
-    /**
31
-     * numerical value used for sorting form steps
32
-     *
33
-     * @var int $order
34
-     */
35
-    private $order = 1;
36
-
37
-    /**
38
-     * a final URL with all form related parameters added
39
-     * that will be used to advance to the next step
40
-     *
41
-     * @var string $redirect_url
42
-     */
43
-    private $redirect_url = '';
44
-
45
-    /**
46
-     * URL params in key value pairs
47
-     *
48
-     * @var array $redirect_args
49
-     */
50
-    private $redirect_args = array();
51
-
52
-    /**
53
-     * Which step should be redirected to after form processing.
54
-     * Usually after successfully processing this value would be REDIRECT_TO_NEXT_STEP
55
-     * If a form is invalid and requires errors to be corrected,
56
-     * then this value would be REDIRECT_TO_CURRENT_STEP so that form can be resubmitted
57
-     * Some form handlers do not have a form that is displayable,
58
-     * and only perform data processing, but if an error occurs,
59
-     * then this value needs to be set to REDIRECT_TO_PREV_STEP
60
-     * since the current step has no displayable content.
61
-     * if the form is completely finished, and needs to redirect to somewhere
62
-     * completely different, then this value will be REDIRECT_TO_OTHER
63
-     *
64
-     * @var string $redirect_to
65
-     */
66
-    private $redirect_to = SequentialStepForm::REDIRECT_TO_CURRENT_STEP;
67
-
68
-
69
-
70
-    /**
71
-     * SequentialStepForm constructor
72
-     *
73
-     * @param int         $order
74
-     * @param string      $form_name
75
-     * @param string      $admin_name
76
-     * @param string      $slug
77
-     * @param string      $form_action
78
-     * @param string      $form_config
79
-     * @param EE_Registry $registry
80
-     * @throws InvalidArgumentException
81
-     * @throws InvalidDataTypeException
82
-     * @throws DomainException
83
-     */
84
-    public function __construct(
85
-        $order,
86
-        $form_name,
87
-        $admin_name,
88
-        $slug,
89
-        $form_action = '',
90
-        $form_config = 'add_form_tags_and_submit',
91
-        EE_Registry $registry
92
-    ) {
93
-        $this->setOrder($order);
94
-        parent::__construct($form_name, $admin_name, $slug, $form_action, $form_config, $registry);
95
-    }
96
-
97
-
98
-
99
-    /**
100
-     * @return int
101
-     */
102
-    public function order()
103
-    {
104
-        return $this->order;
105
-    }
106
-
107
-
108
-
109
-    /**
110
-     * @param int $order
111
-     * @throws InvalidArgumentException
112
-     */
113
-    public function setOrder($order)
114
-    {
115
-        $order = absint($order);
116
-        if (! $order > 0) {
117
-            throw new InvalidArgumentException(
118
-                esc_html__('The form order property must be a positive integer.', 'event_espresso')
119
-            );
120
-        }
121
-        $this->order = $order;
122
-    }
123
-
124
-
125
-
126
-    /**
127
-     * @return string
128
-     */
129
-    public function redirectUrl()
130
-    {
131
-        return ! empty($this->redirect_args)
132
-            ? add_query_arg($this->redirect_args, $this->redirect_url)
133
-            : $this->redirect_url;
134
-    }
135
-
136
-
137
-
138
-    /**
139
-     * @param string $redirect_url
140
-     * @throws InvalidDataTypeException
141
-     * @throws InvalidArgumentException
142
-     */
143
-    public function setRedirectUrl($redirect_url)
144
-    {
145
-        if (! is_string($redirect_url)) {
146
-            throw new InvalidDataTypeException('$redirect_url', $redirect_url, 'string');
147
-        }
148
-        if (empty($redirect_url)) {
149
-            throw new InvalidArgumentException(
150
-                esc_html__('The redirect URL can not be an empty string.', 'event_espresso')
151
-            );
152
-        }
153
-        $this->redirect_url = $redirect_url;
154
-    }
155
-
156
-
157
-
158
-    /**
159
-     * @param array $redirect_args
160
-     * @throws InvalidDataTypeException
161
-     * @throws InvalidArgumentException
162
-     */
163
-    public function addRedirectArgs($redirect_args = array())
164
-    {
165
-        if (is_object($redirect_args)) {
166
-            throw new InvalidDataTypeException(
167
-                '$redirect_args',
168
-                $redirect_args,
169
-                'anything other than an object was expected.'
170
-            );
171
-        }
172
-        if (empty($redirect_args)) {
173
-            throw new InvalidArgumentException(
174
-                esc_html__('The redirect argument can not be an empty array.', 'event_espresso')
175
-            );
176
-        }
177
-        $this->redirect_args = array_merge($this->redirect_args, (array) $redirect_args);
178
-    }
179
-
180
-
181
-
182
-    /**
183
-     * @param array $redirect_arg_keys_to_remove
184
-     * @throws InvalidDataTypeException
185
-     * @throws InvalidArgumentException
186
-     */
187
-    public function removeRedirectArgs($redirect_arg_keys_to_remove = array())
188
-    {
189
-        if (is_object($redirect_arg_keys_to_remove)) {
190
-            throw new InvalidDataTypeException(
191
-                '$redirect_arg_keys_to_remove',
192
-                $redirect_arg_keys_to_remove,
193
-                'anything other than an object was expected.'
194
-            );
195
-        }
196
-        if (empty($redirect_arg_keys_to_remove)) {
197
-            throw new InvalidArgumentException(
198
-                esc_html__('The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso')
199
-            );
200
-        }
201
-        foreach ($redirect_arg_keys_to_remove as $redirect_arg_key) {
202
-            unset($this->redirect_args[ $redirect_arg_key ]);
203
-        }
204
-    }
205
-
206
-
207
-
208
-    /**
209
-     * @return string
210
-     */
211
-    public function redirectTo()
212
-    {
213
-        return $this->redirect_to;
214
-    }
215
-
216
-
217
-
218
-    /**
219
-     * @param string $redirect_to
220
-     * @throws InvalidDataTypeException
221
-     */
222
-    public function setRedirectTo($redirect_to)
223
-    {
224
-        if (! in_array(
225
-            $redirect_to,
226
-            array(
227
-                    SequentialStepForm::REDIRECT_TO_NEXT_STEP,
228
-                    SequentialStepForm::REDIRECT_TO_CURRENT_STEP,
229
-                    SequentialStepForm::REDIRECT_TO_PREV_STEP,
230
-                    SequentialStepForm::REDIRECT_TO_OTHER,
231
-                ),
232
-            true
233
-        )
234
-        ) {
235
-            throw new InvalidDataTypeException(
236
-                'setRedirectTo()',
237
-                $redirect_to,
238
-                'one of the SequentialStepForm class constants was expected.'
239
-            );
240
-        }
241
-        $this->redirect_to = $redirect_to;
242
-    }
22
+	const REDIRECT_TO_NEXT_STEP    = 'redirect_to_next_step';
23
+
24
+	const REDIRECT_TO_CURRENT_STEP = 'redirect_to_current_step';
25
+
26
+	const REDIRECT_TO_PREV_STEP    = 'redirect_to_prev_step';
27
+
28
+	const REDIRECT_TO_OTHER        = 'redirect_to_other';
29
+
30
+	/**
31
+	 * numerical value used for sorting form steps
32
+	 *
33
+	 * @var int $order
34
+	 */
35
+	private $order = 1;
36
+
37
+	/**
38
+	 * a final URL with all form related parameters added
39
+	 * that will be used to advance to the next step
40
+	 *
41
+	 * @var string $redirect_url
42
+	 */
43
+	private $redirect_url = '';
44
+
45
+	/**
46
+	 * URL params in key value pairs
47
+	 *
48
+	 * @var array $redirect_args
49
+	 */
50
+	private $redirect_args = array();
51
+
52
+	/**
53
+	 * Which step should be redirected to after form processing.
54
+	 * Usually after successfully processing this value would be REDIRECT_TO_NEXT_STEP
55
+	 * If a form is invalid and requires errors to be corrected,
56
+	 * then this value would be REDIRECT_TO_CURRENT_STEP so that form can be resubmitted
57
+	 * Some form handlers do not have a form that is displayable,
58
+	 * and only perform data processing, but if an error occurs,
59
+	 * then this value needs to be set to REDIRECT_TO_PREV_STEP
60
+	 * since the current step has no displayable content.
61
+	 * if the form is completely finished, and needs to redirect to somewhere
62
+	 * completely different, then this value will be REDIRECT_TO_OTHER
63
+	 *
64
+	 * @var string $redirect_to
65
+	 */
66
+	private $redirect_to = SequentialStepForm::REDIRECT_TO_CURRENT_STEP;
67
+
68
+
69
+
70
+	/**
71
+	 * SequentialStepForm constructor
72
+	 *
73
+	 * @param int         $order
74
+	 * @param string      $form_name
75
+	 * @param string      $admin_name
76
+	 * @param string      $slug
77
+	 * @param string      $form_action
78
+	 * @param string      $form_config
79
+	 * @param EE_Registry $registry
80
+	 * @throws InvalidArgumentException
81
+	 * @throws InvalidDataTypeException
82
+	 * @throws DomainException
83
+	 */
84
+	public function __construct(
85
+		$order,
86
+		$form_name,
87
+		$admin_name,
88
+		$slug,
89
+		$form_action = '',
90
+		$form_config = 'add_form_tags_and_submit',
91
+		EE_Registry $registry
92
+	) {
93
+		$this->setOrder($order);
94
+		parent::__construct($form_name, $admin_name, $slug, $form_action, $form_config, $registry);
95
+	}
96
+
97
+
98
+
99
+	/**
100
+	 * @return int
101
+	 */
102
+	public function order()
103
+	{
104
+		return $this->order;
105
+	}
106
+
107
+
108
+
109
+	/**
110
+	 * @param int $order
111
+	 * @throws InvalidArgumentException
112
+	 */
113
+	public function setOrder($order)
114
+	{
115
+		$order = absint($order);
116
+		if (! $order > 0) {
117
+			throw new InvalidArgumentException(
118
+				esc_html__('The form order property must be a positive integer.', 'event_espresso')
119
+			);
120
+		}
121
+		$this->order = $order;
122
+	}
123
+
124
+
125
+
126
+	/**
127
+	 * @return string
128
+	 */
129
+	public function redirectUrl()
130
+	{
131
+		return ! empty($this->redirect_args)
132
+			? add_query_arg($this->redirect_args, $this->redirect_url)
133
+			: $this->redirect_url;
134
+	}
135
+
136
+
137
+
138
+	/**
139
+	 * @param string $redirect_url
140
+	 * @throws InvalidDataTypeException
141
+	 * @throws InvalidArgumentException
142
+	 */
143
+	public function setRedirectUrl($redirect_url)
144
+	{
145
+		if (! is_string($redirect_url)) {
146
+			throw new InvalidDataTypeException('$redirect_url', $redirect_url, 'string');
147
+		}
148
+		if (empty($redirect_url)) {
149
+			throw new InvalidArgumentException(
150
+				esc_html__('The redirect URL can not be an empty string.', 'event_espresso')
151
+			);
152
+		}
153
+		$this->redirect_url = $redirect_url;
154
+	}
155
+
156
+
157
+
158
+	/**
159
+	 * @param array $redirect_args
160
+	 * @throws InvalidDataTypeException
161
+	 * @throws InvalidArgumentException
162
+	 */
163
+	public function addRedirectArgs($redirect_args = array())
164
+	{
165
+		if (is_object($redirect_args)) {
166
+			throw new InvalidDataTypeException(
167
+				'$redirect_args',
168
+				$redirect_args,
169
+				'anything other than an object was expected.'
170
+			);
171
+		}
172
+		if (empty($redirect_args)) {
173
+			throw new InvalidArgumentException(
174
+				esc_html__('The redirect argument can not be an empty array.', 'event_espresso')
175
+			);
176
+		}
177
+		$this->redirect_args = array_merge($this->redirect_args, (array) $redirect_args);
178
+	}
179
+
180
+
181
+
182
+	/**
183
+	 * @param array $redirect_arg_keys_to_remove
184
+	 * @throws InvalidDataTypeException
185
+	 * @throws InvalidArgumentException
186
+	 */
187
+	public function removeRedirectArgs($redirect_arg_keys_to_remove = array())
188
+	{
189
+		if (is_object($redirect_arg_keys_to_remove)) {
190
+			throw new InvalidDataTypeException(
191
+				'$redirect_arg_keys_to_remove',
192
+				$redirect_arg_keys_to_remove,
193
+				'anything other than an object was expected.'
194
+			);
195
+		}
196
+		if (empty($redirect_arg_keys_to_remove)) {
197
+			throw new InvalidArgumentException(
198
+				esc_html__('The $redirect_arg_keys_to_remove argument can not be an empty array.', 'event_espresso')
199
+			);
200
+		}
201
+		foreach ($redirect_arg_keys_to_remove as $redirect_arg_key) {
202
+			unset($this->redirect_args[ $redirect_arg_key ]);
203
+		}
204
+	}
205
+
206
+
207
+
208
+	/**
209
+	 * @return string
210
+	 */
211
+	public function redirectTo()
212
+	{
213
+		return $this->redirect_to;
214
+	}
215
+
216
+
217
+
218
+	/**
219
+	 * @param string $redirect_to
220
+	 * @throws InvalidDataTypeException
221
+	 */
222
+	public function setRedirectTo($redirect_to)
223
+	{
224
+		if (! in_array(
225
+			$redirect_to,
226
+			array(
227
+					SequentialStepForm::REDIRECT_TO_NEXT_STEP,
228
+					SequentialStepForm::REDIRECT_TO_CURRENT_STEP,
229
+					SequentialStepForm::REDIRECT_TO_PREV_STEP,
230
+					SequentialStepForm::REDIRECT_TO_OTHER,
231
+				),
232
+			true
233
+		)
234
+		) {
235
+			throw new InvalidDataTypeException(
236
+				'setRedirectTo()',
237
+				$redirect_to,
238
+				'one of the SequentialStepForm class constants was expected.'
239
+			);
240
+		}
241
+		$this->redirect_to = $redirect_to;
242
+	}
243 243
 }
244 244
 // End of file SequentialStepForm.php
245 245
 // Location: /SequentialStepForm.php
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     public function setOrder($order)
114 114
     {
115 115
         $order = absint($order);
116
-        if (! $order > 0) {
116
+        if ( ! $order > 0) {
117 117
             throw new InvalidArgumentException(
118 118
                 esc_html__('The form order property must be a positive integer.', 'event_espresso')
119 119
             );
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
      */
143 143
     public function setRedirectUrl($redirect_url)
144 144
     {
145
-        if (! is_string($redirect_url)) {
145
+        if ( ! is_string($redirect_url)) {
146 146
             throw new InvalidDataTypeException('$redirect_url', $redirect_url, 'string');
147 147
         }
148 148
         if (empty($redirect_url)) {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
             );
200 200
         }
201 201
         foreach ($redirect_arg_keys_to_remove as $redirect_arg_key) {
202
-            unset($this->redirect_args[ $redirect_arg_key ]);
202
+            unset($this->redirect_args[$redirect_arg_key]);
203 203
         }
204 204
     }
205 205
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
      */
222 222
     public function setRedirectTo($redirect_to)
223 223
     {
224
-        if (! in_array(
224
+        if ( ! in_array(
225 225
             $redirect_to,
226 226
             array(
227 227
                     SequentialStepForm::REDIRECT_TO_NEXT_STEP,
Please login to merge, or discard this patch.
form_sections/inputs/EE_Checkbox_Dropdown_Selector_Input.input.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -12,68 +12,68 @@
 block discarded – undo
12 12
 class EE_Checkbox_Dropdown_Selector_Input extends EE_Form_Input_With_Options_Base
13 13
 {
14 14
 
15
-    /**
16
-     * @var string text to display on the select button itself
17
-     */
18
-    protected $_select_button_text;
15
+	/**
16
+	 * @var string text to display on the select button itself
17
+	 */
18
+	protected $_select_button_text;
19 19
 
20
-    /**
21
-     * @param array $answer_options
22
-     * @param array $input_settings
23
-     */
24
-    public function __construct($answer_options, $input_settings = array())
25
-    {
26
-        $this->_select_button_text = EEH_Array::is_set(
27
-            $input_settings,
28
-            'select_button_text',
29
-            esc_html__('Select', 'event_espresso')
30
-        );
31
-        $display_strategy = new EE_Checkbox_Dropdown_Selector_Display_Strategy();
32
-        $this->_set_display_strategy($display_strategy);
33
-        $this->load_iframe_assets($display_strategy);
34
-        $this->_add_validation_strategy(
35
-            new EE_Many_Valued_Validation_Strategy(
36
-                array(
37
-                    new EE_Enum_Validation_Strategy(
38
-                        isset($input_settings['validation_error_message'])
39
-                            ? $input_settings['validation_error_message']
40
-                            : null
41
-                    ),
42
-                )
43
-            )
44
-        );
45
-        $this->_multiple_selections = true;
46
-        parent::__construct($answer_options, $input_settings);
47
-    }
20
+	/**
21
+	 * @param array $answer_options
22
+	 * @param array $input_settings
23
+	 */
24
+	public function __construct($answer_options, $input_settings = array())
25
+	{
26
+		$this->_select_button_text = EEH_Array::is_set(
27
+			$input_settings,
28
+			'select_button_text',
29
+			esc_html__('Select', 'event_espresso')
30
+		);
31
+		$display_strategy = new EE_Checkbox_Dropdown_Selector_Display_Strategy();
32
+		$this->_set_display_strategy($display_strategy);
33
+		$this->load_iframe_assets($display_strategy);
34
+		$this->_add_validation_strategy(
35
+			new EE_Many_Valued_Validation_Strategy(
36
+				array(
37
+					new EE_Enum_Validation_Strategy(
38
+						isset($input_settings['validation_error_message'])
39
+							? $input_settings['validation_error_message']
40
+							: null
41
+					),
42
+				)
43
+			)
44
+		);
45
+		$this->_multiple_selections = true;
46
+		parent::__construct($answer_options, $input_settings);
47
+	}
48 48
 
49
-    /*
49
+	/*
50 50
      * Returns the text to display in the select button
51 51
      */
52
-    public function select_button_text()
53
-    {
54
-        return $this->_select_button_text;
55
-    }
52
+	public function select_button_text()
53
+	{
54
+		return $this->_select_button_text;
55
+	}
56 56
 
57
-    /*
57
+	/*
58 58
      * add css and js for iframes
59 59
      */
60
-    protected function load_iframe_assets(EE_Checkbox_Dropdown_Selector_Display_Strategy $display_strategy)
61
-    {
62
-        add_filter(
63
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
64
-            array($display_strategy, 'iframe_css')
65
-        );
66
-        add_filter(
67
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
68
-            array($display_strategy, 'iframe_js')
69
-        );
70
-        add_filter(
71
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
72
-            array($display_strategy, 'iframe_css')
73
-        );
74
-        add_filter(
75
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
76
-            array($display_strategy, 'iframe_js')
77
-        );
78
-    }
60
+	protected function load_iframe_assets(EE_Checkbox_Dropdown_Selector_Display_Strategy $display_strategy)
61
+	{
62
+		add_filter(
63
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__css',
64
+			array($display_strategy, 'iframe_css')
65
+		);
66
+		add_filter(
67
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
68
+			array($display_strategy, 'iframe_js')
69
+		);
70
+		add_filter(
71
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
72
+			array($display_strategy, 'iframe_css')
73
+		);
74
+		add_filter(
75
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
76
+			array($display_strategy, 'iframe_js')
77
+		);
78
+	}
79 79
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Button_Input.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -11,42 +11,42 @@
 block discarded – undo
11 11
 class EE_Button_Input extends EE_Form_Input_Base
12 12
 {
13 13
 
14
-    /**
15
-     * @var string of HTML to put between the button tags
16
-     */
17
-    protected $_button_content;
18
-    /**
19
-     * @param array $options
20
-     */
21
-    public function __construct($options = array())
22
-    {
23
-        if (empty($options['button_content'])) {
24
-            $options['button_content'] = esc_html__('Button', 'event_espresso');
25
-        }
26
-        $this->_set_display_strategy(new EE_Button_Display_Strategy());
27
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
28
-        $this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
29
-        parent::__construct($options);
30
-    }
14
+	/**
15
+	 * @var string of HTML to put between the button tags
16
+	 */
17
+	protected $_button_content;
18
+	/**
19
+	 * @param array $options
20
+	 */
21
+	public function __construct($options = array())
22
+	{
23
+		if (empty($options['button_content'])) {
24
+			$options['button_content'] = esc_html__('Button', 'event_espresso');
25
+		}
26
+		$this->_set_display_strategy(new EE_Button_Display_Strategy());
27
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
28
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
29
+		parent::__construct($options);
30
+	}
31 31
 
32 32
 
33 33
 
34
-    /**
35
-     * Sets the button content
36
-     * @see EE_Button_Input::$_button_content
37
-     * @param string $new_content
38
-     */
39
-    public function set_button_content($new_content)
40
-    {
41
-        $this->_button_content = $new_content;
42
-    }
34
+	/**
35
+	 * Sets the button content
36
+	 * @see EE_Button_Input::$_button_content
37
+	 * @param string $new_content
38
+	 */
39
+	public function set_button_content($new_content)
40
+	{
41
+		$this->_button_content = $new_content;
42
+	}
43 43
     
44
-    /**
45
-     * Gets the button content
46
-     * @return string
47
-     */
48
-    public function button_content()
49
-    {
50
-        return $this->_button_content;
51
-    }
44
+	/**
45
+	 * Gets the button content
46
+	 * @return string
47
+	 */
48
+	public function button_content()
49
+	{
50
+		return $this->_button_content;
51
+	}
52 52
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Submit_Input.input.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -11,17 +11,17 @@
 block discarded – undo
11 11
 class EE_Submit_Input extends EE_Form_Input_Base
12 12
 {
13 13
 
14
-    /**
15
-     * @param array $options
16
-     */
17
-    public function __construct($options = array())
18
-    {
19
-        if (empty($options['default'])) {
20
-            $options['default'] = esc_html__('Submit', 'event_espresso');
21
-        }
22
-        $this->_set_display_strategy(new EE_Submit_Input_Display_Strategy());
23
-        $this->_set_normalization_strategy(new EE_Text_Normalization());
24
-        $this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
25
-        parent::__construct($options);
26
-    }
14
+	/**
15
+	 * @param array $options
16
+	 */
17
+	public function __construct($options = array())
18
+	{
19
+		if (empty($options['default'])) {
20
+			$options['default'] = esc_html__('Submit', 'event_espresso');
21
+		}
22
+		$this->_set_display_strategy(new EE_Submit_Input_Display_Strategy());
23
+		$this->_set_normalization_strategy(new EE_Text_Normalization());
24
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
25
+		parent::__construct($options);
26
+	}
27 27
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Checkbox_Multi_Input.input.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,15 +14,15 @@
 block discarded – undo
14 14
 class EE_Checkbox_Multi_Input extends EE_Form_Input_With_Options_Base
15 15
 {
16 16
 
17
-    /**
18
-     * @param array $input_settings
19
-     * @param array | EE_Question_Option[] $answer_options
20
-     */
21
-    public function __construct($answer_options, $input_settings = array())
22
-    {
23
-        $this->_set_display_strategy(new EE_Checkbox_Display_Strategy());
24
-        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
25
-        $this->_multiple_selections = true;
26
-        parent::__construct($answer_options, $input_settings);
27
-    }
17
+	/**
18
+	 * @param array $input_settings
19
+	 * @param array | EE_Question_Option[] $answer_options
20
+	 */
21
+	public function __construct($answer_options, $input_settings = array())
22
+	{
23
+		$this->_set_display_strategy(new EE_Checkbox_Display_Strategy());
24
+		$this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
25
+		$this->_multiple_selections = true;
26
+		parent::__construct($answer_options, $input_settings);
27
+	}
28 28
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
     public function __construct($answer_options, $input_settings = array())
22 22
     {
23 23
         $this->_set_display_strategy(new EE_Checkbox_Display_Strategy());
24
-        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array( new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null) )));
24
+        $this->_add_validation_strategy(new EE_Many_Valued_Validation_Strategy(array(new EE_Enum_Validation_Strategy(isset($input_settings['validation_error_message']) ? $input_settings['validation_error_message'] : null))));
25 25
         $this->_multiple_selections = true;
26 26
         parent::__construct($answer_options, $input_settings);
27 27
     }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Month_Input.input.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -9,36 +9,36 @@
 block discarded – undo
9 9
 class EE_Month_Input extends EE_Select_Input
10 10
 {
11 11
 
12
-    /**
13
-     * @param bool  $leading_zero
14
-     * @param array $input_settings
15
-     * @param bool $january_is_month_1 whether january should have value of 1; or it should be month 0
16
-     */
17
-    public function __construct($leading_zero = false, $input_settings = array(), $january_is_month_1 = true)
18
-    {
19
-        $key_begin_range = $january_is_month_1 ? 1 : 0;
20
-        $key_range = range($key_begin_range, $key_begin_range + 11);
21
-        if ($leading_zero) {
22
-            array_walk($key_range, array( $this, '_zero_pad' ));
23
-        }
24
-        $value_range = range(1, 12);
25
-        array_walk($value_range, array( $this, '_zero_pad' ));
26
-        parent::__construct(
27
-            array_combine(
28
-                $key_range,
29
-                $value_range
30
-            ),
31
-            $input_settings
32
-        );
33
-    }
12
+	/**
13
+	 * @param bool  $leading_zero
14
+	 * @param array $input_settings
15
+	 * @param bool $january_is_month_1 whether january should have value of 1; or it should be month 0
16
+	 */
17
+	public function __construct($leading_zero = false, $input_settings = array(), $january_is_month_1 = true)
18
+	{
19
+		$key_begin_range = $january_is_month_1 ? 1 : 0;
20
+		$key_range = range($key_begin_range, $key_begin_range + 11);
21
+		if ($leading_zero) {
22
+			array_walk($key_range, array( $this, '_zero_pad' ));
23
+		}
24
+		$value_range = range(1, 12);
25
+		array_walk($value_range, array( $this, '_zero_pad' ));
26
+		parent::__construct(
27
+			array_combine(
28
+				$key_range,
29
+				$value_range
30
+			),
31
+			$input_settings
32
+		);
33
+	}
34 34
     
35
-    /**
36
-     * Changes int 1 to 01, etc. Useful with array_walk
37
-     * @param int $input
38
-     * @param mixed $key
39
-     */
40
-    protected function _zero_pad(&$input, $key)
41
-    {
42
-        $input = str_pad($input, 2, '0', STR_PAD_LEFT);
43
-    }
35
+	/**
36
+	 * Changes int 1 to 01, etc. Useful with array_walk
37
+	 * @param int $input
38
+	 * @param mixed $key
39
+	 */
40
+	protected function _zero_pad(&$input, $key)
41
+	{
42
+		$input = str_pad($input, 2, '0', STR_PAD_LEFT);
43
+	}
44 44
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@
 block discarded – undo
19 19
         $key_begin_range = $january_is_month_1 ? 1 : 0;
20 20
         $key_range = range($key_begin_range, $key_begin_range + 11);
21 21
         if ($leading_zero) {
22
-            array_walk($key_range, array( $this, '_zero_pad' ));
22
+            array_walk($key_range, array($this, '_zero_pad'));
23 23
         }
24 24
         $value_range = range(1, 12);
25
-        array_walk($value_range, array( $this, '_zero_pad' ));
25
+        array_walk($value_range, array($this, '_zero_pad'));
26 26
         parent::__construct(
27 27
             array_combine(
28 28
                 $key_range,
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Yes_No_Input.input.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -9,13 +9,13 @@
 block discarded – undo
9 9
 class EE_Yes_No_Input extends EE_Select_Input
10 10
 {
11 11
 
12
-    /**
13
-     * @param array $options
14
-     */
15
-    public function __construct($options = array())
16
-    {
17
-        $select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
12
+	/**
13
+	 * @param array $options
14
+	 */
15
+	public function __construct($options = array())
16
+	{
17
+		$select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
18 18
 
19
-        parent::__construct($select_options, $options);
20
-    }
19
+		parent::__construct($select_options, $options);
20
+	}
21 21
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
      */
15 15
     public function __construct($options = array())
16 16
     {
17
-        $select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
17
+        $select_options = array(true=>  __("Yes", "event_espresso"), false=>  __("No", "event_espresso"));
18 18
 
19 19
         parent::__construct($select_options, $options);
20 20
     }
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Credit_Card_Year_Input.input.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -10,15 +10,15 @@
 block discarded – undo
10 10
 class EE_Credit_Card_Year_Input extends EE_Year_Input
11 11
 {
12 12
 
13
-    /**
14
-     * @param array $input_settings
15
-     * @param bool  $four_digit_year
16
-     * @param int   $years_behind
17
-     * @param int   $years_ahead
18
-     */
19
-    public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15)
20
-    {
21
-        $this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
22
-        parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
23
-    }
13
+	/**
14
+	 * @param array $input_settings
15
+	 * @param bool  $four_digit_year
16
+	 * @param int   $years_behind
17
+	 * @param int   $years_ahead
18
+	 */
19
+	public function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15)
20
+	{
21
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
22
+		parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
23
+	}
24 24
 }
Please login to merge, or discard this patch.
libraries/form_sections/inputs/EE_Select_Ajax_Model_Rest_Input.input.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         );
68 68
         // make sure limit and caps are always set
69 69
         $query_params = array_merge(
70
-            array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
70
+            array('limit' => 10, 'caps' => EEM_Base::caps_read_admin),
71 71
             $query_params
72 72
         );
73 73
         $this->_value_field_name = EEH_Array::is_set(
@@ -146,12 +146,12 @@  discard block
 block discarded – undo
146 146
         $values_for_options = (array) $value;
147 147
         $value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
148 148
         $display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
149
-        $this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
150
-        $this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
149
+        $this->_extra_select_columns[] = $value_field->get_qualified_column().' AS '.$this->_value_field_name;
150
+        $this->_extra_select_columns[] = $display_field->get_qualified_column().' AS '.$this->_display_field_name;
151 151
         $display_values = $this->_get_model()->get_all_wpdb_results(
152 152
             array(
153 153
                 array(
154
-                    $this->_value_field_name => array( 'IN', $values_for_options )
154
+                    $this->_value_field_name => array('IN', $values_for_options)
155 155
                 )
156 156
             ),
157 157
             ARRAY_A,
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
         if (is_array($select_options)) {
162 162
             foreach ($display_values as $db_rows) {
163 163
                 $db_rows = (array) $db_rows;
164
-                $select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
164
+                $select_options[$db_rows[$this->_value_field_name]] = apply_filters(
165 165
                     'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
166
-                    $db_rows[ $this->_display_field_name ],
166
+                    $db_rows[$this->_display_field_name],
167 167
                     $db_rows
168 168
                 );
169 169
             }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      */
180 180
     protected function _get_model()
181 181
     {
182
-        if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
182
+        if ( ! EE_Registry::instance()->is_model_name($this->_model_name)) {
183 183
             throw new EE_Error(
184 184
                 sprintf(
185 185
                     __(
Please login to merge, or discard this patch.
Indentation   +176 added lines, -176 removed lines patch added patch discarded remove patch
@@ -17,189 +17,189 @@
 block discarded – undo
17 17
 class EE_Select_Ajax_Model_Rest_Input extends EE_Form_Input_With_Options_Base
18 18
 {
19 19
 
20
-    /**
21
-     * @var string $_model_name
22
-     */
23
-    protected $_model_name;
20
+	/**
21
+	 * @var string $_model_name
22
+	 */
23
+	protected $_model_name;
24 24
 
25
-    /**
26
-     * @var string $_display_field_name
27
-     */
28
-    protected $_display_field_name;
25
+	/**
26
+	 * @var string $_display_field_name
27
+	 */
28
+	protected $_display_field_name;
29 29
 
30
-    /**
31
-     * @var string $_value_field_name
32
-     */
33
-    protected $_value_field_name;
30
+	/**
31
+	 * @var string $_value_field_name
32
+	 */
33
+	protected $_value_field_name;
34 34
 
35
-    /**
36
-     * @var array $_extra_select_columns
37
-     */
38
-    protected $_extra_select_columns = array();
35
+	/**
36
+	 * @var array $_extra_select_columns
37
+	 */
38
+	protected $_extra_select_columns = array();
39 39
 
40 40
 
41
-    /**
42
-     * @param array $input_settings     {
43
-     * @type string $model_name         the name of model to be used for searching, both via the REST API and server-side model queries
44
-     * @type array  $query_params       default query parameters which will apply to both REST API queries and server-side queries. This should be
45
-     *                                  in the exact format that will be used for server-side model usage (eg use index 0 for where conditions, not
46
-     *                                  the string "where")
47
-     * @type string $value_field_name   the name of the model field on this model to
48
-     *                                  be used for the HTML select's option's values
49
-     * @type string $display_field_name the name of the model field on this model
50
-     *                                  to be used for the HTML select's option's display text
51
-     * @type array  $select2_args       arguments to be passed directly into the select2's JS constructor
52
-     *                                  }
53
-     *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
54
-     * }
55
-     * @throws EE_Error
56
-     * @throws InvalidArgumentException
57
-     * @throws InvalidDataTypeException
58
-     * @throws InvalidInterfaceException
59
-     */
60
-    public function __construct($input_settings = array())
61
-    {
62
-        // needed input settings:
63
-        // select2_args
64
-        $this->_model_name = EEH_Array::is_set(
65
-            $input_settings,
66
-            'model_name',
67
-            null
68
-        );
69
-        $model = $this->_get_model();
70
-        $query_params = EEH_Array::is_set(
71
-            $input_settings,
72
-            'query_params',
73
-            array()
74
-        );
75
-        // make sure limit and caps are always set
76
-        $query_params = array_merge(
77
-            array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
78
-            $query_params
79
-        );
80
-        $this->_value_field_name = EEH_Array::is_set(
81
-            $input_settings,
82
-            'value_field_name',
83
-            $model->primary_key_name()
84
-        );
85
-        $this->_display_field_name = EEH_Array::is_set(
86
-            $input_settings,
87
-            'display_field_name',
88
-            $model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
89
-        );
90
-        $this->_extra_select_columns = EEH_Array::is_set(
91
-            $input_settings,
92
-            'extra_select_columns',
93
-            array()
94
-        );
95
-        $this->_add_validation_strategy(
96
-            new EE_Model_Matching_Query_Validation_Strategy(
97
-                '',
98
-                $this->_model_name,
99
-                $query_params,
100
-                $this->_value_field_name
101
-            )
102
-        );
103
-        // get resource endpoint
104
-        $rest_controller = LoaderFactory::getLoader()->getNew(
105
-            'EventEspresso\core\libraries\rest_api\controllers\model\Read'
106
-        );
107
-        $rest_controller->setRequestedVersion(EED_Core_Rest_Api::latest_rest_api_version());
108
-        $default_select2_args = array(
109
-            'ajax' => array(
110
-                'url' => $rest_controller->getVersionedLinkTo(
111
-                    EEH_Inflector::pluralize_and_lower($this->_model_name)
112
-                ),
113
-                'dataType' => 'json',
114
-                'delay' => '250',
115
-                'data_interface' => 'EE_Select2_REST_API_Interface',
116
-                'data_interface_args' => array(
117
-                    'default_query_params' => (object) ModelDataTranslator::prepareQueryParamsForRestApi(
118
-                        $query_params,
119
-                        $model
120
-                    ),
121
-                    'display_field' => $this->_display_field_name,
122
-                    'value_field' => $this->_value_field_name,
123
-                    'nonce' => wp_create_nonce('wp_rest'),
124
-                    'locale' => str_replace('_', '-', strtolower(get_locale()))
125
-                ),
126
-            ),
127
-            'cache' => true,
128
-            'width' => 'resolve'
129
-        );
130
-        $select2_args = array_replace_recursive(
131
-            $default_select2_args,
132
-            (array) EEH_Array::is_set($input_settings, 'select2_args', array())
133
-        );
134
-        $this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
135
-        parent::__construct(array(), $input_settings);
136
-    }
41
+	/**
42
+	 * @param array $input_settings     {
43
+	 * @type string $model_name         the name of model to be used for searching, both via the REST API and server-side model queries
44
+	 * @type array  $query_params       default query parameters which will apply to both REST API queries and server-side queries. This should be
45
+	 *                                  in the exact format that will be used for server-side model usage (eg use index 0 for where conditions, not
46
+	 *                                  the string "where")
47
+	 * @type string $value_field_name   the name of the model field on this model to
48
+	 *                                  be used for the HTML select's option's values
49
+	 * @type string $display_field_name the name of the model field on this model
50
+	 *                                  to be used for the HTML select's option's display text
51
+	 * @type array  $select2_args       arguments to be passed directly into the select2's JS constructor
52
+	 *                                  }
53
+	 *                                  And the arguments accepted by EE_Form_Input_With_Options_Base
54
+	 * }
55
+	 * @throws EE_Error
56
+	 * @throws InvalidArgumentException
57
+	 * @throws InvalidDataTypeException
58
+	 * @throws InvalidInterfaceException
59
+	 */
60
+	public function __construct($input_settings = array())
61
+	{
62
+		// needed input settings:
63
+		// select2_args
64
+		$this->_model_name = EEH_Array::is_set(
65
+			$input_settings,
66
+			'model_name',
67
+			null
68
+		);
69
+		$model = $this->_get_model();
70
+		$query_params = EEH_Array::is_set(
71
+			$input_settings,
72
+			'query_params',
73
+			array()
74
+		);
75
+		// make sure limit and caps are always set
76
+		$query_params = array_merge(
77
+			array( 'limit' => 10, 'caps' => EEM_Base::caps_read_admin ),
78
+			$query_params
79
+		);
80
+		$this->_value_field_name = EEH_Array::is_set(
81
+			$input_settings,
82
+			'value_field_name',
83
+			$model->primary_key_name()
84
+		);
85
+		$this->_display_field_name = EEH_Array::is_set(
86
+			$input_settings,
87
+			'display_field_name',
88
+			$model->get_a_field_of_type('EE_Text_Field_Base')->get_name()
89
+		);
90
+		$this->_extra_select_columns = EEH_Array::is_set(
91
+			$input_settings,
92
+			'extra_select_columns',
93
+			array()
94
+		);
95
+		$this->_add_validation_strategy(
96
+			new EE_Model_Matching_Query_Validation_Strategy(
97
+				'',
98
+				$this->_model_name,
99
+				$query_params,
100
+				$this->_value_field_name
101
+			)
102
+		);
103
+		// get resource endpoint
104
+		$rest_controller = LoaderFactory::getLoader()->getNew(
105
+			'EventEspresso\core\libraries\rest_api\controllers\model\Read'
106
+		);
107
+		$rest_controller->setRequestedVersion(EED_Core_Rest_Api::latest_rest_api_version());
108
+		$default_select2_args = array(
109
+			'ajax' => array(
110
+				'url' => $rest_controller->getVersionedLinkTo(
111
+					EEH_Inflector::pluralize_and_lower($this->_model_name)
112
+				),
113
+				'dataType' => 'json',
114
+				'delay' => '250',
115
+				'data_interface' => 'EE_Select2_REST_API_Interface',
116
+				'data_interface_args' => array(
117
+					'default_query_params' => (object) ModelDataTranslator::prepareQueryParamsForRestApi(
118
+						$query_params,
119
+						$model
120
+					),
121
+					'display_field' => $this->_display_field_name,
122
+					'value_field' => $this->_value_field_name,
123
+					'nonce' => wp_create_nonce('wp_rest'),
124
+					'locale' => str_replace('_', '-', strtolower(get_locale()))
125
+				),
126
+			),
127
+			'cache' => true,
128
+			'width' => 'resolve'
129
+		);
130
+		$select2_args = array_replace_recursive(
131
+			$default_select2_args,
132
+			(array) EEH_Array::is_set($input_settings, 'select2_args', array())
133
+		);
134
+		$this->set_display_strategy(new EE_Select2_Display_Strategy($select2_args));
135
+		parent::__construct(array(), $input_settings);
136
+	}
137 137
 
138 138
 
139 139
 
140
-    /**
141
-     * Before setting the raw value (usually because we're setting the default,
142
-     * or we've received a form submission and this might be re-displayed to the user),
143
-     * sets the options so that the current selections appear on initial display.
144
-     *
145
-     * Note: because this input uses EE_Model_Matching_Query_Validation_Strategy
146
-     * for validation, this input's options only affect DISPLAY and NOT validation,
147
-     * which is why its ok to just assume the provided $value to be in the list of acceptable values
148
-     *
149
-     * @param mixed $value
150
-     * @return void
151
-     * @throws \EE_Error
152
-     */
153
-    public function _set_raw_value($value)
154
-    {
155
-        $values_for_options = (array) $value;
156
-        $value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
157
-        $display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
158
-        $this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
159
-        $this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
160
-        $display_values = $this->_get_model()->get_all_wpdb_results(
161
-            array(
162
-                array(
163
-                    $this->_value_field_name => array( 'IN', $values_for_options )
164
-                )
165
-            ),
166
-            ARRAY_A,
167
-            implode(',', $this->_extra_select_columns)
168
-        );
169
-        $select_options = array();
170
-        if (is_array($select_options)) {
171
-            foreach ($display_values as $db_rows) {
172
-                $db_rows = (array) $db_rows;
173
-                $select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
174
-                    'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
175
-                    $db_rows[ $this->_display_field_name ],
176
-                    $db_rows
177
-                );
178
-            }
179
-        }
180
-        $this->set_select_options($select_options);
181
-        parent::_set_raw_value($value);
182
-    }
140
+	/**
141
+	 * Before setting the raw value (usually because we're setting the default,
142
+	 * or we've received a form submission and this might be re-displayed to the user),
143
+	 * sets the options so that the current selections appear on initial display.
144
+	 *
145
+	 * Note: because this input uses EE_Model_Matching_Query_Validation_Strategy
146
+	 * for validation, this input's options only affect DISPLAY and NOT validation,
147
+	 * which is why its ok to just assume the provided $value to be in the list of acceptable values
148
+	 *
149
+	 * @param mixed $value
150
+	 * @return void
151
+	 * @throws \EE_Error
152
+	 */
153
+	public function _set_raw_value($value)
154
+	{
155
+		$values_for_options = (array) $value;
156
+		$value_field = $this->_get_model()->field_settings_for($this->_value_field_name);
157
+		$display_field = $this->_get_model()->field_settings_for($this->_display_field_name);
158
+		$this->_extra_select_columns[] = $value_field->get_qualified_column() . ' AS ' . $this->_value_field_name;
159
+		$this->_extra_select_columns[] = $display_field->get_qualified_column() . ' AS ' . $this->_display_field_name;
160
+		$display_values = $this->_get_model()->get_all_wpdb_results(
161
+			array(
162
+				array(
163
+					$this->_value_field_name => array( 'IN', $values_for_options )
164
+				)
165
+			),
166
+			ARRAY_A,
167
+			implode(',', $this->_extra_select_columns)
168
+		);
169
+		$select_options = array();
170
+		if (is_array($select_options)) {
171
+			foreach ($display_values as $db_rows) {
172
+				$db_rows = (array) $db_rows;
173
+				$select_options[ $db_rows[ $this->_value_field_name ] ] = apply_filters(
174
+					'FHEE__EE_Select_Ajax_Model_Rest_Input___set_raw_value__select_option_value',
175
+					$db_rows[ $this->_display_field_name ],
176
+					$db_rows
177
+				);
178
+			}
179
+		}
180
+		$this->set_select_options($select_options);
181
+		parent::_set_raw_value($value);
182
+	}
183 183
 
184
-    /**
185
-     * Returns the model, or throws an exception if the model name provided in constructor doesn't exist
186
-     * @return EEM_Base
187
-     * @throws EE_Error
188
-     */
189
-    protected function _get_model()
190
-    {
191
-        if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
192
-            throw new EE_Error(
193
-                sprintf(
194
-                    __(
195
-                        '%1$s is not a proper model name. Please provide a model name in the "model_name" form input argument',
196
-                        'event_espresso'
197
-                    ),
198
-                    $this->_model_name
199
-                )
200
-            );
201
-        } else {
202
-            return EE_Registry::instance()->load_model($this->_model_name);
203
-        }
204
-    }
184
+	/**
185
+	 * Returns the model, or throws an exception if the model name provided in constructor doesn't exist
186
+	 * @return EEM_Base
187
+	 * @throws EE_Error
188
+	 */
189
+	protected function _get_model()
190
+	{
191
+		if (! EE_Registry::instance()->is_model_name($this->_model_name)) {
192
+			throw new EE_Error(
193
+				sprintf(
194
+					__(
195
+						'%1$s is not a proper model name. Please provide a model name in the "model_name" form input argument',
196
+						'event_espresso'
197
+					),
198
+					$this->_model_name
199
+				)
200
+			);
201
+		} else {
202
+			return EE_Registry::instance()->load_model($this->_model_name);
203
+		}
204
+	}
205 205
 }
Please login to merge, or discard this patch.