@@ -66,47 +66,47 @@ |
||
66 | 66 | */ |
67 | 67 | public function render_block( $attributes, $content ) { |
68 | 68 | |
69 | - if ( ! isset( $attributes['form_id'] ) ) { |
|
69 | + if ( ! isset( $attributes[ 'form_id' ] ) ) { |
|
70 | 70 | return; |
71 | 71 | } |
72 | 72 | |
73 | 73 | $shortcode_attributes = array( |
74 | - 'form' => $attributes['form_id'], |
|
75 | - 'submit' => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '', |
|
76 | - 'title' => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0', |
|
77 | - 'custom_title' => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '', |
|
78 | - 'description' => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0', |
|
79 | - 'custom_description' => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '', |
|
80 | - 'ajax' => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0', |
|
81 | - 'recaptcha' => isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '', |
|
82 | - 'recaptcha_lang' => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '', |
|
83 | - 'recaptcha_type' => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '', |
|
84 | - 'recaptcha_theme' => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '', |
|
85 | - 'recaptcha_size' => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '', |
|
86 | - 'recaptcha_data_callback' => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '', |
|
87 | - 'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '', |
|
88 | - 'inline' => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0', |
|
74 | + 'form' => $attributes[ 'form_id' ], |
|
75 | + 'submit' => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '', |
|
76 | + 'title' => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0', |
|
77 | + 'custom_title' => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '', |
|
78 | + 'description' => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0', |
|
79 | + 'custom_description' => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '', |
|
80 | + 'ajax' => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0', |
|
81 | + 'recaptcha' => isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '', |
|
82 | + 'recaptcha_lang' => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '', |
|
83 | + 'recaptcha_type' => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '', |
|
84 | + 'recaptcha_theme' => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '', |
|
85 | + 'recaptcha_size' => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '', |
|
86 | + 'recaptcha_data_callback' => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '', |
|
87 | + 'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '', |
|
88 | + 'inline' => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0', |
|
89 | 89 | ); |
90 | 90 | |
91 | 91 | // We want to run process_mailchimp_shortcode() but we need to return |
92 | 92 | // the plaintext shortcode or Gutenberg will autop() the shortcode content. |
93 | 93 | return sprintf( |
94 | 94 | '[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s" recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]', |
95 | - $shortcode_attributes['form'], |
|
96 | - $shortcode_attributes['submit'], |
|
97 | - $shortcode_attributes['title'], |
|
98 | - $shortcode_attributes['custom_title'], |
|
99 | - $shortcode_attributes['description'], |
|
100 | - $shortcode_attributes['custom_description'], |
|
101 | - $shortcode_attributes['ajax'], |
|
102 | - $shortcode_attributes['recaptcha'], |
|
103 | - $shortcode_attributes['recaptcha_lang'], |
|
104 | - $shortcode_attributes['recaptcha_type'], |
|
105 | - $shortcode_attributes['recaptcha_theme'], |
|
106 | - $shortcode_attributes['recaptcha_size'], |
|
107 | - $shortcode_attributes['recaptcha_data_callback'], |
|
108 | - $shortcode_attributes['recaptcha_expired_callback'], |
|
109 | - $shortcode_attributes['inline'] |
|
95 | + $shortcode_attributes[ 'form' ], |
|
96 | + $shortcode_attributes[ 'submit' ], |
|
97 | + $shortcode_attributes[ 'title' ], |
|
98 | + $shortcode_attributes[ 'custom_title' ], |
|
99 | + $shortcode_attributes[ 'description' ], |
|
100 | + $shortcode_attributes[ 'custom_description' ], |
|
101 | + $shortcode_attributes[ 'ajax' ], |
|
102 | + $shortcode_attributes[ 'recaptcha' ], |
|
103 | + $shortcode_attributes[ 'recaptcha_lang' ], |
|
104 | + $shortcode_attributes[ 'recaptcha_type' ], |
|
105 | + $shortcode_attributes[ 'recaptcha_theme' ], |
|
106 | + $shortcode_attributes[ 'recaptcha_size' ], |
|
107 | + $shortcode_attributes[ 'recaptcha_data_callback' ], |
|
108 | + $shortcode_attributes[ 'recaptcha_expired_callback' ], |
|
109 | + $shortcode_attributes[ 'inline' ] |
|
110 | 110 | ); |
111 | 111 | } |
112 | 112 | } |
@@ -3,234 +3,234 @@ discard block |
||
3 | 3 | class Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler { |
4 | 4 | |
5 | 5 | /** |
6 | - * A flag signifying whether we're dealing with an AJAX submission or standard form submission |
|
7 | - * |
|
8 | - * @since 6.3.0 |
|
9 | - * @access protected |
|
10 | - * @var bool | $is_ajax |
|
11 | - */ |
|
6 | + * A flag signifying whether we're dealing with an AJAX submission or standard form submission |
|
7 | + * |
|
8 | + * @since 6.3.0 |
|
9 | + * @access protected |
|
10 | + * @var bool | $is_ajax |
|
11 | + */ |
|
12 | 12 | protected $is_ajax; |
13 | 13 | |
14 | 14 | /**** Hardcoded Internal Variables ****/ |
15 | 15 | |
16 | 16 | /** |
17 | - * An array of form fields we don't process |
|
18 | - * |
|
19 | - * @since 6.3.0 |
|
20 | - * @access protected |
|
21 | - * @var array | $skipped_form_fields |
|
22 | - */ |
|
17 | + * An array of form fields we don't process |
|
18 | + * |
|
19 | + * @since 6.3.0 |
|
20 | + * @access protected |
|
21 | + * @var array | $skipped_form_fields |
|
22 | + */ |
|
23 | 23 | protected $skipped_form_fields; |
24 | 24 | |
25 | 25 | /**** Form Variables ****/ |
26 | 26 | |
27 | 27 | /** |
28 | - * The ID of the corresponding YIKES MailChimp form |
|
29 | - * |
|
30 | - * @since 6.3.0 |
|
31 | - * @access public |
|
32 | - * @var int | $form_id |
|
33 | - */ |
|
28 | + * The ID of the corresponding YIKES MailChimp form |
|
29 | + * |
|
30 | + * @since 6.3.0 |
|
31 | + * @access public |
|
32 | + * @var int | $form_id |
|
33 | + */ |
|
34 | 34 | public $form_id; |
35 | 35 | |
36 | 36 | /** |
37 | - * The ID of the corresponding MailChimp list |
|
38 | - * |
|
39 | - * @since 6.3.0 |
|
40 | - * @access public |
|
41 | - * @var int | $list_id |
|
42 | - */ |
|
37 | + * The ID of the corresponding MailChimp list |
|
38 | + * |
|
39 | + * @since 6.3.0 |
|
40 | + * @access public |
|
41 | + * @var int | $list_id |
|
42 | + */ |
|
43 | 43 | public $list_id; |
44 | 44 | |
45 | 45 | /** |
46 | - * The submitted email |
|
47 | - * |
|
48 | - * @since 6.3.0 |
|
49 | - * @access public |
|
50 | - * @var string | $email |
|
51 | - */ |
|
46 | + * The submitted email |
|
47 | + * |
|
48 | + * @since 6.3.0 |
|
49 | + * @access public |
|
50 | + * @var string | $email |
|
51 | + */ |
|
52 | 52 | public $email; |
53 | 53 | |
54 | 54 | /** |
55 | - * The array of error messages defined by the user and attached to this form |
|
56 | - * |
|
57 | - * @since 6.3.0 |
|
58 | - * @access public |
|
59 | - * @var array | $error_messages |
|
60 | - */ |
|
55 | + * The array of error messages defined by the user and attached to this form |
|
56 | + * |
|
57 | + * @since 6.3.0 |
|
58 | + * @access public |
|
59 | + * @var array | $error_messages |
|
60 | + */ |
|
61 | 61 | public $error_messages; |
62 | 62 | |
63 | 63 | /**** Default Error Messages ****/ |
64 | 64 | |
65 | 65 | /** |
66 | - * The error message for no form ID |
|
67 | - * |
|
68 | - * @since 6.3.0 |
|
69 | - * @access public |
|
70 | - * @var string | $handle_empty_form_id_message |
|
71 | - */ |
|
66 | + * The error message for no form ID |
|
67 | + * |
|
68 | + * @since 6.3.0 |
|
69 | + * @access public |
|
70 | + * @var string | $handle_empty_form_id_message |
|
71 | + */ |
|
72 | 72 | public $handle_empty_form_id_message; |
73 | 73 | |
74 | 74 | /** |
75 | - * The error message for no form found |
|
76 | - * |
|
77 | - * @since 6.3.0 |
|
78 | - * @access public |
|
79 | - * @var string | $handle_empty_form_message |
|
80 | - */ |
|
75 | + * The error message for no form found |
|
76 | + * |
|
77 | + * @since 6.3.0 |
|
78 | + * @access public |
|
79 | + * @var string | $handle_empty_form_message |
|
80 | + */ |
|
81 | 81 | public $handle_empty_form_message; |
82 | 82 | |
83 | 83 | /** |
84 | - * The error message for missing form fields |
|
85 | - * |
|
86 | - * @since 6.3.0 |
|
87 | - * @access public |
|
88 | - * @var string | $handle_empty_fields_generic_message |
|
89 | - */ |
|
84 | + * The error message for missing form fields |
|
85 | + * |
|
86 | + * @since 6.3.0 |
|
87 | + * @access public |
|
88 | + * @var string | $handle_empty_fields_generic_message |
|
89 | + */ |
|
90 | 90 | public $handle_empty_fields_generic_message; |
91 | 91 | |
92 | 92 | /** |
93 | - * The error message for missing $list_handler class |
|
94 | - * |
|
95 | - * @since 6.3.0 |
|
96 | - * @access public |
|
97 | - * @var string | $handle_empty_list_handler_message |
|
98 | - */ |
|
93 | + * The error message for missing $list_handler class |
|
94 | + * |
|
95 | + * @since 6.3.0 |
|
96 | + * @access public |
|
97 | + * @var string | $handle_empty_list_handler_message |
|
98 | + */ |
|
99 | 99 | public $handle_empty_list_handler_message; |
100 | 100 | |
101 | 101 | /** |
102 | - * The error message for no email |
|
103 | - * |
|
104 | - * @since 6.3.0 |
|
105 | - * @access public |
|
106 | - * @var string | $handle_empty_email_message |
|
107 | - */ |
|
102 | + * The error message for no email |
|
103 | + * |
|
104 | + * @since 6.3.0 |
|
105 | + * @access public |
|
106 | + * @var string | $handle_empty_email_message |
|
107 | + */ |
|
108 | 108 | public $handle_empty_email_message; |
109 | 109 | |
110 | 110 | /** |
111 | - * The error message for a filled in honeypot |
|
112 | - * |
|
113 | - * @since 6.3.0 |
|
114 | - * @access public |
|
115 | - * @var string | $handle_non_empty_honeypot_message |
|
116 | - */ |
|
111 | + * The error message for a filled in honeypot |
|
112 | + * |
|
113 | + * @since 6.3.0 |
|
114 | + * @access public |
|
115 | + * @var string | $handle_non_empty_honeypot_message |
|
116 | + */ |
|
117 | 117 | public $handle_non_empty_honeypot_message; |
118 | 118 | |
119 | 119 | /** |
120 | - * The error message for existing users trying to update when it's disallowed |
|
121 | - * |
|
122 | - * @since 6.3.0 |
|
123 | - * @access public |
|
124 | - * @var string | $handle_disallowed_existing_user_update_message |
|
125 | - */ |
|
120 | + * The error message for existing users trying to update when it's disallowed |
|
121 | + * |
|
122 | + * @since 6.3.0 |
|
123 | + * @access public |
|
124 | + * @var string | $handle_disallowed_existing_user_update_message |
|
125 | + */ |
|
126 | 126 | public $handle_disallowed_existing_user_update_message; |
127 | 127 | |
128 | 128 | /** |
129 | - * The first half of the error message for updating an existing user when it's done via a profile link |
|
130 | - * |
|
131 | - * @since 6.3.0 |
|
132 | - * @access public |
|
133 | - * @var string | $handle_updating_existing_user_message |
|
134 | - */ |
|
129 | + * The first half of the error message for updating an existing user when it's done via a profile link |
|
130 | + * |
|
131 | + * @since 6.3.0 |
|
132 | + * @access public |
|
133 | + * @var string | $handle_updating_existing_user_message |
|
134 | + */ |
|
135 | 135 | public $handle_updating_existing_user_message; |
136 | 136 | |
137 | 137 | /** |
138 | - * The second half of the error message (the link) for updating an existing user when it's done via a profile link |
|
139 | - * |
|
140 | - * @since 6.3.0 |
|
141 | - * @access public |
|
142 | - * @var string | $handle_updating_existing_user_link_message |
|
143 | - */ |
|
138 | + * The second half of the error message (the link) for updating an existing user when it's done via a profile link |
|
139 | + * |
|
140 | + * @since 6.3.0 |
|
141 | + * @access public |
|
142 | + * @var string | $handle_updating_existing_user_link_message |
|
143 | + */ |
|
144 | 144 | public $handle_updating_existing_user_link_message; |
145 | 145 | |
146 | 146 | /** |
147 | - * A default, generic error message |
|
148 | - * |
|
149 | - * @since 6.3.0 |
|
150 | - * @access public |
|
151 | - * @var string | $default_error_response_message |
|
152 | - */ |
|
147 | + * A default, generic error message |
|
148 | + * |
|
149 | + * @since 6.3.0 |
|
150 | + * @access public |
|
151 | + * @var string | $default_error_response_message |
|
152 | + */ |
|
153 | 153 | public $default_error_response_message; |
154 | 154 | |
155 | 155 | /** |
156 | - * The error message for not filling out a required form field |
|
157 | - * |
|
158 | - * @since 6.3.0 |
|
159 | - * @access public |
|
160 | - * @var string | $handle_empty_required_field_message |
|
161 | - */ |
|
156 | + * The error message for not filling out a required form field |
|
157 | + * |
|
158 | + * @since 6.3.0 |
|
159 | + * @access public |
|
160 | + * @var string | $handle_empty_required_field_message |
|
161 | + */ |
|
162 | 162 | public $handle_empty_required_field_message; |
163 | 163 | |
164 | 164 | /** |
165 | - * The error message for not filling out a required interest group |
|
166 | - * |
|
167 | - * @since 6.3.0 |
|
168 | - * @access public |
|
169 | - * @var string | $handle_empty_required_interest_group_message |
|
170 | - */ |
|
165 | + * The error message for not filling out a required interest group |
|
166 | + * |
|
167 | + * @since 6.3.0 |
|
168 | + * @access public |
|
169 | + * @var string | $handle_empty_required_interest_group_message |
|
170 | + */ |
|
171 | 171 | public $handle_empty_required_interest_group_message; |
172 | 172 | |
173 | 173 | /** |
174 | - * The error message for nonce failures |
|
175 | - * |
|
176 | - * @since 6.3.0 |
|
177 | - * @access public |
|
178 | - * @var string | $handle_nonce_message |
|
179 | - */ |
|
174 | + * The error message for nonce failures |
|
175 | + * |
|
176 | + * @since 6.3.0 |
|
177 | + * @access public |
|
178 | + * @var string | $handle_nonce_message |
|
179 | + */ |
|
180 | 180 | public $handle_nonce_message; |
181 | 181 | |
182 | 182 | /** |
183 | - * The error message for a recaptcha that is not checked/filled out |
|
184 | - * |
|
185 | - * @since 6.3.0 |
|
186 | - * @access public |
|
187 | - * @var string | $handle_nonce_message |
|
188 | - */ |
|
183 | + * The error message for a recaptcha that is not checked/filled out |
|
184 | + * |
|
185 | + * @since 6.3.0 |
|
186 | + * @access public |
|
187 | + * @var string | $handle_nonce_message |
|
188 | + */ |
|
189 | 189 | public $handle_non_filled_recaptcha_message_message; |
190 | 190 | |
191 | 191 | /** |
192 | - * The error message for recaptcha errors that we're not sure of |
|
193 | - * |
|
194 | - * @since 6.3.0 |
|
195 | - * @access public |
|
196 | - * @var string | $handle_nonce_message |
|
197 | - */ |
|
192 | + * The error message for recaptcha errors that we're not sure of |
|
193 | + * |
|
194 | + * @since 6.3.0 |
|
195 | + * @access public |
|
196 | + * @var string | $handle_nonce_message |
|
197 | + */ |
|
198 | 198 | public $generic_recaptcha_error_message; |
199 | 199 | |
200 | 200 | /**** Default Success Messages ****/ |
201 | 201 | |
202 | 202 | /** |
203 | - * The success message for single-optin forms |
|
204 | - * |
|
205 | - * @since 6.3.0 |
|
206 | - * @access public |
|
207 | - * @var string | $default_response_single_optin_success_message |
|
208 | - */ |
|
203 | + * The success message for single-optin forms |
|
204 | + * |
|
205 | + * @since 6.3.0 |
|
206 | + * @access public |
|
207 | + * @var string | $default_response_single_optin_success_message |
|
208 | + */ |
|
209 | 209 | public $default_response_single_optin_success_message; |
210 | 210 | |
211 | 211 | /** |
212 | - * The default success message for double-optin forms |
|
213 | - * |
|
214 | - * @since 6.3.0 |
|
215 | - * @access public |
|
216 | - * @var string | $default_response_double_optin_success_message |
|
217 | - */ |
|
212 | + * The default success message for double-optin forms |
|
213 | + * |
|
214 | + * @since 6.3.0 |
|
215 | + * @access public |
|
216 | + * @var string | $default_response_double_optin_success_message |
|
217 | + */ |
|
218 | 218 | public $default_response_double_optin_success_message; |
219 | 219 | |
220 | 220 | /** |
221 | - * The default success message for already subscribed users re-subscribing |
|
222 | - * |
|
223 | - * @since 6.3.0 |
|
224 | - * @access public |
|
225 | - * @var string | $existing_subscriber_profile_update_message |
|
226 | - */ |
|
221 | + * The default success message for already subscribed users re-subscribing |
|
222 | + * |
|
223 | + * @since 6.3.0 |
|
224 | + * @access public |
|
225 | + * @var string | $existing_subscriber_profile_update_message |
|
226 | + */ |
|
227 | 227 | public $existing_subscriber_profile_update_message; |
228 | 228 | |
229 | 229 | /** |
230 | - * The construct function - sets all of our hardcoded variables |
|
231 | - * |
|
232 | - * @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission |
|
233 | - */ |
|
230 | + * The construct function - sets all of our hardcoded variables |
|
231 | + * |
|
232 | + * @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission |
|
233 | + */ |
|
234 | 234 | public function __construct( $is_ajax ) { |
235 | 235 | |
236 | 236 | // Set up our variables |
@@ -268,45 +268,45 @@ discard block |
||
268 | 268 | /**** Setters for our Form Variables ****/ |
269 | 269 | |
270 | 270 | /** |
271 | - * Set the form ID class property |
|
272 | - * |
|
273 | - * @since 6.3.0 |
|
274 | - * |
|
275 | - * @param int | $form_id | ID of the corresponding YIKES MailChimp form |
|
276 | - */ |
|
271 | + * Set the form ID class property |
|
272 | + * |
|
273 | + * @since 6.3.0 |
|
274 | + * |
|
275 | + * @param int | $form_id | ID of the corresponding YIKES MailChimp form |
|
276 | + */ |
|
277 | 277 | public function set_form_id( $form_id ) { |
278 | 278 | $this->form_id = $form_id; |
279 | 279 | } |
280 | 280 | |
281 | 281 | /** |
282 | - * Set the list ID class property |
|
283 | - * |
|
284 | - * @since 6.3.0 |
|
285 | - * |
|
286 | - * @param int | $list_id | ID of the corresponding MailChimp list |
|
287 | - */ |
|
282 | + * Set the list ID class property |
|
283 | + * |
|
284 | + * @since 6.3.0 |
|
285 | + * |
|
286 | + * @param int | $list_id | ID of the corresponding MailChimp list |
|
287 | + */ |
|
288 | 288 | public function set_list_id( $list_id ) { |
289 | 289 | $this->list_id = $list_id; |
290 | 290 | } |
291 | 291 | |
292 | 292 | /** |
293 | - * Set the email class property |
|
294 | - * |
|
295 | - * @since 6.3.0 |
|
296 | - * |
|
297 | - * @param string | $sanitized_email | The sanitized email |
|
298 | - */ |
|
293 | + * Set the email class property |
|
294 | + * |
|
295 | + * @since 6.3.0 |
|
296 | + * |
|
297 | + * @param string | $sanitized_email | The sanitized email |
|
298 | + */ |
|
299 | 299 | public function set_email( $sanitized_email ) { |
300 | 300 | $this->email = $sanitized_email; |
301 | 301 | } |
302 | 302 | |
303 | 303 | /** |
304 | - * Set the $error_messages class property |
|
305 | - * |
|
306 | - * @since 6.3.0 |
|
307 | - * |
|
308 | - * @param array | $error_messages | The array of user-defined error messages for this form |
|
309 | - */ |
|
304 | + * Set the $error_messages class property |
|
305 | + * |
|
306 | + * @since 6.3.0 |
|
307 | + * |
|
308 | + * @param array | $error_messages | The array of user-defined error messages for this form |
|
309 | + */ |
|
310 | 310 | public function set_error_messages( $error_messages ) { |
311 | 311 | $this->error_messages = $error_messages; |
312 | 312 | } |
@@ -315,24 +315,24 @@ discard block |
||
315 | 315 | /**** Simple Return Functions ****/ |
316 | 316 | |
317 | 317 | /** |
318 | - * Return a sanitized email |
|
319 | - * |
|
320 | - * @since 6.3.0 |
|
321 | - * |
|
322 | - * @param string | $email | The user's email |
|
323 | - * @return string| $email | The user's email, lowercased and sanitized |
|
324 | - */ |
|
318 | + * Return a sanitized email |
|
319 | + * |
|
320 | + * @since 6.3.0 |
|
321 | + * |
|
322 | + * @param string | $email | The user's email |
|
323 | + * @return string| $email | The user's email, lowercased and sanitized |
|
324 | + */ |
|
325 | 325 | public function get_sanitized_email( $email ) { |
326 | 326 | return sanitize_email( strtolower( $email ) ); |
327 | 327 | } |
328 | 328 | |
329 | 329 | /** |
330 | - * Return the class property $skipped_form_fields |
|
331 | - * |
|
332 | - * @since 6.3.0 |
|
333 | - * |
|
334 | - * @return array | $skipped_form_fields |
|
335 | - */ |
|
330 | + * Return the class property $skipped_form_fields |
|
331 | + * |
|
332 | + * @since 6.3.0 |
|
333 | + * |
|
334 | + * @return array | $skipped_form_fields |
|
335 | + */ |
|
336 | 336 | protected function get_skipped_merge_tags() { |
337 | 337 | return $this->skipped_form_fields; |
338 | 338 | } |
@@ -341,14 +341,14 @@ discard block |
||
341 | 341 | /**** Collection of functions handling the incoming form and interest group data ****/ |
342 | 342 | |
343 | 343 | /** |
344 | - * Loop through form data to sanitize, format, filter, and return. |
|
345 | - * |
|
346 | - * @since 6.3.0 |
|
347 | - * |
|
348 | - * @param array | $data | The array of user-submitted form values |
|
349 | - * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
350 | - * @return array| $merge_variables| The array of sanitized and formatted form values |
|
351 | - */ |
|
344 | + * Loop through form data to sanitize, format, filter, and return. |
|
345 | + * |
|
346 | + * @since 6.3.0 |
|
347 | + * |
|
348 | + * @param array | $data | The array of user-submitted form values |
|
349 | + * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
350 | + * @return array| $merge_variables| The array of sanitized and formatted form values |
|
351 | + */ |
|
352 | 352 | public function get_submitted_merge_values( $data, $form_fields ) { |
353 | 353 | |
354 | 354 | // Array to return |
@@ -400,14 +400,14 @@ discard block |
||
400 | 400 | } |
401 | 401 | |
402 | 402 | /** |
403 | - * Sanitize form values and return them |
|
404 | - * |
|
405 | - * @since 6.3.0 |
|
406 | - * |
|
407 | - * @param string | $key | The MERGE/Field-name for this value |
|
408 | - * @param mixed | $value | The form value - this could be an array or a string |
|
409 | - * @return mixed | $sanitized | The $value sanitized |
|
410 | - */ |
|
403 | + * Sanitize form values and return them |
|
404 | + * |
|
405 | + * @since 6.3.0 |
|
406 | + * |
|
407 | + * @param string | $key | The MERGE/Field-name for this value |
|
408 | + * @param mixed | $value | The form value - this could be an array or a string |
|
409 | + * @return mixed | $sanitized | The $value sanitized |
|
410 | + */ |
|
411 | 411 | protected function sanitize_form_values( $key, $value ) { |
412 | 412 | if ( is_scalar( $value ) ) { |
413 | 413 | $sanitized = sanitize_text_field( $value ); |
@@ -421,14 +421,14 @@ discard block |
||
421 | 421 | } |
422 | 422 | |
423 | 423 | /** |
424 | - * Check a date field's date format and pass it along to the appropriate function |
|
425 | - * |
|
426 | - * @since 6.3.0 |
|
427 | - * |
|
428 | - * @param string | $date | The unformatted date value |
|
429 | - * @param string | $date_format | The date format |
|
430 | - * @return string| $date | The date formatted according to the $date_format |
|
431 | - */ |
|
424 | + * Check a date field's date format and pass it along to the appropriate function |
|
425 | + * |
|
426 | + * @since 6.3.0 |
|
427 | + * |
|
428 | + * @param string | $date | The unformatted date value |
|
429 | + * @param string | $date_format | The date format |
|
430 | + * @return string| $date | The date formatted according to the $date_format |
|
431 | + */ |
|
432 | 432 | protected function handle_date_format_merge_values( $date, $date_format ) { |
433 | 433 | // Check if EU date format (for dates: 'DD/MM/YYYY', for birthdays: 'DD/MM') |
434 | 434 | if ( 'DD/MM/YYYY' === $date_format ) { |
@@ -441,13 +441,13 @@ discard block |
||
441 | 441 | } |
442 | 442 | |
443 | 443 | /** |
444 | - * Format a date field whose date format is dd/mm/yyyy |
|
445 | - * |
|
446 | - * @since 6.3.0 |
|
447 | - * |
|
448 | - * @param string | $date | A date in the format dd/mm/yyyy |
|
449 | - * @return string| $date | A date in the format mm/dd/yyyy |
|
450 | - */ |
|
444 | + * Format a date field whose date format is dd/mm/yyyy |
|
445 | + * |
|
446 | + * @since 6.3.0 |
|
447 | + * |
|
448 | + * @param string | $date | A date in the format dd/mm/yyyy |
|
449 | + * @return string| $date | A date in the format mm/dd/yyyy |
|
450 | + */ |
|
451 | 451 | protected function handle_dd_mm_yyyy_date( $date ) { |
452 | 452 | |
453 | 453 | // MailChimp wants the dates as 'MM/DD/YYYY' regardless of user-specified format, so convert |
@@ -466,13 +466,13 @@ discard block |
||
466 | 466 | } |
467 | 467 | |
468 | 468 | /** |
469 | - * Format a birthday field whose date format is dd/mm |
|
470 | - * |
|
471 | - * @since 6.3.0 |
|
472 | - * |
|
473 | - * @param string | $birthday | A date in the format dd/mm |
|
474 | - * @return string| $birthday | A date in the format mm/dd |
|
475 | - */ |
|
469 | + * Format a birthday field whose date format is dd/mm |
|
470 | + * |
|
471 | + * @since 6.3.0 |
|
472 | + * |
|
473 | + * @param string | $birthday | A date in the format dd/mm |
|
474 | + * @return string| $birthday | A date in the format mm/dd |
|
475 | + */ |
|
476 | 476 | protected function handle_dd_mm_birthday( $birthday ) { |
477 | 477 | |
478 | 478 | // MailChimp wants the birthdays as 'MM/DD' regardless of user-specified format, so convert |
@@ -492,14 +492,14 @@ discard block |
||
492 | 492 | |
493 | 493 | |
494 | 494 | /** |
495 | - * Create an array of available interest groups based on the $replace_interests flag |
|
496 | - * |
|
497 | - * @since 6.3.0 |
|
498 | - * |
|
499 | - * @param bool | $replace_interests| True if we're replacing interest groups, false if updating interest groups |
|
500 | - * @param class | $list_class | Class for interacting with the current list |
|
501 | - * @return array | $groups | Array of interest groups |
|
502 | - */ |
|
495 | + * Create an array of available interest groups based on the $replace_interests flag |
|
496 | + * |
|
497 | + * @since 6.3.0 |
|
498 | + * |
|
499 | + * @param bool | $replace_interests| True if we're replacing interest groups, false if updating interest groups |
|
500 | + * @param class | $list_class | Class for interacting with the current list |
|
501 | + * @return array | $groups | Array of interest groups |
|
502 | + */ |
|
503 | 503 | public function get_default_interest_groups( $replace_interests, $list_class ) { |
504 | 504 | |
505 | 505 | // If $replace_interests flag is true then loop through interest groups and set them all to false to start. |
@@ -537,15 +537,15 @@ discard block |
||
537 | 537 | |
538 | 538 | |
539 | 539 | /** |
540 | - * Loop through the interest group form data to sanitize, format, filter, and return. |
|
541 | - * |
|
542 | - * @since 6.3.0 |
|
543 | - * |
|
544 | - * @param array | $data | The array of user-submitted form values |
|
545 | - * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
546 | - * @param array | $groups | The array of interest groups created by `get_default_interest_groups()` |
|
547 | - * @return array| $groups | The array of sanitized and formatted form values |
|
548 | - */ |
|
540 | + * Loop through the interest group form data to sanitize, format, filter, and return. |
|
541 | + * |
|
542 | + * @since 6.3.0 |
|
543 | + * |
|
544 | + * @param array | $data | The array of user-submitted form values |
|
545 | + * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
546 | + * @param array | $groups | The array of interest groups created by `get_default_interest_groups()` |
|
547 | + * @return array| $groups | The array of sanitized and formatted form values |
|
548 | + */ |
|
549 | 549 | public function get_submitted_interest_groups( $data, $form_fields, $groups ) { |
550 | 550 | |
551 | 551 | // loop to push variables to our array |
@@ -574,13 +574,13 @@ discard block |
||
574 | 574 | } |
575 | 575 | |
576 | 576 | /** |
577 | - * yikes-mailchimp-filter-groups-before-submission |
|
578 | - * |
|
579 | - * Catch the interest groups before they get sent over to MailChimp |
|
580 | - * @param array | $groups | User submitted interest group data |
|
581 | - * @optional int| $form_id| the ID of the form to filter |
|
582 | - * @since 6.3.0 |
|
583 | - */ |
|
577 | + * yikes-mailchimp-filter-groups-before-submission |
|
578 | + * |
|
579 | + * Catch the interest groups before they get sent over to MailChimp |
|
580 | + * @param array | $groups | User submitted interest group data |
|
581 | + * @optional int| $form_id| the ID of the form to filter |
|
582 | + * @since 6.3.0 |
|
583 | + */ |
|
584 | 584 | $groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission', $groups, $this->form_id ); |
585 | 585 | $groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission-{$this->form_id}', $groups, $this->form_id ); |
586 | 586 | |
@@ -591,17 +591,17 @@ discard block |
||
591 | 591 | /**** Functions to Handle Subscribe API Response ****/ |
592 | 592 | |
593 | 593 | /** |
594 | - * Handle the response to a successful subscribe request |
|
595 | - * |
|
596 | - * @since 6.3.0 |
|
597 | - * |
|
598 | - * @param array | $submission_settings | Array of the form's submission settings |
|
599 | - * @param array | $page_data | Array of the page data |
|
600 | - * @param array | $merge_variables | Array of the submitted form variables |
|
601 | - * @param array | $notifications | Literally don't know what this is yet. |
|
602 | - * @param array | $optin_settings | Array of the form's optin settings |
|
603 | - * @param bool | $new_subscriber | True if a new subscriber, false if an existing one |
|
604 | - */ |
|
594 | + * Handle the response to a successful subscribe request |
|
595 | + * |
|
596 | + * @since 6.3.0 |
|
597 | + * |
|
598 | + * @param array | $submission_settings | Array of the form's submission settings |
|
599 | + * @param array | $page_data | Array of the page data |
|
600 | + * @param array | $merge_variables | Array of the submitted form variables |
|
601 | + * @param array | $notifications | Literally don't know what this is yet. |
|
602 | + * @param array | $optin_settings | Array of the form's optin settings |
|
603 | + * @param bool | $new_subscriber | True if a new subscriber, false if an existing one |
|
604 | + */ |
|
605 | 605 | public function handle_submission_response_success( $submission_settings, $page_data, $merge_variables, $notifications, $optin_settings, $new_subscriber ) { |
606 | 606 | |
607 | 607 | // Check if we should redirect, and collect the redirect info in an array |
@@ -610,27 +610,27 @@ discard block |
||
610 | 610 | // Fire off our actions |
611 | 611 | |
612 | 612 | /** |
613 | - * yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id} |
|
614 | - * |
|
615 | - * Catch the merge variables after they've been sent over to MailChimp |
|
616 | - * @since 6.0.0 |
|
617 | - * |
|
618 | - * @param array | $merge_variables | The array of user submitted form data |
|
619 | - */ |
|
613 | + * yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id} |
|
614 | + * |
|
615 | + * Catch the merge variables after they've been sent over to MailChimp |
|
616 | + * @since 6.0.0 |
|
617 | + * |
|
618 | + * @param array | $merge_variables | The array of user submitted form data |
|
619 | + */ |
|
620 | 620 | do_action( 'yikes-mailchimp-after-submission', $merge_variables, $this->form_id ); |
621 | 621 | do_action( "yikes-mailchimp-after-submission-{$this->form_id}", $merge_variables, $this->form_id ); |
622 | 622 | |
623 | 623 | /** |
624 | - * yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id} |
|
625 | - * |
|
626 | - * Catch our notifications and other form data |
|
627 | - * |
|
628 | - * @param string | $email | The user's email |
|
629 | - * @param array | $merge_variables | The array of user submitted form data |
|
630 | - * @param string | $form_id | The form ID |
|
631 | - * @param array | $notifications | Array of notification messages |
|
632 | - * |
|
633 | - */ |
|
624 | + * yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id} |
|
625 | + * |
|
626 | + * Catch our notifications and other form data |
|
627 | + * |
|
628 | + * @param string | $email | The user's email |
|
629 | + * @param array | $merge_variables | The array of user submitted form data |
|
630 | + * @param string | $form_id | The form ID |
|
631 | + * @param array | $notifications | Array of notification messages |
|
632 | + * |
|
633 | + */ |
|
634 | 634 | do_action( 'yikes-mailchimp-form-submission', $this->email, $merge_variables, $this->form_id, $notifications ); |
635 | 635 | do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications ); |
636 | 636 | |
@@ -652,15 +652,15 @@ discard block |
||
652 | 652 | $default_response = ( $new_subscriber === false ) ? $this->check_for_user_defined_response_message( 'success-resubscribed', $this->existing_subscriber_profile_update_message ) : $default_response; |
653 | 653 | |
654 | 654 | /** |
655 | - * yikes-mailchimp-success-response |
|
656 | - * |
|
657 | - * Filter the success message displayed to the user |
|
658 | - * |
|
659 | - * @param string | $default_response | The response message that will be shown to the user if unchanged (see above for logic) |
|
660 | - * @param string | $form_id | The form ID |
|
661 | - * @param array | $merge_variables | The array of user submitted form data |
|
662 | - * |
|
663 | - */ |
|
655 | + * yikes-mailchimp-success-response |
|
656 | + * |
|
657 | + * Filter the success message displayed to the user |
|
658 | + * |
|
659 | + * @param string | $default_response | The response message that will be shown to the user if unchanged (see above for logic) |
|
660 | + * @param string | $form_id | The form ID |
|
661 | + * @param array | $merge_variables | The array of user submitted form data |
|
662 | + * |
|
663 | + */ |
|
664 | 664 | $response_message = apply_filters( 'yikes-mailchimp-success-response', $default_response, $this->form_id, $merge_variables ); |
665 | 665 | |
666 | 666 | // Construct our success array variables |
@@ -679,13 +679,13 @@ discard block |
||
679 | 679 | } |
680 | 680 | |
681 | 681 | /** |
682 | - * Handle an unsuccessful/error subscribe request |
|
683 | - * |
|
684 | - * @since 6.3.0 |
|
685 | - * |
|
686 | - * @param object | $subscribe_response | The response from the API |
|
687 | - * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
688 | - */ |
|
682 | + * Handle an unsuccessful/error subscribe request |
|
683 | + * |
|
684 | + * @since 6.3.0 |
|
685 | + * |
|
686 | + * @param object | $subscribe_response | The response from the API |
|
687 | + * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
688 | + */ |
|
689 | 689 | public function handle_submission_response_error( $subscribe_response, $form_fields ) { |
690 | 690 | |
691 | 691 | // Get the error data |
@@ -727,13 +727,13 @@ discard block |
||
727 | 727 | // Note: All of these functions return `return $this->yikes_fail()`. Check function for more info. |
728 | 728 | |
729 | 729 | /** |
730 | - * Check if the submitted form data is missing any required fields |
|
731 | - * |
|
732 | - * @since 6.3.0 |
|
733 | - * |
|
734 | - * @param array | $data | The array of user-submitted form values |
|
735 | - * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
736 | - */ |
|
730 | + * Check if the submitted form data is missing any required fields |
|
731 | + * |
|
732 | + * @since 6.3.0 |
|
733 | + * |
|
734 | + * @param array | $data | The array of user-submitted form values |
|
735 | + * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
736 | + */ |
|
737 | 737 | public function check_for_required_form_fields( $data, $form_fields ) { |
738 | 738 | |
739 | 739 | // Set up our defaults |
@@ -758,15 +758,15 @@ discard block |
||
758 | 758 | foreach( $value as $field => $val ) { |
759 | 759 | |
760 | 760 | /** |
761 | - * 'yikes-mailchimp-ignore-required-array-field' |
|
762 | - * |
|
763 | - * Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array. |
|
764 | - * |
|
765 | - * @param array | Array of fields to ignore. Key of the array should be the field name. |
|
766 | - * @param int | $form_id |
|
767 | - * |
|
768 | - * @return Array of fields to ignore. |
|
769 | - */ |
|
761 | + * 'yikes-mailchimp-ignore-required-array-field' |
|
762 | + * |
|
763 | + * Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array. |
|
764 | + * |
|
765 | + * @param array | Array of fields to ignore. Key of the array should be the field name. |
|
766 | + * @param int | $form_id |
|
767 | + * |
|
768 | + * @return Array of fields to ignore. |
|
769 | + */ |
|
770 | 770 | $ignored_fields = apply_filters( 'yikes-mailchimp-ignore-required-array-field', array( 'addr2' => true ), $this->form_id ); |
771 | 771 | |
772 | 772 | if ( empty( $val ) && ! isset( $ignored_fields[ $field ] ) ) { |
@@ -797,14 +797,14 @@ discard block |
||
797 | 797 | ); |
798 | 798 | |
799 | 799 | /** |
800 | - * yikes-mailchimp-required-form-field-missing |
|
801 | - * |
|
802 | - * Alter the response message shown to the user for missing required form fields |
|
803 | - * |
|
804 | - * @param string | $handle_empty_required_field_message | The default message displayed to the user |
|
805 | - * @param int | $form_id | The ID of the form |
|
806 | - * @param array | $missing_fields | Array of the missing required fields |
|
807 | - */ |
|
800 | + * yikes-mailchimp-required-form-field-missing |
|
801 | + * |
|
802 | + * Alter the response message shown to the user for missing required form fields |
|
803 | + * |
|
804 | + * @param string | $handle_empty_required_field_message | The default message displayed to the user |
|
805 | + * @param int | $form_id | The ID of the form |
|
806 | + * @param array | $missing_fields | Array of the missing required fields |
|
807 | + */ |
|
808 | 808 | $default_response = apply_filters( 'yikes-mailchimp-required-form-field-missing', $this->handle_empty_required_field_message, $this->form_id, $missing_fields ); |
809 | 809 | |
810 | 810 | // If we've found a missing field, return the array of field data |
@@ -813,13 +813,13 @@ discard block |
||
813 | 813 | } |
814 | 814 | |
815 | 815 | /** |
816 | - * Check if the submitted form interest group data is missing any required fields |
|
817 | - * |
|
818 | - * @since 6.3.0 |
|
819 | - * |
|
820 | - * @param array | $data | The array of user-submitted form values |
|
821 | - * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
822 | - */ |
|
816 | + * Check if the submitted form interest group data is missing any required fields |
|
817 | + * |
|
818 | + * @since 6.3.0 |
|
819 | + * |
|
820 | + * @param array | $data | The array of user-submitted form values |
|
821 | + * @param array | $form_fields | The array of form field definitions for this YIKES MailChimp form |
|
822 | + */ |
|
823 | 823 | public function check_for_required_interest_groups( $data, $form_fields ) { |
824 | 824 | |
825 | 825 | // Set up our defaults |
@@ -853,14 +853,14 @@ discard block |
||
853 | 853 | ); |
854 | 854 | |
855 | 855 | /** |
856 | - * yikes-mailchimp-required-interest-group-missing |
|
857 | - * |
|
858 | - * Alter the response message shown to the user for missing required form fields |
|
859 | - * |
|
860 | - * @param string | $handle_empty_required_interest_group_message | The default message displayed to the user |
|
861 | - * @param int | $form_id | The ID of the form |
|
862 | - * @param array | $missing_fields | Array of the missing required fields |
|
863 | - */ |
|
856 | + * yikes-mailchimp-required-interest-group-missing |
|
857 | + * |
|
858 | + * Alter the response message shown to the user for missing required form fields |
|
859 | + * |
|
860 | + * @param string | $handle_empty_required_interest_group_message | The default message displayed to the user |
|
861 | + * @param int | $form_id | The ID of the form |
|
862 | + * @param array | $missing_fields | Array of the missing required fields |
|
863 | + */ |
|
864 | 864 | $default_response = apply_filters( 'yikes-mailchimp-required-interest-group-missing', $this->handle_empty_required_interest_group_message, $this->form_id, $missing_fields ); |
865 | 865 | |
866 | 866 | // If we find a required interest group with an empty value, send an error |
@@ -869,12 +869,12 @@ discard block |
||
869 | 869 | } |
870 | 870 | |
871 | 871 | /** |
872 | - * Handle the reCAPTCHA |
|
873 | - * |
|
874 | - * @since 6.3.0 |
|
875 | - * |
|
876 | - * @param string | $recaptcha_response | The form value of the recaptcha field |
|
877 | - */ |
|
872 | + * Handle the reCAPTCHA |
|
873 | + * |
|
874 | + * @since 6.3.0 |
|
875 | + * |
|
876 | + * @param string | $recaptcha_response | The form value of the recaptcha field |
|
877 | + */ |
|
878 | 878 | public function handle_recaptcha( $recaptcha_response ) { |
879 | 879 | |
880 | 880 | // Before we the hit the API, let's check that we actually got a response. |
@@ -882,11 +882,11 @@ discard block |
||
882 | 882 | if ( empty( $recaptcha_response ) ) { |
883 | 883 | |
884 | 884 | /** |
885 | - * yikes-mailchimp-recaptcha-required-error |
|
886 | - * |
|
887 | - * Catch the recaptcha errors before they're returned to the user |
|
888 | - * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
889 | - */ |
|
885 | + * yikes-mailchimp-recaptcha-required-error |
|
886 | + * |
|
887 | + * Catch the recaptcha errors before they're returned to the user |
|
888 | + * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
889 | + */ |
|
890 | 890 | $response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', $this->handle_non_filled_recaptcha_message_message, $this->form_id ); |
891 | 891 | return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true ); |
892 | 892 | } |
@@ -919,40 +919,40 @@ discard block |
||
919 | 919 | } |
920 | 920 | |
921 | 921 | /** |
922 | - * yikes-mailchimp-recaptcha-required-error |
|
923 | - * |
|
924 | - * Catch the recaptcha errors before they're returned to the user |
|
925 | - * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
926 | - */ |
|
922 | + * yikes-mailchimp-recaptcha-required-error |
|
923 | + * |
|
924 | + * Catch the recaptcha errors before they're returned to the user |
|
925 | + * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
926 | + */ |
|
927 | 927 | $response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $recaptcha_errors ), $this->form_id ); |
928 | 928 | return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true ); |
929 | 929 | } |
930 | 930 | } |
931 | 931 | |
932 | 932 | /** |
933 | - * Handle the nonce field |
|
934 | - * |
|
935 | - * @since 6.3.0 |
|
936 | - * |
|
937 | - * @param string | $nonce_value | The form value of the nonce |
|
938 | - * @param string | $nonce_name | The name of the nonce |
|
939 | - */ |
|
933 | + * Handle the nonce field |
|
934 | + * |
|
935 | + * @since 6.3.0 |
|
936 | + * |
|
937 | + * @param string | $nonce_value | The form value of the nonce |
|
938 | + * @param string | $nonce_name | The name of the nonce |
|
939 | + */ |
|
940 | 940 | public function handle_nonce( $nonce_value, $nonce_name ) { |
941 | 941 | |
942 | 942 | // First, check our option - this is set in the general settings page |
943 | 943 | if ( get_option( 'yikes-mailchimp-use-nonce' ) === '1' ) { |
944 | 944 | |
945 | 945 | /** |
946 | - * yikes-mailchimp-use-nonce-verification |
|
947 | - * |
|
948 | - * Decide if we're going to check the nonce value. |
|
949 | - * The reason we filter this is that some users are experiencing nonce issues repeatedly. |
|
950 | - * The default will always be to use the nonce. |
|
951 | - * |
|
952 | - * @param int | $form_id | The form id |
|
953 | - * |
|
954 | - * @return bool | True if we should check the nonce |
|
955 | - */ |
|
946 | + * yikes-mailchimp-use-nonce-verification |
|
947 | + * |
|
948 | + * Decide if we're going to check the nonce value. |
|
949 | + * The reason we filter this is that some users are experiencing nonce issues repeatedly. |
|
950 | + * The default will always be to use the nonce. |
|
951 | + * |
|
952 | + * @param int | $form_id | The form id |
|
953 | + * |
|
954 | + * @return bool | True if we should check the nonce |
|
955 | + */ |
|
956 | 956 | $use_nonce = apply_filters( 'yikes-mailchimp-use-nonce-verification', true, $this->form_id ); |
957 | 957 | |
958 | 958 | // We let the filter override the option because the filter is on a per-form basis |
@@ -965,24 +965,24 @@ discard block |
||
965 | 965 | } |
966 | 966 | |
967 | 967 | /** |
968 | - * Handle a merge_variables error |
|
969 | - * |
|
970 | - * @since 6.3.0 |
|
971 | - * |
|
972 | - * @param int | $error | Int $error = 1 if an error |
|
973 | - * @param string | $message | The message shown to the user |
|
974 | - */ |
|
968 | + * Handle a merge_variables error |
|
969 | + * |
|
970 | + * @since 6.3.0 |
|
971 | + * |
|
972 | + * @param int | $error | Int $error = 1 if an error |
|
973 | + * @param string | $message | The message shown to the user |
|
974 | + */ |
|
975 | 975 | public function handle_merge_variables_error( $error, $message ) { |
976 | 976 | return $this->yikes_fail( $hide = 0, $error, $message, array(), $return_response_non_ajax = true ); |
977 | 977 | } |
978 | 978 | |
979 | 979 | /** |
980 | - * Handle an empty email field and return the corresponding error message |
|
981 | - * |
|
982 | - * @since 6.3.0 |
|
983 | - * |
|
984 | - * @param string | $email |
|
985 | - */ |
|
980 | + * Handle an empty email field and return the corresponding error message |
|
981 | + * |
|
982 | + * @since 6.3.0 |
|
983 | + * |
|
984 | + * @param string | $email |
|
985 | + */ |
|
986 | 986 | public function handle_empty_email( $email ) { |
987 | 987 | if ( empty( $email ) ) { |
988 | 988 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_email_message ); |
@@ -990,12 +990,12 @@ discard block |
||
990 | 990 | } |
991 | 991 | |
992 | 992 | /** |
993 | - * Check if the form is empty and return the corresponding error message |
|
994 | - * |
|
995 | - * @since 6.3.0 |
|
996 | - * |
|
997 | - * @param array | $form_data |
|
998 | - */ |
|
993 | + * Check if the form is empty and return the corresponding error message |
|
994 | + * |
|
995 | + * @since 6.3.0 |
|
996 | + * |
|
997 | + * @param array | $form_data |
|
998 | + */ |
|
999 | 999 | public function handle_empty_form( $form_data ) { |
1000 | 1000 | if ( empty( $form_data ) ) { |
1001 | 1001 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_message ); |
@@ -1003,12 +1003,12 @@ discard block |
||
1003 | 1003 | } |
1004 | 1004 | |
1005 | 1005 | /** |
1006 | - * Check if the honeypot is NOT empty and return the corresponding error message |
|
1007 | - * |
|
1008 | - * @since 6.3.0 |
|
1009 | - * |
|
1010 | - * @param bool | $honey_pot_filled | True if the honeypot was filled out |
|
1011 | - */ |
|
1006 | + * Check if the honeypot is NOT empty and return the corresponding error message |
|
1007 | + * |
|
1008 | + * @since 6.3.0 |
|
1009 | + * |
|
1010 | + * @param bool | $honey_pot_filled | True if the honeypot was filled out |
|
1011 | + */ |
|
1012 | 1012 | public function handle_non_empty_honeypot( $honey_pot_filled ) { |
1013 | 1013 | if ( $honey_pot_filled === true ) { |
1014 | 1014 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_non_empty_honeypot_message ); |
@@ -1016,12 +1016,12 @@ discard block |
||
1016 | 1016 | } |
1017 | 1017 | |
1018 | 1018 | /** |
1019 | - * Loop through fields looking for null and return the corresponding error message |
|
1020 | - * |
|
1021 | - * @since 6.3.0 |
|
1022 | - * |
|
1023 | - * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
|
1024 | - */ |
|
1019 | + * Loop through fields looking for null and return the corresponding error message |
|
1020 | + * |
|
1021 | + * @since 6.3.0 |
|
1022 | + * |
|
1023 | + * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
|
1024 | + */ |
|
1025 | 1025 | public function handle_empty_fields_generic( $fields_array ) { |
1026 | 1026 | foreach( $fields_array as $field ) { |
1027 | 1027 | if ( $field === null ) { |
@@ -1031,12 +1031,12 @@ discard block |
||
1031 | 1031 | } |
1032 | 1032 | |
1033 | 1033 | /** |
1034 | - * Check if the list handler is empty and return the corresponding error message |
|
1035 | - * |
|
1036 | - * @since 6.3.0 |
|
1037 | - * |
|
1038 | - * @param class | $list_handler | A class that handles list functions |
|
1039 | - */ |
|
1034 | + * Check if the list handler is empty and return the corresponding error message |
|
1035 | + * |
|
1036 | + * @since 6.3.0 |
|
1037 | + * |
|
1038 | + * @param class | $list_handler | A class that handles list functions |
|
1039 | + */ |
|
1040 | 1040 | public function handle_empty_list_handler( $list_handler ) { |
1041 | 1041 | if ( empty( $list_handler ) ) { |
1042 | 1042 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_list_handler_message ); |
@@ -1044,12 +1044,12 @@ discard block |
||
1044 | 1044 | } |
1045 | 1045 | |
1046 | 1046 | /** |
1047 | - * Check if the form id is empty and return the corresponding error message |
|
1048 | - * |
|
1049 | - * @since 6.3.0 |
|
1050 | - * |
|
1051 | - * @param int | $form_id | The form ID |
|
1052 | - */ |
|
1047 | + * Check if the form id is empty and return the corresponding error message |
|
1048 | + * |
|
1049 | + * @since 6.3.0 |
|
1050 | + * |
|
1051 | + * @param int | $form_id | The form ID |
|
1052 | + */ |
|
1053 | 1053 | public function handle_empty_form_id( $form_id ) { |
1054 | 1054 | if ( empty( $form_id ) ) { |
1055 | 1055 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_id_message ); |
@@ -1057,10 +1057,10 @@ discard block |
||
1057 | 1057 | } |
1058 | 1058 | |
1059 | 1059 | /** |
1060 | - * Construct and filter the error message related to user's re-subscribing when it's not allowed |
|
1061 | - * |
|
1062 | - * @since 6.3.0 |
|
1063 | - */ |
|
1060 | + * Construct and filter the error message related to user's re-subscribing when it's not allowed |
|
1061 | + * |
|
1062 | + * @since 6.3.0 |
|
1063 | + */ |
|
1064 | 1064 | public function handle_disallowed_existing_user_update() { |
1065 | 1065 | |
1066 | 1066 | // Get the default response |
@@ -1073,10 +1073,10 @@ discard block |
||
1073 | 1073 | } |
1074 | 1074 | |
1075 | 1075 | /** |
1076 | - * Construct and filter the error message related to the profile link to update user's profile |
|
1077 | - * |
|
1078 | - * @since 6.3.0 |
|
1079 | - */ |
|
1076 | + * Construct and filter the error message related to the profile link to update user's profile |
|
1077 | + * |
|
1078 | + * @since 6.3.0 |
|
1079 | + */ |
|
1080 | 1080 | public function handle_updating_existing_user() { |
1081 | 1081 | |
1082 | 1082 | // Get the first half of the message |
@@ -1101,15 +1101,15 @@ discard block |
||
1101 | 1101 | /**** Helper Functions ****/ |
1102 | 1102 | |
1103 | 1103 | /** |
1104 | - * Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults. |
|
1105 | - * |
|
1106 | - * @since 6.3.0 |
|
1107 | - * |
|
1108 | - * @param string | $slug | The type of message we're looking for |
|
1109 | - * @param string | $response_text| The default response message |
|
1110 | - * @param array | $data | An array of data that may be needed to construct the user's error message |
|
1111 | - * @return string| $response_text| The $response_text (after it's potentially been changed) |
|
1112 | - */ |
|
1104 | + * Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults. |
|
1105 | + * |
|
1106 | + * @since 6.3.0 |
|
1107 | + * |
|
1108 | + * @param string | $slug | The type of message we're looking for |
|
1109 | + * @param string | $response_text| The default response message |
|
1110 | + * @param array | $data | An array of data that may be needed to construct the user's error message |
|
1111 | + * @return string| $response_text| The $response_text (after it's potentially been changed) |
|
1112 | + */ |
|
1113 | 1113 | protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) { |
1114 | 1114 | |
1115 | 1115 | switch( $slug ) { |
@@ -1123,13 +1123,13 @@ discard block |
||
1123 | 1123 | } |
1124 | 1124 | |
1125 | 1125 | /** |
1126 | - * yikes-easy-mailchimp-user-already-subscribed-text |
|
1127 | - * |
|
1128 | - * Catch the message for user's already subscrbed before we show it to the user |
|
1129 | - * @param string | $message | The response message |
|
1130 | - * @param int | $form_id | The form id |
|
1131 | - * @param string | $email | The user's email |
|
1132 | - */ |
|
1126 | + * yikes-easy-mailchimp-user-already-subscribed-text |
|
1127 | + * |
|
1128 | + * Catch the message for user's already subscrbed before we show it to the user |
|
1129 | + * @param string | $message | The response message |
|
1130 | + * @param int | $form_id | The form id |
|
1131 | + * @param string | $email | The user's email |
|
1132 | + */ |
|
1133 | 1133 | $response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-text', $response_text, $this->form_id, $this->email ); |
1134 | 1134 | |
1135 | 1135 | return $response_text; |
@@ -1148,13 +1148,13 @@ discard block |
||
1148 | 1148 | } |
1149 | 1149 | |
1150 | 1150 | /** |
1151 | - * yikes-easy-mailchimp-user-already-subscribed-link-text |
|
1152 | - * |
|
1153 | - * Catch the message for user's already subscrbed link text before we show it to the user |
|
1154 | - * |
|
1155 | - * @param string | $response_text | The response message that will be shown to the user |
|
1156 | - * @param string | $form_id | The form ID |
|
1157 | - */ |
|
1151 | + * yikes-easy-mailchimp-user-already-subscribed-link-text |
|
1152 | + * |
|
1153 | + * Catch the message for user's already subscrbed link text before we show it to the user |
|
1154 | + * |
|
1155 | + * @param string | $response_text | The response message that will be shown to the user |
|
1156 | + * @param string | $form_id | The form ID |
|
1157 | + */ |
|
1158 | 1158 | $response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-link-text', $response_text, $this->form_id ); |
1159 | 1159 | |
1160 | 1160 | return $response_text; |
@@ -1168,14 +1168,14 @@ discard block |
||
1168 | 1168 | } |
1169 | 1169 | |
1170 | 1170 | /** |
1171 | - * yikes-mailchimp-success-double-optin-response |
|
1172 | - * |
|
1173 | - * Filter the success message displayed to the user |
|
1174 | - * |
|
1175 | - * @param string | $response_text | The response message that will be shown to the user |
|
1176 | - * @param string | $form_id | The form ID |
|
1177 | - * |
|
1178 | - */ |
|
1171 | + * yikes-mailchimp-success-double-optin-response |
|
1172 | + * |
|
1173 | + * Filter the success message displayed to the user |
|
1174 | + * |
|
1175 | + * @param string | $response_text | The response message that will be shown to the user |
|
1176 | + * @param string | $form_id | The form ID |
|
1177 | + * |
|
1178 | + */ |
|
1179 | 1179 | $response_text = apply_filters( 'yikes-mailchimp-success-double-optin-response', $response_text, $this->form_id ); |
1180 | 1180 | |
1181 | 1181 | return $response_text; |
@@ -1188,14 +1188,14 @@ discard block |
||
1188 | 1188 | } |
1189 | 1189 | |
1190 | 1190 | /** |
1191 | - * yikes-mailchimp-success-single-optin-response |
|
1192 | - * |
|
1193 | - * Filter the success message displayed to the user |
|
1194 | - * |
|
1195 | - * @param string | $response_text | The response message that will be shown to the user |
|
1196 | - * @param string | $form_id | The form ID |
|
1197 | - * |
|
1198 | - */ |
|
1191 | + * yikes-mailchimp-success-single-optin-response |
|
1192 | + * |
|
1193 | + * Filter the success message displayed to the user |
|
1194 | + * |
|
1195 | + * @param string | $response_text | The response message that will be shown to the user |
|
1196 | + * @param string | $form_id | The form ID |
|
1197 | + * |
|
1198 | + */ |
|
1199 | 1199 | $response_text = apply_filters( 'yikes-mailchimp-success-single-optin-response', $response_text, $this->form_id ); |
1200 | 1200 | |
1201 | 1201 | return $response_text; |
@@ -1208,14 +1208,14 @@ discard block |
||
1208 | 1208 | } |
1209 | 1209 | |
1210 | 1210 | /** |
1211 | - * yikes-mailchimp-success-resubscribed-response |
|
1212 | - * |
|
1213 | - * Filter the success message displayed to the user |
|
1214 | - * |
|
1215 | - * @param string | $response_text | The response message that will be shown to the user |
|
1216 | - * @param string | $form_id | The form ID |
|
1217 | - * |
|
1218 | - */ |
|
1211 | + * yikes-mailchimp-success-resubscribed-response |
|
1212 | + * |
|
1213 | + * Filter the success message displayed to the user |
|
1214 | + * |
|
1215 | + * @param string | $response_text | The response message that will be shown to the user |
|
1216 | + * @param string | $form_id | The form ID |
|
1217 | + * |
|
1218 | + */ |
|
1219 | 1219 | $response_text = apply_filters( 'yikes-mailchimp-success-resubscribed-response', $response_text, $this->form_id ); |
1220 | 1220 | |
1221 | 1221 | return $response_text; |
@@ -1231,16 +1231,16 @@ discard block |
||
1231 | 1231 | } |
1232 | 1232 | |
1233 | 1233 | /** |
1234 | - * yikes-mailchimp-general-error-response |
|
1235 | - * |
|
1236 | - * Filter the error message displayed to the user |
|
1237 | - * |
|
1238 | - * @param string | $original_response_text | The original response message returned from the API |
|
1239 | - * @param string | $user_defined_response_text | The response message defined by the user |
|
1240 | - * @param string | $form_id | The form ID |
|
1241 | - * |
|
1242 | - * @return string | $response_text | The message that will be shown to the user |
|
1243 | - */ |
|
1234 | + * yikes-mailchimp-general-error-response |
|
1235 | + * |
|
1236 | + * Filter the error message displayed to the user |
|
1237 | + * |
|
1238 | + * @param string | $original_response_text | The original response message returned from the API |
|
1239 | + * @param string | $user_defined_response_text | The response message defined by the user |
|
1240 | + * @param string | $form_id | The form ID |
|
1241 | + * |
|
1242 | + * @return string | $response_text | The message that will be shown to the user |
|
1243 | + */ |
|
1244 | 1244 | $response_text = apply_filters( 'yikes-mailchimp-general-error-response', $original_response_text, $user_defined_response_text, $this->form_id ); |
1245 | 1245 | |
1246 | 1246 | return $response_text; |
@@ -1254,14 +1254,14 @@ discard block |
||
1254 | 1254 | } |
1255 | 1255 | |
1256 | 1256 | /** |
1257 | - * Wrap the response message in HTML for Non-AJAX form submissions |
|
1258 | - * |
|
1259 | - * @since 6.3.0 |
|
1260 | - * |
|
1261 | - * @param string | $message | The response message |
|
1262 | - * @param bool | $is_success | Boolean signifying if we're returning a success message or an error message |
|
1263 | - * @return string| The $message wrapping in HTML |
|
1264 | - */ |
|
1257 | + * Wrap the response message in HTML for Non-AJAX form submissions |
|
1258 | + * |
|
1259 | + * @since 6.3.0 |
|
1260 | + * |
|
1261 | + * @param string | $message | The response message |
|
1262 | + * @param bool | $is_success | Boolean signifying if we're returning a success message or an error message |
|
1263 | + * @return string| The $message wrapping in HTML |
|
1264 | + */ |
|
1265 | 1265 | public function wrap_form_submission_response( $message, $is_success ) { |
1266 | 1266 | |
1267 | 1267 | // If we're successful, we wrap the $message differently |
@@ -1275,14 +1275,14 @@ discard block |
||
1275 | 1275 | /**** Returning Success / Failure Functions ****/ |
1276 | 1276 | |
1277 | 1277 | /** |
1278 | - * Return success. Method of returning success based on the $is_ajax flag |
|
1279 | - * |
|
1280 | - * @since 6.3.0 |
|
1281 | - * |
|
1282 | - * @param array | $success_array | Array of success values to return |
|
1283 | - * |
|
1284 | - * @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`. |
|
1285 | - */ |
|
1278 | + * Return success. Method of returning success based on the $is_ajax flag |
|
1279 | + * |
|
1280 | + * @since 6.3.0 |
|
1281 | + * |
|
1282 | + * @param array | $success_array | Array of success values to return |
|
1283 | + * |
|
1284 | + * @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`. |
|
1285 | + */ |
|
1286 | 1286 | protected function yikes_success( $success_array ) { |
1287 | 1287 | if ( $this->is_ajax === true ) { |
1288 | 1288 | wp_send_json_success( $success_array ); |
@@ -1295,18 +1295,18 @@ discard block |
||
1295 | 1295 | } |
1296 | 1296 | |
1297 | 1297 | /** |
1298 | - * Return failure. Method of returning failure based on the $is_ajax flag |
|
1299 | - * |
|
1300 | - * @since 6.3.0 |
|
1301 | - * |
|
1302 | - * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
1303 | - * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
1304 | - * @param string | $response | The response message to display to the user |
|
1305 | - * @param array | $additional_fields | An array of additional fields to return |
|
1306 | - * @param bool | $return_response_non_ajax | Boolean deciding if we need to return a message |
|
1307 | - * |
|
1308 | - * @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false. |
|
1309 | - */ |
|
1298 | + * Return failure. Method of returning failure based on the $is_ajax flag |
|
1299 | + * |
|
1300 | + * @since 6.3.0 |
|
1301 | + * |
|
1302 | + * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
1303 | + * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
1304 | + * @param string | $response | The response message to display to the user |
|
1305 | + * @param array | $additional_fields | An array of additional fields to return |
|
1306 | + * @param bool | $return_response_non_ajax | Boolean deciding if we need to return a message |
|
1307 | + * |
|
1308 | + * @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false. |
|
1309 | + */ |
|
1310 | 1310 | protected function yikes_fail( $hide, $error, $response, $additional_fields = array(), $return_response_non_ajax = false ) { |
1311 | 1311 | if ( $this->is_ajax === true ) { |
1312 | 1312 | $this->yikes_send_json_error( $hide, $error, $response, $additional_fields ); |
@@ -1319,17 +1319,17 @@ discard block |
||
1319 | 1319 | } |
1320 | 1320 | |
1321 | 1321 | /** |
1322 | - * Wrapper function for wp_send_json_error() |
|
1323 | - * |
|
1324 | - * @since 6.3.0 |
|
1325 | - * |
|
1326 | - * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
1327 | - * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
1328 | - * @param string | $translated_string | The response message to display to the user |
|
1329 | - * @param array | $additional_fields | An array of additional fields to return |
|
1330 | - * |
|
1331 | - * @return func | wp_send_json_error() |
|
1332 | - */ |
|
1322 | + * Wrapper function for wp_send_json_error() |
|
1323 | + * |
|
1324 | + * @since 6.3.0 |
|
1325 | + * |
|
1326 | + * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
1327 | + * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
1328 | + * @param string | $translated_string | The response message to display to the user |
|
1329 | + * @param array | $additional_fields | An array of additional fields to return |
|
1330 | + * |
|
1331 | + * @return func | wp_send_json_error() |
|
1332 | + */ |
|
1333 | 1333 | protected function yikes_send_json_error( $hide, $error, $translated_string, $additional_fields = array() ) { |
1334 | 1334 | |
1335 | 1335 | // Default response array |
@@ -1353,14 +1353,14 @@ discard block |
||
1353 | 1353 | /** Static functions used in other places **/ |
1354 | 1354 | |
1355 | 1355 | /** |
1356 | - * Handle the redirect logic for successful submissions |
|
1357 | - * |
|
1358 | - * @since 6.3.0 |
|
1359 | - * |
|
1360 | - * @param array | $submission_settings | Array of the form's submission settings |
|
1361 | - * @param array | $page_data | Page ID |
|
1362 | - * @return array| $redirect_array | Array with two values: Redirection flag, Redirect URL |
|
1363 | - */ |
|
1356 | + * Handle the redirect logic for successful submissions |
|
1357 | + * |
|
1358 | + * @since 6.3.0 |
|
1359 | + * |
|
1360 | + * @param array | $submission_settings | Array of the form's submission settings |
|
1361 | + * @param array | $page_data | Page ID |
|
1362 | + * @return array| $redirect_array | Array with two values: Redirection flag, Redirect URL |
|
1363 | + */ |
|
1364 | 1364 | public static function handle_submission_response_success_redirect( $form_id, $submission_settings, $page_data ) { |
1365 | 1365 | |
1366 | 1366 | $default_redirect_time_ms = 1500; |
@@ -1393,23 +1393,23 @@ discard block |
||
1393 | 1393 | $redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting; |
1394 | 1394 | |
1395 | 1395 | /** |
1396 | - * yikes-mailchimp-redirect-url |
|
1397 | - * |
|
1398 | - * Catch the redirect URL before it's shown to the user |
|
1399 | - * |
|
1400 | - * @param string | $redirect_url | The URL that we will redirect to |
|
1401 | - * @param string | $form_id | The ID of the current form being subscribed to |
|
1402 | - * @param array | $page_data | An array of data related to the page the form is on |
|
1403 | - */ |
|
1396 | + * yikes-mailchimp-redirect-url |
|
1397 | + * |
|
1398 | + * Catch the redirect URL before it's shown to the user |
|
1399 | + * |
|
1400 | + * @param string | $redirect_url | The URL that we will redirect to |
|
1401 | + * @param string | $form_id | The ID of the current form being subscribed to |
|
1402 | + * @param array | $page_data | An array of data related to the page the form is on |
|
1403 | + */ |
|
1404 | 1404 | $redirect_url = apply_filters( 'yikes-mailchimp-redirect-url', $redirect_url, $form_id, $page_data ); |
1405 | 1405 | |
1406 | 1406 | /** |
1407 | - * yikes-mailchimp-redirect-timer |
|
1408 | - * |
|
1409 | - * Catch the redirect timer before it's sent to the JavaScript file |
|
1410 | - * |
|
1411 | - * @param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting |
|
1412 | - */ |
|
1407 | + * yikes-mailchimp-redirect-timer |
|
1408 | + * |
|
1409 | + * Catch the redirect timer before it's sent to the JavaScript file |
|
1410 | + * |
|
1411 | + * @param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting |
|
1412 | + */ |
|
1413 | 1413 | $redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data ); |
1414 | 1414 | |
1415 | 1415 | $redirect_array['redirect_timer'] = $redirect_timer; |
@@ -255,13 +255,13 @@ discard block |
||
255 | 255 | $this->handle_updating_existing_user_link_message = __( 'To update your MailChimp profile, please click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ); |
256 | 256 | $this->handle_empty_required_field_message = __( 'A required field is missing.', 'yikes-inc-easy-mailchimp-extender' ); |
257 | 257 | $this->handle_empty_required_interest_group_message = __( 'A required interest group is missing.', 'yikes-inc-easy-mailchimp-extender' ); |
258 | - $this->handle_nonce_message = __( 'Error: Sorry, the nonce security check didn\'t pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.' , 'yikes-inc-easy-mailchimp-extender' ); |
|
258 | + $this->handle_nonce_message = __( 'Error: Sorry, the nonce security check didn\'t pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.', 'yikes-inc-easy-mailchimp-extender' ); |
|
259 | 259 | $this->handle_non_filled_recaptcha_message_message = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' ); |
260 | 260 | $this->generic_recaptcha_error_message = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' ); |
261 | 261 | |
262 | 262 | // Define our success messages |
263 | - $this->default_response_single_optin_success_message = __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' ); |
|
264 | - $this->default_response_double_optin_success_message = __( 'Thank you for subscribing. Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ); |
|
263 | + $this->default_response_single_optin_success_message = __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' ); |
|
264 | + $this->default_response_double_optin_success_message = __( 'Thank you for subscribing. Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ); |
|
265 | 265 | $this->existing_subscriber_profile_update_message = __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' ); |
266 | 266 | } |
267 | 267 | |
@@ -373,16 +373,16 @@ discard block |
||
373 | 373 | } |
374 | 374 | |
375 | 375 | // Check if the current iteration has a 'date_format' key set (i.e. date/birthday fields) |
376 | - if ( isset( $form_fields[ $merge_tag ]['date_format'] ) ) { |
|
377 | - $sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ]['date_format'] ); |
|
376 | + if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) { |
|
377 | + $sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ][ 'date_format' ] ); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | $merge_variables[ $merge_tag ] = $sanitized; |
381 | 381 | } |
382 | 382 | |
383 | 383 | // Make sure we send the lower-cased, sanitized email so it matches the one we're sending in the body of the request. |
384 | - if ( isset( $merge_variables['EMAIL'] ) ) { |
|
385 | - $merge_variables['EMAIL'] = $this->email; |
|
384 | + if ( isset( $merge_variables[ 'EMAIL' ] ) ) { |
|
385 | + $merge_variables[ 'EMAIL' ] = $this->email; |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | /** |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | if ( count( $pieces ) === 3 ) { |
460 | 460 | |
461 | 461 | // $pieces[1] = MM. $pieces[0] = DD. $date = MM/DD/YYYY |
462 | - $date = $pieces[1] . '/' . $pieces[0] . '/' . $pieces[2]; |
|
462 | + $date = $pieces[ 1 ] . '/' . $pieces[ 0 ] . '/' . $pieces[ 2 ]; |
|
463 | 463 | } |
464 | 464 | |
465 | 465 | return $date; |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | if ( count( $pieces ) === 2 ) { |
485 | 485 | |
486 | 486 | // $pieces[1] = MM. $pieces[0] = DD. $birthday = MM/DD |
487 | - $birthday = $pieces[1] . '/' . $pieces[0]; |
|
487 | + $birthday = $pieces[ 1 ] . '/' . $pieces[ 0 ]; |
|
488 | 488 | } |
489 | 489 | |
490 | 490 | return $birthday; |
@@ -517,12 +517,12 @@ discard block |
||
517 | 517 | // Loop through the interest groups and create a single array like {group_id} => false |
518 | 518 | foreach ( $interest_groupings as $group_data ) { |
519 | 519 | |
520 | - if ( ! isset( $group_data['items'] ) || isset( $group_data['items'] ) && ( empty( $group_data['items'] ) || ! is_array( $group_data['items'] ) ) ) { |
|
520 | + if ( ! isset( $group_data[ 'items' ] ) || isset( $group_data[ 'items' ] ) && ( empty( $group_data[ 'items' ] ) || ! is_array( $group_data[ 'items' ] ) ) ) { |
|
521 | 521 | continue; |
522 | 522 | } |
523 | 523 | |
524 | - foreach ( $group_data['items'] as $item ) { |
|
525 | - $groups[$item['id']] = false; |
|
524 | + foreach ( $group_data[ 'items' ] as $item ) { |
|
525 | + $groups[ $item[ 'id' ] ] = false; |
|
526 | 526 | } |
527 | 527 | |
528 | 528 | } |
@@ -635,7 +635,7 @@ discard block |
||
635 | 635 | do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications ); |
636 | 636 | |
637 | 637 | // Get the optin value |
638 | - $optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
638 | + $optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
639 | 639 | |
640 | 640 | if ( 1 === $optin ) { |
641 | 641 | |
@@ -665,13 +665,13 @@ discard block |
||
665 | 665 | |
666 | 666 | // Construct our success array variables |
667 | 667 | $return_success_array = array( |
668 | - 'hide' => $submission_settings['hide_form_post_signup'], |
|
668 | + 'hide' => $submission_settings[ 'hide_form_post_signup' ], |
|
669 | 669 | 'error' => 0, |
670 | 670 | 'response' => $response_message, |
671 | - 'redirection' => $redirect_array['redirection'], |
|
672 | - 'redirect' => $redirect_array['redirect'], |
|
673 | - 'new_window' => $redirect_array['new_window'], |
|
674 | - 'redirect_timer' => $redirect_array['redirect_timer'], |
|
671 | + 'redirection' => $redirect_array[ 'redirection' ], |
|
672 | + 'redirect' => $redirect_array[ 'redirect' ], |
|
673 | + 'new_window' => $redirect_array[ 'new_window' ], |
|
674 | + 'redirect_timer' => $redirect_array[ 'redirect_timer' ], |
|
675 | 675 | ); |
676 | 676 | |
677 | 677 | // Return success array |
@@ -693,12 +693,12 @@ discard block |
||
693 | 693 | $details = ''; |
694 | 694 | |
695 | 695 | // Loop through the error data and retrieve any fields and messages |
696 | - if ( isset( $error_data['data'] ) ) { |
|
697 | - foreach ( $error_data['data'] as $datum ) { |
|
698 | - if ( ! isset( $datum['field'], $datum['message'] ) ) { |
|
696 | + if ( isset( $error_data[ 'data' ] ) ) { |
|
697 | + foreach ( $error_data[ 'data' ] as $datum ) { |
|
698 | + if ( ! isset( $datum[ 'field' ], $datum[ 'message' ] ) ) { |
|
699 | 699 | continue; |
700 | 700 | } |
701 | - $details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum['field'] ]['label'], $datum['message'] ); |
|
701 | + $details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum[ 'field' ] ][ 'label' ], $datum[ 'message' ] ); |
|
702 | 702 | } |
703 | 703 | } |
704 | 704 | |
@@ -741,21 +741,21 @@ discard block |
||
741 | 741 | $missing_fields = array(); |
742 | 742 | |
743 | 743 | // Loop through submitted form data |
744 | - foreach( $data as $merge_tag => $value ) { |
|
744 | + foreach ( $data as $merge_tag => $value ) { |
|
745 | 745 | |
746 | 746 | // Skip interest groups |
747 | - if ( isset( $form_fields[ $merge_tag ]['group_id'] ) ) { |
|
747 | + if ( isset( $form_fields[ $merge_tag ][ 'group_id' ] ) ) { |
|
748 | 748 | continue; |
749 | 749 | } |
750 | 750 | |
751 | 751 | // check if this field is required |
752 | - if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ]['require'] ) && $form_fields[ $merge_tag ]['require'] === '1' ) { |
|
752 | + if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ][ 'require' ] ) && $form_fields[ $merge_tag ][ 'require' ] === '1' ) { |
|
753 | 753 | |
754 | 754 | // Check if the field(s) are empty |
755 | 755 | if ( is_array( $value ) ) { |
756 | 756 | |
757 | 757 | // Loop through the data and check if any are empty |
758 | - foreach( $value as $field => $val ) { |
|
758 | + foreach ( $value as $field => $val ) { |
|
759 | 759 | |
760 | 760 | /** |
761 | 761 | * 'yikes-mailchimp-ignore-required-array-field' |
@@ -774,13 +774,13 @@ discard block |
||
774 | 774 | |
775 | 775 | // Set the merge label (e.g. MMERGE6) as the key so we don't get the same field multiple times |
776 | 776 | // (e.g. For arrays, like an address, where multiple address fields are empty) |
777 | - $missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ]; |
|
777 | + $missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ]; |
|
778 | 778 | } |
779 | 779 | } |
780 | 780 | |
781 | 781 | } else if ( empty( $value ) ) { |
782 | 782 | $field_is_missing = true; |
783 | - $missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ]; |
|
783 | + $missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ]; |
|
784 | 784 | } |
785 | 785 | } |
786 | 786 | } |
@@ -830,7 +830,7 @@ discard block |
||
830 | 830 | foreach ( $form_fields as $merge_tag => $field_data ) { |
831 | 831 | |
832 | 832 | // If an interest group and it's required |
833 | - if ( isset( $field_data['group_id'] ) && isset( $field_data['require'] ) && $field_data['require'] === '1' ) { |
|
833 | + if ( isset( $field_data[ 'group_id' ] ) && isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] === '1' ) { |
|
834 | 834 | |
835 | 835 | // Check if it was submitted (meaning, check if it's set in our $data array) |
836 | 836 | if ( ! isset( $data[ 'group-' . $merge_tag ] ) ) { |
@@ -892,30 +892,30 @@ discard block |
||
892 | 892 | } |
893 | 893 | |
894 | 894 | // Construct the API URL |
895 | - $url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER['REMOTE_ADDR'] ); |
|
895 | + $url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER[ 'REMOTE_ADDR' ] ); |
|
896 | 896 | $response = wp_remote_get( $url ); |
897 | - $response_body = json_decode( $response['body'], true ); |
|
897 | + $response_body = json_decode( $response[ 'body' ], true ); |
|
898 | 898 | |
899 | 899 | // Set up errors array |
900 | 900 | $recaptcha_errors = array(); |
901 | 901 | |
902 | 902 | // if we've hit an error, lets return the error! |
903 | - if ( true !== $response_body['success'] ) { |
|
903 | + if ( true !== $response_body[ 'success' ] ) { |
|
904 | 904 | |
905 | - if( isset( $response_body['error-codes'] ) ) { |
|
905 | + if ( isset( $response_body[ 'error-codes' ] ) ) { |
|
906 | 906 | |
907 | 907 | // Loop through response error codes |
908 | - foreach ( $response_body['error-codes'] as $error_code ) { |
|
908 | + foreach ( $response_body[ 'error-codes' ] as $error_code ) { |
|
909 | 909 | if ( 'missing-input-response' === $error_code ) { |
910 | 910 | $error_code = $this->handle_non_filled_recaptcha_message; |
911 | 911 | } |
912 | 912 | |
913 | 913 | // Add our error_code to the errors array |
914 | - $recaptcha_errors[] = $error_code; |
|
914 | + $recaptcha_errors[ ] = $error_code; |
|
915 | 915 | } |
916 | 916 | |
917 | 917 | } else { |
918 | - $recaptcha_errors[] = $this->generic_recaptcha_error_message; |
|
918 | + $recaptcha_errors[ ] = $this->generic_recaptcha_error_message; |
|
919 | 919 | } |
920 | 920 | |
921 | 921 | /** |
@@ -1023,7 +1023,7 @@ discard block |
||
1023 | 1023 | * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
1024 | 1024 | */ |
1025 | 1025 | public function handle_empty_fields_generic( $fields_array ) { |
1026 | - foreach( $fields_array as $field ) { |
|
1026 | + foreach ( $fields_array as $field ) { |
|
1027 | 1027 | if ( $field === null ) { |
1028 | 1028 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_fields_generic_message ); |
1029 | 1029 | } |
@@ -1089,7 +1089,7 @@ discard block |
||
1089 | 1089 | |
1090 | 1090 | // Append our 'send-update-email' link and text |
1091 | 1091 | $response .= $link_start_tag; |
1092 | - $response .= $this->handle_updating_existing_user_link_message; |
|
1092 | + $response .= $this->handle_updating_existing_user_link_message; |
|
1093 | 1093 | $response .= $link_close_tag; |
1094 | 1094 | |
1095 | 1095 | // Check for a user-defined message |
@@ -1112,14 +1112,14 @@ discard block |
||
1112 | 1112 | */ |
1113 | 1113 | protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) { |
1114 | 1114 | |
1115 | - switch( $slug ) { |
|
1115 | + switch ( $slug ) { |
|
1116 | 1116 | case 'already-subscribed': |
1117 | 1117 | |
1118 | 1118 | // Check if this error message exists |
1119 | - if ( isset( $this->error_messages['already-subscribed'] ) && ! empty( $this->error_messages['already-subscribed'] ) ) { |
|
1119 | + if ( isset( $this->error_messages[ 'already-subscribed' ] ) && ! empty( $this->error_messages[ 'already-subscribed' ] ) ) { |
|
1120 | 1120 | |
1121 | 1121 | // Check if the substring (that we replace) '[email]' is located in the string and replace it |
1122 | - $response_text = str_replace( '[email]', $this->email, $this->error_messages['already-subscribed'] ); |
|
1122 | + $response_text = str_replace( '[email]', $this->email, $this->error_messages[ 'already-subscribed' ] ); |
|
1123 | 1123 | } |
1124 | 1124 | |
1125 | 1125 | /** |
@@ -1138,13 +1138,13 @@ discard block |
||
1138 | 1138 | case 'update-link': |
1139 | 1139 | |
1140 | 1140 | // Check if this error message exists |
1141 | - if ( $data !== false && isset( $this->error_messages['update-link'] ) && ! empty( $this->error_messages['update-link'] ) ) { |
|
1141 | + if ( $data !== false && isset( $this->error_messages[ 'update-link' ] ) && ! empty( $this->error_messages[ 'update-link' ] ) ) { |
|
1142 | 1142 | |
1143 | 1143 | // Check if the substring (that we replace) '[link]' is located in the string and replace it |
1144 | - $response_text = str_replace( '[link]', $data['link_start_tag'], $this->error_messages['update-link'] ); |
|
1144 | + $response_text = str_replace( '[link]', $data[ 'link_start_tag' ], $this->error_messages[ 'update-link' ] ); |
|
1145 | 1145 | |
1146 | 1146 | // Remove [/link] |
1147 | - $response_text = str_replace( '[/link]', $data['link_close_tag'], $response_text ); |
|
1147 | + $response_text = str_replace( '[/link]', $data[ 'link_close_tag' ], $response_text ); |
|
1148 | 1148 | } |
1149 | 1149 | |
1150 | 1150 | /** |
@@ -1163,8 +1163,8 @@ discard block |
||
1163 | 1163 | case 'success': |
1164 | 1164 | |
1165 | 1165 | // 'success' is the user-defined success message for double opt-in |
1166 | - if ( isset( $this->error_messages['success'] ) && ! empty( $this->error_messages['success'] ) ) { |
|
1167 | - $response_text = $this->error_messages['success']; |
|
1166 | + if ( isset( $this->error_messages[ 'success' ] ) && ! empty( $this->error_messages[ 'success' ] ) ) { |
|
1167 | + $response_text = $this->error_messages[ 'success' ]; |
|
1168 | 1168 | } |
1169 | 1169 | |
1170 | 1170 | /** |
@@ -1183,8 +1183,8 @@ discard block |
||
1183 | 1183 | |
1184 | 1184 | case 'success-single-optin': |
1185 | 1185 | |
1186 | - if ( isset( $this->error_messages['success-single-optin'] ) && ! empty( $this->error_messages['success-single-optin'] ) ) { |
|
1187 | - $response_text = $this->error_messages['success-single-optin']; |
|
1186 | + if ( isset( $this->error_messages[ 'success-single-optin' ] ) && ! empty( $this->error_messages[ 'success-single-optin' ] ) ) { |
|
1187 | + $response_text = $this->error_messages[ 'success-single-optin' ]; |
|
1188 | 1188 | } |
1189 | 1189 | |
1190 | 1190 | /** |
@@ -1203,8 +1203,8 @@ discard block |
||
1203 | 1203 | |
1204 | 1204 | case 'success-resubscribed': |
1205 | 1205 | |
1206 | - if ( isset( $this->error_messages['success-resubscribed'] ) && ! empty( $this->error_messages['success-resubscribed'] ) ) { |
|
1207 | - $response_text = $this->error_messages['success-resubscribed']; |
|
1206 | + if ( isset( $this->error_messages[ 'success-resubscribed' ] ) && ! empty( $this->error_messages[ 'success-resubscribed' ] ) ) { |
|
1207 | + $response_text = $this->error_messages[ 'success-resubscribed' ]; |
|
1208 | 1208 | } |
1209 | 1209 | |
1210 | 1210 | /** |
@@ -1226,8 +1226,8 @@ discard block |
||
1226 | 1226 | $original_response_text = $response_text; |
1227 | 1227 | $user_defined_response_text = ''; |
1228 | 1228 | |
1229 | - if ( isset( $this->error_messages['general-error'] ) && ! empty( $this->error_messages['general-error'] ) ) { |
|
1230 | - $user_defined_response_text = $this->error_messages['general-error']; |
|
1229 | + if ( isset( $this->error_messages[ 'general-error' ] ) && ! empty( $this->error_messages[ 'general-error' ] ) ) { |
|
1230 | + $user_defined_response_text = $this->error_messages[ 'general-error' ]; |
|
1231 | 1231 | } |
1232 | 1232 | |
1233 | 1233 | /** |
@@ -1289,7 +1289,7 @@ discard block |
||
1289 | 1289 | } else { |
1290 | 1290 | global $process_submission_response; |
1291 | 1291 | |
1292 | - $process_submission_response = isset( $success_array['response'] ) ? $success_array['response'] : ''; // DEFAULT SUCCESS? |
|
1292 | + $process_submission_response = isset( $success_array[ 'response' ] ) ? $success_array[ 'response' ] : ''; // DEFAULT SUCCESS? |
|
1293 | 1293 | $process_submission_response = $this->wrap_form_submission_response( $process_submission_response, $is_success = true ); |
1294 | 1294 | } |
1295 | 1295 | } |
@@ -1342,8 +1342,8 @@ discard block |
||
1342 | 1342 | // Add additional fields we've been supplied |
1343 | 1343 | if ( ! empty( $additional_fields ) ) { |
1344 | 1344 | |
1345 | - foreach( $additional_fields as $key => $value ) { |
|
1346 | - $response_array[$key] = $value; |
|
1345 | + foreach ( $additional_fields as $key => $value ) { |
|
1346 | + $response_array[ $key ] = $value; |
|
1347 | 1347 | } |
1348 | 1348 | } |
1349 | 1349 | |
@@ -1374,20 +1374,20 @@ discard block |
||
1374 | 1374 | ); |
1375 | 1375 | |
1376 | 1376 | // Let's confirm we have a value before trying to use it |
1377 | - $redirect_setting = isset( $submission_settings['redirect_on_submission'] ) ? $submission_settings['redirect_on_submission'] : false; |
|
1377 | + $redirect_setting = isset( $submission_settings[ 'redirect_on_submission' ] ) ? $submission_settings[ 'redirect_on_submission' ] : false; |
|
1378 | 1378 | |
1379 | 1379 | // Check the redirect flag |
1380 | 1380 | if ( '1' === $redirect_setting ) { |
1381 | 1381 | |
1382 | 1382 | // Supply return array with default value of 1 |
1383 | - $redirect_array['redirection'] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data ); |
|
1383 | + $redirect_array[ 'redirection' ] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data ); |
|
1384 | 1384 | |
1385 | 1385 | // Let's confirm we have redirect_page/custom_redirect_url/new_window values |
1386 | - $redirect_page_setting = isset( $submission_settings['redirect_page'] ) ? $submission_settings['redirect_page'] : false; |
|
1387 | - $custom_redirect_setting = isset( $submission_settings['custom_redirect_url'] ) ? $submission_settings['custom_redirect_url'] : false; |
|
1388 | - $redirect_new_window = isset( $submission_settings['redirect_new_window'] ) ? $submission_settings['redirect_new_window'] : false; |
|
1386 | + $redirect_page_setting = isset( $submission_settings[ 'redirect_page' ] ) ? $submission_settings[ 'redirect_page' ] : false; |
|
1387 | + $custom_redirect_setting = isset( $submission_settings[ 'custom_redirect_url' ] ) ? $submission_settings[ 'custom_redirect_url' ] : false; |
|
1388 | + $redirect_new_window = isset( $submission_settings[ 'redirect_new_window' ] ) ? $submission_settings[ 'redirect_new_window' ] : false; |
|
1389 | 1389 | |
1390 | - $redirect_array['new_window'] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data ); |
|
1390 | + $redirect_array[ 'new_window' ] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data ); |
|
1391 | 1391 | |
1392 | 1392 | // Check if we're redirecting to a custom_url or just the redirect_page |
1393 | 1393 | $redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting; |
@@ -1412,9 +1412,9 @@ discard block |
||
1412 | 1412 | */ |
1413 | 1413 | $redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data ); |
1414 | 1414 | |
1415 | - $redirect_array['redirect_timer'] = $redirect_timer; |
|
1415 | + $redirect_array[ 'redirect_timer' ] = $redirect_timer; |
|
1416 | 1416 | |
1417 | - $redirect_array['redirect'] = $redirect_url; |
|
1417 | + $redirect_array[ 'redirect' ] = $redirect_url; |
|
1418 | 1418 | } |
1419 | 1419 | |
1420 | 1420 | return $redirect_array; |
@@ -11,16 +11,16 @@ discard block |
||
11 | 11 | */ |
12 | 12 | public function __construct() { |
13 | 13 | // ajax process form submission |
14 | - add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 ); |
|
15 | - add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 ); |
|
14 | + add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 ); |
|
15 | + add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 ); |
|
16 | 16 | |
17 | 17 | // ajax send update emails |
18 | - add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 ); |
|
19 | - add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 ); |
|
18 | + add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 ); |
|
19 | + add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 ); |
|
20 | 20 | |
21 | 21 | // increase submission count for a given form on successful submit |
22 | - add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 ); |
|
23 | - add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 ); |
|
22 | + add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 ); |
|
23 | + add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 ); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /* |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | * Increase the submission count for a given form. |
38 | 38 | */ |
39 | 39 | public function increase_submission_count() { |
40 | - $form_id = intval( $_POST['form_id'] ); |
|
40 | + $form_id = intval( $_POST[ 'form_id' ] ); |
|
41 | 41 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
42 | 42 | $form = $interface->get_form( $form_id ); |
43 | 43 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | // Update the form. |
50 | - $submission_count = isset( $form['submissions'] ) ? $form['submissions'] + 1 : 1; |
|
50 | + $submission_count = isset( $form[ 'submissions' ] ) ? $form[ 'submissions' ] + 1 : 1; |
|
51 | 51 | $interface->update_form_field( $form_id, 'submissions', $submission_count ); |
52 | 52 | |
53 | 53 | exit(); |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | @since v6.0.4.1 |
59 | 59 | */ |
60 | 60 | public function sendUpdateProfileEmail() { |
61 | - $user_email = filter_var( $_POST['user_email'], FILTER_SANITIZE_STRING ); |
|
61 | + $user_email = filter_var( $_POST[ 'user_email' ], FILTER_SANITIZE_STRING ); |
|
62 | 62 | $user_id = md5( $user_email ); |
63 | - $list_id = filter_var( $_POST['list_id'], FILTER_SANITIZE_STRING ); |
|
64 | - $form_id = filter_var( $_POST['form_id'], FILTER_SANITIZE_NUMBER_INT ); |
|
65 | - $page_id = filter_var( $_POST['page_id'], FILTER_SANITIZE_NUMBER_INT ); |
|
63 | + $list_id = filter_var( $_POST[ 'list_id' ], FILTER_SANITIZE_STRING ); |
|
64 | + $form_id = filter_var( $_POST[ 'form_id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
65 | + $page_id = filter_var( $_POST[ 'page_id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
66 | 66 | $full_site_url = get_bloginfo( 'url' ); |
67 | 67 | $manager = yikes_get_mc_api_manager(); |
68 | 68 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | 'class.public_ajax.php' |
80 | 80 | ); |
81 | 81 | $is_error = true; |
82 | - $errors[] = $list_details->get_error_message(); |
|
82 | + $errors[ ] = $list_details->get_error_message(); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | // Subscriber details API call. |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
89 | 89 | $error_logging->maybe_write_to_log( $subscriber_account_details->get_error_code(), __( 'Send Update Profile Email - Get Member Info.', 'yikes-inc-easy-mailchimp-extender' ), 'class.public_ajax.php' ); |
90 | 90 | $is_error = true; |
91 | - $errors[] = $subscriber_account_details->get_error_message(); |
|
91 | + $errors[ ] = $subscriber_account_details->get_error_message(); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | // Form details API call. |
@@ -96,22 +96,22 @@ discard block |
||
96 | 96 | if ( ! empty( $interface ) && method_exists( $interface, 'get_form' ) && ! empty( $form_id ) ) { |
97 | 97 | $form_data = $interface->get_form( $form_id ); |
98 | 98 | if ( ! empty( $form_data ) ) { |
99 | - if ( isset( $form_data['error_messages'] ) ) { |
|
99 | + if ( isset( $form_data[ 'error_messages' ] ) ) { |
|
100 | 100 | |
101 | - if ( isset( $form_data['error_messages']['email-body'] ) && ! empty( $form_data['error_messages']['email-body'] ) ) { |
|
102 | - $email_body = apply_filters( 'the_content', $form_data['error_messages']['email-body'] ); |
|
101 | + if ( isset( $form_data[ 'error_messages' ][ 'email-body' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-body' ] ) ) { |
|
102 | + $email_body = apply_filters( 'the_content', $form_data[ 'error_messages' ][ 'email-body' ] ); |
|
103 | 103 | } |
104 | 104 | |
105 | - if ( isset( $form_data['error_messages']['email-subject'] ) && ! empty( $form_data['error_messages']['email-subject'] ) ) { |
|
106 | - $email_subject = $form_data['error_messages']['email-subject']; |
|
105 | + if ( isset( $form_data[ 'error_messages' ][ 'email-subject' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-subject' ] ) ) { |
|
106 | + $email_subject = $form_data[ 'error_messages' ][ 'email-subject' ]; |
|
107 | 107 | } |
108 | 108 | |
109 | - if ( isset( $form_data['error_messages']['update-email-success'] ) && ! empty( $form_data['error_messages']['update-email-success'] ) ) { |
|
110 | - $update_email_success_message = $form_data['error_messages']['update-email-success']; |
|
109 | + if ( isset( $form_data[ 'error_messages' ][ 'update-email-success' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-success' ] ) ) { |
|
110 | + $update_email_success_message = $form_data[ 'error_messages' ][ 'update-email-success' ]; |
|
111 | 111 | } |
112 | 112 | |
113 | - if ( isset( $form_data['error_messages']['update-email-failure'] ) && ! empty( $form_data['error_messages']['update-email-failure'] ) ) { |
|
114 | - $update_email_failed_message = $form_data['error_messages']['update-email-failure']; |
|
113 | + if ( isset( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) ) { |
|
114 | + $update_email_failed_message = $form_data[ 'error_messages' ][ 'update-email-failure' ]; |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | } |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | // Construct the headers & email message content. |
135 | - $subscriber_id = $subscriber_account_details['unique_email_id']; |
|
136 | - $update_link_href = str_replace( '/subscribe', '/profile', $list_details['subscribe_url_long'] ); |
|
135 | + $subscriber_id = $subscriber_account_details[ 'unique_email_id' ]; |
|
136 | + $update_link_href = str_replace( '/subscribe', '/profile', $list_details[ 'subscribe_url_long' ] ); |
|
137 | 137 | $update_link_href = add_query_arg( 'e', $subscriber_id, $update_link_href ); |
138 | 138 | $update_link_tag = '<a href="' . $update_link_href . '">'; |
139 | - $headers = 'From: ' . $list_details['campaign_defaults']['from_name'] . ' <' . $list_details['campaign_defaults']['from_email'] . '>' . "\r\n"; |
|
139 | + $headers = 'From: ' . $list_details[ 'campaign_defaults' ][ 'from_name' ] . ' <' . $list_details[ 'campaign_defaults' ][ 'from_email' ] . '>' . "\r\n"; |
|
140 | 140 | $headers .= 'Content-type: text/html'; |
141 | 141 | |
142 | 142 | if ( ! isset( $email_subject ) ) { |
@@ -178,26 +178,26 @@ discard block |
||
178 | 178 | $email_body = str_replace( array( '[subscriber_id]', '[SUBSCRIBER_ID]' ), $subscriber_id, $email_body ); |
179 | 179 | |
180 | 180 | // We let the user use [form_name] for the form's name so replace [form_name] with the form's name. |
181 | - $email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data['form_name'], $email_body ); |
|
181 | + $email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data[ 'form_name' ], $email_body ); |
|
182 | 182 | |
183 | 183 | // We let the user use [fname] and [lname] so replace those. |
184 | - $email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details['merge_fields']['FNAME'] ) ? $subscriber_account_details['merge_fields']['FNAME'] : '', $email_body ); |
|
185 | - $email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details['merge_fields']['LNAME'] ) ? $subscriber_account_details['merge_fields']['LNAME'] : '', $email_body ); |
|
184 | + $email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] : '', $email_body ); |
|
185 | + $email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] : '', $email_body ); |
|
186 | 186 | |
187 | 187 | /* Confirm that the email was sent */ |
188 | 188 | if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $email_subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_body, $update_link_href ), $headers ) ) { |
189 | 189 | |
190 | 190 | $update_email_success_message = apply_filters( 'yikes-mailchimp-update-email-success-message', $update_email_success_message, $form_id, $user_email ); |
191 | - $submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
191 | + $submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
192 | 192 | $redirect_settings = Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler::handle_submission_response_success_redirect( $form_id, $submission_settings, $page_id ); |
193 | 193 | |
194 | 194 | wp_send_json_success( |
195 | 195 | array( |
196 | 196 | 'response_text' => '<div class="yikes-easy-mc-success-message">' . $update_email_success_message . '</div>', |
197 | - 'redirection' => $redirect_settings['redirection'], |
|
198 | - 'redirect' => $redirect_settings['redirect'], |
|
199 | - 'redirect_timer' => $redirect_settings['redirect_timer'], |
|
200 | - 'new_window' => $redirect_settings['new_window'], |
|
197 | + 'redirection' => $redirect_settings[ 'redirection' ], |
|
198 | + 'redirect' => $redirect_settings[ 'redirect' ], |
|
199 | + 'redirect_timer' => $redirect_settings[ 'redirect_timer' ], |
|
200 | + 'new_window' => $redirect_settings[ 'new_window' ], |
|
201 | 201 | ) |
202 | 202 | ); |
203 | 203 | } else { |
@@ -2,23 +2,23 @@ discard block |
||
2 | 2 | <?php |
3 | 3 | |
4 | 4 | // if an error was returned in the most recent query |
5 | - if( isset( $_GET['sql_error'] ) ) { |
|
5 | + if ( isset( $_GET[ 'sql_error' ] ) ) { |
|
6 | 6 | // if error logging is turned on, lets display a better error to help narrow things down |
7 | 7 | // lets also log things to the error log |
8 | - if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) { |
|
9 | - wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET['sql_error'] ) ) . '</p>' , __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
8 | + if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) { |
|
9 | + wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET[ 'sql_error' ] ) ) . '</p>', __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) ); |
|
10 | 10 | } else { |
11 | - wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>' ); |
|
11 | + wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>' ); |
|
12 | 12 | } |
13 | 13 | } |
14 | 14 | |
15 | 15 | /* Get The Form ID we need to edit */ |
16 | - if ( ! isset( $_GET['id'] ) ) { |
|
16 | + if ( ! isset( $_GET[ 'id' ] ) ) { |
|
17 | 17 | wp_die( __( 'Oh No!', 'yikes-inc-easy-mailchimp-extender' ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) ); |
18 | 18 | } |
19 | 19 | |
20 | 20 | // grab and store the form ID |
21 | - $form_id = (int) $_GET['id']; |
|
21 | + $form_id = (int) $_GET[ 'id' ]; |
|
22 | 22 | |
23 | 23 | // Get our form interface. |
24 | 24 | $form_interface = yikes_easy_mailchimp_extender_get_form_interface(); |
@@ -31,19 +31,19 @@ discard block |
||
31 | 31 | |
32 | 32 | // if the form was not found return an error |
33 | 33 | if ( empty( $form ) ) { |
34 | - wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> " , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ), __( 'debug settings page' , 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error' , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
34 | + wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> ", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ), __( 'debug settings page', 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) ); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | // set global form data, mainly for use in custom form field declarations |
38 | - $GLOBALS["form_data"] = $form; |
|
38 | + $GLOBALS[ "form_data" ] = $form; |
|
39 | 39 | |
40 | - $custom_styles = $form['custom_styles']; |
|
41 | - $optin_settings = $form['optin_settings']; |
|
42 | - $submission_settings = $form['submission_settings']; |
|
43 | - $error_messages = $form['error_messages']; |
|
40 | + $custom_styles = $form[ 'custom_styles' ]; |
|
41 | + $optin_settings = $form[ 'optin_settings' ]; |
|
42 | + $submission_settings = $form[ 'submission_settings' ]; |
|
43 | + $error_messages = $form[ 'error_messages' ]; |
|
44 | 44 | |
45 | - if ( isset( $form['form_settings'] ) ) { |
|
46 | - $form_settings = $form['form_settings']; |
|
45 | + if ( isset( $form[ 'form_settings' ] ) ) { |
|
46 | + $form_settings = $form[ 'form_settings' ]; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | // get defaults if none are saved in the database yet |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | // Get the merge fields |
89 | - $available_merge_variables = $list_handler->get_merge_fields( $form['list_id'] ); |
|
89 | + $available_merge_variables = $list_handler->get_merge_fields( $form[ 'list_id' ] ); |
|
90 | 90 | if ( is_wp_error( $available_merge_variables ) ) { |
91 | 91 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
92 | 92 | $error_logging->maybe_write_to_log( |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | // get the interest group data |
101 | - $interest_groupings = $list_handler->get_interest_categories( $form['list_id'] ); |
|
101 | + $interest_groupings = $list_handler->get_interest_categories( $form[ 'list_id' ] ); |
|
102 | 102 | if ( is_wp_error( $interest_groupings ) ) { |
103 | 103 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
104 | 104 | $error_logging->maybe_write_to_log( |
@@ -115,22 +115,22 @@ discard block |
||
115 | 115 | add_query_arg( |
116 | 116 | array( |
117 | 117 | 'action' => 'yikes-easy-mc-update-form', |
118 | - 'nonce' => wp_create_nonce( 'update-mailchimp-form'.-$form['id'] ) |
|
118 | + 'nonce' => wp_create_nonce( 'update-mailchimp-form' . -$form[ 'id' ] ) |
|
119 | 119 | ) |
120 | 120 | ) |
121 | 121 | ); |
122 | 122 | /* Display Our Form */ |
123 | 123 | ?> |
124 | 124 | <!-- Freddie Logo --> |
125 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
125 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
126 | 126 | |
127 | - <h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form['form_name']; ?></h1> |
|
127 | + <h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form[ 'form_name' ]; ?></h1> |
|
128 | 128 | |
129 | 129 | <!-- Settings Page Description --> |
130 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
130 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
131 | 131 | |
132 | 132 | <?php |
133 | - if ( isset( $_REQUEST['updated-form'] ) && $_REQUEST['updated-form'] == 'true' ) { |
|
133 | + if ( isset( $_REQUEST[ 'updated-form' ] ) && $_REQUEST[ 'updated-form' ] == 'true' ) { |
|
134 | 134 | ?> |
135 | 135 | <div class="updated manage-form-admin-notice"> |
136 | 136 | <p><?php _e( 'Opt-in form successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -154,15 +154,15 @@ discard block |
||
154 | 154 | <div class="inside"> |
155 | 155 | |
156 | 156 | <label for="form-name"> |
157 | - <h3 class="bg-transparent"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
158 | - <input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form['form_name'] ) ); ?>" class="widefat" /> |
|
159 | - <p class="description"><?php _e( "The title of this signup form." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
157 | + <h3 class="bg-transparent"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
158 | + <input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form[ 'form_name' ] ) ); ?>" class="widefat" /> |
|
159 | + <p class="description"><?php _e( "The title of this signup form.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
160 | 160 | </label> |
161 | 161 | |
162 | 162 | <label for="form-description"> |
163 | - <h3 class="bg-transparent"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
164 | - <textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form['form_description'] ) ? stripslashes( esc_textarea( $form['form_description'] ) ) : ''; ?></textarea> |
|
165 | - <p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
163 | + <h3 class="bg-transparent"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
164 | + <textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form[ 'form_description' ] ) ? stripslashes( esc_textarea( $form[ 'form_description' ] ) ) : ''; ?></textarea> |
|
165 | + <p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
166 | 166 | <p class="description"><?php printf( __( 'To display the number of subscribers for the list associated with this form, use %s in the form description field above.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes-mailchimp-subscriber-count]</code>' ); ?><p> |
167 | 167 | </label> |
168 | 168 | |
@@ -178,16 +178,16 @@ discard block |
||
178 | 178 | |
179 | 179 | <ul id="yikes_easy_mc_toolbar_links"> |
180 | 180 | <li class="hidden_setting_list"> |
181 | - <a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
181 | + <a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
182 | 182 | <div class="selected_setting_triangle"></div> |
183 | 183 | </li> |
184 | 184 | <li class="hidden_setting_list"> |
185 | - <a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
185 | + <a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
186 | 186 | </li> |
187 | 187 | <li class="hidden_setting_list"> |
188 | - <a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
188 | + <a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
189 | 189 | </li> |
190 | - <?php do_action( 'yikes-mailchimp-edit-form-section-links' , $form ); ?> |
|
190 | + <?php do_action( 'yikes-mailchimp-edit-form-section-links', $form ); ?> |
|
191 | 191 | </ul> |
192 | 192 | |
193 | 193 | </div> |
@@ -208,22 +208,22 @@ discard block |
||
208 | 208 | <div class="meta-box-sortables ui-sortable"> |
209 | 209 | <div class="postbox yikes-easy-mc-postbox"> |
210 | 210 | <!-- container title --> |
211 | - <h3 class="edit-form-title" id="form-builder-div" data-list-id="<?php echo $form['list_id'] ?>" ><?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
212 | - <p id="edit-form-description" class="description edit-form-description-form-builder"><?php _e( 'Click a field to show its advanced options or drag fields to re-arrange them. Click <span class="dashicons dashicons-edit"></span> to edit a field label. Make sure you hit "Update Form" to save all of your changes.' , 'yikes-inc-easy-mailchimp-extender' );?></p> |
|
211 | + <h3 class="edit-form-title" id="form-builder-div" data-list-id="<?php echo $form[ 'list_id' ] ?>" ><?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
212 | + <p id="edit-form-description" class="description edit-form-description-form-builder"><?php _e( 'Click a field to show its advanced options or drag fields to re-arrange them. Click <span class="dashicons dashicons-edit"></span> to edit a field label. Make sure you hit "Update Form" to save all of your changes.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
213 | 213 | <div id="form-builder-container" class="inside"> |
214 | 214 | <!-- #poststuff --> |
215 | - <?php echo $this->generate_form_editor( $form['fields'], $form['list_id'] , $available_merge_variables , isset( $interest_groupings ) ? $interest_groupings : array() ); ?> |
|
215 | + <?php echo $this->generate_form_editor( $form[ 'fields' ], $form[ 'list_id' ], $available_merge_variables, isset( $interest_groupings ) ? $interest_groupings : array() ); ?> |
|
216 | 216 | </div> |
217 | 217 | |
218 | 218 | <!-- Bulk Delete Form Fields --> |
219 | - <a href="#" class="clear-form-fields" <?php if( isset( $form['fields'] ) && count( $form['fields'] ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
219 | + <a href="#" class="clear-form-fields" <?php if ( isset( $form[ 'fields' ] ) && count( $form[ 'fields' ] ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
220 | 220 | |
221 | 221 | <?php |
222 | - $display_none = ( isset( $form['fields'] ) && count( $form['fields'] ) <= 0 ) ? 'display:none;' : ''; |
|
222 | + $display_none = ( isset( $form[ 'fields' ] ) && count( $form[ 'fields' ] ) <= 0 ) ? 'display:none;' : ''; |
|
223 | 223 | ?> |
224 | 224 | |
225 | 225 | <!-- Save Fields Button --> |
226 | - <?php submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;'.$display_none ) ); ?> |
|
226 | + <?php submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;' . $display_none ) ); ?> |
|
227 | 227 | |
228 | 228 | <!-- .inside --> |
229 | 229 | </div> |
@@ -236,15 +236,15 @@ discard block |
||
236 | 236 | <div id="postbox-container-1" class="postbox-container"> |
237 | 237 | <div class="meta-box-sortables"> |
238 | 238 | <div class="postbox yikes-easy-mc-postbox"> |
239 | - <h3 class="edit-form-title"><span><?php _e( "Form Fields & Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
239 | + <h3 class="edit-form-title"><span><?php _e( "Form Fields & Interest Groups", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
240 | 240 | <div class="inside"> |
241 | 241 | |
242 | 242 | <h3 class="nav-tab-wrapper mv_ig_list"> |
243 | - <a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
244 | - <?php if( !isset( $merge_variable_error ) ) { ?> |
|
245 | - <a href="#" class="nav-tab"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
243 | + <a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
244 | + <?php if ( ! isset( $merge_variable_error ) ) { ?> |
|
245 | + <a href="#" class="nav-tab"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
246 | 246 | <?php } else { ?> |
247 | - <a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist" , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
247 | + <a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist", 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
248 | 248 | <?php } ?> |
249 | 249 | </h3> |
250 | 250 | |
@@ -252,11 +252,11 @@ discard block |
||
252 | 252 | |
253 | 253 | <div id="merge-variables-container" class="list-container"> |
254 | 254 | <?php |
255 | - if( ! isset( $merge_variable_error ) ) { |
|
255 | + if ( ! isset( $merge_variable_error ) ) { |
|
256 | 256 | // build a list of available merge variables, |
257 | 257 | // but exclude the ones already assigned to the form |
258 | - echo '<p class="description">' . __( "Select the fields below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
259 | - $this->build_available_merge_vars( $form['fields'] , $available_merge_variables ); |
|
258 | + echo '<p class="description">' . __( "Select the fields below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
259 | + $this->build_available_merge_vars( $form[ 'fields' ], $available_merge_variables ); |
|
260 | 260 | } else { |
261 | 261 | echo $merge_variable_error; |
262 | 262 | } |
@@ -265,14 +265,14 @@ discard block |
||
265 | 265 | |
266 | 266 | <div id="interest-groups-container" class="list-container"> |
267 | 267 | <?php |
268 | - if( isset( $interest_groupings ) && ! isset( $interest_groupings['error'] ) ) { |
|
268 | + if ( isset( $interest_groupings ) && ! isset( $interest_groupings[ 'error' ] ) ) { |
|
269 | 269 | // build a list of available merge variables, |
270 | 270 | // but exclude the ones already assigned to the form |
271 | - echo '<p class="description">' . __( "Select an interest group below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
271 | + echo '<p class="description">' . __( "Select an interest group below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
272 | 272 | // $this->build_available_merge_vars( $form['fields'] , $available_merge_variables ); |
273 | - $this->build_available_interest_groups( $form['fields'] , $interest_groupings , $form['list_id'] ); |
|
273 | + $this->build_available_interest_groups( $form[ 'fields' ], $interest_groupings, $form[ 'list_id' ] ); |
|
274 | 274 | } else { |
275 | - echo '<p class="description">' . $interest_groupings['error'] . '</p>'; |
|
275 | + echo '<p class="description">' . $interest_groupings[ 'error' ] . '</p>'; |
|
276 | 276 | } |
277 | 277 | ?> |
278 | 278 | </div> |
@@ -305,19 +305,19 @@ discard block |
||
305 | 305 | <div id="post-body-content"> |
306 | 306 | <div class="meta-box-sortables ui-sortable"> |
307 | 307 | <div class="postbox yikes-easy-mc-postbox"> |
308 | - <h3 class="edit-form-title"><span><?php _e( "Additional Form Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
308 | + <h3 class="edit-form-title"><span><?php _e( "Additional Form Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
309 | 309 | |
310 | 310 | <div class="inside form-settings-container"> |
311 | 311 | |
312 | - <p class="edit-form-description"><?php _e( "Adjust some additional form settings below." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
312 | + <p class="edit-form-description"><?php _e( "Adjust some additional form settings below.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
313 | 313 | |
314 | 314 | <!-- begin form classes section --> |
315 | 315 | <strong class="section-title first"><?php _e( 'Overall Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
316 | 316 | <section class="section-interior"> |
317 | 317 | |
318 | 318 | <!-- form classes --> |
319 | - <label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
320 | - <input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings['yikes-easy-mc-form-class-names']; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" > |
|
319 | + <label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
320 | + <input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings[ 'yikes-easy-mc-form-class-names' ]; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" > |
|
321 | 321 | <p class="description"><?php printf( __( 'Add additional class names to the %s element.', 'yikes-inc-easy-mailchimp-extender' ), '<code>' . htmlentities( '<form>' ) . '</code>' ); ?></p> |
322 | 322 | </label> |
323 | 323 | |
@@ -330,12 +330,12 @@ discard block |
||
330 | 330 | |
331 | 331 | <!-- setup the checked state here --> |
332 | 332 | <!-- inline form --> |
333 | - <strong><?php _e( 'Inline Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
333 | + <strong><?php _e( 'Inline Form', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
334 | 334 | <label class="inline-form-label"> |
335 | - <input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
335 | + <input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
336 | 336 | </label> |
337 | 337 | <label class="inline-form-label"> |
338 | - <input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
338 | + <input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
339 | 339 | </label> |
340 | 340 | <p class="description"><?php _e( 'Programatically setup this form so that all fields are on the same line.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
341 | 341 | <p class="description"><?php printf( __( 'If you are having issues with your theme not displaying the inline form properly, please see the following %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://yikesplugins.com/support/knowledge-base/my-form-fields-are-not-fully-inline-after-enabling-the-inline-form-option-how-come/" target="_blank">' . __( 'knowledge base article', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></p> |
@@ -348,21 +348,21 @@ discard block |
||
348 | 348 | <section class="section-interior"> |
349 | 349 | |
350 | 350 | <!-- Submit button type --> |
351 | - <strong><?php _e( 'Submit Button Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
351 | + <strong><?php _e( 'Submit Button Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
352 | 352 | <label class="inline-form-label"> |
353 | - <input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
353 | + <input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
354 | 354 | </label> |
355 | 355 | <label class="inline-form-label"> |
356 | - <input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
356 | + <input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
357 | 357 | </label> |
358 | 358 | <p class="description"><?php _e( 'Select the submit button type for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
359 | 359 | <!-- end submit button type --> |
360 | 360 | |
361 | 361 | <!-- Text submit button type --> |
362 | - <section class="submit-button-type-text nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'image' ) { echo ' hidden'; } ?>"> |
|
362 | + <section class="submit-button-type-text nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'image' ) { echo ' hidden'; } ?>"> |
|
363 | 363 | <!-- submit button text --> |
364 | - <label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
365 | - <input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings['yikes-easy-mc-submit-button-text']; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
364 | + <label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
365 | + <input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-text' ]; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
366 | 366 | <p class="description"><?php printf( __( 'Set the submit button text. Leaving this blank will default to %s.', 'yikes-inc-easy-mailchimp-extender' ), '"' . __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ) . '"' ); ?></p> |
367 | 367 | |
368 | 368 | <p class="description"><?php _e( 'The submit button text set above, can be overwritten on a per-form basis using shortcodes.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -371,9 +371,9 @@ discard block |
||
371 | 371 | <!-- end text submit button type --> |
372 | 372 | |
373 | 373 | <!-- Image submit button type --> |
374 | - <section class="submit-button-type-image nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'text' ) { echo ' hidden'; } ?>"> |
|
375 | - <label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
376 | - <input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings['yikes-easy-mc-submit-button-image']; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
374 | + <section class="submit-button-type-image nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'text' ) { echo ' hidden'; } ?>"> |
|
375 | + <label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
376 | + <input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-image' ]; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
377 | 377 | <p class="description"><?php _e( 'Enter the URL of an image you would like to use as the submit button for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
378 | 378 | </label> |
379 | 379 | </section> |
@@ -381,8 +381,8 @@ discard block |
||
381 | 381 | |
382 | 382 | |
383 | 383 | <!-- submit button classes --> |
384 | - <label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
385 | - <input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings['yikes-easy-mc-submit-button-classes']; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" > |
|
384 | + <label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
385 | + <input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-classes' ]; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" > |
|
386 | 386 | <p class="description"><?php _e( 'Add custom classes to the submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
387 | 387 | </label> |
388 | 388 | <!-- end submit button classes --> |
@@ -395,45 +395,45 @@ discard block |
||
395 | 395 | <section class="section-interior"> |
396 | 396 | <!-- Schedule form --> |
397 | 397 | <label class="inline-form-label"> |
398 | - <input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings['yikes-easy-mc-form-schedule'], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
398 | + <input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-schedule' ], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
399 | 399 | </label> |
400 | 400 | <p class="description" style="margin-bottom:0;"><?php _e( 'Set a time period that this form should be active on your site. (mm/dd/yyyy)', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
401 | 401 | <p class="description" style="margin: 0 0 .5em 0;"><?php _e( 'Once the end date & time have passed, users will no longer be able to signup for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
402 | 402 | <!-- Start Date Limitation Nested --> |
403 | - <section class="date-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?>"> |
|
403 | + <section class="date-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?>"> |
|
404 | 404 | <!-- Start Date --> |
405 | - <label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
406 | - <input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo ! empty($form_settings['yikes-easy-mc-form-restriction-start'] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-start'] ) : ''; ?>" > |
|
405 | + <label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
406 | + <input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) : ''; ?>" > |
|
407 | 407 | <?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?> |
408 | 408 | </label> |
409 | 409 | |
410 | 410 | <!-- Start Time --> |
411 | - <label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
412 | - <input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo ! empty( $form_settings['yikes-easy-mc-form-restriction-start'] ) ? date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-start'] ) : ''; ?>" > |
|
411 | + <label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
412 | + <input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) ? date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) : ''; ?>" > |
|
413 | 413 | </label> |
414 | 414 | <p class="description"><?php _e( 'Set the dates that this form should display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
415 | 415 | </section> |
416 | 416 | <!-- end Start Date Limitation Nested --> |
417 | 417 | |
418 | 418 | <!-- End Date Limitation Nested --> |
419 | - <section class="date-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?> last"> |
|
419 | + <section class="date-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?> last"> |
|
420 | 420 | <!-- End Date --> |
421 | - <label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
422 | - <input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo ! empty( $form_settings['yikes-easy-mc-form-restriction-end'] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-end'] ) : ''; ?>" > |
|
421 | + <label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
422 | + <input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) : ''; ?>" > |
|
423 | 423 | <?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?> |
424 | 424 | </label> |
425 | 425 | |
426 | 426 | <!-- End Time --> |
427 | - <label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
428 | - <input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo ! empty( $form_settings['yikes-easy-mc-form-restriction-end'] ) ? date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-end'] ) : ''; ?>" > |
|
427 | + <label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
428 | + <input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) ? date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) : ''; ?>" > |
|
429 | 429 | </label> |
430 | 430 | <p class="description"><?php _e( 'Set the dates that this form should no longer display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
431 | 431 | |
432 | 432 | <!-- Form pending message --> |
433 | - <label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
433 | + <label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
434 | 434 | <?php |
435 | 435 | wp_editor( |
436 | - $form_settings['yikes-easy-mc-form-restriction-pending-message'], |
|
436 | + $form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ], |
|
437 | 437 | 'yikes-easy-mc-form-restriction-pending-message', |
438 | 438 | array( |
439 | 439 | 'editor_class' => 'yikes-easy-mc-form-restriction-pending-message', |
@@ -445,10 +445,10 @@ discard block |
||
445 | 445 | <p class="description"><?php _e( 'Set the message that should display prior to the form being active.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
446 | 446 | |
447 | 447 | <!-- form expired message --> |
448 | - <label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
448 | + <label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
449 | 449 | <?php |
450 | 450 | wp_editor( |
451 | - $form_settings['yikes-easy-mc-form-restriction-expired-message'], |
|
451 | + $form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ], |
|
452 | 452 | 'yikes-easy-mc-form-restriction-expired-message', |
453 | 453 | array( |
454 | 454 | 'editor_class' => 'yikes-easy-mc-form-restriction-expired-message', |
@@ -463,16 +463,16 @@ discard block |
||
463 | 463 | |
464 | 464 | <!-- Require Users to be Logged In --> |
465 | 465 | <label class="inline-form-label"> |
466 | - <input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings['yikes-easy-mc-form-login-required'], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
466 | + <input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-login-required' ], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
467 | 467 | </label> |
468 | 468 | <p class="description"><?php _e( 'Require users to be logged in before they can view and submit this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
469 | 469 | |
470 | 470 | <!-- Require Login Message --> |
471 | - <section class="login-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-login-required'] == '0' ) { echo ' hidden'; } ?>"> |
|
472 | - <label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
471 | + <section class="login-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-login-required' ] == '0' ) { echo ' hidden'; } ?>"> |
|
472 | + <label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
473 | 473 | <?php |
474 | 474 | wp_editor( |
475 | - $form_settings['yikes-easy-mc-form-restriction-login-message'], |
|
475 | + $form_settings[ 'yikes-easy-mc-form-restriction-login-message' ], |
|
476 | 476 | 'yikes-easy-mc-form-restriction-login-message', |
477 | 477 | array( |
478 | 478 | 'editor_class' => 'yikes-easy-mc-form-restriction-login-message', |
@@ -501,14 +501,14 @@ discard block |
||
501 | 501 | <div id="postbox-container-1" class="postbox-container"> |
502 | 502 | <div class="meta-box-sortables"> |
503 | 503 | <div class="postbox yikes-easy-mc-postbox"> |
504 | - <h3 class="edit-form-title"><span><?php _e( "Form Settings Explained" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
504 | + <h3 class="edit-form-title"><span><?php _e( "Form Settings Explained", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
505 | 505 | <div class="inside"> |
506 | 506 | |
507 | 507 | <ul> |
508 | - <li><strong><?php _e( 'Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
509 | - <li><strong><?php _e( 'Form Layout' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
510 | - <li><strong><?php _e( 'Submit Button' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to assign additional classes to your submit button - ensuring it fits better into your theme.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
511 | - <li><strong><?php _e( 'Form Restrictions' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!' , 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
508 | + <li><strong><?php _e( 'Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.', 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
509 | + <li><strong><?php _e( 'Form Layout', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.', 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
510 | + <li><strong><?php _e( 'Submit Button', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to assign additional classes to your submit button - ensuring it fits better into your theme.', 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
511 | + <li><strong><?php _e( 'Form Restrictions', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!', 'yikes-inc-easy-mailchimp-extender' ); ?></li> |
|
512 | 512 | </ul> |
513 | 513 | |
514 | 514 | </div> |
@@ -536,78 +536,78 @@ discard block |
||
536 | 536 | <div id="post-body-content"> |
537 | 537 | <div class="meta-box-sortables ui-sortable"> |
538 | 538 | <div class="postbox yikes-easy-mc-postbox"> |
539 | - <h3 class="edit-form-title"><span><?php _e( "Custom Messages" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
539 | + <h3 class="edit-form-title"><span><?php _e( "Custom Messages", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
540 | 540 | |
541 | 541 | <div class="inside error-message-container"> |
542 | 542 | <?php |
543 | 543 | // build our default options |
544 | 544 | $error_message_array = array( |
545 | - 'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ), |
|
546 | - 'success-single-optin' => __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' ), |
|
545 | + 'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ), |
|
546 | + 'success-single-optin' => __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' ), |
|
547 | 547 | 'success-resubscribed' => __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' ), |
548 | - 'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ), |
|
549 | - 'email-exists-error' => __( "The email you entered is already a subscriber to this list." , 'yikes-inc-easy-mailchimp-extender' ), |
|
548 | + 'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), |
|
549 | + 'email-exists-error' => __( "The email you entered is already a subscriber to this list.", 'yikes-inc-easy-mailchimp-extender' ), |
|
550 | 550 | 'update-link' => __( "You're already subscribed. To update your MailChimp profile, please [link]click to send yourself an update link[/link].", 'yikes-inc-easy-mailchimp-extender' ), |
551 | 551 | 'email-subject' => __( 'MailChimp Profile Update', 'yikes-inc-easy-mailchimp-extender' ), |
552 | 552 | 'update-email-success' => sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '✔' ), |
553 | 553 | 'update-email-failure' => sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '✕' ), |
554 | 554 | |
555 | 555 | ); |
556 | - $global_error_messages = get_option( 'yikes-easy-mc-global-error-messages' , $error_message_array ); |
|
556 | + $global_error_messages = get_option( 'yikes-easy-mc-global-error-messages', $error_message_array ); |
|
557 | 557 | ?> |
558 | - <p class="edit-form-description"><?php _e( "Customize the response messages for this form. Leave the field blank to use the default message. The messages shown below depend on the Opt-in Settings chosen." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
558 | + <p class="edit-form-description"><?php _e( "Customize the response messages for this form. Leave the field blank to use the default message. The messages shown below depend on the Opt-in Settings chosen.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
559 | 559 | |
560 | 560 | <!-- Success Message (refactored @ 6.3.0 for double optin) --> |
561 | - <label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success: Double opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
562 | - <input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages['success'] ) ? stripslashes( esc_html( $error_messages['success'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success']; ?>" > |
|
561 | + <label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success: Double opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
562 | + <input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages[ 'success' ] ) ? stripslashes( esc_html( $error_messages[ 'success' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success' ]; ?>" > |
|
563 | 563 | </label> |
564 | 564 | <!-- Success Message (for single optin) --> |
565 | - <label for="yikes-easy-mc-success-single-optin-message"><strong><?php _e( 'Success: Single opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
566 | - <input type="text" class="widefat" name="yikes-easy-mc-success-single-optin-message" id="yikes-easy-mc-success-single-optin-message" value="<?php echo isset( $error_messages['success-single-optin'] ) ? stripslashes( esc_html( $error_messages['success-single-optin'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success-single-optin']; ?>" > |
|
565 | + <label for="yikes-easy-mc-success-single-optin-message"><strong><?php _e( 'Success: Single opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
566 | + <input type="text" class="widefat" name="yikes-easy-mc-success-single-optin-message" id="yikes-easy-mc-success-single-optin-message" value="<?php echo isset( $error_messages[ 'success-single-optin' ] ) ? stripslashes( esc_html( $error_messages[ 'success-single-optin' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success-single-optin' ]; ?>" > |
|
567 | 567 | </label> |
568 | 568 | <!-- Resubscribing users when updating your profile via the form is allowed --> |
569 | - <label for="yikes-easy-mc-user-resubscribed-success-message"><strong><?php _e( 'Success: Re-subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
570 | - <input type="text" class="widefat" name="yikes-easy-mc-user-resubscribed-success-message" id="yikes-easy-mc-user-resubscribed-success-message" value="<?php echo isset( $error_messages['success-resubscribed'] ) ? stripslashes( esc_html( $error_messages['success-resubscribed'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success-resubscribed']; ?>"> |
|
569 | + <label for="yikes-easy-mc-user-resubscribed-success-message"><strong><?php _e( 'Success: Re-subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
570 | + <input type="text" class="widefat" name="yikes-easy-mc-user-resubscribed-success-message" id="yikes-easy-mc-user-resubscribed-success-message" value="<?php echo isset( $error_messages[ 'success-resubscribed' ] ) ? stripslashes( esc_html( $error_messages[ 'success-resubscribed' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success-resubscribed' ]; ?>"> |
|
571 | 571 | </label> |
572 | 572 | |
573 | 573 | <!-- Click the link to update user profile etc. etc. --> |
574 | - <label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Success: Re-subscriber with link to email profile update message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
575 | - <input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages['update-link'] ) ? stripslashes( esc_html( $error_messages['update-link'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-link']; ?>"> |
|
574 | + <label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Success: Re-subscriber with link to email profile update message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
575 | + <input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages[ 'update-link' ] ) ? stripslashes( esc_html( $error_messages[ 'update-link' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-link' ]; ?>"> |
|
576 | 576 | </label> |
577 | 577 | |
578 | 578 | <!-- Email Address is already subscribed --> |
579 | - <label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Error: Re-subscribers not permitted' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
580 | - <input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages['already-subscribed'] ) ? stripslashes( esc_html( $error_messages['already-subscribed'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['email-exists-error']; ?>"> |
|
579 | + <label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Error: Re-subscribers not permitted', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
580 | + <input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages[ 'already-subscribed' ] ) ? stripslashes( esc_html( $error_messages[ 'already-subscribed' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'email-exists-error' ]; ?>"> |
|
581 | 581 | </label> |
582 | 582 | |
583 | 583 | <!-- Update email successfully sent --> |
584 | - <label for="yikes-easy-mc-update-email-successful"><strong><?php _e( 'Success: Update email successfully sent' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
585 | - <input type="text" class="widefat" name="yikes-easy-mc-update-email-successful" id="yikes-easy-mc-update-email-successful" value="<?php echo isset( $error_messages['update-email-success'] ) ? stripslashes( esc_attr( $error_messages['update-email-success'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-email-success']; ?>" > |
|
584 | + <label for="yikes-easy-mc-update-email-successful"><strong><?php _e( 'Success: Update email successfully sent', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
585 | + <input type="text" class="widefat" name="yikes-easy-mc-update-email-successful" id="yikes-easy-mc-update-email-successful" value="<?php echo isset( $error_messages[ 'update-email-success' ] ) ? stripslashes( esc_attr( $error_messages[ 'update-email-success' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-email-success' ]; ?>" > |
|
586 | 586 | </label> |
587 | 587 | |
588 | 588 | <!-- Update email failed to send --> |
589 | - <label for="yikes-easy-mc-update-email-failure"><strong><?php _e( 'Error: Update email failed to send' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
590 | - <input type="text" class="widefat" name="yikes-easy-mc-update-email-failure" id="yikes-easy-mc-update-email-failure" value="<?php echo isset( $error_messages['update-email-failure'] ) ? stripslashes( esc_attr( $error_messages['update-email-failure'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-email-failure']; ?>" > |
|
589 | + <label for="yikes-easy-mc-update-email-failure"><strong><?php _e( 'Error: Update email failed to send', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
590 | + <input type="text" class="widefat" name="yikes-easy-mc-update-email-failure" id="yikes-easy-mc-update-email-failure" value="<?php echo isset( $error_messages[ 'update-email-failure' ] ) ? stripslashes( esc_attr( $error_messages[ 'update-email-failure' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-email-failure' ]; ?>" > |
|
591 | 591 | </label> |
592 | 592 | |
593 | 593 | <!-- General Error Message --> |
594 | - <label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'Error: General' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
595 | - <input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages['general-error'] ) ? stripslashes( esc_html( $error_messages['general-error'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['general-error']; ?>" > |
|
594 | + <label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'Error: General', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
595 | + <input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages[ 'general-error' ] ) ? stripslashes( esc_html( $error_messages[ 'general-error' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'general-error' ]; ?>" > |
|
596 | 596 | </label> |
597 | 597 | |
598 | 598 | <!-- Email Section --> |
599 | 599 | |
600 | 600 | <hr> |
601 | 601 | <div class="yikes-easy-mc-custom-messages-email-section"> |
602 | - <p class="edit-form-description"><?php _e( 'Customize the profile verification email sent to re-subscribers. Leave the text unedited to use the default message.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
602 | + <p class="edit-form-description"><?php _e( 'Customize the profile verification email sent to re-subscribers. Leave the text unedited to use the default message.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
603 | 603 | <!-- Email Subject --> |
604 | - <label for="yikes-easy-mc-user-email-subject"><strong><?php _e( 'Email Subject' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
605 | - <input type="text" class="widefat" name="yikes-easy-mc-user-email-subject" id="yikes-easy-mc-user-email-subject" value="<?php echo isset( $error_messages['email-subject'] ) ? stripslashes( esc_html( $error_messages['email-subject'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['email-subject']; ?>"> |
|
604 | + <label for="yikes-easy-mc-user-email-subject"><strong><?php _e( 'Email Subject', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
605 | + <input type="text" class="widefat" name="yikes-easy-mc-user-email-subject" id="yikes-easy-mc-user-email-subject" value="<?php echo isset( $error_messages[ 'email-subject' ] ) ? stripslashes( esc_html( $error_messages[ 'email-subject' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'email-subject' ]; ?>"> |
|
606 | 606 | </label> |
607 | 607 | <!-- Email Body --> |
608 | - <label for="yikes-easy-mc-user-email-body"><strong><?php _e( 'Email Body' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
608 | + <label for="yikes-easy-mc-user-email-body"><strong><?php _e( 'Email Body', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
609 | 609 | <?php |
610 | - $editor_content = ( isset( $error_messages['email-body'] ) && ! empty( $error_messages['email-body'] ) ) ? $error_messages['email-body'] : Yikes_Inc_Easy_Mailchimp_Forms_Admin::generate_default_email_body(); |
|
610 | + $editor_content = ( isset( $error_messages[ 'email-body' ] ) && ! empty( $error_messages[ 'email-body' ] ) ) ? $error_messages[ 'email-body' ] : Yikes_Inc_Easy_Mailchimp_Forms_Admin::generate_default_email_body(); |
|
611 | 611 | wp_editor( $editor_content, 'yikes-easy-mc-user-email-body', array( 'textarea_id' => 'yikes-easy-mc-user-email-body' ) ); |
612 | 612 | ?> |
613 | 613 | </label> |
@@ -717,7 +717,7 @@ discard block |
||
717 | 717 | <li> |
718 | 718 | <?php |
719 | 719 | /* translators: First two placeholders are HTML <code> tags, third one is the form's name */ |
720 | - echo sprintf( esc_html__( '%1$1s[form_name]%2$2s displays your form\'s name (i.e. %3$3s).', 'yikes-inc-easy-mailchimp-extender' ), '<code>', '</code>', esc_html( $form['form_name'] ) ); |
|
720 | + echo sprintf( esc_html__( '%1$1s[form_name]%2$2s displays your form\'s name (i.e. %3$3s).', 'yikes-inc-easy-mailchimp-extender' ), '<code>', '</code>', esc_html( $form[ 'form_name' ] ) ); |
|
721 | 721 | ?> |
722 | 722 | </li> |
723 | 723 | <li> |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | </label> |
752 | 752 | <!-- End Error Messages --> |
753 | 753 | |
754 | - <?php do_action( 'yikes-mailchimp-edit-form-sections' , $form ); ?> |
|
754 | + <?php do_action( 'yikes-mailchimp-edit-form-sections', $form ); ?> |
|
755 | 755 | |
756 | 756 | </div> |
757 | 757 | <!-- .inside --> |
@@ -766,103 +766,103 @@ discard block |
||
766 | 766 | <div id="postbox-container-1" class="postbox-container yikes-easy-forms-sidebar"> |
767 | 767 | <div class="meta-box-sortables"> |
768 | 768 | <div class="postbox yikes-easy-mc-postbox"> |
769 | - <h3><span><?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
769 | + <h3><span><?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
770 | 770 | |
771 | 771 | <div class="inside"> |
772 | 772 | <p class="inside-section-1"> |
773 | - <label for="shortcode"><?php _e( 'Edit Another Form' , 'yikes-inc-easy-mailchimp-extender' ); ?><br /> |
|
773 | + <label for="shortcode"><?php _e( 'Edit Another Form', 'yikes-inc-easy-mailchimp-extender' ); ?><br /> |
|
774 | 774 | <select class="widefat" name="form_switcher" id="form_switcher" onchange="YIKES_Easy_MC_SwitchForm(jQuery(this).val());"> |
775 | - <?php foreach( $all_forms as $single_form ) { ?> |
|
776 | - <option <?php selected( $form_id , $single_form['id'] ); ?>value="<?php echo $single_form['id']; ?>"><?php echo $single_form['form_name']; ?></option> |
|
775 | + <?php foreach ( $all_forms as $single_form ) { ?> |
|
776 | + <option <?php selected( $form_id, $single_form[ 'id' ] ); ?>value="<?php echo $single_form[ 'id' ]; ?>"><?php echo $single_form[ 'form_name' ]; ?></option> |
|
777 | 777 | <?php } ?> |
778 | 778 | </select> |
779 | 779 | </label> |
780 | 780 | </p> |
781 | 781 | |
782 | 782 | <p class="inside-section-2"> |
783 | - <label for="shortcode"><?php _e( 'Shortcode' , 'yikes-inc-easy-mailchimp-extender' ); ?><br /> |
|
784 | - <input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form['id']; ?>"]' /> |
|
783 | + <label for="shortcode"><?php _e( 'Shortcode', 'yikes-inc-easy-mailchimp-extender' ); ?><br /> |
|
784 | + <input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form[ 'id' ]; ?>"]' /> |
|
785 | 785 | </label> |
786 | 786 | </p> |
787 | 787 | |
788 | 788 | |
789 | 789 | <a href="#" class="expansion-section-title settings-sidebar"> |
790 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Associated List Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
790 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Associated List Settings', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
791 | 791 | </a> |
792 | 792 | <div class="yikes-mc-settings-expansion-section"> |
793 | 793 | <!-- Associated List --> |
794 | 794 | <p class="form-field-container"> |
795 | 795 | <!-- necessary to prevent skipping on slideToggle(); --> |
796 | - <label for="associated-list"><strong><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
796 | + <label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
797 | 797 | <select name="associated-list" id="associated-list" <?php if ( empty( $list_data ) ) { echo 'disabled="disabled"'; } ?> onchange="jQuery('.view-list-link').attr( 'href', '<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' ) ); ?>' + jQuery( this ).val() );"> |
798 | 798 | <?php |
799 | 799 | if ( ! empty( $list_data ) ) { |
800 | - foreach( $list_data as $mailing_list ) { |
|
800 | + foreach ( $list_data as $mailing_list ) { |
|
801 | 801 | ?> |
802 | - <option <?php selected( $form['list_id'] , $mailing_list['id'] ); ?> value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option> |
|
802 | + <option <?php selected( $form[ 'list_id' ], $mailing_list[ 'id' ] ); ?> value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option> |
|
803 | 803 | <?php |
804 | 804 | } |
805 | 805 | } else { |
806 | 806 | ?> |
807 | - <option value="no-forms"><?php _e( 'No Lists Found' , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
807 | + <option value="no-forms"><?php _e( 'No Lists Found', 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
808 | 808 | <?php |
809 | 809 | } |
810 | 810 | ?> |
811 | 811 | </select> |
812 | - <?php if( ! empty( $form['list_id'] ) ) { ?> |
|
812 | + <?php if ( ! empty( $form[ 'list_id' ] ) ) { ?> |
|
813 | 813 | <p class="description view-list"> |
814 | - <a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form['list_id'] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
814 | + <a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form[ 'list_id' ] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
815 | 815 | </p> |
816 | 816 | <p class="description"> |
817 | - <?php _e( "Users who sign up via this form will be added to the list selected above." , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
817 | + <?php _e( "Users who sign up via this form will be added to the list selected above.", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
818 | 818 | </p> |
819 | 819 | <?php } else { ?> |
820 | 820 | <p class="description"> |
821 | - <?php _e( "It looks like you first need to create a list to assign this form to. Head over to" , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list' , 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list' , 'yikes-inc-easy-mailchimp-extender' ); ?>. |
|
821 | + <?php _e( "It looks like you first need to create a list to assign this form to. Head over to", 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list', 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list', 'yikes-inc-easy-mailchimp-extender' ); ?>. |
|
822 | 822 | </p> |
823 | 823 | <?php } ?> |
824 | 824 | |
825 | 825 | <!-- Display our Clear API Cache button --> |
826 | 826 | <?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?> |
827 | - <p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
827 | + <p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
828 | 828 | <?php } else { ?> |
829 | - <p><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" class="button-primary"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
829 | + <p><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" class="button-primary"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
830 | 830 | <?php } ?> |
831 | 831 | </label> |
832 | 832 | </p> |
833 | 833 | </div> |
834 | 834 | |
835 | 835 | <a href="#" class="expansion-section-title settings-sidebar"> |
836 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Opt-in Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
836 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Opt-in Settings', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
837 | 837 | </a> |
838 | 838 | <div class="yikes-mc-settings-expansion-section"> |
839 | 839 | |
840 | 840 | <!-- Single or Double Opt-in --> |
841 | 841 | <?php |
842 | - if( !isset( $optin_settings['optin'] ) ) { |
|
843 | - $optin_settings['optin'] = '1'; |
|
842 | + if ( ! isset( $optin_settings[ 'optin' ] ) ) { |
|
843 | + $optin_settings[ 'optin' ] = '1'; |
|
844 | 844 | } |
845 | 845 | ?> |
846 | - <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
846 | + <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
847 | 847 | <span class="edit-form-field-container-span"> |
848 | - <label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings['optin'] , '0' ); ?>><?php _e( 'Single' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
849 | - <label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings['optin'] , '1' ); ?>><?php _e( 'Double' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
848 | + <label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings[ 'optin' ], '0' ); ?>><?php _e( 'Single', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
849 | + <label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings[ 'optin' ], '1' ); ?>><?php _e( 'Double', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
850 | 850 | </span> |
851 | - <p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)" , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
851 | + <p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
852 | 852 | </label></p> |
853 | 853 | |
854 | 854 | <!-- Update Existing Users --> |
855 | 855 | <?php |
856 | - if( !isset( $optin_settings['update_existing_user'] ) ) { |
|
857 | - $optin_settings['update_existing_user'] = '1'; |
|
856 | + if ( ! isset( $optin_settings[ 'update_existing_user' ] ) ) { |
|
857 | + $optin_settings[ 'update_existing_user' ] = '1'; |
|
858 | 858 | } |
859 | 859 | ?> |
860 | - <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
860 | + <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
861 | 861 | <span class="form-field-container-span"> |
862 | - <label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings['update_existing_user'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
863 | - <label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user" name="update-existing-user" value="0" <?php checked( $optin_settings['update_existing_user'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
862 | + <label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings[ 'update_existing_user' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
863 | + <label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user" name="update-existing-user" value="0" <?php checked( $optin_settings[ 'update_existing_user' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
864 | 864 | </span> |
865 | - <p class="description"><?php printf( __( "Update an existing subscriber's profile information instead of displaying a %s message." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p> |
|
865 | + <p class="description"><?php printf( __( "Update an existing subscriber's profile information instead of displaying a %s message.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p> |
|
866 | 866 | </label></p> |
867 | 867 | |
868 | 868 | <!-- |
@@ -871,101 +871,101 @@ discard block |
||
871 | 871 | - No = Just update the user profile without an email |
872 | 872 | --> |
873 | 873 | <?php |
874 | - $send_update_email = ( isset( $optin_settings['send_update_email'] ) && '' !== $optin_settings['send_update_email'] ) ? $optin_settings['send_update_email'] : 0; |
|
874 | + $send_update_email = ( isset( $optin_settings[ 'send_update_email' ] ) && '' !== $optin_settings[ 'send_update_email' ] ) ? $optin_settings[ 'send_update_email' ] : 0; |
|
875 | 875 | ?> |
876 | - <p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings['update_existing_user'] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
876 | + <p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings[ 'update_existing_user' ] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
877 | 877 | <span class="form-field-container-span"> |
878 | - <label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
879 | - <label for="do-not-update-email"><input type="radio" id="do-not-update-email" name="update-existing-email" value="0" <?php checked( $send_update_email , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
878 | + <label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email, '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
879 | + <label for="do-not-update-email"><input type="radio" id="do-not-update-email" name="update-existing-email" value="0" <?php checked( $send_update_email, '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
880 | 880 | </span> |
881 | - <em><?php printf( __( "Send an email to the user granting their permission to update their profile information. Otherwise, an existing subscriber filling out this form, will have their profile information updated without any further interaction." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em> |
|
881 | + <em><?php printf( __( "Send an email to the user granting their permission to update their profile information. Otherwise, an existing subscriber filling out this form, will have their profile information updated without any further interaction.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em> |
|
882 | 882 | </label></p> |
883 | 883 | |
884 | 884 | </div> |
885 | 885 | |
886 | 886 | <a href="#" class="expansion-section-title settings-sidebar"> |
887 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Submission Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
887 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Submission Settings', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
888 | 888 | </a> |
889 | 889 | <div class="yikes-mc-settings-expansion-section"> |
890 | 890 | <!-- AJAX form Submission --> |
891 | 891 | <?php |
892 | - if( !isset( $submission_settings['ajax'] ) ) { |
|
893 | - $submission_settings['ajax'] = '1'; |
|
892 | + if ( ! isset( $submission_settings[ 'ajax' ] ) ) { |
|
893 | + $submission_settings[ 'ajax' ] = '1'; |
|
894 | 894 | } |
895 | 895 | ?> |
896 | - <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
896 | + <p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
897 | 897 | <span class="form-field-container-span"> |
898 | - <label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="1" <?php checked( $submission_settings['ajax'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
899 | - <label for="disable-ajax"><input type="radio" id="disable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="0" <?php checked( $submission_settings['ajax'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
898 | + <label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="1" <?php checked( $submission_settings[ 'ajax' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
899 | + <label for="disable-ajax"><input type="radio" id="disable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="0" <?php checked( $submission_settings[ 'ajax' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
900 | 900 | </span> |
901 | - <p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
901 | + <p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
902 | 902 | </label></p> |
903 | 903 | |
904 | 904 | <!-- Redirect User On Submission --> |
905 | 905 | <?php |
906 | - if( !isset( $submission_settings['redirect_on_submission'] ) ) { |
|
907 | - $submission_settings['redirect_on_submission'] = '0'; |
|
908 | - $submission_settings['redirect_page'] = ''; |
|
906 | + if ( ! isset( $submission_settings[ 'redirect_on_submission' ] ) ) { |
|
907 | + $submission_settings[ 'redirect_on_submission' ] = '0'; |
|
908 | + $submission_settings[ 'redirect_page' ] = ''; |
|
909 | 909 | } |
910 | 910 | ?> |
911 | - <p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
911 | + <p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
912 | 912 | <span class="form-field-container-span"> |
913 | - <label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings['redirect_on_submission'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
914 | - <label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings['redirect_on_submission'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
913 | + <label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings[ 'redirect_on_submission' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
914 | + <label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings[ 'redirect_on_submission' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
915 | 915 | </span> |
916 | - <?php $this->generate_page_redirect_dropdown( $submission_settings['redirect_on_submission'] , $submission_settings['redirect_page'], ( isset( $submission_settings['custom_redirect_url'] ) ) ? esc_url( $submission_settings['custom_redirect_url'] ) : '' ); ?> |
|
917 | - <p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
916 | + <?php $this->generate_page_redirect_dropdown( $submission_settings[ 'redirect_on_submission' ], $submission_settings[ 'redirect_page' ], ( isset( $submission_settings[ 'custom_redirect_url' ] ) ) ? esc_url( $submission_settings[ 'custom_redirect_url' ] ) : '' ); ?> |
|
917 | + <p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
918 | 918 | </label></p> |
919 | 919 | |
920 | 920 | <?php |
921 | - if ( ! isset( $submission_settings['redirect_new_window'] ) ) { |
|
922 | - $submission_settings['redirect_new_window'] = '0'; |
|
921 | + if ( ! isset( $submission_settings[ 'redirect_new_window' ] ) ) { |
|
922 | + $submission_settings[ 'redirect_new_window' ] = '0'; |
|
923 | 923 | } |
924 | 924 | ?> |
925 | 925 | |
926 | 926 | <!-- Option to open the redirect URL in a new window --> |
927 | - <div class="redirect-new-window-div" <?php if ( ( ! isset( $submission_settings['redirect_on_submission'] ) || $submission_settings['redirect_on_submission'] === '0' ) || ( ! isset( $submission_settings['ajax'] ) || $submission_settings['ajax'] !== '1' ) ) { echo 'style="display:none;"'; } ?>> |
|
928 | - <p><strong><?php _e( "Open Redirect URL in a New Window" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
927 | + <div class="redirect-new-window-div" <?php if ( ( ! isset( $submission_settings[ 'redirect_on_submission' ] ) || $submission_settings[ 'redirect_on_submission' ] === '0' ) || ( ! isset( $submission_settings[ 'ajax' ] ) || $submission_settings[ 'ajax' ] !== '1' ) ) { echo 'style="display:none;"'; } ?>> |
|
928 | + <p><strong><?php _e( "Open Redirect URL in a New Window", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
929 | 929 | <label for="redirect-new-window-yes"> |
930 | - <input type="radio" class="widefat custom-redirect-new-window" id="redirect-new-window-yes" name="redirect_new_window" value="1" <?php checked( $submission_settings['redirect_new_window'], '1' ); ?>/><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
930 | + <input type="radio" class="widefat custom-redirect-new-window" id="redirect-new-window-yes" name="redirect_new_window" value="1" <?php checked( $submission_settings[ 'redirect_new_window' ], '1' ); ?>/><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
931 | 931 | </label> |
932 | 932 | |
933 | 933 | <label for="redirect-new-window-no"> |
934 | - <input type="radio" class="widefat redirect-new-window" id="redirect-new-window-no" name="redirect_new_window" value="0" <?php checked( $submission_settings['redirect_new_window'] , '0' ); ?>/><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
934 | + <input type="radio" class="widefat redirect-new-window" id="redirect-new-window-no" name="redirect_new_window" value="0" <?php checked( $submission_settings[ 'redirect_new_window' ], '0' ); ?>/><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
935 | 935 | </label> |
936 | - <p class="description"><?php _e( "Should the redirect URL open in a new window/tab?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
936 | + <p class="description"><?php _e( "Should the redirect URL open in a new window/tab?", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
937 | 937 | </div> |
938 | 938 | |
939 | 939 | <!-- Hide Form On Submission --> |
940 | 940 | <?php |
941 | - if( !isset( $submission_settings['hide_form_post_signup'] ) ) { |
|
942 | - $submission_settings['hide_form_post_signup'] = '0'; |
|
941 | + if ( ! isset( $submission_settings[ 'hide_form_post_signup' ] ) ) { |
|
942 | + $submission_settings[ 'hide_form_post_signup' ] = '0'; |
|
943 | 943 | } |
944 | 944 | ?> |
945 | - <p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
945 | + <p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
946 | 946 | <span class="form-field-container-span"> |
947 | - <label for="hide-form"><input type="radio" id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings['hide_form_post_signup'] , '1' ); ?> checked><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
948 | - <label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings['hide_form_post_signup'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
947 | + <label for="hide-form"><input type="radio" id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '1' ); ?> checked><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
948 | + <label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
949 | 949 | </span> |
950 | - <p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
950 | + <p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
951 | 951 | </label></p> |
952 | 952 | |
953 | 953 | <!-- Append or Replace Interest Groups --> |
954 | 954 | <?php |
955 | - if( !isset( $submission_settings['replace_interests'] ) ) { |
|
956 | - $submission_settings['replace_interests'] = '1'; // defaults to true |
|
955 | + if ( ! isset( $submission_settings[ 'replace_interests' ] ) ) { |
|
956 | + $submission_settings[ 'replace_interests' ] = '1'; // defaults to true |
|
957 | 957 | } |
958 | 958 | ?> |
959 | - <p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
959 | + <p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
960 | 960 | <span class="form-field-container-span"> |
961 | - <label for="replace-interest-groups"><input type="radio" id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings['replace_interests'] , '1' ); ?> checked><?php _e( 'Replace' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
962 | - <label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings['replace_interests'] , '0' ); ?>><?php _e( 'Update' , 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
961 | + <label for="replace-interest-groups"><input type="radio" id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings[ 'replace_interests' ], '1' ); ?> checked><?php _e( 'Replace', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
962 | + <label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings[ 'replace_interests' ], '0' ); ?>><?php _e( 'Update', 'yikes-inc-easy-mailchimp-extender' ); ?></label> |
|
963 | 963 | </span> |
964 | 964 | |
965 | - <p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
965 | + <p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
966 | 966 | |
967 | 967 | |
968 | - <p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
968 | + <p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
969 | 969 | |
970 | 970 | </label></p> |
971 | 971 | |
@@ -978,9 +978,9 @@ discard block |
||
978 | 978 | |
979 | 979 | <span class="form-buttons-container" id="major-publishing-actions"> |
980 | 980 | <?php |
981 | - echo submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) ); |
|
982 | - $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form['id'] , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$form['id'] ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); |
|
983 | - echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone." , 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form" , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
981 | + echo submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) ); |
|
982 | + $url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $form[ 'id' ] ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); |
|
983 | + echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone.", 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form", 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
984 | 984 | ?> |
985 | 985 | </span> |
986 | 986 |
@@ -3,8 +3,8 @@ discard block |
||
3 | 3 | * Get and store our variables |
4 | 4 | * @since 6.0 |
5 | 5 | */ |
6 | -$list_id = $_GET['mailchimp-list']; |
|
7 | -$email_id = esc_attr( $_GET['email-id'] ); |
|
6 | +$list_id = $_GET[ 'mailchimp-list' ]; |
|
7 | +$email_id = esc_attr( $_GET[ 'email-id' ] ); |
|
8 | 8 | $list_helper = yikes_get_mc_api_manager()->get_list_handler(); |
9 | 9 | |
10 | 10 | /* |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | $other_lists = $list_helper->get_members_lists( $email_id ); |
39 | -$merge_data_array = $user_data['merge_fields']; |
|
39 | +$merge_data_array = $user_data[ 'merge_fields' ]; |
|
40 | 40 | |
41 | 41 | $additional_lists = array(); |
42 | 42 | $merge_variable_fields = array(); |
43 | 43 | |
44 | 44 | /* Build the array of mailing lists the user is subscribed to */ |
45 | 45 | foreach ( $other_lists as $id => $value ) { |
46 | - if ( 'subscribed' !== $value['status'] ) { |
|
46 | + if ( 'subscribed' !== $value[ 'status' ] ) { |
|
47 | 47 | continue; |
48 | 48 | } |
49 | 49 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | continue; |
59 | 59 | } |
60 | 60 | |
61 | - $additional_lists[ $list_data['id'] ] = $list_data['name']; |
|
61 | + $additional_lists[ $list_data[ 'id' ] ] = $list_data[ 'name' ]; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /* Build the array of merge variables => value */ |
@@ -74,21 +74,21 @@ discard block |
||
74 | 74 | } |
75 | 75 | // loop and display |
76 | 76 | if ( $merge_variables ) { |
77 | - foreach ( $merge_variables['merge_fields'] as $merge_variable ) { |
|
78 | - if ( $merge_variable['tag'] != 'EMAIL' ) { |
|
79 | - $merge_variable_fields[ $merge_variable['name'] ] = ( isset( $merge_data_array[ $merge_variable['tag'] ] ) ) ? $merge_data_array[ $merge_variable['tag'] ] : ''; |
|
77 | + foreach ( $merge_variables[ 'merge_fields' ] as $merge_variable ) { |
|
78 | + if ( $merge_variable[ 'tag' ] != 'EMAIL' ) { |
|
79 | + $merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : ''; |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
84 | 84 | |
85 | 85 | // store usable data |
86 | -$user_email = sanitize_email( $user_data['email_address'] ); |
|
86 | +$user_email = sanitize_email( $user_data[ 'email_address' ] ); |
|
87 | 87 | // prepend our email address to the beginning |
88 | 88 | $merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields; |
89 | 89 | $gravatar_image = get_avatar( $user_email, 120 ); |
90 | -$email_type = $user_data['email_type']; |
|
91 | -$member_rating = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0; |
|
90 | +$email_type = $user_data[ 'email_type' ]; |
|
91 | +$member_rating = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0; |
|
92 | 92 | $member_rating_stars = ''; |
93 | 93 | |
94 | 94 | // Create member rating stars |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
103 | -$last_changed = strtotime( $user_data['last_changed'] ); |
|
104 | -$user_language = ( ! empty( $user_data['language'] ) ) ? $user_data['language'] : ''; |
|
103 | +$last_changed = strtotime( $user_data[ 'last_changed' ] ); |
|
104 | +$user_language = ( ! empty( $user_data[ 'language' ] ) ) ? $user_data[ 'language' ] : ''; |
|
105 | 105 | $list_name = $additional_lists[ $list_id ]; |
106 | 106 | |
107 | 107 | // Generate our display page |
@@ -144,11 +144,11 @@ discard block |
||
144 | 144 | echo sprintf( esc_html__( 'Subscribed: %1$1s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( gmdate( 'F jS, Y h:i a', $last_changed ) ) ); |
145 | 145 | ?> |
146 | 146 | </span> |
147 | - <?php if ( isset( $user_data['location'] ) && isset( $user_data['location']['timezone'] ) && ! empty( $user_data['location']['timezone'] ) && isset( $user_data['location']['country_code'] ) && ! empty( $user_data['location']['country_code'] ) ) { ?> |
|
147 | + <?php if ( isset( $user_data[ 'location' ] ) && isset( $user_data[ 'location' ][ 'timezone' ] ) && ! empty( $user_data[ 'location' ][ 'timezone' ] ) && isset( $user_data[ 'location' ][ 'country_code' ] ) && ! empty( $user_data[ 'location' ][ 'country_code' ] ) ) { ?> |
|
148 | 148 | <span class="member-location-data"> |
149 | 149 | <?php |
150 | 150 | /* translators: the placeholders are a timezone and a country code */ |
151 | - echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data['location']['timezone'] ), esc_html( $user_data['location']['country_code'] ) ); |
|
151 | + echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data[ 'location' ][ 'timezone' ] ), esc_html( $user_data[ 'location' ][ 'country_code' ] ) ); |
|
152 | 152 | ?> |
153 | 153 | </span> |
154 | 154 | <?php } ?> |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | <hr class="yikes-mc-subscriber-hr" /> |
158 | 158 | |
159 | 159 | <?php |
160 | - if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && filter_var( wp_unslash( $_GET['section'] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) { |
|
160 | + if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && filter_var( wp_unslash( $_GET[ 'section' ] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) { |
|
161 | 161 | ?> |
162 | 162 | <section class="yikes-mc-card-body merge-variable-section"> |
163 | 163 | <h3><?php esc_html_e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | <strong><?php esc_html_e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
178 | 178 | <?php |
179 | 179 | } |
180 | - if ( isset( $user_data['ip_signup'] ) && ! empty( $user_data['ip_signup'] ) ) { |
|
180 | + if ( isset( $user_data[ 'ip_signup' ] ) && ! empty( $user_data[ 'ip_signup' ] ) ) { |
|
181 | 181 | ?> |
182 | 182 | <li> |
183 | 183 | <label> |
184 | 184 | <strong class="section-label"><?php esc_html_e( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
185 | - <p class="section-value"><em><?php esc_html_e( $user_data['ip_signup'] ); ?></em></p> |
|
185 | + <p class="section-value"><em><?php esc_html_e( $user_data[ 'ip_signup' ] ); ?></em></p> |
|
186 | 186 | </label> |
187 | 187 | </li> |
188 | 188 | <?php |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | <?php |
194 | 194 | |
195 | 195 | |
196 | - if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { |
|
196 | + if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { |
|
197 | 197 | ?> |
198 | 198 | <section class="yikes-mc-card-body"> |
199 | 199 | <?php |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | ?> |
223 | 223 | |
224 | 224 | <?php |
225 | - if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { |
|
225 | + if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { |
|
226 | 226 | $unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array( |
227 | 227 | 'action' => 'yikes-easy-mc-unsubscribe-user', |
228 | 228 | 'mailchimp-list' => $list_id, |
@@ -277,36 +277,36 @@ discard block |
||
277 | 277 | <div id="customer-tab-wrapper"> |
278 | 278 | <ul id="customer-tab-wrapper-list"> |
279 | 279 | |
280 | - <?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?> |
|
280 | + <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?> |
|
281 | 281 | <a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>"> |
282 | 282 | <?php } ?> |
283 | 283 | |
284 | - <li <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
284 | + <li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
285 | 285 | <span class="dashicons dashicons-id"></span></li> |
286 | 286 | |
287 | - <?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?> |
|
287 | + <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?> |
|
288 | 288 | </a> |
289 | 289 | <?php } ?> |
290 | 290 | |
291 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?> |
|
291 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?> |
|
292 | 292 | <a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>"> |
293 | 293 | <?php } ?> |
294 | 294 | |
295 | - <li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
295 | + <li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
296 | 296 | <span class="dashicons dashicons-portfolio"></span></li> |
297 | 297 | |
298 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?> |
|
298 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?> |
|
299 | 299 | </a> |
300 | 300 | <?php } ?> |
301 | 301 | |
302 | - <?php if ( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?> |
|
302 | + <?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?> |
|
303 | 303 | <a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>"> |
304 | 304 | <?php } ?> |
305 | 305 | |
306 | - <li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
306 | + <li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>> |
|
307 | 307 | <span class="dashicons dashicons-trash"></span></li> |
308 | 308 | |
309 | - <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?> |
|
309 | + <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?> |
|
310 | 310 | </a> |
311 | 311 | <?php } ?> |
312 | 312 |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /***********************/ |
102 | 102 | /** Create A Form **/ |
103 | 103 | /**********************/ |
104 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) { |
|
104 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) { |
|
105 | 105 | |
106 | 106 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) ); |
107 | 107 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | /***********************/ |
111 | 111 | /** Delete A Form **/ |
112 | 112 | /**********************/ |
113 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) { |
|
113 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) { |
|
114 | 114 | |
115 | 115 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) ); |
116 | 116 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | /**********************************/ |
120 | 120 | /** Duplicate/Clone A Form **/ |
121 | 121 | /********************************/ |
122 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) { |
|
122 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) { |
|
123 | 123 | |
124 | 124 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) ); |
125 | 125 | |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /*************************************/ |
129 | 129 | /** Reset Form Impression Stats **/ |
130 | 130 | /***********************************/ |
131 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) { |
|
131 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) { |
|
132 | 132 | |
133 | 133 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) ); |
134 | 134 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | /**********************************/ |
138 | 138 | /** Update A Form **/ |
139 | 139 | /********************************/ |
140 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) { |
|
140 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) { |
|
141 | 141 | |
142 | 142 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) ); |
143 | 143 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | /**************************************************/ |
147 | 147 | /** Clear Store MailChimp Transient Data **/ |
148 | 148 | /*************************************************/ |
149 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) { |
|
149 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) { |
|
150 | 150 | |
151 | 151 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) ); |
152 | 152 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | /*******************************************/ |
156 | 156 | /** Remove a user from a mailing list **/ |
157 | 157 | /*****************************************/ |
158 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) { |
|
158 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) { |
|
159 | 159 | |
160 | 160 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) ); |
161 | 161 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | /*******************************************/ |
165 | 165 | /** Create misisng error log file **/ |
166 | 166 | /*****************************************/ |
167 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) { |
|
167 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) { |
|
168 | 168 | |
169 | 169 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) ); |
170 | 170 | |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | /**************************************************/ |
197 | 197 | /** Clear MailChimp Error Log Data **/ |
198 | 198 | /*************************************************/ |
199 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) { |
|
199 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) { |
|
200 | 200 | |
201 | 201 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) ); |
202 | 202 | |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | /*********************************************/ |
206 | 206 | /** Export MailChimp Opt-in Forms **/ |
207 | 207 | /*******************************************/ |
208 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) { |
|
208 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) { |
|
209 | 209 | |
210 | 210 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) ); |
211 | 211 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | /*********************************************/ |
215 | 215 | /** Export Plugin Settings **/ |
216 | 216 | /*******************************************/ |
217 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) { |
|
217 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) { |
|
218 | 218 | |
219 | 219 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) ); |
220 | 220 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | /*******************************************/ |
224 | 224 | /** Import Class Inclusion **/ |
225 | 225 | /*****************************************/ |
226 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) { |
|
226 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) { |
|
227 | 227 | |
228 | 228 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) ); |
229 | 229 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | /*******************************************/ |
233 | 233 | /** Premium Support Request **/ |
234 | 234 | /*****************************************/ |
235 | - if ( isset( $_POST['submit-premium-support-request'] ) ) { |
|
235 | + if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) { |
|
236 | 236 | |
237 | 237 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) ); |
238 | 238 | |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | /****************************************/ |
242 | 242 | /** Dismiss Options Migrations **/ |
243 | 243 | /****************************************/ |
244 | - if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) { |
|
244 | + if ( isset( $_REQUEST[ 'dismiss_migration_nonce' ] ) ) { |
|
245 | 245 | |
246 | 246 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) ); |
247 | 247 | |
@@ -277,8 +277,8 @@ discard block |
||
277 | 277 | * @ return array $links New array of plugin actions |
278 | 278 | */ |
279 | 279 | public function easy_forms_plugin_action_links( $links ) { |
280 | - $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
281 | - $links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
280 | + $links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
281 | + $links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
282 | 282 | return $links; |
283 | 283 | } |
284 | 284 | |
@@ -379,17 +379,17 @@ discard block |
||
379 | 379 | */ |
380 | 380 | public function yikes_easy_mailchimp_export_forms() { |
381 | 381 | // grab our nonce. |
382 | - $nonce = $_REQUEST['nonce']; |
|
382 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
383 | 383 | // grab the forms. |
384 | - $forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array(); |
|
384 | + $forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array(); |
|
385 | 385 | // validate nonce. |
386 | 386 | if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) { |
387 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
387 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | // run the export function. |
391 | 391 | // parameters: ( $table_name, $form_ids, $file_name ). |
392 | - Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-MailChimp-Forms-Export', $forms ); |
|
392 | + Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-MailChimp-Forms-Export', $forms ); |
|
393 | 393 | // re-direct the user back to the page. |
394 | 394 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); |
395 | 395 | die(); |
@@ -403,10 +403,10 @@ discard block |
||
403 | 403 | */ |
404 | 404 | public function yikes_easy_mailchimp_export_plugin_settings() { |
405 | 405 | // grab our nonce |
406 | - $nonce = $_REQUEST['nonce']; |
|
406 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
407 | 407 | // validate nonce. |
408 | 408 | if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) { |
409 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
409 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
410 | 410 | } |
411 | 411 | |
412 | 412 | // run the export function. |
@@ -423,10 +423,10 @@ discard block |
||
423 | 423 | */ |
424 | 424 | public function yikes_easy_mailchimp_import_forms() { |
425 | 425 | // grab our nonce. |
426 | - $nonce = $_REQUEST['nonce']; |
|
426 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
427 | 427 | // validate nonce. |
428 | 428 | if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) { |
429 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
429 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
430 | 430 | } |
431 | 431 | // include the export class. |
432 | 432 | if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) { |
@@ -447,18 +447,18 @@ discard block |
||
447 | 447 | */ |
448 | 448 | public function yikes_easy_mailchimp_premium_support_request() { |
449 | 449 | |
450 | - if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) { |
|
450 | + if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) { |
|
451 | 451 | return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); |
452 | 452 | } |
453 | 453 | |
454 | - $email = isset( $_POST['user-email'] ) ? $_POST['user-email'] : ''; |
|
455 | - $topic = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : ''; |
|
456 | - $issue = isset( $_POST['support-content'] ) ? $_POST['support-content'] : ''; |
|
457 | - $priority = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1; |
|
458 | - $license = isset( $_POST['license_key'] ) ? $_POST['license_key'] : ''; |
|
459 | - $plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : ''; |
|
460 | - $plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : ''; |
|
461 | - $name = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'MailChimp Support'; |
|
454 | + $email = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : ''; |
|
455 | + $topic = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : ''; |
|
456 | + $issue = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : ''; |
|
457 | + $priority = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1; |
|
458 | + $license = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : ''; |
|
459 | + $plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : ''; |
|
460 | + $plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : ''; |
|
461 | + $name = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'MailChimp Support'; |
|
462 | 462 | |
463 | 463 | $edd_item_id = $this->get_premium_license( $plugin_slug ); |
464 | 464 | |
@@ -493,7 +493,7 @@ discard block |
||
493 | 493 | |
494 | 494 | public function get_premium_license( $plugin_slug ) { |
495 | 495 | |
496 | - switch( $plugin_slug ) { |
|
496 | + switch ( $plugin_slug ) { |
|
497 | 497 | |
498 | 498 | case 'form-customizer': |
499 | 499 | return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : ''; |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | // add a new option to store the plugin activation date/time. |
554 | 554 | // @since v6.0.0. |
555 | 555 | // this is used to notify the user that they should review after 2 weeks. |
556 | - if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) { |
|
556 | + if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) { |
|
557 | 557 | add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) ); |
558 | 558 | } |
559 | 559 | |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | $install_date = get_option( 'yikes_easy_mailchimp_activation_date' ); |
564 | 564 | $past_date = strtotime( '-14 days' ); |
565 | 565 | if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) { |
566 | - add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
566 | + add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
567 | 567 | } |
568 | 568 | } |
569 | 569 | |
@@ -576,13 +576,13 @@ discard block |
||
576 | 576 | */ |
577 | 577 | public function yikes_easy_mailchimp_display_review_us_notice() { |
578 | 578 | /* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */ |
579 | - if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) { |
|
579 | + if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) { |
|
580 | 580 | |
581 | 581 | // The URL of the page the user is currently on |
582 | - $current_uri = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false; |
|
583 | - $current_host = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false; |
|
582 | + $current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false; |
|
583 | + $current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false; |
|
584 | 584 | $current_protocol = is_ssl() === true ? 'https://' : 'http://'; |
585 | - $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
585 | + $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
586 | 586 | |
587 | 587 | $plugin_name = '<strong>Easy Forms for MailChimp</strong>'; |
588 | 588 | // Review URL - Change to the URL of your plugin on WordPress.org. |
@@ -593,17 +593,17 @@ discard block |
||
593 | 593 | // Make sure all of our variables have values. |
594 | 594 | $reviewurl = ( ! empty( $reviewurl ) ) ? $reviewurl : ''; |
595 | 595 | $addons_url = ( ! empty( $addons_url ) ) ? $addons_url : ''; |
596 | - $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
596 | + $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
597 | 597 | |
598 | 598 | $review_message = '<div id="yikes-mailchimp-logo"></div>'; |
599 | 599 | $review_message .= sprintf( |
600 | 600 | __( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' ) |
601 | 601 | . '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>' |
602 | - . __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) |
|
602 | + . __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) |
|
603 | 603 | . '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>' |
604 | - . __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) |
|
604 | + . __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) |
|
605 | 605 | . '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>' |
606 | - . __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) |
|
606 | + . __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) |
|
607 | 607 | . "</a> </span>", |
608 | 608 | $plugin_name, $reviewurl, $addons_url, $nobugurl ); |
609 | 609 | ?> |
@@ -620,7 +620,7 @@ discard block |
||
620 | 620 | @since v3.1.1 |
621 | 621 | */ |
622 | 622 | public function yikes_easy_mailchimp_stop_bugging_me() { |
623 | - if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) { |
|
623 | + if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) { |
|
624 | 624 | add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true ); |
625 | 625 | } |
626 | 626 | } |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | // inlcude the js for tinymce. |
659 | 659 | public function yks_mc_add_tinymce_plugin( $plugin_array ) { |
660 | 660 | |
661 | - $plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
661 | + $plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
662 | 662 | |
663 | 663 | return $plugin_array; |
664 | 664 | } |
@@ -679,13 +679,13 @@ discard block |
||
679 | 679 | if ( ! empty( $list_data ) ) { |
680 | 680 | // build an array to pass to our javascript. |
681 | 681 | foreach ( $list_data as $id => $form ) { |
682 | - $lists[] = array( |
|
683 | - 'text' => urlencode( $form['form_name'] ), |
|
682 | + $lists[ ] = array( |
|
683 | + 'text' => urlencode( $form[ 'form_name' ] ), |
|
684 | 684 | 'value' => $id, |
685 | 685 | ); |
686 | 686 | } |
687 | 687 | } else { |
688 | - $lists[0] = array( |
|
688 | + $lists[ 0 ] = array( |
|
689 | 689 | 'text' => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ), |
690 | 690 | 'value' => '-', |
691 | 691 | ); |
@@ -773,8 +773,8 @@ discard block |
||
773 | 773 | |
774 | 774 | wp_enqueue_style( 'wp-color-picker' ); |
775 | 775 | wp_enqueue_script( 'wp-color-picker' ); |
776 | - wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false ); |
|
777 | - wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false ); |
|
776 | + wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false ); |
|
777 | + wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false ); |
|
778 | 778 | |
779 | 779 | $localized_data = array( |
780 | 780 | 'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ), |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | * Convert the php date format string to a js date format |
869 | 869 | */ |
870 | 870 | public function yikes_jQuery_datepicker_date_format( $site_option ) { |
871 | - switch( $site_option ) { |
|
871 | + switch ( $site_option ) { |
|
872 | 872 | //Predefined WP date formats |
873 | 873 | default: |
874 | 874 | case 'F j, Y': |
@@ -1080,7 +1080,7 @@ discard block |
||
1080 | 1080 | |
1081 | 1081 | /* Register General Settings Section */ |
1082 | 1082 | |
1083 | - register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) ); |
|
1083 | + register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) ); |
|
1084 | 1084 | |
1085 | 1085 | register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' ); |
1086 | 1086 | |
@@ -1125,7 +1125,7 @@ discard block |
||
1125 | 1125 | add_settings_field( |
1126 | 1126 | 'optin-checkbox-init', |
1127 | 1127 | __( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ), |
1128 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
1128 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
1129 | 1129 | 'yikes_inc_easy_mc_checkbox_settings' |
1130 | 1130 | ); |
1131 | 1131 | /* End Checkbox Settings */ |
@@ -1147,21 +1147,21 @@ discard block |
||
1147 | 1147 | add_settings_field( |
1148 | 1148 | 'yikes-mc-recaptcha-site-key', |
1149 | 1149 | __( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ), |
1150 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
1150 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
1151 | 1151 | 'yikes_easy_mc_settings_recpatcha_section' |
1152 | 1152 | ); |
1153 | 1153 | |
1154 | 1154 | add_settings_field( |
1155 | 1155 | 'yikes-mc-recaptcha-secret-key', |
1156 | 1156 | __( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ), |
1157 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
1157 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
1158 | 1158 | 'yikes_easy_mc_settings_recpatcha_section' |
1159 | 1159 | ); |
1160 | 1160 | |
1161 | 1161 | add_settings_field( |
1162 | 1162 | 'yikes-mc-recaptcha-status', |
1163 | 1163 | __( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ), |
1164 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
1164 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
1165 | 1165 | 'yikes_easy_mc_settings_recpatcha_section' |
1166 | 1166 | ); |
1167 | 1167 | |
@@ -1181,7 +1181,7 @@ discard block |
||
1181 | 1181 | add_settings_field( |
1182 | 1182 | 'yikes-mailchimp-debug-status', |
1183 | 1183 | __( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ), |
1184 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
1184 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
1185 | 1185 | 'yikes_easy_mc_settings_debug_section' |
1186 | 1186 | ); |
1187 | 1187 | |
@@ -1201,7 +1201,7 @@ discard block |
||
1201 | 1201 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
1202 | 1202 | return ''; |
1203 | 1203 | } |
1204 | - $api_key = strip_tags ( trim( $input ) ); |
|
1204 | + $api_key = strip_tags( trim( $input ) ); |
|
1205 | 1205 | $dash_position = strpos( trim( $input ), '-' ); |
1206 | 1206 | if ( $dash_position !== false ) { |
1207 | 1207 | $manager = new Yikes_Inc_Easy_MailChimp_API_Manager( $api_key ); |
@@ -1216,9 +1216,9 @@ discard block |
||
1216 | 1216 | update_option( 'yikes-mc-api-validation', 'valid_api_key' ); |
1217 | 1217 | // Clear the API key transient data |
1218 | 1218 | $this->delete_yikes_mailchimp_transients(); |
1219 | - } else { |
|
1219 | + } else { |
|
1220 | 1220 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
1221 | - $error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to MailChimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1221 | + $error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to MailChimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1222 | 1222 | update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() ); |
1223 | 1223 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
1224 | 1224 | } |
@@ -1267,11 +1267,11 @@ discard block |
||
1267 | 1267 | public function check_for_old_yks_mc_options() { |
1268 | 1268 | $old_plugin_options = get_option( 'ykseme_storage' ); |
1269 | 1269 | // only perform options migrations if the site is not a multi-site setup |
1270 | - if ( !is_multisite() ) { |
|
1270 | + if ( ! is_multisite() ) { |
|
1271 | 1271 | if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) { |
1272 | 1272 | // display a notice to the user that they should 'migrate' |
1273 | 1273 | // from the old plugin settings to the new ones |
1274 | - add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 ); |
|
1274 | + add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 ); |
|
1275 | 1275 | } |
1276 | 1276 | } |
1277 | 1277 | } |
@@ -1304,11 +1304,11 @@ discard block |
||
1304 | 1304 | |
1305 | 1305 | // Confirm that the necessary forms table in the database exists, else bail |
1306 | 1306 | global $wpdb; |
1307 | - if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) { |
|
1307 | + if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) { |
|
1308 | 1308 | return; |
1309 | 1309 | } |
1310 | 1310 | |
1311 | - if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) { |
|
1311 | + if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) { |
|
1312 | 1312 | // Delete the options, start a-new! (this will disable the migration notice altogether) |
1313 | 1313 | delete_option( 'widget_yikes_mc_widget' ); |
1314 | 1314 | delete_option( 'api_validation' ); |
@@ -1322,7 +1322,7 @@ discard block |
||
1322 | 1322 | } else { |
1323 | 1323 | ?> |
1324 | 1324 | <div class="yikes-easy-mc-updated migrate-options-notice"> |
1325 | - <p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?></p> |
|
1325 | + <p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>' ); ?></p> |
|
1326 | 1326 | <p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
1327 | 1327 | <p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p> |
1328 | 1328 | <section id="migration-buttons"> |
@@ -1347,9 +1347,9 @@ discard block |
||
1347 | 1347 | * and return the index ( used to find the list name assigned to a form ) |
1348 | 1348 | * - http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search |
1349 | 1349 | */ |
1350 | - function findMCListID($id, $array) { |
|
1351 | - foreach ($array as $key => $val) { |
|
1352 | - if ($val['id'] === $id) { |
|
1350 | + function findMCListID( $id, $array ) { |
|
1351 | + foreach ( $array as $key => $val ) { |
|
1352 | + if ( $val[ 'id' ] === $id ) { |
|
1353 | 1353 | return $key; |
1354 | 1354 | } |
1355 | 1355 | } |
@@ -1359,8 +1359,8 @@ discard block |
||
1359 | 1359 | /* Ajax Migrate Options */ |
1360 | 1360 | function migrate_archived_options() { |
1361 | 1361 | // all options prefixed with 'yikes-mc-' |
1362 | - $option_name = 'yikes-mc-'.$_POST['option_name']; |
|
1363 | - $option_value = $_POST['option_value']; |
|
1362 | + $option_name = 'yikes-mc-' . $_POST[ 'option_name' ]; |
|
1363 | + $option_value = $_POST[ 'option_value' ]; |
|
1364 | 1364 | if ( json_decode( $option_value ) ) { |
1365 | 1365 | // decode our lists() array, and store it |
1366 | 1366 | $opt_value = json_decode( $option_value, true ); |
@@ -1374,22 +1374,22 @@ discard block |
||
1374 | 1374 | |
1375 | 1375 | /* Ajax Migrate Forms */ |
1376 | 1376 | function migrate_previously_setup_forms() { |
1377 | - $option_name = $_POST['option_name']; |
|
1378 | - $done = $_POST['done_import']; |
|
1377 | + $option_name = $_POST[ 'option_name' ]; |
|
1378 | + $done = $_POST[ 'done_import' ]; |
|
1379 | 1379 | // Create some starter forms for the user |
1380 | 1380 | // based on previously imported lists (to our old version) |
1381 | 1381 | if ( $option_name == 'yikes-mc-lists' ) { |
1382 | - $option_value = $_POST['option_value']; |
|
1383 | - $new_options = json_decode( stripslashes_deep( $option_value ) , true ); |
|
1382 | + $option_value = $_POST[ 'option_value' ]; |
|
1383 | + $new_options = json_decode( stripslashes_deep( $option_value ), true ); |
|
1384 | 1384 | |
1385 | - $list_id = $new_options['id']; |
|
1386 | - $form_name = $new_options['name']; |
|
1387 | - $fields = $new_options['fields']; // our fields array |
|
1385 | + $list_id = $new_options[ 'id' ]; |
|
1386 | + $form_name = $new_options[ 'name' ]; |
|
1387 | + $fields = $new_options[ 'fields' ]; // our fields array |
|
1388 | 1388 | |
1389 | - $custom_styles = isset( $new_options['custom_styles'] ) ? $new_options['custom_styles']: '0'; // store as an array with all of our styles |
|
1390 | - $custom_template = isset( $new_options['custom_template'] ) ? $new_options['custom_template'] : '0'; // store template data as an array ( active , template used ) |
|
1391 | - $redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0'; |
|
1392 | - $redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : ''; |
|
1389 | + $custom_styles = isset( $new_options[ 'custom_styles' ] ) ? $new_options[ 'custom_styles' ] : '0'; // store as an array with all of our styles |
|
1390 | + $custom_template = isset( $new_options[ 'custom_template' ] ) ? $new_options[ 'custom_template' ] : '0'; // store template data as an array ( active , template used ) |
|
1391 | + $redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0'; |
|
1392 | + $redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : ''; |
|
1393 | 1393 | |
1394 | 1394 | /* Insert Forms Function */ |
1395 | 1395 | $this->form_interface->create_form( array( |
@@ -1425,8 +1425,8 @@ discard block |
||
1425 | 1425 | * @since v5.6 - complete re-write |
1426 | 1426 | */ |
1427 | 1427 | public function generate_options_pages_sidebar_menu() { |
1428 | - if ( isset( $_REQUEST['section'] ) ) { |
|
1429 | - $selected = $_REQUEST['section']; |
|
1428 | + if ( isset( $_REQUEST[ 'section' ] ) ) { |
|
1429 | + $selected = $_REQUEST[ 'section' ]; |
|
1430 | 1430 | } |
1431 | 1431 | $installed_addons = get_option( 'yikes-easy-mc-active-addons', array() ); |
1432 | 1432 | |
@@ -1443,25 +1443,25 @@ discard block |
||
1443 | 1443 | <h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
1444 | 1444 | <div class="inside"> |
1445 | 1445 | <ul id="settings-nav"> |
1446 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1447 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1448 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1449 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1450 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1451 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1446 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1447 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1448 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1449 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1450 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1451 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li> |
|
1452 | 1452 | </ul> |
1453 | 1453 | <?php |
1454 | 1454 | // create our add-on settings pages |
1455 | - if ( !empty( $installed_addons ) ) { |
|
1455 | + if ( ! empty( $installed_addons ) ) { |
|
1456 | 1456 | ?> |
1457 | 1457 | <hr class="add-on-settings-divider" /> |
1458 | 1458 | <strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
1459 | 1459 | <ul id="addon-settings-nav"> |
1460 | 1460 | <?php |
1461 | - foreach( $installed_addons as $addon_name ) { |
|
1461 | + foreach ( $installed_addons as $addon_name ) { |
|
1462 | 1462 | ?> |
1463 | 1463 | <li> |
1464 | - <?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li> |
|
1464 | + <?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li> |
|
1465 | 1465 | <?php |
1466 | 1466 | } |
1467 | 1467 | ?> |
@@ -1510,19 +1510,19 @@ discard block |
||
1510 | 1510 | <select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>> |
1511 | 1511 | <?php |
1512 | 1512 | if ( ! empty( $lists ) ) { |
1513 | - foreach( $lists as $mailing_list ) { |
|
1513 | + foreach ( $lists as $mailing_list ) { |
|
1514 | 1514 | ?> |
1515 | - <option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option> |
|
1515 | + <option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option> |
|
1516 | 1516 | <?php |
1517 | 1517 | } |
1518 | 1518 | } else { |
1519 | 1519 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) { |
1520 | 1520 | ?> |
1521 | - <option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
1521 | + <option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
1522 | 1522 | <?php |
1523 | 1523 | } else { |
1524 | 1524 | ?> |
1525 | - <option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
1525 | + <option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
1526 | 1526 | <?php |
1527 | 1527 | |
1528 | 1528 | } |
@@ -1531,8 +1531,8 @@ discard block |
||
1531 | 1531 | </select> |
1532 | 1532 | |
1533 | 1533 | <?php |
1534 | - if ( isset( $_GET['transient-cleared'] ) ) { |
|
1535 | - if ( 'true' === $_GET['transient-cleared'] ) { |
|
1534 | + if ( isset( $_GET[ 'transient-cleared' ] ) ) { |
|
1535 | + if ( 'true' === $_GET[ 'transient-cleared' ] ) { |
|
1536 | 1536 | ?> |
1537 | 1537 | <div class="yikes-list-refreshed-notice"> |
1538 | 1538 | <p><?php esc_attr_e( 'MailChimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -1545,7 +1545,7 @@ discard block |
||
1545 | 1545 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) { |
1546 | 1546 | ?> |
1547 | 1547 | <p class="description"> |
1548 | - <?php printf( __( 'Head over to <a href="http://www.MailChimp.com" title="%s">MailChimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?> |
|
1548 | + <?php printf( __( 'Head over to <a href="http://www.MailChimp.com" title="%s">MailChimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?> |
|
1549 | 1549 | </p> |
1550 | 1550 | <?php |
1551 | 1551 | } |
@@ -1554,9 +1554,9 @@ discard block |
||
1554 | 1554 | </label> |
1555 | 1555 | <?php |
1556 | 1556 | if ( $this->is_user_mc_api_valid_form( false ) ) { |
1557 | - echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
1557 | + echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
1558 | 1558 | } else { |
1559 | - echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
1559 | + echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
1560 | 1560 | ?> |
1561 | 1561 | <a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
1562 | 1562 | <?php |
@@ -1586,7 +1586,7 @@ discard block |
||
1586 | 1586 | $post_types = get_post_types(); |
1587 | 1587 | ?> |
1588 | 1588 | <label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>"> |
1589 | - <?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
1589 | + <?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
1590 | 1590 | <select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;"> |
1591 | 1591 | <?php |
1592 | 1592 | |
@@ -1602,7 +1602,7 @@ discard block |
||
1602 | 1602 | $excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types ); |
1603 | 1603 | |
1604 | 1604 | // loop over registered post types, and query! |
1605 | - foreach( $post_types as $registered_post_type ) { |
|
1605 | + foreach ( $post_types as $registered_post_type ) { |
|
1606 | 1606 | |
1607 | 1607 | // exclude a few built in custom post types and any defined by the filter |
1608 | 1608 | if ( ! in_array( $registered_post_type, $excluded_post_types ) ) { |
@@ -1624,8 +1624,8 @@ discard block |
||
1624 | 1624 | ?> |
1625 | 1625 | <optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>"> |
1626 | 1626 | <?php |
1627 | - foreach( $post_ids as $post_id ) { |
|
1628 | - ?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
1627 | + foreach ( $post_ids as $post_id ) { |
|
1628 | + ?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
1629 | 1629 | } |
1630 | 1630 | ?> |
1631 | 1631 | </optgroup> |
@@ -1641,7 +1641,7 @@ discard block |
||
1641 | 1641 | </select> |
1642 | 1642 | |
1643 | 1643 | <label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>> |
1644 | - <?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
1644 | + <?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
1645 | 1645 | <input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" /> |
1646 | 1646 | </label> |
1647 | 1647 | |
@@ -1700,7 +1700,7 @@ discard block |
||
1700 | 1700 | </p> |
1701 | 1701 | </div> |
1702 | 1702 | |
1703 | - <p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p> |
|
1703 | + <p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p> |
|
1704 | 1704 | |
1705 | 1705 | <section id="about-yikes-inc" class="inside"> |
1706 | 1706 | <a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc."> |
@@ -1718,7 +1718,7 @@ discard block |
||
1718 | 1718 | <!-- review us container --> |
1719 | 1719 | <h3><?php _e( 'Easy Forms for MailChimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
1720 | 1720 | <div id="review-yikes-easy-mc" class="inside"> |
1721 | - <p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
1721 | + <p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
1722 | 1722 | <p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
1723 | 1723 | </div> |
1724 | 1724 | |
@@ -1745,11 +1745,11 @@ discard block |
||
1745 | 1745 | |
1746 | 1746 | // if no list id, die! |
1747 | 1747 | if ( ! $list_id ) { |
1748 | - wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1748 | + wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1749 | 1749 | } |
1750 | 1750 | |
1751 | 1751 | if ( ! $merge_variables ) { |
1752 | - wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1752 | + wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
1753 | 1753 | } |
1754 | 1754 | |
1755 | 1755 | if ( ! empty( $form_fields ) ) { |
@@ -1760,17 +1760,17 @@ discard block |
||
1760 | 1760 | $available_interest_groups = array(); |
1761 | 1761 | |
1762 | 1762 | // Default variables as arrays - these are used for holding the MailChimp merge field ID |
1763 | - $merge_field_ids = array(); |
|
1764 | - $mailchimp_merge_field_ids = array(); |
|
1763 | + $merge_field_ids = array(); |
|
1764 | + $mailchimp_merge_field_ids = array(); |
|
1765 | 1765 | |
1766 | 1766 | // loop over merge variables |
1767 | - if ( ! empty( $merge_variables['merge_fields'] ) ) { |
|
1768 | - $available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' ); |
|
1769 | - $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' ); |
|
1767 | + if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) { |
|
1768 | + $available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' ); |
|
1769 | + $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' ); |
|
1770 | 1770 | |
1771 | 1771 | // Array will look like $merge_tag => $merge_id |
1772 | - foreach( $available_merge_variables as $index => $merge_tag ) { |
|
1773 | - $merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index]; |
|
1772 | + foreach ( $available_merge_variables as $index => $merge_tag ) { |
|
1773 | + $merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ]; |
|
1774 | 1774 | } |
1775 | 1775 | } |
1776 | 1776 | |
@@ -1785,46 +1785,46 @@ discard block |
||
1785 | 1785 | $excluded_fields = array_diff( $assigned_fields, $merged_fields ); |
1786 | 1786 | |
1787 | 1787 | $i = 1; |
1788 | - foreach( $form_fields as $field ) { |
|
1788 | + foreach ( $form_fields as $field ) { |
|
1789 | 1789 | |
1790 | - if ( isset( $field['merge'] ) ) { |
|
1790 | + if ( isset( $field[ 'merge' ] ) ) { |
|
1791 | 1791 | // @todo: don't use in_array() |
1792 | - $excluded_field = in_array( $field['merge'], $excluded_fields, true ); |
|
1792 | + $excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true ); |
|
1793 | 1793 | ?> |
1794 | - <section class="draggable" id="<?php echo $field['merge']; ?>"> |
|
1794 | + <section class="draggable" id="<?php echo $field[ 'merge' ]; ?>"> |
|
1795 | 1795 | <!-- top --> |
1796 | 1796 | <a class="expansion-section-title settings-sidebar"> |
1797 | 1797 | <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span> |
1798 | - <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span> |
|
1798 | + <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span> |
|
1799 | 1799 | <?php if ( $excluded_field ) { ?> |
1800 | 1800 | <img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
1801 | 1801 | <?php } ?> |
1802 | - <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" /> |
|
1802 | + <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" /> |
|
1803 | 1803 | <span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
1804 | 1804 | <span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
1805 | 1805 | <span class="yikes-mc-edit-field-label-message"></span> |
1806 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
1806 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
1807 | 1807 | </a> |
1808 | 1808 | <!-- expansion section --> |
1809 | 1809 | <div class="yikes-mc-settings-expansion-section"> |
1810 | 1810 | |
1811 | 1811 | <?php if ( $excluded_field ) { ?> |
1812 | - <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
1812 | + <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
1813 | 1813 | <?php } ?> |
1814 | 1814 | |
1815 | 1815 | <!-- store field data --> |
1816 | - <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
1817 | - <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
1818 | - <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" /> |
|
1819 | - <input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" /> |
|
1820 | - <?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?> |
|
1821 | - <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" /> |
|
1816 | + <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
1817 | + <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
1818 | + <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" /> |
|
1819 | + <input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" /> |
|
1820 | + <?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?> |
|
1821 | + <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" /> |
|
1822 | 1822 | <?php } ?> |
1823 | 1823 | |
1824 | - <?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) { |
|
1825 | - $choices = json_decode( $field['choices'], true ); |
|
1824 | + <?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) { |
|
1825 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
1826 | 1826 | ?> |
1827 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
1827 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
1828 | 1828 | <?php } ?> |
1829 | 1829 | |
1830 | 1830 | <!-- Single or Double Opt-in --> |
@@ -1840,12 +1840,12 @@ discard block |
||
1840 | 1840 | </label> |
1841 | 1841 | </td> |
1842 | 1842 | <td> |
1843 | - <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>"> |
|
1843 | + <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>"> |
|
1844 | 1844 | </td> |
1845 | 1845 | </tr> |
1846 | 1846 | |
1847 | 1847 | <!-- Placeholder Value --> |
1848 | - <?php switch( $field['type'] ) { |
|
1848 | + <?php switch ( $field[ 'type' ] ) { |
|
1849 | 1849 | |
1850 | 1850 | case 'text': |
1851 | 1851 | case 'email': |
@@ -1859,13 +1859,13 @@ discard block |
||
1859 | 1859 | <!-- Placeholder --> |
1860 | 1860 | <tr valign="top"> |
1861 | 1861 | <td scope="row"> |
1862 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
1862 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
1863 | 1863 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
1864 | 1864 | </label> |
1865 | 1865 | </td> |
1866 | 1866 | <td> |
1867 | - <input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" /> |
|
1868 | - <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
1867 | + <input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" /> |
|
1868 | + <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
1869 | 1869 | </td> |
1870 | 1870 | </tr> |
1871 | 1871 | <?php |
@@ -1876,13 +1876,13 @@ discard block |
||
1876 | 1876 | ?> |
1877 | 1877 | <tr valign="top"> |
1878 | 1878 | <td scope="row"> |
1879 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
1879 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
1880 | 1880 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
1881 | 1881 | </label> |
1882 | 1882 | </td> |
1883 | 1883 | <td> |
1884 | - <input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> /> |
|
1885 | - <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span> |
|
1884 | + <input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> /> |
|
1885 | + <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span> |
|
1886 | 1886 | </td> |
1887 | 1887 | </tr> |
1888 | 1888 | <?php |
@@ -1892,7 +1892,7 @@ discard block |
||
1892 | 1892 | ?> |
1893 | 1893 | |
1894 | 1894 | <!-- Default Value --> |
1895 | - <?php switch( $field['type'] ) { |
|
1895 | + <?php switch ( $field[ 'type' ] ) { |
|
1896 | 1896 | default: |
1897 | 1897 | case 'text': |
1898 | 1898 | case 'number': |
@@ -1900,15 +1900,15 @@ discard block |
||
1900 | 1900 | ?> |
1901 | 1901 | <tr valign="top"> |
1902 | 1902 | <td scope="row"> |
1903 | - <label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
1903 | + <label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
1904 | 1904 | <?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?> |
1905 | 1905 | </label> |
1906 | 1906 | </td> |
1907 | 1907 | <td> |
1908 | - <input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> /> |
|
1909 | - <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
1908 | + <input id="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> /> |
|
1909 | + <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
1910 | 1910 | <?php |
1911 | - switch( $field['type'] ) { |
|
1911 | + switch ( $field[ 'type' ] ) { |
|
1912 | 1912 | case 'text': |
1913 | 1913 | ?> |
1914 | 1914 | <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
@@ -1930,28 +1930,28 @@ discard block |
||
1930 | 1930 | </td> |
1931 | 1931 | <td> |
1932 | 1932 | <?php |
1933 | - $field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice']; |
|
1933 | + $field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ]; |
|
1934 | 1934 | $x = 0; |
1935 | 1935 | ?> |
1936 | - <label for="<?php echo $field['merge'] . '-no-default'; ?>"> |
|
1937 | - <input id="<?php echo $field['merge'] . '-no-default'; ?>" |
|
1936 | + <label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>"> |
|
1937 | + <input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>" |
|
1938 | 1938 | type="radio" |
1939 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
1940 | - value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?> |
|
1939 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
1940 | + value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?> |
|
1941 | 1941 | > |
1942 | 1942 | No Default |
1943 | 1943 | </label> |
1944 | 1944 | <?php |
1945 | 1945 | foreach ( $choices as $choice => $value ) { ?> |
1946 | - <label for="<?php echo $field['merge'].'-'.$x; ?>"> |
|
1947 | - <input id="<?php echo $field['merge'].'-'.$x; ?>" |
|
1946 | + <label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>"> |
|
1947 | + <input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>" |
|
1948 | 1948 | type="radio" |
1949 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
1950 | - value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>> |
|
1949 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
1950 | + value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>> |
|
1951 | 1951 | <?php echo $value; ?> |
1952 | 1952 | </label> |
1953 | 1953 | <?php $x++; } ?> |
1954 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
1954 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
1955 | 1955 | </td> |
1956 | 1956 | </tr> |
1957 | 1957 | |
@@ -1967,13 +1967,13 @@ discard block |
||
1967 | 1967 | </label> |
1968 | 1968 | </td> |
1969 | 1969 | <td> |
1970 | - <select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]"> |
|
1971 | - <option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option> |
|
1972 | - <?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?> |
|
1973 | - <option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option> |
|
1970 | + <select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"> |
|
1971 | + <option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option> |
|
1972 | + <?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?> |
|
1973 | + <option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option> |
|
1974 | 1974 | <?php } ?> |
1975 | 1975 | </select> |
1976 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
1976 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
1977 | 1977 | </td> |
1978 | 1978 | </tr> |
1979 | 1979 | |
@@ -1990,82 +1990,82 @@ discard block |
||
1990 | 1990 | <!-- Field Description --> |
1991 | 1991 | <tr valign="top"> |
1992 | 1992 | <td scope="row"> |
1993 | - <label for="description_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
1993 | + <label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
1994 | 1994 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
1995 | 1995 | </label> |
1996 | 1996 | </td> |
1997 | 1997 | <td> |
1998 | - <textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea> |
|
1999 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
1998 | + <textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea> |
|
1999 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2000 | 2000 | </td> |
2001 | 2001 | </tr> |
2002 | 2002 | <!-- Description Above Field --> |
2003 | 2003 | <tr valign="top" class="yikes-checkbox-container"> |
2004 | 2004 | <td scope="row"> |
2005 | - <label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
2005 | + <label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
2006 | 2006 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2007 | 2007 | </label> |
2008 | 2008 | </td> |
2009 | 2009 | <td> |
2010 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> /> |
|
2011 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2010 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> /> |
|
2011 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2012 | 2012 | </td> |
2013 | 2013 | </tr> |
2014 | 2014 | <!-- Additional Classes --> |
2015 | 2015 | <tr valign="top"> |
2016 | 2016 | <td scope="row"> |
2017 | - <label for="classes_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
2017 | + <label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
2018 | 2018 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2019 | 2019 | </label> |
2020 | 2020 | </td> |
2021 | 2021 | <td> |
2022 | - <input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" /> |
|
2023 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
2022 | + <input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" /> |
|
2023 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
2024 | 2024 | </td> |
2025 | 2025 | </tr> |
2026 | 2026 | <!-- Required Toggle --> |
2027 | 2027 | <tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first"> |
2028 | 2028 | <td scope="row"> |
2029 | - <label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
2029 | + <label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
2030 | 2030 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2031 | 2031 | </label> |
2032 | 2032 | </td> |
2033 | 2033 | <td> |
2034 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
2035 | - <input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
2036 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2034 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
2035 | + <input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
2036 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2037 | 2037 | </td> |
2038 | 2038 | </tr> |
2039 | 2039 | <!-- Visible Toggle --> |
2040 | 2040 | <tr valign="top" class="yikes-checkbox-container"> |
2041 | 2041 | <td scope="row"> |
2042 | - <label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
2042 | + <label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
2043 | 2043 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2044 | 2044 | </label> |
2045 | 2045 | </td> |
2046 | 2046 | <td> |
2047 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
2048 | - <input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
2049 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2047 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
2048 | + <input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
2049 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2050 | 2050 | </td> |
2051 | 2051 | </tr> |
2052 | 2052 | <!-- Toggle Field Label Visibility --> |
2053 | 2053 | <tr valign="top" class="yikes-checkbox-container"> |
2054 | 2054 | <td scope="row"> |
2055 | - <label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
2055 | + <label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
2056 | 2056 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2057 | 2057 | </label> |
2058 | 2058 | </td> |
2059 | 2059 | <td> |
2060 | - <?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
2061 | - <input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/> |
|
2062 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2060 | + <?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
2061 | + <input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/> |
|
2062 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2063 | 2063 | </td> |
2064 | 2064 | </tr> |
2065 | 2065 | <!-- Display Phone/Date Formats back to the user --> |
2066 | 2066 | <!-- Phone Format Initial Load --> |
2067 | 2067 | <?php |
2068 | - switch( $field['type'] ) { |
|
2068 | + switch ( $field[ 'type' ] ) { |
|
2069 | 2069 | /* Store the phone format, for properly regex pattern */ |
2070 | 2070 | case 'phone': |
2071 | 2071 | case 'birthday': |
@@ -2075,23 +2075,23 @@ discard block |
||
2075 | 2075 | <td scope="row"> |
2076 | 2076 | <label for="placeholder"> |
2077 | 2077 | <?php |
2078 | - switch( $field['type'] ) { |
|
2078 | + switch ( $field[ 'type' ] ) { |
|
2079 | 2079 | default: |
2080 | 2080 | case 'birthday': |
2081 | 2081 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
2082 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD'; |
|
2082 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD'; |
|
2083 | 2083 | $format_name = 'date_format'; |
2084 | 2084 | break; |
2085 | 2085 | |
2086 | 2086 | case 'date': |
2087 | 2087 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
2088 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY'; |
|
2088 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY'; |
|
2089 | 2089 | $format_name = 'date_format'; |
2090 | 2090 | break; |
2091 | 2091 | |
2092 | 2092 | case 'phone': |
2093 | 2093 | $type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' ); |
2094 | - $format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
2094 | + $format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
2095 | 2095 | $format_name = 'phone_format'; |
2096 | 2096 | break; |
2097 | 2097 | } |
@@ -2101,7 +2101,7 @@ discard block |
||
2101 | 2101 | </td> |
2102 | 2102 | <td> |
2103 | 2103 | <strong><?php echo $format; ?></strong> |
2104 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
2104 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
2105 | 2105 | <p class="description"><small> |
2106 | 2106 | <?php printf( __( 'To change the %s please head over to <a href="%s" title="MailChimp" target="_blank">MailChimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?> |
2107 | 2107 | </small></p> |
@@ -2122,8 +2122,8 @@ discard block |
||
2122 | 2122 | </td> |
2123 | 2123 | <td> |
2124 | 2124 | <span class="toggle-container"> |
2125 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
2126 | - <a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
2125 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
2126 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
2127 | 2127 | </span> |
2128 | 2128 | </td> |
2129 | 2129 | </tr> |
@@ -2141,35 +2141,35 @@ discard block |
||
2141 | 2141 | /**** Interest Group ****/ |
2142 | 2142 | |
2143 | 2143 | ?> |
2144 | - <section class="draggable" id="<?php echo $field['group_id']; ?>"> |
|
2144 | + <section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>"> |
|
2145 | 2145 | <!-- top --> |
2146 | 2146 | <a href="#" class="expansion-section-title settings-sidebar"> |
2147 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?> |
|
2148 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?> |
|
2147 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?> |
|
2148 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?> |
|
2149 | 2149 | <img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
2150 | 2150 | <?php } ?> |
2151 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
2151 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
2152 | 2152 | </a> |
2153 | 2153 | <!-- expansion section --> |
2154 | 2154 | <div class="yikes-mc-settings-expansion-section"> |
2155 | 2155 | |
2156 | 2156 | <!-- check if this field exists in the available interest group array --> |
2157 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?> |
|
2158 | - <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
2157 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?> |
|
2158 | + <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
2159 | 2159 | <?php } ?> |
2160 | 2160 | |
2161 | 2161 | <!-- store the label --> |
2162 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
2163 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
2164 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" /> |
|
2165 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' /> |
|
2162 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
2163 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
2164 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" /> |
|
2165 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' /> |
|
2166 | 2166 | |
2167 | 2167 | <!-- Single or Double Opt-in --> |
2168 | 2168 | <p class="type-container"><!-- necessary to prevent skipping on slideToggle(); --> |
2169 | 2169 | |
2170 | 2170 | <table class="form-table form-field-container"> |
2171 | 2171 | <!-- Default Value --> |
2172 | - <?php switch( $field['type'] ) { |
|
2172 | + <?php switch ( $field[ 'type' ] ) { |
|
2173 | 2173 | default: |
2174 | 2174 | case 'radio': |
2175 | 2175 | case 'checkboxes': |
@@ -2182,15 +2182,15 @@ discard block |
||
2182 | 2182 | </td> |
2183 | 2183 | <td> |
2184 | 2184 | <?php |
2185 | - $field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
2185 | + $field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
2186 | 2186 | |
2187 | 2187 | $default_shown = false; |
2188 | 2188 | |
2189 | - foreach ( json_decode( $field['groups'], true ) as $id => $group ) { |
|
2190 | - $field_id = "{$field['group_id']}-{$id}"; |
|
2191 | - $field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type']; |
|
2189 | + foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) { |
|
2190 | + $field_id = "{$field[ 'group_id' ]}-{$id}"; |
|
2191 | + $field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ]; |
|
2192 | 2192 | $field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type; |
2193 | - $field_name = "field[{$field['group_id']}][default_choice]"; |
|
2193 | + $field_name = "field[{$field[ 'group_id' ]}][default_choice]"; |
|
2194 | 2194 | $field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name; |
2195 | 2195 | |
2196 | 2196 | // Determine if the current group is checked. |
@@ -2198,13 +2198,13 @@ discard block |
||
2198 | 2198 | switch ( $field_type ) { |
2199 | 2199 | case 'radio': |
2200 | 2200 | default: |
2201 | - $default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice']; |
|
2202 | - $checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false ); |
|
2201 | + $default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ]; |
|
2202 | + $checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false ); |
|
2203 | 2203 | break; |
2204 | 2204 | |
2205 | 2205 | case 'checkbox': |
2206 | 2206 | case 'hidden': |
2207 | - if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) { |
|
2207 | + if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) { |
|
2208 | 2208 | $checked = checked( true, true, false ); |
2209 | 2209 | } |
2210 | 2210 | break; |
@@ -2219,7 +2219,7 @@ discard block |
||
2219 | 2219 | type="<?php echo $field_type; ?>" |
2220 | 2220 | name="<?php echo $field_name; ?>" |
2221 | 2221 | value="no-default" |
2222 | - <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>> |
|
2222 | + <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>> |
|
2223 | 2223 | No Default |
2224 | 2224 | </label> |
2225 | 2225 | <?php |
@@ -2235,7 +2235,7 @@ discard block |
||
2235 | 2235 | </label> |
2236 | 2236 | <?php |
2237 | 2237 | } ?> |
2238 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2238 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2239 | 2239 | </td> |
2240 | 2240 | </tr> |
2241 | 2241 | |
@@ -2251,13 +2251,13 @@ discard block |
||
2251 | 2251 | </label> |
2252 | 2252 | </td> |
2253 | 2253 | <td> |
2254 | - <select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]"> |
|
2254 | + <select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]"> |
|
2255 | 2255 | <option value="no-default">No Default</option> |
2256 | - <?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?> |
|
2257 | - <option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
2256 | + <?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?> |
|
2257 | + <option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
2258 | 2258 | <?php } ?> |
2259 | 2259 | </select> |
2260 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2260 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2261 | 2261 | </td> |
2262 | 2262 | </tr> |
2263 | 2263 | |
@@ -2270,78 +2270,78 @@ discard block |
||
2270 | 2270 | <!-- Field Description --> |
2271 | 2271 | <tr valign="top"> |
2272 | 2272 | <td scope="row"> |
2273 | - <label for="description_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
2273 | + <label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
2274 | 2274 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2275 | 2275 | </label> |
2276 | 2276 | </td> |
2277 | 2277 | <td> |
2278 | - <textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea> |
|
2279 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2278 | + <textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea> |
|
2279 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2280 | 2280 | </td> |
2281 | 2281 | </tr> |
2282 | 2282 | |
2283 | 2283 | <!-- Description Above Field --> |
2284 | 2284 | <tr valign="top" class="yikes-checkbox-container"> |
2285 | 2285 | <td scope="row"> |
2286 | - <label for="description_above_<?php echo $field['group_id']; ?>"> |
|
2286 | + <label for="description_above_<?php echo $field[ 'group_id' ]; ?>"> |
|
2287 | 2287 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2288 | 2288 | </label> |
2289 | 2289 | </td> |
2290 | 2290 | <td> |
2291 | - <input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> /> |
|
2292 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2291 | + <input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> /> |
|
2292 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2293 | 2293 | </td> |
2294 | 2294 | </tr> |
2295 | 2295 | |
2296 | 2296 | <!-- Additional Classes --> |
2297 | 2297 | <tr valign="top"> |
2298 | 2298 | <td scope="row"> |
2299 | - <label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
2299 | + <label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
2300 | 2300 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2301 | 2301 | </label> |
2302 | 2302 | </td> |
2303 | 2303 | <td> |
2304 | - <input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" /> |
|
2305 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
2304 | + <input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" /> |
|
2305 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
2306 | 2306 | </td> |
2307 | 2307 | </tr> |
2308 | 2308 | <!-- Required Toggle --> |
2309 | 2309 | <tr valign="top" class="yikes-checkbox-container"> |
2310 | 2310 | <td scope="row"> |
2311 | - <label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
2311 | + <label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
2312 | 2312 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2313 | 2313 | </label> |
2314 | 2314 | </td> |
2315 | 2315 | <td> |
2316 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
2317 | - <input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>> |
|
2318 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2316 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
2317 | + <input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>> |
|
2318 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2319 | 2319 | </td> |
2320 | 2320 | </tr> |
2321 | 2321 | <!-- Visible Toggle --> |
2322 | 2322 | <tr valign="top" class="yikes-checkbox-container"> |
2323 | 2323 | <td scope="row"> |
2324 | - <label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
2324 | + <label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
2325 | 2325 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2326 | 2326 | </label> |
2327 | 2327 | </td> |
2328 | 2328 | <td> |
2329 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
2330 | - <input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>> |
|
2331 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2329 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
2330 | + <input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>> |
|
2331 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2332 | 2332 | </td> |
2333 | 2333 | </tr> |
2334 | 2334 | <!-- Toggle Field Label Visibility --> |
2335 | 2335 | <tr valign="top" class="yikes-checkbox-container"> |
2336 | 2336 | <td scope="row"> |
2337 | - <label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
2337 | + <label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
2338 | 2338 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
2339 | 2339 | </label> |
2340 | 2340 | </td> |
2341 | 2341 | <td> |
2342 | - <?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
2343 | - <input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/> |
|
2344 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
2342 | + <?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
2343 | + <input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/> |
|
2344 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
2345 | 2345 | </td> |
2346 | 2346 | </tr> |
2347 | 2347 | <!-- Toggle Buttons --> |
@@ -2351,8 +2351,8 @@ discard block |
||
2351 | 2351 | </td> |
2352 | 2352 | <td> |
2353 | 2353 | <span class="toggle-container"> |
2354 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
2355 | - <a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
2354 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
2355 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
2356 | 2356 | </span> |
2357 | 2357 | </td> |
2358 | 2358 | </tr> |
@@ -2373,7 +2373,7 @@ discard block |
||
2373 | 2373 | add_thickbox(); |
2374 | 2374 | // enqueue jquery qtip for our tooltip |
2375 | 2375 | wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) ); |
2376 | - wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
2376 | + wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
2377 | 2377 | $available_tags = array( |
2378 | 2378 | array( |
2379 | 2379 | 'tag' => '{page_title}', |
@@ -2428,14 +2428,14 @@ discard block |
||
2428 | 2428 | <h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
2429 | 2429 | <p class="description"><?php _e( 'You can use any of the following tags to populate a MailChimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
2430 | 2430 | <ul> |
2431 | - <?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?> |
|
2431 | + <?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?> |
|
2432 | 2432 | <li class="tooltop-tag"> |
2433 | 2433 | <!-- link/tag --> |
2434 | - <a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a> |
|
2434 | + <a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a> |
|
2435 | 2435 | <!-- help icon --> |
2436 | 2436 | <span class="dashicons dashicons-editor-help"></span> |
2437 | 2437 | <!-- tooltip --> |
2438 | - <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div> |
|
2438 | + <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div> |
|
2439 | 2439 | </li> |
2440 | 2440 | <?php } ?> |
2441 | 2441 | </ul> |
@@ -2451,46 +2451,46 @@ discard block |
||
2451 | 2451 | * - |
2452 | 2452 | * @parameters - $list_id - pass in the list ID to retreive merge variables from |
2453 | 2453 | */ |
2454 | - public function build_available_merge_vars( $form_fields , $available_merge_variables ) { |
|
2454 | + public function build_available_merge_vars( $form_fields, $available_merge_variables ) { |
|
2455 | 2455 | $fields_assigned_to_form = array(); |
2456 | 2456 | foreach ( $form_fields as $field ) { |
2457 | - if ( isset( $field['merge'] ) ) { |
|
2458 | - $fields_assigned_to_form[ $field['merge'] ] = true; |
|
2457 | + if ( isset( $field[ 'merge' ] ) ) { |
|
2458 | + $fields_assigned_to_form[ $field[ 'merge' ] ] = true; |
|
2459 | 2459 | } |
2460 | 2460 | } |
2461 | 2461 | |
2462 | - if ( ! empty( $available_merge_variables['merge_fields'] ) ) { |
|
2462 | + if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) { |
|
2463 | 2463 | ?> |
2464 | 2464 | <ul id="available-fields"><?php |
2465 | - foreach ( $available_merge_variables['merge_fields'] as $merge_var ) { |
|
2466 | - if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) { |
|
2465 | + foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) { |
|
2466 | + if ( isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] ) ) { |
|
2467 | 2467 | ?> |
2468 | 2468 | <li class="available-form-field not-available" |
2469 | - alt="<?php echo $merge_var['tag']; ?>" |
|
2470 | - data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>" |
|
2471 | - data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>" |
|
2472 | - data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>" |
|
2469 | + alt="<?php echo $merge_var[ 'tag' ]; ?>" |
|
2470 | + data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>" |
|
2471 | + data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>" |
|
2472 | + data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>" |
|
2473 | 2473 | title="<?php esc_attr_e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" |
2474 | 2474 | disabled="disabled"> |
2475 | - <?php echo stripslashes( $merge_var['name'] ); |
|
2476 | - if ( $merge_var['required'] ) { |
|
2475 | + <?php echo stripslashes( $merge_var[ 'name' ] ); |
|
2476 | + if ( $merge_var[ 'required' ] ) { |
|
2477 | 2477 | echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; |
2478 | 2478 | } ?> |
2479 | - <small class="field-type-text"><?php echo $merge_var['type']; ?></small> |
|
2479 | + <small class="field-type-text"><?php echo $merge_var[ 'type' ]; ?></small> |
|
2480 | 2480 | </li> |
2481 | 2481 | <?php |
2482 | 2482 | } else { |
2483 | 2483 | ?> |
2484 | 2484 | <li class="available-form-field" |
2485 | - alt="<?php echo $merge_var['tag']; ?>" |
|
2486 | - data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>" |
|
2487 | - data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>" |
|
2488 | - data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>"> |
|
2489 | - <?php echo stripslashes( $merge_var['name'] ); |
|
2490 | - if ( $merge_var['required'] ) { |
|
2485 | + alt="<?php echo $merge_var[ 'tag' ]; ?>" |
|
2486 | + data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>" |
|
2487 | + data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>" |
|
2488 | + data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>"> |
|
2489 | + <?php echo stripslashes( $merge_var[ 'name' ] ); |
|
2490 | + if ( $merge_var[ 'required' ] ) { |
|
2491 | 2491 | echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; |
2492 | 2492 | } ?> |
2493 | - <small class="field-type-text"><?php echo $merge_var['type']; ?></small> |
|
2493 | + <small class="field-type-text"><?php echo $merge_var[ 'type' ]; ?></small> |
|
2494 | 2494 | </li> |
2495 | 2495 | <?php |
2496 | 2496 | } |
@@ -2512,12 +2512,12 @@ discard block |
||
2512 | 2512 | * - |
2513 | 2513 | * @parameters - $list_id - pass in the list ID to retreive merge variables from |
2514 | 2514 | */ |
2515 | - public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) { |
|
2515 | + public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) { |
|
2516 | 2516 | $fields_assigned_to_form = array(); |
2517 | 2517 | if ( ! empty( $form_fields ) ) { |
2518 | 2518 | foreach ( $form_fields as $field ) { |
2519 | - if ( isset( $field['group_id'] ) ) { |
|
2520 | - $fields_assigned_to_form[ $field['group_id'] ] = true; |
|
2519 | + if ( isset( $field[ 'group_id' ] ) ) { |
|
2520 | + $fields_assigned_to_form[ $field[ 'group_id' ] ] = true; |
|
2521 | 2521 | } |
2522 | 2522 | } |
2523 | 2523 | } |
@@ -2526,29 +2526,29 @@ discard block |
||
2526 | 2526 | ?> |
2527 | 2527 | <ul id="available-interest-groups"><?php |
2528 | 2528 | foreach ( $available_interest_groups as $interest_group ) { |
2529 | - if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) { |
|
2529 | + if ( isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] ) ) { |
|
2530 | 2530 | ?> |
2531 | 2531 | <li class="available-interest-group not-available" |
2532 | - alt="<?php echo $interest_group['id']; ?>" |
|
2533 | - data-attr-field-name="<?php echo htmlspecialchars( $interest_group['title'] ); ?>" |
|
2534 | - data-attr-field-type="<?php echo $interest_group['type']; ?>" |
|
2532 | + alt="<?php echo $interest_group[ 'id' ]; ?>" |
|
2533 | + data-attr-field-name="<?php echo htmlspecialchars( $interest_group[ 'title' ] ); ?>" |
|
2534 | + data-attr-field-type="<?php echo $interest_group[ 'type' ]; ?>" |
|
2535 | 2535 | data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" |
2536 | 2536 | disabled="disabled" |
2537 | 2537 | > |
2538 | - <?php echo stripslashes( $interest_group['title'] ); ?> |
|
2539 | - <small class="field-type-text"><?php echo $interest_group['type']; ?></small> |
|
2538 | + <?php echo stripslashes( $interest_group[ 'title' ] ); ?> |
|
2539 | + <small class="field-type-text"><?php echo $interest_group[ 'type' ]; ?></small> |
|
2540 | 2540 | </li> |
2541 | 2541 | <?php |
2542 | 2542 | } else { |
2543 | 2543 | ?> |
2544 | 2544 | <li class="available-interest-group" |
2545 | - alt="<?php echo $interest_group['id']; ?>" |
|
2546 | - data-attr-field-name="<?php echo htmlspecialchars( $interest_group['title'] ); ?>" |
|
2547 | - data-attr-field-type="<?php echo $interest_group['type']; ?>" |
|
2545 | + alt="<?php echo $interest_group[ 'id' ]; ?>" |
|
2546 | + data-attr-field-name="<?php echo htmlspecialchars( $interest_group[ 'title' ] ); ?>" |
|
2547 | + data-attr-field-type="<?php echo $interest_group[ 'type' ]; ?>" |
|
2548 | 2548 | data-attr-form-id="<?php echo $list_id; ?>" |
2549 | 2549 | > |
2550 | - <?php echo stripslashes( $interest_group['title'] ); ?> |
|
2551 | - <small class="field-type-text"><?php echo $interest_group['type']; ?></small> |
|
2550 | + <?php echo stripslashes( $interest_group[ 'title' ] ); ?> |
|
2551 | + <small class="field-type-text"><?php echo $interest_group[ 'type' ]; ?></small> |
|
2552 | 2552 | </li> |
2553 | 2553 | <?php |
2554 | 2554 | } |
@@ -2570,15 +2570,15 @@ discard block |
||
2570 | 2570 | * - must clean up db tables , ensure what data is going in and what is needed... |
2571 | 2571 | */ |
2572 | 2572 | public function yikes_easy_mailchimp_create_form() { |
2573 | - $nonce = $_REQUEST['nonce']; |
|
2573 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2574 | 2574 | if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) { |
2575 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
2575 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
2576 | 2576 | } |
2577 | 2577 | |
2578 | 2578 | $result = $this->form_interface->create_form( array( |
2579 | - 'list_id' => sanitize_key( $_POST['associated-list'] ), |
|
2580 | - 'form_name' => stripslashes( $_POST['form-name'] ), |
|
2581 | - 'form_description' => stripslashes( $_POST['form-description'] ), |
|
2579 | + 'list_id' => sanitize_key( $_POST[ 'associated-list' ] ), |
|
2580 | + 'form_name' => stripslashes( $_POST[ 'form-name' ] ), |
|
2581 | + 'form_description' => stripslashes( $_POST[ 'form-description' ] ), |
|
2582 | 2582 | ) ); |
2583 | 2583 | |
2584 | 2584 | // if an error occurs during the form creation process |
@@ -2586,11 +2586,11 @@ discard block |
||
2586 | 2586 | // write it to the error log |
2587 | 2587 | // if the form was not created successfully |
2588 | 2588 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
2589 | - $error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
2589 | + $error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ), __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
2590 | 2590 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) ); |
2591 | 2591 | } else { |
2592 | 2592 | // redirect the user to the new form edit page |
2593 | - wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) ); |
|
2593 | + wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) ); |
|
2594 | 2594 | } |
2595 | 2595 | exit(); |
2596 | 2596 | } |
@@ -2603,11 +2603,11 @@ discard block |
||
2603 | 2603 | */ |
2604 | 2604 | public function yikes_easy_mailchimp_delete_form() { |
2605 | 2605 | // grab & store our variables ( associated list & form name ) |
2606 | - $nonce = $_REQUEST['nonce']; |
|
2607 | - $post_id_to_delete = $_REQUEST['mailchimp-form']; |
|
2606 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2607 | + $post_id_to_delete = $_REQUEST[ 'mailchimp-form' ]; |
|
2608 | 2608 | // verify our nonce |
2609 | - if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) { |
|
2610 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2609 | + if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) { |
|
2610 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2611 | 2611 | } |
2612 | 2612 | |
2613 | 2613 | $this->form_interface->delete_form( $post_id_to_delete ); |
@@ -2623,19 +2623,19 @@ discard block |
||
2623 | 2623 | */ |
2624 | 2624 | public function yikes_easy_mailchimp_duplicate_form() { |
2625 | 2625 | // grab & store our variables ( associated list & form name ) |
2626 | - $nonce = $_REQUEST['nonce']; |
|
2627 | - $post_id_to_clone = $_REQUEST['mailchimp-form']; |
|
2626 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2627 | + $post_id_to_clone = $_REQUEST[ 'mailchimp-form' ]; |
|
2628 | 2628 | // verify our nonce |
2629 | - if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) { |
|
2630 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2629 | + if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) { |
|
2630 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2631 | 2631 | } |
2632 | 2632 | |
2633 | 2633 | // Get the current form data. |
2634 | 2634 | $form_data = $this->form_interface->get_form( $post_id_to_clone ); |
2635 | 2635 | |
2636 | 2636 | // Update some of the data before duplication |
2637 | - $form_data['form_name'] .= ' - Copy'; |
|
2638 | - $form_data['impressions'] = $form_data['submissions'] = 0; |
|
2637 | + $form_data[ 'form_name' ] .= ' - Copy'; |
|
2638 | + $form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0; |
|
2639 | 2639 | |
2640 | 2640 | // Create the new form, and handle the result. |
2641 | 2641 | $result = $this->form_interface->create_form( $form_data ); |
@@ -2666,11 +2666,11 @@ discard block |
||
2666 | 2666 | */ |
2667 | 2667 | public function yikes_easy_mailchimp_reset_impression_stats() { |
2668 | 2668 | // grab & store our variables ( associated list & form name ) |
2669 | - $nonce = $_REQUEST['nonce']; |
|
2670 | - $form_id_to_reset = $_REQUEST['mailchimp-form']; |
|
2669 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2670 | + $form_id_to_reset = $_REQUEST[ 'mailchimp-form' ]; |
|
2671 | 2671 | // verify our nonce |
2672 | - if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) { |
|
2673 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2672 | + if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) { |
|
2673 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2674 | 2674 | } |
2675 | 2675 | |
2676 | 2676 | $result = $this->form_interface->update_form( |
@@ -2698,8 +2698,8 @@ discard block |
||
2698 | 2698 | */ |
2699 | 2699 | public function yikes_easy_mailchimp_update_form() { |
2700 | 2700 | |
2701 | - $nonce = $_REQUEST['nonce']; |
|
2702 | - $form_id = $_REQUEST['id']; |
|
2701 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2702 | + $form_id = $_REQUEST[ 'id' ]; |
|
2703 | 2703 | |
2704 | 2704 | // verify our nonce |
2705 | 2705 | if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) { |
@@ -2713,70 +2713,70 @@ discard block |
||
2713 | 2713 | } |
2714 | 2714 | |
2715 | 2715 | // Store our values! |
2716 | - $list_id = $_POST['associated-list']; |
|
2717 | - $form_name = stripslashes( $_POST['form-name'] ); |
|
2718 | - $form_description = sanitize_text_field( stripslashes( $_POST['form-description'] ) ); |
|
2719 | - $redirect_user_on_submit = $_POST['redirect-user-on-submission']; |
|
2720 | - $redirect_page = $_POST['redirect-user-to-selection']; |
|
2716 | + $list_id = $_POST[ 'associated-list' ]; |
|
2717 | + $form_name = stripslashes( $_POST[ 'form-name' ] ); |
|
2718 | + $form_description = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) ); |
|
2719 | + $redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ]; |
|
2720 | + $redirect_page = $_POST[ 'redirect-user-to-selection' ]; |
|
2721 | 2721 | |
2722 | 2722 | // stripslashes_deep on save, to prevent foreign languages from added excessive backslashes |
2723 | - $assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array(); |
|
2723 | + $assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array(); |
|
2724 | 2724 | |
2725 | 2725 | // setup our submission settings serialized array |
2726 | 2726 | $submission_settings = array( |
2727 | - 'ajax' => $_POST['form-ajax-submission'], |
|
2728 | - 'redirect_on_submission' => $_POST['redirect-user-on-submission'], |
|
2729 | - 'redirect_page' => $_POST['redirect-user-to-selection'], |
|
2730 | - 'custom_redirect_url' => esc_url( $_POST['custom-redirect-url'] ), |
|
2731 | - 'redirect_new_window' => $_POST['redirect_new_window'], |
|
2732 | - 'hide_form_post_signup' => $_POST['hide-form-post-signup'], |
|
2733 | - 'replace_interests' => $_POST['replace-interest-groups'], |
|
2727 | + 'ajax' => $_POST[ 'form-ajax-submission' ], |
|
2728 | + 'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ], |
|
2729 | + 'redirect_page' => $_POST[ 'redirect-user-to-selection' ], |
|
2730 | + 'custom_redirect_url' => esc_url( $_POST[ 'custom-redirect-url' ] ), |
|
2731 | + 'redirect_new_window' => $_POST[ 'redirect_new_window' ], |
|
2732 | + 'hide_form_post_signup' => $_POST[ 'hide-form-post-signup' ], |
|
2733 | + 'replace_interests' => $_POST[ 'replace-interest-groups' ], |
|
2734 | 2734 | ); |
2735 | 2735 | |
2736 | 2736 | // setup our opt-in settings serialized array |
2737 | 2737 | $optin_settings = array( |
2738 | - 'optin' => $_POST['single-double-optin'], |
|
2739 | - 'update_existing_user' => $_POST['update-existing-user'], |
|
2740 | - 'send_update_email' => $_POST['update-existing-email'], |
|
2738 | + 'optin' => $_POST[ 'single-double-optin' ], |
|
2739 | + 'update_existing_user' => $_POST[ 'update-existing-user' ], |
|
2740 | + 'send_update_email' => $_POST[ 'update-existing-email' ], |
|
2741 | 2741 | ); |
2742 | 2742 | |
2743 | 2743 | // Setup our error settings serialized array |
2744 | 2744 | $error_settings = array( |
2745 | - 'success' => trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '', |
|
2746 | - 'success-single-optin' => trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '', |
|
2747 | - 'success-resubscribed' => trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '', |
|
2748 | - 'general-error' => trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '', |
|
2749 | - 'already-subscribed' => trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '', |
|
2750 | - 'update-link' => trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '', |
|
2751 | - 'email-subject' => trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '', |
|
2752 | - 'email-body' => trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '', |
|
2753 | - 'update-email-success' => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '', |
|
2754 | - 'update-email-failure' => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '', |
|
2745 | + 'success' => trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '', |
|
2746 | + 'success-single-optin' => trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '', |
|
2747 | + 'success-resubscribed' => trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '', |
|
2748 | + 'general-error' => trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '', |
|
2749 | + 'already-subscribed' => trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '', |
|
2750 | + 'update-link' => trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '', |
|
2751 | + 'email-subject' => trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '', |
|
2752 | + 'email-body' => trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '', |
|
2753 | + 'update-email-success' => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '', |
|
2754 | + 'update-email-failure' => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '', |
|
2755 | 2755 | ); |
2756 | 2756 | |
2757 | 2757 | // Setup the new form settings array |
2758 | 2758 | // @since 6.0.3.8 |
2759 | 2759 | // To Do: Combine date & time so it's a single unix timestamp |
2760 | 2760 | $form_settings = array( |
2761 | - 'yikes-easy-mc-form-class-names' => trim( $_POST['yikes-easy-mc-form-class-names'] ), |
|
2762 | - 'yikes-easy-mc-inline-form' => $_POST['yikes-easy-mc-inline-form'][0], |
|
2763 | - 'yikes-easy-mc-submit-button-type' => $_POST['yikes-easy-mc-submit-button-type'][0], |
|
2764 | - 'yikes-easy-mc-submit-button-text' => trim( $_POST['yikes-easy-mc-submit-button-text'] ), |
|
2765 | - 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ), |
|
2766 | - 'yikes-easy-mc-submit-button-classes' => trim( $_POST['yikes-easy-mc-submit-button-classes'] ), |
|
2767 | - 'yikes-easy-mc-form-schedule' => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0', |
|
2768 | - 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ), |
|
2769 | - 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ), |
|
2770 | - 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ), |
|
2771 | - 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ), |
|
2772 | - 'yikes-easy-mc-form-login-required' => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0', |
|
2773 | - 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ), |
|
2761 | + 'yikes-easy-mc-form-class-names' => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ), |
|
2762 | + 'yikes-easy-mc-inline-form' => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ], |
|
2763 | + 'yikes-easy-mc-submit-button-type' => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ], |
|
2764 | + 'yikes-easy-mc-submit-button-text' => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ), |
|
2765 | + 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ), |
|
2766 | + 'yikes-easy-mc-submit-button-classes' => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ), |
|
2767 | + 'yikes-easy-mc-form-schedule' => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0', |
|
2768 | + 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ), |
|
2769 | + 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ), |
|
2770 | + 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ), |
|
2771 | + 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ), |
|
2772 | + 'yikes-easy-mc-form-login-required' => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0', |
|
2773 | + 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ), |
|
2774 | 2774 | ); |
2775 | 2775 | |
2776 | 2776 | // additional custom fields (extensions / user defined fields) |
2777 | 2777 | $custom_fields = array(); |
2778 | - if ( isset( $_POST['custom-field'] ) ) { |
|
2779 | - foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) { |
|
2778 | + if ( isset( $_POST[ 'custom-field' ] ) ) { |
|
2779 | + foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) { |
|
2780 | 2780 | if ( is_array( $custom_value ) ) { |
2781 | 2781 | $custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!) |
2782 | 2782 | } else { |
@@ -2808,7 +2808,7 @@ discard block |
||
2808 | 2808 | $this->form_interface->update_form( $form_id, $form_updates ); |
2809 | 2809 | |
2810 | 2810 | /* Custom action hook which allows users to update specific options when a form is updated - used in add ons */ |
2811 | - do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
2811 | + do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
2812 | 2812 | |
2813 | 2813 | // redirect the user to the manage forms page, display confirmation |
2814 | 2814 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) ); |
@@ -2819,11 +2819,11 @@ discard block |
||
2819 | 2819 | $email_body = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
2820 | 2820 | |
2821 | 2821 | $email_body .= '<p>'; |
2822 | - $email_body .= __( 'A request has been made to update your MailChimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
2823 | - $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
2824 | - $email_body .= '[link]'; |
|
2825 | - $email_body .= __( 'Update MailChimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
2826 | - $email_body .= '[/link]'; |
|
2822 | + $email_body .= __( 'A request has been made to update your MailChimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
2823 | + $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
2824 | + $email_body .= '[link]'; |
|
2825 | + $email_body .= __( 'Update MailChimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
2826 | + $email_body .= '[/link]'; |
|
2827 | 2827 | $email_body .= '</p>'; |
2828 | 2828 | |
2829 | 2829 | $email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
@@ -2839,13 +2839,13 @@ discard block |
||
2839 | 2839 | |
2840 | 2840 | /* Unsubscribe a given user from our list */ |
2841 | 2841 | public function yikes_easy_mailchimp_unsubscribe_user() { |
2842 | - $nonce = $_REQUEST['nonce']; |
|
2843 | - $list_id = $_REQUEST['mailchimp-list']; |
|
2844 | - $email_id = $_REQUEST['email_id']; |
|
2842 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2843 | + $list_id = $_REQUEST[ 'mailchimp-list' ]; |
|
2844 | + $email_id = $_REQUEST[ 'email_id' ]; |
|
2845 | 2845 | |
2846 | 2846 | // verify our nonce |
2847 | 2847 | if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) { |
2848 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2848 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2849 | 2849 | } |
2850 | 2850 | |
2851 | 2851 | $response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id ); |
@@ -2864,21 +2864,21 @@ discard block |
||
2864 | 2864 | |
2865 | 2865 | public function yikes_easy_mailchimp_create_missing_error_log() { |
2866 | 2866 | // grab our nonnce |
2867 | - $nonce = $_REQUEST['nonce']; |
|
2867 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2868 | 2868 | // validate nonce |
2869 | - if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) { |
|
2870 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2869 | + if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) { |
|
2870 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2871 | 2871 | } |
2872 | 2872 | // setup the path to the error log |
2873 | 2873 | $error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' ); |
2874 | 2874 | try { |
2875 | 2875 | // create the file |
2876 | - fwrite( $error_log , '' ); |
|
2876 | + fwrite( $error_log, '' ); |
|
2877 | 2877 | // close out |
2878 | 2878 | fclose( $error_log ); |
2879 | 2879 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=true' ) ) ); |
2880 | 2880 | } catch ( Exception $e ) { |
2881 | - wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) ); |
|
2881 | + wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) ); |
|
2882 | 2882 | } |
2883 | 2883 | } |
2884 | 2884 | |
@@ -2889,9 +2889,9 @@ discard block |
||
2889 | 2889 | public function yikes_easy_mailchimp_clear_transient_data() { |
2890 | 2890 | |
2891 | 2891 | // verify our nonce |
2892 | - $nonce = $_REQUEST['nonce']; |
|
2892 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
2893 | 2893 | if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) { |
2894 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
2894 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
2895 | 2895 | } |
2896 | 2896 | |
2897 | 2897 | $this->delete_yikes_mailchimp_transients(); |
@@ -2900,10 +2900,10 @@ discard block |
||
2900 | 2900 | $referer = wp_get_referer(); |
2901 | 2901 | if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) { |
2902 | 2902 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings&transient-cleared=true' ) ) ); |
2903 | - } elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) { |
|
2903 | + } elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) { |
|
2904 | 2904 | |
2905 | 2905 | // else check if we were editing a form. |
2906 | - $id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT ); |
|
2906 | + $id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
2907 | 2907 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) ); |
2908 | 2908 | } else { |
2909 | 2909 | // else redirect to the manage forms page. |
@@ -2947,7 +2947,7 @@ discard block |
||
2947 | 2947 | */ |
2948 | 2948 | public function yikes_mailchimp_load_helper_class() { |
2949 | 2949 | // check to see if it's already loaded up. |
2950 | - if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) { |
|
2950 | + if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) { |
|
2951 | 2951 | // Include our main helper class file |
2952 | 2952 | include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' ); |
2953 | 2953 | } |
@@ -5,8 +5,8 @@ discard block |
||
5 | 5 | $error = 0; |
6 | 6 | |
7 | 7 | // Get our $_POST variables |
8 | -$list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : ''; |
|
9 | -$interest_groups = isset( $_POST['interest_groups'] ) ? $_POST['interest_groups'] : array(); |
|
8 | +$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : ''; |
|
9 | +$interest_groups = isset( $_POST[ 'interest_groups' ] ) ? $_POST[ 'interest_groups' ] : array(); |
|
10 | 10 | |
11 | 11 | // Make sure our $_POST variables aren't empty |
12 | 12 | if ( empty( $list_id ) ) { |
@@ -49,20 +49,20 @@ discard block |
||
49 | 49 | |
50 | 50 | |
51 | 51 | // Loop through the interest groups data (group_id, field_name, field_type) and add the fields to the form |
52 | -foreach( $interest_groups as $group ) { |
|
52 | +foreach ( $interest_groups as $group ) { |
|
53 | 53 | |
54 | 54 | // find and return the location of this merge field in the array |
55 | - $index = $this->findMCListIndex( $group['group_id'], $interest_groupings, 'id' ); |
|
55 | + $index = $this->findMCListIndex( $group[ 'group_id' ], $interest_groupings, 'id' ); |
|
56 | 56 | $field_data = $interest_groupings[ $index ]; |
57 | - $groups = wp_list_pluck( $field_data['items'], 'name' ); |
|
57 | + $groups = wp_list_pluck( $field_data[ 'items' ], 'name' ); |
|
58 | 58 | |
59 | 59 | ?> |
60 | - <section class="draggable" id="<?php echo $group['group_id']; ?>"> |
|
60 | + <section class="draggable" id="<?php echo $group[ 'group_id' ]; ?>"> |
|
61 | 61 | <!-- top --> |
62 | 62 | <a href="#" class="expansion-section-title settings-sidebar"> |
63 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
64 | - <?php echo stripslashes( $group['field_name'] ); ?> |
|
65 | - <span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group['field_type']; ?></small></span> |
|
63 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
64 | + <?php echo stripslashes( $group[ 'field_name' ] ); ?> |
|
65 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $group[ 'field_type' ]; ?></small></span> |
|
66 | 66 | </a> |
67 | 67 | <!-- expansion section --> |
68 | 68 | <div class="yikes-mc-settings-expansion-section"> |
@@ -70,37 +70,37 @@ discard block |
||
70 | 70 | <!-- Single or Double Opt-in --> |
71 | 71 | <p class="type-container"><!-- necessary to prevent skipping on slideToggle(); --> |
72 | 72 | <!-- store the label --> |
73 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $group['field_name'] ); ?>" /> |
|
74 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][type]" value="<?php echo $group['field_type']; ?>" /> |
|
75 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][group_id]" value="<?php echo $group['group_id']; ?>" /> |
|
76 | - <input type="hidden" name="field[<?php echo $group['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' /> |
|
73 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $group[ 'field_name' ] ); ?>" /> |
|
74 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][type]" value="<?php echo $group[ 'field_type' ]; ?>" /> |
|
75 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][group_id]" value="<?php echo $group[ 'group_id' ]; ?>" /> |
|
76 | + <input type="hidden" name="field[<?php echo $group[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( $groups, true ) ); ?>' /> |
|
77 | 77 | |
78 | 78 | |
79 | 79 | <table class="form-table form-field-container"> |
80 | 80 | |
81 | 81 | <!-- Default Value --> |
82 | - <?php switch( $group['field_type'] ) { |
|
82 | + <?php switch ( $group[ 'field_type' ] ) { |
|
83 | 83 | |
84 | 84 | case 'radio': |
85 | 85 | ?> |
86 | 86 | <tr valign="top"> |
87 | 87 | <td scope="row"> |
88 | 88 | <label for="placeholder"> |
89 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
89 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
90 | 90 | </label> |
91 | 91 | </td> |
92 | 92 | <td> |
93 | 93 | |
94 | - <?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?> |
|
94 | + <?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?> |
|
95 | 95 | |
96 | 96 | <!-- No Default option for radio buttons --> |
97 | - <input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default |
|
97 | + <input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>>No Default |
|
98 | 98 | |
99 | - <?php foreach ( $field_data['items'] as $id => $interest_group ) { ?> |
|
100 | - <input type="radio" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); |
|
99 | + <?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?> |
|
100 | + <input type="radio" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo esc_attr( $id ); ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); |
|
101 | 101 | } ?> |
102 | 102 | |
103 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
103 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
104 | 104 | </td> |
105 | 105 | </tr> |
106 | 106 | |
@@ -114,19 +114,19 @@ discard block |
||
114 | 114 | <tr valign="top" class="yikes-checkbox-container"> |
115 | 115 | <td scope="row"> |
116 | 116 | <label for="placeholder"> |
117 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
117 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
118 | 118 | </label> |
119 | 119 | </td> |
120 | 120 | <td> |
121 | 121 | <?php |
122 | - foreach ( $field_data['items'] as $id => $interest_group ) { |
|
123 | - $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : '0'; |
|
122 | + foreach ( $field_data[ 'items' ] as $id => $interest_group ) { |
|
123 | + $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : '0'; |
|
124 | 124 | ?> |
125 | - <input type="checkbox" name="field[<?php echo $group['group_id']; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group['name'] ); ?> |
|
125 | + <input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice][]" value="<?php echo $id; ?>" <?php checked( $pre_selected, $id ); ?>><?php echo stripslashes( $interest_group[ 'name' ] ); ?> |
|
126 | 126 | <?php |
127 | 127 | } |
128 | 128 | ?> |
129 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
129 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
130 | 130 | </td> |
131 | 131 | </tr> |
132 | 132 | |
@@ -138,18 +138,18 @@ discard block |
||
138 | 138 | <tr valign="top"> |
139 | 139 | <td scope="row"> |
140 | 140 | <label for="placeholder"> |
141 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
141 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
142 | 142 | </label> |
143 | 143 | </td> |
144 | 144 | <td> |
145 | - <select type="default" name="field[<?php echo $group['group_id']; ?>][default_choice]"> |
|
146 | - <?php $pre_selected = ! empty( $field_data['default_choice'] ) ? $field_data['default_choice'] : 'no-default'; ?> |
|
145 | + <select type="default" name="field[<?php echo $group[ 'group_id' ]; ?>][default_choice]"> |
|
146 | + <?php $pre_selected = ! empty( $field_data[ 'default_choice' ] ) ? $field_data[ 'default_choice' ] : 'no-default'; ?> |
|
147 | 147 | <option value="no-default">No Default</option> |
148 | - <?php foreach ( $field_data['items'] as $id => $interest_group ) { ?> |
|
149 | - <option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group['name']; ?></option> |
|
148 | + <?php foreach ( $field_data[ 'items' ] as $id => $interest_group ) { ?> |
|
149 | + <option value="<?php echo $id; ?>" <?php selected( $pre_selected, $id ); ?>><?php echo $interest_group[ 'name' ]; ?></option> |
|
150 | 150 | <?php } ?> |
151 | 151 | </select> |
152 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
152 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
153 | 153 | </td> |
154 | 154 | </tr> |
155 | 155 | |
@@ -161,25 +161,25 @@ discard block |
||
161 | 161 | <tr valign="top"> |
162 | 162 | <td scope="row"> |
163 | 163 | <label for="placeholder"> |
164 | - <?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
164 | + <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
165 | 165 | </label> |
166 | 166 | </td> |
167 | 167 | <td> |
168 | - <textarea class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description]"></textarea> |
|
169 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
168 | + <textarea class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description]"></textarea> |
|
169 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
170 | 170 | </td> |
171 | 171 | </tr> |
172 | 172 | |
173 | 173 | <!-- Description Above Field --> |
174 | 174 | <tr valign="top" class="yikes-checkbox-container"> |
175 | 175 | <td scope="row"> |
176 | - <label for="description_above_<?php echo esc_attr( $group['group_id'] ); ?>"> |
|
177 | - <?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
176 | + <label for="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>"> |
|
177 | + <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
178 | 178 | </label> |
179 | 179 | </td> |
180 | 180 | <td> |
181 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $group['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $group['group_id']; ?>][description_above]" value="1" /> |
|
182 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
181 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $group[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $group[ 'group_id' ]; ?>][description_above]" value="1" /> |
|
182 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
183 | 183 | </td> |
184 | 184 | </tr> |
185 | 185 | |
@@ -187,48 +187,48 @@ discard block |
||
187 | 187 | <tr valign="top"> |
188 | 188 | <td scope="row"> |
189 | 189 | <label for="placeholder"> |
190 | - <?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
190 | + <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
191 | 191 | </label> |
192 | 192 | </td> |
193 | 193 | <td> |
194 | - <input type="text" class="widefat" name="field[<?php echo $group['group_id']; ?>][additional-classes]" value="<?php echo isset( $group['classes'] ) ? stripslashes( wp_strip_all_tags( $group['classes'] ) ) : '' ; ?>" /> |
|
195 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
194 | + <input type="text" class="widefat" name="field[<?php echo $group[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $group[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $group[ 'classes' ] ) ) : ''; ?>" /> |
|
195 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
196 | 196 | </td> |
197 | 197 | </tr> |
198 | 198 | <!-- Required Toggle --> |
199 | 199 | <tr valign="top" class="yikes-checkbox-container"> |
200 | 200 | <td scope="row"> |
201 | 201 | <label for="field-required"> |
202 | - <?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
202 | + <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
203 | 203 | </label> |
204 | 204 | </td> |
205 | 205 | <td> |
206 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][require]"> |
|
207 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
206 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][require]"> |
|
207 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
208 | 208 | </td> |
209 | 209 | </tr> |
210 | 210 | <!-- Visible Toggle --> |
211 | 211 | <tr valign="top" class="yikes-checkbox-container"> |
212 | 212 | <td scope="row"> |
213 | 213 | <label for="hide-field"> |
214 | - <?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
214 | + <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
215 | 215 | </label> |
216 | 216 | </td> |
217 | 217 | <td> |
218 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group['group_id']; ?>][hide]"> |
|
219 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
218 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $group[ 'group_id' ]; ?>][hide]"> |
|
219 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
220 | 220 | </td> |
221 | 221 | </tr> |
222 | 222 | <!-- Toggle Field Label Visibility --> |
223 | 223 | <tr valign="top" class="yikes-checkbox-container"> |
224 | 224 | <td scope="row"> |
225 | 225 | <label for="placeholder"> |
226 | - <?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
226 | + <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
227 | 227 | </label> |
228 | 228 | </td> |
229 | 229 | <td> |
230 | - <input type="checkbox" name="field[<?php echo $group['group_id']; ?>][hide-label]" value="1" /> |
|
231 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
230 | + <input type="checkbox" name="field[<?php echo $group[ 'group_id' ]; ?>][hide-label]" value="1" /> |
|
231 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
232 | 232 | </td> |
233 | 233 | </tr> |
234 | 234 | <!-- Toggle Buttons --> |
@@ -238,8 +238,8 @@ discard block |
||
238 | 238 | </td> |
239 | 239 | <td> |
240 | 240 | <span class="toggle-container"> |
241 | - <a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
242 | - <a href="#" class="remove-field" alt="<?php echo $group['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
241 | + <a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
242 | + <a href="#" class="remove-field" alt="<?php echo $group[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
243 | 243 | </span> |
244 | 244 | </td> |
245 | 245 | </tr> |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | $form_data = array( |
3 | - 'field_name' => $_POST['field_name'], |
|
4 | - 'merge_tag' => $_POST['merge_tag'], |
|
5 | - 'field_type' => $_POST['field_type'], |
|
6 | - 'list_id' => $_POST['list_id'], |
|
3 | + 'field_name' => $_POST[ 'field_name' ], |
|
4 | + 'merge_tag' => $_POST[ 'merge_tag' ], |
|
5 | + 'field_type' => $_POST[ 'field_type' ], |
|
6 | + 'list_id' => $_POST[ 'list_id' ], |
|
7 | 7 | ); |
8 | 8 | |
9 | 9 | // Grab our list handler. |
10 | 10 | $list_handler = yikes_get_mc_api_manager()->get_list_handler(); |
11 | 11 | |
12 | -$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] ); |
|
12 | +$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] ); |
|
13 | 13 | if ( is_wp_error( $available_merge_variables ) ) { |
14 | 14 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
15 | 15 | $error_logging->maybe_write_to_log( |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | // find and return the location of this merge field in the array |
31 | -$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' ); |
|
31 | +$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' ); |
|
32 | 32 | |
33 | 33 | // store it and use it to pre-populate field data (only on initial add to form) |
34 | -$merge_field_data = $available_merge_variables['merge_fields'][ $index ]; |
|
34 | +$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ]; |
|
35 | 35 | ?> |
36 | -<section class="draggable" id="<?php echo $form_data['field_name']; ?>"> |
|
36 | +<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>"> |
|
37 | 37 | <!-- top --> |
38 | 38 | <a href="#" class="expansion-section-title settings-sidebar"> |
39 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
40 | - <?php echo stripslashes( $form_data['field_name'] ); ?> |
|
41 | - <span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span> |
|
39 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
|
40 | + <?php echo stripslashes( $form_data[ 'field_name' ] ); ?> |
|
41 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span> |
|
42 | 42 | </a> |
43 | 43 | <!-- expansion section --> |
44 | 44 | <div class="yikes-mc-settings-expansion-section"> |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | <!-- Single or Double Opt-in --> |
47 | 47 | <p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); --> |
48 | 48 | <!-- store the label --> |
49 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" /> |
|
50 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" /> |
|
51 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" /> |
|
52 | - <input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" /> |
|
49 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" /> |
|
50 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" /> |
|
51 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" /> |
|
52 | + <input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" /> |
|
53 | 53 | |
54 | - <?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?> |
|
55 | - <?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?> |
|
56 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' /> |
|
54 | + <?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?> |
|
55 | + <?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?> |
|
56 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' /> |
|
57 | 57 | <?php } ?> |
58 | 58 | |
59 | 59 | <table class="form-table form-field-container"> |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | <tr valign="top"> |
63 | 63 | <td scope="row"> |
64 | 64 | <label for="merge-tag"> |
65 | - <?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
65 | + <?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
66 | 66 | </label> |
67 | 67 | </td> |
68 | 68 | <td> |
69 | - <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>"> |
|
69 | + <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>"> |
|
70 | 70 | </td> |
71 | 71 | </tr> |
72 | 72 | |
73 | - <?php switch( $form_data['field_type'] ) { |
|
73 | + <?php switch ( $form_data[ 'field_type' ] ) { |
|
74 | 74 | |
75 | 75 | default: |
76 | 76 | break; |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | <tr valign="top"> |
88 | 88 | <td scope="row"> |
89 | 89 | <label for="placeholder"> |
90 | - <?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
90 | + <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
91 | 91 | </label> |
92 | 92 | </td> |
93 | 93 | <td> |
94 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" /> |
|
95 | - <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
94 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" /> |
|
95 | + <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
96 | 96 | </td> |
97 | 97 | </tr> |
98 | 98 | |
@@ -101,27 +101,27 @@ discard block |
||
101 | 101 | * Loop over field types and store necessary formats |
102 | 102 | * ( date, birthday - dateformat ; phone - phoneformat ) |
103 | 103 | */ |
104 | - switch( $form_data['field_type'] ) { |
|
104 | + switch ( $form_data[ 'field_type' ] ) { |
|
105 | 105 | |
106 | 106 | /* Store the date format, for properly rendering dates on the front end */ |
107 | 107 | case 'date': |
108 | - $date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY'; |
|
108 | + $date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY'; |
|
109 | 109 | ?> |
110 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
110 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
111 | 111 | <?php |
112 | 112 | break; |
113 | 113 | |
114 | 114 | case 'birthday': |
115 | - $date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD'; |
|
115 | + $date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD'; |
|
116 | 116 | ?> |
117 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
117 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" /> |
|
118 | 118 | <?php |
119 | 119 | break; |
120 | 120 | |
121 | 121 | /* Store the phone format, for properly regex pattern */ |
122 | 122 | case 'phone': |
123 | 123 | ?> |
124 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" /> |
|
124 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" /> |
|
125 | 125 | <?php |
126 | 126 | break; |
127 | 127 | } |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | ?> |
133 | 133 | <tr valign="top"> |
134 | 134 | <td scope="row"> |
135 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
136 | - <?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
135 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
136 | + <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
137 | 137 | </label> |
138 | 138 | </td> |
139 | 139 | <td> |
140 | - <input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" /> |
|
141 | - <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span> |
|
140 | + <input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" /> |
|
141 | + <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span> |
|
142 | 142 | </td> |
143 | 143 | </tr> |
144 | 144 | <?php |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | ?> |
149 | 149 | |
150 | 150 | <!-- Default Value --> |
151 | - <?php switch( $form_data['field_type'] ) { |
|
151 | + <?php switch ( $form_data[ 'field_type' ] ) { |
|
152 | 152 | |
153 | 153 | default: |
154 | 154 | case 'text': |
@@ -156,17 +156,17 @@ discard block |
||
156 | 156 | <tr valign="top"> |
157 | 157 | <td scope="row"> |
158 | 158 | <label for="placeholder"> |
159 | - <?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
159 | + <?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
160 | 160 | </label> |
161 | 161 | </td> |
162 | 162 | <td> |
163 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" /> |
|
164 | - <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
163 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" /> |
|
164 | + <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
165 | 165 | <?php |
166 | - switch ( $form_data['field_type'] ) { |
|
166 | + switch ( $form_data[ 'field_type' ] ) { |
|
167 | 167 | case 'text': |
168 | 168 | ?> |
169 | - <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
169 | + <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
170 | 170 | <?php |
171 | 171 | break; |
172 | 172 | } ?> |
@@ -180,28 +180,28 @@ discard block |
||
180 | 180 | <tr valign="top"> |
181 | 181 | <td scope="row"> |
182 | 182 | <label for="placeholder"> |
183 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
183 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
184 | 184 | </label> |
185 | 185 | </td> |
186 | 186 | <td> |
187 | - <?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?> |
|
188 | - <label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"> |
|
189 | - <input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>" |
|
187 | + <?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?> |
|
188 | + <label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"> |
|
189 | + <input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>" |
|
190 | 190 | type="radio" |
191 | - name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" |
|
191 | + name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" |
|
192 | 192 | value="no-default" <?php checked( $pre_selected, 'no-default' ); ?> |
193 | 193 | > |
194 | 194 | No Default |
195 | 195 | </label> |
196 | 196 | <?php |
197 | 197 | $x = 0; |
198 | - foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?> |
|
198 | + foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?> |
|
199 | 199 | <label> |
200 | - <input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?> |
|
200 | + <input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?> |
|
201 | 201 | </label> |
202 | 202 | <?php $x++; |
203 | 203 | } ?> |
204 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
204 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
205 | 205 | </td> |
206 | 206 | </tr> |
207 | 207 | |
@@ -213,18 +213,18 @@ discard block |
||
213 | 213 | <tr valign="top"> |
214 | 214 | <td scope="row"> |
215 | 215 | <label for="placeholder"> |
216 | - <?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
216 | + <?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
217 | 217 | </label> |
218 | 218 | </td> |
219 | 219 | <td> |
220 | - <select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"> |
|
221 | - <?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?> |
|
220 | + <select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"> |
|
221 | + <?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?> |
|
222 | 222 | <option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option> |
223 | - <?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?> |
|
223 | + <?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?> |
|
224 | 224 | <option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option> |
225 | 225 | <?php } ?> |
226 | 226 | </select> |
227 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
227 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
228 | 228 | </td> |
229 | 229 | </tr> |
230 | 230 | |
@@ -237,77 +237,77 @@ discard block |
||
237 | 237 | <tr valign="top"> |
238 | 238 | <td scope="row"> |
239 | 239 | <label for="placeholder"> |
240 | - <?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
240 | + <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
241 | 241 | </label> |
242 | 242 | </td> |
243 | 243 | <td> |
244 | - <textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea> |
|
245 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
244 | + <textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea> |
|
245 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
246 | 246 | </td> |
247 | 247 | </tr> |
248 | 248 | <!-- Description Above Field --> |
249 | 249 | <tr valign="top" class="yikes-checkbox-container"> |
250 | 250 | <td scope="row"> |
251 | - <label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>"> |
|
252 | - <?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
251 | + <label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>"> |
|
252 | + <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
253 | 253 | </label> |
254 | 254 | </td> |
255 | 255 | <td> |
256 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" /> |
|
257 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
256 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" /> |
|
257 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
258 | 258 | </td> |
259 | 259 | </tr> |
260 | 260 | <!-- Additional Classes --> |
261 | 261 | <tr valign="top"> |
262 | 262 | <td scope="row"> |
263 | 263 | <label for="placeholder"> |
264 | - <?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
264 | + <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
265 | 265 | </label> |
266 | 266 | </td> |
267 | 267 | <td> |
268 | - <input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" /> |
|
269 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
268 | + <input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" /> |
|
269 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
270 | 270 | </td> |
271 | 271 | </tr> |
272 | 272 | <!-- Required Toggle --> |
273 | 273 | <tr valign="top" class="yikes-checkbox-container"> |
274 | 274 | <td scope="row"> |
275 | 275 | <label for="field-required"> |
276 | - <?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
276 | + <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
277 | 277 | </label> |
278 | 278 | </td> |
279 | 279 | <td> |
280 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
281 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
280 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
281 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
282 | 282 | </td> |
283 | 283 | </tr> |
284 | 284 | <!-- Visible Toggle --> |
285 | 285 | <tr valign="top" class="yikes-checkbox-container"> |
286 | 286 | <td scope="row"> |
287 | 287 | <label for="hide-field"> |
288 | - <?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
288 | + <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
289 | 289 | </label> |
290 | 290 | </td> |
291 | 291 | <td> |
292 | - <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
293 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
292 | + <input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>"> |
|
293 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
294 | 294 | </td> |
295 | 295 | </tr> |
296 | 296 | <!-- Toggle Field Label Visibility --> |
297 | 297 | <tr valign="top" class="yikes-checkbox-container"> |
298 | 298 | <td scope="row"> |
299 | 299 | <label for="placeholder"> |
300 | - <?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
300 | + <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
301 | 301 | </label> |
302 | 302 | </td> |
303 | 303 | <td> |
304 | - <input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" /> |
|
305 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
304 | + <input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" /> |
|
305 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
306 | 306 | </td> |
307 | 307 | </tr> |
308 | 308 | <!-- Display Phone/Date Formats back to the user --> |
309 | 309 | <?php |
310 | - switch( $form_data['field_type'] ) { |
|
310 | + switch ( $form_data[ 'field_type' ] ) { |
|
311 | 311 | |
312 | 312 | /* Store the phone format, for properly regex pattern */ |
313 | 313 | case 'phone': |
@@ -318,23 +318,23 @@ discard block |
||
318 | 318 | <td scope="row"> |
319 | 319 | <label for="placeholder"> |
320 | 320 | <?php |
321 | - switch( $form_data['field_type'] ) { |
|
321 | + switch ( $form_data[ 'field_type' ] ) { |
|
322 | 322 | default: |
323 | 323 | case 'birthday': |
324 | - $type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
325 | - $format = $merge_field_data['options']['date_format']; |
|
324 | + $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
325 | + $format = $merge_field_data[ 'options' ][ 'date_format' ]; |
|
326 | 326 | $format_name = 'date_format'; |
327 | 327 | break; |
328 | 328 | |
329 | 329 | case 'date': |
330 | - $type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
331 | - $format = $merge_field_data['options']['date_format']; |
|
330 | + $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
331 | + $format = $merge_field_data[ 'options' ][ 'date_format' ]; |
|
332 | 332 | $format_name = 'date_format'; |
333 | 333 | break; |
334 | 334 | |
335 | 335 | case 'phone': |
336 | - $type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' ); |
|
337 | - $format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] ); |
|
336 | + $type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' ); |
|
337 | + $format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] ); |
|
338 | 338 | $format_name = 'phone_format'; |
339 | 339 | break; |
340 | 340 | } |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | </td> |
345 | 345 | <td> |
346 | 346 | <strong><?php echo $format; ?></strong> |
347 | - <input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
347 | + <input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
348 | 348 | <p class="description"><small> |
349 | 349 | <?php printf( __( 'To change the %s please head over to <a href="%s" title="MailChimp" target="_blank">MailChimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?> |
350 | 350 | </small></p> |
@@ -365,8 +365,8 @@ discard block |
||
365 | 365 | </td> |
366 | 366 | <td> |
367 | 367 | <span class="toggle-container"> |
368 | - <a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
369 | - <a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
368 | + <a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
369 | + <a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
370 | 370 | </span> |
371 | 371 | </td> |
372 | 372 | </tr> |