@@ -4,7 +4,7 @@ discard block  | 
                                                    ||
| 4 | 4 | - php version, wp version, plugin version and debug log  | 
                                                        
| 5 | 5 | -->  | 
                                                        
| 6 | 6 | |
| 7 | -<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>  | 
                                                        |
| 7 | +<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>  | 
                                                        |
| 8 | 8 | |
| 9 | 9 | <div class="inside">  | 
                                                        
| 10 | 10 | |
@@ -13,10 +13,10 @@ discard block  | 
                                                    ||
| 13 | 13 | |
| 14 | 14 | <?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>  | 
                                                        
| 15 | 15 | |
| 16 | - <label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>  | 
                                                        |
| 17 | - <input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>  | 
                                                        |
| 16 | + <label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>  | 
                                                        |
| 17 | + <input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>  | 
                                                        |
| 18 | 18 | </label>  | 
                                                        
| 19 | - <p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>  | 
                                                        |
| 19 | + <p class="description"><?php _e( "If you encounter an issue with Easy Forms for MailChimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>  | 
                                                        |
| 20 | 20 | |
| 21 | 21 | <?php submit_button(); ?>  | 
                                                        
| 22 | 22 | |
@@ -35,7 +35,7 @@ discard block  | 
                                                    ||
| 35 | 35 | )  | 
                                                        
| 36 | 36 | );  | 
                                                        
| 37 | 37 | ?>  | 
                                                        
| 38 | - <h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?>   <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>  | 
                                                        |
| 38 | + <h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?>   <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>  | 
                                                        |
| 39 | 39 | |
| 40 | 40 | <table class="widefat" id="yikes-mailchimp-error-log">  | 
                                                        
| 41 | 41 | <!-- table header -->  | 
                                                        
@@ -7,13 +7,13 @@ discard block  | 
                                                    ||
| 7 | 7 |  	class Yikes_Inc_Easy_Mailchimp_Extender_Helper { | 
                                                        
| 8 | 8 | |
| 9 | 9 | /**  | 
                                                        
| 10 | - * Helper functions to help out with extensions (still fleshing out)  | 
                                                        |
| 11 | - * @since 6.0  | 
                                                        |
| 12 | - * @ Parameters (array of data)  | 
                                                        |
| 13 | - * - Section ID - id of the section, should be a slug style text ie: 'custom-section'  | 
                                                        |
| 14 | - * - Link Text - Visible text for this link ie: 'Custom Section'  | 
                                                        |
| 15 | - * - Dashicon - class of the icon you would like to use for this link  | 
                                                        |
| 16 | - **/  | 
                                                        |
| 10 | + * Helper functions to help out with extensions (still fleshing out)  | 
                                                        |
| 11 | + * @since 6.0  | 
                                                        |
| 12 | + * @ Parameters (array of data)  | 
                                                        |
| 13 | + * - Section ID - id of the section, should be a slug style text ie: 'custom-section'  | 
                                                        |
| 14 | + * - Link Text - Visible text for this link ie: 'Custom Section'  | 
                                                        |
| 15 | + * - Dashicon - class of the icon you would like to use for this link  | 
                                                        |
| 16 | + **/  | 
                                                        |
| 17 | 17 |  			public static function add_edit_form_section_link( $link_array=array() ) { | 
                                                        
| 18 | 18 |  				if( !empty( $link_array ) ) { | 
                                                        
| 19 | 19 | $link_data = wp_parse_args( array() , $link_array );  | 
                                                        
@@ -36,17 +36,17 @@ discard block  | 
                                                    ||
| 36 | 36 | }  | 
                                                        
| 37 | 37 | |
| 38 | 38 | /**  | 
                                                        
| 39 | - * Helper functions to help out with extensions (still fleshing out)  | 
                                                        |
| 40 | - * @since 6.0  | 
                                                        |
| 41 | - * @ Parameters:  | 
                                                        |
| 42 | - * - Section ID - id of the section, should be a slug style text ie: 'custom-section'  | 
                                                        |
| 43 | - * - Class - class file to call function from?  | 
                                                        |
| 44 | - * - Main Callback - call back for main section  | 
                                                        |
| 45 | - * - Main Section Title - main section title  | 
                                                        |
| 46 | - * - Sidebar Callback - callback for the sidebar section  | 
                                                        |
| 47 | - * - Sidebar Title - title of the sidebar section  | 
                                                        |
| 48 | - * - Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))  | 
                                                        |
| 49 | - **/  | 
                                                        |
| 39 | + * Helper functions to help out with extensions (still fleshing out)  | 
                                                        |
| 40 | + * @since 6.0  | 
                                                        |
| 41 | + * @ Parameters:  | 
                                                        |
| 42 | + * - Section ID - id of the section, should be a slug style text ie: 'custom-section'  | 
                                                        |
| 43 | + * - Class - class file to call function from?  | 
                                                        |
| 44 | + * - Main Callback - call back for main section  | 
                                                        |
| 45 | + * - Main Section Title - main section title  | 
                                                        |
| 46 | + * - Sidebar Callback - callback for the sidebar section  | 
                                                        |
| 47 | + * - Sidebar Title - title of the sidebar section  | 
                                                        |
| 48 | + * - Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))  | 
                                                        |
| 49 | + **/  | 
                                                        |
| 50 | 50 |  			public static function add_edit_form_section( $section_array=array() ) { | 
                                                        
| 51 | 51 |  				if( !empty( $section_array ) ) { | 
                                                        
| 52 | 52 | $section_data = wp_parse_args( array() , $section_array );  | 
                                                        
@@ -59,11 +59,11 @@ discard block  | 
                                                    ||
| 59 | 59 | }  | 
                                                        
| 60 | 60 | |
| 61 | 61 | /**  | 
                                                        
| 62 | - * Check if the custom section is single or two columns (with sidebar)  | 
                                                        |
| 63 | - * @since 6.0  | 
                                                        |
| 64 | - * @Parameters:  | 
                                                        |
| 65 | - * - Section Data - the array of data associated with the custom field you've set up  | 
                                                        |
| 66 | - */  | 
                                                        |
| 62 | + * Check if the custom section is single or two columns (with sidebar)  | 
                                                        |
| 63 | + * @since 6.0  | 
                                                        |
| 64 | + * @Parameters:  | 
                                                        |
| 65 | + * - Section Data - the array of data associated with the custom field you've set up  | 
                                                        |
| 66 | + */  | 
                                                        |
| 67 | 67 |  			public static function is_custom_section_two_column( $custom_section_data ) { | 
                                                        
| 68 | 68 | // print_r( $custom_section_data );  | 
                                                        
| 69 | 69 | $value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ? true : false;  | 
                                                        
@@ -14,21 +14,21 @@ discard block  | 
                                                    ||
| 14 | 14 | * - Link Text - Visible text for this link ie: 'Custom Section'  | 
                                                        
| 15 | 15 | * - Dashicon - class of the icon you would like to use for this link  | 
                                                        
| 16 | 16 | **/  | 
                                                        
| 17 | -			public static function add_edit_form_section_link( $link_array=array() ) { | 
                                                        |
| 18 | -				if( !empty( $link_array ) ) { | 
                                                        |
| 19 | - $link_data = wp_parse_args( array() , $link_array );  | 
                                                        |
| 20 | -					if( !empty( $link_data['text'] ) && !empty( $link_data['id'] ) ) { | 
                                                        |
| 21 | -						if( !empty( $link_data['icon'] ) ) { | 
                                                        |
| 22 | -							if( !isset( $link_data['icon_family'] ) || $link_data['icon_family'] == 'dashicons' || $link_data['icon_family'] == 'dashicon' ) { | 
                                                        |
| 23 | - $icon = '<span class="dashicons dashicons-' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';  | 
                                                        |
| 17 | +			public static function add_edit_form_section_link( $link_array = array() ) { | 
                                                        |
| 18 | +				if ( ! empty( $link_array ) ) { | 
                                                        |
| 19 | + $link_data = wp_parse_args( array(), $link_array );  | 
                                                        |
| 20 | +					if ( ! empty( $link_data[ 'text' ] ) && ! empty( $link_data[ 'id' ] ) ) { | 
                                                        |
| 21 | +						if ( ! empty( $link_data[ 'icon' ] ) ) { | 
                                                        |
| 22 | +							if ( ! isset( $link_data[ 'icon_family' ] ) || $link_data[ 'icon_family' ] == 'dashicons' || $link_data[ 'icon_family' ] == 'dashicon' ) { | 
                                                        |
| 23 | + $icon = '<span class="dashicons dashicons-' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';  | 
                                                        |
| 24 | 24 |  							} else { | 
                                                        
| 25 | - $icon = '<span class="' . esc_attr__( $link_data['icon'] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';  | 
                                                        |
| 25 | + $icon = '<span class="' . esc_attr__( $link_data[ 'icon' ] ) . ' yikes-easy-mailchimp-custom-content-icon"></span>';  | 
                                                        |
| 26 | 26 | }  | 
                                                        
| 27 | 27 |  						} else { | 
                                                        
| 28 | 28 | $icon = '';  | 
                                                        
| 29 | 29 | }  | 
                                                        
| 30 | 30 | $link = '<li class="hidden_setting_list">';  | 
                                                        
| 31 | - $link .= '<a class="hidden_setting ' . esc_attr__( $link_data['id'] ) . '" data-attr-container="' . esc_attr__( $link_data['id'] ) . '" onclick="return false;" title="' . esc_attr__( $link_data['text'] ) . '" href="#">' . $icon . esc_attr__( $link_data['text'] ) . '</a>';  | 
                                                        |
| 31 | + $link .= '<a class="hidden_setting ' . esc_attr__( $link_data[ 'id' ] ) . '" data-attr-container="' . esc_attr__( $link_data[ 'id' ] ) . '" onclick="return false;" title="' . esc_attr__( $link_data[ 'text' ] ) . '" href="#">' . $icon . esc_attr__( $link_data[ 'text' ] ) . '</a>';  | 
                                                        |
| 32 | 32 | $link .= '</li>';  | 
                                                        
| 33 | 33 | echo $link;  | 
                                                        
| 34 | 34 | }  | 
                                                        
@@ -47,9 +47,9 @@ discard block  | 
                                                    ||
| 47 | 47 | * - Sidebar Title - title of the sidebar section  | 
                                                        
| 48 | 48 | * - Class - class to reference funtions out of (optiona, if left blank functions should be defined in functions.php (or outside of a class))  | 
                                                        
| 49 | 49 | **/  | 
                                                        
| 50 | -			public static function add_edit_form_section( $section_array=array() ) { | 
                                                        |
| 51 | -				if( !empty( $section_array ) ) { | 
                                                        |
| 52 | - $section_data = wp_parse_args( array() , $section_array );  | 
                                                        |
| 50 | +			public static function add_edit_form_section( $section_array = array() ) { | 
                                                        |
| 51 | +				if ( ! empty( $section_array ) ) { | 
                                                        |
| 52 | + $section_data = wp_parse_args( array(), $section_array );  | 
                                                        |
| 53 | 53 | ob_start();  | 
                                                        
| 54 | 54 | include ( YIKES_MC_PATH . 'admin/partials/helpers/edit-form-hidden-section-template.php' );  | 
                                                        
| 55 | 55 | $section = ob_get_contents();  | 
                                                        
@@ -66,7 +66,7 @@ discard block  | 
                                                    ||
| 66 | 66 | */  | 
                                                        
| 67 | 67 |  			public static function is_custom_section_two_column( $custom_section_data ) { | 
                                                        
| 68 | 68 | // print_r( $custom_section_data );  | 
                                                        
| 69 | - $value = ( isset( $custom_section_data['sidebar_title'] ) && isset( $custom_section_data['sidebar_fields'] ) && !empty( $custom_section_data['sidebar_fields'] ) ) ? true : false;  | 
                                                        |
| 69 | + $value = ( isset( $custom_section_data[ 'sidebar_title' ] ) && isset( $custom_section_data[ 'sidebar_fields' ] ) && ! empty( $custom_section_data[ 'sidebar_fields' ] ) ) ? true : false;  | 
                                                        |
| 70 | 70 | return $value;  | 
                                                        
| 71 | 71 | }  | 
                                                        
| 72 | 72 | |
@@ -8,28 +8,28 @@ discard block  | 
                                                    ||
| 8 | 8 | // grab our global form_data;  | 
                                                        
| 9 | 9 | global $form_data;  | 
                                                        
| 10 | 10 | ?>  | 
                                                        
| 11 | - <label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data['id'] ); ?>>  | 
                                                        |
| 11 | + <label class="hidden-setting-label yikes-easy-mc-hidden" for="form" id=<?php esc_attr_e( $section_data[ 'id' ] ); ?>>  | 
                                                        |
| 12 | 12 | <div id="poststuff">  | 
                                                        
| 13 | -			<div id="post-body" class="metabox-holder <?php if( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>"> | 
                                                        |
| 13 | +			<div id="post-body" class="metabox-holder <?php if ( self::is_custom_section_two_column( $section_data ) ) { ?> columns-2 <?php } else { ?> columns-1 <?php } ?>"> | 
                                                        |
| 14 | 14 | <div id="post-body-content">  | 
                                                        
| 15 | 15 | <div class="meta-box-sortables ui-sortable">  | 
                                                        
| 16 | 16 | <div class="postbox yikes-easy-mc-postbox">  | 
                                                        
| 17 | - <h3 class="edit-form-title"><span><?php echo $section_data['main_title']; ?></span></h3>  | 
                                                        |
| 18 | - <div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-container">  | 
                                                        |
| 17 | + <h3 class="edit-form-title"><span><?php echo $section_data[ 'main_title' ]; ?></span></h3>  | 
                                                        |
| 18 | + <div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-container">  | 
                                                        |
| 19 | 19 | <?php  | 
                                                        
| 20 | -										if( isset( $section_data['main_description'] ) && $section_data['main_description'] != '' ) { | 
                                                        |
| 20 | +										if ( isset( $section_data[ 'main_description' ] ) && $section_data[ 'main_description' ] != '' ) { | 
                                                        |
| 21 | 21 | ?>  | 
                                                        
| 22 | - <p><?php echo $section_data['main_description']; ?></p>  | 
                                                        |
| 22 | + <p><?php echo $section_data[ 'main_description' ]; ?></p>  | 
                                                        |
| 23 | 23 | <?php  | 
                                                        
| 24 | 24 | }  | 
                                                        
| 25 | - $main_field_data = $section_data['main_fields'];  | 
                                                        |
| 26 | -										foreach( $main_field_data as $field ) {  | 
                                                        |
| 27 | -											if( $field['type'] == 'custom' ) { | 
                                                        |
| 25 | + $main_field_data = $section_data[ 'main_fields' ];  | 
                                                        |
| 26 | +										foreach ( $main_field_data as $field ) {  | 
                                                        |
| 27 | +											if ( $field[ 'type' ] == 'custom' ) { | 
                                                        |
| 28 | 28 | // execute the custom callback  | 
                                                        
| 29 | - $field['callback']();  | 
                                                        |
| 29 | + $field[ 'callback' ]();  | 
                                                        |
| 30 | 30 |  											} else { | 
                                                        
| 31 | 31 | // include our field files  | 
                                                        
| 32 | - include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );  | 
                                                        |
| 32 | + include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );  | 
                                                        |
| 33 | 33 | }  | 
                                                        
| 34 | 34 | }  | 
                                                        
| 35 | 35 | ?>  | 
                                                        
@@ -39,27 +39,27 @@ discard block  | 
                                                    ||
| 39 | 39 | </div>  | 
                                                        
| 40 | 40 | |
| 41 | 41 | <!-- check for single/double box -->  | 
                                                        
| 42 | -					<?php if( self::is_custom_section_two_column( $section_data ) ) { ?> | 
                                                        |
| 42 | +					<?php if ( self::is_custom_section_two_column( $section_data ) ) { ?> | 
                                                        |
| 43 | 43 | <!-- begin sidebar -->  | 
                                                        
| 44 | 44 | <div id="postbox-container-1" class="postbox-container">  | 
                                                        
| 45 | 45 | <div class="meta-box-sortables">  | 
                                                        
| 46 | 46 | <div class="postbox yikes-easy-mc-postbox">  | 
                                                        
| 47 | - <h3 class="edit-form-title"><span><?php echo $section_data['sidebar_title']; ?></span></h3>  | 
                                                        |
| 48 | - <div class="inside <?php esc_attr_e( $section_data['id'] ); ?>-sidebar-container">  | 
                                                        |
| 47 | + <h3 class="edit-form-title"><span><?php echo $section_data[ 'sidebar_title' ]; ?></span></h3>  | 
                                                        |
| 48 | + <div class="inside <?php esc_attr_e( $section_data[ 'id' ] ); ?>-sidebar-container">  | 
                                                        |
| 49 | 49 | <?php  | 
                                                        
| 50 | -											if( isset( $section_data['sidebar_description'] ) && $section_data['sidebar_description'] != '' ) { | 
                                                        |
| 50 | +											if ( isset( $section_data[ 'sidebar_description' ] ) && $section_data[ 'sidebar_description' ] != '' ) { | 
                                                        |
| 51 | 51 | ?>  | 
                                                        
| 52 | - <p><?php echo $section_data['sidebar_description']; ?></p>  | 
                                                        |
| 52 | + <p><?php echo $section_data[ 'sidebar_description' ]; ?></p>  | 
                                                        |
| 53 | 53 | <?php  | 
                                                        
| 54 | 54 | }  | 
                                                        
| 55 | - $sidebar_field_data = $section_data['sidebar_fields'];  | 
                                                        |
| 56 | -											foreach( $sidebar_field_data as $field ) {  | 
                                                        |
| 57 | -												if( $field['type'] == 'custom' ) { | 
                                                        |
| 55 | + $sidebar_field_data = $section_data[ 'sidebar_fields' ];  | 
                                                        |
| 56 | +											foreach ( $sidebar_field_data as $field ) {  | 
                                                        |
| 57 | +												if ( $field[ 'type' ] == 'custom' ) { | 
                                                        |
| 58 | 58 | // execute the custom callback  | 
                                                        
| 59 | - $field['callback']();  | 
                                                        |
| 59 | + $field[ 'callback' ]();  | 
                                                        |
| 60 | 60 |  												} else { | 
                                                        
| 61 | 61 | // include our field files  | 
                                                        
| 62 | - include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field['type'] . '-field.php' );  | 
                                                        |
| 62 | + include( YIKES_MC_PATH . 'admin/partials/helpers/fields/yikes-mailchimp-' . $field[ 'type' ] . '-field.php' );  | 
                                                        |
| 63 | 63 | }  | 
                                                        
| 64 | 64 | }  | 
                                                        
| 65 | 65 | ?>  | 
                                                        
@@ -11,7 +11,7 @@ discard block  | 
                                                    ||
| 11 | 11 | *  | 
                                                        
| 12 | 12 | * @since 6.0.0  | 
                                                        
| 13 | 13 | */  | 
                                                        
| 14 | -function yksemeProcessSnippet( $list=false, $submit_text ) { | 
                                                        |
| 14 | +function yksemeProcessSnippet( $list = false, $submit_text ) { | 
                                                        |
| 15 | 15 | $submit_text = ( isset( $submit_text ) ) ? 'submit="' . $submit_text . '"' : '';  | 
                                                        
| 16 | 16 | return do_shortcode( '[yikes-mailchimp form="' . $list . '" ' . $submit_text . ']' );  | 
                                                        
| 17 | 17 | }  | 
                                                        
@@ -21,7 +21,7 @@ discard block  | 
                                                    ||
| 21 | 21 | * @since 6.0.3.4  | 
                                                        
| 22 | 22 | */  | 
                                                        
| 23 | 23 |  function yikes_get_form_data( $form_id ) { | 
                                                        
| 24 | -	if( ! $form_id ) { | 
                                                        |
| 24 | +	if ( ! $form_id ) { | 
                                                        |
| 25 | 25 | return __( 'Whoops, you forgot to specify a form ID.', 'yikes-inc-easy-mailchimp-extender' );  | 
                                                        
| 26 | 26 | }  | 
                                                        
| 27 | 27 | return Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $form_id );  | 
                                                        
@@ -32,7 +32,7 @@  | 
                                                    ||
| 32 | 32 | |
| 33 | 33 | <div class="addon-footer-wrap give-clearfix">  | 
                                                        
| 34 | 34 | <a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">  | 
                                                        
| 35 | - <?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>  | 
                                                        |
| 35 | + <?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>  | 
                                                        |
| 36 | 36 | <span class="dashicons dashicons-external"></span></a>  | 
                                                        
| 37 | 37 | </div>  | 
                                                        
| 38 | 38 | |
@@ -9,14 +9,14 @@ discard block  | 
                                                    ||
| 9 | 9 | * @table_name - table name to impot data to  | 
                                                        
| 10 | 10 | */  | 
                                                        
| 11 | 11 |  	public static function yikes_mailchimp_import_forms( $csv_file ) { | 
                                                        
| 12 | -		if ( ! isset( $_REQUEST['action'] ) ||  $_REQUEST['action'] !== 'yikes-easy-mc-import-forms' ) { | 
                                                        |
| 12 | +		if ( ! isset( $_REQUEST[ 'action' ] ) || $_REQUEST[ 'action' ] !== 'yikes-easy-mc-import-forms' ) { | 
                                                        |
| 13 | 13 | wp_die( __( 'There was an error during import. If you continue to run into issues, please reach out to the Yikes Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ) );  | 
                                                        
| 14 | 14 | }  | 
                                                        
| 15 | 15 | |
| 16 | - $name = $csv_file['csv']['name'];  | 
                                                        |
| 16 | + $name = $csv_file[ 'csv' ][ 'name' ];  | 
                                                        |
| 17 | 17 | $ext_array = explode( '.', $name );  | 
                                                        
| 18 | 18 | $ext = end( $ext_array );  | 
                                                        
| 19 | - $tmp_name = $csv_file['csv']['tmp_name'];  | 
                                                        |
| 19 | + $tmp_name = $csv_file[ 'csv' ][ 'tmp_name' ];  | 
                                                        |
| 20 | 20 | |
| 21 | 21 | // Ensure we have a valid file extension.  | 
                                                        
| 22 | 22 |  		if ( 'csv' !== $ext ) { | 
                                                        
@@ -41,17 +41,17 @@ discard block  | 
                                                    ||
| 41 | 41 | |
| 42 | 42 | // Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'  | 
                                                        
| 43 | 43 | // @todo: this should be a separate method.  | 
                                                        
| 44 | -			if( $line[0] == 'yikes-mc-api-key' ) { | 
                                                        |
| 45 | - $options = fgetcsv($file, 10000, ',');  | 
                                                        |
| 44 | +			if ( $line[ 0 ] == 'yikes-mc-api-key' ) { | 
                                                        |
| 45 | + $options = fgetcsv( $file, 10000, ',' );  | 
                                                        |
| 46 | 46 | $new_settings = array();  | 
                                                        
| 47 | 47 | $x = 0;  | 
                                                        
| 48 | 48 | // build our new array $key => $value pair  | 
                                                        
| 49 | -				foreach( $line as $option_name ) { | 
                                                        |
| 50 | - $new_settings[$option_name] = $options[$x];  | 
                                                        |
| 49 | +				foreach ( $line as $option_name ) { | 
                                                        |
| 50 | + $new_settings[ $option_name ] = $options[ $x ];  | 
                                                        |
| 51 | 51 | $x++;  | 
                                                        
| 52 | 52 | }  | 
                                                        
| 53 | 53 | // update the options in the databse  | 
                                                        
| 54 | -				foreach( $new_settings as $option_name => $option_value ) { | 
                                                        |
| 54 | +				foreach ( $new_settings as $option_name => $option_value ) { | 
                                                        |
| 55 | 55 | update_option( $option_name, $option_value );  | 
                                                        
| 56 | 56 | }  | 
                                                        
| 57 | 57 |  			} else { // if it's not, then it's an opt-in forms import | 
                                                        
@@ -80,7 +80,7 @@ discard block  | 
                                                    ||
| 80 | 80 | $row++;  | 
                                                        
| 81 | 81 | }  | 
                                                        
| 82 | 82 | |
| 83 | - fclose($file);  | 
                                                        |
| 83 | + fclose( $file );  | 
                                                        |
| 84 | 84 | }  | 
                                                        
| 85 | 85 | |
| 86 | 86 | /*  | 
                                                        
@@ -91,20 +91,20 @@ discard block  | 
                                                    ||
| 91 | 91 | */  | 
                                                        
| 92 | 92 |  	public static function yikes_mailchimp_import_type( $csv_file ) { | 
                                                        
| 93 | 93 | // confirm  | 
                                                        
| 94 | -		if( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) { | 
                                                        |
| 95 | - $name = $csv_file['csv']['name'];  | 
                                                        |
| 96 | -			$ext_array = explode('.', $name); | 
                                                        |
| 94 | +		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) { | 
                                                        |
| 95 | + $name = $csv_file[ 'csv' ][ 'name' ];  | 
                                                        |
| 96 | + $ext_array = explode( '.', $name );  | 
                                                        |
| 97 | 97 | $ext = end( $ext_array );  | 
                                                        
| 98 | - $tmpName = $csv_file['csv']['tmp_name'];  | 
                                                        |
| 99 | -			if($ext === 'csv') { | 
                                                        |
| 100 | -				if(($handle = fopen($tmpName, 'r')) !== FALSE) { | 
                                                        |
| 101 | - $num = count($handle);  | 
                                                        |
| 102 | - $file = fopen( $tmpName, 'r');  | 
                                                        |
| 98 | + $tmpName = $csv_file[ 'csv' ][ 'tmp_name' ];  | 
                                                        |
| 99 | +			if ( $ext === 'csv' ) { | 
                                                        |
| 100 | +				if ( ( $handle = fopen( $tmpName, 'r' ) ) !== FALSE ) { | 
                                                        |
| 101 | + $num = count( $handle );  | 
                                                        |
| 102 | + $file = fopen( $tmpName, 'r' );  | 
                                                        |
| 103 | 103 | $row = 1;  | 
                                                        
| 104 | - $first_line_data = fgetcsv($file, 10000, ',');  | 
                                                        |
| 105 | -					if( count( $first_line_data ) > 1 ) { | 
                                                        |
| 104 | + $first_line_data = fgetcsv( $file, 10000, ',' );  | 
                                                        |
| 105 | +					if ( count( $first_line_data ) > 1 ) { | 
                                                        |
| 106 | 106 | // Check if this is a settings import by confirming the first option is 'yikes-mc-api-key'  | 
                                                        
| 107 | -						if( $first_line_data[0] == 'yikes-mc-api-key' ) { | 
                                                        |
| 107 | +						if ( $first_line_data[ 0 ] == 'yikes-mc-api-key' ) { | 
                                                        |
| 108 | 108 | $import_type = 'import-settings';  | 
                                                        
| 109 | 109 |  						} else { | 
                                                        
| 110 | 110 | $import_type = 'import-forms';  | 
                                                        
@@ -1,6 +1,6 @@  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | |
| 3 | -return array (  | 
                                                        |
| 3 | +return array(  | 
                                                        |
| 4 | 4 | 'yikes_inc_easy_mailchimp_forms_admin' => 'admin/class-yikes-inc-easy-mailchimp-extender-admin.php',  | 
                                                        
| 5 | 5 | 'yikes_inc_easy_mailchimp_process_ajax' => 'admin/partials/ajax/class.ajax.php',  | 
                                                        
| 6 | 6 | 'yikes_inc_easy_mailchimp_dashboard_widgets' => 'admin/partials/dashboard-widgets/class.list-activity-widget.php',  | 
                                                        
@@ -80,7 +80,7 @@ discard block  | 
                                                    ||
| 80 | 80 | $titles = array();  | 
                                                        
| 81 | 81 | $content = array();  | 
                                                        
| 82 | 82 |  		foreach ( $plugin_settings as $option_name => $option_value ) { | 
                                                        
| 83 | - $titles[] = $option_name;  | 
                                                        |
| 83 | + $titles[ ] = $option_name;  | 
                                                        |
| 84 | 84 | }  | 
                                                        
| 85 | 85 | |
| 86 | 86 | // Generate the output file.  | 
                                                        
@@ -103,7 +103,7 @@ discard block  | 
                                                    ||
| 103 | 103 | fputcsv( $output_handle, $titles );  | 
                                                        
| 104 | 104 | $first = false;  | 
                                                        
| 105 | 105 | }  | 
                                                        
| 106 | - $content[] = $option_value;  | 
                                                        |
| 106 | + $content[ ] = $option_value;  | 
                                                        |
| 107 | 107 | |
| 108 | 108 | }  | 
                                                        
| 109 | 109 | fputcsv( $output_handle, $content );  | 
                                                        
@@ -93,7 +93,7 @@ discard block  | 
                                                    ||
| 93 | 93 | */  | 
                                                        
| 94 | 94 |  	public function update_form( $form_id, $data ) { | 
                                                        
| 95 | 95 | // Prepare the data for the database.  | 
                                                        
| 96 | - $data['id'] = $form_id;  | 
                                                        |
| 96 | + $data[ 'id' ] = $form_id;  | 
                                                        |
| 97 | 97 | $save_data = $this->prepare_data_for_db( $data );  | 
                                                        
| 98 | 98 | $formats = $this->get_format_array( $save_data );  | 
                                                        
| 99 | 99 | |
@@ -122,7 +122,7 @@ discard block  | 
                                                    ||
| 122 | 122 | $form_data = yikes_deep_parse_args( $form_data, $this->get_form_defaults() );  | 
                                                        
| 123 | 123 | |
| 124 | 124 | // If there is an ID set, remove it  | 
                                                        
| 125 | - unset( $form_data['id'] );  | 
                                                        |
| 125 | + unset( $form_data[ 'id' ] );  | 
                                                        |
| 126 | 126 | |
| 127 | 127 | // Prepare the data for the database  | 
                                                        
| 128 | 128 | $save_data = $this->prepare_data_for_db( $form_data );  | 
                                                        
@@ -302,11 +302,11 @@ discard block  | 
                                                    ||
| 302 | 302 | case 'redirect_user_on_submit':  | 
                                                        
| 303 | 303 | case 'redirect_page':  | 
                                                        
| 304 | 304 | case 'id':  | 
                                                        
| 305 | - $formats[] = '%d';  | 
                                                        |
| 305 | + $formats[ ] = '%d';  | 
                                                        |
| 306 | 306 | break;  | 
                                                        
| 307 | 307 | |
| 308 | 308 | default:  | 
                                                        
| 309 | - $formats[] = '%s';  | 
                                                        |
| 309 | + $formats[ ] = '%s';  | 
                                                        |
| 310 | 310 | }  | 
                                                        
| 311 | 311 | }  | 
                                                        
| 312 | 312 | |
@@ -346,7 +346,7 @@ discard block  | 
                                                    ||
| 346 | 346 | continue;  | 
                                                        
| 347 | 347 | }  | 
                                                        
| 348 | 348 | |
| 349 | - $data['id'] = $id;  | 
                                                        |
| 349 | + $data[ 'id' ] = $id;  | 
                                                        |
| 350 | 350 | $_form_data = $this->prepare_data_for_db( $data );  | 
                                                        
| 351 | 351 | $formats = $this->get_format_array( $_form_data );  | 
                                                        
| 352 | 352 | |