yikesinc /
yikes-inc-easy-mailchimp-extender
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | $yikes_mc_api_constant = defined( 'YIKES_MC_API_KEY' ); |
| 9 | 9 | ?> |
| 10 | 10 | |
| 11 | -<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3> |
|
| 11 | +<h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3> |
|
| 12 | 12 | <div class="inside"> |
| 13 | 13 | |
| 14 | 14 | <!-- Settings Form --> |
@@ -21,11 +21,11 @@ discard block |
||
| 21 | 21 | <!-- Mailchimp API Input Field --> |
| 22 | 22 | <label for="yks-mailchimp-api-key"> |
| 23 | 23 | |
| 24 | - <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> |
|
| 24 | + <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> |
|
| 25 | 25 | |
| 26 | - <p><strong><?php _e( 'Mailchimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
| 26 | + <p><strong><?php _e( 'Mailchimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
| 27 | 27 | |
| 28 | - <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 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" /> |
|
| 28 | + <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 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" /> |
|
| 29 | 29 | |
| 30 | 30 | <?php if ( $yikes_mc_api_constant ) { ?> |
| 31 | 31 | <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> |
@@ -34,21 +34,21 @@ discard block |
||
| 34 | 34 | <?php echo $api_error_response; ?> |
| 35 | 35 | |
| 36 | 36 | <?php if ( ! $yikes_mc_api_constant ) { ?> |
| 37 | - <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> |
|
| 37 | + <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> |
|
| 38 | 38 | <?php } ?> |
| 39 | 39 | |
| 40 | 40 | <p class="description">Warning: changing your API key will break your current forms.</p> |
| 41 | 41 | </label> |
| 42 | 42 | |
| 43 | 43 | <!-- Use Nonce Validation Field --> |
| 44 | - <p><strong><?php _e( 'Enable nonce validation on this site?' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
| 44 | + <p><strong><?php _e( 'Enable nonce validation on this site?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p> |
|
| 45 | 45 | <label for="yikes-mailchimp-use-nonce-yes"> |
| 46 | 46 | Yes |
| 47 | - <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' ); ?> /> |
|
| 47 | + <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' ); ?> /> |
|
| 48 | 48 | </label> |
| 49 | 49 | <label for="yikes-mailchimp-use-nonce-no"> |
| 50 | 50 | No |
| 51 | - <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' ); ?> /> |
|
| 51 | + <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' ); ?> /> |
|
| 52 | 52 | </label> |
| 53 | 53 | |
| 54 | 54 | <?php submit_button(); ?> |
@@ -3,18 +3,18 @@ |
||
| 3 | 3 | - Clear Mailchimp transient data such as forms, form fields, list data, subscribers etc. |
| 4 | 4 | * transient cache is stored for 60 minutes. |
| 5 | 5 | --> |
| 6 | -<h3><span><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
| 6 | +<h3><span><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
|
| 7 | 7 | <div class="inside"> |
| 8 | 8 | |
| 9 | 9 | <!-- Settings Form --> |
| 10 | - <form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post"> |
|
| 10 | + <form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post"> |
|
| 11 | 11 | |
| 12 | - <p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 12 | + <p><?php _e( "Delete all Mailchimp data stored in your sites cache. Most data is stored in the cache for 1 hour.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 13 | 13 | <!-- check if any of our transients contain data --> |
| 14 | 14 | <?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?> |
| 15 | - <p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
| 15 | + <p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No Mailchimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
|
| 16 | 16 | <?php } else { ?> |
| 17 | - <p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p> |
|
| 17 | + <p><input type="submit" class="button-primary" value="<?php _e( 'Clear Mailchimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p> |
|
| 18 | 18 | <?php } ?> |
| 19 | 19 | |
| 20 | 20 | </form> |
@@ -30,39 +30,39 @@ discard block |
||
| 30 | 30 | $form_submitted = isset( $form_submitted ) ? $form_submitted : 0; |
| 31 | 31 | |
| 32 | 32 | /* If the user hasn't authenticated yet, lets kill off */ |
| 33 | - if ( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 34 | - 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>'; |
|
| 33 | + if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 34 | + 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>'; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // if the user forgot to specify a form ID, lets kill of and warn them. |
| 38 | - if( ! $atts['form'] ) { |
|
| 38 | + if ( ! $atts[ 'form' ] ) { |
|
| 39 | 39 | return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' ); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | // store our variables |
| 43 | - $form_id = (int) $atts['form']; // form id (the id of the form in the database) |
|
| 43 | + $form_id = (int) $atts[ 'form' ]; // form id (the id of the form in the database) |
|
| 44 | 44 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
| 45 | 45 | $form_data = $interface->get_form( $form_id ); |
| 46 | 46 | |
| 47 | 47 | // confirm we have some results, or return an error |
| 48 | 48 | if ( empty( $form_data ) ) { |
| 49 | - 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' ); |
|
| 49 | + 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 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /* |
| 53 | 53 | * Check if the user wants to use reCAPTCHA Spam Prevention |
| 54 | 54 | */ |
| 55 | - if ( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) { |
|
| 55 | + if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) { |
|
| 56 | 56 | |
| 57 | 57 | // Allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page). |
| 58 | - if ( $atts['recaptcha'] != '0' ) { |
|
| 58 | + if ( $atts[ 'recaptcha' ] != '0' ) { |
|
| 59 | 59 | |
| 60 | 60 | // If either of the Private the Secret key is left blank, we should display an error back to the user. |
| 61 | - if ( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) { |
|
| 62 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA 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>'; |
|
| 61 | + if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) { |
|
| 62 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA 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>'; |
|
| 63 | 63 | } |
| 64 | - if ( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) { |
|
| 65 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA 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>'; |
|
| 64 | + if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) { |
|
| 65 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA 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>'; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $has_recaptcha = true; |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | $locale_split = explode( '_', $locale ); |
| 73 | 73 | |
| 74 | 74 | // Setup reCAPTCHA parameters. |
| 75 | - $lang = ! empty( $locale_split ) ? $locale_split[0] : $locale; |
|
| 76 | - $lang = ! empty( $atts['recaptcha_lang'] ) ? $atts['recaptcha_lang'] : $lang; |
|
| 77 | - $type = ! empty( $atts['recaptcha_type'] ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type |
|
| 78 | - $theme = ! empty( $atts['recaptcha_theme'] ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme |
|
| 79 | - $size = ! empty( $atts['recaptcha_size'] ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size |
|
| 80 | - $data_cb = ! empty( $atts['recaptcha_data_callback'] ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size |
|
| 81 | - $expired_cb = ! empty( $atts['recaptcha_expired_callback'] ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size |
|
| 75 | + $lang = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale; |
|
| 76 | + $lang = ! empty( $atts[ 'recaptcha_lang' ] ) ? $atts[ 'recaptcha_lang' ] : $lang; |
|
| 77 | + $type = ! empty( $atts[ 'recaptcha_type' ] ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type |
|
| 78 | + $theme = ! empty( $atts[ 'recaptcha_theme' ] ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme |
|
| 79 | + $size = ! empty( $atts[ 'recaptcha_size' ] ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size |
|
| 80 | + $data_cb = ! empty( $atts[ 'recaptcha_data_callback' ] ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size |
|
| 81 | + $expired_cb = ! empty( $atts[ 'recaptcha_expired_callback' ] ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size |
|
| 82 | 82 | |
| 83 | 83 | // Pass the shortcode parameters through a filter. |
| 84 | 84 | $recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array( |
@@ -88,49 +88,49 @@ discard block |
||
| 88 | 88 | 'size' => $size, |
| 89 | 89 | 'success_callback' => $data_cb, |
| 90 | 90 | 'expired_callback' => $expired_cb, |
| 91 | - ), $atts['form'] ); |
|
| 91 | + ), $atts[ 'form' ] ); |
|
| 92 | 92 | |
| 93 | 93 | // Enqueue Google recaptcha JS. |
| 94 | - 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' ); |
|
| 94 | + 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 | 95 | wp_enqueue_script( 'google-recaptcha-js' ); |
| 96 | 96 | |
| 97 | - $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' ); |
|
| 98 | - $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>'; |
|
| 97 | + $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' ); |
|
| 98 | + $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>'; |
|
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | // place our results into a separate variable for easy looping |
| 103 | - $additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false; |
|
| 103 | + $additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false; |
|
| 104 | 104 | |
| 105 | 105 | // store our options from the additional form settings array |
| 106 | - $form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : ''; |
|
| 107 | - $inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : ''; |
|
| 108 | - $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text'; |
|
| 109 | - $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' ); |
|
| 110 | - $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : ''; |
|
| 111 | - $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : ''; |
|
| 106 | + $form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : ''; |
|
| 107 | + $inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : ''; |
|
| 108 | + $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text'; |
|
| 109 | + $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' ); |
|
| 110 | + $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : ''; |
|
| 111 | + $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : ''; |
|
| 112 | 112 | |
| 113 | 113 | // scheuldes |
| 114 | - $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false; |
|
| 115 | - $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';; |
|
| 116 | - $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : ''; |
|
| 117 | - $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : ''; |
|
| 118 | - $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : ''; |
|
| 114 | + $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false; |
|
| 115 | + $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ; |
|
| 116 | + $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : ''; |
|
| 117 | + $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : ''; |
|
| 118 | + $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : ''; |
|
| 119 | 119 | |
| 120 | 120 | // register required |
| 121 | - $form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false; |
|
| 122 | - $form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : ''; |
|
| 121 | + $form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false; |
|
| 122 | + $form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : ''; |
|
| 123 | 123 | |
| 124 | 124 | // store number of fields |
| 125 | - $field_count = (int) count( $form_data['fields'] ); |
|
| 125 | + $field_count = (int) count( $form_data[ 'fields' ] ); |
|
| 126 | 126 | |
| 127 | 127 | // confirm we actually have fields, before looping |
| 128 | - if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
| 128 | + if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
| 129 | 129 | // loop over each field, if it's set to hidden -- subtract it from the field count |
| 130 | 130 | // this throws off the layout for inline forms setup below |
| 131 | - foreach ( $form_data['fields'] as $form_field ) { |
|
| 132 | - if ( isset( $form_field['hide'] ) && (string) $form_field['hide'] === '1' ) { |
|
| 133 | - $field_count --; |
|
| 131 | + foreach ( $form_data[ 'fields' ] as $form_field ) { |
|
| 132 | + if ( isset( $form_field[ 'hide' ] ) && (string) $form_field[ 'hide' ] === '1' ) { |
|
| 133 | + $field_count--; |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -139,8 +139,8 @@ discard block |
||
| 139 | 139 | * If login is required, abort |
| 140 | 140 | * @since 6.0.3.8 |
| 141 | 141 | */ |
| 142 | - if( $form_login_required ) { |
|
| 143 | - if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
| 142 | + if ( $form_login_required ) { |
|
| 143 | + if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
| 144 | 144 | ob_start(); |
| 145 | 145 | ?> |
| 146 | 146 | <div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required"> |
@@ -156,19 +156,19 @@ discard block |
||
| 156 | 156 | * Check if schedule is set for this form |
| 157 | 157 | * @since 6.0.3.8 |
| 158 | 158 | */ |
| 159 | - if( $form_schedule_state ) { |
|
| 159 | + if ( $form_schedule_state ) { |
|
| 160 | 160 | // store current date |
| 161 | 161 | $current_date = strtotime( current_time( 'm/d/Y g:iA' ) ); |
| 162 | 162 | |
| 163 | 163 | // the the current date is less than the form scheduled start date |
| 164 | - if( $current_date < $form_schedule_start ) { |
|
| 164 | + if ( $current_date < $form_schedule_start ) { |
|
| 165 | 165 | echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message, $form_id, $form_schedule_start ); |
| 166 | 166 | return; |
| 167 | 167 | // abort |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | // The current date is past or equal to the end date, aka form has now expired |
| 171 | - if( $current_date >= $form_schedule_end ) { |
|
| 171 | + if ( $current_date >= $form_schedule_end ) { |
|
| 172 | 172 | echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message, $form_id, $form_schedule_end ); |
| 173 | 173 | return; |
| 174 | 174 | // abort |
@@ -177,14 +177,14 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | // setup the submit button text |
| 179 | 179 | // shortcode parameter takes precedence over option |
| 180 | - $submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text; |
|
| 180 | + $submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text; |
|
| 181 | 181 | |
| 182 | 182 | /* |
| 183 | 183 | * Check for the constant to prevent styles from loading |
| 184 | 184 | * to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php |
| 185 | 185 | * @since 6.0.3.8 |
| 186 | 186 | */ |
| 187 | - if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
| 187 | + if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
| 188 | 188 | // enqueue the form styles |
| 189 | 189 | wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css' ); |
| 190 | 190 | } |
@@ -192,19 +192,19 @@ discard block |
||
| 192 | 192 | /** |
| 193 | 193 | * Check for form inline parameter |
| 194 | 194 | */ |
| 195 | - $form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
| 195 | + $form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
| 196 | 196 | // recheck from our form options |
| 197 | 197 | if ( ! $form_inline ) { |
| 198 | - $form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form']; |
|
| 198 | + $form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ]; |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
| 202 | - if( is_user_logged_in() ) { |
|
| 203 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 202 | + if ( is_user_logged_in() ) { |
|
| 203 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 204 | 204 | $edit_form_link = '<span class="edit-link">'; |
| 205 | - $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>'; |
|
| 205 | + $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>'; |
|
| 206 | 206 | $edit_form_link .= '</span>'; |
| 207 | - $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) ); |
|
| 207 | + $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) ); |
|
| 208 | 208 | } else { |
| 209 | 209 | $edit_form_link = ''; |
| 210 | 210 | } |
@@ -214,16 +214,16 @@ discard block |
||
| 214 | 214 | // or else Mailchimp throws errors at you |
| 215 | 215 | // extract our array keys |
| 216 | 216 | // @todo Remove array_keys() and in_array() usage here. |
| 217 | - if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
| 218 | - $array_keys = array_keys( $form_data['fields'] ); |
|
| 217 | + if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
| 218 | + $array_keys = array_keys( $form_data[ 'fields' ] ); |
|
| 219 | 219 | // check for EMAIL in that array |
| 220 | - if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) { |
|
| 221 | - 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>'; |
|
| 220 | + if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) { |
|
| 221 | + 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>'; |
|
| 222 | 222 | } |
| 223 | 223 | } else { |
| 224 | - $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 225 | - if( is_user_logged_in() ) { |
|
| 226 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 224 | + $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 225 | + if ( is_user_logged_in() ) { |
|
| 226 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 227 | 227 | return $error . $edit_form_link; |
| 228 | 228 | } |
| 229 | 229 | } else { |
@@ -325,17 +325,17 @@ discard block |
||
| 325 | 325 | * Set a custom title using custom_title="lorem ipsum" parameter in the shortcode |
| 326 | 326 | * - This takes precedence over the title set |
| 327 | 327 | */ |
| 328 | - if ( $atts['title'] ) { |
|
| 329 | - if ( ! empty( $atts['custom_title'] ) ) { |
|
| 328 | + if ( $atts[ 'title' ] ) { |
|
| 329 | + if ( ! empty( $atts[ 'custom_title' ] ) ) { |
|
| 330 | 330 | /** |
| 331 | 331 | * Filter the title that is displayed through the shortcode. |
| 332 | 332 | * |
| 333 | 333 | * @param string $title The title to display. |
| 334 | 334 | * @param int $form_id The form ID. |
| 335 | 335 | */ |
| 336 | - $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ); |
|
| 336 | + $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ); |
|
| 337 | 337 | } else { |
| 338 | - $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id ); |
|
| 338 | + $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id ); |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title ); |
@@ -345,17 +345,17 @@ discard block |
||
| 345 | 345 | * Allow users to specify a custom description for this form, no html support |
| 346 | 346 | * @since 6.0.3.8 |
| 347 | 347 | */ |
| 348 | - if ( $atts['description'] ) { |
|
| 349 | - if ( ! empty( $atts['custom_description'] ) ) { |
|
| 348 | + if ( $atts[ 'description' ] ) { |
|
| 349 | + if ( ! empty( $atts[ 'custom_description' ] ) ) { |
|
| 350 | 350 | /** |
| 351 | 351 | * Filter the description that is displayed through the shortcode. |
| 352 | 352 | * |
| 353 | 353 | * @param string $title The title to display. |
| 354 | 354 | * @param int $form_id The form ID. |
| 355 | 355 | */ |
| 356 | - $description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ); |
|
| 356 | + $description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ); |
|
| 357 | 357 | } else { |
| 358 | - $description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id ); |
|
| 358 | + $description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id ); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description ); |
@@ -370,10 +370,10 @@ discard block |
||
| 370 | 370 | $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 371 | 371 | |
| 372 | 372 | // Check for AJAX |
| 373 | - if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) { |
|
| 373 | + if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) { |
|
| 374 | 374 | |
| 375 | 375 | // Enqueue our ajax script |
| 376 | - wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js" , array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
| 376 | + wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js", array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
| 377 | 377 | wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array( |
| 378 | 378 | 'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ), |
| 379 | 379 | 'page_data' => $page_data, |
@@ -404,67 +404,67 @@ discard block |
||
| 404 | 404 | |
| 405 | 405 | // render the form! |
| 406 | 406 | ?> |
| 407 | - <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 ); ?>"> |
|
| 407 | + <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 ); ?>"> |
|
| 408 | 408 | |
| 409 | 409 | <?php |
| 410 | 410 | // Set a default constant for hidden fields |
| 411 | 411 | $hidden_label_count = 0; |
| 412 | 412 | |
| 413 | 413 | // Loop over our form fields |
| 414 | - foreach( $form_data['fields'] as $field ) { |
|
| 414 | + foreach ( $form_data[ 'fields' ] as $field ) { |
|
| 415 | 415 | // input array |
| 416 | 416 | $field_array = array(); |
| 417 | 417 | // label array |
| 418 | 418 | $label_array = array(); |
| 419 | 419 | // label classes array |
| 420 | 420 | $label_class_array = array(); |
| 421 | - if( $field['additional-classes'] != '' ) { |
|
| 421 | + if ( $field[ 'additional-classes' ] != '' ) { |
|
| 422 | 422 | // split custom classes at spaces |
| 423 | - $custom_classes = explode( ' ' , $field['additional-classes'] ); |
|
| 423 | + $custom_classes = explode( ' ', $field[ 'additional-classes' ] ); |
|
| 424 | 424 | // check our custom class array for field-left/field-right |
| 425 | 425 | // if it's set we need to assign it to our label and remove it from the field classes |
| 426 | 426 | // input half left |
| 427 | - if( in_array( 'field-left-half' , $custom_classes ) ) { |
|
| 427 | + if ( in_array( 'field-left-half', $custom_classes ) ) { |
|
| 428 | 428 | // $label_array['class'] = 'class="field-left-half"'; |
| 429 | - $label_class_array[] = 'field-left-half'; |
|
| 430 | - $key = array_search( 'field-left-half' , $custom_classes ); |
|
| 431 | - unset( $custom_classes[$key] ); |
|
| 429 | + $label_class_array[ ] = 'field-left-half'; |
|
| 430 | + $key = array_search( 'field-left-half', $custom_classes ); |
|
| 431 | + unset( $custom_classes[ $key ] ); |
|
| 432 | 432 | } // input half right |
| 433 | - if( in_array( 'field-right-half' , $custom_classes ) ) { |
|
| 433 | + if ( in_array( 'field-right-half', $custom_classes ) ) { |
|
| 434 | 434 | // $label_array['class'] = 'class="field-right-half"'; |
| 435 | - $label_class_array[] = 'field-right-half'; |
|
| 436 | - $key = array_search( 'field-right-half' , $custom_classes ); |
|
| 437 | - unset( $custom_classes[$key] ); |
|
| 435 | + $label_class_array[ ] = 'field-right-half'; |
|
| 436 | + $key = array_search( 'field-right-half', $custom_classes ); |
|
| 437 | + unset( $custom_classes[ $key ] ); |
|
| 438 | 438 | } // input thirds (1/3 width, floated left) |
| 439 | - if( in_array( 'field-third' , $custom_classes ) ) { |
|
| 439 | + if ( in_array( 'field-third', $custom_classes ) ) { |
|
| 440 | 440 | // $label_array['class'] = 'class="field-third"'; |
| 441 | - $label_class_array[] = 'field-third'; |
|
| 442 | - $key = array_search( 'field-third' , $custom_classes ); |
|
| 443 | - unset( $custom_classes[$key] ); |
|
| 441 | + $label_class_array[ ] = 'field-third'; |
|
| 442 | + $key = array_search( 'field-third', $custom_classes ); |
|
| 443 | + unset( $custom_classes[ $key ] ); |
|
| 444 | 444 | } // 2 column radio |
| 445 | - if( in_array( 'option-2-col' , $custom_classes ) ) { |
|
| 445 | + if ( in_array( 'option-2-col', $custom_classes ) ) { |
|
| 446 | 446 | // $label_array['class'] = 'class="option-2-col"'; |
| 447 | - $label_class_array[] = 'option-2-col'; |
|
| 448 | - $key = array_search( 'option-2-col' , $custom_classes ); |
|
| 449 | - unset( $custom_classes[$key] ); |
|
| 447 | + $label_class_array[ ] = 'option-2-col'; |
|
| 448 | + $key = array_search( 'option-2-col', $custom_classes ); |
|
| 449 | + unset( $custom_classes[ $key ] ); |
|
| 450 | 450 | } // 3 column radio |
| 451 | - if( in_array( 'option-3-col' , $custom_classes ) ) { |
|
| 451 | + if ( in_array( 'option-3-col', $custom_classes ) ) { |
|
| 452 | 452 | // $label_array['class'] = 'class="option-3-col"'; |
| 453 | - $label_class_array[] = 'option-3-col'; |
|
| 454 | - $key = array_search( 'option-3-col' , $custom_classes ); |
|
| 455 | - unset( $custom_classes[$key] ); |
|
| 453 | + $label_class_array[ ] = 'option-3-col'; |
|
| 454 | + $key = array_search( 'option-3-col', $custom_classes ); |
|
| 455 | + unset( $custom_classes[ $key ] ); |
|
| 456 | 456 | } // 4 column radio |
| 457 | - if( in_array( 'option-4-col' , $custom_classes ) ) { |
|
| 457 | + if ( in_array( 'option-4-col', $custom_classes ) ) { |
|
| 458 | 458 | // $label_array['class'] = 'class="option-4-col"'; |
| 459 | - $label_class_array[] = 'option-4-col'; |
|
| 460 | - $key = array_search( 'option-4-col' , $custom_classes ); |
|
| 461 | - unset( $custom_classes[$key] ); |
|
| 459 | + $label_class_array[ ] = 'option-4-col'; |
|
| 460 | + $key = array_search( 'option-4-col', $custom_classes ); |
|
| 461 | + unset( $custom_classes[ $key ] ); |
|
| 462 | 462 | } // inline radio & checkboxes etc |
| 463 | - if( in_array( 'option-inline' , $custom_classes ) ) { |
|
| 463 | + if ( in_array( 'option-inline', $custom_classes ) ) { |
|
| 464 | 464 | // $label_array['class'] = 'class="option-inline"'; |
| 465 | - $label_class_array[] = 'option-inline'; |
|
| 466 | - $key = array_search( 'option-inline' , $custom_classes ); |
|
| 467 | - unset( $custom_classes[$key] ); |
|
| 465 | + $label_class_array[ ] = 'option-inline'; |
|
| 466 | + $key = array_search( 'option-inline', $custom_classes ); |
|
| 467 | + unset( $custom_classes[ $key ] ); |
|
| 468 | 468 | } |
| 469 | 469 | } else { |
| 470 | 470 | $custom_classes = array(); |
@@ -472,19 +472,19 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | // if the form is set to inline, add the inline class to our labels |
| 474 | 474 | // since @6.0.3.8 |
| 475 | - if( $form_inline ) { |
|
| 476 | - $label_class_array[] = 'label-inline'; |
|
| 475 | + if ( $form_inline ) { |
|
| 476 | + $label_class_array[ ] = 'label-inline'; |
|
| 477 | 477 | } |
| 478 | 478 | |
| 479 | - if( isset( $field['hide-label'] ) ) { |
|
| 480 | - if( absint( $field['hide-label'] ) === 1 ) { |
|
| 479 | + if ( isset( $field[ 'hide-label' ] ) ) { |
|
| 480 | + if ( absint( $field[ 'hide-label' ] ) === 1 ) { |
|
| 481 | 481 | $hidden_label_count++; |
| 482 | - $custom_classes[] = 'field-no-label'; |
|
| 482 | + $custom_classes[ ] = 'field-no-label'; |
|
| 483 | 483 | } |
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | /* Store tag variable based on field type */ |
| 487 | - if( isset( $field['merge'] ) ) { |
|
| 487 | + if ( isset( $field[ 'merge' ] ) ) { |
|
| 488 | 488 | $group = ''; |
| 489 | 489 | $tag = 'merge'; |
| 490 | 490 | } else { |
@@ -494,28 +494,28 @@ discard block |
||
| 494 | 494 | |
| 495 | 495 | // build up our array |
| 496 | 496 | $field_id_string = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ]; |
| 497 | - $field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
| 498 | - $field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
| 499 | - $field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : ''; |
|
| 500 | - $field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' . esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" '; |
|
| 497 | + $field_array[ 'id' ] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
| 498 | + $field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
| 499 | + $field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : ''; |
|
| 500 | + $field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" '; |
|
| 501 | 501 | |
| 502 | 502 | // email must always be required and visible |
| 503 | - if( $field['type'] == 'email' ) { |
|
| 504 | - $field_array['required'] = 'required="required"'; |
|
| 505 | - $label_array['visible'] = ''; |
|
| 506 | - $label_class_array[] = $field['merge'] . '-label'; |
|
| 507 | - $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
| 503 | + if ( $field[ 'type' ] == 'email' ) { |
|
| 504 | + $field_array[ 'required' ] = 'required="required"'; |
|
| 505 | + $label_array[ 'visible' ] = ''; |
|
| 506 | + $label_class_array[ ] = $field[ 'merge' ] . '-label'; |
|
| 507 | + $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
| 508 | 508 | } else { |
| 509 | - $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : ''; |
|
| 510 | - $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : ''; |
|
| 511 | - $label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label'; |
|
| 512 | - if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
| 509 | + $field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : ''; |
|
| 510 | + $label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : ''; |
|
| 511 | + $label_class_array[ ] = ( $tag === 'merge' ) ? $field[ 'merge' ] . '-label' : $field[ 'group_id' ] . '-label'; |
|
| 512 | + if ( isset( $field[ 'require' ] ) ) $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
| 513 | 513 | } |
| 514 | 514 | |
| 515 | 515 | // if both hide label and hide field are checked, we gotta hide the field! |
| 516 | - if( isset( $field['hide' ] ) && $field['hide'] == 1 ) { |
|
| 517 | - if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) { |
|
| 518 | - $field_array['visible'] = 'style="display:none;"'; |
|
| 516 | + if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) { |
|
| 517 | + if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) { |
|
| 518 | + $field_array[ 'visible' ] = 'style="display:none;"'; |
|
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | |
@@ -523,20 +523,20 @@ discard block |
||
| 523 | 523 | $label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array; |
| 524 | 524 | |
| 525 | 525 | // Turn the clases into a string |
| 526 | - $label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
| 526 | + $label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
| 527 | 527 | |
| 528 | 528 | // Filter the field array data |
| 529 | 529 | $field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id ); |
| 530 | 530 | |
| 531 | 531 | /* Loop Over Standard Fields (aka merge variables) */ |
| 532 | - if( isset( $field['merge'] ) ) { |
|
| 532 | + if ( isset( $field[ 'merge' ] ) ) { |
|
| 533 | 533 | |
| 534 | 534 | // Handle the Description logic in one spot, here: |
| 535 | - $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
| 536 | - $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
| 535 | + $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
| 536 | + $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
| 537 | 537 | if ( $show_description === true ) { |
| 538 | - $description = '<p class="form-field-description" id="form-field-description-' . $field['merge'] . '">'; |
|
| 539 | - $description .= apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 538 | + $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'merge' ] . '">'; |
|
| 539 | + $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 540 | 540 | $description .= '</p>'; |
| 541 | 541 | |
| 542 | 542 | /** |
@@ -548,11 +548,11 @@ discard block |
||
| 548 | 548 | * @param string | $field['description'] | The field's description text |
| 549 | 549 | * @param int | $form_id |
| 550 | 550 | */ |
| 551 | - $description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 551 | + $description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 552 | 552 | } |
| 553 | 553 | |
| 554 | 554 | // loop over our fields by Type |
| 555 | - switch ( $field['type'] ) { |
|
| 555 | + switch ( $field[ 'type' ] ) { |
|
| 556 | 556 | |
| 557 | 557 | default: |
| 558 | 558 | case 'email': |
@@ -560,24 +560,24 @@ discard block |
||
| 560 | 560 | case 'number': |
| 561 | 561 | |
| 562 | 562 | // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type) |
| 563 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 563 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 564 | 564 | $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value ); |
| 565 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 565 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 566 | 566 | |
| 567 | 567 | ?> |
| 568 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 568 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 569 | 569 | |
| 570 | 570 | <!-- dictate label visibility --> |
| 571 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 572 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 573 | - <?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?> |
|
| 571 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 572 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 573 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?> |
|
| 574 | 574 | </span> |
| 575 | 575 | <?php } ?> |
| 576 | 576 | |
| 577 | 577 | <!-- Description Above --> |
| 578 | 578 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 579 | 579 | |
| 580 | - <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 ); } ?>"> |
|
| 580 | + <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 ); } ?>"> |
|
| 581 | 581 | |
| 582 | 582 | <!-- Description Below --> |
| 583 | 583 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -589,23 +589,23 @@ discard block |
||
| 589 | 589 | |
| 590 | 590 | case 'url': |
| 591 | 591 | case 'imageurl': |
| 592 | - $default_value = ( isset( $field['default'] ) ) ? $field['default'] : ''; |
|
| 593 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 592 | + $default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : ''; |
|
| 593 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 594 | 594 | ?> |
| 595 | 595 | |
| 596 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 596 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 597 | 597 | |
| 598 | 598 | <!-- dictate label visibility --> |
| 599 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 600 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 601 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 599 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 600 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 601 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 602 | 602 | </span> |
| 603 | 603 | <?php } ?> |
| 604 | 604 | |
| 605 | 605 | <!-- Description Above --> |
| 606 | 606 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 607 | 607 | |
| 608 | - <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 ); } ?>" > |
|
| 608 | + <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 ); } ?>" > |
|
| 609 | 609 | |
| 610 | 610 | <!-- Description Below --> |
| 611 | 611 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -616,24 +616,24 @@ discard block |
||
| 616 | 616 | break; |
| 617 | 617 | |
| 618 | 618 | case 'phone': |
| 619 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 620 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 621 | - $phone_format = $field['phone_format']; |
|
| 619 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 620 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 621 | + $phone_format = $field[ 'phone_format' ]; |
|
| 622 | 622 | ?> |
| 623 | 623 | |
| 624 | - <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 624 | + <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 625 | 625 | |
| 626 | 626 | <!-- dictate label visibility --> |
| 627 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 628 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 629 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 627 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 628 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 629 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 630 | 630 | </span> |
| 631 | 631 | <?php } ?> |
| 632 | 632 | |
| 633 | 633 | <!-- Description Above --> |
| 634 | 634 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 635 | 635 | |
| 636 | - <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 ); } ?>"> |
|
| 636 | + <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 ); } ?>"> |
|
| 637 | 637 | |
| 638 | 638 | <!-- Description Below --> |
| 639 | 639 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -643,23 +643,23 @@ discard block |
||
| 643 | 643 | break; |
| 644 | 644 | |
| 645 | 645 | case 'zip': |
| 646 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 647 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 646 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 647 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 648 | 648 | |
| 649 | 649 | ?> |
| 650 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 650 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 651 | 651 | |
| 652 | 652 | <!-- dictate label visibility --> |
| 653 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 654 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 655 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 653 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 654 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 655 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 656 | 656 | </span> |
| 657 | 657 | <?php } ?> |
| 658 | 658 | |
| 659 | 659 | <!-- Description Above --> |
| 660 | 660 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 661 | 661 | |
| 662 | - <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 ); } ?>"> |
|
| 662 | + <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 ); } ?>"> |
|
| 663 | 663 | |
| 664 | 664 | <!-- Description Below --> |
| 665 | 665 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | case 'address': |
| 673 | 673 | |
| 674 | 674 | // required fields |
| 675 | - $required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' ); |
|
| 675 | + $required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' ); |
|
| 676 | 676 | |
| 677 | 677 | /** |
| 678 | 678 | * Filter to control the default country (the option pre-selected in the country dropdown). |
@@ -688,55 +688,55 @@ discard block |
||
| 688 | 688 | if ( $show_description === true && $description_above === true ) { echo $description; } |
| 689 | 689 | |
| 690 | 690 | // Placeholder logic |
| 691 | - if ( ! empty( $field_array['placeholder'] ) ) { |
|
| 691 | + if ( ! empty( $field_array[ 'placeholder' ] ) ) { |
|
| 692 | 692 | |
| 693 | 693 | $use_address_placeholder = true; |
| 694 | 694 | |
| 695 | 695 | // Don't use the address field's array placeholder - use the custom placeholder |
| 696 | - unset( $field_array['placeholder'] ); |
|
| 696 | + unset( $field_array[ 'placeholder' ] ); |
|
| 697 | 697 | } |
| 698 | 698 | |
| 699 | 699 | // store number for looping |
| 700 | 700 | $x = 1; |
| 701 | - foreach( $required_fields as $type => $label ) { |
|
| 701 | + foreach ( $required_fields as $type => $label ) { |
|
| 702 | 702 | |
| 703 | 703 | // set the field names for the address fields |
| 704 | - $field_array['name'] = 'name="' . $field[$tag] . '[' . $type . ']' . '"'; |
|
| 704 | + $field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"'; |
|
| 705 | 705 | |
| 706 | 706 | // Set the placeholder value if we need to |
| 707 | 707 | $placeholder = isset( $use_address_placeholder ) ? apply_filters( 'yikes-mailchimp-address-' . $type . '-placeholder', ucwords( $label ) ) : ''; |
| 708 | 708 | |
| 709 | 709 | // reset the label classes for left-half/right-half for addresses |
| 710 | - if( isset( $label_array['class'] ) ) { |
|
| 710 | + if ( isset( $label_array[ 'class' ] ) ) { |
|
| 711 | 711 | if ( $x % 2 == 0 ) { |
| 712 | - $label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] ); |
|
| 712 | + $label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] ); |
|
| 713 | 713 | } else { |
| 714 | - $label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] ); |
|
| 714 | + $label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] ); |
|
| 715 | 715 | } |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | 718 | // Never force addr2 to be required |
| 719 | 719 | if ( $type === 'addr2' ) { |
| 720 | - $field_array['required'] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
| 720 | + $field_array[ 'required' ] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | - switch( $type ) { |
|
| 723 | + switch ( $type ) { |
|
| 724 | 724 | |
| 725 | 725 | default: |
| 726 | 726 | case 'addr1': |
| 727 | 727 | case 'addr2': |
| 728 | 728 | case 'city': |
| 729 | 729 | ?> |
| 730 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 730 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
| 731 | 731 | |
| 732 | 732 | <!-- dictate label visibility --> |
| 733 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 734 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 735 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 733 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 734 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 735 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 736 | 736 | </span> |
| 737 | 737 | <?php } ?> |
| 738 | 738 | |
| 739 | - <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] ); } ?>"> |
|
| 739 | + <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 ] ); } ?>"> |
|
| 740 | 740 | |
| 741 | 741 | </label> |
| 742 | 742 | <?php |
@@ -745,16 +745,16 @@ discard block |
||
| 745 | 745 | |
| 746 | 746 | case 'state': |
| 747 | 747 | ?> |
| 748 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"> |
|
| 748 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"> |
|
| 749 | 749 | |
| 750 | 750 | <!-- dictate label visibility --> |
| 751 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 752 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 753 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 751 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 752 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 753 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 754 | 754 | </span> |
| 755 | 755 | <?php } ?> |
| 756 | 756 | |
| 757 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 757 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 758 | 758 | <?php |
| 759 | 759 | $state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); |
| 760 | 760 | /** |
@@ -780,21 +780,21 @@ discard block |
||
| 780 | 780 | case 'zip': |
| 781 | 781 | |
| 782 | 782 | ?> |
| 783 | - <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 } ?>> |
|
| 783 | + <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 } ?>> |
|
| 784 | 784 | |
| 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 | 791 | <?php |
| 792 | 792 | // If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently... |
| 793 | - if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { |
|
| 794 | - if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) { |
|
| 795 | - $zip_value = $_POST[$field['merge']]['zip']; |
|
| 793 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { |
|
| 794 | + if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) { |
|
| 795 | + $zip_value = $_POST[ $field[ 'merge' ] ][ 'zip' ]; |
|
| 796 | 796 | } else { |
| 797 | - $zip_value = $_POST[$field['merge']]; |
|
| 797 | + $zip_value = $_POST[ $field[ 'merge' ] ]; |
|
| 798 | 798 | } |
| 799 | 799 | } else { |
| 800 | 800 | |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | } |
| 815 | 815 | ?> |
| 816 | 816 | |
| 817 | - <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 ); ?>"> |
|
| 817 | + <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 ); ?>"> |
|
| 818 | 818 | |
| 819 | 819 | </label> |
| 820 | 820 | <?php |
@@ -824,16 +824,16 @@ discard block |
||
| 824 | 824 | case 'country': |
| 825 | 825 | ?> |
| 826 | 826 | |
| 827 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 827 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
| 828 | 828 | |
| 829 | 829 | <!-- dictate label visibility --> |
| 830 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 831 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 832 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 830 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 831 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 832 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 833 | 833 | </span> |
| 834 | 834 | <?php } ?> |
| 835 | 835 | |
| 836 | - <select <?php echo implode( ' ' , $field_array ); ?> data-country="true"> |
|
| 836 | + <select <?php echo implode( ' ', $field_array ); ?> data-country="true"> |
|
| 837 | 837 | <?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?> |
| 838 | 838 | </select> |
| 839 | 839 | </label> |
@@ -879,40 +879,40 @@ discard block |
||
| 879 | 879 | wp_register_script( 'yikes-datepicker-scripts', YIKES_MC_URL . "public/js/yikes-datepicker-scripts{$min}.js", array( 'jquery-ui-datepicker' ), YIKES_MC_VERSION, false ); |
| 880 | 880 | wp_localize_script( 'yikes-datepicker-scripts', 'datepicker_settings', $datepicker_options ); |
| 881 | 881 | wp_enqueue_script( 'yikes-datepicker-scripts' ); |
| 882 | - wp_enqueue_style( 'jquery-datepicker-styles' , YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
| 883 | - wp_enqueue_style( 'yikes-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
| 882 | + wp_enqueue_style( 'jquery-datepicker-styles', YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
| 883 | + wp_enqueue_style( 'yikes-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
| 884 | 884 | |
| 885 | - switch ( $field['type'] ) { |
|
| 885 | + switch ( $field[ 'type' ] ) { |
|
| 886 | 886 | default: |
| 887 | 887 | case 'date': |
| 888 | - $date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yyyy'; |
|
| 888 | + $date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yyyy'; |
|
| 889 | 889 | break; |
| 890 | 890 | |
| 891 | 891 | case 'birthday': |
| 892 | - $date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd'; |
|
| 892 | + $date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd'; |
|
| 893 | 893 | break; |
| 894 | 894 | } |
| 895 | 895 | |
| 896 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 897 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 896 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 897 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 898 | 898 | |
| 899 | 899 | // store empty number for looping |
| 900 | 900 | $x = 0; |
| 901 | 901 | |
| 902 | 902 | ?> |
| 903 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 903 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 904 | 904 | |
| 905 | 905 | <!-- dictate label visibility --> |
| 906 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 907 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 908 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 906 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 907 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 908 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 909 | 909 | </span> |
| 910 | 910 | <?php } ?> |
| 911 | 911 | |
| 912 | 912 | <!-- Description Above --> |
| 913 | 913 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 914 | 914 | |
| 915 | - <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 ) ); ?>"> |
|
| 915 | + <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 ) ); ?>"> |
|
| 916 | 916 | |
| 917 | 917 | <!-- Description Below --> |
| 918 | 918 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -923,26 +923,26 @@ discard block |
||
| 923 | 923 | break; |
| 924 | 924 | |
| 925 | 925 | case 'dropdown': |
| 926 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 927 | - $default_choice = is_array( $field['default_choice'] ) ? $field['default_choice'] : array( $field['default_choice'] ); |
|
| 926 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 927 | + $default_choice = is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : array( $field[ 'default_choice' ] ); |
|
| 928 | 928 | |
| 929 | 929 | // store empty number for looping |
| 930 | 930 | $x = 0; |
| 931 | 931 | ?> |
| 932 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 932 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 933 | 933 | <!-- dictate label visibility --> |
| 934 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 935 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 936 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 934 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 935 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 936 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 937 | 937 | </span> |
| 938 | 938 | <?php } |
| 939 | 939 | |
| 940 | 940 | // decode for looping |
| 941 | - $choices = json_decode( $field['choices'], true ); |
|
| 941 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 942 | 942 | |
| 943 | 943 | // If the form was submitted, but failed, let's default to the chosen option |
| 944 | - if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
| 945 | - $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
| 944 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
| 945 | + $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
| 946 | 946 | } |
| 947 | 947 | |
| 948 | 948 | ?> |
@@ -950,11 +950,11 @@ discard block |
||
| 950 | 950 | <!-- Description Above --> |
| 951 | 951 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 952 | 952 | |
| 953 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 953 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 954 | 954 | <?php |
| 955 | 955 | $no_default_name = apply_filters( 'yikes-mailchimp-dropdown-field-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); |
| 956 | 956 | echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
| 957 | - foreach( $choices as $choice ) { ?> |
|
| 957 | + foreach ( $choices as $choice ) { ?> |
|
| 958 | 958 | <option |
| 959 | 959 | value="<?php echo esc_attr( $choice ); ?>" |
| 960 | 960 | <?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'selected="selected"'; } ?>> |
@@ -977,17 +977,17 @@ discard block |
||
| 977 | 977 | case 'radio': |
| 978 | 978 | case 'checkbox': |
| 979 | 979 | // remove the ID (as to not assign the same ID to every radio button) |
| 980 | - unset( $field_array['id'] ); |
|
| 981 | - $choices = json_decode( $field['choices'], true ); |
|
| 980 | + unset( $field_array[ 'id' ] ); |
|
| 981 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 982 | 982 | |
| 983 | 983 | // assign a default choice |
| 984 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 985 | - $default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? $field['default_choice'] : $choices[0]; |
|
| 984 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 985 | + $default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? $field[ 'default_choice' ] : $choices[ 0 ]; |
|
| 986 | 986 | $default_choice = ( is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
| 987 | 987 | |
| 988 | 988 | // If the form was submitted, but failed, let's default to the chosen option |
| 989 | - if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
| 990 | - $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
| 989 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
| 990 | + $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
| 991 | 991 | } |
| 992 | 992 | |
| 993 | 993 | $count = count( $choices ); |
@@ -995,29 +995,29 @@ discard block |
||
| 995 | 995 | $x = 0; |
| 996 | 996 | |
| 997 | 997 | ?> |
| 998 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 998 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 999 | 999 | |
| 1000 | 1000 | <!-- dictate label visibility --> |
| 1001 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1002 | - <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label"> |
|
| 1003 | - <?php echo esc_attr( apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label', stripslashes( $field['label'] ) ) ); ?> |
|
| 1001 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1002 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1003 | + <?php echo esc_attr( apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1004 | 1004 | </span> |
| 1005 | 1005 | <?php } |
| 1006 | 1006 | |
| 1007 | 1007 | // <!-- Description Above --> |
| 1008 | 1008 | if ( $show_description === true && $description_above === true ) { echo $description; } |
| 1009 | 1009 | |
| 1010 | - foreach( $choices as $choice ) { |
|
| 1010 | + foreach ( $choices as $choice ) { |
|
| 1011 | 1011 | ?> |
| 1012 | - <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 } ?>"> |
|
| 1012 | + <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 } ?>"> |
|
| 1013 | 1013 | <input |
| 1014 | - type="<?php echo esc_attr( $field['type'] ); ?>" |
|
| 1015 | - name="<?php echo esc_attr( $field['merge'] ); ?>" |
|
| 1016 | - id="<?php echo esc_attr( $field['merge'] . '-' . $i ); ?>" |
|
| 1014 | + type="<?php echo esc_attr( $field[ 'type' ] ); ?>" |
|
| 1015 | + name="<?php echo esc_attr( $field[ 'merge' ] ); ?>" |
|
| 1016 | + id="<?php echo esc_attr( $field[ 'merge' ] . '-' . $i ); ?>" |
|
| 1017 | 1017 | <?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'checked="checked"'; } ?> |
| 1018 | - <?php echo $field_array['required']; ?> |
|
| 1018 | + <?php echo $field_array[ 'required' ]; ?> |
|
| 1019 | 1019 | value="<?php echo esc_attr( $choice ); ?>"> |
| 1020 | - <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
| 1020 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
| 1021 | 1021 | </label> |
| 1022 | 1022 | <?php |
| 1023 | 1023 | $i++; |
@@ -1038,11 +1038,11 @@ discard block |
||
| 1038 | 1038 | /**** Interest Groups ****/ |
| 1039 | 1039 | |
| 1040 | 1040 | // Handle the Description logic in one spot, here: |
| 1041 | - $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
| 1042 | - $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
| 1041 | + $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
| 1042 | + $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
| 1043 | 1043 | if ( $show_description === true ) { |
| 1044 | - $description = '<p class="form-field-description" id="form-field-description-' . $field['group_id'] . '">'; |
|
| 1045 | - $description .= apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 1044 | + $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'group_id' ] . '">'; |
|
| 1045 | + $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 1046 | 1046 | $description .= '</p>'; |
| 1047 | 1047 | |
| 1048 | 1048 | /** |
@@ -1054,27 +1054,27 @@ discard block |
||
| 1054 | 1054 | * @param string | $field['description'] | The field's description text |
| 1055 | 1055 | * @param int | $form_id |
| 1056 | 1056 | */ |
| 1057 | - $description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 1057 | + $description = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | // Get our groups |
| 1061 | - $groups = isset( $field['groups'] ) && ! empty( $field['groups'] ) ? json_decode( $field['groups'], true ) : array(); |
|
| 1061 | + $groups = isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ? json_decode( $field[ 'groups' ], true ) : array(); |
|
| 1062 | 1062 | |
| 1063 | 1063 | // Get the default choice(s) from the field settings and turn them into an array if not already |
| 1064 | - $default_choice = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
| 1064 | + $default_choice = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
| 1065 | 1065 | $default_choice = is_array( $default_choice ) ? $default_choice : array( $default_choice ); |
| 1066 | - $default_choice = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-default', $default_choice, $groups, $field, $form_id ); |
|
| 1066 | + $default_choice = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-default', $default_choice, $groups, $field, $form_id ); |
|
| 1067 | 1067 | |
| 1068 | 1068 | $count = count( $groups ); |
| 1069 | 1069 | |
| 1070 | - if( $field['type'] === 'checkboxes' ) { |
|
| 1070 | + if ( $field[ 'type' ] === 'checkboxes' ) { |
|
| 1071 | 1071 | $type = 'checkbox'; |
| 1072 | - } else if( $field['type'] === 'radio' ) { |
|
| 1072 | + } else if ( $field[ 'type' ] === 'radio' ) { |
|
| 1073 | 1073 | $type = 'radio'; |
| 1074 | 1074 | } |
| 1075 | 1075 | |
| 1076 | 1076 | // loop over the interest group field types |
| 1077 | - switch ( $field['type'] ) { |
|
| 1077 | + switch ( $field[ 'type' ] ) { |
|
| 1078 | 1078 | |
| 1079 | 1079 | case 'checkboxes': |
| 1080 | 1080 | case 'radio': |
@@ -1082,11 +1082,11 @@ discard block |
||
| 1082 | 1082 | $x = 1; // used to find the last item of our array |
| 1083 | 1083 | |
| 1084 | 1084 | ?> |
| 1085 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1086 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1085 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1086 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1087 | 1087 | <!-- dictate label visibility --> |
| 1088 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1089 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1088 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1089 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1090 | 1090 | </span> |
| 1091 | 1091 | <?php |
| 1092 | 1092 | } |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | |
| 1097 | 1097 | // Display Submission Errors |
| 1098 | 1098 | if ( ! empty( $missing_required_checkbox_interest_groups ) ) { |
| 1099 | - if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) { |
|
| 1099 | + if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) { |
|
| 1100 | 1100 | ?> |
| 1101 | 1101 | <p class="yikes-mailchimp-required-interest-group-error"> |
| 1102 | 1102 | <?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?> |
@@ -1108,20 +1108,20 @@ discard block |
||
| 1108 | 1108 | foreach ( $groups as $group_id => $name ) { |
| 1109 | 1109 | |
| 1110 | 1110 | // If the form was submitted and failed, set the submitted/chosen values as the default |
| 1111 | - if ( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
| 1111 | + if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
| 1112 | 1112 | |
| 1113 | 1113 | // Format default choice as array |
| 1114 | - $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
| 1114 | + $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | 1117 | ?> |
| 1118 | - <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 } ?>"> |
|
| 1118 | + <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 } ?>"> |
|
| 1119 | 1119 | <input |
| 1120 | - <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { if ( $field['type'] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
| 1120 | + <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { if ( $field[ 'type' ] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
| 1121 | 1121 | class="yikes-interest-group-required" <?php } ?> |
| 1122 | 1122 | type="<?php echo esc_attr( $type ); ?>" |
| 1123 | - name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
| 1124 | - id="<?php echo esc_attr( $field['group_id'] . '-' . $i ); ?>" |
|
| 1123 | + name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
| 1124 | + id="<?php echo esc_attr( $field[ 'group_id' ] . '-' . $i ); ?>" |
|
| 1125 | 1125 | <?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
| 1126 | 1126 | value="<?php echo esc_attr( $group_id ); ?>"> |
| 1127 | 1127 | <?php echo esc_attr( $name ); ?> |
@@ -1143,32 +1143,32 @@ discard block |
||
| 1143 | 1143 | |
| 1144 | 1144 | ?> |
| 1145 | 1145 | |
| 1146 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1146 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1147 | 1147 | <!-- dictate label visibility --> |
| 1148 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1149 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>"> |
|
| 1150 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1148 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1149 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>"> |
|
| 1150 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1151 | 1151 | </span> |
| 1152 | 1152 | <?php } ?> |
| 1153 | 1153 | |
| 1154 | 1154 | <!-- Description Above --> |
| 1155 | 1155 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 1156 | 1156 | |
| 1157 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 1157 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 1158 | 1158 | |
| 1159 | 1159 | <?php |
| 1160 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 1160 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 1161 | 1161 | $no_default_name = apply_filters( 'yikes-mailchimp-dropdown-ig-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); |
| 1162 | 1162 | echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
| 1163 | 1163 | |
| 1164 | 1164 | $i = 0; |
| 1165 | - foreach( $groups as $group_id => $name ) { |
|
| 1165 | + foreach ( $groups as $group_id => $name ) { |
|
| 1166 | 1166 | |
| 1167 | 1167 | // If the form was submitted and failed, set the submitted/chosen values as the default |
| 1168 | - if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
| 1168 | + if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
| 1169 | 1169 | |
| 1170 | 1170 | // Format default choice as array |
| 1171 | - $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
| 1171 | + $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
| 1172 | 1172 | } |
| 1173 | 1173 | ?> |
| 1174 | 1174 | <option |
@@ -1196,12 +1196,12 @@ discard block |
||
| 1196 | 1196 | |
| 1197 | 1197 | ?> |
| 1198 | 1198 | |
| 1199 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1199 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1200 | 1200 | |
| 1201 | 1201 | <!-- dictate label visibility --> |
| 1202 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1203 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
| 1204 | - <?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1202 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1203 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
| 1204 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1205 | 1205 | </span> |
| 1206 | 1206 | <?php } |
| 1207 | 1207 | |
@@ -1211,17 +1211,17 @@ discard block |
||
| 1211 | 1211 | // Turn $default_choice into an array if it isn't already |
| 1212 | 1212 | $default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
| 1213 | 1213 | |
| 1214 | - foreach( $groups as $group_id => $name ) { |
|
| 1214 | + foreach ( $groups as $group_id => $name ) { |
|
| 1215 | 1215 | ?> |
| 1216 | - <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;"> |
|
| 1216 | + <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;"> |
|
| 1217 | 1217 | <input |
| 1218 | 1218 | type="checkbox" |
| 1219 | - name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
| 1220 | - id="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" |
|
| 1219 | + name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
| 1220 | + id="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" |
|
| 1221 | 1221 | value="<?php echo esc_attr( $group_id ) ?>" |
| 1222 | 1222 | <?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
| 1223 | 1223 | > |
| 1224 | - <?php echo esc_attr( stripslashes( str_replace( '' , '\'', $name ) ) ); ?> |
|
| 1224 | + <?php echo esc_attr( stripslashes( str_replace( '', '\'', $name ) ) ); ?> |
|
| 1225 | 1225 | </label> |
| 1226 | 1226 | <?php |
| 1227 | 1227 | $i++; |
@@ -1246,14 +1246,14 @@ discard block |
||
| 1246 | 1246 | echo $recaptcha_box; |
| 1247 | 1247 | } |
| 1248 | 1248 | |
| 1249 | - $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
| 1249 | + $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
| 1250 | 1250 | ?> |
| 1251 | 1251 | |
| 1252 | 1252 | <!-- Honeypot Trap --> |
| 1253 | 1253 | <input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot-<?php echo esc_attr( $form_id ); ?>" value=""> |
| 1254 | 1254 | |
| 1255 | 1255 | <!-- List ID --> |
| 1256 | - <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'] ); ?>"> |
|
| 1256 | + <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' ] ); ?>"> |
|
| 1257 | 1257 | |
| 1258 | 1258 | <!-- The form that is being submitted! Used to display error/success messages above the correct form --> |
| 1259 | 1259 | <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 ); ?>"> |
@@ -1267,15 +1267,15 @@ discard block |
||
| 1267 | 1267 | // If the number of fields, is equal to the hidden label count, add our class |
| 1268 | 1268 | // eg: All field labels are set to hidden. |
| 1269 | 1269 | if ( absint( $field_count ) === absint( $hidden_label_count ) ) { |
| 1270 | - $submit_button_label_classes[] = 'labels-hidden'; |
|
| 1270 | + $submit_button_label_classes[ ] = 'labels-hidden'; |
|
| 1271 | 1271 | } |
| 1272 | 1272 | echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '"> </span>'; |
| 1273 | 1273 | } |
| 1274 | 1274 | // Display the image or text based button. |
| 1275 | 1275 | if ( $submit_button_type === 'text' ) { |
| 1276 | - 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'] ); |
|
| 1276 | + 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' ] ); |
|
| 1277 | 1277 | } else { |
| 1278 | - 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'] ); |
|
| 1278 | + 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' ] ); |
|
| 1279 | 1279 | } |
| 1280 | 1280 | if ( $form_inline && ! $inline_form_override ) { |
| 1281 | 1281 | echo '</label>'; |
@@ -1290,8 +1290,8 @@ discard block |
||
| 1290 | 1290 | |
| 1291 | 1291 | <?php |
| 1292 | 1292 | /* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
| 1293 | - if( is_user_logged_in() ) { |
|
| 1294 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 1293 | + if ( is_user_logged_in() ) { |
|
| 1294 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 1295 | 1295 | echo $edit_form_link; |
| 1296 | 1296 | } |
| 1297 | 1297 | } |
@@ -1307,7 +1307,7 @@ discard block |
||
| 1307 | 1307 | * for non-admins |
| 1308 | 1308 | */ |
| 1309 | 1309 | if ( ! current_user_can( 'manage_options' ) ) { |
| 1310 | - $impressions = $form_data['impressions'] + 1; |
|
| 1310 | + $impressions = $form_data[ 'impressions' ] + 1; |
|
| 1311 | 1311 | $interface->update_form_field( $form_id, 'impressions', $impressions ); |
| 1312 | 1312 | } |
| 1313 | 1313 | |
@@ -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 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | // Only add groups if they exist |
| 161 | 161 | if ( ! empty( $groups ) ) { |
| 162 | - $member_data['interests'] = $groups; |
|
| 162 | + $member_data[ 'interests' ] = $groups; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | // Check if this member already exists |
@@ -169,30 +169,30 @@ 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 | -$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' ); |
|
| 172 | +$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' ); |
|
| 173 | 173 | |
| 174 | 174 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
| 175 | 175 | $new_subscriber = true; |
| 176 | 176 | |
| 177 | 177 | // Check the opt-in value - is it double or single? |
| 178 | 178 | // Double opt-in means 'status_if_new' => 'pending' |
| 179 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
| 179 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
| 180 | 180 | |
| 181 | 181 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
| 182 | 182 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
| 183 | 183 | // allow us to re-subscribe the user. |
| 184 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
| 184 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
| 185 | 185 | |
| 186 | 186 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
| 187 | 187 | |
| 188 | 188 | // Double opt-in |
| 189 | - $member_data['status_if_new'] = 'pending'; |
|
| 190 | - $member_data['status'] = 'pending'; |
|
| 189 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
| 190 | + $member_data[ 'status' ] = 'pending'; |
|
| 191 | 191 | } else { |
| 192 | 192 | |
| 193 | 193 | // Single opt-in |
| 194 | - $member_data['status_if_new'] = 'subscribed'; |
|
| 195 | - $member_data['status'] = 'subscribed'; |
|
| 194 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
| 195 | + $member_data[ 'status' ] = 'subscribed'; |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | } else { |
@@ -201,28 +201,28 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | // But first let's set our flag, and set the Mailchimp status flag |
| 203 | 203 | $new_subscriber = false; |
| 204 | - $member_data['status'] = 'subscribed'; |
|
| 204 | + $member_data[ 'status' ] = 'subscribed'; |
|
| 205 | 205 | |
| 206 | 206 | // Check our update_existing_user optin setting |
| 207 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
| 207 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
| 208 | 208 | |
| 209 | 209 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
| 210 | 210 | if ( $update_existing_user === false ) { |
| 211 | 211 | $disallow_update_array = $submission_handler->handle_disallowed_existing_user_update(); |
| 212 | - if ( $disallow_update_array['success'] === false ) { |
|
| 213 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array['message'], $is_success = false ); |
|
| 212 | + if ( $disallow_update_array[ 'success' ] === false ) { |
|
| 213 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array[ 'message' ], $is_success = false ); |
|
| 214 | 214 | return; |
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | // If update_existing_user is true, we need to check our 'send_update_email' option |
| 219 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
| 219 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
| 220 | 220 | |
| 221 | 221 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
| 222 | 222 | if ( $send_update_email === true ) { |
| 223 | 223 | $update_existing_user_array = $submission_handler->handle_updating_existing_user(); |
| 224 | - if ( $update_existing_user_array['success'] === false ) { |
|
| 225 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array['message'], $is_success = false ); |
|
| 224 | + if ( $update_existing_user_array[ 'success' ] === false ) { |
|
| 225 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array[ 'message' ], $is_success = false ); |
|
| 226 | 226 | return; |
| 227 | 227 | } |
| 228 | 228 | } |
@@ -258,9 +258,9 @@ discard block |
||
| 258 | 258 | } |
| 259 | 259 | |
| 260 | 260 | // Handle errors in the response |
| 261 | -if ( isset( $success_array ) && isset( $success_array['success'] ) && $success_array['success'] === false ) { |
|
| 262 | - $process_submission_response = isset( $success_array['message'] ) ? $success_array['message'] : ''; |
|
| 263 | - $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array['message'], $is_success = false ); |
|
| 261 | +if ( isset( $success_array ) && isset( $success_array[ 'success' ] ) && $success_array[ 'success' ] === false ) { |
|
| 262 | + $process_submission_response = isset( $success_array[ 'message' ] ) ? $success_array[ 'message' ] : ''; |
|
| 263 | + $process_submission_response = $submission_handler->wrap_form_submission_response( $success_array[ 'message' ], $is_success = false ); |
|
| 264 | 264 | return; |
| 265 | 265 | } |
| 266 | 266 | |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | // For non-AJAX submissions, if we have a new subscriber we need to increment our submissions count by 1 |
| 271 | 271 | // For AJAX, this is an AJAX call that gets fired off after form submission |
| 272 | 272 | if ( $new_subscriber === true ) { |
| 273 | - $submissions = (int) $form_settings['submissions'] + 1; |
|
| 273 | + $submissions = (int) $form_settings[ 'submissions' ] + 1; |
|
| 274 | 274 | $interface->update_form_field( $form_id, 'submissions', $submissions ); |
| 275 | 275 | } |
| 276 | 276 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | /***********************/ |
| 102 | 102 | /** Create A Form **/ |
| 103 | 103 | /**********************/ |
| 104 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
|
|
| 104 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
|
|
| 105 | 105 | |
| 106 | 106 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) ); |
| 107 | 107 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | /***********************/ |
| 111 | 111 | /** Delete A Form **/ |
| 112 | 112 | /**********************/ |
| 113 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
|
|
| 113 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
|
|
| 114 | 114 | |
| 115 | 115 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) ); |
| 116 | 116 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | /**********************************/ |
| 120 | 120 | /** Duplicate/Clone A Form **/ |
| 121 | 121 | /********************************/ |
| 122 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
|
|
| 122 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
|
|
| 123 | 123 | |
| 124 | 124 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) ); |
| 125 | 125 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | /*************************************/ |
| 129 | 129 | /** Reset Form Impression Stats **/ |
| 130 | 130 | /***********************************/ |
| 131 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
|
|
| 131 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
|
|
| 132 | 132 | |
| 133 | 133 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) ); |
| 134 | 134 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /**********************************/ |
| 138 | 138 | /** Update A Form **/ |
| 139 | 139 | /********************************/ |
| 140 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
|
|
| 140 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
|
|
| 141 | 141 | |
| 142 | 142 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) ); |
| 143 | 143 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | /**************************************************/ |
| 147 | 147 | /** Clear Store Mailchimp Transient Data **/ |
| 148 | 148 | /*************************************************/ |
| 149 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
|
|
| 149 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
|
|
| 150 | 150 | |
| 151 | 151 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) ); |
| 152 | 152 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | /*******************************************/ |
| 156 | 156 | /** Remove a user from a mailing list **/ |
| 157 | 157 | /*****************************************/ |
| 158 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
|
|
| 158 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
|
|
| 159 | 159 | |
| 160 | 160 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) ); |
| 161 | 161 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | /*******************************************/ |
| 165 | 165 | /** Create misisng error log file **/ |
| 166 | 166 | /*****************************************/ |
| 167 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
|
|
| 167 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
|
|
| 168 | 168 | |
| 169 | 169 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) ); |
| 170 | 170 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | /**************************************************/ |
| 197 | 197 | /** Clear Mailchimp Error Log Data **/ |
| 198 | 198 | /*************************************************/ |
| 199 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
|
|
| 199 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
|
|
| 200 | 200 | |
| 201 | 201 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) ); |
| 202 | 202 | |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | /*********************************************/ |
| 206 | 206 | /** Export Mailchimp Opt-in Forms **/ |
| 207 | 207 | /*******************************************/ |
| 208 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
|
|
| 208 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
|
|
| 209 | 209 | |
| 210 | 210 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) ); |
| 211 | 211 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | /*********************************************/ |
| 215 | 215 | /** Export Plugin Settings **/ |
| 216 | 216 | /*******************************************/ |
| 217 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
|
|
| 217 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
|
|
| 218 | 218 | |
| 219 | 219 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) ); |
| 220 | 220 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | /*******************************************/ |
| 224 | 224 | /** Import Class Inclusion **/ |
| 225 | 225 | /*****************************************/ |
| 226 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
|
|
| 226 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
|
|
| 227 | 227 | |
| 228 | 228 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) ); |
| 229 | 229 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | /*******************************************/ |
| 233 | 233 | /** Premium Support Request **/ |
| 234 | 234 | /*****************************************/ |
| 235 | - if ( isset( $_POST['submit-premium-support-request'] ) ) {
|
|
| 235 | + if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
|
|
| 236 | 236 | |
| 237 | 237 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) ); |
| 238 | 238 | |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | /****************************************/ |
| 242 | 242 | /** Dismiss Options Migrations **/ |
| 243 | 243 | /****************************************/ |
| 244 | - if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
|
|
| 244 | + if ( isset( $_REQUEST[ 'dismiss_migration_nonce' ] ) ) {
|
|
| 245 | 245 | |
| 246 | 246 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) ); |
| 247 | 247 | |
@@ -277,8 +277,8 @@ discard block |
||
| 277 | 277 | * @ return array $links New array of plugin actions |
| 278 | 278 | */ |
| 279 | 279 | public function easy_forms_plugin_action_links( $links ) {
|
| 280 | - $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 281 | - $links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 280 | + $links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 281 | + $links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 282 | 282 | return $links; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -379,17 +379,17 @@ discard block |
||
| 379 | 379 | */ |
| 380 | 380 | public function yikes_easy_mailchimp_export_forms() {
|
| 381 | 381 | // grab our nonce. |
| 382 | - $nonce = $_REQUEST['nonce']; |
|
| 382 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 383 | 383 | // grab the forms. |
| 384 | - $forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array(); |
|
| 384 | + $forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array(); |
|
| 385 | 385 | // validate nonce. |
| 386 | 386 | if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
|
| 387 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 387 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | // run the export function. |
| 391 | 391 | // parameters: ( $table_name, $form_ids, $file_name ). |
| 392 | - Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
|
|
| 392 | + Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms ); |
|
| 393 | 393 | // re-direct the user back to the page. |
| 394 | 394 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); |
| 395 | 395 | die(); |
@@ -403,10 +403,10 @@ discard block |
||
| 403 | 403 | */ |
| 404 | 404 | public function yikes_easy_mailchimp_export_plugin_settings() {
|
| 405 | 405 | // grab our nonce |
| 406 | - $nonce = $_REQUEST['nonce']; |
|
| 406 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 407 | 407 | // validate nonce. |
| 408 | 408 | if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
|
| 409 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 409 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | // run the export function. |
@@ -423,10 +423,10 @@ discard block |
||
| 423 | 423 | */ |
| 424 | 424 | public function yikes_easy_mailchimp_import_forms() {
|
| 425 | 425 | // grab our nonce. |
| 426 | - $nonce = $_REQUEST['nonce']; |
|
| 426 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 427 | 427 | // validate nonce. |
| 428 | 428 | if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
|
| 429 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 429 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 430 | 430 | } |
| 431 | 431 | // include the export class. |
| 432 | 432 | if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
|
@@ -447,18 +447,18 @@ discard block |
||
| 447 | 447 | */ |
| 448 | 448 | public function yikes_easy_mailchimp_premium_support_request() {
|
| 449 | 449 | |
| 450 | - if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
|
|
| 450 | + if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
|
|
| 451 | 451 | return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | - $email = isset( $_POST['user-email'] ) ? $_POST['user-email'] : ''; |
|
| 455 | - $topic = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : ''; |
|
| 456 | - $issue = isset( $_POST['support-content'] ) ? $_POST['support-content'] : ''; |
|
| 457 | - $priority = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1; |
|
| 458 | - $license = isset( $_POST['license_key'] ) ? $_POST['license_key'] : ''; |
|
| 459 | - $plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : ''; |
|
| 460 | - $plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : ''; |
|
| 461 | - $name = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support'; |
|
| 454 | + $email = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : ''; |
|
| 455 | + $topic = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : ''; |
|
| 456 | + $issue = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : ''; |
|
| 457 | + $priority = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1; |
|
| 458 | + $license = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : ''; |
|
| 459 | + $plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : ''; |
|
| 460 | + $plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : ''; |
|
| 461 | + $name = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support'; |
|
| 462 | 462 | |
| 463 | 463 | $edd_item_id = $this->get_premium_license( $plugin_slug ); |
| 464 | 464 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | |
| 494 | 494 | public function get_premium_license( $plugin_slug ) {
|
| 495 | 495 | |
| 496 | - switch( $plugin_slug ) {
|
|
| 496 | + switch ( $plugin_slug ) {
|
|
| 497 | 497 | |
| 498 | 498 | case 'form-customizer': |
| 499 | 499 | return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : ''; |
@@ -553,7 +553,7 @@ discard block |
||
| 553 | 553 | // add a new option to store the plugin activation date/time. |
| 554 | 554 | // @since v6.0.0. |
| 555 | 555 | // this is used to notify the user that they should review after 2 weeks. |
| 556 | - if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
|
|
| 556 | + if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
|
|
| 557 | 557 | add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) ); |
| 558 | 558 | } |
| 559 | 559 | |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | $install_date = get_option( 'yikes_easy_mailchimp_activation_date' ); |
| 564 | 564 | $past_date = strtotime( '-14 days' ); |
| 565 | 565 | if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
|
| 566 | - add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
| 566 | + add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | |
@@ -576,13 +576,13 @@ discard block |
||
| 576 | 576 | */ |
| 577 | 577 | public function yikes_easy_mailchimp_display_review_us_notice() {
|
| 578 | 578 | /* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */ |
| 579 | - if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
|
|
| 579 | + if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
|
|
| 580 | 580 | |
| 581 | 581 | // The URL of the page the user is currently on |
| 582 | - $current_uri = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false; |
|
| 583 | - $current_host = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false; |
|
| 582 | + $current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false; |
|
| 583 | + $current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false; |
|
| 584 | 584 | $current_protocol = is_ssl() === true ? 'https://' : 'http://'; |
| 585 | - $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
| 585 | + $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
| 586 | 586 | |
| 587 | 587 | $plugin_name = '<strong>Easy Forms for Mailchimp</strong>'; |
| 588 | 588 | // Review URL - Change to the URL of your plugin on WordPress.org. |
@@ -593,17 +593,17 @@ discard block |
||
| 593 | 593 | // Make sure all of our variables have values. |
| 594 | 594 | $reviewurl = ( ! empty( $reviewurl ) ) ? $reviewurl : ''; |
| 595 | 595 | $addons_url = ( ! empty( $addons_url ) ) ? $addons_url : ''; |
| 596 | - $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
| 596 | + $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
| 597 | 597 | |
| 598 | 598 | $review_message = '<div id="yikes-mailchimp-logo"></div>'; |
| 599 | 599 | $review_message .= sprintf( |
| 600 | 600 | __( 'It looks like you\'ve been using %1$s for 2 weeks now. We hope you\'re enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you\'re really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.', 'yikes-inc-easy-mailchimp-extender' ) |
| 601 | 601 | . '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>' |
| 602 | - . __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 602 | + . __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 603 | 603 | . '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>' |
| 604 | - . __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 604 | + . __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 605 | 605 | . '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>' |
| 606 | - . __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 606 | + . __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 607 | 607 | . "</a> </span>", |
| 608 | 608 | $plugin_name, $reviewurl, $addons_url, $nobugurl ); |
| 609 | 609 | ?> |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | @since v3.1.1 |
| 621 | 621 | */ |
| 622 | 622 | public function yikes_easy_mailchimp_stop_bugging_me() {
|
| 623 | - if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
|
|
| 623 | + if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
|
|
| 624 | 624 | add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true ); |
| 625 | 625 | } |
| 626 | 626 | } |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | // inlcude the js for tinymce. |
| 659 | 659 | public function yks_mc_add_tinymce_plugin( $plugin_array ) {
|
| 660 | 660 | |
| 661 | - $plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
| 661 | + $plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
| 662 | 662 | |
| 663 | 663 | return $plugin_array; |
| 664 | 664 | } |
@@ -679,13 +679,13 @@ discard block |
||
| 679 | 679 | if ( ! empty( $list_data ) ) {
|
| 680 | 680 | // build an array to pass to our javascript. |
| 681 | 681 | foreach ( $list_data as $id => $form ) {
|
| 682 | - $lists[] = array( |
|
| 683 | - 'text' => urlencode( $form['form_name'] ), |
|
| 682 | + $lists[ ] = array( |
|
| 683 | + 'text' => urlencode( $form[ 'form_name' ] ), |
|
| 684 | 684 | 'value' => $id, |
| 685 | 685 | ); |
| 686 | 686 | } |
| 687 | 687 | } else {
|
| 688 | - $lists[0] = array( |
|
| 688 | + $lists[ 0 ] = array( |
|
| 689 | 689 | 'text' => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ), |
| 690 | 690 | 'value' => '-', |
| 691 | 691 | ); |
@@ -766,8 +766,8 @@ discard block |
||
| 766 | 766 | |
| 767 | 767 | wp_enqueue_style( 'wp-color-picker' ); |
| 768 | 768 | wp_enqueue_script( 'wp-color-picker' ); |
| 769 | - wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false ); |
|
| 770 | - wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false ); |
|
| 769 | + wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false ); |
|
| 770 | + wp_enqueue_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false ); |
|
| 771 | 771 | |
| 772 | 772 | $localized_data = array( |
| 773 | 773 | 'add_tag_nonce' => wp_create_nonce( 'add-tag' ), |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | * Convert the php date format string to a js date format |
| 864 | 864 | */ |
| 865 | 865 | public function yikes_jQuery_datepicker_date_format( $site_option ) {
|
| 866 | - switch( $site_option ) {
|
|
| 866 | + switch ( $site_option ) {
|
|
| 867 | 867 | //Predefined WP date formats |
| 868 | 868 | default: |
| 869 | 869 | case 'F j, Y': |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | |
| 1066 | 1066 | /* Register General Settings Section */ |
| 1067 | 1067 | |
| 1068 | - register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) ); |
|
| 1068 | + register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) ); |
|
| 1069 | 1069 | |
| 1070 | 1070 | register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' ); |
| 1071 | 1071 | |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | add_settings_field( |
| 1111 | 1111 | 'optin-checkbox-init', |
| 1112 | 1112 | __( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ), |
| 1113 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1113 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1114 | 1114 | 'yikes_inc_easy_mc_checkbox_settings' |
| 1115 | 1115 | ); |
| 1116 | 1116 | /* End Checkbox Settings */ |
@@ -1132,21 +1132,21 @@ discard block |
||
| 1132 | 1132 | add_settings_field( |
| 1133 | 1133 | 'yikes-mc-recaptcha-site-key', |
| 1134 | 1134 | __( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1135 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1135 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1136 | 1136 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1137 | 1137 | ); |
| 1138 | 1138 | |
| 1139 | 1139 | add_settings_field( |
| 1140 | 1140 | 'yikes-mc-recaptcha-secret-key', |
| 1141 | 1141 | __( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1142 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1142 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1143 | 1143 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1144 | 1144 | ); |
| 1145 | 1145 | |
| 1146 | 1146 | add_settings_field( |
| 1147 | 1147 | 'yikes-mc-recaptcha-status', |
| 1148 | 1148 | __( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ), |
| 1149 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1149 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1150 | 1150 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1151 | 1151 | ); |
| 1152 | 1152 | |
@@ -1166,7 +1166,7 @@ discard block |
||
| 1166 | 1166 | add_settings_field( |
| 1167 | 1167 | 'yikes-mailchimp-debug-status', |
| 1168 | 1168 | __( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ), |
| 1169 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1169 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1170 | 1170 | 'yikes_easy_mc_settings_debug_section' |
| 1171 | 1171 | ); |
| 1172 | 1172 | |
@@ -1186,7 +1186,7 @@ discard block |
||
| 1186 | 1186 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
| 1187 | 1187 | return ''; |
| 1188 | 1188 | } |
| 1189 | - $api_key = strip_tags ( trim( $input ) ); |
|
| 1189 | + $api_key = strip_tags( trim( $input ) ); |
|
| 1190 | 1190 | $dash_position = strpos( trim( $input ), '-' ); |
| 1191 | 1191 | if ( $dash_position !== false ) {
|
| 1192 | 1192 | $manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key ); |
@@ -1201,9 +1201,9 @@ discard block |
||
| 1201 | 1201 | update_option( 'yikes-mc-api-validation', 'valid_api_key' ); |
| 1202 | 1202 | // Clear the API key transient data |
| 1203 | 1203 | $this->delete_yikes_mailchimp_transients(); |
| 1204 | - } else {
|
|
| 1204 | + } else {
|
|
| 1205 | 1205 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 1206 | - $error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message() , __( "Connecting to Mailchimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1206 | + $error_logging->yikes_easy_mailchimp_write_to_error_log( $response->get_error_message(), __( "Connecting to Mailchimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1207 | 1207 | update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() ); |
| 1208 | 1208 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
| 1209 | 1209 | } |
@@ -1252,11 +1252,11 @@ discard block |
||
| 1252 | 1252 | public function check_for_old_yks_mc_options() {
|
| 1253 | 1253 | $old_plugin_options = get_option( 'ykseme_storage' ); |
| 1254 | 1254 | // only perform options migrations if the site is not a multi-site setup |
| 1255 | - if ( !is_multisite() ) {
|
|
| 1255 | + if ( ! is_multisite() ) {
|
|
| 1256 | 1256 | if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
|
| 1257 | 1257 | // display a notice to the user that they should 'migrate' |
| 1258 | 1258 | // from the old plugin settings to the new ones |
| 1259 | - add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 ); |
|
| 1259 | + add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 ); |
|
| 1260 | 1260 | } |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
@@ -1279,11 +1279,11 @@ discard block |
||
| 1279 | 1279 | |
| 1280 | 1280 | // Confirm that the necessary forms table in the database exists, else bail |
| 1281 | 1281 | global $wpdb; |
| 1282 | - if ( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
|
|
| 1282 | + if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {
|
|
| 1283 | 1283 | return; |
| 1284 | 1284 | } |
| 1285 | 1285 | |
| 1286 | - if ( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
|
|
| 1286 | + if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) {
|
|
| 1287 | 1287 | // Delete the options, start a-new! (this will disable the migration notice altogether) |
| 1288 | 1288 | delete_option( 'widget_yikes_mc_widget' ); |
| 1289 | 1289 | delete_option( 'api_validation' ); |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | } else {
|
| 1298 | 1298 | ?> |
| 1299 | 1299 | <div class="yikes-easy-mc-updated migrate-options-notice"> |
| 1300 | - <p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?></p> |
|
| 1300 | + <p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for Mailchimp</strong>' ); ?></p> |
|
| 1301 | 1301 | <p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
| 1302 | 1302 | <p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p> |
| 1303 | 1303 | <section id="migration-buttons"> |
@@ -1322,9 +1322,9 @@ discard block |
||
| 1322 | 1322 | * and return the index ( used to find the list name assigned to a form ) |
| 1323 | 1323 | * - http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search |
| 1324 | 1324 | */ |
| 1325 | - function findMCListID($id, $array) {
|
|
| 1326 | - foreach ($array as $key => $val) {
|
|
| 1327 | - if ($val['id'] === $id) {
|
|
| 1325 | + function findMCListID( $id, $array ) {
|
|
| 1326 | + foreach ( $array as $key => $val ) {
|
|
| 1327 | + if ( $val[ 'id' ] === $id ) {
|
|
| 1328 | 1328 | return $key; |
| 1329 | 1329 | } |
| 1330 | 1330 | } |
@@ -1334,8 +1334,8 @@ discard block |
||
| 1334 | 1334 | /* Ajax Migrate Options */ |
| 1335 | 1335 | function migrate_archived_options() {
|
| 1336 | 1336 | // all options prefixed with 'yikes-mc-' |
| 1337 | - $option_name = 'yikes-mc-'.$_POST['option_name']; |
|
| 1338 | - $option_value = $_POST['option_value']; |
|
| 1337 | + $option_name = 'yikes-mc-' . $_POST[ 'option_name' ]; |
|
| 1338 | + $option_value = $_POST[ 'option_value' ]; |
|
| 1339 | 1339 | if ( json_decode( $option_value ) ) {
|
| 1340 | 1340 | // decode our lists() array, and store it |
| 1341 | 1341 | $opt_value = json_decode( $option_value, true ); |
@@ -1349,22 +1349,22 @@ discard block |
||
| 1349 | 1349 | |
| 1350 | 1350 | /* Ajax Migrate Forms */ |
| 1351 | 1351 | function migrate_previously_setup_forms() {
|
| 1352 | - $option_name = $_POST['option_name']; |
|
| 1353 | - $done = $_POST['done_import']; |
|
| 1352 | + $option_name = $_POST[ 'option_name' ]; |
|
| 1353 | + $done = $_POST[ 'done_import' ]; |
|
| 1354 | 1354 | // Create some starter forms for the user |
| 1355 | 1355 | // based on previously imported lists (to our old version) |
| 1356 | 1356 | if ( $option_name == 'yikes-mc-lists' ) {
|
| 1357 | - $option_value = $_POST['option_value']; |
|
| 1358 | - $new_options = json_decode( stripslashes_deep( $option_value ) , true ); |
|
| 1357 | + $option_value = $_POST[ 'option_value' ]; |
|
| 1358 | + $new_options = json_decode( stripslashes_deep( $option_value ), true ); |
|
| 1359 | 1359 | |
| 1360 | - $list_id = $new_options['id']; |
|
| 1361 | - $form_name = $new_options['name']; |
|
| 1362 | - $fields = $new_options['fields']; // our fields array |
|
| 1360 | + $list_id = $new_options[ 'id' ]; |
|
| 1361 | + $form_name = $new_options[ 'name' ]; |
|
| 1362 | + $fields = $new_options[ 'fields' ]; // our fields array |
|
| 1363 | 1363 | |
| 1364 | - $custom_styles = isset( $new_options['custom_styles'] ) ? $new_options['custom_styles']: '0'; // store as an array with all of our styles |
|
| 1365 | - $custom_template = isset( $new_options['custom_template'] ) ? $new_options['custom_template'] : '0'; // store template data as an array ( active , template used ) |
|
| 1366 | - $redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0'; |
|
| 1367 | - $redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : ''; |
|
| 1364 | + $custom_styles = isset( $new_options[ 'custom_styles' ] ) ? $new_options[ 'custom_styles' ] : '0'; // store as an array with all of our styles |
|
| 1365 | + $custom_template = isset( $new_options[ 'custom_template' ] ) ? $new_options[ 'custom_template' ] : '0'; // store template data as an array ( active , template used ) |
|
| 1366 | + $redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0'; |
|
| 1367 | + $redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : ''; |
|
| 1368 | 1368 | |
| 1369 | 1369 | /* Insert Forms Function */ |
| 1370 | 1370 | $this->form_interface->create_form( array( |
@@ -1400,8 +1400,8 @@ discard block |
||
| 1400 | 1400 | * @since v5.6 - complete re-write |
| 1401 | 1401 | */ |
| 1402 | 1402 | public function generate_options_pages_sidebar_menu() {
|
| 1403 | - if ( isset( $_REQUEST['section'] ) ) {
|
|
| 1404 | - $selected = $_REQUEST['section']; |
|
| 1403 | + if ( isset( $_REQUEST[ 'section' ] ) ) {
|
|
| 1404 | + $selected = $_REQUEST[ 'section' ]; |
|
| 1405 | 1405 | } |
| 1406 | 1406 | $installed_addons = get_option( 'yikes-easy-mc-active-addons', array() ); |
| 1407 | 1407 | |
@@ -1418,25 +1418,25 @@ discard block |
||
| 1418 | 1418 | <h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
| 1419 | 1419 | <div class="inside"> |
| 1420 | 1420 | <ul id="settings-nav"> |
| 1421 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1422 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1423 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1424 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1425 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1426 | - <li><?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1421 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1422 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1423 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1424 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1425 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1426 | + <li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
|
|
| 1427 | 1427 | </ul> |
| 1428 | 1428 | <?php |
| 1429 | 1429 | // create our add-on settings pages |
| 1430 | - if ( !empty( $installed_addons ) ) {
|
|
| 1430 | + if ( ! empty( $installed_addons ) ) {
|
|
| 1431 | 1431 | ?> |
| 1432 | 1432 | <hr class="add-on-settings-divider" /> |
| 1433 | 1433 | <strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 1434 | 1434 | <ul id="addon-settings-nav"> |
| 1435 | 1435 | <?php |
| 1436 | - foreach( $installed_addons as $addon_name ) {
|
|
| 1436 | + foreach ( $installed_addons as $addon_name ) {
|
|
| 1437 | 1437 | ?> |
| 1438 | 1438 | <li> |
| 1439 | - <?php if ( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
|
|
| 1439 | + <?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
|
|
| 1440 | 1440 | <?php |
| 1441 | 1441 | } |
| 1442 | 1442 | ?> |
@@ -1485,19 +1485,19 @@ discard block |
||
| 1485 | 1485 | <select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>> |
| 1486 | 1486 | <?php |
| 1487 | 1487 | if ( ! empty( $lists ) ) {
|
| 1488 | - foreach( $lists as $mailing_list ) {
|
|
| 1488 | + foreach ( $lists as $mailing_list ) {
|
|
| 1489 | 1489 | ?> |
| 1490 | - <option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
|
|
| 1490 | + <option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
|
|
| 1491 | 1491 | <?php |
| 1492 | 1492 | } |
| 1493 | 1493 | } else {
|
| 1494 | 1494 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
|
| 1495 | 1495 | ?> |
| 1496 | - <option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1496 | + <option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1497 | 1497 | <?php |
| 1498 | 1498 | } else {
|
| 1499 | 1499 | ?> |
| 1500 | - <option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1500 | + <option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1501 | 1501 | <?php |
| 1502 | 1502 | |
| 1503 | 1503 | } |
@@ -1506,8 +1506,8 @@ discard block |
||
| 1506 | 1506 | </select> |
| 1507 | 1507 | |
| 1508 | 1508 | <?php |
| 1509 | - if ( isset( $_GET['transient-cleared'] ) ) {
|
|
| 1510 | - if ( 'true' === $_GET['transient-cleared'] ) {
|
|
| 1509 | + if ( isset( $_GET[ 'transient-cleared' ] ) ) {
|
|
| 1510 | + if ( 'true' === $_GET[ 'transient-cleared' ] ) {
|
|
| 1511 | 1511 | ?> |
| 1512 | 1512 | <div class="yikes-list-refreshed-notice"> |
| 1513 | 1513 | <p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -1520,7 +1520,7 @@ discard block |
||
| 1520 | 1520 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
|
| 1521 | 1521 | ?> |
| 1522 | 1522 | <p class="description"> |
| 1523 | - <?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?> |
|
| 1523 | + <?php printf( __( 'Head over to <a href="http://www.Mailchimp.com" title="%s">Mailchimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?> |
|
| 1524 | 1524 | </p> |
| 1525 | 1525 | <?php |
| 1526 | 1526 | } |
@@ -1529,9 +1529,9 @@ discard block |
||
| 1529 | 1529 | </label> |
| 1530 | 1530 | <?php |
| 1531 | 1531 | if ( $this->is_user_mc_api_valid_form( false ) ) {
|
| 1532 | - echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
| 1532 | + echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
| 1533 | 1533 | } else {
|
| 1534 | - echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 1534 | + echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 1535 | 1535 | ?> |
| 1536 | 1536 | <a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
| 1537 | 1537 | <?php |
@@ -1561,7 +1561,7 @@ discard block |
||
| 1561 | 1561 | $post_types = get_post_types(); |
| 1562 | 1562 | ?> |
| 1563 | 1563 | <label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
|
| 1564 | - <?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1564 | + <?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1565 | 1565 | <select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;"> |
| 1566 | 1566 | <?php |
| 1567 | 1567 | |
@@ -1577,7 +1577,7 @@ discard block |
||
| 1577 | 1577 | $excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types ); |
| 1578 | 1578 | |
| 1579 | 1579 | // loop over registered post types, and query! |
| 1580 | - foreach( $post_types as $registered_post_type ) {
|
|
| 1580 | + foreach ( $post_types as $registered_post_type ) {
|
|
| 1581 | 1581 | |
| 1582 | 1582 | // exclude a few built in custom post types and any defined by the filter |
| 1583 | 1583 | if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
|
@@ -1599,8 +1599,8 @@ discard block |
||
| 1599 | 1599 | ?> |
| 1600 | 1600 | <optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>"> |
| 1601 | 1601 | <?php |
| 1602 | - foreach( $post_ids as $post_id ) {
|
|
| 1603 | - ?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
| 1602 | + foreach ( $post_ids as $post_id ) {
|
|
| 1603 | + ?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
| 1604 | 1604 | } |
| 1605 | 1605 | ?> |
| 1606 | 1606 | </optgroup> |
@@ -1616,7 +1616,7 @@ discard block |
||
| 1616 | 1616 | </select> |
| 1617 | 1617 | |
| 1618 | 1618 | <label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
|
| 1619 | - <?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1619 | + <?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1620 | 1620 | <input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" /> |
| 1621 | 1621 | </label> |
| 1622 | 1622 | |
@@ -1675,7 +1675,7 @@ discard block |
||
| 1675 | 1675 | </p> |
| 1676 | 1676 | </div> |
| 1677 | 1677 | |
| 1678 | - <p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p> |
|
| 1678 | + <p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p> |
|
| 1679 | 1679 | |
| 1680 | 1680 | <section id="about-yikes-inc" class="inside"> |
| 1681 | 1681 | <a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc."> |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | <!-- review us container --> |
| 1694 | 1694 | <h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
| 1695 | 1695 | <div id="review-yikes-easy-mc" class="inside"> |
| 1696 | - <p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1696 | + <p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1697 | 1697 | <p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> |
| 1698 | 1698 | </div> |
| 1699 | 1699 | |
@@ -1720,11 +1720,11 @@ discard block |
||
| 1720 | 1720 | |
| 1721 | 1721 | // if no list id, die! |
| 1722 | 1722 | if ( ! $list_id ) {
|
| 1723 | - wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1723 | + wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1724 | 1724 | } |
| 1725 | 1725 | |
| 1726 | 1726 | if ( ! $merge_variables ) {
|
| 1727 | - wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1727 | + wp_die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1728 | 1728 | } |
| 1729 | 1729 | |
| 1730 | 1730 | if ( ! empty( $form_fields ) ) {
|
@@ -1735,17 +1735,17 @@ discard block |
||
| 1735 | 1735 | $available_interest_groups = array(); |
| 1736 | 1736 | |
| 1737 | 1737 | // Default variables as arrays - these are used for holding the Mailchimp merge field ID |
| 1738 | - $merge_field_ids = array(); |
|
| 1739 | - $mailchimp_merge_field_ids = array(); |
|
| 1738 | + $merge_field_ids = array(); |
|
| 1739 | + $mailchimp_merge_field_ids = array(); |
|
| 1740 | 1740 | |
| 1741 | 1741 | // loop over merge variables |
| 1742 | - if ( ! empty( $merge_variables['merge_fields'] ) ) {
|
|
| 1743 | - $available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' ); |
|
| 1744 | - $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' ); |
|
| 1742 | + if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
|
|
| 1743 | + $available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' ); |
|
| 1744 | + $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' ); |
|
| 1745 | 1745 | |
| 1746 | 1746 | // Array will look like $merge_tag => $merge_id |
| 1747 | - foreach( $available_merge_variables as $index => $merge_tag ) {
|
|
| 1748 | - $merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index]; |
|
| 1747 | + foreach ( $available_merge_variables as $index => $merge_tag ) {
|
|
| 1748 | + $merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ]; |
|
| 1749 | 1749 | } |
| 1750 | 1750 | } |
| 1751 | 1751 | |
@@ -1760,46 +1760,46 @@ discard block |
||
| 1760 | 1760 | $excluded_fields = array_diff( $assigned_fields, $merged_fields ); |
| 1761 | 1761 | |
| 1762 | 1762 | $i = 1; |
| 1763 | - foreach( $form_fields as $field ) {
|
|
| 1763 | + foreach ( $form_fields as $field ) {
|
|
| 1764 | 1764 | |
| 1765 | - if ( isset( $field['merge'] ) ) {
|
|
| 1765 | + if ( isset( $field[ 'merge' ] ) ) {
|
|
| 1766 | 1766 | // @todo: don't use in_array() |
| 1767 | - $excluded_field = in_array( $field['merge'], $excluded_fields, true ); |
|
| 1767 | + $excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true ); |
|
| 1768 | 1768 | ?> |
| 1769 | - <section class="draggable" id="<?php echo $field['merge']; ?>"> |
|
| 1769 | + <section class="draggable" id="<?php echo $field[ 'merge' ]; ?>"> |
|
| 1770 | 1770 | <!-- top --> |
| 1771 | 1771 | <a class="expansion-section-title settings-sidebar"> |
| 1772 | 1772 | <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span> |
| 1773 | - <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span> |
|
| 1773 | + <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span> |
|
| 1774 | 1774 | <?php if ( $excluded_field ) { ?>
|
| 1775 | 1775 | <img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
| 1776 | 1776 | <?php } ?> |
| 1777 | - <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" /> |
|
| 1777 | + <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" /> |
|
| 1778 | 1778 | <span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
| 1779 | 1779 | <span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span> |
| 1780 | 1780 | <span class="yikes-mc-edit-field-label-message"></span> |
| 1781 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
| 1781 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
| 1782 | 1782 | </a> |
| 1783 | 1783 | <!-- expansion section --> |
| 1784 | 1784 | <div class="yikes-mc-settings-expansion-section"> |
| 1785 | 1785 | |
| 1786 | 1786 | <?php if ( $excluded_field ) { ?>
|
| 1787 | - <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1787 | + <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1788 | 1788 | <?php } ?> |
| 1789 | 1789 | |
| 1790 | 1790 | <!-- store field data --> |
| 1791 | - <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
| 1792 | - <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
| 1793 | - <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" /> |
|
| 1794 | - <input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" /> |
|
| 1795 | - <?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
|
|
| 1796 | - <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" /> |
|
| 1791 | + <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
| 1792 | + <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
| 1793 | + <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" /> |
|
| 1794 | + <input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" /> |
|
| 1795 | + <?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
|
|
| 1796 | + <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" /> |
|
| 1797 | 1797 | <?php } ?> |
| 1798 | 1798 | |
| 1799 | - <?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
|
|
| 1800 | - $choices = json_decode( $field['choices'], true ); |
|
| 1799 | + <?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
|
|
| 1800 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 1801 | 1801 | ?> |
| 1802 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
| 1802 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
| 1803 | 1803 | <?php } ?> |
| 1804 | 1804 | |
| 1805 | 1805 | <!-- Single or Double Opt-in --> |
@@ -1815,12 +1815,12 @@ discard block |
||
| 1815 | 1815 | </label> |
| 1816 | 1816 | </td> |
| 1817 | 1817 | <td> |
| 1818 | - <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>"> |
|
| 1818 | + <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>"> |
|
| 1819 | 1819 | </td> |
| 1820 | 1820 | </tr> |
| 1821 | 1821 | |
| 1822 | 1822 | <!-- Placeholder Value --> |
| 1823 | - <?php switch( $field['type'] ) {
|
|
| 1823 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 1824 | 1824 | |
| 1825 | 1825 | case 'text': |
| 1826 | 1826 | case 'email': |
@@ -1834,13 +1834,13 @@ discard block |
||
| 1834 | 1834 | <!-- Placeholder --> |
| 1835 | 1835 | <tr valign="top"> |
| 1836 | 1836 | <td scope="row"> |
| 1837 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1837 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1838 | 1838 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1839 | 1839 | </label> |
| 1840 | 1840 | </td> |
| 1841 | 1841 | <td> |
| 1842 | - <input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" /> |
|
| 1843 | - <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1842 | + <input type="text" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" /> |
|
| 1843 | + <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1844 | 1844 | </td> |
| 1845 | 1845 | </tr> |
| 1846 | 1846 | <?php |
@@ -1851,13 +1851,13 @@ discard block |
||
| 1851 | 1851 | ?> |
| 1852 | 1852 | <tr valign="top"> |
| 1853 | 1853 | <td scope="row"> |
| 1854 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1854 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1855 | 1855 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1856 | 1856 | </label> |
| 1857 | 1857 | </td> |
| 1858 | 1858 | <td> |
| 1859 | - <input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> /> |
|
| 1860 | - <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span> |
|
| 1859 | + <input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> /> |
|
| 1860 | + <span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span> |
|
| 1861 | 1861 | </td> |
| 1862 | 1862 | </tr> |
| 1863 | 1863 | <?php |
@@ -1867,7 +1867,7 @@ discard block |
||
| 1867 | 1867 | ?> |
| 1868 | 1868 | |
| 1869 | 1869 | <!-- Default Value --> |
| 1870 | - <?php switch( $field['type'] ) {
|
|
| 1870 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 1871 | 1871 | default: |
| 1872 | 1872 | case 'text': |
| 1873 | 1873 | case 'number': |
@@ -1875,15 +1875,15 @@ discard block |
||
| 1875 | 1875 | ?> |
| 1876 | 1876 | <tr valign="top"> |
| 1877 | 1877 | <td scope="row"> |
| 1878 | - <label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1878 | + <label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1879 | 1879 | <?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1880 | 1880 | </label> |
| 1881 | 1881 | </td> |
| 1882 | 1882 | <td> |
| 1883 | - <input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?php if ( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if ( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
|
|
| 1884 | - <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1883 | + <input id="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> />
|
|
| 1884 | + <p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1885 | 1885 | <?php |
| 1886 | - switch( $field['type'] ) {
|
|
| 1886 | + switch ( $field[ 'type' ] ) {
|
|
| 1887 | 1887 | case 'text': |
| 1888 | 1888 | ?> |
| 1889 | 1889 | <p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p> |
@@ -1905,28 +1905,28 @@ discard block |
||
| 1905 | 1905 | </td> |
| 1906 | 1906 | <td> |
| 1907 | 1907 | <?php |
| 1908 | - $field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice']; |
|
| 1908 | + $field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ]; |
|
| 1909 | 1909 | $x = 0; |
| 1910 | 1910 | ?> |
| 1911 | - <label for="<?php echo $field['merge'] . '-no-default'; ?>"> |
|
| 1912 | - <input id="<?php echo $field['merge'] . '-no-default'; ?>" |
|
| 1911 | + <label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>"> |
|
| 1912 | + <input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>" |
|
| 1913 | 1913 | type="radio" |
| 1914 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
| 1915 | - value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?> |
|
| 1914 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
| 1915 | + value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?> |
|
| 1916 | 1916 | > |
| 1917 | 1917 | No Default |
| 1918 | 1918 | </label> |
| 1919 | 1919 | <?php |
| 1920 | 1920 | foreach ( $choices as $choice => $value ) { ?>
|
| 1921 | - <label for="<?php echo $field['merge'].'-'.$x; ?>"> |
|
| 1922 | - <input id="<?php echo $field['merge'].'-'.$x; ?>" |
|
| 1921 | + <label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>"> |
|
| 1922 | + <input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>" |
|
| 1923 | 1923 | type="radio" |
| 1924 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
| 1925 | - value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>> |
|
| 1924 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
| 1925 | + value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>> |
|
| 1926 | 1926 | <?php echo $value; ?> |
| 1927 | 1927 | </label> |
| 1928 | 1928 | <?php $x++; } ?> |
| 1929 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1929 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1930 | 1930 | </td> |
| 1931 | 1931 | </tr> |
| 1932 | 1932 | |
@@ -1942,13 +1942,13 @@ discard block |
||
| 1942 | 1942 | </label> |
| 1943 | 1943 | </td> |
| 1944 | 1944 | <td> |
| 1945 | - <select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]"> |
|
| 1946 | - <option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option> |
|
| 1947 | - <?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
|
|
| 1948 | - <option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option> |
|
| 1945 | + <select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"> |
|
| 1946 | + <option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option> |
|
| 1947 | + <?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
|
|
| 1948 | + <option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option> |
|
| 1949 | 1949 | <?php } ?> |
| 1950 | 1950 | </select> |
| 1951 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1951 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1952 | 1952 | </td> |
| 1953 | 1953 | </tr> |
| 1954 | 1954 | |
@@ -1965,82 +1965,82 @@ discard block |
||
| 1965 | 1965 | <!-- Field Description --> |
| 1966 | 1966 | <tr valign="top"> |
| 1967 | 1967 | <td scope="row"> |
| 1968 | - <label for="description_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1968 | + <label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1969 | 1969 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1970 | 1970 | </label> |
| 1971 | 1971 | </td> |
| 1972 | 1972 | <td> |
| 1973 | - <textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea> |
|
| 1974 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1973 | + <textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea> |
|
| 1974 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1975 | 1975 | </td> |
| 1976 | 1976 | </tr> |
| 1977 | 1977 | <!-- Description Above Field --> |
| 1978 | 1978 | <tr valign="top" class="yikes-checkbox-container"> |
| 1979 | 1979 | <td scope="row"> |
| 1980 | - <label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1980 | + <label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1981 | 1981 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1982 | 1982 | </label> |
| 1983 | 1983 | </td> |
| 1984 | 1984 | <td> |
| 1985 | - <input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> /> |
|
| 1986 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1985 | + <input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> /> |
|
| 1986 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1987 | 1987 | </td> |
| 1988 | 1988 | </tr> |
| 1989 | 1989 | <!-- Additional Classes --> |
| 1990 | 1990 | <tr valign="top"> |
| 1991 | 1991 | <td scope="row"> |
| 1992 | - <label for="classes_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1992 | + <label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1993 | 1993 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1994 | 1994 | </label> |
| 1995 | 1995 | </td> |
| 1996 | 1996 | <td> |
| 1997 | - <input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" /> |
|
| 1998 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
| 1997 | + <input type="text" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" /> |
|
| 1998 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
| 1999 | 1999 | </td> |
| 2000 | 2000 | </tr> |
| 2001 | 2001 | <!-- Required Toggle --> |
| 2002 | 2002 | <tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first"> |
| 2003 | 2003 | <td scope="row"> |
| 2004 | - <label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 2004 | + <label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 2005 | 2005 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2006 | 2006 | </label> |
| 2007 | 2007 | </td> |
| 2008 | 2008 | <td> |
| 2009 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
| 2010 | - <input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
|
|
| 2011 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2009 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
| 2010 | + <input id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) { ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
|
|
| 2011 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2012 | 2012 | </td> |
| 2013 | 2013 | </tr> |
| 2014 | 2014 | <!-- Visible Toggle --> |
| 2015 | 2015 | <tr valign="top" class="yikes-checkbox-container"> |
| 2016 | 2016 | <td scope="row"> |
| 2017 | - <label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 2017 | + <label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 2018 | 2018 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2019 | 2019 | </label> |
| 2020 | 2020 | </td> |
| 2021 | 2021 | <td> |
| 2022 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
| 2023 | - <input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if ( $field['merge'] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
|
|
| 2024 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2022 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
| 2023 | + <input id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) { ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
|
|
| 2024 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2025 | 2025 | </td> |
| 2026 | 2026 | </tr> |
| 2027 | 2027 | <!-- Toggle Field Label Visibility --> |
| 2028 | 2028 | <tr valign="top" class="yikes-checkbox-container"> |
| 2029 | 2029 | <td scope="row"> |
| 2030 | - <label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 2030 | + <label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 2031 | 2031 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2032 | 2032 | </label> |
| 2033 | 2033 | </td> |
| 2034 | 2034 | <td> |
| 2035 | - <?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
| 2036 | - <input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/> |
|
| 2037 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2035 | + <?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
| 2036 | + <input id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/> |
|
| 2037 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2038 | 2038 | </td> |
| 2039 | 2039 | </tr> |
| 2040 | 2040 | <!-- Display Phone/Date Formats back to the user --> |
| 2041 | 2041 | <!-- Phone Format Initial Load --> |
| 2042 | 2042 | <?php |
| 2043 | - switch( $field['type'] ) {
|
|
| 2043 | + switch ( $field[ 'type' ] ) {
|
|
| 2044 | 2044 | /* Store the phone format, for properly regex pattern */ |
| 2045 | 2045 | case 'phone': |
| 2046 | 2046 | case 'birthday': |
@@ -2050,23 +2050,23 @@ discard block |
||
| 2050 | 2050 | <td scope="row"> |
| 2051 | 2051 | <label for="placeholder"> |
| 2052 | 2052 | <?php |
| 2053 | - switch( $field['type'] ) {
|
|
| 2053 | + switch ( $field[ 'type' ] ) {
|
|
| 2054 | 2054 | default: |
| 2055 | 2055 | case 'birthday': |
| 2056 | 2056 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 2057 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD'; |
|
| 2057 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD'; |
|
| 2058 | 2058 | $format_name = 'date_format'; |
| 2059 | 2059 | break; |
| 2060 | 2060 | |
| 2061 | 2061 | case 'date': |
| 2062 | 2062 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 2063 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY'; |
|
| 2063 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY'; |
|
| 2064 | 2064 | $format_name = 'date_format'; |
| 2065 | 2065 | break; |
| 2066 | 2066 | |
| 2067 | 2067 | case 'phone': |
| 2068 | 2068 | $type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 2069 | - $format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2069 | + $format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2070 | 2070 | $format_name = 'phone_format'; |
| 2071 | 2071 | break; |
| 2072 | 2072 | } |
@@ -2076,7 +2076,7 @@ discard block |
||
| 2076 | 2076 | </td> |
| 2077 | 2077 | <td> |
| 2078 | 2078 | <strong><?php echo $format; ?></strong> |
| 2079 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 2079 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 2080 | 2080 | <p class="description"><small> |
| 2081 | 2081 | <?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?> |
| 2082 | 2082 | </small></p> |
@@ -2097,8 +2097,8 @@ discard block |
||
| 2097 | 2097 | </td> |
| 2098 | 2098 | <td> |
| 2099 | 2099 | <span class="toggle-container"> |
| 2100 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2101 | - <a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2100 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2101 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2102 | 2102 | </span> |
| 2103 | 2103 | </td> |
| 2104 | 2104 | </tr> |
@@ -2116,35 +2116,35 @@ discard block |
||
| 2116 | 2116 | /**** Interest Group ****/ |
| 2117 | 2117 | |
| 2118 | 2118 | ?> |
| 2119 | - <section class="draggable" id="<?php echo $field['group_id']; ?>"> |
|
| 2119 | + <section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>"> |
|
| 2120 | 2120 | <!-- top --> |
| 2121 | 2121 | <a href="#" class="expansion-section-title settings-sidebar"> |
| 2122 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?> |
|
| 2123 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
|
|
| 2122 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?> |
|
| 2123 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
|
|
| 2124 | 2124 | <img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
| 2125 | 2125 | <?php } ?> |
| 2126 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
| 2126 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
| 2127 | 2127 | </a> |
| 2128 | 2128 | <!-- expansion section --> |
| 2129 | 2129 | <div class="yikes-mc-settings-expansion-section"> |
| 2130 | 2130 | |
| 2131 | 2131 | <!-- check if this field exists in the available interest group array --> |
| 2132 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
|
|
| 2133 | - <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 2132 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
|
|
| 2133 | + <p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 2134 | 2134 | <?php } ?> |
| 2135 | 2135 | |
| 2136 | 2136 | <!-- store the label --> |
| 2137 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
| 2138 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
| 2139 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" /> |
|
| 2140 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' /> |
|
| 2137 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
| 2138 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
| 2139 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" /> |
|
| 2140 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' /> |
|
| 2141 | 2141 | |
| 2142 | 2142 | <!-- Single or Double Opt-in --> |
| 2143 | 2143 | <p class="type-container"><!-- necessary to prevent skipping on slideToggle(); --> |
| 2144 | 2144 | |
| 2145 | 2145 | <table class="form-table form-field-container"> |
| 2146 | 2146 | <!-- Default Value --> |
| 2147 | - <?php switch( $field['type'] ) {
|
|
| 2147 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 2148 | 2148 | default: |
| 2149 | 2149 | case 'radio': |
| 2150 | 2150 | case 'checkboxes': |
@@ -2157,15 +2157,15 @@ discard block |
||
| 2157 | 2157 | </td> |
| 2158 | 2158 | <td> |
| 2159 | 2159 | <?php |
| 2160 | - $field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
| 2160 | + $field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
| 2161 | 2161 | |
| 2162 | 2162 | $default_shown = false; |
| 2163 | 2163 | |
| 2164 | - foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
|
|
| 2165 | - $field_id = "{$field['group_id']}-{$id}";
|
|
| 2166 | - $field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type']; |
|
| 2164 | + foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
|
|
| 2165 | + $field_id = "{$field[ 'group_id' ]}-{$id}";
|
|
| 2166 | + $field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ]; |
|
| 2167 | 2167 | $field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type; |
| 2168 | - $field_name = "field[{$field['group_id']}][default_choice]";
|
|
| 2168 | + $field_name = "field[{$field[ 'group_id' ]}][default_choice]";
|
|
| 2169 | 2169 | $field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name; |
| 2170 | 2170 | |
| 2171 | 2171 | // Determine if the current group is checked. |
@@ -2173,13 +2173,13 @@ discard block |
||
| 2173 | 2173 | switch ( $field_type ) {
|
| 2174 | 2174 | case 'radio': |
| 2175 | 2175 | default: |
| 2176 | - $default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice']; |
|
| 2177 | - $checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false ); |
|
| 2176 | + $default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ]; |
|
| 2177 | + $checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false ); |
|
| 2178 | 2178 | break; |
| 2179 | 2179 | |
| 2180 | 2180 | case 'checkbox': |
| 2181 | 2181 | case 'hidden': |
| 2182 | - if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
|
|
| 2182 | + if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
|
|
| 2183 | 2183 | $checked = checked( true, true, false ); |
| 2184 | 2184 | } |
| 2185 | 2185 | break; |
@@ -2194,7 +2194,7 @@ discard block |
||
| 2194 | 2194 | type="<?php echo $field_type; ?>" |
| 2195 | 2195 | name="<?php echo $field_name; ?>" |
| 2196 | 2196 | value="no-default" |
| 2197 | - <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>> |
|
| 2197 | + <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>> |
|
| 2198 | 2198 | No Default |
| 2199 | 2199 | </label> |
| 2200 | 2200 | <?php |
@@ -2210,7 +2210,7 @@ discard block |
||
| 2210 | 2210 | </label> |
| 2211 | 2211 | <?php |
| 2212 | 2212 | } ?> |
| 2213 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2213 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2214 | 2214 | </td> |
| 2215 | 2215 | </tr> |
| 2216 | 2216 | |
@@ -2226,13 +2226,13 @@ discard block |
||
| 2226 | 2226 | </label> |
| 2227 | 2227 | </td> |
| 2228 | 2228 | <td> |
| 2229 | - <select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]"> |
|
| 2229 | + <select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]"> |
|
| 2230 | 2230 | <option value="no-default">No Default</option> |
| 2231 | - <?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
|
|
| 2232 | - <option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
| 2231 | + <?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
|
|
| 2232 | + <option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
| 2233 | 2233 | <?php } ?> |
| 2234 | 2234 | </select> |
| 2235 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2235 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2236 | 2236 | </td> |
| 2237 | 2237 | </tr> |
| 2238 | 2238 | |
@@ -2245,78 +2245,78 @@ discard block |
||
| 2245 | 2245 | <!-- Field Description --> |
| 2246 | 2246 | <tr valign="top"> |
| 2247 | 2247 | <td scope="row"> |
| 2248 | - <label for="description_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2248 | + <label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2249 | 2249 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2250 | 2250 | </label> |
| 2251 | 2251 | </td> |
| 2252 | 2252 | <td> |
| 2253 | - <textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea> |
|
| 2254 | - <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2253 | + <textarea id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea> |
|
| 2254 | + <p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2255 | 2255 | </td> |
| 2256 | 2256 | </tr> |
| 2257 | 2257 | |
| 2258 | 2258 | <!-- Description Above Field --> |
| 2259 | 2259 | <tr valign="top" class="yikes-checkbox-container"> |
| 2260 | 2260 | <td scope="row"> |
| 2261 | - <label for="description_above_<?php echo $field['group_id']; ?>"> |
|
| 2261 | + <label for="description_above_<?php echo $field[ 'group_id' ]; ?>"> |
|
| 2262 | 2262 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2263 | 2263 | </label> |
| 2264 | 2264 | </td> |
| 2265 | 2265 | <td> |
| 2266 | - <input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> /> |
|
| 2267 | - <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2266 | + <input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> /> |
|
| 2267 | + <p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2268 | 2268 | </td> |
| 2269 | 2269 | </tr> |
| 2270 | 2270 | |
| 2271 | 2271 | <!-- Additional Classes --> |
| 2272 | 2272 | <tr valign="top"> |
| 2273 | 2273 | <td scope="row"> |
| 2274 | - <label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2274 | + <label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2275 | 2275 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2276 | 2276 | </label> |
| 2277 | 2277 | </td> |
| 2278 | 2278 | <td> |
| 2279 | - <input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" /> |
|
| 2280 | - <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p> |
|
| 2279 | + <input type="text" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" /> |
|
| 2280 | + <p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p> |
|
| 2281 | 2281 | </td> |
| 2282 | 2282 | </tr> |
| 2283 | 2283 | <!-- Required Toggle --> |
| 2284 | 2284 | <tr valign="top" class="yikes-checkbox-container"> |
| 2285 | 2285 | <td scope="row"> |
| 2286 | - <label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2286 | + <label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2287 | 2287 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2288 | 2288 | </label> |
| 2289 | 2289 | </td> |
| 2290 | 2290 | <td> |
| 2291 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
| 2292 | - <input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>> |
|
| 2293 | - <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2291 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
| 2292 | + <input type="checkbox" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>> |
|
| 2293 | + <p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2294 | 2294 | </td> |
| 2295 | 2295 | </tr> |
| 2296 | 2296 | <!-- Visible Toggle --> |
| 2297 | 2297 | <tr valign="top" class="yikes-checkbox-container"> |
| 2298 | 2298 | <td scope="row"> |
| 2299 | - <label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2299 | + <label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2300 | 2300 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2301 | 2301 | </label> |
| 2302 | 2302 | </td> |
| 2303 | 2303 | <td> |
| 2304 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
| 2305 | - <input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>> |
|
| 2306 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2304 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
| 2305 | + <input type="checkbox" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>> |
|
| 2306 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2307 | 2307 | </td> |
| 2308 | 2308 | </tr> |
| 2309 | 2309 | <!-- Toggle Field Label Visibility --> |
| 2310 | 2310 | <tr valign="top" class="yikes-checkbox-container"> |
| 2311 | 2311 | <td scope="row"> |
| 2312 | - <label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2312 | + <label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2313 | 2313 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2314 | 2314 | </label> |
| 2315 | 2315 | </td> |
| 2316 | 2316 | <td> |
| 2317 | - <?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
| 2318 | - <input type="checkbox" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/> |
|
| 2319 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2317 | + <?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
| 2318 | + <input type="checkbox" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/> |
|
| 2319 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2320 | 2320 | </td> |
| 2321 | 2321 | </tr> |
| 2322 | 2322 | <!-- Toggle Buttons --> |
@@ -2326,8 +2326,8 @@ discard block |
||
| 2326 | 2326 | </td> |
| 2327 | 2327 | <td> |
| 2328 | 2328 | <span class="toggle-container"> |
| 2329 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2330 | - <a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2329 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2330 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2331 | 2331 | </span> |
| 2332 | 2332 | </td> |
| 2333 | 2333 | </tr> |
@@ -2348,7 +2348,7 @@ discard block |
||
| 2348 | 2348 | add_thickbox(); |
| 2349 | 2349 | // enqueue jquery qtip for our tooltip |
| 2350 | 2350 | wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) ); |
| 2351 | - wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
| 2351 | + wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
| 2352 | 2352 | $available_tags = array( |
| 2353 | 2353 | array( |
| 2354 | 2354 | 'tag' => '{page_title}',
|
@@ -2403,14 +2403,14 @@ discard block |
||
| 2403 | 2403 | <h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
| 2404 | 2404 | <p class="description"><?php _e( 'You can use any of the following tags to populate a Mailchimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
| 2405 | 2405 | <ul> |
| 2406 | - <?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
|
|
| 2406 | + <?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
|
|
| 2407 | 2407 | <li class="tooltop-tag"> |
| 2408 | 2408 | <!-- link/tag --> |
| 2409 | - <a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a> |
|
| 2409 | + <a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a> |
|
| 2410 | 2410 | <!-- help icon --> |
| 2411 | 2411 | <span class="dashicons dashicons-editor-help"></span> |
| 2412 | 2412 | <!-- tooltip --> |
| 2413 | - <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div> |
|
| 2413 | + <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div> |
|
| 2414 | 2414 | </li> |
| 2415 | 2415 | <?php } ?> |
| 2416 | 2416 | </ul> |
@@ -2429,32 +2429,32 @@ discard block |
||
| 2429 | 2429 | public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
|
| 2430 | 2430 | $fields_assigned_to_form = array(); |
| 2431 | 2431 | foreach ( $form_fields as $field ) {
|
| 2432 | - if ( isset( $field['merge'] ) ) {
|
|
| 2433 | - $fields_assigned_to_form[ $field['merge'] ] = true; |
|
| 2432 | + if ( isset( $field[ 'merge' ] ) ) {
|
|
| 2433 | + $fields_assigned_to_form[ $field[ 'merge' ] ] = true; |
|
| 2434 | 2434 | } |
| 2435 | 2435 | } |
| 2436 | 2436 | |
| 2437 | - if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
|
|
| 2437 | + if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
|
|
| 2438 | 2438 | ?> |
| 2439 | 2439 | <ul id="available-fields"><?php |
| 2440 | - foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
|
|
| 2441 | - $not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] ); |
|
| 2440 | + foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
|
|
| 2441 | + $not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] ); |
|
| 2442 | 2442 | ?> |
| 2443 | 2443 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2444 | - alt="<?php echo esc_attr( $merge_var['tag'] ); ?>" |
|
| 2445 | - data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>" |
|
| 2446 | - data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>" |
|
| 2447 | - data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>" |
|
| 2444 | + alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>" |
|
| 2445 | + data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>" |
|
| 2446 | + data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>" |
|
| 2447 | + data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>" |
|
| 2448 | 2448 | title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>" |
| 2449 | 2449 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2450 | 2450 | > |
| 2451 | 2451 | <?php |
| 2452 | - echo esc_html( stripslashes( $merge_var['name'] ) ); |
|
| 2453 | - if ( $merge_var['required'] ) {
|
|
| 2452 | + echo esc_html( stripslashes( $merge_var[ 'name' ] ) ); |
|
| 2453 | + if ( $merge_var[ 'required' ] ) {
|
|
| 2454 | 2454 | echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; |
| 2455 | 2455 | } |
| 2456 | 2456 | ?> |
| 2457 | - <small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small> |
|
| 2457 | + <small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small> |
|
| 2458 | 2458 | </li> |
| 2459 | 2459 | <?php |
| 2460 | 2460 | } |
@@ -2479,8 +2479,8 @@ discard block |
||
| 2479 | 2479 | $fields_assigned_to_form = array(); |
| 2480 | 2480 | if ( ! empty( $form_fields ) ) {
|
| 2481 | 2481 | foreach ( $form_fields as $field ) {
|
| 2482 | - if ( isset( $field['group_id'] ) ) {
|
|
| 2483 | - $fields_assigned_to_form[ $field['group_id'] ] = true; |
|
| 2482 | + if ( isset( $field[ 'group_id' ] ) ) {
|
|
| 2483 | + $fields_assigned_to_form[ $field[ 'group_id' ] ] = true; |
|
| 2484 | 2484 | } |
| 2485 | 2485 | } |
| 2486 | 2486 | } |
@@ -2490,19 +2490,19 @@ discard block |
||
| 2490 | 2490 | <ul id="available-interest-groups"> |
| 2491 | 2491 | <?php |
| 2492 | 2492 | foreach ( $available_interest_groups as $interest_group ) {
|
| 2493 | - $not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] ); |
|
| 2493 | + $not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] ); |
|
| 2494 | 2494 | ?> |
| 2495 | 2495 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2496 | - alt="<?php echo esc_attr( $interest_group['id'] ); ?>" |
|
| 2497 | - data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>" |
|
| 2498 | - data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>" |
|
| 2499 | - data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>" |
|
| 2496 | + alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" |
|
| 2497 | + data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" |
|
| 2498 | + data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>" |
|
| 2499 | + data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>" |
|
| 2500 | 2500 | data-attr-form-id="<?php echo esc_attr( $list_id ); ?>" |
| 2501 | 2501 | title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>" |
| 2502 | 2502 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2503 | 2503 | > |
| 2504 | - <?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?> |
|
| 2505 | - <small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small> |
|
| 2504 | + <?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?> |
|
| 2505 | + <small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small> |
|
| 2506 | 2506 | </li> |
| 2507 | 2507 | <?php |
| 2508 | 2508 | } |
@@ -2528,13 +2528,13 @@ discard block |
||
| 2528 | 2528 | $not_available = isset( $form_tags[ $tag_id ] ); |
| 2529 | 2529 | ?> |
| 2530 | 2530 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2531 | - id="tag-<?php echo esc_attr( $tag['id'] ); ?>" |
|
| 2532 | - data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>" |
|
| 2533 | - data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>" |
|
| 2534 | - title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>" |
|
| 2531 | + id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>" |
|
| 2532 | + data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>" |
|
| 2533 | + data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>" |
|
| 2534 | + title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>" |
|
| 2535 | 2535 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2536 | 2536 | > |
| 2537 | - <?php echo esc_html( $tag['name'] ); ?> |
|
| 2537 | + <?php echo esc_html( $tag[ 'name' ] ); ?> |
|
| 2538 | 2538 | </li> |
| 2539 | 2539 | <?php |
| 2540 | 2540 | } |
@@ -2555,15 +2555,15 @@ discard block |
||
| 2555 | 2555 | * - must clean up db tables , ensure what data is going in and what is needed... |
| 2556 | 2556 | */ |
| 2557 | 2557 | public function yikes_easy_mailchimp_create_form() {
|
| 2558 | - $nonce = $_REQUEST['nonce']; |
|
| 2558 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2559 | 2559 | if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
|
| 2560 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2560 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2561 | 2561 | } |
| 2562 | 2562 | |
| 2563 | 2563 | $result = $this->form_interface->create_form( array( |
| 2564 | - 'list_id' => sanitize_key( $_POST['associated-list'] ), |
|
| 2565 | - 'form_name' => stripslashes( $_POST['form-name'] ), |
|
| 2566 | - 'form_description' => stripslashes( $_POST['form-description'] ), |
|
| 2564 | + 'list_id' => sanitize_key( $_POST[ 'associated-list' ] ), |
|
| 2565 | + 'form_name' => stripslashes( $_POST[ 'form-name' ] ), |
|
| 2566 | + 'form_description' => stripslashes( $_POST[ 'form-description' ] ), |
|
| 2567 | 2567 | ) ); |
| 2568 | 2568 | |
| 2569 | 2569 | // if an error occurs during the form creation process |
@@ -2571,11 +2571,11 @@ discard block |
||
| 2571 | 2571 | // write it to the error log |
| 2572 | 2572 | // if the form was not created successfully |
| 2573 | 2573 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 2574 | - $error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2574 | + $error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ), __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2575 | 2575 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) ); |
| 2576 | 2576 | } else {
|
| 2577 | 2577 | // redirect the user to the new form edit page |
| 2578 | - wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) ); |
|
| 2578 | + wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) ); |
|
| 2579 | 2579 | } |
| 2580 | 2580 | exit(); |
| 2581 | 2581 | } |
@@ -2588,11 +2588,11 @@ discard block |
||
| 2588 | 2588 | */ |
| 2589 | 2589 | public function yikes_easy_mailchimp_delete_form() {
|
| 2590 | 2590 | // grab & store our variables ( associated list & form name ) |
| 2591 | - $nonce = $_REQUEST['nonce']; |
|
| 2592 | - $post_id_to_delete = $_REQUEST['mailchimp-form']; |
|
| 2591 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2592 | + $post_id_to_delete = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2593 | 2593 | // verify our nonce |
| 2594 | - if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
|
|
| 2595 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2594 | + if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
|
|
| 2595 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2596 | 2596 | } |
| 2597 | 2597 | |
| 2598 | 2598 | $this->form_interface->delete_form( $post_id_to_delete ); |
@@ -2608,19 +2608,19 @@ discard block |
||
| 2608 | 2608 | */ |
| 2609 | 2609 | public function yikes_easy_mailchimp_duplicate_form() {
|
| 2610 | 2610 | // grab & store our variables ( associated list & form name ) |
| 2611 | - $nonce = $_REQUEST['nonce']; |
|
| 2612 | - $post_id_to_clone = $_REQUEST['mailchimp-form']; |
|
| 2611 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2612 | + $post_id_to_clone = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2613 | 2613 | // verify our nonce |
| 2614 | - if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
|
|
| 2615 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2614 | + if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
|
|
| 2615 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2616 | 2616 | } |
| 2617 | 2617 | |
| 2618 | 2618 | // Get the current form data. |
| 2619 | 2619 | $form_data = $this->form_interface->get_form( $post_id_to_clone ); |
| 2620 | 2620 | |
| 2621 | 2621 | // Update some of the data before duplication |
| 2622 | - $form_data['form_name'] .= ' - Copy'; |
|
| 2623 | - $form_data['impressions'] = $form_data['submissions'] = 0; |
|
| 2622 | + $form_data[ 'form_name' ] .= ' - Copy'; |
|
| 2623 | + $form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0; |
|
| 2624 | 2624 | |
| 2625 | 2625 | // Create the new form, and handle the result. |
| 2626 | 2626 | $result = $this->form_interface->create_form( $form_data ); |
@@ -2651,11 +2651,11 @@ discard block |
||
| 2651 | 2651 | */ |
| 2652 | 2652 | public function yikes_easy_mailchimp_reset_impression_stats() {
|
| 2653 | 2653 | // grab & store our variables ( associated list & form name ) |
| 2654 | - $nonce = $_REQUEST['nonce']; |
|
| 2655 | - $form_id_to_reset = $_REQUEST['mailchimp-form']; |
|
| 2654 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2655 | + $form_id_to_reset = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2656 | 2656 | // verify our nonce |
| 2657 | - if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
|
|
| 2658 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2657 | + if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
|
|
| 2658 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2659 | 2659 | } |
| 2660 | 2660 | |
| 2661 | 2661 | $result = $this->form_interface->update_form( |
@@ -2683,8 +2683,8 @@ discard block |
||
| 2683 | 2683 | */ |
| 2684 | 2684 | public function yikes_easy_mailchimp_update_form() {
|
| 2685 | 2685 | |
| 2686 | - $nonce = $_REQUEST['nonce']; |
|
| 2687 | - $form_id = $_REQUEST['id']; |
|
| 2686 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2687 | + $form_id = $_REQUEST[ 'id' ]; |
|
| 2688 | 2688 | |
| 2689 | 2689 | // verify our nonce |
| 2690 | 2690 | if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
|
@@ -2698,70 +2698,70 @@ discard block |
||
| 2698 | 2698 | } |
| 2699 | 2699 | |
| 2700 | 2700 | // Store our values! |
| 2701 | - $list_id = $_POST['associated-list']; |
|
| 2702 | - $form_name = stripslashes( $_POST['form-name'] ); |
|
| 2703 | - $form_description = sanitize_text_field( stripslashes( $_POST['form-description'] ) ); |
|
| 2704 | - $redirect_user_on_submit = $_POST['redirect-user-on-submission']; |
|
| 2705 | - $redirect_page = $_POST['redirect-user-to-selection']; |
|
| 2701 | + $list_id = $_POST[ 'associated-list' ]; |
|
| 2702 | + $form_name = stripslashes( $_POST[ 'form-name' ] ); |
|
| 2703 | + $form_description = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) ); |
|
| 2704 | + $redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ]; |
|
| 2705 | + $redirect_page = $_POST[ 'redirect-user-to-selection' ]; |
|
| 2706 | 2706 | |
| 2707 | 2707 | // stripslashes_deep on save, to prevent foreign languages from added excessive backslashes |
| 2708 | - $assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array(); |
|
| 2708 | + $assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array(); |
|
| 2709 | 2709 | |
| 2710 | 2710 | // setup our submission settings serialized array |
| 2711 | 2711 | $submission_settings = array( |
| 2712 | - 'ajax' => $_POST['form-ajax-submission'], |
|
| 2713 | - 'redirect_on_submission' => $_POST['redirect-user-on-submission'], |
|
| 2714 | - 'redirect_page' => $_POST['redirect-user-to-selection'], |
|
| 2715 | - 'custom_redirect_url' => esc_url( $_POST['custom-redirect-url'] ), |
|
| 2716 | - 'redirect_new_window' => $_POST['redirect_new_window'], |
|
| 2717 | - 'hide_form_post_signup' => $_POST['hide-form-post-signup'], |
|
| 2718 | - 'replace_interests' => $_POST['replace-interest-groups'], |
|
| 2712 | + 'ajax' => $_POST[ 'form-ajax-submission' ], |
|
| 2713 | + 'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ], |
|
| 2714 | + 'redirect_page' => $_POST[ 'redirect-user-to-selection' ], |
|
| 2715 | + 'custom_redirect_url' => esc_url( $_POST[ 'custom-redirect-url' ] ), |
|
| 2716 | + 'redirect_new_window' => $_POST[ 'redirect_new_window' ], |
|
| 2717 | + 'hide_form_post_signup' => $_POST[ 'hide-form-post-signup' ], |
|
| 2718 | + 'replace_interests' => $_POST[ 'replace-interest-groups' ], |
|
| 2719 | 2719 | ); |
| 2720 | 2720 | |
| 2721 | 2721 | // setup our opt-in settings serialized array |
| 2722 | 2722 | $optin_settings = array( |
| 2723 | - 'optin' => $_POST['single-double-optin'], |
|
| 2724 | - 'update_existing_user' => $_POST['update-existing-user'], |
|
| 2725 | - 'send_update_email' => $_POST['update-existing-email'], |
|
| 2723 | + 'optin' => $_POST[ 'single-double-optin' ], |
|
| 2724 | + 'update_existing_user' => $_POST[ 'update-existing-user' ], |
|
| 2725 | + 'send_update_email' => $_POST[ 'update-existing-email' ], |
|
| 2726 | 2726 | ); |
| 2727 | 2727 | |
| 2728 | 2728 | // Setup our error settings serialized array |
| 2729 | 2729 | $error_settings = array( |
| 2730 | - 'success' => trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '', |
|
| 2731 | - 'success-single-optin' => trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '', |
|
| 2732 | - 'success-resubscribed' => trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '', |
|
| 2733 | - 'general-error' => trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '', |
|
| 2734 | - 'already-subscribed' => trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '', |
|
| 2735 | - 'update-link' => trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '', |
|
| 2736 | - 'email-subject' => trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '', |
|
| 2737 | - 'email-body' => trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '', |
|
| 2738 | - 'update-email-success' => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '', |
|
| 2739 | - 'update-email-failure' => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '', |
|
| 2730 | + 'success' => trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '', |
|
| 2731 | + 'success-single-optin' => trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '', |
|
| 2732 | + 'success-resubscribed' => trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '', |
|
| 2733 | + 'general-error' => trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '', |
|
| 2734 | + 'already-subscribed' => trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '', |
|
| 2735 | + 'update-link' => trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '', |
|
| 2736 | + 'email-subject' => trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '', |
|
| 2737 | + 'email-body' => trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '', |
|
| 2738 | + 'update-email-success' => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '', |
|
| 2739 | + 'update-email-failure' => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '', |
|
| 2740 | 2740 | ); |
| 2741 | 2741 | |
| 2742 | 2742 | // Setup the new form settings array |
| 2743 | 2743 | // @since 6.0.3.8 |
| 2744 | 2744 | // To Do: Combine date & time so it's a single unix timestamp |
| 2745 | 2745 | $form_settings = array( |
| 2746 | - 'yikes-easy-mc-form-class-names' => trim( $_POST['yikes-easy-mc-form-class-names'] ), |
|
| 2747 | - 'yikes-easy-mc-inline-form' => $_POST['yikes-easy-mc-inline-form'][0], |
|
| 2748 | - 'yikes-easy-mc-submit-button-type' => $_POST['yikes-easy-mc-submit-button-type'][0], |
|
| 2749 | - 'yikes-easy-mc-submit-button-text' => trim( $_POST['yikes-easy-mc-submit-button-text'] ), |
|
| 2750 | - 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ), |
|
| 2751 | - 'yikes-easy-mc-submit-button-classes' => trim( $_POST['yikes-easy-mc-submit-button-classes'] ), |
|
| 2752 | - 'yikes-easy-mc-form-schedule' => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0', |
|
| 2753 | - 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ), |
|
| 2754 | - 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ), |
|
| 2755 | - 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ), |
|
| 2756 | - 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ), |
|
| 2757 | - 'yikes-easy-mc-form-login-required' => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0', |
|
| 2758 | - 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ), |
|
| 2746 | + 'yikes-easy-mc-form-class-names' => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ), |
|
| 2747 | + 'yikes-easy-mc-inline-form' => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ], |
|
| 2748 | + 'yikes-easy-mc-submit-button-type' => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ], |
|
| 2749 | + 'yikes-easy-mc-submit-button-text' => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ), |
|
| 2750 | + 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ), |
|
| 2751 | + 'yikes-easy-mc-submit-button-classes' => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ), |
|
| 2752 | + 'yikes-easy-mc-form-schedule' => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0', |
|
| 2753 | + 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ), |
|
| 2754 | + 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ), |
|
| 2755 | + 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ), |
|
| 2756 | + 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ), |
|
| 2757 | + 'yikes-easy-mc-form-login-required' => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0', |
|
| 2758 | + 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ), |
|
| 2759 | 2759 | ); |
| 2760 | 2760 | |
| 2761 | 2761 | // additional custom fields (extensions / user defined fields) |
| 2762 | 2762 | $custom_fields = array(); |
| 2763 | - if ( isset( $_POST['custom-field'] ) ) {
|
|
| 2764 | - foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
|
|
| 2763 | + if ( isset( $_POST[ 'custom-field' ] ) ) {
|
|
| 2764 | + foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
|
|
| 2765 | 2765 | if ( is_array( $custom_value ) ) {
|
| 2766 | 2766 | $custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!) |
| 2767 | 2767 | } else {
|
@@ -2793,7 +2793,7 @@ discard block |
||
| 2793 | 2793 | $this->form_interface->update_form( $form_id, $form_updates ); |
| 2794 | 2794 | |
| 2795 | 2795 | /* Custom action hook which allows users to update specific options when a form is updated - used in add ons */ |
| 2796 | - do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
| 2796 | + do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
| 2797 | 2797 | |
| 2798 | 2798 | // redirect the user to the manage forms page, display confirmation |
| 2799 | 2799 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) ); |
@@ -2804,11 +2804,11 @@ discard block |
||
| 2804 | 2804 | $email_body = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
| 2805 | 2805 | |
| 2806 | 2806 | $email_body .= '<p>'; |
| 2807 | - $email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2808 | - $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2809 | - $email_body .= '[link]'; |
|
| 2810 | - $email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2811 | - $email_body .= '[/link]'; |
|
| 2807 | + $email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2808 | + $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2809 | + $email_body .= '[link]'; |
|
| 2810 | + $email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2811 | + $email_body .= '[/link]'; |
|
| 2812 | 2812 | $email_body .= '</p>'; |
| 2813 | 2813 | |
| 2814 | 2814 | $email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
@@ -2824,13 +2824,13 @@ discard block |
||
| 2824 | 2824 | |
| 2825 | 2825 | /* Unsubscribe a given user from our list */ |
| 2826 | 2826 | public function yikes_easy_mailchimp_unsubscribe_user() {
|
| 2827 | - $nonce = $_REQUEST['nonce']; |
|
| 2828 | - $list_id = $_REQUEST['mailchimp-list']; |
|
| 2829 | - $email_id = $_REQUEST['email_id']; |
|
| 2827 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2828 | + $list_id = $_REQUEST[ 'mailchimp-list' ]; |
|
| 2829 | + $email_id = $_REQUEST[ 'email_id' ]; |
|
| 2830 | 2830 | |
| 2831 | 2831 | // verify our nonce |
| 2832 | 2832 | if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
|
| 2833 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2833 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2834 | 2834 | } |
| 2835 | 2835 | |
| 2836 | 2836 | $response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id ); |
@@ -2849,21 +2849,21 @@ discard block |
||
| 2849 | 2849 | |
| 2850 | 2850 | public function yikes_easy_mailchimp_create_missing_error_log() {
|
| 2851 | 2851 | // grab our nonnce |
| 2852 | - $nonce = $_REQUEST['nonce']; |
|
| 2852 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2853 | 2853 | // validate nonce |
| 2854 | - if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
|
|
| 2855 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2854 | + if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
|
|
| 2855 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2856 | 2856 | } |
| 2857 | 2857 | // setup the path to the error log |
| 2858 | 2858 | $error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' ); |
| 2859 | 2859 | try {
|
| 2860 | 2860 | // create the file |
| 2861 | - fwrite( $error_log , '' ); |
|
| 2861 | + fwrite( $error_log, '' ); |
|
| 2862 | 2862 | // close out |
| 2863 | 2863 | fclose( $error_log ); |
| 2864 | 2864 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=true' ) ) ); |
| 2865 | 2865 | } catch ( Exception $e ) {
|
| 2866 | - wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) ); |
|
| 2866 | + wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) ); |
|
| 2867 | 2867 | } |
| 2868 | 2868 | } |
| 2869 | 2869 | |
@@ -2874,9 +2874,9 @@ discard block |
||
| 2874 | 2874 | public function yikes_easy_mailchimp_clear_transient_data() {
|
| 2875 | 2875 | |
| 2876 | 2876 | // verify our nonce |
| 2877 | - $nonce = $_REQUEST['nonce']; |
|
| 2877 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2878 | 2878 | if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
|
| 2879 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) ); |
|
| 2879 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) ); |
|
| 2880 | 2880 | } |
| 2881 | 2881 | |
| 2882 | 2882 | $this->delete_yikes_mailchimp_transients(); |
@@ -2885,10 +2885,10 @@ discard block |
||
| 2885 | 2885 | $referer = wp_get_referer(); |
| 2886 | 2886 | if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
|
| 2887 | 2887 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings&transient-cleared=true' ) ) ); |
| 2888 | - } elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
|
|
| 2888 | + } elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
|
|
| 2889 | 2889 | |
| 2890 | 2890 | // else check if we were editing a form. |
| 2891 | - $id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT ); |
|
| 2891 | + $id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
| 2892 | 2892 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) ); |
| 2893 | 2893 | } else {
|
| 2894 | 2894 | // else redirect to the manage forms page. |
@@ -2932,7 +2932,7 @@ discard block |
||
| 2932 | 2932 | */ |
| 2933 | 2933 | public function yikes_mailchimp_load_helper_class() {
|
| 2934 | 2934 | // check to see if it's already loaded up. |
| 2935 | - if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
|
|
| 2935 | + if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
|
|
| 2936 | 2936 | // Include our main helper class file |
| 2937 | 2937 | include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' ); |
| 2938 | 2938 | } |
@@ -7,12 +7,12 @@ |
||
| 7 | 7 | <div class="wrap"> |
| 8 | 8 | |
| 9 | 9 | <!-- Freddie Logo --> |
| 10 | - <img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 10 | + <img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 11 | 11 | |
| 12 | - <h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1> |
|
| 12 | + <h1>Easy Forms for Mailchimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="https://yikesplugins.com/plugins/?plugins=Mailchimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1> |
|
| 13 | 13 | |
| 14 | 14 | <!-- Addons Page Description --> |
| 15 | - <p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 15 | + <p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find all free and paid add-ons available for Easy Forms for Mailchimp. Each add-on extends the functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 16 | 16 | |
| 17 | 17 | <!-- Add-On Container --> |
| 18 | 18 | <section id="add-ons"> |
@@ -9,21 +9,21 @@ |
||
| 9 | 9 | <div class="wrap yikes-easy-mc-support-wrap"> |
| 10 | 10 | |
| 11 | 11 | <!-- Freddie Logo --> |
| 12 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 12 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 13 | 13 | |
| 14 | - <h1>Easy Forms for Mailchimp | <?php _e( 'Support' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1> |
|
| 14 | + <h1>Easy Forms for Mailchimp | <?php _e( 'Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h1> |
|
| 15 | 15 | <!-- Support Page Description --> |
| 16 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 16 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'If you have questions, we have answers!', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 17 | 17 | |
| 18 | - <?php if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) { ?> |
|
| 19 | - <p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 20 | - <p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!' , 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p> |
|
| 18 | + <?php if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) { ?> |
|
| 19 | + <p><?php _e( 'Users of the free version of Easy Forms for Mailchimp can post questions to our support forum on the WordPress Plugin Directory. We aim to respond to support requests for the free version of the plugin within a week.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 20 | + <p><?php printf( __( 'Purchasers of our paid add-ons qualify for premium support. <a href="%s" target="_blank" title="' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Check out our paid add-ons', 'yikes-inc-easy-mailchimp-extender' ) . '</a>!', 'yikes-inc-easy-mailchimp-extender' ), esc_url( 'https://yikesplugins.com/' ) ); ?></p> |
|
| 21 | 21 | <?php } else { ?> |
| 22 | - <p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 23 | - <p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:[email protected]'>[email protected]</a> and a ticket will be created." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 22 | + <p><?php _e( "It looks like you are one of our premium users! Fill out the form below to submit a priority support request.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 23 | + <p><?php _e( "If you have any problems with the form, send an email to <a href='mailto:[email protected]'>[email protected]</a> and a ticket will be created.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 24 | 24 | <?php } ?> |
| 25 | 25 | |
| 26 | - <p><?php printf( __( 'Before submitting a support request, please visit our %s.' , 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p> |
|
| 26 | + <p><?php printf( __( 'Before submitting a support request, please visit our %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/' ) . '" title="' . __( 'Knowledge Base', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'knowledge base', 'yikes-inc-easy-mailchimp-extender' ) . '</a> where we have step-by-step guides and troubleshooting help' ); ?></p> |
|
| 27 | 27 | |
| 28 | 28 | <hr /> |
| 29 | 29 | |
@@ -6,13 +6,13 @@ discard block |
||
| 6 | 6 | $all_forms = $form_interface->get_all_forms(); |
| 7 | 7 | |
| 8 | 8 | /* Store Data if User is Authorized */ |
| 9 | -if( $this->is_user_mc_api_valid_form( false ) == 'valid' ) { |
|
| 9 | +if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) { |
|
| 10 | 10 | $list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists(); |
| 11 | 11 | if ( is_wp_error( $list_data ) ) { |
| 12 | 12 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 13 | 13 | $error_logging->maybe_write_to_log( |
| 14 | 14 | $list_data->get_error_code(), |
| 15 | - __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), |
|
| 15 | + __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), |
|
| 16 | 16 | "Manage Forms Page" |
| 17 | 17 | ); |
| 18 | 18 | $list_data = array(); |
@@ -23,24 +23,24 @@ discard block |
||
| 23 | 23 | ?> |
| 24 | 24 | <div class="wrap"> |
| 25 | 25 | <!-- Freddie Logo --> |
| 26 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 26 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 27 | 27 | |
| 28 | - <h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1> |
|
| 28 | + <h1>Easy Forms for Mailchimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1> |
|
| 29 | 29 | |
| 30 | 30 | <!-- Settings Page Description --> |
| 31 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 31 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your Mailchimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 32 | 32 | |
| 33 | 33 | <!-- Action Notices --> |
| 34 | 34 | <?php |
| 35 | 35 | |
| 36 | 36 | /* If the user hasn't authenticated yet, lets kill off */ |
| 37 | - if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 38 | - wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 ); |
|
| 37 | + if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 38 | + wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to Mailchimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 ); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /* Display our admin notices here */ |
| 42 | 42 | // delete form success |
| 43 | - if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) { |
|
| 43 | + if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) { |
|
| 44 | 44 | ?> |
| 45 | 45 | <div class="updated manage-form-admin-notice"> |
| 46 | 46 | <p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | <?php |
| 49 | 49 | } |
| 50 | 50 | // duplicate form success |
| 51 | - if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) { |
|
| 51 | + if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) { |
|
| 52 | 52 | ?> |
| 53 | 53 | <div class="updated manage-form-admin-notice"> |
| 54 | 54 | <p><?php _e( 'Mailchimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | <?php |
| 57 | 57 | } |
| 58 | 58 | // duplicate form error |
| 59 | - if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) { |
|
| 59 | + if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) { |
|
| 60 | 60 | ?> |
| 61 | 61 | <div class="error manage-form-admin-notice"> |
| 62 | 62 | <p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | <?php |
| 65 | 65 | } |
| 66 | 66 | // reset form submission stats success |
| 67 | - if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) { |
|
| 67 | + if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) { |
|
| 68 | 68 | ?> |
| 69 | 69 | <div class="updated manage-form-admin-notice"> |
| 70 | 70 | <p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | 74 | // reset form submission stats error |
| 75 | - if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) { |
|
| 75 | + if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) { |
|
| 76 | 76 | ?> |
| 77 | 77 | <div class="error manage-form-admin-notice"> |
| 78 | 78 | <p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | <thead> |
| 100 | 100 | <tr> |
| 101 | 101 | <th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th> |
| 102 | - <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 103 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 104 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 105 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 106 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 107 | - <th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 108 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 102 | + <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 103 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 104 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 105 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 106 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 107 | + <th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 108 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 109 | 109 | </tr> |
| 110 | 110 | </thead> |
| 111 | 111 | <!-- end header --> |
@@ -114,13 +114,13 @@ discard block |
||
| 114 | 114 | <tfoot> |
| 115 | 115 | <tr> |
| 116 | 116 | <th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th> |
| 117 | - <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 118 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 119 | - <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 120 | - <th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 121 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 122 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 123 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 117 | + <th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 118 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 119 | + <th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 120 | + <th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 121 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 122 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 123 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
| 124 | 124 | </tr> |
| 125 | 125 | </tfoot> |
| 126 | 126 | <!-- end footer --> |
@@ -130,40 +130,40 @@ discard block |
||
| 130 | 130 | <?php |
| 131 | 131 | if ( count( $all_forms ) > 0 ) { |
| 132 | 132 | $i = 1; |
| 133 | - foreach( $all_forms as $id => $form ) { |
|
| 133 | + foreach ( $all_forms as $id => $form ) { |
|
| 134 | 134 | ?> |
| 135 | - <tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>"> |
|
| 135 | + <tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>"> |
|
| 136 | 136 | <th class="check-column num" scope="row"><input type="checkbox" /></th> |
| 137 | 137 | <td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td> |
| 138 | 138 | <td class="column-columnname"> |
| 139 | 139 | <!-- row title/link --> |
| 140 | - <a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title"> |
|
| 141 | - <?php echo stripslashes( $form['form_name'] ); ?> |
|
| 140 | + <a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title"> |
|
| 141 | + <?php echo stripslashes( $form[ 'form_name' ] ); ?> |
|
| 142 | 142 | </a> |
| 143 | 143 | <div class="row-actions"> |
| 144 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 145 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 146 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 147 | - <span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 144 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 145 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 146 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 147 | + <span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span> |
|
| 148 | 148 | <?php |
| 149 | 149 | /* |
| 150 | 150 | * Custom action to allow users to add additional action links |
| 151 | 151 | * to each form. We use this in our add-ons. |
| 152 | 152 | * - Delete should remain last |
| 153 | 153 | */ |
| 154 | - do_action( 'yikes-mailchimp-custom-form-actions' , $id ); |
|
| 154 | + do_action( 'yikes-mailchimp-custom-form-actions', $id ); |
|
| 155 | 155 | ?> |
| 156 | - <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span> |
|
| 156 | + <span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span> |
|
| 157 | 157 | </div> |
| 158 | 158 | </td> |
| 159 | 159 | |
| 160 | - <td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td> |
|
| 160 | + <td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td> |
|
| 161 | 161 | <td class="column-columnname"> |
| 162 | 162 | <?php |
| 163 | 163 | if ( $list_data && count( $list_data ) > 0 ) { |
| 164 | 164 | $parsed = wp_list_pluck( $list_data, 'name', 'id' ); |
| 165 | - if ( isset( $parsed[ $form['list_id'] ] ) ) { |
|
| 166 | - echo esc_textarea( $parsed[ $form['list_id'] ] ); |
|
| 165 | + if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) { |
|
| 166 | + echo esc_textarea( $parsed[ $form[ 'list_id' ] ] ); |
|
| 167 | 167 | } else { |
| 168 | 168 | echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>'; |
| 169 | 169 | } |
@@ -172,25 +172,25 @@ discard block |
||
| 172 | 172 | |
| 173 | 173 | <td class="column-columnname num stat-container"> |
| 174 | 174 | <?php |
| 175 | - $impressions = number_format( $form['impressions'] ); |
|
| 176 | - echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>'; |
|
| 175 | + $impressions = number_format( $form[ 'impressions' ] ); |
|
| 176 | + echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>'; |
|
| 177 | 177 | ?> |
| 178 | 178 | </td> |
| 179 | 179 | <td class="column-columnname num stat-container"> |
| 180 | 180 | <?php |
| 181 | - $submissions = number_format( $form['submissions'] ); |
|
| 182 | - echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>'; |
|
| 181 | + $submissions = number_format( $form[ 'submissions' ] ); |
|
| 182 | + echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>'; |
|
| 183 | 183 | ?> |
| 184 | 184 | </td> |
| 185 | 185 | <td class="column-columnname num stat-container"> |
| 186 | 186 | <?php |
| 187 | - if( $impressions != 0 ) { |
|
| 188 | - $conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) ); |
|
| 189 | - if( $conversion_rate >= '15' ) { |
|
| 187 | + if ( $impressions != 0 ) { |
|
| 188 | + $conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) ); |
|
| 189 | + if ( $conversion_rate >= '15' ) { |
|
| 190 | 190 | $conversion_color = '#00cc00'; // green (unicorn!) |
| 191 | - } else if( $conversion_rate < '15' && $conversion_rate >= '10' ) { |
|
| 191 | + } else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) { |
|
| 192 | 192 | $conversion_color = '#0080FF'; // light blue (good) |
| 193 | - } else if( $conversion_rate < '10' && $conversion_rate >= '5' ) { |
|
| 193 | + } else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) { |
|
| 194 | 194 | $conversion_color = '#FFFF32'; // yellow (ok) |
| 195 | 195 | } else { |
| 196 | 196 | $conversion_color = '#FF0000'; // red (no bueno) |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $conversion_rate = '0'; |
| 200 | 200 | $conversion_color = '#333333'; |
| 201 | 201 | } |
| 202 | - echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>'; |
|
| 202 | + echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>'; |
|
| 203 | 203 | ?> |
| 204 | 204 | </td> |
| 205 | 205 | <!-- shortcode --> |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | } |
| 213 | 213 | } else { ?> |
| 214 | 214 | <tr class="no-items"> |
| 215 | - <td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
| 215 | + <td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No Mailchimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
| 216 | 216 | </tr> |
| 217 | 217 | <?php } ?> |
| 218 | 218 | </tbody> |
@@ -5,13 +5,13 @@ discard block |
||
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | 7 | /* Get and Store Option Values */ |
| 8 | - if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) === 'valid_api_key' ) { |
|
| 9 | - $api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API" , "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>'; |
|
| 8 | + if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) === 'valid_api_key' ) { |
|
| 9 | + $api_connection = '<span id="connection-container" class="api-connected" title="' . __( "Your site is currently connected to the Mailchimp API", "yikes-inc-easy-mailchimp-extender" ) . '"><span class="dashicons dashicons-yes yikes-mc-api-connected"></span> ' . __( "Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>'; |
|
| 10 | 10 | $api_error_response = ''; |
| 11 | 11 | } else { |
| 12 | - $api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span> ' . __( "Not Connected" , 'yikes-inc-easy-mailchimp-extender' ) . '</span>'; |
|
| 13 | - if( get_option( 'yikes-mc-api-invalid-key-response' , '' ) != '' ) { |
|
| 14 | - $api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response' , '' ) . '</small></p>'; |
|
| 12 | + $api_connection = '<span id="connection-container" class="api-not-connected"><span class="dashicons dashicons-no-alt yikes-mc-api-not-connected"></span> ' . __( "Not Connected", 'yikes-inc-easy-mailchimp-extender' ) . '</span>'; |
|
| 13 | + if ( get_option( 'yikes-mc-api-invalid-key-response', '' ) != '' ) { |
|
| 14 | + $api_error_response = '<p><small><i class="dashicons dashicons-no-alt"></i> ' . get_option( 'yikes-mc-api-invalid-key-response', '' ) . '</small></p>'; |
|
| 15 | 15 | } else { |
| 16 | 16 | $api_error_response = ''; |
| 17 | 17 | } |
@@ -23,23 +23,23 @@ discard block |
||
| 23 | 23 | * @since 6.2.2 |
| 24 | 24 | * |
| 25 | 25 | */ |
| 26 | - if ( isset( $_REQUEST['section'] ) ) { |
|
| 27 | - $_REQUEST['section'] = preg_replace('/[^\w-]/', '', strip_tags ( $_REQUEST['section'] ) ); |
|
| 26 | + if ( isset( $_REQUEST[ 'section' ] ) ) { |
|
| 27 | + $_REQUEST[ 'section' ] = preg_replace( '/[^\w-]/', '', strip_tags( $_REQUEST[ 'section' ] ) ); |
|
| 28 | 28 | } |
| 29 | 29 | ?> |
| 30 | 30 | <!-- Actual Settings Form --> |
| 31 | 31 | <div class="wrap"> |
| 32 | 32 | |
| 33 | 33 | <!-- Freddie Logo --> |
| 34 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 34 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
| 35 | 35 | |
| 36 | - <h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST['section'] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST['section'] ) ); } else { echo __( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); } ?></h1> |
|
| 36 | + <h1>Easy Forms for Mailchimp | <?php if ( isset( $_REQUEST[ 'section' ] ) ) { echo ucwords( str_replace( '-', ' ', $_REQUEST[ 'section' ] ) ); } else { echo __( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); } ?></h1> |
|
| 37 | 37 | |
| 38 | 38 | <!-- Settings Page Description --> |
| 39 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 39 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'Manage the overall settings for Easy forms for Mailchimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 40 | 40 | <?php |
| 41 | 41 | /* Success Messages on Options Updated */ |
| 42 | - if( isset( $_REQUEST['settings-updated'] ) && $_REQUEST['settings-updated'] == 'true' ) { |
|
| 42 | + if ( isset( $_REQUEST[ 'settings-updated' ] ) && $_REQUEST[ 'settings-updated' ] == 'true' ) { |
|
| 43 | 43 | ?> |
| 44 | 44 | <div class="updated manage-form-admin-notice"> |
| 45 | 45 | <p><?php _e( 'Settings successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <?php |
| 48 | 48 | } |
| 49 | 49 | /* Mailchimp API Cleared Successfully message */ |
| 50 | - if( isset( $_REQUEST['transient-cleared'] ) && $_REQUEST['transient-cleared'] == 'true' ) { |
|
| 50 | + if ( isset( $_REQUEST[ 'transient-cleared' ] ) && $_REQUEST[ 'transient-cleared' ] == 'true' ) { |
|
| 51 | 51 | ?> |
| 52 | 52 | <div class="updated manage-form-admin-notice"> |
| 53 | 53 | <p><?php _e( 'Mailchimp API Cache successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | /* Error Log Clear Messages */ |
| 58 | 58 | /* Success Messages on Options Updated */ |
| 59 | - if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'true' ) { |
|
| 59 | + if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'true' ) { |
|
| 60 | 60 | ?> |
| 61 | 61 | <div class="updated manage-form-admin-notice"> |
| 62 | 62 | <p><?php _e( 'Error log successfully cleared.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | <?php |
| 65 | 65 | } |
| 66 | 66 | /* Mailchimp API Cleared Successfully message */ |
| 67 | - if( isset( $_REQUEST['error-log-cleared'] ) && $_REQUEST['error-log-cleared'] == 'false' ) { |
|
| 67 | + if ( isset( $_REQUEST[ 'error-log-cleared' ] ) && $_REQUEST[ 'error-log-cleared' ] == 'false' ) { |
|
| 68 | 68 | ?> |
| 69 | 69 | <div class="error manage-form-admin-notice"> |
| 70 | 70 | <p><?php _e( "Whoops! We've encountered an error while trying to clear the error log. Please refresh the page and try again. If the error persists please get in touch with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -73,28 +73,28 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /* Display a success message if our error log was sucessfully created, or display an error if not */ |
| 76 | - if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'true' ) { |
|
| 76 | + if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'true' ) { |
|
| 77 | 77 | ?> |
| 78 | 78 | <div class="updated"> |
| 79 | 79 | <p><?php _e( 'Error log successfully created. You may now start logging errors.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
| 80 | 80 | </div> |
| 81 | 81 | <?php |
| 82 | - } else if( isset( $_GET['error_log_created'] ) && $_GET['error_log_created'] == 'false' ) { |
|
| 82 | + } else if ( isset( $_GET[ 'error_log_created' ] ) && $_GET[ 'error_log_created' ] == 'false' ) { |
|
| 83 | 83 | ?> |
| 84 | 84 | <div class="error"> |
| 85 | - <p><?php echo esc_attr( urldecode( $_GET['error_message'] ) , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 85 | + <p><?php echo esc_attr( urldecode( $_GET[ 'error_message' ] ), 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 86 | 86 | </div> |
| 87 | 87 | <?php |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /* Display a success message if the user successfully imported some forms */ |
| 91 | - if( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-forms'] ) && $_GET['import-forms'] == 'true' ) { |
|
| 91 | + if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-forms' ] ) && $_GET[ 'import-forms' ] == 'true' ) { |
|
| 92 | 92 | ?> |
| 93 | 93 | <div class="updated"> |
| 94 | 94 | <p><?php printf( __( 'Opt-in forms successfully imported. <a href="%s" title="View Forms">View Forms</a>', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p> |
| 95 | 95 | </div> |
| 96 | 96 | <?php |
| 97 | - } elseif( isset( $_GET['section'] ) && $_GET['section'] == 'import-export-forms' && isset( $_GET['import-settings'] ) && $_GET['import-settings'] == 'true' ) { |
|
| 97 | + } elseif ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'import-export-forms' && isset( $_GET[ 'import-settings' ] ) && $_GET[ 'import-settings' ] == 'true' ) { |
|
| 98 | 98 | ?> |
| 99 | 99 | <div class="updated"> |
| 100 | 100 | <p><?php printf( __( 'YIKES Easy Forms for Mailchimp settings successfully imported.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?></p> |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | <div class="postbox yikes-easy-mc-postbox"> |
| 117 | 117 | |
| 118 | - <?php if( !isset( $_REQUEST['section'] ) || $_REQUEST['section'] == '' ) { |
|
| 118 | + <?php if ( ! isset( $_REQUEST[ 'section' ] ) || $_REQUEST[ 'section' ] == '' ) { |
|
| 119 | 119 | include YIKES_MC_PATH . 'admin/partials/menu/options-sections/general-settings.php'; |
| 120 | 120 | } else { |
| 121 | - if( isset( $_REQUEST['addon'] ) && $_REQUEST['addon'] == 'true' ) { |
|
| 122 | - include apply_filters( 'yikes-mailchimp-'.$_REQUEST['section'].'-options-path' , '' ); |
|
| 121 | + if ( isset( $_REQUEST[ 'addon' ] ) && $_REQUEST[ 'addon' ] == 'true' ) { |
|
| 122 | + include apply_filters( 'yikes-mailchimp-' . $_REQUEST[ 'section' ] . '-options-path', '' ); |
|
| 123 | 123 | } else { |
| 124 | 124 | // White list a set of files that are allowed to be included here |
| 125 | 125 | $file_base = 'admin/partials/menu/options-sections/'; |
@@ -132,8 +132,8 @@ discard block |
||
| 132 | 132 | $file_base . 'recaptcha-settings.php', |
| 133 | 133 | ); |
| 134 | 134 | // Ensure the included file is allowed and whitelisted above, before including it |
| 135 | - if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php', $acceptable_files ) ) { |
|
| 136 | - include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST['section'] . '.php'; |
|
| 135 | + if ( 0 === validate_file( 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php', $acceptable_files ) ) { |
|
| 136 | + include YIKES_MC_PATH . 'admin/partials/menu/options-sections/' . $_REQUEST[ 'section' ] . '.php'; |
|
| 137 | 137 | } else { |
| 138 | 138 | wp_die( esc_attr__( 'Invalid file. If this error persists, please contact support.', 'yikes-inc-easy-mailchimp' ) ); |
| 139 | 139 | } |
