| @@ -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 | |
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | * @return bool Whether the form was successfully updated. | 
| 49 | 49 | */ | 
| 50 | 50 |  	public function update_form( $form_id, $data ) { | 
| 51 | - $data['id'] = $form_id; | |
| 51 | + $data[ 'id' ] = $form_id; | |
| 52 | 52 | $all_forms = $this->get_all_forms(); | 
| 53 | 53 | |
| 54 | 54 |  		if ( ! isset( $all_forms[ $form_id ] ) ) { | 
| @@ -79,7 +79,7 @@ discard block | ||
| 79 | 79 | $all_ids = $this->get_form_ids(); | 
| 80 | 80 | $last_id = end( $all_ids ); | 
| 81 | 81 | $new_id = false === $last_id ? 1 : $last_id + 1; | 
| 82 | - $form_data['id'] = $new_id; | |
| 82 | + $form_data[ 'id' ] = $new_id; | |
| 83 | 83 | |
| 84 | 84 | // Ensure our data is consistently sorted | 
| 85 | 85 | ksort( $form_data ); | 
| @@ -5,16 +5,16 @@ | ||
| 5 | 5 | * For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/] | 
| 6 | 6 | * @since 6.0 | 
| 7 | 7 | */ | 
| 8 | -	if ( is_string( $form_data['custom_fields'] ) ) { | |
| 9 | - $field_data = json_decode( $form_data['custom_fields'] , true ); | |
| 10 | -	} elseif ( is_array( $form_data['custom_fields'] ) ) { | |
| 11 | - $field_data = $form_data['custom_fields']; | |
| 8 | +	if ( is_string( $form_data[ 'custom_fields' ] ) ) { | |
| 9 | + $field_data = json_decode( $form_data[ 'custom_fields' ], true ); | |
| 10 | +	} elseif ( is_array( $form_data[ 'custom_fields' ] ) ) { | |
| 11 | + $field_data = $form_data[ 'custom_fields' ]; | |
| 12 | 12 | } | 
| 13 | 13 | ?> | 
| 14 | 14 | <label class="custom-field-section"> | 
| 15 | - <strong><?php echo $field['label']; ?></strong> | |
| 16 | - <input type="text" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="<?php echo isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : ''; ?>" placeholder="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : ''; ?>"> | |
| 17 | -	<?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?> | |
| 18 | - <p class="description"><?php echo $field['description']; ?></p> | |
| 15 | + <strong><?php echo $field[ 'label' ]; ?></strong> | |
| 16 | + <input type="text" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="<?php echo isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : ''; ?>" placeholder="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>"> | |
| 17 | +	<?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?> | |
| 18 | + <p class="description"><?php echo $field[ 'description' ]; ?></p> | |
| 19 | 19 | <?php } ?> | 
| 20 | 20 | </label> | 
| 21 | 21 | \ No newline at end of file |