@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | - * Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted |
|
| 77 | - * |
|
| 78 | - * @since 6.0.3 |
|
| 79 | - */ |
|
| 76 | + * Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted |
|
| 77 | + * |
|
| 78 | + * @since 6.0.3 |
|
| 79 | + */ |
|
| 80 | 80 | public function yikes_custom_frontend_content_filter() { |
| 81 | 81 | add_filter( 'yikes-mailchimp-frontend-content', 'wptexturize' ); |
| 82 | 82 | add_filter( 'yikes-mailchimp-frontend-content', 'convert_smilies' ); |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * load our checkbox classes |
| 94 | 94 | * |
| 95 | 95 | * @since 6.0.0 |
| 96 | - **/ |
|
| 96 | + **/ |
|
| 97 | 97 | public function load_checkbox_integration_classes() { |
| 98 | 98 | // store our options |
| 99 | 99 | $integrations = get_option( 'optin-checkbox-init' , '' ); |
@@ -138,7 +138,8 @@ |
||
| 138 | 138 | if( $form_id ) { |
| 139 | 139 | $form_settings = self::yikes_retrieve_form_settings( $form_id ); |
| 140 | 140 | if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) { |
| 141 | - if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted |
|
| 141 | + if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { |
|
| 142 | +// ensure we only process the form that was submitted |
|
| 142 | 143 | // lets include our form processing file |
| 143 | 144 | include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' ); |
| 144 | 145 | if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) { |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | // Process our form submissions (non ajax forms) |
| 19 | 19 | if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) { |
| 20 | 20 | |
| 21 | - $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>'; |
|
| 21 | + $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>'; |
|
| 22 | 22 | return; |
| 23 | 23 | |
| 24 | 24 | } else { |
@@ -124,11 +124,11 @@ discard block |
||
| 124 | 124 | $merge_variables = apply_filters( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables ); |
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | - * Action hooks fired before API request |
|
| 128 | - * @since 6.0.5.5 |
|
| 129 | - * @param $merge_variables array Array of merge variable to use |
|
| 130 | - * @param $form_id integer The form ID to target (eg: 1, 2 etc.) |
|
| 131 | - */ |
|
| 127 | + * Action hooks fired before API request |
|
| 128 | + * @since 6.0.5.5 |
|
| 129 | + * @param $merge_variables array Array of merge variable to use |
|
| 130 | + * @param $form_id integer The form ID to target (eg: 1, 2 etc.) |
|
| 131 | + */ |
|
| 132 | 132 | do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
| 133 | 133 | do_action( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables ); |
| 134 | 134 | |
@@ -413,8 +413,9 @@ discard block |
||
| 413 | 413 | $create_ticket_response = wp_remote_retrieve_body( $response ); |
| 414 | 414 | |
| 415 | 415 | // display it |
| 416 | - if( $create_ticket_response ) |
|
| 417 | - echo $create_ticket_response; |
|
| 416 | + if( $create_ticket_response ) { |
|
| 417 | + echo $create_ticket_response; |
|
| 418 | + } |
|
| 418 | 419 | |
| 419 | 420 | } |
| 420 | 421 | |
@@ -1160,7 +1161,7 @@ discard block |
||
| 1160 | 1161 | if( isset( $body['msg'] ) && $body['msg'] == "Everything's Chimpy!" ) { |
| 1161 | 1162 | update_option( 'yikes-mc-api-validation' , 'valid_api_key' ); |
| 1162 | 1163 | } |
| 1163 | - } else { |
|
| 1164 | + } else { |
|
| 1164 | 1165 | require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php'; |
| 1165 | 1166 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 1166 | 1167 | $error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message() , __( "Connecting to MailChimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) ); |
@@ -2009,7 +2010,8 @@ discard block |
||
| 2009 | 2010 | |
| 2010 | 2011 | |
| 2011 | 2012 | |
| 2012 | - } else { // THIS IS AN INTEREST GROUP! |
|
| 2013 | + } else { |
|
| 2014 | +// THIS IS AN INTEREST GROUP! |
|
| 2013 | 2015 | |
| 2014 | 2016 | ?> |
| 2015 | 2017 | <section class="draggable" id="<?php echo $field['group_id']; ?>"> |