yikesinc /
yikes-inc-easy-mailchimp-extender
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | <?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?> |
| 30 | 30 | |
| 31 | 31 | <label for="yikes-mc-recaptcha-version-three"> |
| 32 | - <input type="checkbox" id="yikes-mc-recaptcha-version-three" name="yikes-mc-recaptcha-version-three" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-version-three', '' ) , '1' ); ?>> |
|
| 32 | + <input type="checkbox" id="yikes-mc-recaptcha-version-three" name="yikes-mc-recaptcha-version-three" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-version-three', '' ), '1' ); ?>> |
|
| 33 | 33 | <strong><?php _e( 'Use reCAPTCHA Version 3', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 34 | 34 | </label> |
| 35 | 35 | |
| 36 | 36 | <label for="yikes-mc-recaptcha-setting"> |
| 37 | - <input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ) , '1' ); ?>> |
|
| 37 | + <input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>> |
|
| 38 | 38 | <strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 39 | 39 | </label> |
| 40 | 40 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | /***********************/ |
| 93 | 93 | /** Create A Form **/ |
| 94 | 94 | /**********************/ |
| 95 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
|
|
| 95 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
|
|
| 96 | 96 | |
| 97 | 97 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) ); |
| 98 | 98 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | /***********************/ |
| 102 | 102 | /** Delete A Form **/ |
| 103 | 103 | /**********************/ |
| 104 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
|
|
| 104 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
|
|
| 105 | 105 | |
| 106 | 106 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) ); |
| 107 | 107 | |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | /**********************************/ |
| 111 | 111 | /** Duplicate/Clone A Form **/ |
| 112 | 112 | /********************************/ |
| 113 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
|
|
| 113 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
|
|
| 114 | 114 | |
| 115 | 115 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) ); |
| 116 | 116 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | /*************************************/ |
| 120 | 120 | /** Reset Form Impression Stats **/ |
| 121 | 121 | /***********************************/ |
| 122 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
|
|
| 122 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
|
|
| 123 | 123 | |
| 124 | 124 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) ); |
| 125 | 125 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | /**********************************/ |
| 129 | 129 | /** Update A Form **/ |
| 130 | 130 | /********************************/ |
| 131 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
|
|
| 131 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
|
|
| 132 | 132 | |
| 133 | 133 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) ); |
| 134 | 134 | |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /**************************************************/ |
| 138 | 138 | /** Clear Store Mailchimp Transient Data **/ |
| 139 | 139 | /*************************************************/ |
| 140 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-transient-data' ) {
|
|
| 140 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
|
|
| 141 | 141 | |
| 142 | 142 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) ); |
| 143 | 143 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | /*******************************************/ |
| 147 | 147 | /** Remove a user from a mailing list **/ |
| 148 | 148 | /*****************************************/ |
| 149 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
|
|
| 149 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
|
|
| 150 | 150 | |
| 151 | 151 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) ); |
| 152 | 152 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | /*******************************************/ |
| 156 | 156 | /** Create misisng error log file **/ |
| 157 | 157 | /*****************************************/ |
| 158 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
|
|
| 158 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
|
|
| 159 | 159 | |
| 160 | 160 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) ); |
| 161 | 161 | |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | /**************************************************/ |
| 188 | 188 | /** Clear Mailchimp Error Log Data **/ |
| 189 | 189 | /*************************************************/ |
| 190 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
|
|
| 190 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
|
|
| 191 | 191 | |
| 192 | 192 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) ); |
| 193 | 193 | |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | /*********************************************/ |
| 197 | 197 | /** Export Mailchimp Opt-in Forms **/ |
| 198 | 198 | /*******************************************/ |
| 199 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
|
|
| 199 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
|
|
| 200 | 200 | |
| 201 | 201 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) ); |
| 202 | 202 | |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | /*********************************************/ |
| 206 | 206 | /** Export Plugin Settings **/ |
| 207 | 207 | /*******************************************/ |
| 208 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
|
|
| 208 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
|
|
| 209 | 209 | |
| 210 | 210 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) ); |
| 211 | 211 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | /*******************************************/ |
| 215 | 215 | /** Import Class Inclusion **/ |
| 216 | 216 | /*****************************************/ |
| 217 | - if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
|
|
| 217 | + if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
|
|
| 218 | 218 | |
| 219 | 219 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) ); |
| 220 | 220 | |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | /*******************************************/ |
| 224 | 224 | /** Premium Support Request **/ |
| 225 | 225 | /*****************************************/ |
| 226 | - if ( isset( $_POST['submit-premium-support-request'] ) ) {
|
|
| 226 | + if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
|
|
| 227 | 227 | |
| 228 | 228 | add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) ); |
| 229 | 229 | |
@@ -256,8 +256,8 @@ discard block |
||
| 256 | 256 | * @ return array $links New array of plugin actions |
| 257 | 257 | */ |
| 258 | 258 | public function easy_forms_plugin_action_links( $links ) {
|
| 259 | - $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 260 | - $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>'; |
|
| 259 | + $links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 260 | + $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>'; |
|
| 261 | 261 | return $links; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -358,17 +358,17 @@ discard block |
||
| 358 | 358 | */ |
| 359 | 359 | public function yikes_easy_mailchimp_export_forms() {
|
| 360 | 360 | // grab our nonce. |
| 361 | - $nonce = $_REQUEST['nonce']; |
|
| 361 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 362 | 362 | // grab the forms. |
| 363 | - $forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array(); |
|
| 363 | + $forms = isset( $_REQUEST[ 'yikes_export_forms' ] ) ? $_REQUEST[ 'yikes_export_forms' ] : array(); |
|
| 364 | 364 | // validate nonce. |
| 365 | 365 | if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
|
| 366 | - 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 ) ); |
|
| 366 | + 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 ) ); |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | // run the export function. |
| 370 | 370 | // parameters: ( $table_name, $form_ids, $file_name ). |
| 371 | - Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms );
|
|
| 371 | + Yikes_Inc_Easy_Mailchimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-Mailchimp-Forms-Export', $forms ); |
|
| 372 | 372 | // re-direct the user back to the page. |
| 373 | 373 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=import-export-forms' ) ) ); |
| 374 | 374 | die(); |
@@ -382,10 +382,10 @@ discard block |
||
| 382 | 382 | */ |
| 383 | 383 | public function yikes_easy_mailchimp_export_plugin_settings() {
|
| 384 | 384 | // grab our nonce |
| 385 | - $nonce = $_REQUEST['nonce']; |
|
| 385 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 386 | 386 | // validate nonce. |
| 387 | 387 | if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
|
| 388 | - 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 | + 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 ) ); |
|
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | // run the export function. |
@@ -402,10 +402,10 @@ discard block |
||
| 402 | 402 | */ |
| 403 | 403 | public function yikes_easy_mailchimp_import_forms() {
|
| 404 | 404 | // grab our nonce. |
| 405 | - $nonce = $_REQUEST['nonce']; |
|
| 405 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 406 | 406 | // validate nonce. |
| 407 | 407 | if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
|
| 408 | - 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 ) ); |
|
| 408 | + 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 | 409 | } |
| 410 | 410 | // include the export class. |
| 411 | 411 | if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Import_Class' ) ) {
|
@@ -426,18 +426,18 @@ discard block |
||
| 426 | 426 | */ |
| 427 | 427 | public function yikes_easy_mailchimp_premium_support_request() {
|
| 428 | 428 | |
| 429 | - if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
|
|
| 429 | + if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
|
|
| 430 | 430 | return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); |
| 431 | 431 | } |
| 432 | 432 | |
| 433 | - $email = isset( $_POST['user-email'] ) ? $_POST['user-email'] : ''; |
|
| 434 | - $topic = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : ''; |
|
| 435 | - $issue = isset( $_POST['support-content'] ) ? $_POST['support-content'] : ''; |
|
| 436 | - $priority = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1; |
|
| 437 | - $license = isset( $_POST['license_key'] ) ? $_POST['license_key'] : ''; |
|
| 438 | - $plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : ''; |
|
| 439 | - $plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : ''; |
|
| 440 | - $name = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support'; |
|
| 433 | + $email = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : ''; |
|
| 434 | + $topic = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : ''; |
|
| 435 | + $issue = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : ''; |
|
| 436 | + $priority = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1; |
|
| 437 | + $license = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : ''; |
|
| 438 | + $plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : ''; |
|
| 439 | + $plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : ''; |
|
| 440 | + $name = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support'; |
|
| 441 | 441 | |
| 442 | 442 | $edd_item_id = $this->get_premium_license( $plugin_slug ); |
| 443 | 443 | |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | |
| 473 | 473 | public function get_premium_license( $plugin_slug ) {
|
| 474 | 474 | |
| 475 | - switch( $plugin_slug ) {
|
|
| 475 | + switch ( $plugin_slug ) {
|
|
| 476 | 476 | |
| 477 | 477 | case 'form-customizer': |
| 478 | 478 | return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : ''; |
@@ -516,7 +516,7 @@ discard block |
||
| 516 | 516 | // add a new option to store the plugin activation date/time. |
| 517 | 517 | // @since v6.0.0. |
| 518 | 518 | // this is used to notify the user that they should review after 2 weeks. |
| 519 | - if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
|
|
| 519 | + if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
|
|
| 520 | 520 | add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) ); |
| 521 | 521 | } |
| 522 | 522 | |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | $install_date = get_option( 'yikes_easy_mailchimp_activation_date' ); |
| 527 | 527 | $past_date = strtotime( '-14 days' ); |
| 528 | 528 | if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
|
| 529 | - add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
| 529 | + add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) ); |
|
| 530 | 530 | } |
| 531 | 531 | } |
| 532 | 532 | |
@@ -539,13 +539,13 @@ discard block |
||
| 539 | 539 | */ |
| 540 | 540 | public function yikes_easy_mailchimp_display_review_us_notice() {
|
| 541 | 541 | /* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */ |
| 542 | - if ( in_array( get_current_screen()->base , array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
|
|
| 542 | + if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
|
|
| 543 | 543 | |
| 544 | 544 | // The URL of the page the user is currently on |
| 545 | - $current_uri = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false; |
|
| 546 | - $current_host = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false; |
|
| 545 | + $current_uri = isset( $_SERVER[ 'REQUEST_URI' ] ) && ! empty( $_SERVER[ 'REQUEST_URI' ] ) ? $_SERVER[ 'REQUEST_URI' ] : false; |
|
| 546 | + $current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false; |
|
| 547 | 547 | $current_protocol = is_ssl() === true ? 'https://' : 'http://'; |
| 548 | - $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
| 548 | + $current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url(); |
|
| 549 | 549 | |
| 550 | 550 | $plugin_name = '<strong>Easy Forms for Mailchimp</strong>'; |
| 551 | 551 | // Review URL - Change to the URL of your plugin on WordPress.org. |
@@ -556,17 +556,17 @@ discard block |
||
| 556 | 556 | // Make sure all of our variables have values. |
| 557 | 557 | $reviewurl = ( ! empty( $reviewurl ) ) ? $reviewurl : ''; |
| 558 | 558 | $addons_url = ( ! empty( $addons_url ) ) ? $addons_url : ''; |
| 559 | - $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
| 559 | + $nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : ''; |
|
| 560 | 560 | |
| 561 | 561 | $review_message = '<div id="yikes-mailchimp-logo"></div>'; |
| 562 | 562 | $review_message .= sprintf( |
| 563 | 563 | __( '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' ) |
| 564 | 564 | . '<span class="button-container"> <a href="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>' |
| 565 | - . __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 565 | + . __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 566 | 566 | . '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>' |
| 567 | - . __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 567 | + . __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 568 | 568 | . '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>' |
| 569 | - . __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) |
|
| 569 | + . __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) |
|
| 570 | 570 | . "</a> </span>", |
| 571 | 571 | $plugin_name, $reviewurl, $addons_url, $nobugurl ); |
| 572 | 572 | ?> |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | @since v3.1.1 |
| 584 | 584 | */ |
| 585 | 585 | public function yikes_easy_mailchimp_stop_bugging_me() {
|
| 586 | - if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
|
|
| 586 | + if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) && (int) filter_var( $_GET[ 'yikes_easy_mc_icons_nobug' ], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
|
|
| 587 | 587 | add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true ); |
| 588 | 588 | } |
| 589 | 589 | } |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | // inlcude the js for tinymce. |
| 622 | 622 | public function yks_mc_add_tinymce_plugin( $plugin_array ) {
|
| 623 | 623 | |
| 624 | - $plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
| 624 | + $plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ ); |
|
| 625 | 625 | |
| 626 | 626 | return $plugin_array; |
| 627 | 627 | } |
@@ -642,13 +642,13 @@ discard block |
||
| 642 | 642 | if ( ! empty( $list_data ) ) {
|
| 643 | 643 | // build an array to pass to our javascript. |
| 644 | 644 | foreach ( $list_data as $id => $form ) {
|
| 645 | - $lists[] = array( |
|
| 646 | - 'text' => urlencode( $form['form_name'] ), |
|
| 645 | + $lists[ ] = array( |
|
| 646 | + 'text' => urlencode( $form[ 'form_name' ] ), |
|
| 647 | 647 | 'value' => $id, |
| 648 | 648 | ); |
| 649 | 649 | } |
| 650 | 650 | } else {
|
| 651 | - $lists[0] = array( |
|
| 651 | + $lists[ 0 ] = array( |
|
| 652 | 652 | 'text' => __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ), |
| 653 | 653 | 'value' => '-', |
| 654 | 654 | ); |
@@ -729,8 +729,8 @@ discard block |
||
| 729 | 729 | |
| 730 | 730 | wp_enqueue_style( 'wp-color-picker' ); |
| 731 | 731 | wp_enqueue_script( 'wp-color-picker' ); |
| 732 | - wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ) , $this->version, false ); |
|
| 733 | - 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 ); |
|
| 732 | + wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false ); |
|
| 733 | + 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 ); |
|
| 734 | 734 | |
| 735 | 735 | $localized_data = array( |
| 736 | 736 | 'add_tag_nonce' => wp_create_nonce( 'add-tag' ), |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | * Convert the php date format string to a js date format |
| 827 | 827 | */ |
| 828 | 828 | public function yikes_jQuery_datepicker_date_format( $site_option ) {
|
| 829 | - switch( $site_option ) {
|
|
| 829 | + switch ( $site_option ) {
|
|
| 830 | 830 | //Predefined WP date formats |
| 831 | 831 | default: |
| 832 | 832 | case 'F j, Y': |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | |
| 1029 | 1029 | /* Register General Settings Section */ |
| 1030 | 1030 | |
| 1031 | - register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) ); |
|
| 1031 | + register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) ); |
|
| 1032 | 1032 | |
| 1033 | 1033 | register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' ); |
| 1034 | 1034 | |
@@ -1073,7 +1073,7 @@ discard block |
||
| 1073 | 1073 | add_settings_field( |
| 1074 | 1074 | 'optin-checkbox-init', |
| 1075 | 1075 | __( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ), |
| 1076 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1076 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1077 | 1077 | 'yikes_inc_easy_mc_checkbox_settings' |
| 1078 | 1078 | ); |
| 1079 | 1079 | /* End Checkbox Settings */ |
@@ -1100,42 +1100,42 @@ discard block |
||
| 1100 | 1100 | add_settings_field( |
| 1101 | 1101 | 'yikes-mc-recaptcha-site-key', |
| 1102 | 1102 | __( 'Enter reCAPTCHA V2 Site Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1103 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1103 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1104 | 1104 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1105 | 1105 | ); |
| 1106 | 1106 | |
| 1107 | 1107 | add_settings_field( |
| 1108 | 1108 | 'yikes-mc-recaptcha-secret-key', |
| 1109 | 1109 | __( 'Enter reCAPTCHA V2 Secret Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1110 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1110 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1111 | 1111 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1112 | 1112 | ); |
| 1113 | 1113 | |
| 1114 | 1114 | add_settings_field( |
| 1115 | 1115 | 'yikes-mc-recaptcha-status', |
| 1116 | 1116 | __( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ), |
| 1117 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1117 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1118 | 1118 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1119 | 1119 | ); |
| 1120 | 1120 | |
| 1121 | 1121 | add_settings_field( |
| 1122 | 1122 | 'yikes-mc-recaptcha-version-three', |
| 1123 | 1123 | __( 'Enable Version 3', 'yikes-inc-easy-mailchimp-extender' ), |
| 1124 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1124 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1125 | 1125 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1126 | 1126 | ); |
| 1127 | 1127 | |
| 1128 | 1128 | add_settings_field( |
| 1129 | 1129 | 'yikes-mc-recaptcha-site-key-three', |
| 1130 | 1130 | __( 'Enter reCAPTCHA V3 Site Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1131 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1131 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1132 | 1132 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1133 | 1133 | ); |
| 1134 | 1134 | |
| 1135 | 1135 | add_settings_field( |
| 1136 | 1136 | 'yikes-mc-recaptcha-secret-key-three', |
| 1137 | 1137 | __( 'Enter reCAPTCHA V3 Secret Key', 'yikes-inc-easy-mailchimp-extender' ), |
| 1138 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1138 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1139 | 1139 | 'yikes_easy_mc_settings_recpatcha_section' |
| 1140 | 1140 | ); |
| 1141 | 1141 | |
@@ -1155,7 +1155,7 @@ discard block |
||
| 1155 | 1155 | add_settings_field( |
| 1156 | 1156 | 'yikes-mailchimp-debug-status', |
| 1157 | 1157 | __( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ), |
| 1158 | - '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1158 | + '', // callback + validation inside of admin/partials/menu/options.php |
|
| 1159 | 1159 | 'yikes_easy_mc_settings_debug_section' |
| 1160 | 1160 | ); |
| 1161 | 1161 | |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
| 1176 | 1176 | return ''; |
| 1177 | 1177 | } |
| 1178 | - $api_key = strip_tags ( trim( $input ) ); |
|
| 1178 | + $api_key = strip_tags( trim( $input ) ); |
|
| 1179 | 1179 | $dash_position = strpos( trim( $input ), '-' ); |
| 1180 | 1180 | if ( $dash_position !== false ) {
|
| 1181 | 1181 | $manager = new Yikes_Inc_Easy_Mailchimp_API_Manager( $api_key ); |
@@ -1190,9 +1190,9 @@ discard block |
||
| 1190 | 1190 | update_option( 'yikes-mc-api-validation', 'valid_api_key' ); |
| 1191 | 1191 | // Clear the API key transient data |
| 1192 | 1192 | $this->delete_yikes_mailchimp_transients(); |
| 1193 | - } else {
|
|
| 1193 | + } else {
|
|
| 1194 | 1194 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 1195 | - $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' ) ); |
|
| 1195 | + $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' ) ); |
|
| 1196 | 1196 | update_option( 'yikes-mc-api-invalid-key-response', $response->get_error_message() ); |
| 1197 | 1197 | update_option( 'yikes-mc-api-validation', 'invalid_api_key' ); |
| 1198 | 1198 | } |
@@ -1239,9 +1239,9 @@ discard block |
||
| 1239 | 1239 | * and return the index ( used to find the list name assigned to a form ) |
| 1240 | 1240 | * - http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search |
| 1241 | 1241 | */ |
| 1242 | - function findMCListID($id, $array) {
|
|
| 1243 | - foreach ($array as $key => $val) {
|
|
| 1244 | - if ($val['id'] === $id) {
|
|
| 1242 | + function findMCListID( $id, $array ) {
|
|
| 1243 | + foreach ( $array as $key => $val ) {
|
|
| 1244 | + if ( $val[ 'id' ] === $id ) {
|
|
| 1245 | 1245 | return $key; |
| 1246 | 1246 | } |
| 1247 | 1247 | } |
@@ -1254,8 +1254,8 @@ discard block |
||
| 1254 | 1254 | * @since v5.6 - complete re-write |
| 1255 | 1255 | */ |
| 1256 | 1256 | public function generate_options_pages_sidebar_menu() {
|
| 1257 | - if ( isset( $_REQUEST['section'] ) ) {
|
|
| 1258 | - $selected = $_REQUEST['section']; |
|
| 1257 | + if ( isset( $_REQUEST[ 'section' ] ) ) {
|
|
| 1258 | + $selected = $_REQUEST[ 'section' ]; |
|
| 1259 | 1259 | } |
| 1260 | 1260 | $installed_addons = get_option( 'yikes-easy-mc-active-addons', array() ); |
| 1261 | 1261 | |
@@ -1272,25 +1272,25 @@ discard block |
||
| 1272 | 1272 | <h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3> |
| 1273 | 1273 | <div class="inside"> |
| 1274 | 1274 | <ul id="settings-nav"> |
| 1275 | - <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>
|
|
| 1276 | - <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>
|
|
| 1277 | - <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>
|
|
| 1278 | - <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>
|
|
| 1279 | - <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>
|
|
| 1280 | - <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>
|
|
| 1275 | + <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>
|
|
| 1276 | + <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>
|
|
| 1277 | + <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>
|
|
| 1278 | + <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>
|
|
| 1279 | + <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>
|
|
| 1280 | + <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>
|
|
| 1281 | 1281 | </ul> |
| 1282 | 1282 | <?php |
| 1283 | 1283 | // create our add-on settings pages |
| 1284 | - if ( !empty( $installed_addons ) ) {
|
|
| 1284 | + if ( ! empty( $installed_addons ) ) {
|
|
| 1285 | 1285 | ?> |
| 1286 | 1286 | <hr class="add-on-settings-divider" /> |
| 1287 | 1287 | <strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> |
| 1288 | 1288 | <ul id="addon-settings-nav"> |
| 1289 | 1289 | <?php |
| 1290 | - foreach( $installed_addons as $addon_name ) {
|
|
| 1290 | + foreach ( $installed_addons as $addon_name ) {
|
|
| 1291 | 1291 | ?> |
| 1292 | 1292 | <li> |
| 1293 | - <?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>
|
|
| 1293 | + <?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>
|
|
| 1294 | 1294 | <?php |
| 1295 | 1295 | } |
| 1296 | 1296 | ?> |
@@ -1339,19 +1339,19 @@ discard block |
||
| 1339 | 1339 | <select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); disabled( true, empty( $lists ) ); ?>> |
| 1340 | 1340 | <?php |
| 1341 | 1341 | if ( ! empty( $lists ) ) {
|
| 1342 | - foreach( $lists as $mailing_list ) {
|
|
| 1342 | + foreach ( $lists as $mailing_list ) {
|
|
| 1343 | 1343 | ?> |
| 1344 | - <option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
|
|
| 1344 | + <option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
|
|
| 1345 | 1345 | <?php |
| 1346 | 1346 | } |
| 1347 | 1347 | } else {
|
| 1348 | 1348 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
|
| 1349 | 1349 | ?> |
| 1350 | - <option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1350 | + <option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1351 | 1351 | <?php |
| 1352 | 1352 | } else {
|
| 1353 | 1353 | ?> |
| 1354 | - <option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1354 | + <option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option> |
|
| 1355 | 1355 | <?php |
| 1356 | 1356 | |
| 1357 | 1357 | } |
@@ -1360,8 +1360,8 @@ discard block |
||
| 1360 | 1360 | </select> |
| 1361 | 1361 | |
| 1362 | 1362 | <?php |
| 1363 | - if ( isset( $_GET['transient-cleared'] ) ) {
|
|
| 1364 | - if ( 'true' === $_GET['transient-cleared'] ) {
|
|
| 1363 | + if ( isset( $_GET[ 'transient-cleared' ] ) ) {
|
|
| 1364 | + if ( 'true' === $_GET[ 'transient-cleared' ] ) {
|
|
| 1365 | 1365 | ?> |
| 1366 | 1366 | <div class="yikes-list-refreshed-notice"> |
| 1367 | 1367 | <p><?php esc_attr_e( 'Mailchimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -1374,7 +1374,7 @@ discard block |
||
| 1374 | 1374 | if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
|
| 1375 | 1375 | ?> |
| 1376 | 1376 | <p class="description"> |
| 1377 | - <?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' ) ); ?> |
|
| 1377 | + <?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' ) ); ?> |
|
| 1378 | 1378 | </p> |
| 1379 | 1379 | <?php |
| 1380 | 1380 | } |
@@ -1383,9 +1383,9 @@ discard block |
||
| 1383 | 1383 | </label> |
| 1384 | 1384 | <?php |
| 1385 | 1385 | if ( $this->is_user_mc_api_valid_form( false ) ) {
|
| 1386 | - echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary', '', false , array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
| 1386 | + echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) ); |
|
| 1387 | 1387 | } else {
|
| 1388 | - echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 1388 | + echo '<p class="description">' . __( "Please enter a valid Mailchimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 1389 | 1389 | ?> |
| 1390 | 1390 | <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> |
| 1391 | 1391 | <?php |
@@ -1415,7 +1415,7 @@ discard block |
||
| 1415 | 1415 | $post_types = get_post_types(); |
| 1416 | 1416 | ?> |
| 1417 | 1417 | <label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
|
| 1418 | - <?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1418 | + <?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1419 | 1419 | <select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;"> |
| 1420 | 1420 | <?php |
| 1421 | 1421 | |
@@ -1431,7 +1431,7 @@ discard block |
||
| 1431 | 1431 | $excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types ); |
| 1432 | 1432 | |
| 1433 | 1433 | // loop over registered post types, and query! |
| 1434 | - foreach( $post_types as $registered_post_type ) {
|
|
| 1434 | + foreach ( $post_types as $registered_post_type ) {
|
|
| 1435 | 1435 | |
| 1436 | 1436 | // exclude a few built in custom post types and any defined by the filter |
| 1437 | 1437 | if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
|
@@ -1453,8 +1453,8 @@ discard block |
||
| 1453 | 1453 | ?> |
| 1454 | 1454 | <optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>"> |
| 1455 | 1455 | <?php |
| 1456 | - foreach( $post_ids as $post_id ) {
|
|
| 1457 | - ?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
| 1456 | + foreach ( $post_ids as $post_id ) {
|
|
| 1457 | + ?><option <?php selected( $redirect_page, $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php |
|
| 1458 | 1458 | } |
| 1459 | 1459 | ?> |
| 1460 | 1460 | </optgroup> |
@@ -1470,7 +1470,7 @@ discard block |
||
| 1470 | 1470 | </select> |
| 1471 | 1471 | |
| 1472 | 1472 | <label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
|
| 1473 | - <?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1473 | + <?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?> |
|
| 1474 | 1474 | <input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" /> |
| 1475 | 1475 | </label> |
| 1476 | 1476 | |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | </p> |
| 1530 | 1530 | </div> |
| 1531 | 1531 | |
| 1532 | - <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> |
|
| 1532 | + <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> |
|
| 1533 | 1533 | |
| 1534 | 1534 | <section id="about-yikes-inc" class="inside"> |
| 1535 | 1535 | <a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc."> |
@@ -1547,7 +1547,7 @@ discard block |
||
| 1547 | 1547 | <!-- review us container --> |
| 1548 | 1548 | <h3><?php _e( 'Easy Forms for Mailchimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
| 1549 | 1549 | <div id="review-yikes-easy-mc" class="inside"> |
| 1550 | - <p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1550 | + <p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
| 1551 | 1551 | <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> |
| 1552 | 1552 | </div> |
| 1553 | 1553 | |
@@ -1574,11 +1574,11 @@ discard block |
||
| 1574 | 1574 | |
| 1575 | 1575 | // if no list id, die! |
| 1576 | 1576 | if ( ! $list_id ) {
|
| 1577 | - wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1577 | + wp_die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 1578 | 1578 | } |
| 1579 | 1579 | |
| 1580 | 1580 | if ( ! $merge_variables ) {
|
| 1581 | - 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' ) ); |
|
| 1581 | + 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' ) ); |
|
| 1582 | 1582 | } |
| 1583 | 1583 | |
| 1584 | 1584 | if ( ! empty( $form_fields ) ) {
|
@@ -1589,17 +1589,17 @@ discard block |
||
| 1589 | 1589 | $available_interest_groups = array(); |
| 1590 | 1590 | |
| 1591 | 1591 | // Default variables as arrays - these are used for holding the Mailchimp merge field ID |
| 1592 | - $merge_field_ids = array(); |
|
| 1593 | - $mailchimp_merge_field_ids = array(); |
|
| 1592 | + $merge_field_ids = array(); |
|
| 1593 | + $mailchimp_merge_field_ids = array(); |
|
| 1594 | 1594 | |
| 1595 | 1595 | // loop over merge variables |
| 1596 | - if ( ! empty( $merge_variables['merge_fields'] ) ) {
|
|
| 1597 | - $available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' ); |
|
| 1598 | - $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' ); |
|
| 1596 | + if ( ! empty( $merge_variables[ 'merge_fields' ] ) ) {
|
|
| 1597 | + $available_merge_variables = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'tag' ); |
|
| 1598 | + $mailchimp_merge_field_ids = wp_list_pluck( $merge_variables[ 'merge_fields' ], 'merge_id' ); |
|
| 1599 | 1599 | |
| 1600 | 1600 | // Array will look like $merge_tag => $merge_id |
| 1601 | - foreach( $available_merge_variables as $index => $merge_tag ) {
|
|
| 1602 | - $merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index]; |
|
| 1601 | + foreach ( $available_merge_variables as $index => $merge_tag ) {
|
|
| 1602 | + $merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ]; |
|
| 1603 | 1603 | } |
| 1604 | 1604 | } |
| 1605 | 1605 | |
@@ -1614,46 +1614,46 @@ discard block |
||
| 1614 | 1614 | $excluded_fields = array_diff( $assigned_fields, $merged_fields ); |
| 1615 | 1615 | |
| 1616 | 1616 | $i = 1; |
| 1617 | - foreach( $form_fields as $field ) {
|
|
| 1617 | + foreach ( $form_fields as $field ) {
|
|
| 1618 | 1618 | |
| 1619 | - if ( isset( $field['merge'] ) ) {
|
|
| 1619 | + if ( isset( $field[ 'merge' ] ) ) {
|
|
| 1620 | 1620 | // @todo: don't use in_array() |
| 1621 | - $excluded_field = in_array( $field['merge'], $excluded_fields, true ); |
|
| 1621 | + $excluded_field = in_array( $field[ 'merge' ], $excluded_fields, true ); |
|
| 1622 | 1622 | ?> |
| 1623 | - <section class="draggable" id="<?php echo $field['merge']; ?>"> |
|
| 1623 | + <section class="draggable" id="<?php echo $field[ 'merge' ]; ?>"> |
|
| 1624 | 1624 | <!-- top --> |
| 1625 | 1625 | <a class="expansion-section-title settings-sidebar"> |
| 1626 | 1626 | <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span> |
| 1627 | - <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span> |
|
| 1627 | + <span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span> |
|
| 1628 | 1628 | <?php if ( $excluded_field ) { ?>
|
| 1629 | 1629 | <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' ); ?>"> |
| 1630 | 1630 | <?php } ?> |
| 1631 | - <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" /> |
|
| 1631 | + <input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" /> |
|
| 1632 | 1632 | <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> |
| 1633 | 1633 | <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> |
| 1634 | 1634 | <span class="yikes-mc-edit-field-label-message"></span> |
| 1635 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
| 1635 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
| 1636 | 1636 | </a> |
| 1637 | 1637 | <!-- expansion section --> |
| 1638 | 1638 | <div class="yikes-mc-settings-expansion-section"> |
| 1639 | 1639 | |
| 1640 | 1640 | <?php if ( $excluded_field ) { ?>
|
| 1641 | - <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> |
|
| 1641 | + <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> |
|
| 1642 | 1642 | <?php } ?> |
| 1643 | 1643 | |
| 1644 | 1644 | <!-- store field data --> |
| 1645 | - <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
| 1646 | - <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
| 1647 | - <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" /> |
|
| 1648 | - <input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" /> |
|
| 1649 | - <?php if ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?>
|
|
| 1650 | - <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" /> |
|
| 1645 | + <input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
| 1646 | + <input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
| 1647 | + <input type="hidden" class="yikes-mc-merge-field-tag" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" /> |
|
| 1648 | + <input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" /> |
|
| 1649 | + <?php if ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?>
|
|
| 1650 | + <input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field[ 'merge' ]; ?>][id]" value="<?php echo $merge_field_ids[ $field[ 'merge' ] ] ?>" /> |
|
| 1651 | 1651 | <?php } ?> |
| 1652 | 1652 | |
| 1653 | - <?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
|
|
| 1654 | - $choices = json_decode( $field['choices'], true ); |
|
| 1653 | + <?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
|
|
| 1654 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 1655 | 1655 | ?> |
| 1656 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
| 1656 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' /> |
|
| 1657 | 1657 | <?php } ?> |
| 1658 | 1658 | |
| 1659 | 1659 | <!-- Single or Double Opt-in --> |
@@ -1669,12 +1669,12 @@ discard block |
||
| 1669 | 1669 | </label> |
| 1670 | 1670 | </td> |
| 1671 | 1671 | <td> |
| 1672 | - <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>"> |
|
| 1672 | + <input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>"> |
|
| 1673 | 1673 | </td> |
| 1674 | 1674 | </tr> |
| 1675 | 1675 | |
| 1676 | 1676 | <!-- Placeholder Value --> |
| 1677 | - <?php switch( $field['type'] ) {
|
|
| 1677 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 1678 | 1678 | |
| 1679 | 1679 | case 'text': |
| 1680 | 1680 | case 'email': |
@@ -1688,13 +1688,13 @@ discard block |
||
| 1688 | 1688 | <!-- Placeholder --> |
| 1689 | 1689 | <tr valign="top"> |
| 1690 | 1690 | <td scope="row"> |
| 1691 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1691 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1692 | 1692 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1693 | 1693 | </label> |
| 1694 | 1694 | </td> |
| 1695 | 1695 | <td> |
| 1696 | - <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'] : '' ; ?>" /> |
|
| 1697 | - <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1696 | + <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' ] : ''; ?>" /> |
|
| 1697 | + <p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1698 | 1698 | </td> |
| 1699 | 1699 | </tr> |
| 1700 | 1700 | <?php |
@@ -1705,13 +1705,13 @@ discard block |
||
| 1705 | 1705 | ?> |
| 1706 | 1706 | <tr valign="top"> |
| 1707 | 1707 | <td scope="row"> |
| 1708 | - <label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1708 | + <label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1709 | 1709 | <?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1710 | 1710 | </label> |
| 1711 | 1711 | </td> |
| 1712 | 1712 | <td> |
| 1713 | - <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"' : '' ; ?> /> |
|
| 1714 | - <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> |
|
| 1713 | + <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"' : ''; ?> /> |
|
| 1714 | + <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> |
|
| 1715 | 1715 | </td> |
| 1716 | 1716 | </tr> |
| 1717 | 1717 | <?php |
@@ -1721,7 +1721,7 @@ discard block |
||
| 1721 | 1721 | ?> |
| 1722 | 1722 | |
| 1723 | 1723 | <!-- Default Value --> |
| 1724 | - <?php switch( $field['type'] ) {
|
|
| 1724 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 1725 | 1725 | default: |
| 1726 | 1726 | case 'text': |
| 1727 | 1727 | case 'number': |
@@ -1729,15 +1729,15 @@ discard block |
||
| 1729 | 1729 | ?> |
| 1730 | 1730 | <tr valign="top"> |
| 1731 | 1731 | <td scope="row"> |
| 1732 | - <label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1732 | + <label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1733 | 1733 | <?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1734 | 1734 | </label> |
| 1735 | 1735 | </td> |
| 1736 | 1736 | <td> |
| 1737 | - <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 } ?> />
|
|
| 1738 | - <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> |
|
| 1737 | + <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 } ?> />
|
|
| 1738 | + <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> |
|
| 1739 | 1739 | <?php |
| 1740 | - switch( $field['type'] ) {
|
|
| 1740 | + switch ( $field[ 'type' ] ) {
|
|
| 1741 | 1741 | case 'text': |
| 1742 | 1742 | ?> |
| 1743 | 1743 | <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> |
@@ -1759,28 +1759,28 @@ discard block |
||
| 1759 | 1759 | </td> |
| 1760 | 1760 | <td> |
| 1761 | 1761 | <?php |
| 1762 | - $field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice']; |
|
| 1762 | + $field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ]; |
|
| 1763 | 1763 | $x = 0; |
| 1764 | 1764 | ?> |
| 1765 | - <label for="<?php echo $field['merge'] . '-no-default'; ?>"> |
|
| 1766 | - <input id="<?php echo $field['merge'] . '-no-default'; ?>" |
|
| 1765 | + <label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>"> |
|
| 1766 | + <input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>" |
|
| 1767 | 1767 | type="radio" |
| 1768 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
| 1769 | - value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?> |
|
| 1768 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
| 1769 | + value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?> |
|
| 1770 | 1770 | > |
| 1771 | 1771 | No Default |
| 1772 | 1772 | </label> |
| 1773 | 1773 | <?php |
| 1774 | 1774 | foreach ( $choices as $choice => $value ) { ?>
|
| 1775 | - <label for="<?php echo $field['merge'].'-'.$x; ?>"> |
|
| 1776 | - <input id="<?php echo $field['merge'].'-'.$x; ?>" |
|
| 1775 | + <label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>"> |
|
| 1776 | + <input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>" |
|
| 1777 | 1777 | type="radio" |
| 1778 | - name="field[<?php echo $field['merge']; ?>][default_choice]" |
|
| 1779 | - value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>> |
|
| 1778 | + name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" |
|
| 1779 | + value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>> |
|
| 1780 | 1780 | <?php echo $value; ?> |
| 1781 | 1781 | </label> |
| 1782 | 1782 | <?php $x++; } ?> |
| 1783 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1783 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1784 | 1784 | </td> |
| 1785 | 1785 | </tr> |
| 1786 | 1786 | |
@@ -1796,13 +1796,13 @@ discard block |
||
| 1796 | 1796 | </label> |
| 1797 | 1797 | </td> |
| 1798 | 1798 | <td> |
| 1799 | - <select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]"> |
|
| 1800 | - <option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option> |
|
| 1801 | - <?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
|
|
| 1802 | - <option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option> |
|
| 1799 | + <select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"> |
|
| 1800 | + <option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option> |
|
| 1801 | + <?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
|
|
| 1802 | + <option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option> |
|
| 1803 | 1803 | <?php } ?> |
| 1804 | 1804 | </select> |
| 1805 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1805 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1806 | 1806 | </td> |
| 1807 | 1807 | </tr> |
| 1808 | 1808 | |
@@ -1819,82 +1819,82 @@ discard block |
||
| 1819 | 1819 | <!-- Field Description --> |
| 1820 | 1820 | <tr valign="top"> |
| 1821 | 1821 | <td scope="row"> |
| 1822 | - <label for="description_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1822 | + <label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1823 | 1823 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1824 | 1824 | </label> |
| 1825 | 1825 | </td> |
| 1826 | 1826 | <td> |
| 1827 | - <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> |
|
| 1828 | - <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> |
|
| 1827 | + <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> |
|
| 1828 | + <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> |
|
| 1829 | 1829 | </td> |
| 1830 | 1830 | </tr> |
| 1831 | 1831 | <!-- Description Above Field --> |
| 1832 | 1832 | <tr valign="top" class="yikes-checkbox-container"> |
| 1833 | 1833 | <td scope="row"> |
| 1834 | - <label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1834 | + <label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1835 | 1835 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1836 | 1836 | </label> |
| 1837 | 1837 | </td> |
| 1838 | 1838 | <td> |
| 1839 | - <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"' : ''; ?> /> |
|
| 1840 | - <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> |
|
| 1839 | + <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"' : ''; ?> /> |
|
| 1840 | + <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> |
|
| 1841 | 1841 | </td> |
| 1842 | 1842 | </tr> |
| 1843 | 1843 | <!-- Additional Classes --> |
| 1844 | 1844 | <tr valign="top"> |
| 1845 | 1845 | <td scope="row"> |
| 1846 | - <label for="classes_<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1846 | + <label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1847 | 1847 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1848 | 1848 | </label> |
| 1849 | 1849 | </td> |
| 1850 | 1850 | <td> |
| 1851 | - <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'] ) ) : '' ; ?>" /> |
|
| 1852 | - <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> |
|
| 1851 | + <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' ] ) ) : ''; ?>" /> |
|
| 1852 | + <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> |
|
| 1853 | 1853 | </td> |
| 1854 | 1854 | </tr> |
| 1855 | 1855 | <!-- Required Toggle --> |
| 1856 | 1856 | <tr valign="top" class="yikes-checkbox-container yikes-checkbox-container-first"> |
| 1857 | 1857 | <td scope="row"> |
| 1858 | - <label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1858 | + <label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1859 | 1859 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1860 | 1860 | </label> |
| 1861 | 1861 | </td> |
| 1862 | 1862 | <td> |
| 1863 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
| 1864 | - <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' ); } ?>">
|
|
| 1865 | - <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> |
|
| 1863 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
| 1864 | + <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' ); } ?>">
|
|
| 1865 | + <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> |
|
| 1866 | 1866 | </td> |
| 1867 | 1867 | </tr> |
| 1868 | 1868 | <!-- Visible Toggle --> |
| 1869 | 1869 | <tr valign="top" class="yikes-checkbox-container"> |
| 1870 | 1870 | <td scope="row"> |
| 1871 | - <label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1871 | + <label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1872 | 1872 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1873 | 1873 | </label> |
| 1874 | 1874 | </td> |
| 1875 | 1875 | <td> |
| 1876 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
| 1877 | - <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' ); } ?>">
|
|
| 1878 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1876 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
| 1877 | + <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' ); } ?>">
|
|
| 1878 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1879 | 1879 | </td> |
| 1880 | 1880 | </tr> |
| 1881 | 1881 | <!-- Toggle Field Label Visibility --> |
| 1882 | 1882 | <tr valign="top" class="yikes-checkbox-container"> |
| 1883 | 1883 | <td scope="row"> |
| 1884 | - <label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>"> |
|
| 1884 | + <label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>"> |
|
| 1885 | 1885 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 1886 | 1886 | </label> |
| 1887 | 1887 | </td> |
| 1888 | 1888 | <td> |
| 1889 | - <?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
| 1890 | - <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 ); ?>/> |
|
| 1891 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 1889 | + <?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
| 1890 | + <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 ); ?>/> |
|
| 1891 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 1892 | 1892 | </td> |
| 1893 | 1893 | </tr> |
| 1894 | 1894 | <!-- Display Phone/Date Formats back to the user --> |
| 1895 | 1895 | <!-- Phone Format Initial Load --> |
| 1896 | 1896 | <?php |
| 1897 | - switch( $field['type'] ) {
|
|
| 1897 | + switch ( $field[ 'type' ] ) {
|
|
| 1898 | 1898 | /* Store the phone format, for properly regex pattern */ |
| 1899 | 1899 | case 'phone': |
| 1900 | 1900 | case 'birthday': |
@@ -1904,23 +1904,23 @@ discard block |
||
| 1904 | 1904 | <td scope="row"> |
| 1905 | 1905 | <label for="placeholder"> |
| 1906 | 1906 | <?php |
| 1907 | - switch( $field['type'] ) {
|
|
| 1907 | + switch ( $field[ 'type' ] ) {
|
|
| 1908 | 1908 | default: |
| 1909 | 1909 | case 'birthday': |
| 1910 | 1910 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 1911 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD'; |
|
| 1911 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD'; |
|
| 1912 | 1912 | $format_name = 'date_format'; |
| 1913 | 1913 | break; |
| 1914 | 1914 | |
| 1915 | 1915 | case 'date': |
| 1916 | 1916 | $type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 1917 | - $format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY'; |
|
| 1917 | + $format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY'; |
|
| 1918 | 1918 | $format_name = 'date_format'; |
| 1919 | 1919 | break; |
| 1920 | 1920 | |
| 1921 | 1921 | case 'phone': |
| 1922 | 1922 | $type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' ); |
| 1923 | - $format = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 1923 | + $format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 1924 | 1924 | $format_name = 'phone_format'; |
| 1925 | 1925 | break; |
| 1926 | 1926 | } |
@@ -1930,7 +1930,7 @@ discard block |
||
| 1930 | 1930 | </td> |
| 1931 | 1931 | <td> |
| 1932 | 1932 | <strong><?php echo $format; ?></strong> |
| 1933 | - <input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 1933 | + <input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" /> |
|
| 1934 | 1934 | <p class="description"><small> |
| 1935 | 1935 | <?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' ) ); ?> |
| 1936 | 1936 | </small></p> |
@@ -1951,8 +1951,8 @@ discard block |
||
| 1951 | 1951 | </td> |
| 1952 | 1952 | <td> |
| 1953 | 1953 | <span class="toggle-container"> |
| 1954 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 1955 | - <a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 1954 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 1955 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 1956 | 1956 | </span> |
| 1957 | 1957 | </td> |
| 1958 | 1958 | </tr> |
@@ -1970,35 +1970,35 @@ discard block |
||
| 1970 | 1970 | /**** Interest Group ****/ |
| 1971 | 1971 | |
| 1972 | 1972 | ?> |
| 1973 | - <section class="draggable" id="<?php echo $field['group_id']; ?>"> |
|
| 1973 | + <section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>"> |
|
| 1974 | 1974 | <!-- top --> |
| 1975 | 1975 | <a href="#" class="expansion-section-title settings-sidebar"> |
| 1976 | - <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?> |
|
| 1977 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
|
|
| 1976 | + <span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field[ 'label' ] ); ?> |
|
| 1977 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
|
|
| 1978 | 1978 | <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' ); ?>"> |
| 1979 | 1979 | <?php } ?> |
| 1980 | - <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span> |
|
| 1980 | + <span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span> |
|
| 1981 | 1981 | </a> |
| 1982 | 1982 | <!-- expansion section --> |
| 1983 | 1983 | <div class="yikes-mc-settings-expansion-section"> |
| 1984 | 1984 | |
| 1985 | 1985 | <!-- check if this field exists in the available interest group array --> |
| 1986 | - <?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
|
|
| 1987 | - <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> |
|
| 1986 | + <?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
|
|
| 1987 | + <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> |
|
| 1988 | 1988 | <?php } ?> |
| 1989 | 1989 | |
| 1990 | 1990 | <!-- store the label --> |
| 1991 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" /> |
|
| 1992 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" /> |
|
| 1993 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" /> |
|
| 1994 | - <input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' /> |
|
| 1991 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" /> |
|
| 1992 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" /> |
|
| 1993 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" /> |
|
| 1994 | + <input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' /> |
|
| 1995 | 1995 | |
| 1996 | 1996 | <!-- Single or Double Opt-in --> |
| 1997 | 1997 | <p class="type-container"><!-- necessary to prevent skipping on slideToggle(); --> |
| 1998 | 1998 | |
| 1999 | 1999 | <table class="form-table form-field-container"> |
| 2000 | 2000 | <!-- Default Value --> |
| 2001 | - <?php switch( $field['type'] ) {
|
|
| 2001 | + <?php switch ( $field[ 'type' ] ) {
|
|
| 2002 | 2002 | default: |
| 2003 | 2003 | case 'radio': |
| 2004 | 2004 | case 'checkboxes': |
@@ -2011,15 +2011,15 @@ discard block |
||
| 2011 | 2011 | </td> |
| 2012 | 2012 | <td> |
| 2013 | 2013 | <?php |
| 2014 | - $field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
| 2014 | + $field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
| 2015 | 2015 | |
| 2016 | 2016 | $default_shown = false; |
| 2017 | 2017 | |
| 2018 | - foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
|
|
| 2019 | - $field_id = "{$field['group_id']}-{$id}";
|
|
| 2020 | - $field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type']; |
|
| 2018 | + foreach ( json_decode( $field[ 'groups' ], true ) as $id => $group ) {
|
|
| 2019 | + $field_id = "{$field[ 'group_id' ]}-{$id}";
|
|
| 2020 | + $field_type = 'hidden' == $field[ 'type' ] ? 'checkbox' : $field[ 'type' ]; |
|
| 2021 | 2021 | $field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type; |
| 2022 | - $field_name = "field[{$field['group_id']}][default_choice]";
|
|
| 2022 | + $field_name = "field[{$field[ 'group_id' ]}][default_choice]";
|
|
| 2023 | 2023 | $field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name; |
| 2024 | 2024 | |
| 2025 | 2025 | // Determine if the current group is checked. |
@@ -2027,13 +2027,13 @@ discard block |
||
| 2027 | 2027 | switch ( $field_type ) {
|
| 2028 | 2028 | case 'radio': |
| 2029 | 2029 | default: |
| 2030 | - $default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice']; |
|
| 2031 | - $checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false ); |
|
| 2030 | + $default = is_array( $field[ 'default_choice' ] ) ? current( $field[ 'default_choice' ] ) : $field[ 'default_choice' ]; |
|
| 2031 | + $checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false ); |
|
| 2032 | 2032 | break; |
| 2033 | 2033 | |
| 2034 | 2034 | case 'checkbox': |
| 2035 | 2035 | case 'hidden': |
| 2036 | - if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
|
|
| 2036 | + if ( is_array( $field[ 'default_choice' ] ) && in_array( $id, $field[ 'default_choice' ] ) ) {
|
|
| 2037 | 2037 | $checked = checked( true, true, false ); |
| 2038 | 2038 | } |
| 2039 | 2039 | break; |
@@ -2048,7 +2048,7 @@ discard block |
||
| 2048 | 2048 | type="<?php echo $field_type; ?>" |
| 2049 | 2049 | name="<?php echo $field_name; ?>" |
| 2050 | 2050 | value="no-default" |
| 2051 | - <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>> |
|
| 2051 | + <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>> |
|
| 2052 | 2052 | No Default |
| 2053 | 2053 | </label> |
| 2054 | 2054 | <?php |
@@ -2064,7 +2064,7 @@ discard block |
||
| 2064 | 2064 | </label> |
| 2065 | 2065 | <?php |
| 2066 | 2066 | } ?> |
| 2067 | - <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2067 | + <p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2068 | 2068 | </td> |
| 2069 | 2069 | </tr> |
| 2070 | 2070 | |
@@ -2080,13 +2080,13 @@ discard block |
||
| 2080 | 2080 | </label> |
| 2081 | 2081 | </td> |
| 2082 | 2082 | <td> |
| 2083 | - <select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]"> |
|
| 2083 | + <select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]"> |
|
| 2084 | 2084 | <option value="no-default">No Default</option> |
| 2085 | - <?php foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as $id => $group ) { ?>
|
|
| 2086 | - <option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
| 2085 | + <?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>
|
|
| 2086 | + <option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></option> |
|
| 2087 | 2087 | <?php } ?> |
| 2088 | 2088 | </select> |
| 2089 | - <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2089 | + <p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2090 | 2090 | </td> |
| 2091 | 2091 | </tr> |
| 2092 | 2092 | |
@@ -2099,78 +2099,78 @@ discard block |
||
| 2099 | 2099 | <!-- Field Description --> |
| 2100 | 2100 | <tr valign="top"> |
| 2101 | 2101 | <td scope="row"> |
| 2102 | - <label for="description_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2102 | + <label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2103 | 2103 | <?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2104 | 2104 | </label> |
| 2105 | 2105 | </td> |
| 2106 | 2106 | <td> |
| 2107 | - <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> |
|
| 2108 | - <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> |
|
| 2107 | + <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> |
|
| 2108 | + <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> |
|
| 2109 | 2109 | </td> |
| 2110 | 2110 | </tr> |
| 2111 | 2111 | |
| 2112 | 2112 | <!-- Description Above Field --> |
| 2113 | 2113 | <tr valign="top" class="yikes-checkbox-container"> |
| 2114 | 2114 | <td scope="row"> |
| 2115 | - <label for="description_above_<?php echo $field['group_id']; ?>"> |
|
| 2115 | + <label for="description_above_<?php echo $field[ 'group_id' ]; ?>"> |
|
| 2116 | 2116 | <?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2117 | 2117 | </label> |
| 2118 | 2118 | </td> |
| 2119 | 2119 | <td> |
| 2120 | - <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"' : ''; ?> /> |
|
| 2121 | - <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> |
|
| 2120 | + <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"' : ''; ?> /> |
|
| 2121 | + <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> |
|
| 2122 | 2122 | </td> |
| 2123 | 2123 | </tr> |
| 2124 | 2124 | |
| 2125 | 2125 | <!-- Additional Classes --> |
| 2126 | 2126 | <tr valign="top"> |
| 2127 | 2127 | <td scope="row"> |
| 2128 | - <label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2128 | + <label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2129 | 2129 | <?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2130 | 2130 | </label> |
| 2131 | 2131 | </td> |
| 2132 | 2132 | <td> |
| 2133 | - <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'] ) ) : '' ; ?>" /> |
|
| 2134 | - <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> |
|
| 2133 | + <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' ] ) ) : ''; ?>" /> |
|
| 2134 | + <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> |
|
| 2135 | 2135 | </td> |
| 2136 | 2136 | </tr> |
| 2137 | 2137 | <!-- Required Toggle --> |
| 2138 | 2138 | <tr valign="top" class="yikes-checkbox-container"> |
| 2139 | 2139 | <td scope="row"> |
| 2140 | - <label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2140 | + <label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2141 | 2141 | <?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2142 | 2142 | </label> |
| 2143 | 2143 | </td> |
| 2144 | 2144 | <td> |
| 2145 | - <?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?> |
|
| 2146 | - <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 ); ?>> |
|
| 2147 | - <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> |
|
| 2145 | + <?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?> |
|
| 2146 | + <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 ); ?>> |
|
| 2147 | + <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> |
|
| 2148 | 2148 | </td> |
| 2149 | 2149 | </tr> |
| 2150 | 2150 | <!-- Visible Toggle --> |
| 2151 | 2151 | <tr valign="top" class="yikes-checkbox-container"> |
| 2152 | 2152 | <td scope="row"> |
| 2153 | - <label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2153 | + <label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2154 | 2154 | <?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2155 | 2155 | </label> |
| 2156 | 2156 | </td> |
| 2157 | 2157 | <td> |
| 2158 | - <?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?> |
|
| 2159 | - <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 ); ?>> |
|
| 2160 | - <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2158 | + <?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?> |
|
| 2159 | + <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 ); ?>> |
|
| 2160 | + <p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2161 | 2161 | </td> |
| 2162 | 2162 | </tr> |
| 2163 | 2163 | <!-- Toggle Field Label Visibility --> |
| 2164 | 2164 | <tr valign="top" class="yikes-checkbox-container"> |
| 2165 | 2165 | <td scope="row"> |
| 2166 | - <label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>"> |
|
| 2166 | + <label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>"> |
|
| 2167 | 2167 | <?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?> |
| 2168 | 2168 | </label> |
| 2169 | 2169 | </td> |
| 2170 | 2170 | <td> |
| 2171 | - <?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?> |
|
| 2172 | - <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 ); ?>/> |
|
| 2173 | - <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p> |
|
| 2171 | + <?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?> |
|
| 2172 | + <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 ); ?>/> |
|
| 2173 | + <p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p> |
|
| 2174 | 2174 | </td> |
| 2175 | 2175 | </tr> |
| 2176 | 2176 | <!-- Toggle Buttons --> |
@@ -2180,8 +2180,8 @@ discard block |
||
| 2180 | 2180 | </td> |
| 2181 | 2181 | <td> |
| 2182 | 2182 | <span class="toggle-container"> |
| 2183 | - <a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2184 | - <a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2183 | + <a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> | |
|
| 2184 | + <a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
| 2185 | 2185 | </span> |
| 2186 | 2186 | </td> |
| 2187 | 2187 | </tr> |
@@ -2202,7 +2202,7 @@ discard block |
||
| 2202 | 2202 | add_thickbox(); |
| 2203 | 2203 | // enqueue jquery qtip for our tooltip |
| 2204 | 2204 | wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) ); |
| 2205 | - wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
| 2205 | + wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' ); |
|
| 2206 | 2206 | $available_tags = array( |
| 2207 | 2207 | array( |
| 2208 | 2208 | 'tag' => '{page_title}',
|
@@ -2257,14 +2257,14 @@ discard block |
||
| 2257 | 2257 | <h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
| 2258 | 2258 | <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> |
| 2259 | 2259 | <ul> |
| 2260 | - <?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
|
|
| 2260 | + <?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
|
|
| 2261 | 2261 | <li class="tooltop-tag"> |
| 2262 | 2262 | <!-- link/tag --> |
| 2263 | - <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> |
|
| 2263 | + <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> |
|
| 2264 | 2264 | <!-- help icon --> |
| 2265 | 2265 | <span class="dashicons dashicons-editor-help"></span> |
| 2266 | 2266 | <!-- tooltip --> |
| 2267 | - <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div> |
|
| 2267 | + <div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div> |
|
| 2268 | 2268 | </li> |
| 2269 | 2269 | <?php } ?> |
| 2270 | 2270 | </ul> |
@@ -2283,32 +2283,32 @@ discard block |
||
| 2283 | 2283 | public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
|
| 2284 | 2284 | $fields_assigned_to_form = array(); |
| 2285 | 2285 | foreach ( $form_fields as $field ) {
|
| 2286 | - if ( isset( $field['merge'] ) ) {
|
|
| 2287 | - $fields_assigned_to_form[ $field['merge'] ] = true; |
|
| 2286 | + if ( isset( $field[ 'merge' ] ) ) {
|
|
| 2287 | + $fields_assigned_to_form[ $field[ 'merge' ] ] = true; |
|
| 2288 | 2288 | } |
| 2289 | 2289 | } |
| 2290 | 2290 | |
| 2291 | - if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
|
|
| 2291 | + if ( ! empty( $available_merge_variables[ 'merge_fields' ] ) ) {
|
|
| 2292 | 2292 | ?> |
| 2293 | 2293 | <ul id="available-fields"><?php |
| 2294 | - foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
|
|
| 2295 | - $not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] ); |
|
| 2294 | + foreach ( $available_merge_variables[ 'merge_fields' ] as $merge_var ) {
|
|
| 2295 | + $not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] ); |
|
| 2296 | 2296 | ?> |
| 2297 | 2297 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2298 | - alt="<?php echo esc_attr( $merge_var['tag'] ); ?>" |
|
| 2299 | - data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>" |
|
| 2300 | - data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>" |
|
| 2301 | - data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>" |
|
| 2298 | + alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>" |
|
| 2299 | + data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>" |
|
| 2300 | + data-attr-field-name="<?php echo esc_attr( $merge_var[ 'name' ] ); ?>" |
|
| 2301 | + data-attr-form-id="<?php echo esc_attr( $available_merge_variables[ 'list_id' ] ); ?>" |
|
| 2302 | 2302 | title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>" |
| 2303 | 2303 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2304 | 2304 | > |
| 2305 | 2305 | <?php |
| 2306 | - echo esc_html( stripslashes( $merge_var['name'] ) ); |
|
| 2307 | - if ( $merge_var['required'] ) {
|
|
| 2306 | + echo esc_html( stripslashes( $merge_var[ 'name' ] ) ); |
|
| 2307 | + if ( $merge_var[ 'required' ] ) {
|
|
| 2308 | 2308 | echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; |
| 2309 | 2309 | } |
| 2310 | 2310 | ?> |
| 2311 | - <small class="field-type-text"><?php echo esc_html( $merge_var['type'] ); ?></small> |
|
| 2311 | + <small class="field-type-text"><?php echo esc_html( $merge_var[ 'type' ] ); ?></small> |
|
| 2312 | 2312 | </li> |
| 2313 | 2313 | <?php |
| 2314 | 2314 | } |
@@ -2333,8 +2333,8 @@ discard block |
||
| 2333 | 2333 | $fields_assigned_to_form = array(); |
| 2334 | 2334 | if ( ! empty( $form_fields ) ) {
|
| 2335 | 2335 | foreach ( $form_fields as $field ) {
|
| 2336 | - if ( isset( $field['group_id'] ) ) {
|
|
| 2337 | - $fields_assigned_to_form[ $field['group_id'] ] = true; |
|
| 2336 | + if ( isset( $field[ 'group_id' ] ) ) {
|
|
| 2337 | + $fields_assigned_to_form[ $field[ 'group_id' ] ] = true; |
|
| 2338 | 2338 | } |
| 2339 | 2339 | } |
| 2340 | 2340 | } |
@@ -2344,19 +2344,19 @@ discard block |
||
| 2344 | 2344 | <ul id="available-interest-groups"> |
| 2345 | 2345 | <?php |
| 2346 | 2346 | foreach ( $available_interest_groups as $interest_group ) {
|
| 2347 | - $not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] ); |
|
| 2347 | + $not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] ); |
|
| 2348 | 2348 | ?> |
| 2349 | 2349 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2350 | - alt="<?php echo esc_attr( $interest_group['id'] ); ?>" |
|
| 2351 | - data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>" |
|
| 2352 | - data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>" |
|
| 2353 | - data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>" |
|
| 2350 | + alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" |
|
| 2351 | + data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" |
|
| 2352 | + data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>" |
|
| 2353 | + data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>" |
|
| 2354 | 2354 | data-attr-form-id="<?php echo esc_attr( $list_id ); ?>" |
| 2355 | 2355 | title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>" |
| 2356 | 2356 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2357 | 2357 | > |
| 2358 | - <?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?> |
|
| 2359 | - <small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small> |
|
| 2358 | + <?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?> |
|
| 2359 | + <small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small> |
|
| 2360 | 2360 | </li> |
| 2361 | 2361 | <?php |
| 2362 | 2362 | } |
@@ -2382,13 +2382,13 @@ discard block |
||
| 2382 | 2382 | $not_available = isset( $form_tags[ $tag_id ] ); |
| 2383 | 2383 | ?> |
| 2384 | 2384 | <li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" |
| 2385 | - id="tag-<?php echo esc_attr( $tag['id'] ); ?>" |
|
| 2386 | - data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>" |
|
| 2387 | - data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>" |
|
| 2388 | - title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>" |
|
| 2385 | + id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>" |
|
| 2386 | + data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>" |
|
| 2387 | + data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>" |
|
| 2388 | + title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>" |
|
| 2389 | 2389 | <?php echo $not_available ? 'disabled="disabled"' : ''; ?> |
| 2390 | 2390 | > |
| 2391 | - <?php echo esc_html( $tag['name'] ); ?> |
|
| 2391 | + <?php echo esc_html( $tag[ 'name' ] ); ?> |
|
| 2392 | 2392 | </li> |
| 2393 | 2393 | <?php |
| 2394 | 2394 | } |
@@ -2409,15 +2409,15 @@ discard block |
||
| 2409 | 2409 | * - must clean up db tables , ensure what data is going in and what is needed... |
| 2410 | 2410 | */ |
| 2411 | 2411 | public function yikes_easy_mailchimp_create_form() {
|
| 2412 | - $nonce = $_REQUEST['nonce']; |
|
| 2412 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2413 | 2413 | if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
|
| 2414 | - wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2414 | + wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) ); |
|
| 2415 | 2415 | } |
| 2416 | 2416 | |
| 2417 | 2417 | $result = $this->form_interface->create_form( array( |
| 2418 | - 'list_id' => sanitize_key( $_POST['associated-list'] ), |
|
| 2419 | - 'form_name' => stripslashes( $_POST['form-name'] ), |
|
| 2420 | - 'form_description' => stripslashes( $_POST['form-description'] ), |
|
| 2418 | + 'list_id' => sanitize_key( $_POST[ 'associated-list' ] ), |
|
| 2419 | + 'form_name' => stripslashes( $_POST[ 'form-name' ] ), |
|
| 2420 | + 'form_description' => stripslashes( $_POST[ 'form-description' ] ), |
|
| 2421 | 2421 | ) ); |
| 2422 | 2422 | |
| 2423 | 2423 | // if an error occurs during the form creation process |
@@ -2425,11 +2425,11 @@ discard block |
||
| 2425 | 2425 | // write it to the error log |
| 2426 | 2426 | // if the form was not created successfully |
| 2427 | 2427 | $error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging(); |
| 2428 | - $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' ) ); |
|
| 2428 | + $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' ) ); |
|
| 2429 | 2429 | 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' ) ) ) ) ); |
| 2430 | 2430 | } else {
|
| 2431 | 2431 | // redirect the user to the new form edit page |
| 2432 | - wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result) ) ); |
|
| 2432 | + wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $result ) ) ); |
|
| 2433 | 2433 | } |
| 2434 | 2434 | exit(); |
| 2435 | 2435 | } |
@@ -2442,11 +2442,11 @@ discard block |
||
| 2442 | 2442 | */ |
| 2443 | 2443 | public function yikes_easy_mailchimp_delete_form() {
|
| 2444 | 2444 | // grab & store our variables ( associated list & form name ) |
| 2445 | - $nonce = $_REQUEST['nonce']; |
|
| 2446 | - $post_id_to_delete = $_REQUEST['mailchimp-form']; |
|
| 2445 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2446 | + $post_id_to_delete = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2447 | 2447 | // verify our nonce |
| 2448 | - if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
|
|
| 2449 | - 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 ) ); |
|
| 2448 | + if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
|
|
| 2449 | + 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 ) ); |
|
| 2450 | 2450 | } |
| 2451 | 2451 | |
| 2452 | 2452 | $this->form_interface->delete_form( $post_id_to_delete ); |
@@ -2462,19 +2462,19 @@ discard block |
||
| 2462 | 2462 | */ |
| 2463 | 2463 | public function yikes_easy_mailchimp_duplicate_form() {
|
| 2464 | 2464 | // grab & store our variables ( associated list & form name ) |
| 2465 | - $nonce = $_REQUEST['nonce']; |
|
| 2466 | - $post_id_to_clone = $_REQUEST['mailchimp-form']; |
|
| 2465 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2466 | + $post_id_to_clone = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2467 | 2467 | // verify our nonce |
| 2468 | - if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
|
|
| 2469 | - 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 ) ); |
|
| 2468 | + if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
|
|
| 2469 | + 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 ) ); |
|
| 2470 | 2470 | } |
| 2471 | 2471 | |
| 2472 | 2472 | // Get the current form data. |
| 2473 | 2473 | $form_data = $this->form_interface->get_form( $post_id_to_clone ); |
| 2474 | 2474 | |
| 2475 | 2475 | // Update some of the data before duplication |
| 2476 | - $form_data['form_name'] .= ' - Copy'; |
|
| 2477 | - $form_data['impressions'] = $form_data['submissions'] = 0; |
|
| 2476 | + $form_data[ 'form_name' ] .= ' - Copy'; |
|
| 2477 | + $form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0; |
|
| 2478 | 2478 | |
| 2479 | 2479 | // Create the new form, and handle the result. |
| 2480 | 2480 | $result = $this->form_interface->create_form( $form_data ); |
@@ -2505,11 +2505,11 @@ discard block |
||
| 2505 | 2505 | */ |
| 2506 | 2506 | public function yikes_easy_mailchimp_reset_impression_stats() {
|
| 2507 | 2507 | // grab & store our variables ( associated list & form name ) |
| 2508 | - $nonce = $_REQUEST['nonce']; |
|
| 2509 | - $form_id_to_reset = $_REQUEST['mailchimp-form']; |
|
| 2508 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2509 | + $form_id_to_reset = $_REQUEST[ 'mailchimp-form' ]; |
|
| 2510 | 2510 | // verify our nonce |
| 2511 | - if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
|
|
| 2512 | - 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 ) ); |
|
| 2511 | + if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
|
|
| 2512 | + 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 ) ); |
|
| 2513 | 2513 | } |
| 2514 | 2514 | |
| 2515 | 2515 | $result = $this->form_interface->update_form( |
@@ -2537,8 +2537,8 @@ discard block |
||
| 2537 | 2537 | */ |
| 2538 | 2538 | public function yikes_easy_mailchimp_update_form() {
|
| 2539 | 2539 | |
| 2540 | - $nonce = $_REQUEST['nonce']; |
|
| 2541 | - $form_id = $_REQUEST['id']; |
|
| 2540 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2541 | + $form_id = $_REQUEST[ 'id' ]; |
|
| 2542 | 2542 | |
| 2543 | 2543 | // verify our nonce |
| 2544 | 2544 | if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
|
@@ -2552,70 +2552,70 @@ discard block |
||
| 2552 | 2552 | } |
| 2553 | 2553 | |
| 2554 | 2554 | // Store our values! |
| 2555 | - $list_id = $_POST['associated-list']; |
|
| 2556 | - $form_name = stripslashes( $_POST['form-name'] ); |
|
| 2557 | - $form_description = sanitize_text_field( stripslashes( $_POST['form-description'] ) ); |
|
| 2558 | - $redirect_user_on_submit = $_POST['redirect-user-on-submission']; |
|
| 2559 | - $redirect_page = $_POST['redirect-user-to-selection']; |
|
| 2555 | + $list_id = $_POST[ 'associated-list' ]; |
|
| 2556 | + $form_name = stripslashes( $_POST[ 'form-name' ] ); |
|
| 2557 | + $form_description = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) ); |
|
| 2558 | + $redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ]; |
|
| 2559 | + $redirect_page = $_POST[ 'redirect-user-to-selection' ]; |
|
| 2560 | 2560 | |
| 2561 | 2561 | // stripslashes_deep on save, to prevent foreign languages from added excessive backslashes |
| 2562 | - $assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array(); |
|
| 2562 | + $assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array(); |
|
| 2563 | 2563 | |
| 2564 | 2564 | // setup our submission settings serialized array |
| 2565 | 2565 | $submission_settings = array( |
| 2566 | - 'ajax' => $_POST['form-ajax-submission'], |
|
| 2567 | - 'redirect_on_submission' => $_POST['redirect-user-on-submission'], |
|
| 2568 | - 'redirect_page' => $_POST['redirect-user-to-selection'], |
|
| 2569 | - 'custom_redirect_url' => esc_url( $_POST['custom-redirect-url'] ), |
|
| 2570 | - 'redirect_new_window' => $_POST['redirect_new_window'], |
|
| 2571 | - 'hide_form_post_signup' => $_POST['hide-form-post-signup'], |
|
| 2572 | - 'replace_interests' => $_POST['replace-interest-groups'], |
|
| 2566 | + 'ajax' => $_POST[ 'form-ajax-submission' ], |
|
| 2567 | + 'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ], |
|
| 2568 | + 'redirect_page' => $_POST[ 'redirect-user-to-selection' ], |
|
| 2569 | + 'custom_redirect_url' => esc_url( $_POST[ 'custom-redirect-url' ] ), |
|
| 2570 | + 'redirect_new_window' => $_POST[ 'redirect_new_window' ], |
|
| 2571 | + 'hide_form_post_signup' => $_POST[ 'hide-form-post-signup' ], |
|
| 2572 | + 'replace_interests' => $_POST[ 'replace-interest-groups' ], |
|
| 2573 | 2573 | ); |
| 2574 | 2574 | |
| 2575 | 2575 | // setup our opt-in settings serialized array |
| 2576 | 2576 | $optin_settings = array( |
| 2577 | - 'optin' => $_POST['single-double-optin'], |
|
| 2578 | - 'update_existing_user' => $_POST['update-existing-user'], |
|
| 2579 | - 'send_update_email' => $_POST['update-existing-email'], |
|
| 2577 | + 'optin' => $_POST[ 'single-double-optin' ], |
|
| 2578 | + 'update_existing_user' => $_POST[ 'update-existing-user' ], |
|
| 2579 | + 'send_update_email' => $_POST[ 'update-existing-email' ], |
|
| 2580 | 2580 | ); |
| 2581 | 2581 | |
| 2582 | 2582 | // Setup our error settings serialized array |
| 2583 | 2583 | $error_settings = array( |
| 2584 | - 'success' => trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '', |
|
| 2585 | - 'success-single-optin' => trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '', |
|
| 2586 | - 'success-resubscribed' => trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '', |
|
| 2587 | - 'general-error' => trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '', |
|
| 2588 | - 'already-subscribed' => trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '', |
|
| 2589 | - 'update-link' => trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '', |
|
| 2590 | - 'email-subject' => trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '', |
|
| 2591 | - 'email-body' => trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '', |
|
| 2592 | - 'update-email-success' => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '', |
|
| 2593 | - 'update-email-failure' => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '', |
|
| 2584 | + 'success' => trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '', |
|
| 2585 | + 'success-single-optin' => trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '', |
|
| 2586 | + 'success-resubscribed' => trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '', |
|
| 2587 | + 'general-error' => trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '', |
|
| 2588 | + 'already-subscribed' => trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '', |
|
| 2589 | + 'update-link' => trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '', |
|
| 2590 | + 'email-subject' => trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '', |
|
| 2591 | + 'email-body' => trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '', |
|
| 2592 | + 'update-email-success' => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '', |
|
| 2593 | + 'update-email-failure' => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '', |
|
| 2594 | 2594 | ); |
| 2595 | 2595 | |
| 2596 | 2596 | // Setup the new form settings array |
| 2597 | 2597 | // @since 6.0.3.8 |
| 2598 | 2598 | // To Do: Combine date & time so it's a single unix timestamp |
| 2599 | 2599 | $form_settings = array( |
| 2600 | - 'yikes-easy-mc-form-class-names' => trim( $_POST['yikes-easy-mc-form-class-names'] ), |
|
| 2601 | - 'yikes-easy-mc-inline-form' => $_POST['yikes-easy-mc-inline-form'][0], |
|
| 2602 | - 'yikes-easy-mc-submit-button-type' => $_POST['yikes-easy-mc-submit-button-type'][0], |
|
| 2603 | - 'yikes-easy-mc-submit-button-text' => trim( $_POST['yikes-easy-mc-submit-button-text'] ), |
|
| 2604 | - 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ), |
|
| 2605 | - 'yikes-easy-mc-submit-button-classes' => trim( $_POST['yikes-easy-mc-submit-button-classes'] ), |
|
| 2606 | - 'yikes-easy-mc-form-schedule' => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0', |
|
| 2607 | - 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ), |
|
| 2608 | - 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ), |
|
| 2609 | - 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ), |
|
| 2610 | - 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ), |
|
| 2611 | - 'yikes-easy-mc-form-login-required' => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0', |
|
| 2612 | - 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ), |
|
| 2600 | + 'yikes-easy-mc-form-class-names' => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ), |
|
| 2601 | + 'yikes-easy-mc-inline-form' => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ], |
|
| 2602 | + 'yikes-easy-mc-submit-button-type' => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ], |
|
| 2603 | + 'yikes-easy-mc-submit-button-text' => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ), |
|
| 2604 | + 'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ), |
|
| 2605 | + 'yikes-easy-mc-submit-button-classes' => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ), |
|
| 2606 | + 'yikes-easy-mc-form-schedule' => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0', |
|
| 2607 | + 'yikes-easy-mc-form-restriction-start' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ), |
|
| 2608 | + 'yikes-easy-mc-form-restriction-end' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ), |
|
| 2609 | + 'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ), |
|
| 2610 | + 'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ), |
|
| 2611 | + 'yikes-easy-mc-form-login-required' => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0', |
|
| 2612 | + 'yikes-easy-mc-form-restriction-login-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ), |
|
| 2613 | 2613 | ); |
| 2614 | 2614 | |
| 2615 | 2615 | // additional custom fields (extensions / user defined fields) |
| 2616 | 2616 | $custom_fields = array(); |
| 2617 | - if ( isset( $_POST['custom-field'] ) ) {
|
|
| 2618 | - foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
|
|
| 2617 | + if ( isset( $_POST[ 'custom-field' ] ) ) {
|
|
| 2618 | + foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
|
|
| 2619 | 2619 | if ( is_array( $custom_value ) ) {
|
| 2620 | 2620 | $custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!) |
| 2621 | 2621 | } else {
|
@@ -2647,7 +2647,7 @@ discard block |
||
| 2647 | 2647 | $this->form_interface->update_form( $form_id, $form_updates ); |
| 2648 | 2648 | |
| 2649 | 2649 | /* Custom action hook which allows users to update specific options when a form is updated - used in add ons */ |
| 2650 | - do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
| 2650 | + do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields ); |
|
| 2651 | 2651 | |
| 2652 | 2652 | // redirect the user to the manage forms page, display confirmation |
| 2653 | 2653 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) ); |
@@ -2658,11 +2658,11 @@ discard block |
||
| 2658 | 2658 | $email_body = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
| 2659 | 2659 | |
| 2660 | 2660 | $email_body .= '<p>'; |
| 2661 | - $email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2662 | - $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2663 | - $email_body .= '[link]'; |
|
| 2664 | - $email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2665 | - $email_body .= '[/link]'; |
|
| 2661 | + $email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2662 | + $email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2663 | + $email_body .= '[link]'; |
|
| 2664 | + $email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 2665 | + $email_body .= '[/link]'; |
|
| 2666 | 2666 | $email_body .= '</p>'; |
| 2667 | 2667 | |
| 2668 | 2668 | $email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
@@ -2678,13 +2678,13 @@ discard block |
||
| 2678 | 2678 | |
| 2679 | 2679 | /* Unsubscribe a given user from our list */ |
| 2680 | 2680 | public function yikes_easy_mailchimp_unsubscribe_user() {
|
| 2681 | - $nonce = $_REQUEST['nonce']; |
|
| 2682 | - $list_id = $_REQUEST['mailchimp-list']; |
|
| 2683 | - $email_id = $_REQUEST['email_id']; |
|
| 2681 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2682 | + $list_id = $_REQUEST[ 'mailchimp-list' ]; |
|
| 2683 | + $email_id = $_REQUEST[ 'email_id' ]; |
|
| 2684 | 2684 | |
| 2685 | 2685 | // verify our nonce |
| 2686 | 2686 | if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
|
| 2687 | - 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 ) ); |
|
| 2687 | + 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 ) ); |
|
| 2688 | 2688 | } |
| 2689 | 2689 | |
| 2690 | 2690 | $response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id ); |
@@ -2703,21 +2703,21 @@ discard block |
||
| 2703 | 2703 | |
| 2704 | 2704 | public function yikes_easy_mailchimp_create_missing_error_log() {
|
| 2705 | 2705 | // grab our nonnce |
| 2706 | - $nonce = $_REQUEST['nonce']; |
|
| 2706 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2707 | 2707 | // validate nonce |
| 2708 | - if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
|
|
| 2709 | - 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 ) ); |
|
| 2708 | + if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
|
|
| 2709 | + 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 ) ); |
|
| 2710 | 2710 | } |
| 2711 | 2711 | // setup the path to the error log |
| 2712 | 2712 | $error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' ); |
| 2713 | 2713 | try {
|
| 2714 | 2714 | // create the file |
| 2715 | - fwrite( $error_log , '' ); |
|
| 2715 | + fwrite( $error_log, '' ); |
|
| 2716 | 2716 | // close out |
| 2717 | 2717 | fclose( $error_log ); |
| 2718 | 2718 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=debug-settings&error_log_created=true' ) ) ); |
| 2719 | 2719 | } catch ( Exception $e ) {
|
| 2720 | - 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() ) ) ) ); |
|
| 2720 | + 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() ) ) ) ); |
|
| 2721 | 2721 | } |
| 2722 | 2722 | } |
| 2723 | 2723 | |
@@ -2728,9 +2728,9 @@ discard block |
||
| 2728 | 2728 | public function yikes_easy_mailchimp_clear_transient_data() {
|
| 2729 | 2729 | |
| 2730 | 2730 | // verify our nonce |
| 2731 | - $nonce = $_REQUEST['nonce']; |
|
| 2731 | + $nonce = $_REQUEST[ 'nonce' ]; |
|
| 2732 | 2732 | if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
|
| 2733 | - 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 ) ); |
|
| 2733 | + 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 ) ); |
|
| 2734 | 2734 | } |
| 2735 | 2735 | |
| 2736 | 2736 | $this->delete_yikes_mailchimp_transients(); |
@@ -2739,10 +2739,10 @@ discard block |
||
| 2739 | 2739 | $referer = wp_get_referer(); |
| 2740 | 2740 | if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
|
| 2741 | 2741 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=api-cache-settings&transient-cleared=true' ) ) ); |
| 2742 | - } elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
|
|
| 2742 | + } elseif ( isset( $_REQUEST[ 'page' ] ) && $_REQUEST[ 'page' ] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST[ 'id' ] ) && ! empty( $_REQUEST[ 'id' ] ) ) {
|
|
| 2743 | 2743 | |
| 2744 | 2744 | // else check if we were editing a form. |
| 2745 | - $id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT ); |
|
| 2745 | + $id = filter_var( $_REQUEST[ 'id' ], FILTER_SANITIZE_NUMBER_INT ); |
|
| 2746 | 2746 | wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) ); |
| 2747 | 2747 | } else {
|
| 2748 | 2748 | // else redirect to the manage forms page. |
@@ -2786,7 +2786,7 @@ discard block |
||
| 2786 | 2786 | */ |
| 2787 | 2787 | public function yikes_mailchimp_load_helper_class() {
|
| 2788 | 2788 | // check to see if it's already loaded up. |
| 2789 | - if ( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
|
|
| 2789 | + if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
|
|
| 2790 | 2790 | // Include our main helper class file |
| 2791 | 2791 | include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' ); |
| 2792 | 2792 | } |
@@ -31,39 +31,39 @@ discard block |
||
| 31 | 31 | $form_submitted = isset( $form_submitted ) ? $form_submitted : 0; |
| 32 | 32 | |
| 33 | 33 | /* If the user hasn't authenticated yet, lets kill off */ |
| 34 | - if ( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 35 | - return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>'; |
|
| 34 | + if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) { |
|
| 35 | + return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>'; |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | // if the user forgot to specify a form ID, lets kill of and warn them. |
| 39 | - if( ! $atts['form'] ) { |
|
| 39 | + if ( ! $atts[ 'form' ] ) { |
|
| 40 | 40 | return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' ); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // store our variables |
| 44 | - $form_id = (int) $atts['form']; // form id (the id of the form in the database) |
|
| 44 | + $form_id = (int) $atts[ 'form' ]; // form id (the id of the form in the database) |
|
| 45 | 45 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
| 46 | 46 | $form_data = $interface->get_form( $form_id ); |
| 47 | 47 | |
| 48 | 48 | // confirm we have some results, or return an error |
| 49 | 49 | if ( empty( $form_data ) ) { |
| 50 | - return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 50 | + return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' ); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /* |
| 54 | 54 | * Check if the user wants to use reCAPTCHA Spam Prevention |
| 55 | 55 | */ |
| 56 | - if ( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) { |
|
| 56 | + if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) { |
|
| 57 | 57 | |
| 58 | 58 | // Allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page). |
| 59 | - if ( $atts['recaptcha'] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && absint( $atts['recaptcha_version'] ) !== 3 ) ) { |
|
| 59 | + if ( $atts[ 'recaptcha' ] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && absint( $atts[ 'recaptcha_version' ] ) !== 3 ) ) { |
|
| 60 | 60 | |
| 61 | 61 | // If either of the Private the Secret key is left blank, we should display an error back to the user. |
| 62 | - if ( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) { |
|
| 63 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 62 | + if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) { |
|
| 63 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 64 | 64 | } |
| 65 | - if ( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) { |
|
| 66 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 65 | + if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) { |
|
| 66 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V2 secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | $has_recaptcha = true; |
@@ -73,13 +73,13 @@ discard block |
||
| 73 | 73 | $locale_split = explode( '_', $locale ); |
| 74 | 74 | |
| 75 | 75 | // Setup reCAPTCHA parameters. |
| 76 | - $lang = ! empty( $locale_split ) ? $locale_split[0] : $locale; |
|
| 77 | - $lang = ! empty( $atts['recaptcha_lang'] ) ? $atts['recaptcha_lang'] : $lang; |
|
| 78 | - $type = ! empty( $atts['recaptcha_type'] ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type |
|
| 79 | - $theme = ! empty( $atts['recaptcha_theme'] ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme |
|
| 80 | - $size = ! empty( $atts['recaptcha_size'] ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size |
|
| 81 | - $data_cb = ! empty( $atts['recaptcha_data_callback'] ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size |
|
| 82 | - $expired_cb = ! empty( $atts['recaptcha_expired_callback'] ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size |
|
| 76 | + $lang = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale; |
|
| 77 | + $lang = ! empty( $atts[ 'recaptcha_lang' ] ) ? $atts[ 'recaptcha_lang' ] : $lang; |
|
| 78 | + $type = ! empty( $atts[ 'recaptcha_type' ] ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type |
|
| 79 | + $theme = ! empty( $atts[ 'recaptcha_theme' ] ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme |
|
| 80 | + $size = ! empty( $atts[ 'recaptcha_size' ] ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size |
|
| 81 | + $data_cb = ! empty( $atts[ 'recaptcha_data_callback' ] ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size |
|
| 82 | + $expired_cb = ! empty( $atts[ 'recaptcha_expired_callback' ] ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size |
|
| 83 | 83 | |
| 84 | 84 | // Pass the shortcode parameters through a filter. |
| 85 | 85 | $recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array( |
@@ -89,28 +89,28 @@ discard block |
||
| 89 | 89 | 'size' => $size, |
| 90 | 90 | 'success_callback' => $data_cb, |
| 91 | 91 | 'expired_callback' => $expired_cb, |
| 92 | - ), $atts['form'] ); |
|
| 92 | + ), $atts[ 'form' ] ); |
|
| 93 | 93 | |
| 94 | 94 | // Enqueue Google recaptcha JS. |
| 95 | - wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ) , 'all' ); |
|
| 95 | + wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ), 'all' ); |
|
| 96 | 96 | wp_enqueue_script( 'google-recaptcha-js' ); |
| 97 | 97 | |
| 98 | - $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' ); |
|
| 99 | - $recaptcha_box = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params['theme'] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params['type'] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params['size'] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params['success_callback'] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params['expired_callback'] ) . '"></div>'; |
|
| 98 | + $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' ); |
|
| 99 | + $recaptcha_box = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params[ 'theme' ] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params[ 'type' ] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params[ 'size' ] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params[ 'success_callback' ] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params[ 'expired_callback' ] ) . '"></div>'; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | // Allow users to manually override version 3 and use 2 on some forms. |
| 103 | - if ( $atts['recaptcha'] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && $attrs['recaptcha_version'] === 3 ) || ( get_option( 'yikes-mc-recaptcha-version-three', false ) ) ) { |
|
| 103 | + if ( $atts[ 'recaptcha' ] != '0' && ( ! get_option( 'yikes-mc-recaptcha-version-three', false ) && $attrs[ 'recaptcha_version' ] === 3 ) || ( get_option( 'yikes-mc-recaptcha-version-three', false ) ) ) { |
|
| 104 | 104 | |
| 105 | 105 | // If either of the Private the Secret key is left blank, we should display an error back to the user. |
| 106 | - if ( get_option( 'yikes-mc-recaptcha-site-key-three' , '' ) == '' ) { |
|
| 107 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 106 | + if ( get_option( 'yikes-mc-recaptcha-site-key-three', '' ) == '' ) { |
|
| 107 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 108 | 108 | } |
| 109 | - if ( get_option( 'yikes-mc-recaptcha-secret-key-three' , '' ) == '' ) { |
|
| 110 | - return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 109 | + if ( get_option( 'yikes-mc-recaptcha-secret-key-three', '' ) == '' ) { |
|
| 110 | + return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA V3 secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings§ion=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - $v3_site_key = get_option( 'yikes-mc-recaptcha-site-key-three' , '' ); |
|
| 113 | + $v3_site_key = get_option( 'yikes-mc-recaptcha-site-key-three', '' ); |
|
| 114 | 114 | |
| 115 | 115 | wp_enqueue_script( |
| 116 | 116 | 'yikes-google-recaptcha-v3', |
@@ -149,39 +149,39 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // place our results into a separate variable for easy looping |
| 152 | - $additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false; |
|
| 152 | + $additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false; |
|
| 153 | 153 | |
| 154 | 154 | // store our options from the additional form settings array |
| 155 | - $form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : ''; |
|
| 156 | - $inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : ''; |
|
| 157 | - $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text'; |
|
| 158 | - $submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 159 | - $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : ''; |
|
| 160 | - $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : ''; |
|
| 155 | + $form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : ''; |
|
| 156 | + $inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : ''; |
|
| 157 | + $submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text'; |
|
| 158 | + $submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 159 | + $submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : ''; |
|
| 160 | + $submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : ''; |
|
| 161 | 161 | |
| 162 | 162 | // scheuldes |
| 163 | - $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false; |
|
| 164 | - $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';; |
|
| 165 | - $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : ''; |
|
| 166 | - $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : ''; |
|
| 167 | - $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : ''; |
|
| 163 | + $form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false; |
|
| 164 | + $form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ; |
|
| 165 | + $form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : ''; |
|
| 166 | + $form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : ''; |
|
| 167 | + $form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : ''; |
|
| 168 | 168 | |
| 169 | 169 | // register required |
| 170 | - $form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false; |
|
| 171 | - $form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : ''; |
|
| 170 | + $form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false; |
|
| 171 | + $form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : ''; |
|
| 172 | 172 | |
| 173 | 173 | // store number of fields |
| 174 | - $field_count = (int) count( $form_data['fields'] ); |
|
| 174 | + $field_count = (int) count( $form_data[ 'fields' ] ); |
|
| 175 | 175 | |
| 176 | 176 | // confirm we actually have fields, before looping |
| 177 | - if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
| 177 | + if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
| 178 | 178 | |
| 179 | 179 | // loop over each field, if it's set to hidden -- subtract it from the field count |
| 180 | 180 | // this throws off the layout for inline forms setup below |
| 181 | - foreach ( $form_data['fields'] as $form_field ) { |
|
| 181 | + foreach ( $form_data[ 'fields' ] as $form_field ) { |
|
| 182 | 182 | |
| 183 | - if ( isset( $form_field['hide'] ) && (string) $form_field['hide'] === '1' ) { |
|
| 184 | - $field_count --; |
|
| 183 | + if ( isset( $form_field[ 'hide' ] ) && (string) $form_field[ 'hide' ] === '1' ) { |
|
| 184 | + $field_count--; |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | } |
@@ -190,8 +190,8 @@ discard block |
||
| 190 | 190 | * If login is required, abort |
| 191 | 191 | * @since 6.0.3.8 |
| 192 | 192 | */ |
| 193 | - if( $form_login_required ) { |
|
| 194 | - if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
| 193 | + if ( $form_login_required ) { |
|
| 194 | + if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) { |
|
| 195 | 195 | ob_start(); |
| 196 | 196 | ?> |
| 197 | 197 | <div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required"> |
@@ -207,19 +207,19 @@ discard block |
||
| 207 | 207 | * Check if schedule is set for this form |
| 208 | 208 | * @since 6.0.3.8 |
| 209 | 209 | */ |
| 210 | - if( $form_schedule_state ) { |
|
| 210 | + if ( $form_schedule_state ) { |
|
| 211 | 211 | // store current date |
| 212 | 212 | $current_date = strtotime( current_time( 'm/d/Y g:iA' ) ); |
| 213 | 213 | |
| 214 | 214 | // the the current date is less than the form scheduled start date |
| 215 | - if( $current_date < $form_schedule_start ) { |
|
| 215 | + if ( $current_date < $form_schedule_start ) { |
|
| 216 | 216 | echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message, $form_id, $form_schedule_start ); |
| 217 | 217 | return; |
| 218 | 218 | // abort |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | // The current date is past or equal to the end date, aka form has now expired |
| 222 | - if( $current_date >= $form_schedule_end ) { |
|
| 222 | + if ( $current_date >= $form_schedule_end ) { |
|
| 223 | 223 | echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message, $form_id, $form_schedule_end ); |
| 224 | 224 | return; |
| 225 | 225 | // abort |
@@ -228,14 +228,14 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | // setup the submit button text |
| 230 | 230 | // shortcode parameter takes precedence over option |
| 231 | - $submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text; |
|
| 231 | + $submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text; |
|
| 232 | 232 | |
| 233 | 233 | /* |
| 234 | 234 | * Check for the constant to prevent styles from loading |
| 235 | 235 | * to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php |
| 236 | 236 | * @since 6.0.3.8 |
| 237 | 237 | */ |
| 238 | - if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
| 238 | + if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) { |
|
| 239 | 239 | // enqueue the form styles |
| 240 | 240 | wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css' ); |
| 241 | 241 | } |
@@ -243,19 +243,19 @@ discard block |
||
| 243 | 243 | /** |
| 244 | 244 | * Check for form inline parameter |
| 245 | 245 | */ |
| 246 | - $form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
| 246 | + $form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension |
|
| 247 | 247 | // recheck from our form options |
| 248 | 248 | if ( ! $form_inline ) { |
| 249 | - $form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form']; |
|
| 249 | + $form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ]; |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
| 253 | - if( is_user_logged_in() ) { |
|
| 254 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 253 | + if ( is_user_logged_in() ) { |
|
| 254 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 255 | 255 | $edit_form_link = '<span class="edit-link">'; |
| 256 | - $edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts['form'] ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 256 | + $edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts[ 'form' ] ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>'; |
|
| 257 | 257 | $edit_form_link .= '</span>'; |
| 258 | - $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) ); |
|
| 258 | + $edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) ); |
|
| 259 | 259 | } else { |
| 260 | 260 | $edit_form_link = ''; |
| 261 | 261 | } |
@@ -265,16 +265,16 @@ discard block |
||
| 265 | 265 | // or else Mailchimp throws errors at you |
| 266 | 266 | // extract our array keys |
| 267 | 267 | // @todo Remove array_keys() and in_array() usage here. |
| 268 | - if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) { |
|
| 269 | - $array_keys = array_keys( $form_data['fields'] ); |
|
| 268 | + if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) { |
|
| 269 | + $array_keys = array_keys( $form_data[ 'fields' ] ); |
|
| 270 | 270 | // check for EMAIL in that array |
| 271 | - if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) { |
|
| 272 | - return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>'; |
|
| 271 | + if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) { |
|
| 272 | + return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>'; |
|
| 273 | 273 | } |
| 274 | 274 | } else { |
| 275 | - $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 276 | - if( is_user_logged_in() ) { |
|
| 277 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 275 | + $error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; |
|
| 276 | + if ( is_user_logged_in() ) { |
|
| 277 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 278 | 278 | return $error . $edit_form_link; |
| 279 | 279 | } |
| 280 | 280 | } else { |
@@ -376,17 +376,17 @@ discard block |
||
| 376 | 376 | * Set a custom title using custom_title="lorem ipsum" parameter in the shortcode |
| 377 | 377 | * - This takes precedence over the title set |
| 378 | 378 | */ |
| 379 | - if ( $atts['title'] ) { |
|
| 380 | - if ( ! empty( $atts['custom_title'] ) ) { |
|
| 379 | + if ( $atts[ 'title' ] ) { |
|
| 380 | + if ( ! empty( $atts[ 'custom_title' ] ) ) { |
|
| 381 | 381 | /** |
| 382 | 382 | * Filter the title that is displayed through the shortcode. |
| 383 | 383 | * |
| 384 | 384 | * @param string $title The title to display. |
| 385 | 385 | * @param int $form_id The form ID. |
| 386 | 386 | */ |
| 387 | - $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ); |
|
| 387 | + $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ); |
|
| 388 | 388 | } else { |
| 389 | - $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id ); |
|
| 389 | + $title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id ); |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title ); |
@@ -396,17 +396,17 @@ discard block |
||
| 396 | 396 | * Allow users to specify a custom description for this form, no html support |
| 397 | 397 | * @since 6.0.3.8 |
| 398 | 398 | */ |
| 399 | - if ( $atts['description'] ) { |
|
| 400 | - if ( ! empty( $atts['custom_description'] ) ) { |
|
| 399 | + if ( $atts[ 'description' ] ) { |
|
| 400 | + if ( ! empty( $atts[ 'custom_description' ] ) ) { |
|
| 401 | 401 | /** |
| 402 | 402 | * Filter the description that is displayed through the shortcode. |
| 403 | 403 | * |
| 404 | 404 | * @param string $title The title to display. |
| 405 | 405 | * @param int $form_id The form ID. |
| 406 | 406 | */ |
| 407 | - $description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ); |
|
| 407 | + $description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ); |
|
| 408 | 408 | } else { |
| 409 | - $description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id ); |
|
| 409 | + $description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id ); |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description ); |
@@ -421,10 +421,10 @@ discard block |
||
| 421 | 421 | $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 422 | 422 | |
| 423 | 423 | // Check for AJAX |
| 424 | - if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) { |
|
| 424 | + if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) { |
|
| 425 | 425 | |
| 426 | 426 | // Enqueue our ajax script |
| 427 | - wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js" , array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
| 427 | + wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js", array( 'jquery' ), YIKES_MC_VERSION, false ); |
|
| 428 | 428 | wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array( |
| 429 | 429 | 'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ), |
| 430 | 430 | 'page_data' => $page_data, |
@@ -456,67 +456,67 @@ discard block |
||
| 456 | 456 | |
| 457 | 457 | // render the form! |
| 458 | 458 | ?> |
| 459 | - <form id="<?php echo sanitize_title( $form_data['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_data['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>"> |
|
| 459 | + <form id="<?php echo sanitize_title( $form_data[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>"> |
|
| 460 | 460 | |
| 461 | 461 | <?php |
| 462 | 462 | // Set a default constant for hidden fields |
| 463 | 463 | $hidden_label_count = 0; |
| 464 | 464 | |
| 465 | 465 | // Loop over our form fields |
| 466 | - foreach( $form_data['fields'] as $field ) { |
|
| 466 | + foreach ( $form_data[ 'fields' ] as $field ) { |
|
| 467 | 467 | // input array |
| 468 | 468 | $field_array = array(); |
| 469 | 469 | // label array |
| 470 | 470 | $label_array = array(); |
| 471 | 471 | // label classes array |
| 472 | 472 | $label_class_array = array(); |
| 473 | - if( $field['additional-classes'] != '' ) { |
|
| 473 | + if ( $field[ 'additional-classes' ] != '' ) { |
|
| 474 | 474 | // split custom classes at spaces |
| 475 | - $custom_classes = explode( ' ' , $field['additional-classes'] ); |
|
| 475 | + $custom_classes = explode( ' ', $field[ 'additional-classes' ] ); |
|
| 476 | 476 | // check our custom class array for field-left/field-right |
| 477 | 477 | // if it's set we need to assign it to our label and remove it from the field classes |
| 478 | 478 | // input half left |
| 479 | - if( in_array( 'field-left-half' , $custom_classes ) ) { |
|
| 479 | + if ( in_array( 'field-left-half', $custom_classes ) ) { |
|
| 480 | 480 | // $label_array['class'] = 'class="field-left-half"'; |
| 481 | - $label_class_array[] = 'field-left-half'; |
|
| 482 | - $key = array_search( 'field-left-half' , $custom_classes ); |
|
| 483 | - unset( $custom_classes[$key] ); |
|
| 481 | + $label_class_array[ ] = 'field-left-half'; |
|
| 482 | + $key = array_search( 'field-left-half', $custom_classes ); |
|
| 483 | + unset( $custom_classes[ $key ] ); |
|
| 484 | 484 | } // input half right |
| 485 | - if( in_array( 'field-right-half' , $custom_classes ) ) { |
|
| 485 | + if ( in_array( 'field-right-half', $custom_classes ) ) { |
|
| 486 | 486 | // $label_array['class'] = 'class="field-right-half"'; |
| 487 | - $label_class_array[] = 'field-right-half'; |
|
| 488 | - $key = array_search( 'field-right-half' , $custom_classes ); |
|
| 489 | - unset( $custom_classes[$key] ); |
|
| 487 | + $label_class_array[ ] = 'field-right-half'; |
|
| 488 | + $key = array_search( 'field-right-half', $custom_classes ); |
|
| 489 | + unset( $custom_classes[ $key ] ); |
|
| 490 | 490 | } // input thirds (1/3 width, floated left) |
| 491 | - if( in_array( 'field-third' , $custom_classes ) ) { |
|
| 491 | + if ( in_array( 'field-third', $custom_classes ) ) { |
|
| 492 | 492 | // $label_array['class'] = 'class="field-third"'; |
| 493 | - $label_class_array[] = 'field-third'; |
|
| 494 | - $key = array_search( 'field-third' , $custom_classes ); |
|
| 495 | - unset( $custom_classes[$key] ); |
|
| 493 | + $label_class_array[ ] = 'field-third'; |
|
| 494 | + $key = array_search( 'field-third', $custom_classes ); |
|
| 495 | + unset( $custom_classes[ $key ] ); |
|
| 496 | 496 | } // 2 column radio |
| 497 | - if( in_array( 'option-2-col' , $custom_classes ) ) { |
|
| 497 | + if ( in_array( 'option-2-col', $custom_classes ) ) { |
|
| 498 | 498 | // $label_array['class'] = 'class="option-2-col"'; |
| 499 | - $label_class_array[] = 'option-2-col'; |
|
| 500 | - $key = array_search( 'option-2-col' , $custom_classes ); |
|
| 501 | - unset( $custom_classes[$key] ); |
|
| 499 | + $label_class_array[ ] = 'option-2-col'; |
|
| 500 | + $key = array_search( 'option-2-col', $custom_classes ); |
|
| 501 | + unset( $custom_classes[ $key ] ); |
|
| 502 | 502 | } // 3 column radio |
| 503 | - if( in_array( 'option-3-col' , $custom_classes ) ) { |
|
| 503 | + if ( in_array( 'option-3-col', $custom_classes ) ) { |
|
| 504 | 504 | // $label_array['class'] = 'class="option-3-col"'; |
| 505 | - $label_class_array[] = 'option-3-col'; |
|
| 506 | - $key = array_search( 'option-3-col' , $custom_classes ); |
|
| 507 | - unset( $custom_classes[$key] ); |
|
| 505 | + $label_class_array[ ] = 'option-3-col'; |
|
| 506 | + $key = array_search( 'option-3-col', $custom_classes ); |
|
| 507 | + unset( $custom_classes[ $key ] ); |
|
| 508 | 508 | } // 4 column radio |
| 509 | - if( in_array( 'option-4-col' , $custom_classes ) ) { |
|
| 509 | + if ( in_array( 'option-4-col', $custom_classes ) ) { |
|
| 510 | 510 | // $label_array['class'] = 'class="option-4-col"'; |
| 511 | - $label_class_array[] = 'option-4-col'; |
|
| 512 | - $key = array_search( 'option-4-col' , $custom_classes ); |
|
| 513 | - unset( $custom_classes[$key] ); |
|
| 511 | + $label_class_array[ ] = 'option-4-col'; |
|
| 512 | + $key = array_search( 'option-4-col', $custom_classes ); |
|
| 513 | + unset( $custom_classes[ $key ] ); |
|
| 514 | 514 | } // inline radio & checkboxes etc |
| 515 | - if( in_array( 'option-inline' , $custom_classes ) ) { |
|
| 515 | + if ( in_array( 'option-inline', $custom_classes ) ) { |
|
| 516 | 516 | // $label_array['class'] = 'class="option-inline"'; |
| 517 | - $label_class_array[] = 'option-inline'; |
|
| 518 | - $key = array_search( 'option-inline' , $custom_classes ); |
|
| 519 | - unset( $custom_classes[$key] ); |
|
| 517 | + $label_class_array[ ] = 'option-inline'; |
|
| 518 | + $key = array_search( 'option-inline', $custom_classes ); |
|
| 519 | + unset( $custom_classes[ $key ] ); |
|
| 520 | 520 | } |
| 521 | 521 | } else { |
| 522 | 522 | $custom_classes = array(); |
@@ -524,19 +524,19 @@ discard block |
||
| 524 | 524 | |
| 525 | 525 | // if the form is set to inline, add the inline class to our labels |
| 526 | 526 | // since @6.0.3.8 |
| 527 | - if( $form_inline ) { |
|
| 528 | - $label_class_array[] = 'label-inline'; |
|
| 527 | + if ( $form_inline ) { |
|
| 528 | + $label_class_array[ ] = 'label-inline'; |
|
| 529 | 529 | } |
| 530 | 530 | |
| 531 | - if( isset( $field['hide-label'] ) ) { |
|
| 532 | - if( absint( $field['hide-label'] ) === 1 ) { |
|
| 531 | + if ( isset( $field[ 'hide-label' ] ) ) { |
|
| 532 | + if ( absint( $field[ 'hide-label' ] ) === 1 ) { |
|
| 533 | 533 | $hidden_label_count++; |
| 534 | - $custom_classes[] = 'field-no-label'; |
|
| 534 | + $custom_classes[ ] = 'field-no-label'; |
|
| 535 | 535 | } |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | 538 | /* Store tag variable based on field type */ |
| 539 | - if( isset( $field['merge'] ) ) { |
|
| 539 | + if ( isset( $field[ 'merge' ] ) ) { |
|
| 540 | 540 | $group = ''; |
| 541 | 541 | $tag = 'merge'; |
| 542 | 542 | } else { |
@@ -546,28 +546,28 @@ discard block |
||
| 546 | 546 | |
| 547 | 547 | // build up our array |
| 548 | 548 | $field_id_string = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ]; |
| 549 | - $field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
| 550 | - $field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
| 551 | - $field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : ''; |
|
| 552 | - $field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' . esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" '; |
|
| 549 | + $field_array[ 'id' ] = 'id="' . esc_attr( $field_id_string ) . '" '; |
|
| 550 | + $field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" '; |
|
| 551 | + $field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : ''; |
|
| 552 | + $field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" '; |
|
| 553 | 553 | |
| 554 | 554 | // email must always be required and visible |
| 555 | - if( $field['type'] == 'email' ) { |
|
| 556 | - $field_array['required'] = 'required="required"'; |
|
| 557 | - $label_array['visible'] = ''; |
|
| 558 | - $label_class_array[] = $field['merge'] . '-label'; |
|
| 559 | - $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
| 555 | + if ( $field[ 'type' ] == 'email' ) { |
|
| 556 | + $field_array[ 'required' ] = 'required="required"'; |
|
| 557 | + $label_array[ 'visible' ] = ''; |
|
| 558 | + $label_class_array[ ] = $field[ 'merge' ] . '-label'; |
|
| 559 | + $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
| 560 | 560 | } else { |
| 561 | - $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : ''; |
|
| 562 | - $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : ''; |
|
| 563 | - $label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label'; |
|
| 564 | - if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required'; |
|
| 561 | + $field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : ''; |
|
| 562 | + $label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : ''; |
|
| 563 | + $label_class_array[ ] = ( $tag === 'merge' ) ? $field[ 'merge' ] . '-label' : $field[ 'group_id' ] . '-label'; |
|
| 564 | + if ( isset( $field[ 'require' ] ) ) $label_class_array[ ] = 'yikes-mailchimp-field-required'; |
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | // if both hide label and hide field are checked, we gotta hide the field! |
| 568 | - if( isset( $field['hide' ] ) && $field['hide'] == 1 ) { |
|
| 569 | - if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) { |
|
| 570 | - $field_array['visible'] = 'style="display:none;"'; |
|
| 568 | + if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) { |
|
| 569 | + if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) { |
|
| 570 | + $field_array[ 'visible' ] = 'style="display:none;"'; |
|
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | |
@@ -575,20 +575,20 @@ discard block |
||
| 575 | 575 | $label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array; |
| 576 | 576 | |
| 577 | 577 | // Turn the clases into a string |
| 578 | - $label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
| 578 | + $label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . ' "'; |
|
| 579 | 579 | |
| 580 | 580 | // Filter the field array data |
| 581 | 581 | $field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id ); |
| 582 | 582 | |
| 583 | 583 | /* Loop Over Standard Fields (aka merge variables) */ |
| 584 | - if( isset( $field['merge'] ) ) { |
|
| 584 | + if ( isset( $field[ 'merge' ] ) ) { |
|
| 585 | 585 | |
| 586 | 586 | // Handle the Description logic in one spot, here: |
| 587 | - $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
| 588 | - $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
| 587 | + $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
| 588 | + $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
| 589 | 589 | if ( $show_description === true ) { |
| 590 | - $description = '<p class="form-field-description" id="form-field-description-' . $field['merge'] . '">'; |
|
| 591 | - $description .= apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 590 | + $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'merge' ] . '">'; |
|
| 591 | + $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 592 | 592 | $description .= '</p>'; |
| 593 | 593 | |
| 594 | 594 | /** |
@@ -600,11 +600,11 @@ discard block |
||
| 600 | 600 | * @param string | $field['description'] | The field's description text |
| 601 | 601 | * @param int | $form_id |
| 602 | 602 | */ |
| 603 | - $description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 603 | + $description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | // loop over our fields by Type |
| 607 | - switch ( $field['type'] ) { |
|
| 607 | + switch ( $field[ 'type' ] ) { |
|
| 608 | 608 | |
| 609 | 609 | default: |
| 610 | 610 | case 'email': |
@@ -612,24 +612,24 @@ discard block |
||
| 612 | 612 | case 'number': |
| 613 | 613 | |
| 614 | 614 | // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type) |
| 615 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 615 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 616 | 616 | $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value ); |
| 617 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 617 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 618 | 618 | |
| 619 | 619 | ?> |
| 620 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 620 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 621 | 621 | |
| 622 | 622 | <!-- dictate label visibility --> |
| 623 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 624 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 625 | - <?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?> |
|
| 623 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 624 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 625 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?> |
|
| 626 | 626 | </span> |
| 627 | 627 | <?php } ?> |
| 628 | 628 | |
| 629 | 629 | <!-- Description Above --> |
| 630 | 630 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 631 | 631 | |
| 632 | - <input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 632 | + <input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 633 | 633 | |
| 634 | 634 | <!-- Description Below --> |
| 635 | 635 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -641,23 +641,23 @@ discard block |
||
| 641 | 641 | |
| 642 | 642 | case 'url': |
| 643 | 643 | case 'imageurl': |
| 644 | - $default_value = ( isset( $field['default'] ) ) ? $field['default'] : ''; |
|
| 645 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 644 | + $default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : ''; |
|
| 645 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 646 | 646 | ?> |
| 647 | 647 | |
| 648 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 648 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 649 | 649 | |
| 650 | 650 | <!-- dictate label visibility --> |
| 651 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 652 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 653 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 651 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 652 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 653 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 654 | 654 | </span> |
| 655 | 655 | <?php } ?> |
| 656 | 656 | |
| 657 | 657 | <!-- Description Above --> |
| 658 | 658 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 659 | 659 | |
| 660 | - <input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" > |
|
| 660 | + <input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" > |
|
| 661 | 661 | |
| 662 | 662 | <!-- Description Below --> |
| 663 | 663 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -668,24 +668,24 @@ discard block |
||
| 668 | 668 | break; |
| 669 | 669 | |
| 670 | 670 | case 'phone': |
| 671 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 672 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 673 | - $phone_format = $field['phone_format']; |
|
| 671 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 672 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 673 | + $phone_format = $field[ 'phone_format' ]; |
|
| 674 | 674 | ?> |
| 675 | 675 | |
| 676 | - <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 676 | + <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 677 | 677 | |
| 678 | 678 | <!-- dictate label visibility --> |
| 679 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 680 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 681 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 679 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 680 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 681 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 682 | 682 | </span> |
| 683 | 683 | <?php } ?> |
| 684 | 684 | |
| 685 | 685 | <!-- Description Above --> |
| 686 | 686 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 687 | 687 | |
| 688 | - <input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 688 | + <input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 689 | 689 | |
| 690 | 690 | <!-- Description Below --> |
| 691 | 691 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -695,23 +695,23 @@ discard block |
||
| 695 | 695 | break; |
| 696 | 696 | |
| 697 | 697 | case 'zip': |
| 698 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 699 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 698 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 699 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 700 | 700 | |
| 701 | 701 | ?> |
| 702 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 702 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 703 | 703 | |
| 704 | 704 | <!-- dictate label visibility --> |
| 705 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 706 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 707 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 705 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 706 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 707 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 708 | 708 | </span> |
| 709 | 709 | <?php } ?> |
| 710 | 710 | |
| 711 | 711 | <!-- Description Above --> |
| 712 | 712 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 713 | 713 | |
| 714 | - <input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 714 | + <input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>"> |
|
| 715 | 715 | |
| 716 | 716 | <!-- Description Below --> |
| 717 | 717 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -724,7 +724,7 @@ discard block |
||
| 724 | 724 | case 'address': |
| 725 | 725 | |
| 726 | 726 | // required fields |
| 727 | - $required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' ); |
|
| 727 | + $required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' ); |
|
| 728 | 728 | |
| 729 | 729 | /** |
| 730 | 730 | * Filter to control the default country (the option pre-selected in the country dropdown). |
@@ -740,55 +740,55 @@ discard block |
||
| 740 | 740 | if ( $show_description === true && $description_above === true ) { echo $description; } |
| 741 | 741 | |
| 742 | 742 | // Placeholder logic |
| 743 | - if ( ! empty( $field_array['placeholder'] ) ) { |
|
| 743 | + if ( ! empty( $field_array[ 'placeholder' ] ) ) { |
|
| 744 | 744 | |
| 745 | 745 | $use_address_placeholder = true; |
| 746 | 746 | |
| 747 | 747 | // Don't use the address field's array placeholder - use the custom placeholder |
| 748 | - unset( $field_array['placeholder'] ); |
|
| 748 | + unset( $field_array[ 'placeholder' ] ); |
|
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | // store number for looping |
| 752 | 752 | $x = 1; |
| 753 | - foreach( $required_fields as $type => $label ) { |
|
| 753 | + foreach ( $required_fields as $type => $label ) { |
|
| 754 | 754 | |
| 755 | 755 | // set the field names for the address fields |
| 756 | - $field_array['name'] = 'name="' . $field[$tag] . '[' . $type . ']' . '"'; |
|
| 756 | + $field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"'; |
|
| 757 | 757 | |
| 758 | 758 | // Set the placeholder value if we need to |
| 759 | 759 | $placeholder = isset( $use_address_placeholder ) ? apply_filters( 'yikes-mailchimp-address-' . $type . '-placeholder', ucwords( $label ) ) : ''; |
| 760 | 760 | |
| 761 | 761 | // reset the label classes for left-half/right-half for addresses |
| 762 | - if( isset( $label_array['class'] ) ) { |
|
| 762 | + if ( isset( $label_array[ 'class' ] ) ) { |
|
| 763 | 763 | if ( $x % 2 == 0 ) { |
| 764 | - $label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] ); |
|
| 764 | + $label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] ); |
|
| 765 | 765 | } else { |
| 766 | - $label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] ); |
|
| 766 | + $label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] ); |
|
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | |
| 770 | 770 | // Never force addr2 to be required |
| 771 | 771 | if ( $type === 'addr2' ) { |
| 772 | - $field_array['required'] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
| 772 | + $field_array[ 'required' ] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id ); |
|
| 773 | 773 | } |
| 774 | 774 | |
| 775 | - switch( $type ) { |
|
| 775 | + switch ( $type ) { |
|
| 776 | 776 | |
| 777 | 777 | default: |
| 778 | 778 | case 'addr1': |
| 779 | 779 | case 'addr2': |
| 780 | 780 | case 'city': |
| 781 | 781 | ?> |
| 782 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 782 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
| 783 | 783 | |
| 784 | 784 | <!-- dictate label visibility --> |
| 785 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 786 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 787 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 785 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 786 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 787 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 788 | 788 | </span> |
| 789 | 789 | <?php } ?> |
| 790 | 790 | |
| 791 | - <input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if( isset( $_POST[$field['merge']][$type] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']][$type] ); } ?>"> |
|
| 791 | + <input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ][ $type ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ][ $type ] ); } ?>"> |
|
| 792 | 792 | |
| 793 | 793 | </label> |
| 794 | 794 | <?php |
@@ -797,16 +797,16 @@ discard block |
||
| 797 | 797 | |
| 798 | 798 | case 'state': |
| 799 | 799 | ?> |
| 800 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"> |
|
| 800 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"> |
|
| 801 | 801 | |
| 802 | 802 | <!-- dictate label visibility --> |
| 803 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 804 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 805 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 803 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 804 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 805 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 806 | 806 | </span> |
| 807 | 807 | <?php } ?> |
| 808 | 808 | |
| 809 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 809 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 810 | 810 | <?php |
| 811 | 811 | $state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); |
| 812 | 812 | /** |
@@ -832,21 +832,21 @@ discard block |
||
| 832 | 832 | case 'zip': |
| 833 | 833 | |
| 834 | 834 | ?> |
| 835 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>> |
|
| 835 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>> |
|
| 836 | 836 | |
| 837 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 838 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 839 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 837 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 838 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 839 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 840 | 840 | </span> |
| 841 | 841 | <?php } ?> |
| 842 | 842 | |
| 843 | 843 | <?php |
| 844 | 844 | // If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently... |
| 845 | - if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { |
|
| 846 | - if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) { |
|
| 847 | - $zip_value = $_POST[$field['merge']]['zip']; |
|
| 845 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { |
|
| 846 | + if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) { |
|
| 847 | + $zip_value = $_POST[ $field[ 'merge' ] ][ 'zip' ]; |
|
| 848 | 848 | } else { |
| 849 | - $zip_value = $_POST[$field['merge']]; |
|
| 849 | + $zip_value = $_POST[ $field[ 'merge' ] ]; |
|
| 850 | 850 | } |
| 851 | 851 | } else { |
| 852 | 852 | |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | } |
| 867 | 867 | ?> |
| 868 | 868 | |
| 869 | - <input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>"> |
|
| 869 | + <input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>"> |
|
| 870 | 870 | |
| 871 | 871 | </label> |
| 872 | 872 | <?php |
@@ -876,16 +876,16 @@ discard block |
||
| 876 | 876 | case 'country': |
| 877 | 877 | ?> |
| 878 | 878 | |
| 879 | - <label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 879 | + <label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>> |
|
| 880 | 880 | |
| 881 | 881 | <!-- dictate label visibility --> |
| 882 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 883 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 884 | - <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?> |
|
| 882 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 883 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 884 | + <?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?> |
|
| 885 | 885 | </span> |
| 886 | 886 | <?php } ?> |
| 887 | 887 | |
| 888 | - <select <?php echo implode( ' ' , $field_array ); ?> data-country="true"> |
|
| 888 | + <select <?php echo implode( ' ', $field_array ); ?> data-country="true"> |
|
| 889 | 889 | <?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?> |
| 890 | 890 | </select> |
| 891 | 891 | </label> |
@@ -931,40 +931,40 @@ discard block |
||
| 931 | 931 | wp_register_script( 'yikes-datepicker-scripts', YIKES_MC_URL . "public/js/yikes-datepicker-scripts{$min}.js", array( 'jquery-ui-datepicker' ), YIKES_MC_VERSION, false ); |
| 932 | 932 | wp_localize_script( 'yikes-datepicker-scripts', 'datepicker_settings', $datepicker_options ); |
| 933 | 933 | wp_enqueue_script( 'yikes-datepicker-scripts' ); |
| 934 | - wp_enqueue_style( 'jquery-datepicker-styles' , YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
| 935 | - wp_enqueue_style( 'yikes-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
| 934 | + wp_enqueue_style( 'jquery-datepicker-styles', YIKES_MC_URL . 'public/css/jquery-ui.min.css' ); |
|
| 935 | + wp_enqueue_style( 'yikes-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' ); |
|
| 936 | 936 | |
| 937 | - switch ( $field['type'] ) { |
|
| 937 | + switch ( $field[ 'type' ] ) { |
|
| 938 | 938 | default: |
| 939 | 939 | case 'date': |
| 940 | - $date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yyyy'; |
|
| 940 | + $date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yyyy'; |
|
| 941 | 941 | break; |
| 942 | 942 | |
| 943 | 943 | case 'birthday': |
| 944 | - $date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd'; |
|
| 944 | + $date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd'; |
|
| 945 | 945 | break; |
| 946 | 946 | } |
| 947 | 947 | |
| 948 | - $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' ); |
|
| 949 | - $default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id ); |
|
| 948 | + $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' ); |
|
| 949 | + $default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id ); |
|
| 950 | 950 | |
| 951 | 951 | // store empty number for looping |
| 952 | 952 | $x = 0; |
| 953 | 953 | |
| 954 | 954 | ?> |
| 955 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 955 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 956 | 956 | |
| 957 | 957 | <!-- dictate label visibility --> |
| 958 | - <?php if( !isset( $field['hide-label'] ) ) { ?> |
|
| 959 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 960 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 958 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 959 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 960 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 961 | 961 | </span> |
| 962 | 962 | <?php } ?> |
| 963 | 963 | |
| 964 | 964 | <!-- Description Above --> |
| 965 | 965 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 966 | 966 | |
| 967 | - <input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>"> |
|
| 967 | + <input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>"> |
|
| 968 | 968 | |
| 969 | 969 | <!-- Description Below --> |
| 970 | 970 | <?php if ( $show_description === true && $description_above === false ) { echo $description; } ?> |
@@ -975,26 +975,26 @@ discard block |
||
| 975 | 975 | break; |
| 976 | 976 | |
| 977 | 977 | case 'dropdown': |
| 978 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 979 | - $default_choice = is_array( $field['default_choice'] ) ? $field['default_choice'] : array( $field['default_choice'] ); |
|
| 978 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 979 | + $default_choice = is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : array( $field[ 'default_choice' ] ); |
|
| 980 | 980 | |
| 981 | 981 | // store empty number for looping |
| 982 | 982 | $x = 0; |
| 983 | 983 | ?> |
| 984 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 984 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 985 | 985 | <!-- dictate label visibility --> |
| 986 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 987 | - <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>"> |
|
| 988 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 986 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 987 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"> |
|
| 988 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 989 | 989 | </span> |
| 990 | 990 | <?php } |
| 991 | 991 | |
| 992 | 992 | // decode for looping |
| 993 | - $choices = json_decode( $field['choices'], true ); |
|
| 993 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 994 | 994 | |
| 995 | 995 | // If the form was submitted, but failed, let's default to the chosen option |
| 996 | - if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
| 997 | - $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
| 996 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
| 997 | + $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
| 998 | 998 | } |
| 999 | 999 | |
| 1000 | 1000 | ?> |
@@ -1002,11 +1002,11 @@ discard block |
||
| 1002 | 1002 | <!-- Description Above --> |
| 1003 | 1003 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 1004 | 1004 | |
| 1005 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 1005 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 1006 | 1006 | <?php |
| 1007 | 1007 | $no_default_name = apply_filters( 'yikes-mailchimp-dropdown-field-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); |
| 1008 | 1008 | echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
| 1009 | - foreach( $choices as $choice ) { ?> |
|
| 1009 | + foreach ( $choices as $choice ) { ?> |
|
| 1010 | 1010 | <option |
| 1011 | 1011 | value="<?php echo esc_attr( $choice ); ?>" |
| 1012 | 1012 | <?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'selected="selected"'; } ?>> |
@@ -1029,17 +1029,17 @@ discard block |
||
| 1029 | 1029 | case 'radio': |
| 1030 | 1030 | case 'checkbox': |
| 1031 | 1031 | // remove the ID (as to not assign the same ID to every radio button) |
| 1032 | - unset( $field_array['id'] ); |
|
| 1033 | - $choices = json_decode( $field['choices'], true ); |
|
| 1032 | + unset( $field_array[ 'id' ] ); |
|
| 1033 | + $choices = json_decode( $field[ 'choices' ], true ); |
|
| 1034 | 1034 | |
| 1035 | 1035 | // assign a default choice |
| 1036 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 1037 | - $default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? $field['default_choice'] : $choices[0]; |
|
| 1036 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 1037 | + $default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? $field[ 'default_choice' ] : $choices[ 0 ]; |
|
| 1038 | 1038 | $default_choice = ( is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
| 1039 | 1039 | |
| 1040 | 1040 | // If the form was submitted, but failed, let's default to the chosen option |
| 1041 | - if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) { |
|
| 1042 | - $default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] ); |
|
| 1041 | + if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) { |
|
| 1042 | + $default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] ); |
|
| 1043 | 1043 | } |
| 1044 | 1044 | |
| 1045 | 1045 | $count = count( $choices ); |
@@ -1047,29 +1047,29 @@ discard block |
||
| 1047 | 1047 | $x = 0; |
| 1048 | 1048 | |
| 1049 | 1049 | ?> |
| 1050 | - <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1050 | + <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1051 | 1051 | |
| 1052 | 1052 | <!-- dictate label visibility --> |
| 1053 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1054 | - <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label"> |
|
| 1055 | - <?php echo esc_attr( apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label', stripslashes( $field['label'] ) ) ); ?> |
|
| 1053 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1054 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1055 | + <?php echo esc_attr( apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1056 | 1056 | </span> |
| 1057 | 1057 | <?php } |
| 1058 | 1058 | |
| 1059 | 1059 | // <!-- Description Above --> |
| 1060 | 1060 | if ( $show_description === true && $description_above === true ) { echo $description; } |
| 1061 | 1061 | |
| 1062 | - foreach( $choices as $choice ) { |
|
| 1062 | + foreach ( $choices as $choice ) { |
|
| 1063 | 1063 | ?> |
| 1064 | - <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 } ?>"> |
|
| 1064 | + <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 } ?>"> |
|
| 1065 | 1065 | <input |
| 1066 | - type="<?php echo esc_attr( $field['type'] ); ?>" |
|
| 1067 | - name="<?php echo esc_attr( $field['merge'] ); ?>" |
|
| 1068 | - id="<?php echo esc_attr( $field['merge'] . '-' . $i ); ?>" |
|
| 1066 | + type="<?php echo esc_attr( $field[ 'type' ] ); ?>" |
|
| 1067 | + name="<?php echo esc_attr( $field[ 'merge' ] ); ?>" |
|
| 1068 | + id="<?php echo esc_attr( $field[ 'merge' ] . '-' . $i ); ?>" |
|
| 1069 | 1069 | <?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'checked="checked"'; } ?> |
| 1070 | - <?php echo $field_array['required']; ?> |
|
| 1070 | + <?php echo $field_array[ 'required' ]; ?> |
|
| 1071 | 1071 | value="<?php echo esc_attr( $choice ); ?>"> |
| 1072 | - <span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
| 1072 | + <span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span> |
|
| 1073 | 1073 | </label> |
| 1074 | 1074 | <?php |
| 1075 | 1075 | $i++; |
@@ -1090,11 +1090,11 @@ discard block |
||
| 1090 | 1090 | /**** Interest Groups ****/ |
| 1091 | 1091 | |
| 1092 | 1092 | // Handle the Description logic in one spot, here: |
| 1093 | - $show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false; |
|
| 1094 | - $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false; |
|
| 1093 | + $show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false; |
|
| 1094 | + $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false; |
|
| 1095 | 1095 | if ( $show_description === true ) { |
| 1096 | - $description = '<p class="form-field-description" id="form-field-description-' . $field['group_id'] . '">'; |
|
| 1097 | - $description .= apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 1096 | + $description = '<p class="form-field-description" id="form-field-description-' . $field[ 'group_id' ] . '">'; |
|
| 1097 | + $description .= apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 1098 | 1098 | $description .= '</p>'; |
| 1099 | 1099 | |
| 1100 | 1100 | /** |
@@ -1106,27 +1106,27 @@ discard block |
||
| 1106 | 1106 | * @param string | $field['description'] | The field's description text |
| 1107 | 1107 | * @param int | $form_id |
| 1108 | 1108 | */ |
| 1109 | - $description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id ); |
|
| 1109 | + $description = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); |
|
| 1110 | 1110 | } |
| 1111 | 1111 | |
| 1112 | 1112 | // Get our groups |
| 1113 | - $groups = isset( $field['groups'] ) && ! empty( $field['groups'] ) ? json_decode( $field['groups'], true ) : array(); |
|
| 1113 | + $groups = isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ? json_decode( $field[ 'groups' ], true ) : array(); |
|
| 1114 | 1114 | |
| 1115 | 1115 | // Get the default choice(s) from the field settings and turn them into an array if not already |
| 1116 | - $default_choice = isset( $field['default_choice'] ) ? $field['default_choice'] : ''; |
|
| 1116 | + $default_choice = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : ''; |
|
| 1117 | 1117 | $default_choice = is_array( $default_choice ) ? $default_choice : array( $default_choice ); |
| 1118 | - $default_choice = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-default', $default_choice, $groups, $field, $form_id ); |
|
| 1118 | + $default_choice = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-default', $default_choice, $groups, $field, $form_id ); |
|
| 1119 | 1119 | |
| 1120 | 1120 | $count = count( $groups ); |
| 1121 | 1121 | |
| 1122 | - if( $field['type'] === 'checkboxes' ) { |
|
| 1122 | + if ( $field[ 'type' ] === 'checkboxes' ) { |
|
| 1123 | 1123 | $type = 'checkbox'; |
| 1124 | - } else if( $field['type'] === 'radio' ) { |
|
| 1124 | + } else if ( $field[ 'type' ] === 'radio' ) { |
|
| 1125 | 1125 | $type = 'radio'; |
| 1126 | 1126 | } |
| 1127 | 1127 | |
| 1128 | 1128 | // loop over the interest group field types |
| 1129 | - switch ( $field['type'] ) { |
|
| 1129 | + switch ( $field[ 'type' ] ) { |
|
| 1130 | 1130 | |
| 1131 | 1131 | case 'checkboxes': |
| 1132 | 1132 | case 'radio': |
@@ -1134,11 +1134,11 @@ discard block |
||
| 1134 | 1134 | $x = 1; // used to find the last item of our array |
| 1135 | 1135 | |
| 1136 | 1136 | ?> |
| 1137 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1138 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1137 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1138 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1139 | 1139 | <!-- dictate label visibility --> |
| 1140 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1141 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1140 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label"> |
|
| 1141 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1142 | 1142 | </span> |
| 1143 | 1143 | <?php |
| 1144 | 1144 | } |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | |
| 1149 | 1149 | // Display Submission Errors |
| 1150 | 1150 | if ( ! empty( $missing_required_checkbox_interest_groups ) ) { |
| 1151 | - if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) { |
|
| 1151 | + if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) { |
|
| 1152 | 1152 | ?> |
| 1153 | 1153 | <p class="yikes-mailchimp-required-interest-group-error"> |
| 1154 | 1154 | <?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?> |
@@ -1160,20 +1160,20 @@ discard block |
||
| 1160 | 1160 | foreach ( $groups as $group_id => $name ) { |
| 1161 | 1161 | |
| 1162 | 1162 | // If the form was submitted and failed, set the submitted/chosen values as the default |
| 1163 | - if ( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
| 1163 | + if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
| 1164 | 1164 | |
| 1165 | 1165 | // Format default choice as array |
| 1166 | - $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
| 1166 | + $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
| 1167 | 1167 | } |
| 1168 | 1168 | |
| 1169 | 1169 | ?> |
| 1170 | - <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 } ?>"> |
|
| 1170 | + <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 } ?>"> |
|
| 1171 | 1171 | <input |
| 1172 | - <?php if( isset( $field['require'] ) && $field['require'] == 1 ) { if ( $field['type'] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
| 1172 | + <?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { if ( $field[ 'type' ] !== 'checkboxes' ) { ?> required="required" <?php } ?> |
|
| 1173 | 1173 | class="yikes-interest-group-required" <?php } ?> |
| 1174 | 1174 | type="<?php echo esc_attr( $type ); ?>" |
| 1175 | - name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
| 1176 | - id="<?php echo esc_attr( $field['group_id'] . '-' . $i ); ?>" |
|
| 1175 | + name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
| 1176 | + id="<?php echo esc_attr( $field[ 'group_id' ] . '-' . $i ); ?>" |
|
| 1177 | 1177 | <?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
| 1178 | 1178 | value="<?php echo esc_attr( $group_id ); ?>"> |
| 1179 | 1179 | <?php echo esc_attr( $name ); ?> |
@@ -1195,32 +1195,32 @@ discard block |
||
| 1195 | 1195 | |
| 1196 | 1196 | ?> |
| 1197 | 1197 | |
| 1198 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1198 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1199 | 1199 | <!-- dictate label visibility --> |
| 1200 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1201 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>"> |
|
| 1202 | - <?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1200 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1201 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>"> |
|
| 1202 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1203 | 1203 | </span> |
| 1204 | 1204 | <?php } ?> |
| 1205 | 1205 | |
| 1206 | 1206 | <!-- Description Above --> |
| 1207 | 1207 | <?php if ( $show_description === true && $description_above === true ) { echo $description; } ?> |
| 1208 | 1208 | |
| 1209 | - <select <?php echo implode( ' ' , $field_array ); ?>> |
|
| 1209 | + <select <?php echo implode( ' ', $field_array ); ?>> |
|
| 1210 | 1210 | |
| 1211 | 1211 | <?php |
| 1212 | - $no_default = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default'; |
|
| 1212 | + $no_default = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default'; |
|
| 1213 | 1213 | $no_default_name = apply_filters( 'yikes-mailchimp-dropdown-ig-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); |
| 1214 | 1214 | echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : ''; |
| 1215 | 1215 | |
| 1216 | 1216 | $i = 0; |
| 1217 | - foreach( $groups as $group_id => $name ) { |
|
| 1217 | + foreach ( $groups as $group_id => $name ) { |
|
| 1218 | 1218 | |
| 1219 | 1219 | // If the form was submitted and failed, set the submitted/chosen values as the default |
| 1220 | - if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) { |
|
| 1220 | + if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) { |
|
| 1221 | 1221 | |
| 1222 | 1222 | // Format default choice as array |
| 1223 | - $default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] ); |
|
| 1223 | + $default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] ); |
|
| 1224 | 1224 | } |
| 1225 | 1225 | ?> |
| 1226 | 1226 | <option |
@@ -1248,12 +1248,12 @@ discard block |
||
| 1248 | 1248 | |
| 1249 | 1249 | ?> |
| 1250 | 1250 | |
| 1251 | - <label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>> |
|
| 1251 | + <label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>> |
|
| 1252 | 1252 | |
| 1253 | 1253 | <!-- dictate label visibility --> |
| 1254 | - <?php if( ! isset( $field['hide-label'] ) ) { ?> |
|
| 1255 | - <span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
| 1256 | - <?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?> |
|
| 1254 | + <?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?> |
|
| 1255 | + <span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;"> |
|
| 1256 | + <?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?> |
|
| 1257 | 1257 | </span> |
| 1258 | 1258 | <?php } |
| 1259 | 1259 | |
@@ -1263,17 +1263,17 @@ discard block |
||
| 1263 | 1263 | // Turn $default_choice into an array if it isn't already |
| 1264 | 1264 | $default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice ); |
| 1265 | 1265 | |
| 1266 | - foreach( $groups as $group_id => $name ) { |
|
| 1266 | + foreach ( $groups as $group_id => $name ) { |
|
| 1267 | 1267 | ?> |
| 1268 | - <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;"> |
|
| 1268 | + <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;"> |
|
| 1269 | 1269 | <input |
| 1270 | 1270 | type="checkbox" |
| 1271 | - name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" |
|
| 1272 | - id="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" |
|
| 1271 | + name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" |
|
| 1272 | + id="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" |
|
| 1273 | 1273 | value="<?php echo esc_attr( $group_id ) ?>" |
| 1274 | 1274 | <?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> |
| 1275 | 1275 | > |
| 1276 | - <?php echo esc_attr( stripslashes( str_replace( '' , '\'', $name ) ) ); ?> |
|
| 1276 | + <?php echo esc_attr( stripslashes( str_replace( '', '\'', $name ) ) ); ?> |
|
| 1277 | 1277 | </label> |
| 1278 | 1278 | <?php |
| 1279 | 1279 | $i++; |
@@ -1298,14 +1298,14 @@ discard block |
||
| 1298 | 1298 | echo $recaptcha_box; |
| 1299 | 1299 | } |
| 1300 | 1300 | |
| 1301 | - $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
| 1301 | + $admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ? ' admin-logged-in' : ''; |
|
| 1302 | 1302 | ?> |
| 1303 | 1303 | |
| 1304 | 1304 | <!-- Honeypot Trap --> |
| 1305 | 1305 | <input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot-<?php echo esc_attr( $form_id ); ?>" value=""> |
| 1306 | 1306 | |
| 1307 | 1307 | <!-- List ID --> |
| 1308 | - <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'] ); ?>"> |
|
| 1308 | + <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' ] ); ?>"> |
|
| 1309 | 1309 | |
| 1310 | 1310 | <!-- The form that is being submitted! Used to display error/success messages above the correct form --> |
| 1311 | 1311 | <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 ); ?>"> |
@@ -1319,15 +1319,15 @@ discard block |
||
| 1319 | 1319 | // If the number of fields, is equal to the hidden label count, add our class |
| 1320 | 1320 | // eg: All field labels are set to hidden. |
| 1321 | 1321 | if ( absint( $field_count ) === absint( $hidden_label_count ) ) { |
| 1322 | - $submit_button_label_classes[] = 'labels-hidden'; |
|
| 1322 | + $submit_button_label_classes[ ] = 'labels-hidden'; |
|
| 1323 | 1323 | } |
| 1324 | 1324 | echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '"> </span>'; |
| 1325 | 1325 | } |
| 1326 | 1326 | // Display the image or text based button. |
| 1327 | 1327 | if ( $submit_button_type === 'text' ) { |
| 1328 | - 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'] ); |
|
| 1328 | + 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' ] ); |
|
| 1329 | 1329 | } else { |
| 1330 | - 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'] ); |
|
| 1330 | + 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' ] ); |
|
| 1331 | 1331 | } |
| 1332 | 1332 | if ( $form_inline && ! $inline_form_override ) { |
| 1333 | 1333 | echo '</label>'; |
@@ -1342,8 +1342,8 @@ discard block |
||
| 1342 | 1342 | |
| 1343 | 1343 | <?php |
| 1344 | 1344 | /* If the current user is logged in, and an admin...lets display our 'Edit Form' link */ |
| 1345 | - if( is_user_logged_in() ) { |
|
| 1346 | - if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) { |
|
| 1345 | + if ( is_user_logged_in() ) { |
|
| 1346 | + if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) { |
|
| 1347 | 1347 | echo $edit_form_link; |
| 1348 | 1348 | } |
| 1349 | 1349 | } |
@@ -1359,7 +1359,7 @@ discard block |
||
| 1359 | 1359 | * for non-admins |
| 1360 | 1360 | */ |
| 1361 | 1361 | if ( ! current_user_can( 'manage_options' ) ) { |
| 1362 | - $impressions = $form_data['impressions'] + 1; |
|
| 1362 | + $impressions = $form_data[ 'impressions' ] + 1; |
|
| 1363 | 1363 | $interface->update_form_field( $form_id, 'impressions', $impressions ); |
| 1364 | 1364 | } |
| 1365 | 1365 | |
@@ -8,10 +8,10 @@ discard block |
||
| 8 | 8 | $submission_handler = new Yikes_Inc_Easy_Mailchimp_Extender_Process_Submission_Handler( $is_ajax = true ); |
| 9 | 9 | |
| 10 | 10 | // parse our form data |
| 11 | -parse_str( $_POST['form_data'], $data ); |
|
| 11 | +parse_str( $_POST[ 'form_data' ], $data ); |
|
| 12 | 12 | |
| 13 | 13 | // Get the form_id |
| 14 | -$form_id = absint( $_POST['form_id'] ); |
|
| 14 | +$form_id = absint( $_POST[ 'form_id' ] ); |
|
| 15 | 15 | |
| 16 | 16 | // Send an error if for some reason we can't find the $form_id |
| 17 | 17 | $submission_handler->handle_empty_form_id( $form_id ); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $submission_handler->set_form_id( $form_id ); |
| 21 | 21 | |
| 22 | 22 | // Check our nonce |
| 23 | -$submission_handler->handle_nonce( $_POST['ajax_security_nonce'], 'yikes_mc_form_submission_security_nonce' ); |
|
| 23 | +$submission_handler->handle_nonce( $_POST[ 'ajax_security_nonce' ], 'yikes_mc_form_submission_security_nonce' ); |
|
| 24 | 24 | |
| 25 | 25 | // Get the form data |
| 26 | 26 | $interface = yikes_easy_mailchimp_extender_get_form_interface(); |
@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | $submission_handler->handle_empty_form( $form_data ); |
| 31 | 31 | |
| 32 | 32 | // Set up some variables from the form data -- these are required |
| 33 | -$list_id = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null; |
|
| 34 | -$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null; |
|
| 35 | -$optin_settings = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null; |
|
| 36 | -$form_fields = isset( $form_data['fields'] ) ? $form_data['fields'] : null; |
|
| 33 | +$list_id = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null; |
|
| 34 | +$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null; |
|
| 35 | +$optin_settings = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null; |
|
| 36 | +$form_fields = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null; |
|
| 37 | 37 | |
| 38 | 38 | // Send an error if for some reason we can't find the required form data |
| 39 | 39 | $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ); |
@@ -47,14 +47,14 @@ discard block |
||
| 47 | 47 | $submission_handler->check_for_required_interest_groups( $data, $form_fields ); |
| 48 | 48 | |
| 49 | 49 | // Set up some variables from the form data -- these are not required |
| 50 | -$error_messages = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array(); |
|
| 51 | -$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); |
|
| 50 | +$error_messages = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array(); |
|
| 51 | +$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); |
|
| 52 | 52 | |
| 53 | 53 | // Set the error messages in our class |
| 54 | 54 | $submission_handler->set_error_messages( $error_messages ); |
| 55 | 55 | |
| 56 | 56 | // Some other variables we'll need. |
| 57 | -$page_data = isset( $_POST['page_data'] ) ? $_POST['page_data'] : ''; |
|
| 57 | +$page_data = isset( $_POST[ 'page_data' ] ) ? $_POST[ 'page_data' ] : ''; |
|
| 58 | 58 | $merge_variables = array(); |
| 59 | 59 | $error = 0; |
| 60 | 60 | $list_handler = yikes_get_mc_api_manager()->get_list_handler(); |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | // As of 6.4 we no longer pass the post object, only the ID. |
| 63 | 63 | // For any users relying on the $post object for their `yikes-mailchimp-redirect-url` filter we'll grab the post object here. |
| 64 | 64 | // Eventually we should just pass the $post_id into the filter instead of the whole object. |
| 65 | -$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
| 65 | +$page_data = ! empty( $page_data ) ? get_post( $page_data ) : ''; |
|
| 66 | 66 | |
| 67 | 67 | // Send an error if for some reason we can't find the list_handler |
| 68 | 68 | $submission_handler->handle_empty_list_handler( $list_handler ); |
| 69 | 69 | |
| 70 | 70 | // Get, sanitize and lowercasify the email |
| 71 | -$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : ''; |
|
| 71 | +$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : ''; |
|
| 72 | 72 | $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); |
| 73 | 73 | $submission_handler->set_email( $sanitized_email ); |
| 74 | 74 | |
@@ -76,26 +76,26 @@ discard block |
||
| 76 | 76 | $submission_handler->handle_empty_email( $sanitized_email ); |
| 77 | 77 | |
| 78 | 78 | // Check for Honeypot filled |
| 79 | -$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false; |
|
| 79 | +$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false; |
|
| 80 | 80 | |
| 81 | 81 | // Send an error if honey pot is not empty |
| 82 | 82 | $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ); |
| 83 | 83 | |
| 84 | 84 | // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed |
| 85 | -if ( isset( $data['g-recaptcha-response'] ) ) { |
|
| 86 | - $recaptcha_response = $data['g-recaptcha-response']; |
|
| 85 | +if ( isset( $data[ 'g-recaptcha-response' ] ) ) { |
|
| 86 | + $recaptcha_response = $data[ 'g-recaptcha-response' ]; |
|
| 87 | 87 | $submission_handler->handle_recaptcha( $recaptcha_response ); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | -if ( isset( $data['recaptcha_three_response'] ) ) { |
|
| 91 | - $submission_handler->handle_recaptcha( $data['recaptcha_three_response'], 3 ); |
|
| 90 | +if ( isset( $data[ 'recaptcha_three_response' ] ) ) { |
|
| 91 | + $submission_handler->handle_recaptcha( $data[ 'recaptcha_three_response' ], 3 ); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Loop through the submitted data to sanitize and format values |
| 95 | 95 | $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields ); |
| 96 | 96 | |
| 97 | 97 | // Submission Setting: Replace interest groups or update interest groups |
| 98 | -$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true; |
|
| 98 | +$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true; |
|
| 99 | 99 | |
| 100 | 100 | // Get the default groups |
| 101 | 101 | $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler ); |
@@ -110,15 +110,15 @@ discard block |
||
| 110 | 110 | * |
| 111 | 111 | * @param $merge_variables array Array of merge variable to use |
| 112 | 112 | */ |
| 113 | -do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
| 113 | +do_action( 'yikes-mailchimp-before-submission', $merge_variables ); |
|
| 114 | 114 | do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables ); |
| 115 | 115 | |
| 116 | 116 | // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) |
| 117 | 117 | // and pass back an error and message to the user |
| 118 | 118 | // If error is set and no message, default to our class variable's default error message |
| 119 | -if ( isset( $merge_variables['error'] ) ) { |
|
| 120 | - $merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message; |
|
| 121 | - $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message ); |
|
| 119 | +if ( isset( $merge_variables[ 'error' ] ) ) { |
|
| 120 | + $merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message; |
|
| 121 | + $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message ); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // This is the array we're going to pass through to the Mailchimp API |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | // Only add groups if they exist |
| 131 | 131 | if ( ! empty( $groups ) ) { |
| 132 | - $member_data['interests'] = $groups; |
|
| 132 | + $member_data[ 'interests' ] = $groups; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | // Check if this member already exists |
@@ -140,12 +140,12 @@ discard block |
||
| 140 | 140 | // 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 |
| 141 | 141 | // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe |
| 142 | 142 | // Continue as if they're a new member to force another double opt-in email |
| 143 | -if ( is_array( $member_exists ) && isset( $member_exists['status'] ) ) { |
|
| 144 | - $double_optin_resubscribe = $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed'; |
|
| 143 | +if ( is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) ) { |
|
| 144 | + $double_optin_resubscribe = $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed'; |
|
| 145 | 145 | } else { |
| 146 | 146 | |
| 147 | 147 | // If this member doesn't exist, set their timestamp signup to the current time. |
| 148 | - $member_data['timestamp_signup'] = current_time( 'Y-m-d H:i:s', 1 ); |
|
| 148 | + $member_data[ 'timestamp_signup' ] = current_time( 'Y-m-d H:i:s', 1 ); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) { |
@@ -154,24 +154,24 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | // Check the opt-in value - is it double or single? |
| 156 | 156 | // Double opt-in means 'status_if_new' => 'pending' |
| 157 | - $double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
| 157 | + $double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
| 158 | 158 | |
| 159 | 159 | // If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which |
| 160 | 160 | // causes Mailchimp to send them a confirmation email. This is the only way Mailchimp will |
| 161 | 161 | // allow us to re-subscribe the user. |
| 162 | - $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed'; |
|
| 162 | + $was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed'; |
|
| 163 | 163 | $was_unsubscribed = apply_filters( 'yikes_mailchimp_single_resubscribe', $was_unsubscribed ); |
| 164 | 164 | |
| 165 | 165 | if ( $double_optin === 1 || $was_unsubscribed === true ) { |
| 166 | 166 | |
| 167 | 167 | // Double opt-in |
| 168 | - $member_data['status_if_new'] = 'pending'; |
|
| 169 | - $member_data['status'] = 'pending'; |
|
| 168 | + $member_data[ 'status_if_new' ] = 'pending'; |
|
| 169 | + $member_data[ 'status' ] = 'pending'; |
|
| 170 | 170 | } else { |
| 171 | 171 | |
| 172 | 172 | // Single opt-in |
| 173 | - $member_data['status_if_new'] = 'subscribed'; |
|
| 174 | - $member_data['status'] = 'subscribed'; |
|
| 173 | + $member_data[ 'status_if_new' ] = 'subscribed'; |
|
| 174 | + $member_data[ 'status' ] = 'subscribed'; |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | } else { |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | // But first let's set our flag, and set the Mailchimp status flag |
| 182 | 182 | $new_subscriber = false; |
| 183 | - $member_data['status'] = 'subscribed'; |
|
| 183 | + $member_data[ 'status' ] = 'subscribed'; |
|
| 184 | 184 | |
| 185 | 185 | // Check our update_existing_user optin setting |
| 186 | - $update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false; |
|
| 186 | + $update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false; |
|
| 187 | 187 | |
| 188 | 188 | // If update_existing_user is false (not allowed) then simply fail and return a response message |
| 189 | 189 | if ( $update_existing_user === false ) { |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | // If update_existing_user is true, we need to check our 'send_update_email' option |
| 194 | - $send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false; |
|
| 194 | + $send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false; |
|
| 195 | 195 | |
| 196 | 196 | // If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic |
| 197 | 197 | if ( $send_update_email === true ) { |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | // If this is the first time subscriber add the tags along with the subscribe request. |
| 216 | 216 | // This allows for double opt-in forms submissions to be tagged. |
| 217 | -if ( ! empty( $form_data['tags'] ) && ! is_array( $member_exists ) ) { |
|
| 218 | - foreach( $form_data['tags'] as $tag ) { |
|
| 219 | - $member_data['tags'][] = $tag['name']; |
|
| 217 | +if ( ! empty( $form_data[ 'tags' ] ) && ! is_array( $member_exists ) ) { |
|
| 218 | + foreach ( $form_data[ 'tags' ] as $tag ) { |
|
| 219 | + $member_data[ 'tags' ][ ] = $tag[ 'name' ]; |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | |
@@ -3,234 +3,234 @@ discard block |
||
| 3 | 3 | class Yikes_Inc_Easy_Mailchimp_Extender_Process_Submission_Handler { |
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | - * A flag signifying whether we're dealing with an AJAX submission or standard form submission |
|
| 7 | - * |
|
| 8 | - * @since 6.3.0 |
|
| 9 | - * @access protected |
|
| 10 | - * @var bool | $is_ajax |
|
| 11 | - */ |
|
| 6 | + * A flag signifying whether we're dealing with an AJAX submission or standard form submission |
|
| 7 | + * |
|
| 8 | + * @since 6.3.0 |
|
| 9 | + * @access protected |
|
| 10 | + * @var bool | $is_ajax |
|
| 11 | + */ |
|
| 12 | 12 | protected $is_ajax; |
| 13 | 13 | |
| 14 | 14 | /**** Hardcoded Internal Variables ****/ |
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | - * An array of form fields we don't process |
|
| 18 | - * |
|
| 19 | - * @since 6.3.0 |
|
| 20 | - * @access protected |
|
| 21 | - * @var array | $skipped_form_fields |
|
| 22 | - */ |
|
| 17 | + * An array of form fields we don't process |
|
| 18 | + * |
|
| 19 | + * @since 6.3.0 |
|
| 20 | + * @access protected |
|
| 21 | + * @var array | $skipped_form_fields |
|
| 22 | + */ |
|
| 23 | 23 | protected $skipped_form_fields; |
| 24 | 24 | |
| 25 | 25 | /**** Form Variables ****/ |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | - * The ID of the corresponding YIKES Mailchimp form |
|
| 29 | - * |
|
| 30 | - * @since 6.3.0 |
|
| 31 | - * @access public |
|
| 32 | - * @var int | $form_id |
|
| 33 | - */ |
|
| 28 | + * The ID of the corresponding YIKES Mailchimp form |
|
| 29 | + * |
|
| 30 | + * @since 6.3.0 |
|
| 31 | + * @access public |
|
| 32 | + * @var int | $form_id |
|
| 33 | + */ |
|
| 34 | 34 | public $form_id; |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | - * The ID of the corresponding Mailchimp list |
|
| 38 | - * |
|
| 39 | - * @since 6.3.0 |
|
| 40 | - * @access public |
|
| 41 | - * @var int | $list_id |
|
| 42 | - */ |
|
| 37 | + * The ID of the corresponding Mailchimp list |
|
| 38 | + * |
|
| 39 | + * @since 6.3.0 |
|
| 40 | + * @access public |
|
| 41 | + * @var int | $list_id |
|
| 42 | + */ |
|
| 43 | 43 | public $list_id; |
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | - * The submitted email |
|
| 47 | - * |
|
| 48 | - * @since 6.3.0 |
|
| 49 | - * @access public |
|
| 50 | - * @var string | $email |
|
| 51 | - */ |
|
| 46 | + * The submitted email |
|
| 47 | + * |
|
| 48 | + * @since 6.3.0 |
|
| 49 | + * @access public |
|
| 50 | + * @var string | $email |
|
| 51 | + */ |
|
| 52 | 52 | public $email; |
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | - * The array of error messages defined by the user and attached to this form |
|
| 56 | - * |
|
| 57 | - * @since 6.3.0 |
|
| 58 | - * @access public |
|
| 59 | - * @var array | $error_messages |
|
| 60 | - */ |
|
| 55 | + * The array of error messages defined by the user and attached to this form |
|
| 56 | + * |
|
| 57 | + * @since 6.3.0 |
|
| 58 | + * @access public |
|
| 59 | + * @var array | $error_messages |
|
| 60 | + */ |
|
| 61 | 61 | public $error_messages; |
| 62 | 62 | |
| 63 | 63 | /**** Default Error Messages ****/ |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * The error message for no form ID |
|
| 67 | - * |
|
| 68 | - * @since 6.3.0 |
|
| 69 | - * @access public |
|
| 70 | - * @var string | $handle_empty_form_id_message |
|
| 71 | - */ |
|
| 66 | + * The error message for no form ID |
|
| 67 | + * |
|
| 68 | + * @since 6.3.0 |
|
| 69 | + * @access public |
|
| 70 | + * @var string | $handle_empty_form_id_message |
|
| 71 | + */ |
|
| 72 | 72 | public $handle_empty_form_id_message; |
| 73 | 73 | |
| 74 | 74 | /** |
| 75 | - * The error message for no form found |
|
| 76 | - * |
|
| 77 | - * @since 6.3.0 |
|
| 78 | - * @access public |
|
| 79 | - * @var string | $handle_empty_form_message |
|
| 80 | - */ |
|
| 75 | + * The error message for no form found |
|
| 76 | + * |
|
| 77 | + * @since 6.3.0 |
|
| 78 | + * @access public |
|
| 79 | + * @var string | $handle_empty_form_message |
|
| 80 | + */ |
|
| 81 | 81 | public $handle_empty_form_message; |
| 82 | 82 | |
| 83 | 83 | /** |
| 84 | - * The error message for missing form fields |
|
| 85 | - * |
|
| 86 | - * @since 6.3.0 |
|
| 87 | - * @access public |
|
| 88 | - * @var string | $handle_empty_fields_generic_message |
|
| 89 | - */ |
|
| 84 | + * The error message for missing form fields |
|
| 85 | + * |
|
| 86 | + * @since 6.3.0 |
|
| 87 | + * @access public |
|
| 88 | + * @var string | $handle_empty_fields_generic_message |
|
| 89 | + */ |
|
| 90 | 90 | public $handle_empty_fields_generic_message; |
| 91 | 91 | |
| 92 | 92 | /** |
| 93 | - * The error message for missing $list_handler class |
|
| 94 | - * |
|
| 95 | - * @since 6.3.0 |
|
| 96 | - * @access public |
|
| 97 | - * @var string | $handle_empty_list_handler_message |
|
| 98 | - */ |
|
| 93 | + * The error message for missing $list_handler class |
|
| 94 | + * |
|
| 95 | + * @since 6.3.0 |
|
| 96 | + * @access public |
|
| 97 | + * @var string | $handle_empty_list_handler_message |
|
| 98 | + */ |
|
| 99 | 99 | public $handle_empty_list_handler_message; |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | - * The error message for no email |
|
| 103 | - * |
|
| 104 | - * @since 6.3.0 |
|
| 105 | - * @access public |
|
| 106 | - * @var string | $handle_empty_email_message |
|
| 107 | - */ |
|
| 102 | + * The error message for no email |
|
| 103 | + * |
|
| 104 | + * @since 6.3.0 |
|
| 105 | + * @access public |
|
| 106 | + * @var string | $handle_empty_email_message |
|
| 107 | + */ |
|
| 108 | 108 | public $handle_empty_email_message; |
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | - * The error message for a filled in honeypot |
|
| 112 | - * |
|
| 113 | - * @since 6.3.0 |
|
| 114 | - * @access public |
|
| 115 | - * @var string | $handle_non_empty_honeypot_message |
|
| 116 | - */ |
|
| 111 | + * The error message for a filled in honeypot |
|
| 112 | + * |
|
| 113 | + * @since 6.3.0 |
|
| 114 | + * @access public |
|
| 115 | + * @var string | $handle_non_empty_honeypot_message |
|
| 116 | + */ |
|
| 117 | 117 | public $handle_non_empty_honeypot_message; |
| 118 | 118 | |
| 119 | 119 | /** |
| 120 | - * The error message for existing users trying to update when it's disallowed |
|
| 121 | - * |
|
| 122 | - * @since 6.3.0 |
|
| 123 | - * @access public |
|
| 124 | - * @var string | $handle_disallowed_existing_user_update_message |
|
| 125 | - */ |
|
| 120 | + * The error message for existing users trying to update when it's disallowed |
|
| 121 | + * |
|
| 122 | + * @since 6.3.0 |
|
| 123 | + * @access public |
|
| 124 | + * @var string | $handle_disallowed_existing_user_update_message |
|
| 125 | + */ |
|
| 126 | 126 | public $handle_disallowed_existing_user_update_message; |
| 127 | 127 | |
| 128 | 128 | /** |
| 129 | - * The first half of the error message for updating an existing user when it's done via a profile link |
|
| 130 | - * |
|
| 131 | - * @since 6.3.0 |
|
| 132 | - * @access public |
|
| 133 | - * @var string | $handle_updating_existing_user_message |
|
| 134 | - */ |
|
| 129 | + * The first half of the error message for updating an existing user when it's done via a profile link |
|
| 130 | + * |
|
| 131 | + * @since 6.3.0 |
|
| 132 | + * @access public |
|
| 133 | + * @var string | $handle_updating_existing_user_message |
|
| 134 | + */ |
|
| 135 | 135 | public $handle_updating_existing_user_message; |
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | - * The second half of the error message (the link) for updating an existing user when it's done via a profile link |
|
| 139 | - * |
|
| 140 | - * @since 6.3.0 |
|
| 141 | - * @access public |
|
| 142 | - * @var string | $handle_updating_existing_user_link_message |
|
| 143 | - */ |
|
| 138 | + * The second half of the error message (the link) for updating an existing user when it's done via a profile link |
|
| 139 | + * |
|
| 140 | + * @since 6.3.0 |
|
| 141 | + * @access public |
|
| 142 | + * @var string | $handle_updating_existing_user_link_message |
|
| 143 | + */ |
|
| 144 | 144 | public $handle_updating_existing_user_link_message; |
| 145 | 145 | |
| 146 | 146 | /** |
| 147 | - * A default, generic error message |
|
| 148 | - * |
|
| 149 | - * @since 6.3.0 |
|
| 150 | - * @access public |
|
| 151 | - * @var string | $default_error_response_message |
|
| 152 | - */ |
|
| 147 | + * A default, generic error message |
|
| 148 | + * |
|
| 149 | + * @since 6.3.0 |
|
| 150 | + * @access public |
|
| 151 | + * @var string | $default_error_response_message |
|
| 152 | + */ |
|
| 153 | 153 | public $default_error_response_message; |
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | - * The error message for not filling out a required form field |
|
| 157 | - * |
|
| 158 | - * @since 6.3.0 |
|
| 159 | - * @access public |
|
| 160 | - * @var string | $handle_empty_required_field_message |
|
| 161 | - */ |
|
| 156 | + * The error message for not filling out a required form field |
|
| 157 | + * |
|
| 158 | + * @since 6.3.0 |
|
| 159 | + * @access public |
|
| 160 | + * @var string | $handle_empty_required_field_message |
|
| 161 | + */ |
|
| 162 | 162 | public $handle_empty_required_field_message; |
| 163 | 163 | |
| 164 | 164 | /** |
| 165 | - * The error message for not filling out a required interest group |
|
| 166 | - * |
|
| 167 | - * @since 6.3.0 |
|
| 168 | - * @access public |
|
| 169 | - * @var string | $handle_empty_required_interest_group_message |
|
| 170 | - */ |
|
| 165 | + * The error message for not filling out a required interest group |
|
| 166 | + * |
|
| 167 | + * @since 6.3.0 |
|
| 168 | + * @access public |
|
| 169 | + * @var string | $handle_empty_required_interest_group_message |
|
| 170 | + */ |
|
| 171 | 171 | public $handle_empty_required_interest_group_message; |
| 172 | 172 | |
| 173 | 173 | /** |
| 174 | - * The error message for nonce failures |
|
| 175 | - * |
|
| 176 | - * @since 6.3.0 |
|
| 177 | - * @access public |
|
| 178 | - * @var string | $handle_nonce_message |
|
| 179 | - */ |
|
| 174 | + * The error message for nonce failures |
|
| 175 | + * |
|
| 176 | + * @since 6.3.0 |
|
| 177 | + * @access public |
|
| 178 | + * @var string | $handle_nonce_message |
|
| 179 | + */ |
|
| 180 | 180 | public $handle_nonce_message; |
| 181 | 181 | |
| 182 | 182 | /** |
| 183 | - * The error message for a recaptcha that is not checked/filled out |
|
| 184 | - * |
|
| 185 | - * @since 6.3.0 |
|
| 186 | - * @access public |
|
| 187 | - * @var string | $handle_nonce_message |
|
| 188 | - */ |
|
| 183 | + * The error message for a recaptcha that is not checked/filled out |
|
| 184 | + * |
|
| 185 | + * @since 6.3.0 |
|
| 186 | + * @access public |
|
| 187 | + * @var string | $handle_nonce_message |
|
| 188 | + */ |
|
| 189 | 189 | public $handle_non_filled_recaptcha_message_message; |
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | - * The error message for recaptcha errors that we're not sure of |
|
| 193 | - * |
|
| 194 | - * @since 6.3.0 |
|
| 195 | - * @access public |
|
| 196 | - * @var string | $handle_nonce_message |
|
| 197 | - */ |
|
| 192 | + * The error message for recaptcha errors that we're not sure of |
|
| 193 | + * |
|
| 194 | + * @since 6.3.0 |
|
| 195 | + * @access public |
|
| 196 | + * @var string | $handle_nonce_message |
|
| 197 | + */ |
|
| 198 | 198 | public $generic_recaptcha_error_message; |
| 199 | 199 | |
| 200 | 200 | /**** Default Success Messages ****/ |
| 201 | 201 | |
| 202 | 202 | /** |
| 203 | - * The success message for single-optin forms |
|
| 204 | - * |
|
| 205 | - * @since 6.3.0 |
|
| 206 | - * @access public |
|
| 207 | - * @var string | $default_response_single_optin_success_message |
|
| 208 | - */ |
|
| 203 | + * The success message for single-optin forms |
|
| 204 | + * |
|
| 205 | + * @since 6.3.0 |
|
| 206 | + * @access public |
|
| 207 | + * @var string | $default_response_single_optin_success_message |
|
| 208 | + */ |
|
| 209 | 209 | public $default_response_single_optin_success_message; |
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | - * The default success message for double-optin forms |
|
| 213 | - * |
|
| 214 | - * @since 6.3.0 |
|
| 215 | - * @access public |
|
| 216 | - * @var string | $default_response_double_optin_success_message |
|
| 217 | - */ |
|
| 212 | + * The default success message for double-optin forms |
|
| 213 | + * |
|
| 214 | + * @since 6.3.0 |
|
| 215 | + * @access public |
|
| 216 | + * @var string | $default_response_double_optin_success_message |
|
| 217 | + */ |
|
| 218 | 218 | public $default_response_double_optin_success_message; |
| 219 | 219 | |
| 220 | 220 | /** |
| 221 | - * The default success message for already subscribed users re-subscribing |
|
| 222 | - * |
|
| 223 | - * @since 6.3.0 |
|
| 224 | - * @access public |
|
| 225 | - * @var string | $existing_subscriber_profile_update_message |
|
| 226 | - */ |
|
| 221 | + * The default success message for already subscribed users re-subscribing |
|
| 222 | + * |
|
| 223 | + * @since 6.3.0 |
|
| 224 | + * @access public |
|
| 225 | + * @var string | $existing_subscriber_profile_update_message |
|
| 226 | + */ |
|
| 227 | 227 | public $existing_subscriber_profile_update_message; |
| 228 | 228 | |
| 229 | 229 | /** |
| 230 | - * The construct function - sets all of our hardcoded variables |
|
| 231 | - * |
|
| 232 | - * @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission |
|
| 233 | - */ |
|
| 230 | + * The construct function - sets all of our hardcoded variables |
|
| 231 | + * |
|
| 232 | + * @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission |
|
| 233 | + */ |
|
| 234 | 234 | public function __construct( $is_ajax ) { |
| 235 | 235 | |
| 236 | 236 | // Set up our variables |
@@ -268,45 +268,45 @@ discard block |
||
| 268 | 268 | /**** Setters for our Form Variables ****/ |
| 269 | 269 | |
| 270 | 270 | /** |
| 271 | - * Set the form ID class property |
|
| 272 | - * |
|
| 273 | - * @since 6.3.0 |
|
| 274 | - * |
|
| 275 | - * @param int | $form_id | ID of the corresponding YIKES Mailchimp form |
|
| 276 | - */ |
|
| 271 | + * Set the form ID class property |
|
| 272 | + * |
|
| 273 | + * @since 6.3.0 |
|
| 274 | + * |
|
| 275 | + * @param int | $form_id | ID of the corresponding YIKES Mailchimp form |
|
| 276 | + */ |
|
| 277 | 277 | public function set_form_id( $form_id ) { |
| 278 | 278 | $this->form_id = $form_id; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | /** |
| 282 | - * Set the list ID class property |
|
| 283 | - * |
|
| 284 | - * @since 6.3.0 |
|
| 285 | - * |
|
| 286 | - * @param int | $list_id | ID of the corresponding Mailchimp list |
|
| 287 | - */ |
|
| 282 | + * Set the list ID class property |
|
| 283 | + * |
|
| 284 | + * @since 6.3.0 |
|
| 285 | + * |
|
| 286 | + * @param int | $list_id | ID of the corresponding Mailchimp list |
|
| 287 | + */ |
|
| 288 | 288 | public function set_list_id( $list_id ) { |
| 289 | 289 | $this->list_id = $list_id; |
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | /** |
| 293 | - * Set the email class property |
|
| 294 | - * |
|
| 295 | - * @since 6.3.0 |
|
| 296 | - * |
|
| 297 | - * @param string | $sanitized_email | The sanitized email |
|
| 298 | - */ |
|
| 293 | + * Set the email class property |
|
| 294 | + * |
|
| 295 | + * @since 6.3.0 |
|
| 296 | + * |
|
| 297 | + * @param string | $sanitized_email | The sanitized email |
|
| 298 | + */ |
|
| 299 | 299 | public function set_email( $sanitized_email ) { |
| 300 | 300 | $this->email = $sanitized_email; |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | /** |
| 304 | - * Set the $error_messages class property |
|
| 305 | - * |
|
| 306 | - * @since 6.3.0 |
|
| 307 | - * |
|
| 308 | - * @param array | $error_messages | The array of user-defined error messages for this form |
|
| 309 | - */ |
|
| 304 | + * Set the $error_messages class property |
|
| 305 | + * |
|
| 306 | + * @since 6.3.0 |
|
| 307 | + * |
|
| 308 | + * @param array | $error_messages | The array of user-defined error messages for this form |
|
| 309 | + */ |
|
| 310 | 310 | public function set_error_messages( $error_messages ) { |
| 311 | 311 | $this->error_messages = $error_messages; |
| 312 | 312 | } |
@@ -315,24 +315,24 @@ discard block |
||
| 315 | 315 | /**** Simple Return Functions ****/ |
| 316 | 316 | |
| 317 | 317 | /** |
| 318 | - * Return a sanitized email |
|
| 319 | - * |
|
| 320 | - * @since 6.3.0 |
|
| 321 | - * |
|
| 322 | - * @param string | $email | The user's email |
|
| 323 | - * @return string| $email | The user's email, lowercased and sanitized |
|
| 324 | - */ |
|
| 318 | + * Return a sanitized email |
|
| 319 | + * |
|
| 320 | + * @since 6.3.0 |
|
| 321 | + * |
|
| 322 | + * @param string | $email | The user's email |
|
| 323 | + * @return string| $email | The user's email, lowercased and sanitized |
|
| 324 | + */ |
|
| 325 | 325 | public function get_sanitized_email( $email ) { |
| 326 | 326 | return sanitize_email( strtolower( $email ) ); |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | /** |
| 330 | - * Return the class property $skipped_form_fields |
|
| 331 | - * |
|
| 332 | - * @since 6.3.0 |
|
| 333 | - * |
|
| 334 | - * @return array | $skipped_form_fields |
|
| 335 | - */ |
|
| 330 | + * Return the class property $skipped_form_fields |
|
| 331 | + * |
|
| 332 | + * @since 6.3.0 |
|
| 333 | + * |
|
| 334 | + * @return array | $skipped_form_fields |
|
| 335 | + */ |
|
| 336 | 336 | protected function get_skipped_merge_tags() { |
| 337 | 337 | return $this->skipped_form_fields; |
| 338 | 338 | } |
@@ -341,14 +341,14 @@ discard block |
||
| 341 | 341 | /**** Collection of functions handling the incoming form and interest group data ****/ |
| 342 | 342 | |
| 343 | 343 | /** |
| 344 | - * Loop through form data to sanitize, format, filter, and return. |
|
| 345 | - * |
|
| 346 | - * @since 6.3.0 |
|
| 347 | - * |
|
| 348 | - * @param array | $data | The array of user-submitted form values |
|
| 349 | - * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 350 | - * @return array| $merge_variables| The array of sanitized and formatted form values |
|
| 351 | - */ |
|
| 344 | + * Loop through form data to sanitize, format, filter, and return. |
|
| 345 | + * |
|
| 346 | + * @since 6.3.0 |
|
| 347 | + * |
|
| 348 | + * @param array | $data | The array of user-submitted form values |
|
| 349 | + * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 350 | + * @return array| $merge_variables| The array of sanitized and formatted form values |
|
| 351 | + */ |
|
| 352 | 352 | public function get_submitted_merge_values( $data, $form_fields ) { |
| 353 | 353 | |
| 354 | 354 | // Array to return |
@@ -400,14 +400,14 @@ discard block |
||
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | /** |
| 403 | - * Sanitize form values and return them |
|
| 404 | - * |
|
| 405 | - * @since 6.3.0 |
|
| 406 | - * |
|
| 407 | - * @param string | $key | The MERGE/Field-name for this value |
|
| 408 | - * @param mixed | $value | The form value - this could be an array or a string |
|
| 409 | - * @return mixed | $sanitized | The $value sanitized |
|
| 410 | - */ |
|
| 403 | + * Sanitize form values and return them |
|
| 404 | + * |
|
| 405 | + * @since 6.3.0 |
|
| 406 | + * |
|
| 407 | + * @param string | $key | The MERGE/Field-name for this value |
|
| 408 | + * @param mixed | $value | The form value - this could be an array or a string |
|
| 409 | + * @return mixed | $sanitized | The $value sanitized |
|
| 410 | + */ |
|
| 411 | 411 | protected function sanitize_form_values( $key, $value ) { |
| 412 | 412 | if ( is_scalar( $value ) ) { |
| 413 | 413 | $sanitized = sanitize_text_field( $value ); |
@@ -421,14 +421,14 @@ discard block |
||
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | /** |
| 424 | - * Check a date field's date format and pass it along to the appropriate function |
|
| 425 | - * |
|
| 426 | - * @since 6.3.0 |
|
| 427 | - * |
|
| 428 | - * @param string | $date | The unformatted date value |
|
| 429 | - * @param string | $date_format | The date format |
|
| 430 | - * @return string| $date | The date formatted according to the $date_format |
|
| 431 | - */ |
|
| 424 | + * Check a date field's date format and pass it along to the appropriate function |
|
| 425 | + * |
|
| 426 | + * @since 6.3.0 |
|
| 427 | + * |
|
| 428 | + * @param string | $date | The unformatted date value |
|
| 429 | + * @param string | $date_format | The date format |
|
| 430 | + * @return string| $date | The date formatted according to the $date_format |
|
| 431 | + */ |
|
| 432 | 432 | protected function handle_date_format_merge_values( $date, $date_format ) { |
| 433 | 433 | // Check if EU date format (for dates: 'DD/MM/YYYY', for birthdays: 'DD/MM') |
| 434 | 434 | if ( 'DD/MM/YYYY' === $date_format ) { |
@@ -441,13 +441,13 @@ discard block |
||
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | /** |
| 444 | - * Format a date field whose date format is dd/mm/yyyy |
|
| 445 | - * |
|
| 446 | - * @since 6.3.0 |
|
| 447 | - * |
|
| 448 | - * @param string | $date | A date in the format dd/mm/yyyy |
|
| 449 | - * @return string| $date | A date in the format mm/dd/yyyy |
|
| 450 | - */ |
|
| 444 | + * Format a date field whose date format is dd/mm/yyyy |
|
| 445 | + * |
|
| 446 | + * @since 6.3.0 |
|
| 447 | + * |
|
| 448 | + * @param string | $date | A date in the format dd/mm/yyyy |
|
| 449 | + * @return string| $date | A date in the format mm/dd/yyyy |
|
| 450 | + */ |
|
| 451 | 451 | protected function handle_dd_mm_yyyy_date( $date ) { |
| 452 | 452 | |
| 453 | 453 | // Mailchimp wants the dates as 'MM/DD/YYYY' regardless of user-specified format, so convert |
@@ -466,13 +466,13 @@ discard block |
||
| 466 | 466 | } |
| 467 | 467 | |
| 468 | 468 | /** |
| 469 | - * Format a birthday field whose date format is dd/mm |
|
| 470 | - * |
|
| 471 | - * @since 6.3.0 |
|
| 472 | - * |
|
| 473 | - * @param string | $birthday | A date in the format dd/mm |
|
| 474 | - * @return string| $birthday | A date in the format mm/dd |
|
| 475 | - */ |
|
| 469 | + * Format a birthday field whose date format is dd/mm |
|
| 470 | + * |
|
| 471 | + * @since 6.3.0 |
|
| 472 | + * |
|
| 473 | + * @param string | $birthday | A date in the format dd/mm |
|
| 474 | + * @return string| $birthday | A date in the format mm/dd |
|
| 475 | + */ |
|
| 476 | 476 | protected function handle_dd_mm_birthday( $birthday ) { |
| 477 | 477 | |
| 478 | 478 | // Mailchimp wants the birthdays as 'MM/DD' regardless of user-specified format, so convert |
@@ -492,14 +492,14 @@ discard block |
||
| 492 | 492 | |
| 493 | 493 | |
| 494 | 494 | /** |
| 495 | - * Create an array of available interest groups based on the $replace_interests flag |
|
| 496 | - * |
|
| 497 | - * @since 6.3.0 |
|
| 498 | - * |
|
| 499 | - * @param bool | $replace_interests| True if we're replacing interest groups, false if updating interest groups |
|
| 500 | - * @param class | $list_class | Class for interacting with the current list |
|
| 501 | - * @return array | $groups | Array of interest groups |
|
| 502 | - */ |
|
| 495 | + * Create an array of available interest groups based on the $replace_interests flag |
|
| 496 | + * |
|
| 497 | + * @since 6.3.0 |
|
| 498 | + * |
|
| 499 | + * @param bool | $replace_interests| True if we're replacing interest groups, false if updating interest groups |
|
| 500 | + * @param class | $list_class | Class for interacting with the current list |
|
| 501 | + * @return array | $groups | Array of interest groups |
|
| 502 | + */ |
|
| 503 | 503 | public function get_default_interest_groups( $replace_interests, $list_class ) { |
| 504 | 504 | |
| 505 | 505 | // If $replace_interests flag is true then loop through interest groups and set them all to false to start. |
@@ -537,15 +537,15 @@ discard block |
||
| 537 | 537 | |
| 538 | 538 | |
| 539 | 539 | /** |
| 540 | - * Loop through the interest group form data to sanitize, format, filter, and return. |
|
| 541 | - * |
|
| 542 | - * @since 6.3.0 |
|
| 543 | - * |
|
| 544 | - * @param array | $data | The array of user-submitted form values |
|
| 545 | - * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 546 | - * @param array | $groups | The array of interest groups created by `get_default_interest_groups()` |
|
| 547 | - * @return array| $groups | The array of sanitized and formatted form values |
|
| 548 | - */ |
|
| 540 | + * Loop through the interest group form data to sanitize, format, filter, and return. |
|
| 541 | + * |
|
| 542 | + * @since 6.3.0 |
|
| 543 | + * |
|
| 544 | + * @param array | $data | The array of user-submitted form values |
|
| 545 | + * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 546 | + * @param array | $groups | The array of interest groups created by `get_default_interest_groups()` |
|
| 547 | + * @return array| $groups | The array of sanitized and formatted form values |
|
| 548 | + */ |
|
| 549 | 549 | public function get_submitted_interest_groups( $data, $form_fields, $groups ) { |
| 550 | 550 | |
| 551 | 551 | // loop to push variables to our array |
@@ -574,13 +574,13 @@ discard block |
||
| 574 | 574 | } |
| 575 | 575 | |
| 576 | 576 | /** |
| 577 | - * yikes-mailchimp-filter-groups-before-submission |
|
| 578 | - * |
|
| 579 | - * Catch the interest groups before they get sent over to Mailchimp |
|
| 580 | - * @param array | $groups | User submitted interest group data |
|
| 581 | - * @optional int| $form_id| the ID of the form to filter |
|
| 582 | - * @since 6.3.0 |
|
| 583 | - */ |
|
| 577 | + * yikes-mailchimp-filter-groups-before-submission |
|
| 578 | + * |
|
| 579 | + * Catch the interest groups before they get sent over to Mailchimp |
|
| 580 | + * @param array | $groups | User submitted interest group data |
|
| 581 | + * @optional int| $form_id| the ID of the form to filter |
|
| 582 | + * @since 6.3.0 |
|
| 583 | + */ |
|
| 584 | 584 | $groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission', $groups, $this->form_id ); |
| 585 | 585 | $groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission-{$this->form_id}', $groups, $this->form_id ); |
| 586 | 586 | |
@@ -591,17 +591,17 @@ discard block |
||
| 591 | 591 | /**** Functions to Handle Subscribe API Response ****/ |
| 592 | 592 | |
| 593 | 593 | /** |
| 594 | - * Handle the response to a successful subscribe request |
|
| 595 | - * |
|
| 596 | - * @since 6.3.0 |
|
| 597 | - * |
|
| 598 | - * @param array | $submission_settings | Array of the form's submission settings |
|
| 599 | - * @param array | $page_data | Array of the page data |
|
| 600 | - * @param array | $merge_variables | Array of the submitted form variables |
|
| 601 | - * @param array | $notifications | Literally don't know what this is yet. |
|
| 602 | - * @param array | $optin_settings | Array of the form's optin settings |
|
| 603 | - * @param bool | $new_subscriber | True if a new subscriber, false if an existing one |
|
| 604 | - */ |
|
| 594 | + * Handle the response to a successful subscribe request |
|
| 595 | + * |
|
| 596 | + * @since 6.3.0 |
|
| 597 | + * |
|
| 598 | + * @param array | $submission_settings | Array of the form's submission settings |
|
| 599 | + * @param array | $page_data | Array of the page data |
|
| 600 | + * @param array | $merge_variables | Array of the submitted form variables |
|
| 601 | + * @param array | $notifications | Literally don't know what this is yet. |
|
| 602 | + * @param array | $optin_settings | Array of the form's optin settings |
|
| 603 | + * @param bool | $new_subscriber | True if a new subscriber, false if an existing one |
|
| 604 | + */ |
|
| 605 | 605 | public function handle_submission_response_success( $submission_settings, $page_data, $merge_variables, $notifications, $optin_settings, $new_subscriber ) { |
| 606 | 606 | |
| 607 | 607 | // Check if we should redirect, and collect the redirect info in an array |
@@ -610,27 +610,27 @@ discard block |
||
| 610 | 610 | // Fire off our actions |
| 611 | 611 | |
| 612 | 612 | /** |
| 613 | - * yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id} |
|
| 614 | - * |
|
| 615 | - * Catch the merge variables after they've been sent over to Mailchimp |
|
| 616 | - * @since 6.0.0 |
|
| 617 | - * |
|
| 618 | - * @param array | $merge_variables | The array of user submitted form data |
|
| 619 | - */ |
|
| 613 | + * yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id} |
|
| 614 | + * |
|
| 615 | + * Catch the merge variables after they've been sent over to Mailchimp |
|
| 616 | + * @since 6.0.0 |
|
| 617 | + * |
|
| 618 | + * @param array | $merge_variables | The array of user submitted form data |
|
| 619 | + */ |
|
| 620 | 620 | do_action( 'yikes-mailchimp-after-submission', $merge_variables, $this->form_id ); |
| 621 | 621 | do_action( "yikes-mailchimp-after-submission-{$this->form_id}", $merge_variables, $this->form_id ); |
| 622 | 622 | |
| 623 | 623 | /** |
| 624 | - * yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id} |
|
| 625 | - * |
|
| 626 | - * Catch our notifications and other form data |
|
| 627 | - * |
|
| 628 | - * @param string | $email | The user's email |
|
| 629 | - * @param array | $merge_variables | The array of user submitted form data |
|
| 630 | - * @param string | $form_id | The form ID |
|
| 631 | - * @param array | $notifications | Array of notification messages |
|
| 632 | - * |
|
| 633 | - */ |
|
| 624 | + * yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id} |
|
| 625 | + * |
|
| 626 | + * Catch our notifications and other form data |
|
| 627 | + * |
|
| 628 | + * @param string | $email | The user's email |
|
| 629 | + * @param array | $merge_variables | The array of user submitted form data |
|
| 630 | + * @param string | $form_id | The form ID |
|
| 631 | + * @param array | $notifications | Array of notification messages |
|
| 632 | + * |
|
| 633 | + */ |
|
| 634 | 634 | do_action( 'yikes-mailchimp-form-submission', $this->email, $merge_variables, $this->form_id, $notifications ); |
| 635 | 635 | do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications ); |
| 636 | 636 | |
@@ -652,15 +652,15 @@ discard block |
||
| 652 | 652 | $default_response = ( $new_subscriber === false ) ? $this->check_for_user_defined_response_message( 'success-resubscribed', $this->existing_subscriber_profile_update_message ) : $default_response; |
| 653 | 653 | |
| 654 | 654 | /** |
| 655 | - * yikes-mailchimp-success-response |
|
| 656 | - * |
|
| 657 | - * Filter the success message displayed to the user |
|
| 658 | - * |
|
| 659 | - * @param string | $default_response | The response message that will be shown to the user if unchanged (see above for logic) |
|
| 660 | - * @param string | $form_id | The form ID |
|
| 661 | - * @param array | $merge_variables | The array of user submitted form data |
|
| 662 | - * |
|
| 663 | - */ |
|
| 655 | + * yikes-mailchimp-success-response |
|
| 656 | + * |
|
| 657 | + * Filter the success message displayed to the user |
|
| 658 | + * |
|
| 659 | + * @param string | $default_response | The response message that will be shown to the user if unchanged (see above for logic) |
|
| 660 | + * @param string | $form_id | The form ID |
|
| 661 | + * @param array | $merge_variables | The array of user submitted form data |
|
| 662 | + * |
|
| 663 | + */ |
|
| 664 | 664 | $response_message = apply_filters( 'yikes-mailchimp-success-response', $default_response, $this->form_id, $merge_variables ); |
| 665 | 665 | |
| 666 | 666 | // Construct our success array variables |
@@ -679,13 +679,13 @@ discard block |
||
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | /** |
| 682 | - * Handle an unsuccessful/error subscribe request |
|
| 683 | - * |
|
| 684 | - * @since 6.3.0 |
|
| 685 | - * |
|
| 686 | - * @param object | $subscribe_response | The response from the API |
|
| 687 | - * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 688 | - */ |
|
| 682 | + * Handle an unsuccessful/error subscribe request |
|
| 683 | + * |
|
| 684 | + * @since 6.3.0 |
|
| 685 | + * |
|
| 686 | + * @param object | $subscribe_response | The response from the API |
|
| 687 | + * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 688 | + */ |
|
| 689 | 689 | public function handle_submission_response_error( $subscribe_response, $form_fields ) { |
| 690 | 690 | |
| 691 | 691 | // Get the error data |
@@ -727,13 +727,13 @@ discard block |
||
| 727 | 727 | // Note: All of these functions return `return $this->yikes_fail()`. Check function for more info. |
| 728 | 728 | |
| 729 | 729 | /** |
| 730 | - * Check if the submitted form data is missing any required fields |
|
| 731 | - * |
|
| 732 | - * @since 6.3.0 |
|
| 733 | - * |
|
| 734 | - * @param array | $data | The array of user-submitted form values |
|
| 735 | - * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 736 | - */ |
|
| 730 | + * Check if the submitted form data is missing any required fields |
|
| 731 | + * |
|
| 732 | + * @since 6.3.0 |
|
| 733 | + * |
|
| 734 | + * @param array | $data | The array of user-submitted form values |
|
| 735 | + * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 736 | + */ |
|
| 737 | 737 | public function check_for_required_form_fields( $data, $form_fields ) { |
| 738 | 738 | |
| 739 | 739 | // Set up our defaults |
@@ -758,15 +758,15 @@ discard block |
||
| 758 | 758 | foreach( $value as $field => $val ) { |
| 759 | 759 | |
| 760 | 760 | /** |
| 761 | - * 'yikes-mailchimp-ignore-required-array-field' |
|
| 762 | - * |
|
| 763 | - * Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array. |
|
| 764 | - * |
|
| 765 | - * @param array | Array of fields to ignore. Key of the array should be the field name. |
|
| 766 | - * @param int | $form_id |
|
| 767 | - * |
|
| 768 | - * @return Array of fields to ignore. |
|
| 769 | - */ |
|
| 761 | + * 'yikes-mailchimp-ignore-required-array-field' |
|
| 762 | + * |
|
| 763 | + * Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array. |
|
| 764 | + * |
|
| 765 | + * @param array | Array of fields to ignore. Key of the array should be the field name. |
|
| 766 | + * @param int | $form_id |
|
| 767 | + * |
|
| 768 | + * @return Array of fields to ignore. |
|
| 769 | + */ |
|
| 770 | 770 | $ignored_fields = apply_filters( 'yikes-mailchimp-ignore-required-array-field', array( 'addr2' => true ), $this->form_id ); |
| 771 | 771 | |
| 772 | 772 | if ( empty( $val ) && ! isset( $ignored_fields[ $field ] ) ) { |
@@ -797,14 +797,14 @@ discard block |
||
| 797 | 797 | ); |
| 798 | 798 | |
| 799 | 799 | /** |
| 800 | - * yikes-mailchimp-required-form-field-missing |
|
| 801 | - * |
|
| 802 | - * Alter the response message shown to the user for missing required form fields |
|
| 803 | - * |
|
| 804 | - * @param string | $handle_empty_required_field_message | The default message displayed to the user |
|
| 805 | - * @param int | $form_id | The ID of the form |
|
| 806 | - * @param array | $missing_fields | Array of the missing required fields |
|
| 807 | - */ |
|
| 800 | + * yikes-mailchimp-required-form-field-missing |
|
| 801 | + * |
|
| 802 | + * Alter the response message shown to the user for missing required form fields |
|
| 803 | + * |
|
| 804 | + * @param string | $handle_empty_required_field_message | The default message displayed to the user |
|
| 805 | + * @param int | $form_id | The ID of the form |
|
| 806 | + * @param array | $missing_fields | Array of the missing required fields |
|
| 807 | + */ |
|
| 808 | 808 | $default_response = apply_filters( 'yikes-mailchimp-required-form-field-missing', $this->handle_empty_required_field_message, $this->form_id, $missing_fields ); |
| 809 | 809 | |
| 810 | 810 | // If we've found a missing field, return the array of field data |
@@ -813,13 +813,13 @@ discard block |
||
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | /** |
| 816 | - * Check if the submitted form interest group data is missing any required fields |
|
| 817 | - * |
|
| 818 | - * @since 6.3.0 |
|
| 819 | - * |
|
| 820 | - * @param array | $data | The array of user-submitted form values |
|
| 821 | - * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 822 | - */ |
|
| 816 | + * Check if the submitted form interest group data is missing any required fields |
|
| 817 | + * |
|
| 818 | + * @since 6.3.0 |
|
| 819 | + * |
|
| 820 | + * @param array | $data | The array of user-submitted form values |
|
| 821 | + * @param array | $form_fields | The array of form field definitions for this YIKES Mailchimp form |
|
| 822 | + */ |
|
| 823 | 823 | public function check_for_required_interest_groups( $data, $form_fields ) { |
| 824 | 824 | |
| 825 | 825 | // Set up our defaults |
@@ -853,14 +853,14 @@ discard block |
||
| 853 | 853 | ); |
| 854 | 854 | |
| 855 | 855 | /** |
| 856 | - * yikes-mailchimp-required-interest-group-missing |
|
| 857 | - * |
|
| 858 | - * Alter the response message shown to the user for missing required form fields |
|
| 859 | - * |
|
| 860 | - * @param string | $handle_empty_required_interest_group_message | The default message displayed to the user |
|
| 861 | - * @param int | $form_id | The ID of the form |
|
| 862 | - * @param array | $missing_fields | Array of the missing required fields |
|
| 863 | - */ |
|
| 856 | + * yikes-mailchimp-required-interest-group-missing |
|
| 857 | + * |
|
| 858 | + * Alter the response message shown to the user for missing required form fields |
|
| 859 | + * |
|
| 860 | + * @param string | $handle_empty_required_interest_group_message | The default message displayed to the user |
|
| 861 | + * @param int | $form_id | The ID of the form |
|
| 862 | + * @param array | $missing_fields | Array of the missing required fields |
|
| 863 | + */ |
|
| 864 | 864 | $default_response = apply_filters( 'yikes-mailchimp-required-interest-group-missing', $this->handle_empty_required_interest_group_message, $this->form_id, $missing_fields ); |
| 865 | 865 | |
| 866 | 866 | // If we find a required interest group with an empty value, send an error |
@@ -869,13 +869,13 @@ discard block |
||
| 869 | 869 | } |
| 870 | 870 | |
| 871 | 871 | /** |
| 872 | - * Handle the reCAPTCHA |
|
| 873 | - * |
|
| 874 | - * @since 6.3.0 |
|
| 875 | - * |
|
| 876 | - * @param string | $recaptcha_response | The form value of the recaptcha field |
|
| 877 | - * @param int | $version | The version of recaptcha to use. |
|
| 878 | - */ |
|
| 872 | + * Handle the reCAPTCHA |
|
| 873 | + * |
|
| 874 | + * @since 6.3.0 |
|
| 875 | + * |
|
| 876 | + * @param string | $recaptcha_response | The form value of the recaptcha field |
|
| 877 | + * @param int | $version | The version of recaptcha to use. |
|
| 878 | + */ |
|
| 879 | 879 | public function handle_recaptcha( $recaptcha_response, $version = 2 ) { |
| 880 | 880 | |
| 881 | 881 | // Before we the hit the API, let's check that we actually got a response. |
@@ -883,11 +883,11 @@ discard block |
||
| 883 | 883 | if ( empty( $recaptcha_response ) ) { |
| 884 | 884 | |
| 885 | 885 | /** |
| 886 | - * yikes-mailchimp-recaptcha-required-error |
|
| 887 | - * |
|
| 888 | - * Catch the recaptcha errors before they're returned to the user |
|
| 889 | - * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
| 890 | - */ |
|
| 886 | + * yikes-mailchimp-recaptcha-required-error |
|
| 887 | + * |
|
| 888 | + * Catch the recaptcha errors before they're returned to the user |
|
| 889 | + * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
| 890 | + */ |
|
| 891 | 891 | $response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', $this->handle_non_filled_recaptcha_message_message, $this->form_id ); |
| 892 | 892 | return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true ); |
| 893 | 893 | } |
@@ -932,40 +932,40 @@ discard block |
||
| 932 | 932 | } |
| 933 | 933 | |
| 934 | 934 | /** |
| 935 | - * yikes-mailchimp-recaptcha-required-error |
|
| 936 | - * |
|
| 937 | - * Catch the recaptcha errors before they're returned to the user |
|
| 938 | - * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
| 939 | - */ |
|
| 935 | + * yikes-mailchimp-recaptcha-required-error |
|
| 936 | + * |
|
| 937 | + * Catch the recaptcha errors before they're returned to the user |
|
| 938 | + * @param string | $recaptcha_errors | A string of recaptcha errors separated by a space |
|
| 939 | + */ |
|
| 940 | 940 | $response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $recaptcha_errors ), $this->form_id ); |
| 941 | 941 | return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true ); |
| 942 | 942 | } |
| 943 | 943 | } |
| 944 | 944 | |
| 945 | 945 | /** |
| 946 | - * Handle the nonce field |
|
| 947 | - * |
|
| 948 | - * @since 6.3.0 |
|
| 949 | - * |
|
| 950 | - * @param string | $nonce_value | The form value of the nonce |
|
| 951 | - * @param string | $nonce_name | The name of the nonce |
|
| 952 | - */ |
|
| 946 | + * Handle the nonce field |
|
| 947 | + * |
|
| 948 | + * @since 6.3.0 |
|
| 949 | + * |
|
| 950 | + * @param string | $nonce_value | The form value of the nonce |
|
| 951 | + * @param string | $nonce_name | The name of the nonce |
|
| 952 | + */ |
|
| 953 | 953 | public function handle_nonce( $nonce_value, $nonce_name ) { |
| 954 | 954 | |
| 955 | 955 | // First, check our option - this is set in the general settings page |
| 956 | 956 | if ( get_option( 'yikes-mailchimp-use-nonce' ) === '1' ) { |
| 957 | 957 | |
| 958 | 958 | /** |
| 959 | - * yikes-mailchimp-use-nonce-verification |
|
| 960 | - * |
|
| 961 | - * Decide if we're going to check the nonce value. |
|
| 962 | - * The reason we filter this is that some users are experiencing nonce issues repeatedly. |
|
| 963 | - * The default will always be to use the nonce. |
|
| 964 | - * |
|
| 965 | - * @param int | $form_id | The form id |
|
| 966 | - * |
|
| 967 | - * @return bool | True if we should check the nonce |
|
| 968 | - */ |
|
| 959 | + * yikes-mailchimp-use-nonce-verification |
|
| 960 | + * |
|
| 961 | + * Decide if we're going to check the nonce value. |
|
| 962 | + * The reason we filter this is that some users are experiencing nonce issues repeatedly. |
|
| 963 | + * The default will always be to use the nonce. |
|
| 964 | + * |
|
| 965 | + * @param int | $form_id | The form id |
|
| 966 | + * |
|
| 967 | + * @return bool | True if we should check the nonce |
|
| 968 | + */ |
|
| 969 | 969 | $use_nonce = apply_filters( 'yikes-mailchimp-use-nonce-verification', true, $this->form_id ); |
| 970 | 970 | |
| 971 | 971 | // We let the filter override the option because the filter is on a per-form basis |
@@ -978,24 +978,24 @@ discard block |
||
| 978 | 978 | } |
| 979 | 979 | |
| 980 | 980 | /** |
| 981 | - * Handle a merge_variables error |
|
| 982 | - * |
|
| 983 | - * @since 6.3.0 |
|
| 984 | - * |
|
| 985 | - * @param int | $error | Int $error = 1 if an error |
|
| 986 | - * @param string | $message | The message shown to the user |
|
| 987 | - */ |
|
| 981 | + * Handle a merge_variables error |
|
| 982 | + * |
|
| 983 | + * @since 6.3.0 |
|
| 984 | + * |
|
| 985 | + * @param int | $error | Int $error = 1 if an error |
|
| 986 | + * @param string | $message | The message shown to the user |
|
| 987 | + */ |
|
| 988 | 988 | public function handle_merge_variables_error( $error, $message ) { |
| 989 | 989 | return $this->yikes_fail( $hide = 0, $error, $message, array(), $return_response_non_ajax = true ); |
| 990 | 990 | } |
| 991 | 991 | |
| 992 | 992 | /** |
| 993 | - * Handle an empty email field and return the corresponding error message |
|
| 994 | - * |
|
| 995 | - * @since 6.3.0 |
|
| 996 | - * |
|
| 997 | - * @param string | $email |
|
| 998 | - */ |
|
| 993 | + * Handle an empty email field and return the corresponding error message |
|
| 994 | + * |
|
| 995 | + * @since 6.3.0 |
|
| 996 | + * |
|
| 997 | + * @param string | $email |
|
| 998 | + */ |
|
| 999 | 999 | public function handle_empty_email( $email ) { |
| 1000 | 1000 | if ( empty( $email ) ) { |
| 1001 | 1001 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_email_message ); |
@@ -1003,12 +1003,12 @@ discard block |
||
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | 1005 | /** |
| 1006 | - * Check if the form is empty and return the corresponding error message |
|
| 1007 | - * |
|
| 1008 | - * @since 6.3.0 |
|
| 1009 | - * |
|
| 1010 | - * @param array | $form_data |
|
| 1011 | - */ |
|
| 1006 | + * Check if the form is empty and return the corresponding error message |
|
| 1007 | + * |
|
| 1008 | + * @since 6.3.0 |
|
| 1009 | + * |
|
| 1010 | + * @param array | $form_data |
|
| 1011 | + */ |
|
| 1012 | 1012 | public function handle_empty_form( $form_data ) { |
| 1013 | 1013 | if ( empty( $form_data ) ) { |
| 1014 | 1014 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_message ); |
@@ -1016,12 +1016,12 @@ discard block |
||
| 1016 | 1016 | } |
| 1017 | 1017 | |
| 1018 | 1018 | /** |
| 1019 | - * Check if the honeypot is NOT empty and return the corresponding error message |
|
| 1020 | - * |
|
| 1021 | - * @since 6.3.0 |
|
| 1022 | - * |
|
| 1023 | - * @param bool | $honey_pot_filled | True if the honeypot was filled out |
|
| 1024 | - */ |
|
| 1019 | + * Check if the honeypot is NOT empty and return the corresponding error message |
|
| 1020 | + * |
|
| 1021 | + * @since 6.3.0 |
|
| 1022 | + * |
|
| 1023 | + * @param bool | $honey_pot_filled | True if the honeypot was filled out |
|
| 1024 | + */ |
|
| 1025 | 1025 | public function handle_non_empty_honeypot( $honey_pot_filled ) { |
| 1026 | 1026 | if ( $honey_pot_filled === true ) { |
| 1027 | 1027 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_non_empty_honeypot_message ); |
@@ -1029,12 +1029,12 @@ discard block |
||
| 1029 | 1029 | } |
| 1030 | 1030 | |
| 1031 | 1031 | /** |
| 1032 | - * Loop through fields looking for null and return the corresponding error message |
|
| 1033 | - * |
|
| 1034 | - * @since 6.3.0 |
|
| 1035 | - * |
|
| 1036 | - * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
|
| 1037 | - */ |
|
| 1032 | + * Loop through fields looking for null and return the corresponding error message |
|
| 1033 | + * |
|
| 1034 | + * @since 6.3.0 |
|
| 1035 | + * |
|
| 1036 | + * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
|
| 1037 | + */ |
|
| 1038 | 1038 | public function handle_empty_fields_generic( $fields_array ) { |
| 1039 | 1039 | foreach( $fields_array as $field ) { |
| 1040 | 1040 | if ( $field === null ) { |
@@ -1044,12 +1044,12 @@ discard block |
||
| 1044 | 1044 | } |
| 1045 | 1045 | |
| 1046 | 1046 | /** |
| 1047 | - * Check if the list handler is empty and return the corresponding error message |
|
| 1048 | - * |
|
| 1049 | - * @since 6.3.0 |
|
| 1050 | - * |
|
| 1051 | - * @param class | $list_handler | A class that handles list functions |
|
| 1052 | - */ |
|
| 1047 | + * Check if the list handler is empty and return the corresponding error message |
|
| 1048 | + * |
|
| 1049 | + * @since 6.3.0 |
|
| 1050 | + * |
|
| 1051 | + * @param class | $list_handler | A class that handles list functions |
|
| 1052 | + */ |
|
| 1053 | 1053 | public function handle_empty_list_handler( $list_handler ) { |
| 1054 | 1054 | if ( empty( $list_handler ) ) { |
| 1055 | 1055 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_list_handler_message ); |
@@ -1057,12 +1057,12 @@ discard block |
||
| 1057 | 1057 | } |
| 1058 | 1058 | |
| 1059 | 1059 | /** |
| 1060 | - * Check if the form id is empty and return the corresponding error message |
|
| 1061 | - * |
|
| 1062 | - * @since 6.3.0 |
|
| 1063 | - * |
|
| 1064 | - * @param int | $form_id | The form ID |
|
| 1065 | - */ |
|
| 1060 | + * Check if the form id is empty and return the corresponding error message |
|
| 1061 | + * |
|
| 1062 | + * @since 6.3.0 |
|
| 1063 | + * |
|
| 1064 | + * @param int | $form_id | The form ID |
|
| 1065 | + */ |
|
| 1066 | 1066 | public function handle_empty_form_id( $form_id ) { |
| 1067 | 1067 | if ( empty( $form_id ) ) { |
| 1068 | 1068 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_id_message ); |
@@ -1070,10 +1070,10 @@ discard block |
||
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | 1072 | /** |
| 1073 | - * Construct and filter the error message related to user's re-subscribing when it's not allowed |
|
| 1074 | - * |
|
| 1075 | - * @since 6.3.0 |
|
| 1076 | - */ |
|
| 1073 | + * Construct and filter the error message related to user's re-subscribing when it's not allowed |
|
| 1074 | + * |
|
| 1075 | + * @since 6.3.0 |
|
| 1076 | + */ |
|
| 1077 | 1077 | public function handle_disallowed_existing_user_update() { |
| 1078 | 1078 | |
| 1079 | 1079 | // Get the default response |
@@ -1086,10 +1086,10 @@ discard block |
||
| 1086 | 1086 | } |
| 1087 | 1087 | |
| 1088 | 1088 | /** |
| 1089 | - * Construct and filter the error message related to the profile link to update user's profile |
|
| 1090 | - * |
|
| 1091 | - * @since 6.3.0 |
|
| 1092 | - */ |
|
| 1089 | + * Construct and filter the error message related to the profile link to update user's profile |
|
| 1090 | + * |
|
| 1091 | + * @since 6.3.0 |
|
| 1092 | + */ |
|
| 1093 | 1093 | public function handle_updating_existing_user() { |
| 1094 | 1094 | |
| 1095 | 1095 | // Get the first half of the message |
@@ -1114,15 +1114,15 @@ discard block |
||
| 1114 | 1114 | /**** Helper Functions ****/ |
| 1115 | 1115 | |
| 1116 | 1116 | /** |
| 1117 | - * Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults. |
|
| 1118 | - * |
|
| 1119 | - * @since 6.3.0 |
|
| 1120 | - * |
|
| 1121 | - * @param string | $slug | The type of message we're looking for |
|
| 1122 | - * @param string | $response_text| The default response message |
|
| 1123 | - * @param array | $data | An array of data that may be needed to construct the user's error message |
|
| 1124 | - * @return string| $response_text| The $response_text (after it's potentially been changed) |
|
| 1125 | - */ |
|
| 1117 | + * Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults. |
|
| 1118 | + * |
|
| 1119 | + * @since 6.3.0 |
|
| 1120 | + * |
|
| 1121 | + * @param string | $slug | The type of message we're looking for |
|
| 1122 | + * @param string | $response_text| The default response message |
|
| 1123 | + * @param array | $data | An array of data that may be needed to construct the user's error message |
|
| 1124 | + * @return string| $response_text| The $response_text (after it's potentially been changed) |
|
| 1125 | + */ |
|
| 1126 | 1126 | protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) { |
| 1127 | 1127 | |
| 1128 | 1128 | switch( $slug ) { |
@@ -1136,13 +1136,13 @@ discard block |
||
| 1136 | 1136 | } |
| 1137 | 1137 | |
| 1138 | 1138 | /** |
| 1139 | - * yikes-easy-mailchimp-user-already-subscribed-text |
|
| 1140 | - * |
|
| 1141 | - * Catch the message for user's already subscrbed before we show it to the user |
|
| 1142 | - * @param string | $message | The response message |
|
| 1143 | - * @param int | $form_id | The form id |
|
| 1144 | - * @param string | $email | The user's email |
|
| 1145 | - */ |
|
| 1139 | + * yikes-easy-mailchimp-user-already-subscribed-text |
|
| 1140 | + * |
|
| 1141 | + * Catch the message for user's already subscrbed before we show it to the user |
|
| 1142 | + * @param string | $message | The response message |
|
| 1143 | + * @param int | $form_id | The form id |
|
| 1144 | + * @param string | $email | The user's email |
|
| 1145 | + */ |
|
| 1146 | 1146 | $response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-text', $response_text, $this->form_id, $this->email ); |
| 1147 | 1147 | |
| 1148 | 1148 | return $response_text; |
@@ -1161,13 +1161,13 @@ discard block |
||
| 1161 | 1161 | } |
| 1162 | 1162 | |
| 1163 | 1163 | /** |
| 1164 | - * yikes-easy-mailchimp-user-already-subscribed-link-text |
|
| 1165 | - * |
|
| 1166 | - * Catch the message for user's already subscrbed link text before we show it to the user |
|
| 1167 | - * |
|
| 1168 | - * @param string | $response_text | The response message that will be shown to the user |
|
| 1169 | - * @param string | $form_id | The form ID |
|
| 1170 | - */ |
|
| 1164 | + * yikes-easy-mailchimp-user-already-subscribed-link-text |
|
| 1165 | + * |
|
| 1166 | + * Catch the message for user's already subscrbed link text before we show it to the user |
|
| 1167 | + * |
|
| 1168 | + * @param string | $response_text | The response message that will be shown to the user |
|
| 1169 | + * @param string | $form_id | The form ID |
|
| 1170 | + */ |
|
| 1171 | 1171 | $response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-link-text', $response_text, $this->form_id ); |
| 1172 | 1172 | |
| 1173 | 1173 | return $response_text; |
@@ -1181,14 +1181,14 @@ discard block |
||
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | /** |
| 1184 | - * yikes-mailchimp-success-double-optin-response |
|
| 1185 | - * |
|
| 1186 | - * Filter the success message displayed to the user |
|
| 1187 | - * |
|
| 1188 | - * @param string | $response_text | The response message that will be shown to the user |
|
| 1189 | - * @param string | $form_id | The form ID |
|
| 1190 | - * |
|
| 1191 | - */ |
|
| 1184 | + * yikes-mailchimp-success-double-optin-response |
|
| 1185 | + * |
|
| 1186 | + * Filter the success message displayed to the user |
|
| 1187 | + * |
|
| 1188 | + * @param string | $response_text | The response message that will be shown to the user |
|
| 1189 | + * @param string | $form_id | The form ID |
|
| 1190 | + * |
|
| 1191 | + */ |
|
| 1192 | 1192 | $response_text = apply_filters( 'yikes-mailchimp-success-double-optin-response', $response_text, $this->form_id ); |
| 1193 | 1193 | |
| 1194 | 1194 | return $response_text; |
@@ -1201,14 +1201,14 @@ discard block |
||
| 1201 | 1201 | } |
| 1202 | 1202 | |
| 1203 | 1203 | /** |
| 1204 | - * yikes-mailchimp-success-single-optin-response |
|
| 1205 | - * |
|
| 1206 | - * Filter the success message displayed to the user |
|
| 1207 | - * |
|
| 1208 | - * @param string | $response_text | The response message that will be shown to the user |
|
| 1209 | - * @param string | $form_id | The form ID |
|
| 1210 | - * |
|
| 1211 | - */ |
|
| 1204 | + * yikes-mailchimp-success-single-optin-response |
|
| 1205 | + * |
|
| 1206 | + * Filter the success message displayed to the user |
|
| 1207 | + * |
|
| 1208 | + * @param string | $response_text | The response message that will be shown to the user |
|
| 1209 | + * @param string | $form_id | The form ID |
|
| 1210 | + * |
|
| 1211 | + */ |
|
| 1212 | 1212 | $response_text = apply_filters( 'yikes-mailchimp-success-single-optin-response', $response_text, $this->form_id ); |
| 1213 | 1213 | |
| 1214 | 1214 | return $response_text; |
@@ -1221,14 +1221,14 @@ discard block |
||
| 1221 | 1221 | } |
| 1222 | 1222 | |
| 1223 | 1223 | /** |
| 1224 | - * yikes-mailchimp-success-resubscribed-response |
|
| 1225 | - * |
|
| 1226 | - * Filter the success message displayed to the user |
|
| 1227 | - * |
|
| 1228 | - * @param string | $response_text | The response message that will be shown to the user |
|
| 1229 | - * @param string | $form_id | The form ID |
|
| 1230 | - * |
|
| 1231 | - */ |
|
| 1224 | + * yikes-mailchimp-success-resubscribed-response |
|
| 1225 | + * |
|
| 1226 | + * Filter the success message displayed to the user |
|
| 1227 | + * |
|
| 1228 | + * @param string | $response_text | The response message that will be shown to the user |
|
| 1229 | + * @param string | $form_id | The form ID |
|
| 1230 | + * |
|
| 1231 | + */ |
|
| 1232 | 1232 | $response_text = apply_filters( 'yikes-mailchimp-success-resubscribed-response', $response_text, $this->form_id ); |
| 1233 | 1233 | |
| 1234 | 1234 | return $response_text; |
@@ -1244,16 +1244,16 @@ discard block |
||
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | 1246 | /** |
| 1247 | - * yikes-mailchimp-general-error-response |
|
| 1248 | - * |
|
| 1249 | - * Filter the error message displayed to the user |
|
| 1250 | - * |
|
| 1251 | - * @param string | $original_response_text | The original response message returned from the API |
|
| 1252 | - * @param string | $user_defined_response_text | The response message defined by the user |
|
| 1253 | - * @param string | $form_id | The form ID |
|
| 1254 | - * |
|
| 1255 | - * @return string | $response_text | The message that will be shown to the user |
|
| 1256 | - */ |
|
| 1247 | + * yikes-mailchimp-general-error-response |
|
| 1248 | + * |
|
| 1249 | + * Filter the error message displayed to the user |
|
| 1250 | + * |
|
| 1251 | + * @param string | $original_response_text | The original response message returned from the API |
|
| 1252 | + * @param string | $user_defined_response_text | The response message defined by the user |
|
| 1253 | + * @param string | $form_id | The form ID |
|
| 1254 | + * |
|
| 1255 | + * @return string | $response_text | The message that will be shown to the user |
|
| 1256 | + */ |
|
| 1257 | 1257 | $response_text = apply_filters( 'yikes-mailchimp-general-error-response', $original_response_text, $user_defined_response_text, $this->form_id ); |
| 1258 | 1258 | |
| 1259 | 1259 | return $response_text; |
@@ -1267,14 +1267,14 @@ discard block |
||
| 1267 | 1267 | } |
| 1268 | 1268 | |
| 1269 | 1269 | /** |
| 1270 | - * Wrap the response message in HTML for Non-AJAX form submissions |
|
| 1271 | - * |
|
| 1272 | - * @since 6.3.0 |
|
| 1273 | - * |
|
| 1274 | - * @param string | $message | The response message |
|
| 1275 | - * @param bool | $is_success | Boolean signifying if we're returning a success message or an error message |
|
| 1276 | - * @return string| The $message wrapping in HTML |
|
| 1277 | - */ |
|
| 1270 | + * Wrap the response message in HTML for Non-AJAX form submissions |
|
| 1271 | + * |
|
| 1272 | + * @since 6.3.0 |
|
| 1273 | + * |
|
| 1274 | + * @param string | $message | The response message |
|
| 1275 | + * @param bool | $is_success | Boolean signifying if we're returning a success message or an error message |
|
| 1276 | + * @return string| The $message wrapping in HTML |
|
| 1277 | + */ |
|
| 1278 | 1278 | public function wrap_form_submission_response( $message, $is_success ) { |
| 1279 | 1279 | |
| 1280 | 1280 | // If we're successful, we wrap the $message differently |
@@ -1288,14 +1288,14 @@ discard block |
||
| 1288 | 1288 | /**** Returning Success / Failure Functions ****/ |
| 1289 | 1289 | |
| 1290 | 1290 | /** |
| 1291 | - * Return success. Method of returning success based on the $is_ajax flag |
|
| 1292 | - * |
|
| 1293 | - * @since 6.3.0 |
|
| 1294 | - * |
|
| 1295 | - * @param array | $success_array | Array of success values to return |
|
| 1296 | - * |
|
| 1297 | - * @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`. |
|
| 1298 | - */ |
|
| 1291 | + * Return success. Method of returning success based on the $is_ajax flag |
|
| 1292 | + * |
|
| 1293 | + * @since 6.3.0 |
|
| 1294 | + * |
|
| 1295 | + * @param array | $success_array | Array of success values to return |
|
| 1296 | + * |
|
| 1297 | + * @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`. |
|
| 1298 | + */ |
|
| 1299 | 1299 | protected function yikes_success( $success_array ) { |
| 1300 | 1300 | if ( $this->is_ajax === true ) { |
| 1301 | 1301 | wp_send_json_success( $success_array ); |
@@ -1308,18 +1308,18 @@ discard block |
||
| 1308 | 1308 | } |
| 1309 | 1309 | |
| 1310 | 1310 | /** |
| 1311 | - * Return failure. Method of returning failure based on the $is_ajax flag |
|
| 1312 | - * |
|
| 1313 | - * @since 6.3.0 |
|
| 1314 | - * |
|
| 1315 | - * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
| 1316 | - * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
| 1317 | - * @param string | $response | The response message to display to the user |
|
| 1318 | - * @param array | $additional_fields | An array of additional fields to return |
|
| 1319 | - * @param bool | $return_response_non_ajax | Boolean deciding if we need to return a message |
|
| 1320 | - * |
|
| 1321 | - * @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false. |
|
| 1322 | - */ |
|
| 1311 | + * Return failure. Method of returning failure based on the $is_ajax flag |
|
| 1312 | + * |
|
| 1313 | + * @since 6.3.0 |
|
| 1314 | + * |
|
| 1315 | + * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
| 1316 | + * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
| 1317 | + * @param string | $response | The response message to display to the user |
|
| 1318 | + * @param array | $additional_fields | An array of additional fields to return |
|
| 1319 | + * @param bool | $return_response_non_ajax | Boolean deciding if we need to return a message |
|
| 1320 | + * |
|
| 1321 | + * @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false. |
|
| 1322 | + */ |
|
| 1323 | 1323 | protected function yikes_fail( $hide, $error, $response, $additional_fields = array(), $return_response_non_ajax = false ) { |
| 1324 | 1324 | if ( $this->is_ajax === true ) { |
| 1325 | 1325 | $this->yikes_send_json_error( $hide, $error, $response, $additional_fields ); |
@@ -1332,17 +1332,17 @@ discard block |
||
| 1332 | 1332 | } |
| 1333 | 1333 | |
| 1334 | 1334 | /** |
| 1335 | - * Wrapper function for wp_send_json_error() |
|
| 1336 | - * |
|
| 1337 | - * @since 6.3.0 |
|
| 1338 | - * |
|
| 1339 | - * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
| 1340 | - * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
| 1341 | - * @param string | $translated_string | The response message to display to the user |
|
| 1342 | - * @param array | $additional_fields | An array of additional fields to return |
|
| 1343 | - * |
|
| 1344 | - * @return func | wp_send_json_error() |
|
| 1345 | - */ |
|
| 1335 | + * Wrapper function for wp_send_json_error() |
|
| 1336 | + * |
|
| 1337 | + * @since 6.3.0 |
|
| 1338 | + * |
|
| 1339 | + * @param int | $hide | Flag whether to hide the form (1 = hide, 0 = do not hide) |
|
| 1340 | + * @param int | $error | Flag whether this is an error (1 = error, 0 = no error) |
|
| 1341 | + * @param string | $translated_string | The response message to display to the user |
|
| 1342 | + * @param array | $additional_fields | An array of additional fields to return |
|
| 1343 | + * |
|
| 1344 | + * @return func | wp_send_json_error() |
|
| 1345 | + */ |
|
| 1346 | 1346 | protected function yikes_send_json_error( $hide, $error, $translated_string, $additional_fields = array() ) { |
| 1347 | 1347 | |
| 1348 | 1348 | // Default response array |
@@ -1366,14 +1366,14 @@ discard block |
||
| 1366 | 1366 | /** Static functions used in other places **/ |
| 1367 | 1367 | |
| 1368 | 1368 | /** |
| 1369 | - * Handle the redirect logic for successful submissions |
|
| 1370 | - * |
|
| 1371 | - * @since 6.3.0 |
|
| 1372 | - * |
|
| 1373 | - * @param array | $submission_settings | Array of the form's submission settings |
|
| 1374 | - * @param array | $page_data | Page ID |
|
| 1375 | - * @return array| $redirect_array | Array with two values: Redirection flag, Redirect URL |
|
| 1376 | - */ |
|
| 1369 | + * Handle the redirect logic for successful submissions |
|
| 1370 | + * |
|
| 1371 | + * @since 6.3.0 |
|
| 1372 | + * |
|
| 1373 | + * @param array | $submission_settings | Array of the form's submission settings |
|
| 1374 | + * @param array | $page_data | Page ID |
|
| 1375 | + * @return array| $redirect_array | Array with two values: Redirection flag, Redirect URL |
|
| 1376 | + */ |
|
| 1377 | 1377 | public static function handle_submission_response_success_redirect( $form_id, $submission_settings, $page_data ) { |
| 1378 | 1378 | |
| 1379 | 1379 | $default_redirect_time_ms = 1500; |
@@ -1406,23 +1406,23 @@ discard block |
||
| 1406 | 1406 | $redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting; |
| 1407 | 1407 | |
| 1408 | 1408 | /** |
| 1409 | - * yikes-mailchimp-redirect-url |
|
| 1410 | - * |
|
| 1411 | - * Catch the redirect URL before it's shown to the user |
|
| 1412 | - * |
|
| 1413 | - * @param string | $redirect_url | The URL that we will redirect to |
|
| 1414 | - * @param string | $form_id | The ID of the current form being subscribed to |
|
| 1415 | - * @param array | $page_data | An array of data related to the page the form is on |
|
| 1416 | - */ |
|
| 1409 | + * yikes-mailchimp-redirect-url |
|
| 1410 | + * |
|
| 1411 | + * Catch the redirect URL before it's shown to the user |
|
| 1412 | + * |
|
| 1413 | + * @param string | $redirect_url | The URL that we will redirect to |
|
| 1414 | + * @param string | $form_id | The ID of the current form being subscribed to |
|
| 1415 | + * @param array | $page_data | An array of data related to the page the form is on |
|
| 1416 | + */ |
|
| 1417 | 1417 | $redirect_url = apply_filters( 'yikes-mailchimp-redirect-url', $redirect_url, $form_id, $page_data ); |
| 1418 | 1418 | |
| 1419 | 1419 | /** |
| 1420 | - * yikes-mailchimp-redirect-timer |
|
| 1421 | - * |
|
| 1422 | - * Catch the redirect timer before it's sent to the JavaScript file |
|
| 1423 | - * |
|
| 1424 | - * @param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting |
|
| 1425 | - */ |
|
| 1420 | + * yikes-mailchimp-redirect-timer |
|
| 1421 | + * |
|
| 1422 | + * Catch the redirect timer before it's sent to the JavaScript file |
|
| 1423 | + * |
|
| 1424 | + * @param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting |
|
| 1425 | + */ |
|
| 1426 | 1426 | $redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data ); |
| 1427 | 1427 | |
| 1428 | 1428 | $redirect_array['redirect_timer'] = $redirect_timer; |
@@ -255,13 +255,13 @@ discard block |
||
| 255 | 255 | $this->handle_updating_existing_user_link_message = __( 'To update your Mailchimp profile, please click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ); |
| 256 | 256 | $this->handle_empty_required_field_message = __( 'A required field is missing.', 'yikes-inc-easy-mailchimp-extender' ); |
| 257 | 257 | $this->handle_empty_required_interest_group_message = __( 'A required interest group is missing.', 'yikes-inc-easy-mailchimp-extender' ); |
| 258 | - $this->handle_nonce_message = __( 'Error: Sorry, the nonce security check didn\'t pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 258 | + $this->handle_nonce_message = __( 'Error: Sorry, the nonce security check didn\'t pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 259 | 259 | $this->handle_non_filled_recaptcha_message_message = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' ); |
| 260 | 260 | $this->generic_recaptcha_error_message = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' ); |
| 261 | 261 | |
| 262 | 262 | // Define our success messages |
| 263 | - $this->default_response_single_optin_success_message = __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 264 | - $this->default_response_double_optin_success_message = __( 'Thank you for subscribing. Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ); |
|
| 263 | + $this->default_response_single_optin_success_message = __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 264 | + $this->default_response_double_optin_success_message = __( 'Thank you for subscribing. Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ); |
|
| 265 | 265 | $this->existing_subscriber_profile_update_message = __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' ); |
| 266 | 266 | } |
| 267 | 267 | |
@@ -373,16 +373,16 @@ discard block |
||
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | // Check if the current iteration has a 'date_format' key set (i.e. date/birthday fields) |
| 376 | - if ( isset( $form_fields[ $merge_tag ]['date_format'] ) ) { |
|
| 377 | - $sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ]['date_format'] ); |
|
| 376 | + if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) { |
|
| 377 | + $sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ][ 'date_format' ] ); |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | $merge_variables[ $merge_tag ] = $sanitized; |
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | // Make sure we send the lower-cased, sanitized email so it matches the one we're sending in the body of the request. |
| 384 | - if ( isset( $merge_variables['EMAIL'] ) ) { |
|
| 385 | - $merge_variables['EMAIL'] = $this->email; |
|
| 384 | + if ( isset( $merge_variables[ 'EMAIL' ] ) ) { |
|
| 385 | + $merge_variables[ 'EMAIL' ] = $this->email; |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | if ( count( $pieces ) === 3 ) { |
| 460 | 460 | |
| 461 | 461 | // $pieces[1] = MM. $pieces[0] = DD. $date = MM/DD/YYYY |
| 462 | - $date = $pieces[1] . '/' . $pieces[0] . '/' . $pieces[2]; |
|
| 462 | + $date = $pieces[ 1 ] . '/' . $pieces[ 0 ] . '/' . $pieces[ 2 ]; |
|
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | return $date; |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | if ( count( $pieces ) === 2 ) { |
| 485 | 485 | |
| 486 | 486 | // $pieces[1] = MM. $pieces[0] = DD. $birthday = MM/DD |
| 487 | - $birthday = $pieces[1] . '/' . $pieces[0]; |
|
| 487 | + $birthday = $pieces[ 1 ] . '/' . $pieces[ 0 ]; |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | return $birthday; |
@@ -517,12 +517,12 @@ discard block |
||
| 517 | 517 | // Loop through the interest groups and create a single array like {group_id} => false |
| 518 | 518 | foreach ( $interest_groupings as $group_data ) { |
| 519 | 519 | |
| 520 | - if ( empty( $group_data['items'] ) || ! is_array( $group_data['items'] ) ) { |
|
| 520 | + if ( empty( $group_data[ 'items' ] ) || ! is_array( $group_data[ 'items' ] ) ) { |
|
| 521 | 521 | continue; |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | - foreach ( $group_data['items'] as $item ) { |
|
| 525 | - $groups[ $item['id'] ] = false; |
|
| 524 | + foreach ( $group_data[ 'items' ] as $item ) { |
|
| 525 | + $groups[ $item[ 'id' ] ] = false; |
|
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications ); |
| 636 | 636 | |
| 637 | 637 | // Get the optin value |
| 638 | - $optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0; |
|
| 638 | + $optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0; |
|
| 639 | 639 | |
| 640 | 640 | if ( 1 === $optin ) { |
| 641 | 641 | |
@@ -665,13 +665,13 @@ discard block |
||
| 665 | 665 | |
| 666 | 666 | // Construct our success array variables |
| 667 | 667 | $return_success_array = array( |
| 668 | - 'hide' => $submission_settings['hide_form_post_signup'], |
|
| 668 | + 'hide' => $submission_settings[ 'hide_form_post_signup' ], |
|
| 669 | 669 | 'error' => 0, |
| 670 | 670 | 'response' => $response_message, |
| 671 | - 'redirection' => $redirect_array['redirection'], |
|
| 672 | - 'redirect' => $redirect_array['redirect'], |
|
| 673 | - 'new_window' => $redirect_array['new_window'], |
|
| 674 | - 'redirect_timer' => $redirect_array['redirect_timer'], |
|
| 671 | + 'redirection' => $redirect_array[ 'redirection' ], |
|
| 672 | + 'redirect' => $redirect_array[ 'redirect' ], |
|
| 673 | + 'new_window' => $redirect_array[ 'new_window' ], |
|
| 674 | + 'redirect_timer' => $redirect_array[ 'redirect_timer' ], |
|
| 675 | 675 | ); |
| 676 | 676 | |
| 677 | 677 | // Return success array |
@@ -693,12 +693,12 @@ discard block |
||
| 693 | 693 | $details = ''; |
| 694 | 694 | |
| 695 | 695 | // Loop through the error data and retrieve any fields and messages |
| 696 | - if ( isset( $error_data['data'] ) ) { |
|
| 697 | - foreach ( $error_data['data'] as $datum ) { |
|
| 698 | - if ( ! isset( $datum['field'], $datum['message'] ) ) { |
|
| 696 | + if ( isset( $error_data[ 'data' ] ) ) { |
|
| 697 | + foreach ( $error_data[ 'data' ] as $datum ) { |
|
| 698 | + if ( ! isset( $datum[ 'field' ], $datum[ 'message' ] ) ) { |
|
| 699 | 699 | continue; |
| 700 | 700 | } |
| 701 | - $details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum['field'] ]['label'], $datum['message'] ); |
|
| 701 | + $details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum[ 'field' ] ][ 'label' ], $datum[ 'message' ] ); |
|
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | |
@@ -741,21 +741,21 @@ discard block |
||
| 741 | 741 | $missing_fields = array(); |
| 742 | 742 | |
| 743 | 743 | // Loop through submitted form data |
| 744 | - foreach( $data as $merge_tag => $value ) { |
|
| 744 | + foreach ( $data as $merge_tag => $value ) { |
|
| 745 | 745 | |
| 746 | 746 | // Skip interest groups |
| 747 | - if ( isset( $form_fields[ $merge_tag ]['group_id'] ) ) { |
|
| 747 | + if ( isset( $form_fields[ $merge_tag ][ 'group_id' ] ) ) { |
|
| 748 | 748 | continue; |
| 749 | 749 | } |
| 750 | 750 | |
| 751 | 751 | // check if this field is required |
| 752 | - if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ]['require'] ) && $form_fields[ $merge_tag ]['require'] === '1' ) { |
|
| 752 | + if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ][ 'require' ] ) && $form_fields[ $merge_tag ][ 'require' ] === '1' ) { |
|
| 753 | 753 | |
| 754 | 754 | // Check if the field(s) are empty |
| 755 | 755 | if ( is_array( $value ) ) { |
| 756 | 756 | |
| 757 | 757 | // Loop through the data and check if any are empty |
| 758 | - foreach( $value as $field => $val ) { |
|
| 758 | + foreach ( $value as $field => $val ) { |
|
| 759 | 759 | |
| 760 | 760 | /** |
| 761 | 761 | * 'yikes-mailchimp-ignore-required-array-field' |
@@ -774,13 +774,13 @@ discard block |
||
| 774 | 774 | |
| 775 | 775 | // Set the merge label (e.g. MMERGE6) as the key so we don't get the same field multiple times |
| 776 | 776 | // (e.g. For arrays, like an address, where multiple address fields are empty) |
| 777 | - $missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ]; |
|
| 777 | + $missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ]; |
|
| 778 | 778 | } |
| 779 | 779 | } |
| 780 | 780 | |
| 781 | 781 | } else if ( empty( $value ) ) { |
| 782 | 782 | $field_is_missing = true; |
| 783 | - $missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ]; |
|
| 783 | + $missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ]; |
|
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | 786 | } |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | foreach ( $form_fields as $merge_tag => $field_data ) { |
| 831 | 831 | |
| 832 | 832 | // If an interest group and it's required |
| 833 | - if ( isset( $field_data['group_id'] ) && isset( $field_data['require'] ) && $field_data['require'] === '1' ) { |
|
| 833 | + if ( isset( $field_data[ 'group_id' ] ) && isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] === '1' ) { |
|
| 834 | 834 | |
| 835 | 835 | // Check if it was submitted (meaning, check if it's set in our $data array) |
| 836 | 836 | if ( ! isset( $data[ 'group-' . $merge_tag ] ) ) { |
@@ -900,35 +900,35 @@ discard block |
||
| 900 | 900 | break; |
| 901 | 901 | |
| 902 | 902 | case 3: |
| 903 | - $recaptcha_secret_key = get_option( 'yikes-mc-recaptcha-secret-key-three' , '' ); |
|
| 903 | + $recaptcha_secret_key = get_option( 'yikes-mc-recaptcha-secret-key-three', '' ); |
|
| 904 | 904 | break; |
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | // Construct the API URL |
| 908 | - $url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . $recaptcha_secret_key . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER['REMOTE_ADDR'] ); |
|
| 908 | + $url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . $recaptcha_secret_key . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER[ 'REMOTE_ADDR' ] ); |
|
| 909 | 909 | $response = wp_remote_get( $url ); |
| 910 | - $response_body = json_decode( $response['body'], true ); |
|
| 910 | + $response_body = json_decode( $response[ 'body' ], true ); |
|
| 911 | 911 | |
| 912 | 912 | // Set up errors array |
| 913 | 913 | $recaptcha_errors = array(); |
| 914 | 914 | |
| 915 | 915 | // if we've hit an error, lets return the error! |
| 916 | - if ( true !== $response_body['success'] ) { |
|
| 916 | + if ( true !== $response_body[ 'success' ] ) { |
|
| 917 | 917 | |
| 918 | - if( isset( $response_body['error-codes'] ) ) { |
|
| 918 | + if ( isset( $response_body[ 'error-codes' ] ) ) { |
|
| 919 | 919 | |
| 920 | 920 | // Loop through response error codes |
| 921 | - foreach ( $response_body['error-codes'] as $error_code ) { |
|
| 921 | + foreach ( $response_body[ 'error-codes' ] as $error_code ) { |
|
| 922 | 922 | if ( 'missing-input-response' === $error_code ) { |
| 923 | 923 | $error_code = $this->handle_non_filled_recaptcha_message; |
| 924 | 924 | } |
| 925 | 925 | |
| 926 | 926 | // Add our error_code to the errors array |
| 927 | - $recaptcha_errors[] = $error_code; |
|
| 927 | + $recaptcha_errors[ ] = $error_code; |
|
| 928 | 928 | } |
| 929 | 929 | |
| 930 | 930 | } else { |
| 931 | - $recaptcha_errors[] = $this->generic_recaptcha_error_message; |
|
| 931 | + $recaptcha_errors[ ] = $this->generic_recaptcha_error_message; |
|
| 932 | 932 | } |
| 933 | 933 | |
| 934 | 934 | /** |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | * @param array | $fields_array | An array of fields to loop through and make sure they're not null |
| 1037 | 1037 | */ |
| 1038 | 1038 | public function handle_empty_fields_generic( $fields_array ) { |
| 1039 | - foreach( $fields_array as $field ) { |
|
| 1039 | + foreach ( $fields_array as $field ) { |
|
| 1040 | 1040 | if ( $field === null ) { |
| 1041 | 1041 | return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_fields_generic_message ); |
| 1042 | 1042 | } |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | |
| 1103 | 1103 | // Append our 'send-update-email' link and text |
| 1104 | 1104 | $response .= $link_start_tag; |
| 1105 | - $response .= $this->handle_updating_existing_user_link_message; |
|
| 1105 | + $response .= $this->handle_updating_existing_user_link_message; |
|
| 1106 | 1106 | $response .= $link_close_tag; |
| 1107 | 1107 | |
| 1108 | 1108 | // Check for a user-defined message |
@@ -1125,14 +1125,14 @@ discard block |
||
| 1125 | 1125 | */ |
| 1126 | 1126 | protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) { |
| 1127 | 1127 | |
| 1128 | - switch( $slug ) { |
|
| 1128 | + switch ( $slug ) { |
|
| 1129 | 1129 | case 'already-subscribed': |
| 1130 | 1130 | |
| 1131 | 1131 | // Check if this error message exists |
| 1132 | - if ( isset( $this->error_messages['already-subscribed'] ) && ! empty( $this->error_messages['already-subscribed'] ) ) { |
|
| 1132 | + if ( isset( $this->error_messages[ 'already-subscribed' ] ) && ! empty( $this->error_messages[ 'already-subscribed' ] ) ) { |
|
| 1133 | 1133 | |
| 1134 | 1134 | // Check if the substring (that we replace) '[email]' is located in the string and replace it |
| 1135 | - $response_text = str_replace( '[email]', $this->email, $this->error_messages['already-subscribed'] ); |
|
| 1135 | + $response_text = str_replace( '[email]', $this->email, $this->error_messages[ 'already-subscribed' ] ); |
|
| 1136 | 1136 | } |
| 1137 | 1137 | |
| 1138 | 1138 | /** |
@@ -1151,13 +1151,13 @@ discard block |
||
| 1151 | 1151 | case 'update-link': |
| 1152 | 1152 | |
| 1153 | 1153 | // Check if this error message exists |
| 1154 | - if ( $data !== false && isset( $this->error_messages['update-link'] ) && ! empty( $this->error_messages['update-link'] ) ) { |
|
| 1154 | + if ( $data !== false && isset( $this->error_messages[ 'update-link' ] ) && ! empty( $this->error_messages[ 'update-link' ] ) ) { |
|
| 1155 | 1155 | |
| 1156 | 1156 | // Check if the substring (that we replace) '[link]' is located in the string and replace it |
| 1157 | - $response_text = str_replace( '[link]', $data['link_start_tag'], $this->error_messages['update-link'] ); |
|
| 1157 | + $response_text = str_replace( '[link]', $data[ 'link_start_tag' ], $this->error_messages[ 'update-link' ] ); |
|
| 1158 | 1158 | |
| 1159 | 1159 | // Remove [/link] |
| 1160 | - $response_text = str_replace( '[/link]', $data['link_close_tag'], $response_text ); |
|
| 1160 | + $response_text = str_replace( '[/link]', $data[ 'link_close_tag' ], $response_text ); |
|
| 1161 | 1161 | } |
| 1162 | 1162 | |
| 1163 | 1163 | /** |
@@ -1176,8 +1176,8 @@ discard block |
||
| 1176 | 1176 | case 'success': |
| 1177 | 1177 | |
| 1178 | 1178 | // 'success' is the user-defined success message for double opt-in |
| 1179 | - if ( isset( $this->error_messages['success'] ) && ! empty( $this->error_messages['success'] ) ) { |
|
| 1180 | - $response_text = $this->error_messages['success']; |
|
| 1179 | + if ( isset( $this->error_messages[ 'success' ] ) && ! empty( $this->error_messages[ 'success' ] ) ) { |
|
| 1180 | + $response_text = $this->error_messages[ 'success' ]; |
|
| 1181 | 1181 | } |
| 1182 | 1182 | |
| 1183 | 1183 | /** |
@@ -1196,8 +1196,8 @@ discard block |
||
| 1196 | 1196 | |
| 1197 | 1197 | case 'success-single-optin': |
| 1198 | 1198 | |
| 1199 | - if ( isset( $this->error_messages['success-single-optin'] ) && ! empty( $this->error_messages['success-single-optin'] ) ) { |
|
| 1200 | - $response_text = $this->error_messages['success-single-optin']; |
|
| 1199 | + if ( isset( $this->error_messages[ 'success-single-optin' ] ) && ! empty( $this->error_messages[ 'success-single-optin' ] ) ) { |
|
| 1200 | + $response_text = $this->error_messages[ 'success-single-optin' ]; |
|
| 1201 | 1201 | } |
| 1202 | 1202 | |
| 1203 | 1203 | /** |
@@ -1216,8 +1216,8 @@ discard block |
||
| 1216 | 1216 | |
| 1217 | 1217 | case 'success-resubscribed': |
| 1218 | 1218 | |
| 1219 | - if ( isset( $this->error_messages['success-resubscribed'] ) && ! empty( $this->error_messages['success-resubscribed'] ) ) { |
|
| 1220 | - $response_text = $this->error_messages['success-resubscribed']; |
|
| 1219 | + if ( isset( $this->error_messages[ 'success-resubscribed' ] ) && ! empty( $this->error_messages[ 'success-resubscribed' ] ) ) { |
|
| 1220 | + $response_text = $this->error_messages[ 'success-resubscribed' ]; |
|
| 1221 | 1221 | } |
| 1222 | 1222 | |
| 1223 | 1223 | /** |
@@ -1239,8 +1239,8 @@ discard block |
||
| 1239 | 1239 | $original_response_text = $response_text; |
| 1240 | 1240 | $user_defined_response_text = ''; |
| 1241 | 1241 | |
| 1242 | - if ( isset( $this->error_messages['general-error'] ) && ! empty( $this->error_messages['general-error'] ) ) { |
|
| 1243 | - $user_defined_response_text = $this->error_messages['general-error']; |
|
| 1242 | + if ( isset( $this->error_messages[ 'general-error' ] ) && ! empty( $this->error_messages[ 'general-error' ] ) ) { |
|
| 1243 | + $user_defined_response_text = $this->error_messages[ 'general-error' ]; |
|
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | 1246 | /** |
@@ -1302,7 +1302,7 @@ discard block |
||
| 1302 | 1302 | } else { |
| 1303 | 1303 | global $process_submission_response; |
| 1304 | 1304 | |
| 1305 | - $process_submission_response = isset( $success_array['response'] ) ? $success_array['response'] : ''; // DEFAULT SUCCESS? |
|
| 1305 | + $process_submission_response = isset( $success_array[ 'response' ] ) ? $success_array[ 'response' ] : ''; // DEFAULT SUCCESS? |
|
| 1306 | 1306 | $process_submission_response = $this->wrap_form_submission_response( $process_submission_response, $is_success = true ); |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
@@ -1355,8 +1355,8 @@ discard block |
||
| 1355 | 1355 | // Add additional fields we've been supplied |
| 1356 | 1356 | if ( ! empty( $additional_fields ) ) { |
| 1357 | 1357 | |
| 1358 | - foreach( $additional_fields as $key => $value ) { |
|
| 1359 | - $response_array[$key] = $value; |
|
| 1358 | + foreach ( $additional_fields as $key => $value ) { |
|
| 1359 | + $response_array[ $key ] = $value; |
|
| 1360 | 1360 | } |
| 1361 | 1361 | } |
| 1362 | 1362 | |
@@ -1387,20 +1387,20 @@ discard block |
||
| 1387 | 1387 | ); |
| 1388 | 1388 | |
| 1389 | 1389 | // Let's confirm we have a value before trying to use it |
| 1390 | - $redirect_setting = isset( $submission_settings['redirect_on_submission'] ) ? $submission_settings['redirect_on_submission'] : false; |
|
| 1390 | + $redirect_setting = isset( $submission_settings[ 'redirect_on_submission' ] ) ? $submission_settings[ 'redirect_on_submission' ] : false; |
|
| 1391 | 1391 | |
| 1392 | 1392 | // Check the redirect flag |
| 1393 | 1393 | if ( '1' === $redirect_setting ) { |
| 1394 | 1394 | |
| 1395 | 1395 | // Supply return array with default value of 1 |
| 1396 | - $redirect_array['redirection'] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data ); |
|
| 1396 | + $redirect_array[ 'redirection' ] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data ); |
|
| 1397 | 1397 | |
| 1398 | 1398 | // Let's confirm we have redirect_page/custom_redirect_url/new_window values |
| 1399 | - $redirect_page_setting = isset( $submission_settings['redirect_page'] ) ? $submission_settings['redirect_page'] : false; |
|
| 1400 | - $custom_redirect_setting = isset( $submission_settings['custom_redirect_url'] ) ? $submission_settings['custom_redirect_url'] : false; |
|
| 1401 | - $redirect_new_window = isset( $submission_settings['redirect_new_window'] ) ? $submission_settings['redirect_new_window'] : false; |
|
| 1399 | + $redirect_page_setting = isset( $submission_settings[ 'redirect_page' ] ) ? $submission_settings[ 'redirect_page' ] : false; |
|
| 1400 | + $custom_redirect_setting = isset( $submission_settings[ 'custom_redirect_url' ] ) ? $submission_settings[ 'custom_redirect_url' ] : false; |
|
| 1401 | + $redirect_new_window = isset( $submission_settings[ 'redirect_new_window' ] ) ? $submission_settings[ 'redirect_new_window' ] : false; |
|
| 1402 | 1402 | |
| 1403 | - $redirect_array['new_window'] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data ); |
|
| 1403 | + $redirect_array[ 'new_window' ] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data ); |
|
| 1404 | 1404 | |
| 1405 | 1405 | // Check if we're redirecting to a custom_url or just the redirect_page |
| 1406 | 1406 | $redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting; |
@@ -1425,9 +1425,9 @@ discard block |
||
| 1425 | 1425 | */ |
| 1426 | 1426 | $redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data ); |
| 1427 | 1427 | |
| 1428 | - $redirect_array['redirect_timer'] = $redirect_timer; |
|
| 1428 | + $redirect_array[ 'redirect_timer' ] = $redirect_timer; |
|
| 1429 | 1429 | |
| 1430 | - $redirect_array['redirect'] = $redirect_url; |
|
| 1430 | + $redirect_array[ 'redirect' ] = $redirect_url; |
|
| 1431 | 1431 | } |
| 1432 | 1432 | |
| 1433 | 1433 | return $redirect_array; |
@@ -1436,7 +1436,7 @@ discard block |
||
| 1436 | 1436 | public function maybe_add_tags( $form_data, $subscriber_data ) { |
| 1437 | 1437 | |
| 1438 | 1438 | // Add the form's tags |
| 1439 | - $form_tags = isset( $form_data['tags'] ) ? $form_data['tags'] : array(); |
|
| 1439 | + $form_tags = isset( $form_data[ 'tags' ] ) ? $form_data[ 'tags' ] : array(); |
|
| 1440 | 1440 | $form_tags = apply_filters( 'yikes_mailchimp_subscriber_tags', $form_tags, $form_data, $this->list_id, $subscriber_data ); |
| 1441 | 1441 | |
| 1442 | 1442 | if ( ! empty( $form_tags ) ) { |
@@ -1445,7 +1445,7 @@ discard block |
||
| 1445 | 1445 | $add_tag = apply_filters( 'yikes_mailchimp_subscriber_tag_active', true, $tag, $this->list_id, $subscriber_data ); |
| 1446 | 1446 | |
| 1447 | 1447 | if ( $add_tag ) { |
| 1448 | - $list_handler->create_member_tags( $this->list_id, $tag['id'], array( 'email_address' => $this->email ) ); |
|
| 1448 | + $list_handler->create_member_tags( $this->list_id, $tag[ 'id' ], array( 'email_address' => $this->email ) ); |
|
| 1449 | 1449 | } |
| 1450 | 1450 | } |
| 1451 | 1451 | } |
