Completed
Pull Request — master (#811)
by
unknown
09:59 queued 07:34
created
admin/partials/helpers/fields/yikes-mailchimp-checkbox-field.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,16 +5,16 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.
admin/partials/helpers/fields/yikes-mailchimp-file-field.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
admin/partials/helpers/fields/yikes-mailchimp-wysiwyg-field.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,18 +6,18 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.
admin/partials/helpers/fields/yikes-mailchimp-radio-field.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,26 +5,26 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
includes/api/class-yikes-inc-easy-mailchimp-api-manager.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$this->api_key = $api_key;
98 98
 		$parts         = $this->get_api_key_parts();
99
-		$this->key     = $parts['key'];
100
-		$this->dc      = $parts['dc'];
99
+		$this->key     = $parts[ 'key' ];
100
+		$this->dc      = $parts[ 'dc' ];
101 101
 	}
102 102
 
103 103
 	/**
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 		$parts = explode( '-', $this->api_key );
123 123
 
124 124
 		return array(
125
-			'key' => $parts[0],
126
-			'dc'  => isset( $parts[1] ) ? $parts[1] : '',
125
+			'key' => $parts[ 0 ],
126
+			'dc'  => isset( $parts[ 1 ] ) ? $parts[ 1 ] : '',
127 127
 		);
128 128
 	}
129 129
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 	 * @return Yikes_Inc_Easy_MailChimp_API
168 168
 	 */
169 169
 	public function get_api( $version = '' ) {
170
-		$version = $version ?: $this->get_default_api_version();
170
+		$version = $version ? : $this->get_default_api_version();
171 171
 
172 172
 		if ( ! array_key_exists( $version, $this->api ) || null === $this->api[ $version ] ) {
173 173
 			$this->api[ $version ] = new Yikes_Inc_Easy_MailChimp_API( $this->get_datacenter(), $this->get_api_key(), $version );
Please login to merge, or discard this patch.
public/partials/shortcodes/yikes-mailchimp-subscriber-count.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 		return '';
27 27
 	}
28 28
 
29
-	$form    = ( ! empty( $attributes['form'] ) ) ? str_replace( '&quot;', '', $attributes['form'] ) : false;
30
-	$list_id = ( ! empty( $attributes['list'] ) ) ? $attributes['list'] : false;
29
+	$form    = ( ! empty( $attributes[ 'form' ] ) ) ? str_replace( '&quot;', '', $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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
includes/api/class-yikes-inc-easy-mailchimp-api-abstract-items.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 			}
80 80
 
81 81
 			// If the API gave an error or there are no more lists, break.
82
-			if ( isset( $response['error'] ) ) {
83
-				return new WP_Error( $response['title'], $response['detail'] );
82
+			if ( isset( $response[ 'error' ] ) ) {
83
+				return new WP_Error( $response[ 'title' ], $response[ 'detail' ] );
84 84
 			}
85 85
 
86 86
 			if ( empty( $response[ $item_key ] ) ) {
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
 			// Update the total number of items if it's still zero.
91 91
 			if ( 0 === $total ) {
92
-				$total = intval( $response['total_items'] );
92
+				$total = intval( $response[ 'total_items' ] );
93 93
 			}
94 94
 
95 95
 			// Store each new list.
@@ -196,16 +196,16 @@  discard block
 block discarded – undo
196 196
 			return $response;
197 197
 		}
198 198
 
199
-		if ( isset( $response['error'] ) ) {
200
-			$title  = isset( $response['title'] )  ? $response['title']  : $response['name'];
201
-			$detail = isset( $response['detail'] ) ? $response['detail'] : $response['error'];
202
-			$data   = isset( $response['errors'] ) ? $response['errors'] : array();
199
+		if ( isset( $response[ 'error' ] ) ) {
200
+			$title  = isset( $response[ 'title' ] ) ? $response[ 'title' ] : $response[ 'name' ];
201
+			$detail = isset( $response[ 'detail' ] ) ? $response[ 'detail' ] : $response[ 'error' ];
202
+			$data   = isset( $response[ 'errors' ] ) ? $response[ 'errors' ] : array();
203 203
 
204 204
 			return new WP_Error(
205 205
 				$title,
206 206
 				$detail,
207 207
 				array(
208
-					'status' => (int) $response['status'],
208
+					'status' => (int) $response[ 'status' ],
209 209
 					'data'   => $data,
210 210
 				)
211 211
 			);
@@ -234,9 +234,9 @@  discard block
 block discarded – undo
234 234
 
235 235
 		// MailChimp uses the application/problem+json type for errors
236 236
 		$headers = wp_remote_retrieve_headers( $response );
237
-		if ( isset( $headers['content-type'] ) ) {
238
-			if ( false !== strpos( $headers['content-type'], 'application/problem+json' ) ) {
239
-				$body['error'] = true;
237
+		if ( isset( $headers[ 'content-type' ] ) ) {
238
+			if ( false !== strpos( $headers[ 'content-type' ], 'application/problem+json' ) ) {
239
+				$body[ 'error' ] = true;
240 240
 			}
241 241
 		}
242 242
 
Please login to merge, or discard this patch.
includes/api/class-yikes-inc-easy-mailchimp-api.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 * @return array|WP_Error
104 104
 	 */
105 105
 	public function patch( $path = '', $headers = array(), $params = array() ) {
106
-		if ( ! isset( $params['body'] ) ) {
106
+		if ( ! isset( $params[ 'body' ] ) ) {
107 107
 			return new WP_Error(
108 108
 				'yikesinc_eme_missing_body',
109 109
 				sprintf(
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 * @return array|WP_Error
131 131
 	 */
132 132
 	public function post( $path = '', $headers = array(), $params = array() ) {
133
-		if ( ! isset( $params['body'] ) ) {
133
+		if ( ! isset( $params[ 'body' ] ) ) {
134 134
 			return new WP_Error(
135 135
 				'yikesinc_eme_missing_body',
136 136
 				sprintf(
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 	 * @return array|WP_Error
158 158
 	 */
159 159
 	public function put( $path = '', $headers = array(), $params = array() ) {
160
-		if ( ! isset( $params['body'] ) ) {
160
+		if ( ! isset( $params[ 'body' ] ) ) {
161 161
 			return new WP_Error(
162 162
 				'yikesinc_eme_missing_body',
163 163
 				sprintf(
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
 		$authorized_args = $this->get_authorized_args();
289 289
 
290 290
 		// If we have body data, maybe convert it to JSON.
291
-		if ( isset( $params['body'] ) && ( is_array( $params['body'] ) || is_object( $params['body'] ) ) ) {
292
-			$params['body']          = json_encode( wp_parse_args( $authorized_args['body'], $params['body'] ) );
293
-			$headers['Content-Type'] = 'application/json';
291
+		if ( isset( $params[ 'body' ] ) && ( is_array( $params[ 'body' ] ) || is_object( $params[ 'body' ] ) ) ) {
292
+			$params[ 'body' ]          = json_encode( wp_parse_args( $authorized_args[ 'body' ], $params[ 'body' ] ) );
293
+			$headers[ 'Content-Type' ] = 'application/json';
294 294
 		}
295 295
 
296 296
 		// Combine the given headers and auth headers
297
-		$headers = wp_parse_args( $authorized_args['headers'], $headers );
297
+		$headers = wp_parse_args( $authorized_args[ 'headers' ], $headers );
298 298
 		/**
299 299
 		 * Filter the headers used for a request to the MailChimp API.
300 300
 		 *
@@ -358,12 +358,12 @@  discard block
 block discarded – undo
358 358
 
359 359
 		// Version 2.0 uses body authorization
360 360
 		if ( version_compare( '3.0', $this->api_version, '>' ) ) {
361
-			$args['body'] = $this->get_auth_body();
361
+			$args[ 'body' ] = $this->get_auth_body();
362 362
 		}
363 363
 
364 364
 		// Version 3.0 uses authorization headers.
365 365
 		if ( version_compare( '3.0', $this->api_version, '<=' ) ) {
366
-			$args['headers'] = $this->get_auth_headers();
366
+			$args[ 'headers' ] = $this->get_auth_headers();
367 367
 		}
368 368
 
369 369
 		return $args;
Please login to merge, or discard this patch.
includes/class-yikes-inc-easy-mailchimp-extender-activator.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.