@@ -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 |
@@ -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="checkbox" class="widefat" name="custom-field[<?php echo $field['id']; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[$field['id']] ) ? $field_data[$field['id']] : 0, 1, true ); ?>> |
|
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="checkbox" class="widefat" name="custom-field[<?php echo $field[ 'id' ]; ?>]" id="custom-field" value="1" <?php checked( isset( $field_data[ $field[ 'id' ] ] ) ? $field_data[ $field[ 'id' ] ] : 0, 1, true ); ?>> |
|
17 | + <?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?> |
|
18 | + <p class="description"><?php echo $field[ 'description' ]; ?></p> |
|
19 | 19 | <?php } ?> |
20 | 20 | </label> |
@@ -5,10 +5,10 @@ discard block |
||
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 | // This will enqueue the Media Uploader script |
@@ -16,27 +16,27 @@ discard block |
||
16 | 16 | // And let's not forget the script we wrote earlier |
17 | 17 | wp_enqueue_script( 'yikes-mailchimp-file-field-script', plugin_dir_url( __FILE__ ) . 'js/yikes-mc-file-upload.js', array( 'jquery' ), '1.0', false ); |
18 | 18 | // print_r( $field_data ); |
19 | - wp_localize_script( 'yikes-mailchimp-file-field-script' , 'additional_data' , array( |
|
19 | + wp_localize_script( 'yikes-mailchimp-file-field-script', 'additional_data', array( |
|
20 | 20 | 'wp_includes_image_url' => includes_url() . 'images/media/' |
21 | 21 | ) ); |
22 | 22 | $i = 1; |
23 | 23 | // create an single item array when nothing is stored yet, loop for one field |
24 | - $field_data['incentive-attachment'] = ( isset( $field_data['incentive-attachment'] ) && !empty( $field_data['incentive-attachment'] ) ) ? $field_data['incentive-attachment'] : array( '' ); |
|
24 | + $field_data[ 'incentive-attachment' ] = ( isset( $field_data[ 'incentive-attachment' ] ) && ! empty( $field_data[ 'incentive-attachment' ] ) ) ? $field_data[ 'incentive-attachment' ] : array( '' ); |
|
25 | 25 | ?> |
26 | 26 | |
27 | 27 | <div class="yikes-mailchimp-file-field"> |
28 | - <label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label> |
|
29 | - <?php foreach( $field_data['incentive-attachment'] as $attachment ) { ?> |
|
30 | - <input type="text" name="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field['id']; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[$field['id']][$i] ) ? $field_data[$field['id']][$i] : ''; ?>"> |
|
31 | - <input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File' , 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
28 | + <label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label> |
|
29 | + <?php foreach ( $field_data[ 'incentive-attachment' ] as $attachment ) { ?> |
|
30 | + <input type="text" name="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" id="custom-field[<?php echo $field[ 'id' ]; ?>][<?php echo $i; ?>]" class="file-attachment" value="<?php echo isset( $field_data[ $field[ 'id' ] ][ $i ] ) ? $field_data[ $field[ 'id' ] ][ $i ] : ''; ?>"> |
|
31 | + <input type="button" name="upload-btn" id="upload-btn" class="button-secondary" data-attr-position="<?php echo $i; ?>" value="<?php _e( 'Upload File', 'yikes-inc-easy-mailchimp-extender' ); ?>"> |
|
32 | 32 | <div class="file-container"> |
33 | 33 | <p class="file-remove-wrapper"> |
34 | - <a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
34 | + <a href="#" class="remove-file-button" data-attr-position="<?php echo $i; ?>"><?php _e( 'Remove File', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
35 | 35 | </p> |
36 | 36 | </div> |
37 | 37 | <?php $i++; } ?> |
38 | - <?php if( isset( $field['repeat'] ) ) { ?> |
|
38 | + <?php if ( isset( $field[ 'repeat' ] ) ) { ?> |
|
39 | 39 | <a href="#" class="button-secondary add-new-incentive-attachment" data-attr-position="<?php echo $i; ?>"><span class="dashicons dashicons-plus"></span></a> |
40 | 40 | <?php } ?> |
41 | - <p class="description"><?php echo $field['description']; ?></p> |
|
41 | + <p class="description"><?php echo $field[ 'description' ]; ?></p> |
|
42 | 42 | </div> |
43 | 43 | \ No newline at end of file |
@@ -6,18 +6,18 @@ |
||
6 | 6 | * For help on using, see our documentation [https://yikesplugins.com/support/knowledge-base/product/easy-forms-for-mailchimp/] |
7 | 7 | * @since 6.0 |
8 | 8 | */ |
9 | - if ( is_string( $form_data['custom_fields'] ) ) { |
|
10 | - $field_data = json_decode( $form_data['custom_fields'] , true ); |
|
11 | - } elseif ( is_array( $form_data['custom_fields'] ) ) { |
|
12 | - $field_data = $form_data['custom_fields']; |
|
9 | + if ( is_string( $form_data[ 'custom_fields' ] ) ) { |
|
10 | + $field_data = json_decode( $form_data[ 'custom_fields' ], true ); |
|
11 | + } elseif ( is_array( $form_data[ 'custom_fields' ] ) ) { |
|
12 | + $field_data = $form_data[ 'custom_fields' ]; |
|
13 | 13 | } |
14 | 14 | |
15 | - $content = ( isset( $field_data[$field['id']] ) ) ? $field_data[$field['id']] : ( isset( $field['default'] ) ? $field['default'] : '' ); |
|
16 | - $wysiwyg_id = 'custom-field['.$field['id'].']'; |
|
15 | + $content = ( isset( $field_data[ $field[ 'id' ] ] ) ) ? $field_data[ $field[ 'id' ] ] : ( isset( $field[ 'default' ] ) ? $field[ 'default' ] : '' ); |
|
16 | + $wysiwyg_id = 'custom-field[' . $field[ 'id' ] . ']'; |
|
17 | 17 | ?> |
18 | 18 | |
19 | 19 | <div class="yikes-mailchimp-wysiwyg-field"> |
20 | - <label for="image_url" class="widefat"><strong><?php echo $field['label']; ?></strong></label> |
|
21 | - <?php wp_editor( $content, $field['id'], array( 'textarea_name' => $wysiwyg_id ) ); ?> |
|
22 | - <p class="description"><?php echo $field['description']; ?></p> |
|
20 | + <label for="image_url" class="widefat"><strong><?php echo $field[ 'label' ]; ?></strong></label> |
|
21 | + <?php wp_editor( $content, $field[ 'id' ], array( 'textarea_name' => $wysiwyg_id ) ); ?> |
|
22 | + <p class="description"><?php echo $field[ 'description' ]; ?></p> |
|
23 | 23 | </div> |
@@ -5,26 +5,26 @@ |
||
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 | <div class="custom-field-section"> |
15 | 15 | <!-- title --> |
16 | - <strong><?php echo $field['label']; ?></strong> |
|
16 | + <strong><?php echo $field[ 'label' ]; ?></strong> |
|
17 | 17 | <!-- radio buttons --> |
18 | 18 | <section class="custom-radio-holder"> |
19 | - <?php foreach( $field['options'] as $value => $label ) { ?> |
|
19 | + <?php foreach ( $field[ 'options' ] as $value => $label ) { ?> |
|
20 | 20 | <label class="custom-radio-label"> |
21 | - <input type="radio" name="custom-field[<?php echo $field['id']; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if( isset( $field_data[$field['id']] ) ) { checked( $field_data[$field['id']] , $value ); } ?>> |
|
21 | + <input type="radio" name="custom-field[<?php echo $field[ 'id' ]; ?>][]" id="custom-field" value="<?php echo $value; ?>" <?php if ( isset( $field_data[ $field[ 'id' ] ] ) ) { checked( $field_data[ $field[ 'id' ] ], $value ); } ?>> |
|
22 | 22 | <?php echo $label; ?> |
23 | 23 | </label> |
24 | 24 | <?php } ?> |
25 | 25 | </section> |
26 | 26 | <!-- description --> |
27 | - <?php if( isset( $field['description'] ) && $field['description'] != '' ) { ?> |
|
28 | - <p class="description"><?php echo $field['description']; ?></p> |
|
27 | + <?php if ( isset( $field[ 'description' ] ) && $field[ 'description' ] != '' ) { ?> |
|
28 | + <p class="description"><?php echo $field[ 'description' ]; ?></p> |
|
29 | 29 | <?php } ?> |
30 | 30 | </div> |
31 | 31 | \ No newline at end of file |
@@ -302,9 +302,9 @@ |
||
302 | 302 | ?></ul><?php |
303 | 303 | } |
304 | 304 | /** |
305 | - * Custom action hook for our add-ons to hook into |
|
306 | - * @since 6.0.3.8 |
|
307 | - */ |
|
305 | + * Custom action hook for our add-ons to hook into |
|
306 | + * @since 6.0.3.8 |
|
307 | + */ |
|
308 | 308 | do_action( 'yikes-mailchimp-list-form-fields-metabox' ); |
309 | 309 | ?> |
310 | 310 |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! isset( $_REQUEST['list-id'] ) ) { |
|
2 | +if ( ! isset( $_REQUEST[ 'list-id' ] ) ) { |
|
3 | 3 | wp_die( __( 'Oops, we can\'t determine what List to view. Please go back and try again.' ) ); |
4 | 4 | } |
5 | 5 | |
6 | -$list_id = sanitize_key( $_REQUEST['list-id'] ); |
|
6 | +$list_id = sanitize_key( $_REQUEST[ 'list-id' ] ); |
|
7 | 7 | $list_helper = yikes_get_mc_api_manager()->get_list_handler(); |
8 | 8 | $api_key = yikes_get_mc_api_key(); |
9 | 9 | $dash_position = strpos( $api_key, '-' ); |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | // setup pagination variables |
63 | -$paged = isset( $_REQUEST['paged'] ) ? filter_var( $_REQUEST['paged'], FILTER_SANITIZE_NUMBER_INT ) : 0; |
|
63 | +$paged = isset( $_REQUEST[ 'paged' ] ) ? filter_var( $_REQUEST[ 'paged' ], FILTER_SANITIZE_NUMBER_INT ) : 0; |
|
64 | 64 | $limit = apply_filters( 'yikes_admin_list_subscriber_limit', 20 ); |
65 | -$page_offset = (int) $paged * (int) $limit; |
|
66 | -$sort_dir = isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : 'DESC'; |
|
65 | +$page_offset = (int) $paged * (int) $limit; |
|
66 | +$sort_dir = isset( $_REQUEST[ 'sort' ] ) ? $_REQUEST[ 'sort' ] : 'DESC'; |
|
67 | 67 | |
68 | 68 | if ( $sort_dir === 'DESC' ) { |
69 | 69 | $opposite_sort_dir = 'ASC'; |
@@ -90,25 +90,25 @@ discard block |
||
90 | 90 | ?> |
91 | 91 | <div class="wrap"> |
92 | 92 | <!-- Freddie Logo --> |
93 | - <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
93 | + <img src="<?php echo YIKES_MC_URL . 'includes/images/Mailchimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - Mailchimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" /> |
|
94 | 94 | |
95 | - <h1>YIKES Easy Forms for Mailchimp | <?php echo $list_data['name']; ?></h1> |
|
95 | + <h1>YIKES Easy Forms for Mailchimp | <?php echo $list_data[ 'name' ]; ?></h1> |
|
96 | 96 | |
97 | 97 | <!-- Settings Page Description --> |
98 | - <p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
99 | - <!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> --> |
|
98 | + <p class="yikes-easy-mc-about-text about-text"><?php _e( 'View all subscribers below. View additional subscriber info, or add additional fields to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
|
99 | + <!-- <p class="add-new-subscriber-button"><a href="#" onclick="jQuery(this).parent().next().slideToggle();" class="add-new-h2"><?php _e( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p> --> |
|
100 | 100 | |
101 | 101 | <?php |
102 | 102 | /* Display our admin notices here */ |
103 | 103 | // Unsubscribe user confirmation message |
104 | - if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'true' ) { |
|
104 | + if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'true' ) { |
|
105 | 105 | ?> |
106 | 106 | <div class="updated manage-form-admin-notice"> |
107 | 107 | <p><?php _e( 'User successfully unsubscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
108 | 108 | </div> |
109 | 109 | <?php |
110 | 110 | } |
111 | - if( isset( $_REQUEST['user-unsubscribed'] ) && $_REQUEST['user-unsubscribed'] == 'false' ) { |
|
111 | + if ( isset( $_REQUEST[ 'user-unsubscribed' ] ) && $_REQUEST[ 'user-unsubscribed' ] == 'false' ) { |
|
112 | 112 | ?> |
113 | 113 | <div class="error manage-form-admin-notice"> |
114 | 114 | <p><?php _e( "We've encountered an error trying to remove the subscriber. Please try again. If the error persists please get in contact with the YIKES Inc. support staff.", 'yikes-inc-easy-mailchimp-extender' ); ?></p> |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | ?> |
119 | 119 | |
120 | 120 | <section class="add-new-subscriber-form-container"> |
121 | - <h4><?php _e( 'Add New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></h4> |
|
121 | + <h4><?php _e( 'Add New Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></h4> |
|
122 | 122 | <form id="add-new-subcscriber"> |
123 | - <input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p> |
|
123 | + <input type="text" class="regular-text" placeholder="<?php _e( 'User Email Address', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p> |
|
124 | 124 | <p><?php submit_button( 'Add Subscriber' ); ?></p> |
125 | 125 | </form> |
126 | 126 | </section> |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | <!-- TABLE HEAD --> |
143 | 143 | <thead> |
144 | 144 | <tr> |
145 | - <th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email' , 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); echo $icon;?></a></th> |
|
146 | - <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
145 | + <th id="user-email columnname" class="manage-column column-columnname" scope="col"><a id="user-email-sort" href="<?php echo esc_url_raw( add_query_arg( array( 'column' => 'email', 'sort' => $opposite_sort_dir ) ) ); ?>"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); echo $icon; ?></a></th> |
|
146 | + <th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
147 | 147 | </tr> |
148 | 148 | </thead> |
149 | 149 | <!-- end header --> |
@@ -151,8 +151,8 @@ discard block |
||
151 | 151 | <!-- FOOTER --> |
152 | 152 | <tfoot> |
153 | 153 | <tr> |
154 | - <th class="manage-column column-columnname" scope="col"><?php _e( 'User Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
155 | - <th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client' , 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
154 | + <th class="manage-column column-columnname" scope="col"><?php _e( 'User Email', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
155 | + <th class="manage-column column-columnname num" scope="col"><?php _e( 'Email Client', 'yikes-inc-easy-mailchimp-extender' ); ?></th> |
|
156 | 156 | </tr> |
157 | 157 | </tfoot> |
158 | 158 | <!-- end footer --> |
@@ -162,15 +162,15 @@ discard block |
||
162 | 162 | <?php if ( count( $subscribers_list ) > 0 ) { |
163 | 163 | $i = 1; |
164 | 164 | foreach ( $subscribers_list as $subscriber ) { |
165 | - $user_id = $subscriber['id']; |
|
165 | + $user_id = $subscriber[ 'id' ]; |
|
166 | 166 | $path = YIKES_MC_URL . "includes/images/na.png"; |
167 | 167 | $email_client_icon = "<img width='35' src='" . $path . "' alt='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "' title='" . __( 'not set', 'yikes-inc-easy-mailchimp-extender' ) . "'>"; |
168 | 168 | |
169 | 169 | ?> |
170 | 170 | <tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>"> |
171 | 171 | <td class="column-columnname"> |
172 | - <a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber['email_address'] ); ?>"> |
|
173 | - <?php echo sanitize_email( $subscriber['email_address'] ); ?> |
|
172 | + <a class="user-email row-title" href="mailto:<?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?>"> |
|
173 | + <?php echo sanitize_email( $subscriber[ 'email_address' ] ); ?> |
|
174 | 174 | </a> |
175 | 175 | <div class="row-actions"> |
176 | 176 | <?php $view_user_info_url = esc_url_raw( add_query_arg( array( |
@@ -184,17 +184,17 @@ discard block |
||
184 | 184 | 'nonce' => wp_create_nonce( 'unsubscribe-user-' . $user_id ), |
185 | 185 | 'email_id' => $user_id, |
186 | 186 | ) ) ); ?> |
187 | - <span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber['email_address'] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
187 | + <span><a href="<?php echo $url; ?>" onclick="return confirm('<?php printf( __( "Are you sure you want to unsubscribe %s from this mailing list?", 'yikes-inc-easy-mailchimp-extender' ), sanitize_email( $subscriber[ 'email_address' ] ) ); ?>');" class="yikes-delete-subscriber"><?php _e( "Unsubscribe", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
188 | 188 | </div> |
189 | 189 | </td> |
190 | 190 | <td class="column-columnname num"><?php echo $email_client_icon; ?></td> |
191 | 191 | </tr> |
192 | 192 | <?php |
193 | - $i ++; |
|
193 | + $i++; |
|
194 | 194 | } |
195 | 195 | } else { ?> |
196 | 196 | <tr class="no-items"> |
197 | - <td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
197 | + <td class="colspanchange no-current-subscriber-notice" colspan="2"><em><?php _e( 'No one is currently subscribed to this list.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td> |
|
198 | 198 | </tr> |
199 | 199 | <?php } ?> |
200 | 200 | </tbody> |
@@ -206,11 +206,11 @@ discard block |
||
206 | 206 | <!-- pagination --> |
207 | 207 | <div class="tablenav"> |
208 | 208 | <div class="tablenav-pages"> |
209 | - <a class='first-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>«</a> |
|
210 | - <a class='prev-page <?php if( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>‹</a> |
|
211 | - <span class="paging-input"><input class='current-page' title='<?php _e( "Current page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span> |
|
212 | - <a class='next-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>›</a> |
|
213 | - <a class='last-page <?php if( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page" , 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>»</a> |
|
209 | + <a class='first-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the first page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => 0 ) ) ); ?>'>«</a> |
|
210 | + <a class='prev-page <?php if ( $paged == 0 ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the previous page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged - 1 ) ) ) ); ?>'>‹</a> |
|
211 | + <span class="paging-input"><input class='current-page' title='<?php _e( "Current page", 'yikes-inc-easy-mailchimp-extender' ); ?>' type='text' name='paged' value='<?php if ( $paged == 0 ) { echo '1'; } else { echo intval( $paged + 1 ); } ?>' size='1' /> <?php _e( 'of', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class='total-pages'><?php echo $total_pages; ?></span></span> |
|
212 | + <a class='next-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the next page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $paged + 1 ) ) ) ); ?>'>›</a> |
|
213 | + <a class='last-page <?php if ( $paged == intval( $total_pages - 1 ) ) { echo 'disabled'; } ?>' title='<?php _e( "Go to the last page", 'yikes-inc-easy-mailchimp-extender' ); ?>' href='<?php echo esc_url_raw( add_query_arg( array( "paged" => intval( $total_pages - 1 ) ) ) ); ?>'>»</a> |
|
214 | 214 | </div> |
215 | 215 | </div> |
216 | 216 | |
@@ -225,21 +225,21 @@ discard block |
||
225 | 225 | |
226 | 226 | <div class="postbox yikes-easy-mc-postbox"> |
227 | 227 | |
228 | - <h3><?php _e( 'List Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
228 | + <h3><?php _e( 'List Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
229 | 229 | |
230 | 230 | <?php |
231 | 231 | // store list rating |
232 | - $list_rating = $list_data['list_rating']; |
|
233 | - if( $list_rating > 0 ) { |
|
234 | - $list_rating_explosion = explode( '.' , $list_rating ); |
|
232 | + $list_rating = $list_data[ 'list_rating' ]; |
|
233 | + if ( $list_rating > 0 ) { |
|
234 | + $list_rating_explosion = explode( '.', $list_rating ); |
|
235 | 235 | $star_array = array(); |
236 | 236 | $x = 1; |
237 | - while( $list_rating_explosion[0] >= $x ) { |
|
238 | - $star_array[] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>'; |
|
237 | + while ( $list_rating_explosion[ 0 ] >= $x ) { |
|
238 | + $star_array[ ] = '<span class="dashicons dashicons-star-filled list-rating-star"></span>'; |
|
239 | 239 | $x++; |
240 | 240 | } |
241 | - if( $list_rating_explosion[1] == '5' ) { |
|
242 | - $star_array[] = '<span class="dashicons dashicons-star-half list-rating-star"></span>'; |
|
241 | + if ( $list_rating_explosion[ 1 ] == '5' ) { |
|
242 | + $star_array[ ] = '<span class="dashicons dashicons-star-half list-rating-star"></span>'; |
|
243 | 243 | } |
244 | 244 | } else { |
245 | 245 | $star_array = array( 'n/a' ); |
@@ -247,40 +247,40 @@ discard block |
||
247 | 247 | ?> |
248 | 248 | <table class="form-table"> |
249 | 249 | <tr valign="top"> |
250 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'List Rating' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
251 | - <td><?php echo implode( ' ' , $star_array ); ?></td> |
|
250 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'List Rating', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
251 | + <td><?php echo implode( ' ', $star_array ); ?></td> |
|
252 | 252 | </tr> |
253 | 253 | <tr valign="top"> |
254 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Average Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
255 | - <td><?php echo $list_data['stats']['avg_sub_rate']; ?><small> / <?php _e( 'month' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></td> |
|
254 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Average Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
255 | + <td><?php echo $list_data[ 'stats' ][ 'avg_sub_rate' ]; ?><small> / <?php _e( 'month', 'yikes-inc-easy-mailchimp-extender' ); ?></small></td> |
|
256 | 256 | </tr> |
257 | 257 | <tr valign="top"> |
258 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Subscriber Count' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
259 | - <td><?php echo intval( $list_data['stats']['member_count'] ); ?></td> |
|
258 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Subscriber Count', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
259 | + <td><?php echo intval( $list_data[ 'stats' ][ 'member_count' ] ); ?></td> |
|
260 | 260 | </tr> |
261 | 261 | <tr valign="top"> |
262 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'New Since Last Campaign' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
263 | - <td><?php echo intval( $list_data['stats']['member_count_since_send'] ); ?></td> |
|
262 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'New Since Last Campaign', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
263 | + <td><?php echo intval( $list_data[ 'stats' ][ 'member_count_since_send' ] ); ?></td> |
|
264 | 264 | </tr> |
265 | 265 | <tr valign="top"> |
266 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Created' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
267 | - <td><?php echo date( get_option('date_format') , strtotime( $list_data['date_created'] ) ); ?></td> |
|
266 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Created', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
267 | + <td><?php echo date( get_option( 'date_format' ), strtotime( $list_data[ 'date_created' ] ) ); ?></td> |
|
268 | 268 | </tr> |
269 | 269 | <tr valign="top"> |
270 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'List Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
271 | - <td><?php echo intval( $list_data['stats']['merge_field_count'] + 1 ); // add 1 for our email field.. ?></td> |
|
270 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'List Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
271 | + <td><?php echo intval( $list_data[ 'stats' ][ 'merge_field_count' ] + 1 ); // add 1 for our email field.. ?></td> |
|
272 | 272 | </tr> |
273 | 273 | <tr valign="top"> |
274 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Short Signup URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
275 | - <td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data['subscribe_url_short'] ); ?>" readonly onclick="jQuery(this).select();"></td> |
|
274 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Short Signup URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
275 | + <td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo esc_url_raw( $list_data[ 'subscribe_url_short' ] ); ?>" readonly onclick="jQuery(this).select();"></td> |
|
276 | 276 | </tr> |
277 | 277 | <tr valign="top"> |
278 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Default From Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
279 | - <td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data['campaign_defaults']['from_email'] ); ?>" readonly onclick="jQuery(this).select();"></td> |
|
278 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Default From Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
279 | + <td><input type="text" class="widefat view-list-sidebar-input" value="<?php echo sanitize_email( $list_data[ 'campaign_defaults' ][ 'from_email' ] ); ?>" readonly onclick="jQuery(this).select();"></td> |
|
280 | 280 | </tr> |
281 | 281 | <tr valign="top"> |
282 | - <td scope="row"><label for="tablecell"><strong><?php _e( 'Default From Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
283 | - <td><?php echo $list_data['campaign_defaults']['from_name']; ?></td> |
|
282 | + <td scope="row"><label for="tablecell"><strong><?php _e( 'Default From Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></label></td> |
|
283 | + <td><?php echo $list_data[ 'campaign_defaults' ][ 'from_name' ]; ?></td> |
|
284 | 284 | </tr> |
285 | 285 | </table> |
286 | 286 | |
@@ -290,14 +290,14 @@ discard block |
||
290 | 290 | <!-- Merge Field Info --> |
291 | 291 | <div class="postbox yikes-easy-mc-postbox"> |
292 | 292 | |
293 | - <h3><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
293 | + <h3><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
294 | 294 | <?php |
295 | - if( count( $merge_fields['merge_fields'] ) >= 1 ) { |
|
295 | + if ( count( $merge_fields[ 'merge_fields' ] ) >= 1 ) { |
|
296 | 296 | ?><ul class="merge-variable-ul"><?php |
297 | - echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields['merge_fields'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields['merge_fields'] ) ) ) . '</li>'; |
|
298 | - foreach( $merge_fields['merge_fields'] as $merge_field ) { |
|
297 | + echo '<li class="interest-group-count">' . sprintf( _n( '%d Field', '%d Fields', intval( count( $merge_fields[ 'merge_fields' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $merge_fields[ 'merge_fields' ] ) ) ) . '</li>'; |
|
298 | + foreach ( $merge_fields[ 'merge_fields' ] as $merge_field ) { |
|
299 | 299 | // new action hook @since 6.0.3.8 |
300 | - echo '<li class="' . $merge_field['tag'] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field['name'] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>'; |
|
300 | + echo '<li class="' . $merge_field[ 'tag' ] . '"><span class="dashicons dashicons-marker"></span>' . $merge_field[ 'name' ] . ' ' . do_action( 'yikes-mailchimp-list-field', $merge_field ) . '</li>'; |
|
301 | 301 | } |
302 | 302 | ?></ul><?php |
303 | 303 | } |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | <div class="postbox yikes-easy-mc-postbox"> |
315 | 315 | |
316 | 316 | |
317 | - <h3><?php _e( 'Interest Groups Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
317 | + <h3><?php _e( 'Interest Groups Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
318 | 318 | <?php |
319 | 319 | if ( ! empty( $interest_groupings ) ) { |
320 | 320 | ?> |
@@ -322,8 +322,8 @@ discard block |
||
322 | 322 | echo '<li class="interest-group-count">' . sprintf( _n( '%d Interest Group', '%d Interest Groups', intval( count( $interest_groupings ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $interest_groupings ) ) ) . '</li>'; |
323 | 323 | foreach ( $interest_groupings as $interest_group ) { |
324 | 324 | // Build up the total subscribers |
325 | - $count = array_sum( wp_list_pluck( $interest_group['items'], 'subscriber_count' ) ); |
|
326 | - echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group['title'] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>'; |
|
325 | + $count = array_sum( wp_list_pluck( $interest_group[ 'items' ], 'subscriber_count' ) ); |
|
326 | + echo '<li><span class="dashicons dashicons-marker"></span>' . $interest_group[ 'title' ] . '<span class="interest-group-title"></span><small title="' . $count . ' ' . __( "subscribers assigned to this group", 'yikes-inc-easy-mailchimp-extender' ) . '">(' . $count . ')</small></li>'; |
|
327 | 327 | } |
328 | 328 | ?></ul><?php |
329 | 329 | } else { |
@@ -347,17 +347,17 @@ discard block |
||
347 | 347 | <div class="postbox yikes-easy-mc-postbox"> |
348 | 348 | |
349 | 349 | |
350 | - <h3><?php _e( 'Segments Overview' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
350 | + <h3><?php _e( 'Segments Overview', 'yikes-inc-easy-mailchimp-extender' ); ?></h3> |
|
351 | 351 | <?php |
352 | - if( isset( $segments['saved'] ) && count( $segments['saved'] ) >= 1 ) { |
|
352 | + if ( isset( $segments[ 'saved' ] ) && count( $segments[ 'saved' ] ) >= 1 ) { |
|
353 | 353 | $i = 1; |
354 | 354 | ?><ul class="segment-ul"><?php |
355 | - echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments['saved'] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments['saved'] ) ) ) . '</li>'; |
|
356 | - foreach( $segments['saved'] as $segment ) { |
|
357 | - echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment['name'] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions" , 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>'; |
|
355 | + echo '<li class="segment-group-count">' . sprintf( _n( '%d Segment', '%d Segments', intval( count( $segments[ 'saved' ] ) ), 'yikes-inc-easy-mailchimp-extender' ), intval( count( $segments[ 'saved' ] ) ) ) . '</li>'; |
|
356 | + foreach ( $segments[ 'saved' ] as $segment ) { |
|
357 | + echo '<li><span class="dashicons dashicons-arrow-right"></span>' . $segment[ 'name' ] . ' <small><a href="#" onclick="jQuery(this).parent().parent().next().slideToggle();jQuery(this).toggleText();return false;" data-alt-text="' . __( 'hide conditions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( "view conditions", 'yikes-inc-easy-mailchimp-extender' ) . '</a></small></li>'; |
|
358 | 358 | ?><div class="conditionals yikes-easy-mc-hidden"><?php |
359 | - foreach( $segment['segment_opts']['conditions'] as $condition ) { |
|
360 | - echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition['field'], $condition['op'], $condition['value'] ) . '</small></li>'; |
|
359 | + foreach ( $segment[ 'segment_opts' ][ 'conditions' ] as $condition ) { |
|
360 | + echo '<li><small>' . sprintf( __( 'condition #%s : If %s %s %s', 'yikes-inc-easy-mailchimp-extender' ), intval( $i ), $condition[ 'field' ], $condition[ 'op' ], $condition[ 'value' ] ) . '</small></li>'; |
|
361 | 361 | $i++; |
362 | 362 | } |
363 | 363 | ?></div><?php |
@@ -372,9 +372,9 @@ discard block |
||
372 | 372 | } |
373 | 373 | ?> |
374 | 374 | <!-- |
375 | - <a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments' , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
375 | + <a class="edit-segments-button" href="#" onclick="return false;" class="button-primary"><?php _e( 'Edit Segments', 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
|
376 | 376 | --> |
377 | - <p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to' , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.Mailchimp.com" target="_blank">Mailchimp</a></p> |
|
377 | + <p class="description edit-segment-description"><?php _e( 'To edit this lists segments, head over to', 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.Mailchimp.com" target="_blank">Mailchimp</a></p> |
|
378 | 378 | |
379 | 379 | </div> |
380 | 380 |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | return ''; |
27 | 27 | } |
28 | 28 | |
29 | - $form = ( ! empty( $attributes['form'] ) ) ? str_replace( '"', '', $attributes['form'] ) : false; |
|
30 | - $list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false; |
|
29 | + $form = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '"', '', $attributes[ 'form' ] ) : false; |
|
30 | + $list_id = ( ! empty( $attributes[ 'list' ] ) ) ? $attributes[ 'list' ] : false; |
|
31 | 31 | |
32 | 32 | /* If no list ID was passed into the shortcode - bail */ |
33 | 33 | if ( ! $list_id && ! $form ) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | return ''; |
53 | 53 | } |
54 | 54 | |
55 | - $list_id = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list) |
|
55 | + $list_id = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list) |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | // object buffer |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | /* type cast the returned value as an integer */ |
74 | - echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data['stats']['member_count'] ); |
|
74 | + echo (int) apply_filters( 'yikes-mailchimp-subscriber-count-value', $list_data[ 'stats' ][ 'member_count' ] ); |
|
75 | 75 | |
76 | 76 | return ob_get_clean(); |
77 | 77 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | if ( $network_wide ) { |
35 | 35 | $old_blog = $wpdb->blogid; |
36 | 36 | // Get all blog ids |
37 | - $blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
37 | + $blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
38 | 38 | foreach ( $blogids as $blog_id ) { |
39 | 39 | switch_to_blog( $blog_id ); |
40 | 40 | self::_activate_yikes_easy_mailchimp( $wpdb ); |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | custom_fields TEXT NOT NULL, |
91 | 91 | UNIQUE KEY id (id) |
92 | 92 | ) $charset_collate;"; |
93 | - require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); |
|
94 | - dbDelta($sql); |
|
93 | + require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); |
|
94 | + dbDelta( $sql ); |
|
95 | 95 | |
96 | 96 | // create an option for the date that the user initially activated the plugin |
97 | 97 | // used to display a two week notice, asking for a review or to upgrade |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes |
19 | 19 | * @author YIKES Inc. <[email protected]> |
20 | 20 | */ |
21 | -class Yikes_Inc_Easy_Mailchimp_Extender_Activator { |
|
21 | +class Yikes_Inc_Easy_Mailchimp_Extender_Activator { |
|
22 | 22 | /** |
23 | 23 | * Short Description. Activation hook. |
24 | 24 | * |
@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @since 6.0.0 |
28 | 28 | */ |
29 | - public static function activate( $network_wide ) { |
|
29 | + public static function activate( $network_wide ) { |
|
30 | 30 | global $wpdb; |
31 | 31 | |
32 | - if ( function_exists( 'is_multisite' ) && is_multisite() ) { |
|
32 | + if ( function_exists( 'is_multisite' ) && is_multisite() ) { |
|
33 | 33 | // check if it is a network activation - if so, run the activation function for each blog id |
34 | - if ( $network_wide ) { |
|
34 | + if ( $network_wide ) { |
|
35 | 35 | $old_blog = $wpdb->blogid; |
36 | 36 | // Get all blog ids |
37 | 37 | $blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
38 | - foreach ( $blogids as $blog_id ) { |
|
38 | + foreach ( $blogids as $blog_id ) { |
|
39 | 39 | switch_to_blog( $blog_id ); |
40 | 40 | self::_activate_yikes_easy_mailchimp( $wpdb ); |
41 | 41 | restore_current_blog(); |
@@ -44,7 +44,8 @@ discard block |
||
44 | 44 | return; |
45 | 45 | } |
46 | 46 | self::_activate_yikes_easy_mailchimp( $wpdb ); |
47 | - } else { /* end network activate */ |
|
47 | + } else { |
|
48 | +/* end network activate */ |
|
48 | 49 | self::_activate_yikes_easy_mailchimp( $wpdb ); |
49 | 50 | } |
50 | 51 | } |
@@ -56,7 +57,7 @@ discard block |
||
56 | 57 | * |
57 | 58 | * @since 6.0.0 |
58 | 59 | */ |
59 | - static function _activate_yikes_easy_mailchimp( $wpdb ) { |
|
60 | + static function _activate_yikes_easy_mailchimp( $wpdb ) { |
|
60 | 61 | |
61 | 62 | // single site |
62 | 63 | $custom_table_name = $wpdb->prefix . 'yikes_easy_mc_forms'; |
@@ -95,12 +96,12 @@ discard block |
||
95 | 96 | |
96 | 97 | // create an option for the date that the user initially activated the plugin |
97 | 98 | // used to display a two week notice, asking for a review or to upgrade |
98 | - if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) { |
|
99 | + if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) || get_option( 'yikes_easy_mailchimp_activation_date' ) == '' ) { |
|
99 | 100 | update_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ); |
100 | 101 | } |
101 | 102 | |
102 | 103 | // Create an option for the forms. |
103 | - if ( class_exists( 'Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms' ) ) { |
|
104 | + if ( class_exists( 'Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms' ) ) { |
|
104 | 105 | $option_class = new Yikes_Inc_Easy_Mailchimp_Extender_Option_Forms(); |
105 | 106 | $option_class->create_option(); |
106 | 107 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @return type The collection of actions and filters registered with WordPress. |
87 | 87 | */ |
88 | 88 | private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) { |
89 | - $hooks[] = array( |
|
89 | + $hooks[ ] = array( |
|
90 | 90 | 'hook' => $hook, |
91 | 91 | 'component' => $component, |
92 | 92 | 'callback' => $callback, |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function run() { |
104 | 104 | foreach ( $this->filters as $hook ) { |
105 | - add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] ); |
|
105 | + add_filter( $hook[ 'hook' ], array( $hook[ 'component' ], $hook[ 'callback' ] ), $hook[ 'priority' ], $hook[ 'accepted_args' ] ); |
|
106 | 106 | } |
107 | 107 | foreach ( $this->actions as $hook ) { |
108 | - add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] ); |
|
108 | + add_action( $hook[ 'hook' ], array( $hook[ 'component' ], $hook[ 'callback' ] ), $hook[ 'priority' ], $hook[ 'accepted_args' ] ); |
|
109 | 109 | } |
110 | 110 | } |
111 | 111 | } |
112 | 112 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes |
20 | 20 | * @author YIKES Inc. <[email protected]> |
21 | 21 | */ |
22 | -class Yikes_Inc_Easy_Mailchimp_Extender_Loader { |
|
22 | +class Yikes_Inc_Easy_Mailchimp_Extender_Loader { |
|
23 | 23 | /** |
24 | 24 | * The array of actions registered with WordPress. |
25 | 25 | * |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @since 6.0.0 |
43 | 43 | */ |
44 | - public function __construct() { |
|
44 | + public function __construct() { |
|
45 | 45 | $this->actions = array(); |
46 | 46 | $this->filters = array(); |
47 | 47 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * @param int Optional $priority The priority at which the function should be fired. |
56 | 56 | * @param int Optional $accepted_args The number of arguments that should be passed to the $callback. |
57 | 57 | */ |
58 | - public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) { |
|
58 | + public function add_action( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) { |
|
59 | 59 | $this->actions = $this->add( $this->actions, $hook, $component, $callback, $priority, $accepted_args ); |
60 | 60 | } |
61 | 61 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param int Optional $priority The priority at which the function should be fired. |
69 | 69 | * @param int Optional $accepted_args The number of arguments that should be passed to the $callback. |
70 | 70 | */ |
71 | - public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) { |
|
71 | + public function add_filter( $hook, $component, $callback, $priority = 10, $accepted_args = 1 ) { |
|
72 | 72 | $this->filters = $this->add( $this->filters, $hook, $component, $callback, $priority, $accepted_args ); |
73 | 73 | } |
74 | 74 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @param int Optional $accepted_args The number of arguments that should be passed to the $callback. |
86 | 86 | * @return type The collection of actions and filters registered with WordPress. |
87 | 87 | */ |
88 | - private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) { |
|
88 | + private function add( $hooks, $hook, $component, $callback, $priority, $accepted_args ) { |
|
89 | 89 | $hooks[] = array( |
90 | 90 | 'hook' => $hook, |
91 | 91 | 'component' => $component, |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | * |
101 | 101 | * @since 6.0.0 |
102 | 102 | */ |
103 | - public function run() { |
|
104 | - foreach ( $this->filters as $hook ) { |
|
103 | + public function run() { |
|
104 | + foreach ( $this->filters as $hook ) { |
|
105 | 105 | add_filter( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] ); |
106 | 106 | } |
107 | - foreach ( $this->actions as $hook ) { |
|
107 | + foreach ( $this->actions as $hook ) { |
|
108 | 108 | add_action( $hook['hook'], array( $hook['component'], $hook['callback'] ), $hook['priority'], $hook['accepted_args'] ); |
109 | 109 | } |
110 | 110 | } |