|
@@ -31,39 +31,39 @@ discard block |
|
|
block discarded – undo |
|
31
|
31
|
$form_submitted = isset( $form_submitted ) ? $form_submitted : 0; |
|
32
|
32
|
|
|
33
|
33
|
/* If the user hasn't authenticated yet, lets kill off */ |
|
34
|
|
- if ( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) { |
|
35
|
|
- return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>'; |
|
|
34
|
+ if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) { |
|
|
35
|
+ return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>'; |
|
36
|
36
|
} |
|
37
|
37
|
|
|
38
|
38
|
// if the user forgot to specify a form ID, lets kill of and warn them. |
|
39
|
|
- if( ! $atts['form'] ) { |
|
|
39
|
+ if ( ! $atts[ 'form' ] ) { |
|
40
|
40
|
return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' ); |
|
41
|
41
|
} |
|
42
|
42
|
|
|
43
|
43
|
// store our variables |
|
44
|
|
- $form_id = (int) $atts['form']; // form id (the id of the form in the database) |
|
|
44
|
+ $form_id = (int) $atts[ 'form' ]; // form id (the id of the form in the database) |
|
45
|
45
|
$interface = yikes_easy_mailchimp_extender_get_form_interface(); |
|
46
|
46
|
$form_data = $interface->get_form( $form_id ); |
|
47
|
47
|
|
|
48
|
48
|
// confirm we have some results, or return an error |
|
49
|
49
|
if ( empty( $form_data ) ) { |
|
50
|
|
- return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' ); |
|
|
50
|
+ return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' ); |
|
51
|
51
|
} |
|
52
|
52
|
|
|
53
|
53
|
/* |
|
54
|
54
|
* Check if the user wants to use reCAPTCHA Spam Prevention |
|
55
|
55
|
*/ |
|
56
|
|
- if ( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) { |
|
|
56
|
+ if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) { |
|
57
|
57
|
|
|
58
|
58
|
// Allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page). |
|
59
|
|
- if ( $atts['recaptcha'] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && absint( $atts['recaptcha_version'] ) !== 3 ) ) { |
|
|
59
|
+ if ( $atts[ 'recaptcha' ] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && absint( $atts[ 'recaptcha_version' ] ) !== 3 ) ) { |
|
60
|
60
|
|
|
61
|
61
|
// If either of the Private the Secret key is left blank, we should display an error back to the user. |
|
62
|
|
- if ( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) { |
|
63
|
|
- return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
|
62
|
+ if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) { |
|
|
63
|
+ return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
64
|
64
|
} |
|
65
|
|
- if ( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) { |
|
66
|
|
- return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
|
65
|
+ if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) { |
|
|
66
|
+ return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
67
|
67
|
} |
|
68
|
68
|
|
|
69
|
69
|
$has_recaptcha = true; |
|
@@ -73,13 +73,13 @@ discard block |
|
|
block discarded – undo |
|
73
|
73
|
$locale_split = explode( '_', $locale ); |
|
74
|
74
|
|
|
75
|
75
|
// Setup reCAPTCHA parameters. |
|
76
|
|
- $lang = ! empty( $locale_split ) ? $locale_split[0] : $locale; |
|
77
|
|
- $lang = ! empty( $atts['recaptcha_lang'] ) ? $atts['recaptcha_lang'] : $lang; |
|
78
|
|
- $type = ! empty( $atts['recaptcha_type'] ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type |
|
79
|
|
- $theme = ! empty( $atts['recaptcha_theme'] ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme |
|
80
|
|
- $size = ! empty( $atts['recaptcha_size'] ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size |
|
81
|
|
- $data_cb = ! empty( $atts['recaptcha_data_callback'] ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size |
|
82
|
|
- $expired_cb = ! empty( $atts['recaptcha_expired_callback'] ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size |
|
|
76
|
+ $lang = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale; |
|
|
77
|
+ $lang = ! empty( $atts[ 'recaptcha_lang' ] ) ? $atts[ 'recaptcha_lang' ] : $lang; |
|
|
78
|
+ $type = ! empty( $atts[ 'recaptcha_type' ] ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type |
|
|
79
|
+ $theme = ! empty( $atts[ 'recaptcha_theme' ] ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme |
|
|
80
|
+ $size = ! empty( $atts[ 'recaptcha_size' ] ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size |
|
|
81
|
+ $data_cb = ! empty( $atts[ 'recaptcha_data_callback' ] ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size |
|
|
82
|
+ $expired_cb = ! empty( $atts[ 'recaptcha_expired_callback' ] ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size |
|
83
|
83
|
|
|
84
|
84
|
// Pass the shortcode parameters through a filter. |
|
85
|
85
|
$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array( |
|
@@ -89,28 +89,28 @@ discard block |
|
|
block discarded – undo |
|
89
|
89
|
'size' => $size, |
|
90
|
90
|
'success_callback' => $data_cb, |
|
91
|
91
|
'expired_callback' => $expired_cb, |
|
92
|
|
- ), $atts['form'] ); |
|
|
92
|
+ ), $atts[ 'form' ] ); |
|
93
|
93
|
|
|
94
|
94
|
// Enqueue Google recaptcha JS. |
|
95
|
|
- wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ) , 'all' ); |
|
|
95
|
+ wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ), 'all' ); |
|
96
|
96
|
wp_enqueue_script( 'google-recaptcha-js' ); |
|
97
|
97
|
|
|
98
|
|
- $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' ); |
|
99
|
|
- $recaptcha_box = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params['theme'] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params['type'] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params['size'] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params['success_callback'] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params['expired_callback'] ) . '"></div>'; |
|
|
98
|
+ $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' ); |
|
|
99
|
+ $recaptcha_box = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params[ 'theme' ] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params[ 'type' ] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params[ 'size' ] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params[ 'success_callback' ] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params[ 'expired_callback' ] ) . '"></div>'; |
|
100
|
100
|
} |
|
101
|
101
|
|
|
102
|
102
|
// Allow users to manually override version 3 and use 2 on some forms. |
|
103
|
|
- if ( $atts['recaptcha'] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && $atts['recaptcha_version'] === 3 ) || ( get_option( 'yikes-mc-recaptcha-version-three', false ) ) ) { |
|
|
103
|
+ if ( $atts[ 'recaptcha' ] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && $atts[ 'recaptcha_version' ] === 3 ) || ( get_option( 'yikes-mc-recaptcha-version-three', false ) ) ) { |
|
104
|
104
|
|
|
105
|
105
|
// If either of the Private the Secret key is left blank, we should display an error back to the user. |
|
106
|
|
- if ( get_option( 'yikes-mc-recaptcha-site-key-three' , '' ) == '' ) { |
|
107
|
|
- return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
|
106
|
+ if ( get_option( 'yikes-mc-recaptcha-site-key-three', '' ) == '' ) { |
|
|
107
|
+ return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
108
|
108
|
} |
|
109
|
|
- if ( get_option( 'yikes-mc-recaptcha-secret-key-three' , '' ) == '' ) { |
|
110
|
|
- return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
|
109
|
+ if ( get_option( 'yikes-mc-recaptcha-secret-key-three', '' ) == '' ) { |
|
|
110
|
+ return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
111
|
111
|
} |
|
112
|
112
|
|
|
113
|
|
- $v3_site_key = get_option( 'yikes-mc-recaptcha-site-key-three' , '' ); |
|
|
113
|
+ $v3_site_key = get_option( 'yikes-mc-recaptcha-site-key-three', '' ); |
|
114
|
114
|
|
|
115
|
115
|
wp_enqueue_script( |
|
116
|
116
|
'yikes-google-recaptcha-v3', |
|
@@ -149,39 +149,39 @@ discard block |
|
|
block discarded – undo |
|
149
|
149
|
} |
|
150
|
150
|
|
|
151
|
151
|
// place our results into a separate variable for easy looping |
|
152
|
|
- $additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false; |
|
|
152
|
+ $additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false; |
|
153
|
153
|
|
|
154
|
154
|
// store our options from the additional form settings array |
|
155
|
|
- $form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : ''; |
|
156
|
|
- $inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : ''; |
|
157
|
|
- $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text'; |
|
158
|
|
- $submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
159
|
|
- $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : ''; |
|
160
|
|
- $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : ''; |
|
|
155
|
+ $form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : ''; |
|
|
156
|
+ $inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : ''; |
|
|
157
|
+ $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text'; |
|
|
158
|
+ $submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
|
159
|
+ $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : ''; |
|
|
160
|
+ $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : ''; |
|
161
|
161
|
|
|
162
|
162
|
// scheuldes |
|
163
|
|
- $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false; |
|
164
|
|
- $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';; |
|
165
|
|
- $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : ''; |
|
166
|
|
- $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : ''; |
|
167
|
|
- $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : ''; |
|
|
163
|
+ $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false; |
|
|
164
|
+ $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ; |
|
|
165
|
+ $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : ''; |
|
|
166
|
+ $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : ''; |
|
|
167
|
+ $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : ''; |
|
168
|
168
|
|
|
169
|
169
|
// register required |
|
170
|
|
- $form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false; |
|
171
|
|
- $form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : ''; |
|
|
170
|
+ $form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false; |
|
|
171
|
+ $form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : ''; |
|
172
|
172
|
|
|
173
|
173
|
// store number of fields |
|
174
|
|
- $field_count = (int) count( $form_data['fields'] ); |
|
|
174
|
+ $field_count = (int) count( $form_data[ 'fields' ] ); |
|
175
|
175
|
|
|
176
|
176
|
// confirm we actually have fields, before looping |
|
177
|
|
- if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
|
177
|
+ if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
178
|
178
|
|
|
179
|
179
|
// loop over each field, if it's set to hidden -- subtract it from the field count |
|
180
|
180
|
// this throws off the layout for inline forms setup below |
|
181
|
|
- foreach ( $form_data['fields'] as $form_field ) { |
|
|
181
|
+ foreach ( $form_data[ 'fields' ] as $form_field ) { |
|
182
|
182
|
|
|
183
|
|
- if ( isset( $form_field['hide'] ) && (string) $form_field['hide'] === '1' ) { |
|
184
|
|
- $field_count --; |
|
|
183
|
+ if ( isset( $form_field[ 'hide' ] ) && (string) $form_field[ 'hide' ] === '1' ) { |
|
|
184
|
+ $field_count--; |
|
185
|
185
|
} |
|
186
|
186
|
} |
|
187
|
187
|
} |
|
@@ -190,8 +190,8 @@ discard block |
|
|
block discarded – undo |
|
190
|
190
|
* If login is required, abort |
|
191
|
191
|
* @since 6.0.3.8 |
|
192
|
192
|
*/ |
|
193
|
|
- if( $form_login_required ) { |
|
194
|
|
- if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
|
193
|
+ if ( $form_login_required ) { |
|
|
194
|
+ if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
195
|
195
|
ob_start(); |
|
196
|
196
|
?> |
|
197
|
197
|
<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required"> |
|
@@ -207,19 +207,19 @@ discard block |
|
|
block discarded – undo |
|
207
|
207
|
* Check if schedule is set for this form |
|
208
|
208
|
* @since 6.0.3.8 |
|
209
|
209
|
*/ |
|
210
|
|
- if( $form_schedule_state ) { |
|
|
210
|
+ if ( $form_schedule_state ) { |
|
211
|
211
|
// store current date |
|
212
|
212
|
$current_date = strtotime( current_time( 'm/d/Y g:iA' ) ); |
|
213
|
213
|
|
|
214
|
214
|
// the the current date is less than the form scheduled start date |
|
215
|
|
- if( $current_date < $form_schedule_start ) { |
|
|
215
|
+ if ( $current_date < $form_schedule_start ) { |
|
216
|
216
|
echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message, $form_id, $form_schedule_start ); |
|
217
|
217
|
return; |
|
218
|
218
|
// abort |
|
219
|
219
|
} |
|
220
|
220
|
|
|
221
|
221
|
// The current date is past or equal to the end date, aka form has now expired |
|
222
|
|
- if( $current_date >= $form_schedule_end ) { |
|
|
222
|
+ if ( $current_date >= $form_schedule_end ) { |
|
223
|
223
|
echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message, $form_id, $form_schedule_end ); |
|
224
|
224
|
return; |
|
225
|
225
|
// abort |
|
@@ -228,14 +228,14 @@ discard block |
|
|
block discarded – undo |
|
228
|
228
|
|
|
229
|
229
|
// setup the submit button text |
|
230
|
230
|
// shortcode parameter takes precedence over option |
|
231
|
|
- $submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text; |
|
|
231
|
+ $submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text; |
|
232
|
232
|
|
|
233
|
233
|
/* |
|
234
|
234
|
* Check for the constant to prevent styles from loading |
|
235
|
235
|
* to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php |
|
236
|
236
|
* @since 6.0.3.8 |
|
237
|
237
|
*/ |
|
238
|
|
- if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
|
238
|
+ if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
239
|
239
|
// enqueue the form styles |
|
240
|
240
|
wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css' ); |
|
241
|
241
|
} |
|
@@ -243,19 +243,19 @@ discard block |
|
|
block discarded – undo |
|
243
|
243
|
/** |
|
244
|
244
|
* Check for form inline parameter |
|
245
|
245
|
*/ |
|
246
|
|
- $form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
|
246
|
+ $form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
247
|
247
|
// recheck from our form options |
|
248
|
248
|
if ( ! $form_inline ) { |
|
249
|
|
- $form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form']; |
|
|
249
|
+ $form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ]; |
|
250
|
250
|
} |
|
251
|
251
|
|
|
252
|
252
|
/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
|
253
|
|
- if( is_user_logged_in() ) { |
|
254
|
|
- if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
|
253
|
+ if ( is_user_logged_in() ) { |
|
|
254
|
+ if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
255
|
255
|
$edit_form_link = '<span class="edit-link">'; |
|
256
|
|
- $edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts['form'] ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
|
256
|
+ $edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts[ 'form' ] ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
257
|
257
|
$edit_form_link .= '</span>'; |
|
258
|
|
- $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) ); |
|
|
258
|
+ $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) ); |
|
259
|
259
|
} else { |
|
260
|
260
|
$edit_form_link = ''; |
|
261
|
261
|
} |
|
@@ -265,16 +265,16 @@ discard block |
|
|
block discarded – undo |
|
265
|
265
|
// or else Mailchimp throws errors at you |
|
266
|
266
|
// extract our array keys |
|
267
|
267
|
// @todo Remove array_keys() and in_array() usage here. |
|
268
|
|
- if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
269
|
|
- $array_keys = array_keys( $form_data['fields'] ); |
|
|
268
|
+ if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
|
269
|
+ $array_keys = array_keys( $form_data[ 'fields' ] ); |
|
270
|
270
|
// check for EMAIL in that array |
|
271
|
|
- if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) { |
|
272
|
|
- return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>'; |
|
|
271
|
+ if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) { |
|
|
272
|
+ return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>'; |
|
273
|
273
|
} |
|
274
|
274
|
} else { |
|
275
|
|
- $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
276
|
|
- if( is_user_logged_in() ) { |
|
277
|
|
- if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
|
275
|
+ $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
|
276
|
+ if ( is_user_logged_in() ) { |
|
|
277
|
+ if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
278
|
278
|
return $error . $edit_form_link; |
|
279
|
279
|
} |
|
280
|
280
|
} else { |
|
@@ -376,17 +376,17 @@ discard block |
|
|
block discarded – undo |
|
376
|
376
|
* Set a custom title using custom_title="lorem ipsum" parameter in the shortcode |
|
377
|
377
|
* - This takes precedence over the title set |
|
378
|
378
|
*/ |
|
379
|
|
- if ( $atts['title'] ) { |
|
380
|
|
- if ( ! empty( $atts['custom_title'] ) ) { |
|
|
379
|
+ if ( $atts[ 'title' ] ) { |
|
|
380
|
+ if ( ! empty( $atts[ 'custom_title' ] ) ) { |
|
381
|
381
|
/** |
|
382
|
382
|
* Filter the title that is displayed through the shortcode. |
|
383
|
383
|
* |
|
384
|
384
|
* @param string $title The title to display. |
|
385
|
385
|
* @param int $form_id The form ID. |
|
386
|
386
|
*/ |
|
387
|
|
- $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ); |
|
|
387
|
+ $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ); |
|
388
|
388
|
} else { |
|
389
|
|
- $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id ); |
|
|
389
|
+ $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id ); |
|
390
|
390
|
} |
|
391
|
391
|
|
|
392
|
392
|
echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title ); |
|
@@ -396,17 +396,17 @@ discard block |
|
|
block discarded – undo |
|
396
|
396
|
* Allow users to specify a custom description for this form, no html support |
|
397
|
397
|
* @since 6.0.3.8 |
|
398
|
398
|
*/ |
|
399
|
|
- if ( $atts['description'] ) { |
|
400
|
|
- if ( ! empty( $atts['custom_description'] ) ) { |
|
|
399
|
+ if ( $atts[ 'description' ] ) { |
|
|
400
|
+ if ( ! empty( $atts[ 'custom_description' ] ) ) { |
|
401
|
401
|
/** |
|
402
|
402
|
* Filter the description that is displayed through the shortcode. |
|
403
|
403
|
* |
|
404
|
404
|
* @param string $title The title to display. |
|
405
|
405
|
* @param int $form_id The form ID. |
|
406
|
406
|
*/ |
|
407
|
|
- $description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ); |
|
|
407
|
+ $description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ); |
|
408
|
408
|
} else { |
|
409
|
|
- $description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id ); |
|
|
409
|
+ $description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id ); |
|
410
|
410
|
} |
|
411
|
411
|
|
|
412
|
412
|
echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description ); |
|
@@ -421,10 +421,10 @@ discard block |
|
|
block discarded – undo |
|
421
|
421
|
$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
|
422
|
422
|
|
|
423
|
423
|
// Check for AJAX |
|
424
|
|
- if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) { |
|
|
424
|
+ if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) { |
|
425
|
425
|
|
|
426
|
426
|
// Enqueue our ajax script |
|
427
|
|
- wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js" , array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
|
427
|
+ wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js", array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
428
|
428
|
wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array( |
|
429
|
429
|
'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ), |
|
430
|
430
|
'page_data' => $page_data, |
|
@@ -456,67 +456,67 @@ discard block |
|
|
block discarded – undo |
|
456
|
456
|
|
|
457
|
457
|
// render the form! |
|
458
|
458
|
?> |
|
459
|
|
- <form id="<?php echo sanitize_title( $form_data['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_data['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>"> |
|
|
459
|
+ <form id="<?php echo sanitize_title( $form_data[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>"> |
|
460
|
460
|
|
|
461
|
461
|
<?php |
|
462
|
462
|
// Set a default constant for hidden fields |
|
463
|
463
|
$hidden_label_count = 0; |
|
464
|
464
|
|
|
465
|
465
|
// Loop over our form fields |
|
466
|
|
- foreach( $form_data['fields'] as $field ) { |
|
|
466
|
+ foreach ( $form_data[ 'fields' ] as $field ) { |
|
467
|
467
|
// input array |
|
468
|
468
|
$field_array = array(); |
|
469
|
469
|
// label array |
|
470
|
470
|
$label_array = array(); |
|
471
|
471
|
// label classes array |
|
472
|
472
|
$label_class_array = array(); |
|
473
|
|
- if( $field['additional-classes'] != '' ) { |
|
|
473
|
+ if ( $field[ 'additional-classes' ] != '' ) { |
|
474
|
474
|
// split custom classes at spaces |
|
475
|
|
- $custom_classes = explode( ' ' , $field['additional-classes'] ); |
|
|
475
|
+ $custom_classes = explode( ' ', $field[ 'additional-classes' ] ); |
|
476
|
476
|
// check our custom class array for field-left/field-right |
|
477
|
477
|
// if it's set we need to assign it to our label and remove it from the field classes |
|
478
|
478
|
// input half left |
|
479
|
|
- if( in_array( 'field-left-half' , $custom_classes ) ) { |
|
|
479
|
+ if ( in_array( 'field-left-half', $custom_classes ) ) { |
|
480
|
480
|
// $label_array['class'] = 'class="field-left-half"'; |
|
481
|
|
- $label_class_array[] = 'field-left-half'; |
|
482
|
|
- $key = array_search( 'field-left-half' , $custom_classes ); |
|
483
|
|
- unset( $custom_classes[$key] ); |
|
|
481
|
+ $label_class_array[ ] = 'field-left-half'; |
|
|
482
|
+ $key = array_search( 'field-left-half', $custom_classes ); |
|
|
483
|
+ unset( $custom_classes[ $key ] ); |
|
484
|
484
|
} // input half right |
|
485
|
|
- if( in_array( 'field-right-half' , $custom_classes ) ) { |
|
|
485
|
+ if ( in_array( 'field-right-half', $custom_classes ) ) { |
|
486
|
486
|
// $label_array['class'] = 'class="field-right-half"'; |
|
487
|
|
- $label_class_array[] = 'field-right-half'; |
|
488
|
|
- $key = array_search( 'field-right-half' , $custom_classes ); |
|
489
|
|
- unset( $custom_classes[$key] ); |
|
|
487
|
+ $label_class_array[ ] = 'field-right-half'; |
|
|
488
|
+ $key = array_search( 'field-right-half', $custom_classes ); |
|
|
489
|
+ unset( $custom_classes[ $key ] ); |
|
490
|
490
|
} // input thirds (1/3 width, floated left) |
|
491
|
|
- if( in_array( 'field-third' , $custom_classes ) ) { |
|
|
491
|
+ if ( in_array( 'field-third', $custom_classes ) ) { |
|
492
|
492
|
// $label_array['class'] = 'class="field-third"'; |
|
493
|
|
- $label_class_array[] = 'field-third'; |
|
494
|
|
- $key = array_search( 'field-third' , $custom_classes ); |
|
495
|
|
- unset( $custom_classes[$key] ); |
|
|
493
|
+ $label_class_array[ ] = 'field-third'; |
|
|
494
|
+ $key = array_search( 'field-third', $custom_classes ); |
|
|
495
|
+ unset( $custom_classes[ $key ] ); |
|
496
|
496
|
} // 2 column radio |
|
497
|
|
- if( in_array( 'option-2-col' , $custom_classes ) ) { |
|
|
497
|
+ if ( in_array( 'option-2-col', $custom_classes ) ) { |
|
498
|
498
|
// $label_array['class'] = 'class="option-2-col"'; |
|
499
|
|
- $label_class_array[] = 'option-2-col'; |
|
500
|
|
- $key = array_search( 'option-2-col' , $custom_classes ); |
|
501
|
|
- unset( $custom_classes[$key] ); |
|
|
499
|
+ $label_class_array[ ] = 'option-2-col'; |
|
|
500
|
+ $key = array_search( 'option-2-col', $custom_classes ); |
|
|
501
|
+ unset( $custom_classes[ $key ] ); |
|
502
|
502
|
} // 3 column radio |
|
503
|
|
- if( in_array( 'option-3-col' , $custom_classes ) ) { |
|
|
503
|
+ if ( in_array( 'option-3-col', $custom_classes ) ) { |
|
504
|
504
|
// $label_array['class'] = 'class="option-3-col"'; |
|
505
|
|
- $label_class_array[] = 'option-3-col'; |
|
506
|
|
- $key = array_search( 'option-3-col' , $custom_classes ); |
|
507
|
|
- unset( $custom_classes[$key] ); |
|
|
505
|
+ $label_class_array[ ] = 'option-3-col'; |
|
|
506
|
+ $key = array_search( 'option-3-col', $custom_classes ); |
|
|
507
|
+ unset( $custom_classes[ $key ] ); |
|
508
|
508
|
} // 4 column radio |
|
509
|
|
- if( in_array( 'option-4-col' , $custom_classes ) ) { |
|
|
509
|
+ if ( in_array( 'option-4-col', $custom_classes ) ) { |
|
510
|
510
|
// $label_array['class'] = 'class="option-4-col"'; |
|
511
|
|
- $label_class_array[] = 'option-4-col'; |
|
512
|
|
- $key = array_search( 'option-4-col' , $custom_classes ); |
|
513
|
|
- unset( $custom_classes[$key] ); |
|
|
511
|
+ $label_class_array[ ] = 'option-4-col'; |
|
|
512
|
+ $key = array_search( 'option-4-col', $custom_classes ); |
|
|
513
|
+ unset( $custom_classes[ $key ] ); |
|
514
|
514
|
} // inline radio & checkboxes etc |
|
515
|
|
- if( in_array( 'option-inline' , $custom_classes ) ) { |
|
|
515
|
+ if ( in_array( 'option-inline', $custom_classes ) ) { |
|
516
|
516
|
// $label_array['class'] = 'class="option-inline"'; |
|
517
|
|
- $label_class_array[] = 'option-inline'; |
|
518
|
|
- $key = array_search( 'option-inline' , $custom_classes ); |
|
519
|
|
- unset( $custom_classes[$key] ); |
|
|
517
|
+ $label_class_array[ ] = 'option-inline'; |
|
|
518
|
+ $key = array_search( 'option-inline', $custom_classes ); |
|
|
519
|
+ unset( $custom_classes[ $key ] ); |
|
520
|
520
|
} |
|
521
|
521
|
} else { |
|
522
|
522
|
$custom_classes = array(); |
|
@@ -524,19 +524,19 @@ discard block |
|
|
block discarded – undo |
|
524
|
524
|
|
|
525
|
525
|
// if the form is set to inline, add the inline class to our labels |
|
526
|
526
|
// since @6.0.3.8 |
|
527
|
|
- if( $form_inline ) { |
|
528
|
|
- $label_class_array[] = 'label-inline'; |
|
|
527
|
+ if ( $form_inline ) { |
|
|
528
|
+ $label_class_array[ ] = 'label-inline'; |
|
529
|
529
|
} |
|
530
|
530
|
|
|
531
|
|
- if( isset( $field['hide-label'] ) ) { |
|
532
|
|
- if( absint( $field['hide-label'] ) === 1 ) { |
|
|
531
|
+ if ( isset( $field[ 'hide-label' ] ) ) { |
|
|
532
|
+ if ( absint( $field[ 'hide-label' ] ) === 1 ) { |
|
533
|
533
|
$hidden_label_count++; |
|
534
|
|
- $custom_classes[] = 'field-no-label'; |
|
|
534
|
+ $custom_classes[ ] = 'field-no-label'; |
|
535
|
535
|
} |
|
536
|
536
|
} |
|
537
|
537
|
|
|
538
|
538
|
/* Store tag variable based on field type */ |
|
539
|
|
- if( isset( $field['merge'] ) ) { |
|
|
539
|
+ if ( isset( $field[ 'merge' ] ) ) { |
|
540
|
540
|
$group = ''; |
|
541
|
541
|
$tag = 'merge'; |
|
542
|
542
|
} else { |
|
@@ -546,28 +546,28 @@ discard block |
|
|
block discarded – undo |
|
546
|
546
|
|
|
547
|
547
|
// build up our array |
|
548
|
548
|
$field_id_string = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ]; |
|
549
|
|
- $field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
550
|
|
- $field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
551
|
|
- $field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : ''; |
|
552
|
|
- $field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' . esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" '; |
|
|
549
|
+ $field_array[ 'id' ] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
|
550
|
+ $field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
|
551
|
+ $field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : ''; |
|
|
552
|
+ $field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" '; |
|
553
|
553
|
|
|
554
|
554
|
// email must always be required and visible |
|
555
|
|
- if( $field['type'] == 'email' ) { |
|
556
|
|
- $field_array['required'] = 'required="required"'; |
|
557
|
|
- $label_array['visible'] = ''; |
|
558
|
|
- $label_class_array[] = $field['merge'] . '-label'; |
|
559
|
|
- $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
|
555
|
+ if ( $field[ 'type' ] == 'email' ) { |
|
|
556
|
+ $field_array[ 'required' ] = 'required="required"'; |
|
|
557
|
+ $label_array[ 'visible' ] = ''; |
|
|
558
|
+ $label_class_array[ ] = $field[ 'merge' ] . '-label'; |
|
|
559
|
+ $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
560
|
560
|
} else { |
|
561
|
|
- $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : ''; |
|
562
|
|
- $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : ''; |
|
563
|
|
- $label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label'; |
|
564
|
|
- if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
|
561
|
+ $field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : ''; |
|
|
562
|
+ $label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : ''; |
|
|
563
|
+ $label_class_array[ ] = ( $tag === 'merge' ) ? $field[ 'merge' ] . '-label' : $field[ 'group_id' ] . '-label'; |
|
|
564
|
+ if ( isset( $field[ 'require' ] ) ) $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
565
|
565
|
} |
|
566
|
566
|
|
|
567
|
567
|
// if both hide label and hide field are checked, we gotta hide the field! |
|
568
|
|
- if( isset( $field['hide' ] ) && $field['hide'] == 1 ) { |
|
569
|
|
- if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) { |
|
570
|
|
- $field_array['visible'] = 'style="display:none;"'; |
|
|
568
|
+ if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) { |
|
|
569
|
+ if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) { |
|
|
570
|
+ $field_array[ 'visible' ] = 'style="display:none;"'; |
|
571
|
571
|
} |
|
572
|
572
|
} |
|
573
|
573
|
|
|
@@ -575,20 +575,20 @@ discard block |
|
|
block discarded – undo |
|
575
|
575
|
$label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array; |
|
576
|
576
|
|
|
577
|
577
|
// Turn the clases into a string |
|
578
|
|
- $label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
|
578
|
+ $label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
579
|
579
|
|
|
580
|
580
|
// Filter the field array data |
|
581
|
581
|
$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id ); |
|
582
|
582
|
|
|
583
|
583
|
/* Loop Over Standard Fields (aka merge variables) */ |
|
584
|
|
- if( isset( $field['merge'] ) ) { |
|
|
584
|
+ if ( isset( $field[ 'merge' ] ) ) { |
|
585
|
585
|
|
|
586
|
586
|
// Handle the Description logic in one spot, here: |
|
587
|
|
- $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
588
|
|
- $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
|
587
|
+ $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
|
588
|
+ $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
589
|
589
|
if ( $show_description === true ) { |
|
590
|
|
- $description = '<p class="form-field-description" id="form-field-description-' . $field['merge'] . '">'; |
|
591
|
|
- $description .= apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
|
590
|
+ $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'merge' ] . '">'; |
|
|
591
|
+ $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
592
|
592
|
$description .= '</p>'; |
|
593
|
593
|
|
|
594
|
594
|
/** |
|
@@ -600,11 +600,11 @@ discard block |
|
|
block discarded – undo |
|
600
|
600
|
* @param string | $field['description'] | The field's description text |
|
601
|
601
|
* @param int | $form_id |
|
602
|
602
|
*/ |
|
603
|
|
- $description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
|
603
|
+ $description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
604
|
604
|
} |
|
605
|
605
|
|
|
606
|
606
|
// loop over our fields by Type |
|
607
|
|
- switch ( $field['type'] ) { |
|
|
607
|
+ switch ( $field[ 'type' ] ) { |
|
608
|
608
|
|
|
609
|
609
|
default: |
|
610
|
610
|
case 'email': |
|
@@ -612,24 +612,24 @@ discard block |
|
|
block discarded – undo |
|
612
|
612
|
case 'number': |
|
613
|
613
|
|
|
614
|
614
|
// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type) |
|
615
|
|
- $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
|
615
|
+ $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
616
|
616
|
$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value ); |
|
617
|
|
- $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
|
617
|
+ $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
618
|
618
|
|
|
619
|
619
|
?> |
|
620
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
620
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
621
|
621
|
|
|
622
|
622
|
<!-- dictate label visibility --> |
|
623
|
|
- <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
624
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
625
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?> |
|
|
623
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
624
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
625
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?> |
|
626
|
626
|
</span> |
|
627
|
627
|
<?php } ?> |
|
628
|
628
|
|
|
629
|
629
|
<!-- Description Above --> |
|
630
|
630
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
631
|
631
|
|
|
632
|
|
- <input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
|
632
|
+ <input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
633
|
633
|
|
|
634
|
634
|
<!-- Description Below --> |
|
635
|
635
|
<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
|
@@ -641,23 +641,23 @@ discard block |
|
|
block discarded – undo |
|
641
|
641
|
|
|
642
|
642
|
case 'url': |
|
643
|
643
|
case 'imageurl': |
|
644
|
|
- $default_value = ( isset( $field['default'] ) ) ? $field['default'] : ''; |
|
645
|
|
- $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
|
644
|
+ $default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : ''; |
|
|
645
|
+ $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
646
|
646
|
?> |
|
647
|
647
|
|
|
648
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
648
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
649
|
649
|
|
|
650
|
650
|
<!-- dictate label visibility --> |
|
651
|
|
- <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
652
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
653
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
651
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
652
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
653
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
654
|
654
|
</span> |
|
655
|
655
|
<?php } ?> |
|
656
|
656
|
|
|
657
|
657
|
<!-- Description Above --> |
|
658
|
658
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
659
|
659
|
|
|
660
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" > |
|
|
660
|
+ <input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" > |
|
661
|
661
|
|
|
662
|
662
|
<!-- Description Below --> |
|
663
|
663
|
<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
|
@@ -668,24 +668,24 @@ discard block |
|
|
block discarded – undo |
|
668
|
668
|
break; |
|
669
|
669
|
|
|
670
|
670
|
case 'phone': |
|
671
|
|
- $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
672
|
|
- $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
673
|
|
- $phone_format = $field['phone_format']; |
|
|
671
|
+ $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
|
672
|
+ $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
|
673
|
+ $phone_format = $field[ 'phone_format' ]; |
|
674
|
674
|
?> |
|
675
|
675
|
|
|
676
|
|
- <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
676
|
+ <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
677
|
677
|
|
|
678
|
678
|
<!-- dictate label visibility --> |
|
679
|
|
- <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
680
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
681
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
679
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
680
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
681
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
682
|
682
|
</span> |
|
683
|
683
|
<?php } ?> |
|
684
|
684
|
|
|
685
|
685
|
<!-- Description Above --> |
|
686
|
686
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
687
|
687
|
|
|
688
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
|
688
|
+ <input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
689
|
689
|
|
|
690
|
690
|
<!-- Description Below --> |
|
691
|
691
|
<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
|
@@ -695,23 +695,23 @@ discard block |
|
|
block discarded – undo |
|
695
|
695
|
break; |
|
696
|
696
|
|
|
697
|
697
|
case 'zip': |
|
698
|
|
- $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
699
|
|
- $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
|
698
|
+ $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
|
699
|
+ $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
700
|
700
|
|
|
701
|
701
|
?> |
|
702
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
702
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
703
|
703
|
|
|
704
|
704
|
<!-- dictate label visibility --> |
|
705
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
706
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
707
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
705
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
706
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
707
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
708
|
708
|
</span> |
|
709
|
709
|
<?php } ?> |
|
710
|
710
|
|
|
711
|
711
|
<!-- Description Above --> |
|
712
|
712
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
713
|
713
|
|
|
714
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
|
714
|
+ <input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
715
|
715
|
|
|
716
|
716
|
<!-- Description Below --> |
|
717
|
717
|
<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
|
@@ -724,7 +724,7 @@ discard block |
|
|
block discarded – undo |
|
724
|
724
|
case 'address': |
|
725
|
725
|
|
|
726
|
726
|
// required fields |
|
727
|
|
- $required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' ); |
|
|
727
|
+ $required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' ); |
|
728
|
728
|
|
|
729
|
729
|
/** |
|
730
|
730
|
* Filter to control the default country (the option pre-selected in the country dropdown). |
|
@@ -740,55 +740,55 @@ discard block |
|
|
block discarded – undo |
|
740
|
740
|
if ( $show_description === true && $description_above === true ) { echo $description; } |
|
741
|
741
|
|
|
742
|
742
|
// Placeholder logic |
|
743
|
|
- if ( ! empty( $field_array['placeholder'] ) ) { |
|
|
743
|
+ if ( ! empty( $field_array[ 'placeholder' ] ) ) { |
|
744
|
744
|
|
|
745
|
745
|
$use_address_placeholder = true; |
|
746
|
746
|
|
|
747
|
747
|
// Don't use the address field's array placeholder - use the custom placeholder |
|
748
|
|
- unset( $field_array['placeholder'] ); |
|
|
748
|
+ unset( $field_array[ 'placeholder' ] ); |
|
749
|
749
|
} |
|
750
|
750
|
|
|
751
|
751
|
// store number for looping |
|
752
|
752
|
$x = 1; |
|
753
|
|
- foreach( $required_fields as $type => $label ) { |
|
|
753
|
+ foreach ( $required_fields as $type => $label ) { |
|
754
|
754
|
|
|
755
|
755
|
// set the field names for the address fields |
|
756
|
|
- $field_array['name'] = 'name="' . $field[$tag] . '[' . $type . ']' . '"'; |
|
|
756
|
+ $field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"'; |
|
757
|
757
|
|
|
758
|
758
|
// Set the placeholder value if we need to |
|
759
|
759
|
$placeholder = isset( $use_address_placeholder ) ? apply_filters( 'yikes-mailchimp-address-' . $type . '-placeholder', ucwords( $label ) ) : ''; |
|
760
|
760
|
|
|
761
|
761
|
// reset the label classes for left-half/right-half for addresses |
|
762
|
|
- if( isset( $label_array['class'] ) ) { |
|
|
762
|
+ if ( isset( $label_array[ 'class' ] ) ) { |
|
763
|
763
|
if ( $x % 2 == 0 ) { |
|
764
|
|
- $label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] ); |
|
|
764
|
+ $label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] ); |
|
765
|
765
|
} else { |
|
766
|
|
- $label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] ); |
|
|
766
|
+ $label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] ); |
|
767
|
767
|
} |
|
768
|
768
|
} |
|
769
|
769
|
|
|
770
|
770
|
// Never force addr2 to be required |
|
771
|
771
|
if ( $type === 'addr2' ) { |
|
772
|
|
- $field_array['required'] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
|
772
|
+ $field_array[ 'required' ] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
773
|
773
|
} |
|
774
|
774
|
|
|
775
|
|
- switch( $type ) { |
|
|
775
|
+ switch ( $type ) { |
|
776
|
776
|
|
|
777
|
777
|
default: |
|
778
|
778
|
case 'addr1': |
|
779
|
779
|
case 'addr2': |
|
780
|
780
|
case 'city': |
|
781
|
781
|
?> |
|
782
|
|
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
782
|
+ <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
783
|
783
|
|
|
784
|
784
|
<!-- dictate label visibility --> |
|
785
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
786
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
787
|
|
- <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
|
785
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
786
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
787
|
+ <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
788
|
788
|
</span> |
|
789
|
789
|
<?php } ?> |
|
790
|
790
|
|
|
791
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if( isset( $_POST[$field['merge']][$type] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']][$type] ); } ?>"> |
|
|
791
|
+ <input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ][ $type ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ][ $type ] ); } ?>"> |
|
792
|
792
|
|
|
793
|
793
|
</label> |
|
794
|
794
|
<?php |
|
@@ -797,16 +797,16 @@ discard block |
|
|
block discarded – undo |
|
797
|
797
|
|
|
798
|
798
|
case 'state': |
|
799
|
799
|
?> |
|
800
|
|
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"> |
|
|
800
|
+ <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"> |
|
801
|
801
|
|
|
802
|
802
|
<!-- dictate label visibility --> |
|
803
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
804
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
805
|
|
- <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
|
803
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
804
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
805
|
+ <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
806
|
806
|
</span> |
|
807
|
807
|
<?php } ?> |
|
808
|
808
|
|
|
809
|
|
- <select <?php echo implode( ' ' , $field_array ); ?>> |
|
|
809
|
+ <select <?php echo implode( ' ', $field_array ); ?>> |
|
810
|
810
|
<?php |
|
811
|
811
|
$state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); |
|
812
|
812
|
/** |
|
@@ -832,21 +832,21 @@ discard block |
|
|
block discarded – undo |
|
832
|
832
|
case 'zip': |
|
833
|
833
|
|
|
834
|
834
|
?> |
|
835
|
|
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>> |
|
|
835
|
+ <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>> |
|
836
|
836
|
|
|
837
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
838
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
839
|
|
- <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
|
837
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
838
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
839
|
+ <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
840
|
840
|
</span> |
|
841
|
841
|
<?php } ?> |
|
842
|
842
|
|
|
843
|
843
|
<?php |
|
844
|
844
|
// If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently... |
|
845
|
|
- if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { |
|
846
|
|
- if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) { |
|
847
|
|
- $zip_value = $_POST[$field['merge']]['zip']; |
|
|
845
|
+ if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { |
|
|
846
|
+ if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) { |
|
|
847
|
+ $zip_value = $_POST[ $field[ 'merge' ] ][ 'zip' ]; |
|
848
|
848
|
} else { |
|
849
|
|
- $zip_value = $_POST[$field['merge']]; |
|
|
849
|
+ $zip_value = $_POST[ $field[ 'merge' ] ]; |
|
850
|
850
|
} |
|
851
|
851
|
} else { |
|
852
|
852
|
|
|
@@ -866,7 +866,7 @@ discard block |
|
|
block discarded – undo |
|
866
|
866
|
} |
|
867
|
867
|
?> |
|
868
|
868
|
|
|
869
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>"> |
|
|
869
|
+ <input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>"> |
|
870
|
870
|
|
|
871
|
871
|
</label> |
|
872
|
872
|
<?php |
|
@@ -876,16 +876,16 @@ discard block |
|
|
block discarded – undo |
|
876
|
876
|
case 'country': |
|
877
|
877
|
?> |
|
878
|
878
|
|
|
879
|
|
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
879
|
+ <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
880
|
880
|
|
|
881
|
881
|
<!-- dictate label visibility --> |
|
882
|
|
- <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
883
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
884
|
|
- <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
|
882
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
883
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
884
|
+ <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
885
|
885
|
</span> |
|
886
|
886
|
<?php } ?> |
|
887
|
887
|
|
|
888
|
|
- <select <?php echo implode( ' ' , $field_array ); ?> data-country="true"> |
|
|
888
|
+ <select <?php echo implode( ' ', $field_array ); ?> data-country="true"> |
|
889
|
889
|
<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?> |
|
890
|
890
|
</select> |
|
891
|
891
|
</label> |
|
@@ -931,40 +931,40 @@ discard block |
|
|
block discarded – undo |
|
931
|
931
|
wp_register_script( 'yikes-datepicker-scripts', YIKES_MC_URL . "public/js/yikes-datepicker-scripts{$min}.js", array( 'jquery-ui-datepicker' ), YIKES_MC_VERSION, false ); |
|
932
|
932
|
wp_localize_script( 'yikes-datepicker-scripts', 'datepicker_settings', $datepicker_options ); |
|
933
|
933
|
wp_enqueue_script( 'yikes-datepicker-scripts' ); |
|
934
|
|
- wp_enqueue_style( 'jquery-datepicker-styles' , YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
935
|
|
- wp_enqueue_style( 'yikes-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
|
934
|
+ wp_enqueue_style( 'jquery-datepicker-styles', YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
|
935
|
+ wp_enqueue_style( 'yikes-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
936
|
936
|
|
|
937
|
|
- switch ( $field['type'] ) { |
|
|
937
|
+ switch ( $field[ 'type' ] ) { |
|
938
|
938
|
default: |
|
939
|
939
|
case 'date': |
|
940
|
|
- $date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yyyy'; |
|
|
940
|
+ $date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yyyy'; |
|
941
|
941
|
break; |
|
942
|
942
|
|
|
943
|
943
|
case 'birthday': |
|
944
|
|
- $date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd'; |
|
|
944
|
+ $date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd'; |
|
945
|
945
|
break; |
|
946
|
946
|
} |
|
947
|
947
|
|
|
948
|
|
- $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
949
|
|
- $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
|
948
|
+ $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
|
949
|
+ $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
950
|
950
|
|
|
951
|
951
|
// store empty number for looping |
|
952
|
952
|
$x = 0; |
|
953
|
953
|
|
|
954
|
954
|
?> |
|
955
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
955
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
956
|
956
|
|
|
957
|
957
|
<!-- dictate label visibility --> |
|
958
|
|
- <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
959
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
960
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
958
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
959
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
960
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
961
|
961
|
</span> |
|
962
|
962
|
<?php } ?> |
|
963
|
963
|
|
|
964
|
964
|
<!-- Description Above --> |
|
965
|
965
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
966
|
966
|
|
|
967
|
|
- <input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>"> |
|
|
967
|
+ <input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>"> |
|
968
|
968
|
|
|
969
|
969
|
<!-- Description Below --> |
|
970
|
970
|
<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
|
@@ -975,33 +975,33 @@ discard block |
|
|
block discarded – undo |
|
975
|
975
|
break; |
|
976
|
976
|
|
|
977
|
977
|
case 'dropdown': |
|
978
|
|
- $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
979
|
|
- $no_default_name = __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ); |
|
|
978
|
+ $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
|
979
|
+ $no_default_name = __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ); |
|
980
|
980
|
|
|
981
|
|
- if ( isset( $field['placeholder'] ) && 'no-default' === $field['default_choice'] ) { |
|
|
981
|
+ if ( isset( $field[ 'placeholder' ] ) && 'no-default' === $field[ 'default_choice' ] ) { |
|
982
|
982
|
$no_default = true; |
|
983
|
|
- $no_default_name = $field['placeholder']; |
|
|
983
|
+ $no_default_name = $field[ 'placeholder' ]; |
|
984
|
984
|
} |
|
985
|
985
|
|
|
986
|
|
- $default_choice = is_array( $field['default_choice'] ) ? $field['default_choice'] : array( $field['default_choice'] ); |
|
|
986
|
+ $default_choice = is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : array( $field[ 'default_choice' ] ); |
|
987
|
987
|
|
|
988
|
988
|
// store empty number for looping |
|
989
|
989
|
$x = 0; |
|
990
|
990
|
?> |
|
991
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
991
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
992
|
992
|
<!-- dictate label visibility --> |
|
993
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
994
|
|
- <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
995
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
993
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
994
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
|
995
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
996
|
996
|
</span> |
|
997
|
997
|
<?php } |
|
998
|
998
|
|
|
999
|
999
|
// decode for looping |
|
1000
|
|
- $choices = json_decode( $field['choices'], true ); |
|
|
1000
|
+ $choices = json_decode( $field[ 'choices' ], true ); |
|
1001
|
1001
|
|
|
1002
|
1002
|
// If the form was submitted, but failed, let's default to the chosen option |
|
1003
|
|
- if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
1004
|
|
- $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
|
1003
|
+ if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
|
1004
|
+ $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
1005
|
1005
|
} |
|
1006
|
1006
|
|
|
1007
|
1007
|
?> |
|
@@ -1009,11 +1009,11 @@ discard block |
|
|
block discarded – undo |
|
1009
|
1009
|
<!-- Description Above --> |
|
1010
|
1010
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
1011
|
1011
|
|
|
1012
|
|
- <select <?php echo implode( ' ' , $field_array ); ?>> |
|
|
1012
|
+ <select <?php echo implode( ' ', $field_array ); ?>> |
|
1013
|
1013
|
<?php |
|
1014
|
1014
|
$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-field-no-default-option-name', $no_default_name, $form_id ); |
|
1015
|
1015
|
echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
|
1016
|
|
- foreach( $choices as $choice ) { ?> |
|
|
1016
|
+ foreach ( $choices as $choice ) { ?> |
|
1017
|
1017
|
<option |
|
1018
|
1018
|
value="<?php echo esc_attr( $choice ); ?>" |
|
1019
|
1019
|
<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'selected="selected"'; } ?>> |
|
@@ -1036,17 +1036,17 @@ discard block |
|
|
block discarded – undo |
|
1036
|
1036
|
case 'radio': |
|
1037
|
1037
|
case 'checkbox': |
|
1038
|
1038
|
// remove the ID (as to not assign the same ID to every radio button) |
|
1039
|
|
- unset( $field_array['id'] ); |
|
1040
|
|
- $choices = json_decode( $field['choices'], true ); |
|
|
1039
|
+ unset( $field_array[ 'id' ] ); |
|
|
1040
|
+ $choices = json_decode( $field[ 'choices' ], true ); |
|
1041
|
1041
|
|
|
1042
|
1042
|
// assign a default choice |
|
1043
|
|
- $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
1044
|
|
- $default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? $field['default_choice'] : $choices[0]; |
|
|
1043
|
+ $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
|
1044
|
+ $default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? $field[ 'default_choice' ] : $choices[ 0 ]; |
|
1045
|
1045
|
$default_choice = ( is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
|
1046
|
1046
|
|
|
1047
|
1047
|
// If the form was submitted, but failed, let's default to the chosen option |
|
1048
|
|
- if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
1049
|
|
- $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
|
1048
|
+ if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
|
1049
|
+ $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
1050
|
1050
|
} |
|
1051
|
1051
|
|
|
1052
|
1052
|
$count = count( $choices ); |
|
@@ -1054,29 +1054,29 @@ discard block |
|
|
block discarded – undo |
|
1054
|
1054
|
$x = 0; |
|
1055
|
1055
|
|
|
1056
|
1056
|
?> |
|
1057
|
|
- <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
1057
|
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
1058
|
1058
|
|
|
1059
|
1059
|
<!-- dictate label visibility --> |
|
1060
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
1061
|
|
- <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label"> |
|
1062
|
|
- <?php echo esc_attr( apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label', stripslashes( $field['label'] ) ) ); ?> |
|
|
1060
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
1061
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label"> |
|
|
1062
|
+ <?php echo esc_attr( apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', stripslashes( $field[ 'label' ] ) ) ); ?> |
|
1063
|
1063
|
</span> |
|
1064
|
1064
|
<?php } |
|
1065
|
1065
|
|
|
1066
|
1066
|
// <!-- Description Above --> |
|
1067
|
1067
|
if ( $show_description === true && $description_above === true ) { echo $description; } |
|
1068
|
1068
|
|
|
1069
|
|
- foreach( $choices as $choice ) { |
|
|
1069
|
+ foreach ( $choices as $choice ) { |
|
1070
|
1070
|
?> |
|
1071
|
|
- <label for="<?php echo esc_attr( $field['merge'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $i === $count ) { ?> last-selection<?php } ?>"> |
|
|
1071
|
+ <label for="<?php echo esc_attr( $field[ 'merge' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $i === $count ) { ?> last-selection<?php } ?>"> |
|
1072
|
1072
|
<input |
|
1073
|
|
- type="<?php echo esc_attr( $field['type'] ); ?>" |
|
1074
|
|
- name="<?php echo esc_attr( $field['merge'] ); ?>" |
|
1075
|
|
- id="<?php echo esc_attr( $field['merge'] . '-' . $i ); ?>" |
|
|
1073
|
+ type="<?php echo esc_attr( $field[ 'type' ] ); ?>" |
|
|
1074
|
+ name="<?php echo esc_attr( $field[ 'merge' ] ); ?>" |
|
|
1075
|
+ id="<?php echo esc_attr( $field[ 'merge' ] . '-' . $i ); ?>" |
|
1076
|
1076
|
<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'checked="checked"'; } ?> |
|
1077
|
|
- <?php echo $field_array['required']; ?> |
|
|
1077
|
+ <?php echo $field_array[ 'required' ]; ?> |
|
1078
|
1078
|
value="<?php echo esc_attr( $choice ); ?>"> |
|
1079
|
|
- <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
|
1079
|
+ <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
1080
|
1080
|
</label> |
|
1081
|
1081
|
<?php |
|
1082
|
1082
|
$i++; |
|
@@ -1097,11 +1097,11 @@ discard block |
|
|
block discarded – undo |
|
1097
|
1097
|
/**** Interest Groups ****/ |
|
1098
|
1098
|
|
|
1099
|
1099
|
// Handle the Description logic in one spot, here: |
|
1100
|
|
- $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
1101
|
|
- $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
|
1100
|
+ $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
|
1101
|
+ $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
1102
|
1102
|
if ( $show_description === true ) { |
|
1103
|
|
- $description = '<p class="form-field-description" id="form-field-description-' . $field['group_id'] . '">'; |
|
1104
|
|
- $description .= apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
|
1103
|
+ $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'group_id' ] . '">'; |
|
|
1104
|
+ $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
1105
|
1105
|
$description .= '</p>'; |
|
1106
|
1106
|
|
|
1107
|
1107
|
/** |
|
@@ -1113,27 +1113,27 @@ discard block |
|
|
block discarded – undo |
|
1113
|
1113
|
* @param string | $field['description'] | The field's description text |
|
1114
|
1114
|
* @param int | $form_id |
|
1115
|
1115
|
*/ |
|
1116
|
|
- $description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
|
1116
|
+ $description = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
1117
|
1117
|
} |
|
1118
|
1118
|
|
|
1119
|
1119
|
// Get our groups |
|
1120
|
|
- $groups = isset( $field['groups'] ) && ! empty( $field['groups'] ) ? json_decode( $field['groups'], true ) : array(); |
|
|
1120
|
+ $groups = isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ? json_decode( $field[ 'groups' ], true ) : array(); |
|
1121
|
1121
|
|
|
1122
|
1122
|
// Get the default choice(s) from the field settings and turn them into an array if not already |
|
1123
|
|
- $default_choice = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
|
1123
|
+ $default_choice = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
1124
|
1124
|
$default_choice = is_array( $default_choice ) ? $default_choice : array( $default_choice ); |
|
1125
|
|
- $default_choice = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-default', $default_choice, $groups, $field, $form_id ); |
|
|
1125
|
+ $default_choice = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-default', $default_choice, $groups, $field, $form_id ); |
|
1126
|
1126
|
|
|
1127
|
1127
|
$count = count( $groups ); |
|
1128
|
1128
|
|
|
1129
|
|
- if( $field['type'] === 'checkboxes' ) { |
|
|
1129
|
+ if ( $field[ 'type' ] === 'checkboxes' ) { |
|
1130
|
1130
|
$type = 'checkbox'; |
|
1131
|
|
- } else if( $field['type'] === 'radio' ) { |
|
|
1131
|
+ } else if ( $field[ 'type' ] === 'radio' ) { |
|
1132
|
1132
|
$type = 'radio'; |
|
1133
|
1133
|
} |
|
1134
|
1134
|
|
|
1135
|
1135
|
// loop over the interest group field types |
|
1136
|
|
- switch ( $field['type'] ) { |
|
|
1136
|
+ switch ( $field[ 'type' ] ) { |
|
1137
|
1137
|
|
|
1138
|
1138
|
case 'checkboxes': |
|
1139
|
1139
|
case 'radio': |
|
@@ -1141,11 +1141,11 @@ discard block |
|
|
block discarded – undo |
|
1141
|
1141
|
$x = 1; // used to find the last item of our array |
|
1142
|
1142
|
|
|
1143
|
1143
|
?> |
|
1144
|
|
- <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
1145
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
|
1144
|
+ <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
|
1145
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
1146
|
1146
|
<!-- dictate label visibility --> |
|
1147
|
|
- <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label"> |
|
1148
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
1147
|
+ <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label"> |
|
|
1148
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
1149
|
1149
|
</span> |
|
1150
|
1150
|
<?php |
|
1151
|
1151
|
} |
|
@@ -1155,7 +1155,7 @@ discard block |
|
|
block discarded – undo |
|
1155
|
1155
|
|
|
1156
|
1156
|
// Display Submission Errors |
|
1157
|
1157
|
if ( ! empty( $missing_required_checkbox_interest_groups ) ) { |
|
1158
|
|
- if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) { |
|
|
1158
|
+ if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) { |
|
1159
|
1159
|
?> |
|
1160
|
1160
|
<p class="yikes-mailchimp-required-interest-group-error"> |
|
1161
|
1161
|
<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?> |
|
@@ -1167,20 +1167,20 @@ discard block |
|
|
block discarded – undo |
|
1167
|
1167
|
foreach ( $groups as $group_id => $name ) { |
|
1168
|
1168
|
|
|
1169
|
1169
|
// If the form was submitted and failed, set the submitted/chosen values as the default |
|
1170
|
|
- if ( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
|
1170
|
+ if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
1171
|
1171
|
|
|
1172
|
1172
|
// Format default choice as array |
|
1173
|
|
- $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
|
1173
|
+ $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
1174
|
1174
|
} |
|
1175
|
1175
|
|
|
1176
|
1176
|
?> |
|
1177
|
|
- <label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>"> |
|
|
1177
|
+ <label for="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>"> |
|
1178
|
1178
|
<input |
|
1179
|
|
- <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { if ( $field['type'] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
|
1179
|
+ <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { if ( $field[ 'type' ] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
1180
|
1180
|
class="yikes-interest-group-required" <?php } ?> |
|
1181
|
1181
|
type="<?php echo esc_attr( $type ); ?>" |
|
1182
|
|
- name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
1183
|
|
- id="<?php echo esc_attr( $field['group_id'] . '-' . $i ); ?>" |
|
|
1182
|
+ name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
|
1183
|
+ id="<?php echo esc_attr( $field[ 'group_id' ] . '-' . $i ); ?>" |
|
1184
|
1184
|
<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
|
1185
|
1185
|
value="<?php echo esc_attr( $group_id ); ?>"> |
|
1186
|
1186
|
<?php echo esc_attr( $name ); ?> |
|
@@ -1202,32 +1202,32 @@ discard block |
|
|
block discarded – undo |
|
1202
|
1202
|
|
|
1203
|
1203
|
?> |
|
1204
|
1204
|
|
|
1205
|
|
- <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
1205
|
+ <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
1206
|
1206
|
<!-- dictate label visibility --> |
|
1207
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
1208
|
|
- <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>"> |
|
1209
|
|
- <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
1207
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
1208
|
+ <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>"> |
|
|
1209
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
1210
|
1210
|
</span> |
|
1211
|
1211
|
<?php } ?> |
|
1212
|
1212
|
|
|
1213
|
1213
|
<!-- Description Above --> |
|
1214
|
1214
|
<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
|
1215
|
1215
|
|
|
1216
|
|
- <select <?php echo implode( ' ' , $field_array ); ?>> |
|
|
1216
|
+ <select <?php echo implode( ' ', $field_array ); ?>> |
|
1217
|
1217
|
|
|
1218
|
1218
|
<?php |
|
1219
|
|
- $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
|
1219
|
+ $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
1220
|
1220
|
$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-ig-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); |
|
1221
|
1221
|
echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
|
1222
|
1222
|
|
|
1223
|
1223
|
$i = 0; |
|
1224
|
|
- foreach( $groups as $group_id => $name ) { |
|
|
1224
|
+ foreach ( $groups as $group_id => $name ) { |
|
1225
|
1225
|
|
|
1226
|
1226
|
// If the form was submitted and failed, set the submitted/chosen values as the default |
|
1227
|
|
- if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
|
1227
|
+ if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
1228
|
1228
|
|
|
1229
|
1229
|
// Format default choice as array |
|
1230
|
|
- $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
|
1230
|
+ $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
1231
|
1231
|
} |
|
1232
|
1232
|
?> |
|
1233
|
1233
|
<option |
|
@@ -1255,12 +1255,12 @@ discard block |
|
|
block discarded – undo |
|
1255
|
1255
|
|
|
1256
|
1256
|
?> |
|
1257
|
1257
|
|
|
1258
|
|
- <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
|
1258
|
+ <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
1259
|
1259
|
|
|
1260
|
1260
|
<!-- dictate label visibility --> |
|
1261
|
|
- <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
1262
|
|
- <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
1263
|
|
- <?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
|
1261
|
+ <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
|
1262
|
+ <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
|
1263
|
+ <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
1264
|
1264
|
</span> |
|
1265
|
1265
|
<?php } |
|
1266
|
1266
|
|
|
@@ -1270,17 +1270,17 @@ discard block |
|
|
block discarded – undo |
|
1270
|
1270
|
// Turn $default_choice into an array if it isn't already |
|
1271
|
1271
|
$default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
|
1272
|
1272
|
|
|
1273
|
|
- foreach( $groups as $group_id => $name ) { |
|
|
1273
|
+ foreach ( $groups as $group_id => $name ) { |
|
1274
|
1274
|
?> |
|
1275
|
|
- <label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;"> |
|
|
1275
|
+ <label for="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;"> |
|
1276
|
1276
|
<input |
|
1277
|
1277
|
type="checkbox" |
|
1278
|
|
- name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
1279
|
|
- id="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" |
|
|
1278
|
+ name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
|
1279
|
+ id="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" |
|
1280
|
1280
|
value="<?php echo esc_attr( $group_id ) ?>" |
|
1281
|
1281
|
<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
|
1282
|
1282
|
> |
|
1283
|
|
- <?php echo esc_attr( stripslashes( str_replace( '' , '\'', $name ) ) ); ?> |
|
|
1283
|
+ <?php echo esc_attr( stripslashes( str_replace( '', '\'', $name ) ) ); ?> |
|
1284
|
1284
|
</label> |
|
1285
|
1285
|
<?php |
|
1286
|
1286
|
$i++; |
|
@@ -1305,14 +1305,14 @@ discard block |
|
|
block discarded – undo |
|
1305
|
1305
|
echo $recaptcha_box; |
|
1306
|
1306
|
} |
|
1307
|
1307
|
|
|
1308
|
|
- $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
|
1308
|
+ $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
1309
|
1309
|
?> |
|
1310
|
1310
|
|
|
1311
|
1311
|
<!-- Honeypot Trap --> |
|
1312
|
1312
|
<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot-<?php echo esc_attr( $form_id ); ?>" value=""> |
|
1313
|
1313
|
|
|
1314
|
1314
|
<!-- List ID --> |
|
1315
|
|
- <input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data['list_id'] ); ?>"> |
|
|
1315
|
+ <input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data[ 'list_id' ] ); ?>"> |
|
1316
|
1316
|
|
|
1317
|
1317
|
<!-- The form that is being submitted! Used to display error/success messages above the correct form --> |
|
1318
|
1318
|
<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_id ); ?>"> |
|
@@ -1326,15 +1326,15 @@ discard block |
|
|
block discarded – undo |
|
1326
|
1326
|
// If the number of fields, is equal to the hidden label count, add our class |
|
1327
|
1327
|
// eg: All field labels are set to hidden. |
|
1328
|
1328
|
if ( absint( $field_count ) === absint( $hidden_label_count ) ) { |
|
1329
|
|
- $submit_button_label_classes[] = 'labels-hidden'; |
|
|
1329
|
+ $submit_button_label_classes[ ] = 'labels-hidden'; |
|
1330
|
1330
|
} |
|
1331
|
1331
|
echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '"> </span>'; |
|
1332
|
1332
|
} |
|
1333
|
1333
|
// Display the image or text based button. |
|
1334
|
1334
|
if ( $submit_button_type === 'text' ) { |
|
1335
|
|
- echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</span></button>', $form_data['id'] ); |
|
|
1335
|
+ echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</span></button>', $form_data[ 'id' ] ); |
|
1336
|
1336
|
} else { |
|
1337
|
|
- echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">', $form_data['id'] ); |
|
|
1337
|
+ echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">', $form_data[ 'id' ] ); |
|
1338
|
1338
|
} |
|
1339
|
1339
|
if ( $form_inline && ! $inline_form_override ) { |
|
1340
|
1340
|
echo '</label>'; |
|
@@ -1349,8 +1349,8 @@ discard block |
|
|
block discarded – undo |
|
1349
|
1349
|
|
|
1350
|
1350
|
<?php |
|
1351
|
1351
|
/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
|
1352
|
|
- if( is_user_logged_in() ) { |
|
1353
|
|
- if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
|
1352
|
+ if ( is_user_logged_in() ) { |
|
|
1353
|
+ if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
1354
|
1354
|
echo $edit_form_link; |
|
1355
|
1355
|
} |
|
1356
|
1356
|
} |
|
@@ -1366,7 +1366,7 @@ discard block |
|
|
block discarded – undo |
|
1366
|
1366
|
* for non-admins |
|
1367
|
1367
|
*/ |
|
1368
|
1368
|
if ( ! current_user_can( 'manage_options' ) ) { |
|
1369
|
|
- $impressions = $form_data['impressions'] + 1; |
|
|
1369
|
+ $impressions = $form_data[ 'impressions' ] + 1; |
|
1370
|
1370
|
$interface->update_form_field( $form_id, 'impressions', $impressions ); |
|
1371
|
1371
|
} |
|
1372
|
1372
|
|
yikesinc /
yikes-inc-easy-mailchimp-extender
