@@ -75,14 +75,14 @@ |
||
75 | 75 | |
76 | 76 | // Create merge variables based on comment data. |
77 | 77 | $merge_vars = array( |
78 | - 'FNAME' => $comment_data['comment_author'], |
|
79 | - 'OPTIN_IP' => $comment_data['comment_author_IP'], |
|
78 | + 'FNAME' => $comment_data[ 'comment_author' ], |
|
79 | + 'OPTIN_IP' => $comment_data[ 'comment_author_IP' ], |
|
80 | 80 | ); |
81 | 81 | |
82 | 82 | $addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'comment_data' => $comment_data ), $this->type ); |
83 | 83 | |
84 | 84 | // Subscribe the user. |
85 | - $this->subscribe_user_integration( $comment_data['comment_author_email'], $this->type, $merge_vars, $addl_vars ); |
|
85 | + $this->subscribe_user_integration( $comment_data[ 'comment_author_email' ], $this->type, $merge_vars, $addl_vars ); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | $yikes_easy_mc_comment_checkbox_class = new Yikes_Easy_MC_Comment_Checkbox_Class(); |
@@ -80,11 +80,11 @@ |
||
80 | 80 | |
81 | 81 | $user_info = (array) edd_get_payment_meta_user_info( $payment_id ); |
82 | 82 | $merge_vars = array(); |
83 | - if ( isset( $user_info['first_name'] ) ) { |
|
84 | - $merge_vars['FNAME'] = $user_info['first_name']; |
|
83 | + if ( isset( $user_info[ 'first_name' ] ) ) { |
|
84 | + $merge_vars[ 'FNAME' ] = $user_info[ 'first_name' ]; |
|
85 | 85 | } |
86 | - if ( isset( $user_info['last_name'] ) ) { |
|
87 | - $merge_vars['LNAME'] = $user_info['last_name']; |
|
86 | + if ( isset( $user_info[ 'last_name' ] ) ) { |
|
87 | + $merge_vars[ 'LNAME' ] = $user_info[ 'last_name' ]; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | $addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'user' => $user_info, 'payment_id' => $payment_id ), $this->type ); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * @return array $data CF7 posted data. |
49 | 49 | */ |
50 | 50 | public function alter_cf7_data( $data = array() ) { |
51 | - $data['yikes_mailchimp_checkbox'] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' ); |
|
51 | + $data[ 'yikes_mailchimp_checkbox' ] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' ); |
|
52 | 52 | return $data; |
53 | 53 | } |
54 | 54 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $submission = WPCF7_Submission::get_instance(); |
66 | 66 | if ( $submission ) { |
67 | 67 | $data = $submission->get_posted_data(); |
68 | - $email = isset( $data['your-email'] ) ? $data['your-email'] : ''; |
|
68 | + $email = isset( $data[ 'your-email' ] ) ? $data[ 'your-email' ] : ''; |
|
69 | 69 | $fields = array( 'email' => $email ); |
70 | 70 | $addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'cf7_data' => $data, 'contact_form' => $contact_form ), $this->type ); |
71 | 71 | $this->subscribe_user_integration( $email, $this->type, apply_filters( 'yikes-mailchimp-contact-form-7', $fields, $data ), $addl_vars ); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | - display installation stuff here |
4 | 4 | - php version, wp version, plugin version and debug log |
5 | 5 | --> |
6 | -<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
6 | +<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
7 | 7 | |
8 | 8 | <div class="inside"> |
9 | 9 | |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | |
13 | 13 | <?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?> |
14 | 14 | |
15 | - <label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
16 | - <input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>> |
|
15 | + <label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
|
16 | + <input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>> |
|
17 | 17 | </label> |
18 | - <p class="description"><?php _e( "If you encounter an issue with Easy Forms for Mailchimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
18 | + <p class="description"><?php _e( "If you encounter an issue with Easy Forms for Mailchimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
19 | 19 | |
20 | 20 | <?php submit_button(); ?> |
21 | 21 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | ) |
35 | 35 | ); |
36 | 36 | ?> |
37 | - <h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2> |
|
37 | + <h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2> |
|
38 | 38 | |
39 | 39 | <table class="widefat" id="yikes-mailchimp-error-log"> |
40 | 40 | <!-- table header --> |
@@ -79,8 +79,8 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | // If the API gave an error or there are no more lists, break. |
82 | - if ( isset( $response['error'] ) ) { |
|
83 | - return new WP_Error( $response['title'], $response['detail'] ); |
|
82 | + if ( isset( $response[ 'error' ] ) ) { |
|
83 | + return new WP_Error( $response[ 'title' ], $response[ 'detail' ] ); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | if ( empty( $response[ $item_key ] ) ) { |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | // Update the total number of items if it's still zero. |
91 | 91 | if ( 0 === $total ) { |
92 | - $total = intval( $response['total_items'] ); |
|
92 | + $total = intval( $response[ 'total_items' ] ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | // Store each new list. |
@@ -196,28 +196,28 @@ discard block |
||
196 | 196 | return $response; |
197 | 197 | } |
198 | 198 | |
199 | - if ( isset( $response['error'] ) ) { |
|
200 | - $title = isset( $response['title'] ) ? $response['title'] : $response['name']; |
|
201 | - $detail = isset( $response['detail'] ) ? $response['detail'] : $response['error']; |
|
202 | - $data = isset( $response['errors'] ) ? $response['errors'] : array(); |
|
199 | + if ( isset( $response[ 'error' ] ) ) { |
|
200 | + $title = isset( $response[ 'title' ] ) ? $response[ 'title' ] : $response[ 'name' ]; |
|
201 | + $detail = isset( $response[ 'detail' ] ) ? $response[ 'detail' ] : $response[ 'error' ]; |
|
202 | + $data = isset( $response[ 'errors' ] ) ? $response[ 'errors' ] : array(); |
|
203 | 203 | |
204 | 204 | return new WP_Error( |
205 | 205 | $title, |
206 | 206 | $detail, |
207 | 207 | array( |
208 | - 'status' => (int) $response['status'], |
|
208 | + 'status' => (int) $response[ 'status' ], |
|
209 | 209 | 'data' => $data, |
210 | 210 | ) |
211 | 211 | ); |
212 | 212 | } |
213 | 213 | |
214 | - if ( isset( $response['status'] ) && 503 === (int) $response['status'] ) { |
|
214 | + if ( isset( $response[ 'status' ] ) && 503 === (int) $response[ 'status' ] ) { |
|
215 | 215 | return new WP_Error( |
216 | - $response['status'], |
|
217 | - ( isset( $response['ref_no'] ) ? $response['ref_no'] . '. ' : '' ) . ( isset( $response['title'] ) ? '(' . $response['title'] . ')' : '(akamai_503)' ), |
|
216 | + $response[ 'status' ], |
|
217 | + ( isset( $response[ 'ref_no' ] ) ? $response[ 'ref_no' ] . '. ' : '' ) . ( isset( $response[ 'title' ] ) ? '(' . $response[ 'title' ] . ')' : '(akamai_503)' ), |
|
218 | 218 | array( |
219 | - 'status' => (int) $response['status'], |
|
220 | - 'data' => isset( $response['ref_no'] ) ? $response['ref_no'] : '', |
|
219 | + 'status' => (int) $response[ 'status' ], |
|
220 | + 'data' => isset( $response[ 'ref_no' ] ) ? $response[ 'ref_no' ] : '', |
|
221 | 221 | ) |
222 | 222 | ); |
223 | 223 | } |
@@ -246,9 +246,9 @@ discard block |
||
246 | 246 | // Mailchimp uses the application/problem+json type for errors. |
247 | 247 | $headers = wp_remote_retrieve_headers( $response ); |
248 | 248 | |
249 | - if ( isset( $headers['content-type'] ) ) { |
|
250 | - if ( false !== strpos( $headers['content-type'], 'application/problem+json' ) ) { |
|
251 | - $body['error'] = true; |
|
249 | + if ( isset( $headers[ 'content-type' ] ) ) { |
|
250 | + if ( false !== strpos( $headers[ 'content-type' ], 'application/problem+json' ) ) { |
|
251 | + $body[ 'error' ] = true; |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | </span> |
24 | 24 | </h3> |
25 | 25 | <?php else : ?> |
26 | - <h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3> |
|
26 | + <h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3> |
|
27 | 27 | <?php endif; ?> |
28 | 28 | |
29 | 29 | <div class="inside"> |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | <!-- Mailchimp API Input Field --> |
39 | 39 | <label for="yks-mailchimp-api-key"> |
40 | 40 | |
41 | - <p><?php _e( 'Enter your API key in the field below to connect your site to your Mailchimp account.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
41 | + <p><?php _e( 'Enter your API key in the field below to connect your site to your Mailchimp account.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
42 | 42 | |
43 | - <p><strong><?php _e( 'Mailchimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
43 | + <p><strong><?php _e( 'Mailchimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
44 | 44 | |
45 | - <input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo esc_attr( yikes_get_mc_api_key() ); ?>" placeholder="<?php _e( 'Mailchimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" /> |
|
45 | + <input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if ( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo esc_attr( yikes_get_mc_api_key() ); ?>" placeholder="<?php _e( 'Mailchimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" /> |
|
46 | 46 | |
47 | 47 | <?php if ( $yikes_mc_api_constant ) { ?> |
48 | 48 | <p class="description"><?php printf( __( "Your Mailchimp API key has been defined using the %s constant, in a PHP file.", "yikes-inc-easy-mailchimp-extender" ), '<code>YIKES_MC_API_KEY</code>' ); ?></p> |
@@ -51,21 +51,21 @@ discard block |
||
51 | 51 | <?php echo $api_error_response; ?> |
52 | 52 | |
53 | 53 | <?php if ( ! $yikes_mc_api_constant ) { ?> |
54 | - <p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
54 | + <p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
|
55 | 55 | <?php } ?> |
56 | 56 | |
57 | 57 | <p class="description"><?php esc_html_e( 'Warning: changing your API key may break your current forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
58 | 58 | </label> |
59 | 59 | |
60 | 60 | <!-- Use Nonce Validation Field --> |
61 | - <p><strong><?php _e( 'Enable nonce validation on this site?' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
61 | + <p><strong><?php _e( 'Enable nonce validation on this site?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
62 | 62 | <label for="yikes-mailchimp-use-nonce-yes"> |
63 | 63 | Yes |
64 | - <input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '1' ); ?> /> |
|
64 | + <input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '1' ); ?> /> |
|
65 | 65 | </label> |
66 | 66 | <label for="yikes-mailchimp-use-nonce-no"> |
67 | 67 | No |
68 | - <input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '0' ); ?> /> |
|
68 | + <input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '0' ); ?> /> |
|
69 | 69 | </label> |
70 | 70 | |
71 | 71 | <?php submit_button(); ?> |
@@ -8,10 +8,10 @@ discard block |
||
8 | 8 | $submission_handler = new Yikes_Inc_Easy_Mailchimp_Extender_Process_Submission_Handler( $is_ajax = true ); |
9 | 9 | |
10 | 10 | // parse our form data |
11 | -parse_str( $_POST['form_data'], $data ); |
|
11 | +parse_str( $_POST[ 'form_data' ], $data ); |
|
12 | 12 | |
13 | 13 | // Get the form_id |
14 | -$form_id = absint( $_POST['form_id'] ); |
|
14 | +$form_id = absint( $_POST[ 'form_id' ] ); |
|
15 | 15 | |
16 | 16 | // Send an error if for some reason we can't find the $form_id |
17 | 17 | $submission_handler->handle_empty_form_id( $form_id ); |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $submission_handler->set_form_id( $form_id ); |
21 | 21 | |
22 | 22 | // Check our nonce |
23 | -$submission_handler->handle_nonce( $_POST['ajax_security_nonce'], 'yikes_mc_form_submission_security_nonce' ); |
|
23 | +$submission_handler->handle_nonce( $_POST[ 'ajax_security_nonce' ], 'yikes_mc_form_submission_security_nonce' ); |
|
24 | 24 | |
25 | 25 | // Get the form data |
26 | 26 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | $submission_handler->handle_empty_form( $form_data ); |
31 | 31 | |
32 | 32 | // Set up some variables from the form data -- these are required |
33 | -$list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
34 | -$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
35 | -$optin_settings = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null; |
|
36 | -$form_fields = isset( $form_data['fields'] ) ? $form_data['fields'] : null; |
|
33 | +$list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
34 | +$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
35 | +$optin_settings = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null; |
|
36 | +$form_fields = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null; |
|
37 | 37 | |
38 | 38 | // Send an error if for some reason we can't find the required form data |
39 | 39 | $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ); |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | $submission_handler->check_for_required_interest_groups( $data, $form_fields ); |
48 | 48 | |
49 | 49 | // Set up some variables from the form data -- these are not required |
50 | -$error_messages = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array(); |
|
51 | -$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); |
|
50 | +$error_messages = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array(); |
|
51 | +$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); |
|
52 | 52 | |
53 | 53 | // Set the error messages in our class |
54 | 54 | $submission_handler->set_error_messages( $error_messages ); |
55 | 55 | |
56 | 56 | // Some other variables we'll need. |
57 | -$page_data = isset( $_POST['page_data'] ) ? $_POST['page_data'] : ''; |
|
57 | +$page_data = isset( $_POST[ 'page_data' ] ) ? $_POST[ 'page_data' ] : ''; |
|
58 | 58 | $merge_variables = array(); |
59 | 59 | $error = 0; |
60 | 60 | $list_handler = yikes_get_mc_api_manager()->get_list_handler(); |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | // As of 6.4 we no longer pass the post object, only the ID. |
63 | 63 | // For any users relying on the $post object for their `yikes-mailchimp-redirect-url` filter we'll grab the post object here. |
64 | 64 | // Eventually we should just pass the $post_id into the filter instead of the whole object. |
65 | -$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
65 | +$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
66 | 66 | |
67 | 67 | // Send an error if for some reason we can't find the list_handler |
68 | 68 | $submission_handler->handle_empty_list_handler( $list_handler ); |
69 | 69 | |
70 | 70 | // Get, sanitize and lowercasify the email |
71 | -$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : ''; |
|
71 | +$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : ''; |
|
72 | 72 | $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); |
73 | 73 | $submission_handler->set_email( $sanitized_email ); |
74 | 74 | |
@@ -76,14 +76,14 @@ discard block |
||
76 | 76 | $submission_handler->handle_empty_email( $sanitized_email ); |
77 | 77 | |
78 | 78 | // Check for Honeypot filled |
79 | -$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false; |
|
79 | +$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false; |
|
80 | 80 | |
81 | 81 | // Send an error if honey pot is not empty |
82 | 82 | $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ); |
83 | 83 | |
84 | 84 | // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed |
85 | -if ( isset( $data['g-recaptcha-response'] ) ) { |
|
86 | - $recaptcha_response = $data['g-recaptcha-response']; |
|
85 | +if ( isset( $data[ 'g-recaptcha-response' ] ) ) { |
|
86 | + $recaptcha_response = $data[ 'g-recaptcha-response' ]; |
|
87 | 87 | $submission_handler->handle_recaptcha( $recaptcha_response ); |
88 | 88 | } |
89 | 89 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields ); |
92 | 92 | |
93 | 93 | // Submission Setting: Replace interest groups or update interest groups |
94 | -$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true; |
|
94 | +$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true; |
|
95 | 95 | |
96 | 96 | // Get the default groups |
97 | 97 | $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler ); |
@@ -106,15 +106,15 @@ discard block |
||
106 | 106 | * |
107 | 107 | * @param $merge_variables array Array of merge variable to use |
108 | 108 | */ |
109 | -do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
109 | +do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
110 | 110 | do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables ); |
111 | 111 | |
112 | 112 | // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) |
113 | 113 | // and pass back an error and message to the user |
114 | 114 | // If error is set and no message, default to our class variable's default error message |
115 | -if ( isset( $merge_variables['error'] ) ) { |
|
116 | - $merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message; |
|
117 | - $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message ); |
|
115 | +if ( isset( $merge_variables[ 'error' ] ) ) { |
|
116 | + $merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message; |
|
117 | + $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message ); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | // This is the array we're going to pass through to the Mailchimp API |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | // Only add groups if they exist |
127 | 127 | if ( ! empty( $groups ) ) { |
128 | - $member_data['interests'] = $groups; |
|
128 | + $member_data[ 'interests' ] = $groups; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | // Check if this member already exists |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed |
137 | 137 | // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe |
138 | 138 | // Continue as if they're a new member to force another double opt-in email |
139 | -if ( is_array( $member_exists ) && isset( $member_exists['status'] ) ) { |
|
140 | - $double_optin_resubscribe = $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed'; |
|
139 | +if ( is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) ) { |
|
140 | + $double_optin_resubscribe = $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed'; |
|
141 | 141 | } else { |
142 | 142 | |
143 | 143 | // If this member doesn't exist, set their timestamp signup to the current time. |
144 | - $member_data['timestamp_signup'] = current_time( 'Y-m-d H:i:s', 1 ); |
|
144 | + $member_data[ 'timestamp_signup' ] = current_time( 'Y-m-d H:i:s', 1 ); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
@@ -150,24 +150,24 @@ discard block |
||
150 | 150 | |
151 | 151 | // Check the opt-in value - is it double or single? |
152 | 152 | // Double opt-in means 'status_if_new' => 'pending' |
153 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
153 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
154 | 154 | |
155 | 155 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
156 | 156 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
157 | 157 | // allow us to re-subscribe the user. |
158 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
158 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
159 | 159 | $was_unsubscribed = apply_filters( 'yikes_mailchimp_single_resubscribe', $was_unsubscribed ); |
160 | 160 | |
161 | 161 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
162 | 162 | |
163 | 163 | // Double opt-in |
164 | - $member_data['status_if_new'] = 'pending'; |
|
165 | - $member_data['status'] = 'pending'; |
|
164 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
165 | + $member_data[ 'status' ] = 'pending'; |
|
166 | 166 | } else { |
167 | 167 | |
168 | 168 | // Single opt-in |
169 | - $member_data['status_if_new'] = 'subscribed'; |
|
170 | - $member_data['status'] = 'subscribed'; |
|
169 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
170 | + $member_data[ 'status' ] = 'subscribed'; |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | } else { |
@@ -176,10 +176,10 @@ discard block |
||
176 | 176 | |
177 | 177 | // But first let's set our flag, and set the Mailchimp status flag |
178 | 178 | $new_subscriber = false; |
179 | - $member_data['status'] = 'subscribed'; |
|
179 | + $member_data[ 'status' ] = 'subscribed'; |
|
180 | 180 | |
181 | 181 | // Check our update_existing_user optin setting |
182 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
182 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
183 | 183 | |
184 | 184 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
185 | 185 | if ( $update_existing_user === false ) { |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | } |
188 | 188 | |
189 | 189 | // If update_existing_user is true, we need to check our 'send_update_email' option |
190 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
190 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
191 | 191 | |
192 | 192 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
193 | 193 | if ( $send_update_email === true ) { |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $data = $_POST; |
15 | 15 | |
16 | 16 | // Confirm we have a form id to work with |
17 | -$form_id = ( isset( $data['yikes-mailchimp-submitted-form'] ) ) ? absint( $data['yikes-mailchimp-submitted-form'] ) : false; |
|
17 | +$form_id = ( isset( $data[ 'yikes-mailchimp-submitted-form' ] ) ) ? absint( $data[ 'yikes-mailchimp-submitted-form' ] ) : false; |
|
18 | 18 | |
19 | 19 | // Set the form id in our class |
20 | 20 | $submission_handler->set_form_id( $form_id ); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | // Check our nonce |
31 | -if ( $submission_handler->handle_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) === false ) { |
|
31 | +if ( $submission_handler->handle_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) === false ) { |
|
32 | 32 | $process_submission_response = $submission_handler->wrap_form_submission_response( $submission_handler->handle_nonce_message, $is_success = false ); |
33 | 33 | return; |
34 | 34 | } |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | // Set up some variables from the form data -- these are required |
47 | -$list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
48 | -$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
49 | -$optin_settings = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null; |
|
50 | -$form_fields = isset( $form_data['fields'] ) ? $form_data['fields'] : null; |
|
47 | +$list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
48 | +$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
49 | +$optin_settings = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null; |
|
50 | +$form_fields = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null; |
|
51 | 51 | |
52 | 52 | // Send an error if for some reason we can't find the required form data |
53 | 53 | if ( $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ) === false ) { |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | $submission_handler->set_list_id( $list_id ); |
71 | 71 | |
72 | 72 | // Set up some variables from the form data -- these are not required |
73 | -$error_messages = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array(); |
|
74 | -$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); // Do we need this? |
|
73 | +$error_messages = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array(); |
|
74 | +$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); // Do we need this? |
|
75 | 75 | |
76 | 76 | // Set the error messages in our class |
77 | 77 | $submission_handler->set_error_messages( $error_messages ); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | // Get, sanitize, and lowercasify the email |
90 | -$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : ''; |
|
90 | +$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : ''; |
|
91 | 91 | $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); |
92 | 92 | $submission_handler->set_email( $sanitized_email ); |
93 | 93 | |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | // Check for Honeypot filled |
101 | -$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false; |
|
101 | +$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false; |
|
102 | 102 | |
103 | 103 | // Send an error if honey pot is not empty |
104 | 104 | if ( $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ) === false ) { |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed |
110 | -if ( isset( $data['g-recaptcha-response'] ) ) { |
|
111 | - $recaptcha_response = $data['g-recaptcha-response']; |
|
110 | +if ( isset( $data[ 'g-recaptcha-response' ] ) ) { |
|
111 | + $recaptcha_response = $data[ 'g-recaptcha-response' ]; |
|
112 | 112 | $recaptcha_handle = $submission_handler->handle_recaptcha( $recaptcha_response ); |
113 | - if ( isset( $recaptcha_handle['success'] ) && $recaptcha_handle['success'] === false ) { |
|
114 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle['message'], $is_success = false ); |
|
113 | + if ( isset( $recaptcha_handle[ 'success' ] ) && $recaptcha_handle[ 'success' ] === false ) { |
|
114 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle[ 'message' ], $is_success = false ); |
|
115 | 115 | return; |
116 | 116 | } |
117 | 117 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields ); |
121 | 121 | |
122 | 122 | // Submission Setting: Replace interest groups or update interest groups |
123 | -$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true; |
|
123 | +$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true; |
|
124 | 124 | |
125 | 125 | // Get the default groups |
126 | 126 | $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler ); |
@@ -135,17 +135,17 @@ discard block |
||
135 | 135 | * |
136 | 136 | * @param $merge_variables array Array of merge variable to use |
137 | 137 | */ |
138 | -do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
138 | +do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
139 | 139 | do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables ); |
140 | 140 | |
141 | 141 | // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) |
142 | 142 | // and pass back an error and message to the user |
143 | 143 | // If error is set and no message, default to our class variable's default error message |
144 | -if ( isset( $merge_variables['error'] ) ) { |
|
145 | - $merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message; |
|
146 | - $merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message ); |
|
147 | - if ( $merge_vars_error_array['success'] === false ) { |
|
148 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array['message'], $is_success = false ); |
|
144 | +if ( isset( $merge_variables[ 'error' ] ) ) { |
|
145 | + $merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message; |
|
146 | + $merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message ); |
|
147 | + if ( $merge_vars_error_array[ 'success' ] === false ) { |
|
148 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array[ 'message' ], $is_success = false ); |
|
149 | 149 | return; |
150 | 150 | } |
151 | 151 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | |
159 | 159 | // Only add groups if they exist |
160 | 160 | if ( ! empty( $groups ) ) { |
161 | - $member_data['interests'] = $groups; |
|
161 | + $member_data[ 'interests' ] = $groups; |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | // Check if this member already exists |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed |
170 | 170 | // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe |
171 | 171 | // Continue as if they're a new member to force another double opt-in email. |
172 | -if ( is_array( $member_exists ) && isset( $member_exists['status'] ) ) { |
|
173 | - $double_optin_resubscribe = $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed'; |
|
172 | +if ( is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) ) { |
|
173 | + $double_optin_resubscribe = $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed'; |
|
174 | 174 | } else { |
175 | 175 | |
176 | 176 | // If this member doesn't exist, set their timestamp signup to the current time. |
177 | - $member_data['timestamp_signup'] = current_time( 'Y-m-d H:i:s', 1 ); |
|
177 | + $member_data[ 'timestamp_signup' ] = current_time( 'Y-m-d H:i:s', 1 ); |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
@@ -182,24 +182,24 @@ discard block |
||
182 | 182 | |
183 | 183 | // Check the opt-in value - is it double or single? |
184 | 184 | // Double opt-in means 'status_if_new' => 'pending' |
185 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
185 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
186 | 186 | |
187 | 187 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
188 | 188 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
189 | 189 | // allow us to re-subscribe the user. |
190 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
190 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
191 | 191 | $was_unsubscribed = apply_filters( 'yikes_mailchimp_single_resubscribe', $was_unsubscribed ); |
192 | 192 | |
193 | 193 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
194 | 194 | |
195 | 195 | // Double opt-in |
196 | - $member_data['status_if_new'] = 'pending'; |
|
197 | - $member_data['status'] = 'pending'; |
|
196 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
197 | + $member_data[ 'status' ] = 'pending'; |
|
198 | 198 | } else { |
199 | 199 | |
200 | 200 | // Single opt-in |
201 | - $member_data['status_if_new'] = 'subscribed'; |
|
202 | - $member_data['status'] = 'subscribed'; |
|
201 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
202 | + $member_data[ 'status' ] = 'subscribed'; |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | } else { |
@@ -208,28 +208,28 @@ discard block |
||
208 | 208 | |
209 | 209 | // But first let's set our flag, and set the Mailchimp status flag |
210 | 210 | $new_subscriber = false; |
211 | - $member_data['status'] = 'subscribed'; |
|
211 | + $member_data[ 'status' ] = 'subscribed'; |
|
212 | 212 | |
213 | 213 | // Check our update_existing_user optin setting |
214 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
214 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
215 | 215 | |
216 | 216 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
217 | 217 | if ( $update_existing_user === false ) { |
218 | 218 | $disallow_update_array = $submission_handler->handle_disallowed_existing_user_update(); |
219 | - if ( $disallow_update_array['success'] === false ) { |
|
220 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array['message'], $is_success = false ); |
|
219 | + if ( $disallow_update_array[ 'success' ] === false ) { |
|
220 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array[ 'message' ], $is_success = false ); |
|
221 | 221 | return; |
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | 225 | // If update_existing_user is true, we need to check our 'send_update_email' option |
226 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
226 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
227 | 227 | |
228 | 228 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
229 | 229 | if ( $send_update_email === true ) { |
230 | 230 | $update_existing_user_array = $submission_handler->handle_updating_existing_user(); |
231 | - if ( $update_existing_user_array['success'] === false ) { |
|
232 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array['message'], $is_success = false ); |
|
231 | + if ( $update_existing_user_array[ 'success' ] === false ) { |
|
232 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array[ 'message' ], $is_success = false ); |
|
233 | 233 | return; |
234 | 234 | } |
235 | 235 | } |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | } |
266 | 266 | |
267 | 267 | // Handle errors in the response |
268 | -if ( isset( $success_array ) && isset( $success_array['success'] ) && $success_array['success'] === false ) { |
|
269 | - $process_submission_response = isset( $success_array['message'] ) ? $success_array['message'] : ''; |
|
270 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array['message'], $is_success = false ); |
|
268 | +if ( isset( $success_array ) && isset( $success_array[ 'success' ] ) && $success_array[ 'success' ] === false ) { |
|
269 | + $process_submission_response = isset( $success_array[ 'message' ] ) ? $success_array[ 'message' ] : ''; |
|
270 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array[ 'message' ], $is_success = false ); |
|
271 | 271 | return; |
272 | 272 | } |
273 | 273 | |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | // For non-AJAX submissions, if we have a new subscriber we need to increment our submissions count by 1 |
278 | 278 | // For AJAX, this is an AJAX call that gets fired off after form submission |
279 | 279 | if ( $new_subscriber === true ) { |
280 | - $submissions = (int) $form_settings['submissions'] + 1; |
|
280 | + $submissions = (int) $form_settings[ 'submissions' ] + 1; |
|
281 | 281 | $interface->update_form_field( $form_id, 'submissions', $submissions ); |
282 | 282 | } |
283 | 283 |
@@ -12,7 +12,7 @@ |
||
12 | 12 | public function __construct() { |
13 | 13 | add_action( 'enqueue_block_editor_assets', array( $this, 'editor_scripts' ) ); |
14 | 14 | add_action( 'init', array( $this, 'register_blocks' ), 11 ); |
15 | - add_filter( 'block_categories', array( $this, 'easy_forms_register_category' ), 10, 2); |
|
15 | + add_filter( 'block_categories', array( $this, 'easy_forms_register_category' ), 10, 2 ); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | /** |