yikesinc / yikes-inc-easy-mailchimp-extender

blocks/api/api.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 			wp_send_json_error( '1' );
 		}
 
-		$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : '';
+		$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : '';
 
 		if ( empty( $form_id ) ) {
 			wp_send_json_error( '1' );
@@ -75,12 +75,12 @@ 
 
 			$locale   = get_locale();
 			$locale_a = explode( '_', $locale );
-			$locale   = isset( $locale_a[0] ) ? $locale_a[0] : $locale;
+			$locale   = isset( $locale_a[ 0 ] ) ? $locale_a[ 0 ] : $locale;
 			$return   = apply_filters( 'yikes_mailchimp_recaptcha_data', array(
 				'site_key'   => $site_key,
 				'secret_key' => $secret_key,
 				'locale'     => $locale,
-			));
+			) );
 
 			wp_send_json_success( $return );
 		}

admin/partials/view-user.php

Spacing +29 added lines, -29 removed lines

@@ -3,8 +3,8 @@ 
 *	Get and store our variables
 *	@since 6.0
 */
-$list_id     = $_GET['mailchimp-list'];
-$email_id    = esc_attr( $_GET['email-id'] );
+$list_id     = $_GET[ 'mailchimp-list' ];
+$email_id    = esc_attr( $_GET[ 'email-id' ] );
 $list_helper = yikes_get_mc_api_manager()->get_list_handler();
 
 /*
@@ -36,14 +36,14 @@ 
 }
 
 $other_lists      = $list_helper->get_members_lists( $email_id );
-$merge_data_array = $user_data['merge_fields'];
+$merge_data_array = $user_data[ 'merge_fields' ];
 
 $additional_lists = array();
 $merge_variable_fields = array();
 
 /* Build the array of mailing lists the user is subscribed to */
 foreach ( $other_lists as $id => $value ) {
-	if ( 'subscribed' !== $value['status'] ) {
+	if ( 'subscribed' !== $value[ 'status' ] ) {
 		continue;
 	}
 
@@ -58,7 +58,7 @@ 
 		continue;
 	}
 
-	$additional_lists[ $list_data['id'] ] = $list_data['name'];
+	$additional_lists[ $list_data[ 'id' ] ] = $list_data[ 'name' ];
 }
 
 /* Build the array of merge variables => value */
@@ -74,21 +74,21 @@ 
 }
 // loop and display
 if ( $merge_variables ) {
-	foreach ( $merge_variables['merge_fields'] as $merge_variable ) {
-		if ( $merge_variable['tag'] != 'EMAIL' ) {
-			$merge_variable_fields[ $merge_variable['name'] ] = ( isset( $merge_data_array[ $merge_variable['tag'] ] ) ) ? $merge_data_array[ $merge_variable['tag'] ] : '';
+	foreach ( $merge_variables[ 'merge_fields' ] as $merge_variable ) {
+		if ( $merge_variable[ 'tag' ] != 'EMAIL' ) {
+			$merge_variable_fields[ $merge_variable[ 'name' ] ] = ( isset( $merge_data_array[ $merge_variable[ 'tag' ] ] ) ) ? $merge_data_array[ $merge_variable[ 'tag' ] ] : '';
 		}
 	}
 }
 
 
 // store usable data
-$user_email = sanitize_email( $user_data['email_address'] );
+$user_email = sanitize_email( $user_data[ 'email_address' ] );
 // prepend our email address to the beginning
 $merge_variable_fields = array( 'Email Address' => $user_email ) + $merge_variable_fields;
 $gravatar_image        = get_avatar( $user_email, 120 );
-$email_type            = $user_data['email_type'];
-$member_rating         = ( ! empty( $user_data['member_rating'] ) ) ? (int) $user_data['member_rating'] : 0;
+$email_type            = $user_data[ 'email_type' ];
+$member_rating         = ( ! empty( $user_data[ 'member_rating' ] ) ) ? (int) $user_data[ 'member_rating' ] : 0;
 $member_rating_stars   = '';
 
 // Create member rating stars
@@ -100,8 +100,8 @@ 
 	}
 }
 
-$last_changed  = strtotime( $user_data['last_changed'] );
-$user_language = ( ! empty( $user_data['language'] ) ) ? $user_data['language'] : '';
+$last_changed  = strtotime( $user_data[ 'last_changed' ] );
+$user_language = ( ! empty( $user_data[ 'language' ] ) ) ? $user_data[ 'language' ] : '';
 $list_name     = $additional_lists[ $list_id ];
 
 // Generate our display page
@@ -144,11 +144,11 @@ 
 							echo sprintf( esc_html__( 'Subscribed: %1$1s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( gmdate( 'F jS, Y h:i a', $last_changed ) ) );
 						?>
 					</span>
-				<?php if ( isset( $user_data['location'] ) && isset( $user_data['location']['timezone'] ) && ! empty( $user_data['location']['timezone'] ) && isset( $user_data['location']['country_code'] ) && ! empty( $user_data['location']['country_code'] ) ) { ?>
+				<?php if ( isset( $user_data[ 'location' ] ) && isset( $user_data[ 'location' ][ 'timezone' ] ) && ! empty( $user_data[ 'location' ][ 'timezone' ] ) && isset( $user_data[ 'location' ][ 'country_code' ] ) && ! empty( $user_data[ 'location' ][ 'country_code' ] ) ) { ?>
 					<span class="member-location-data">
 						<?php
 							/* translators: the placeholders are a timezone and a country code */
-							echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data['location']['timezone'] ), esc_html( $user_data['location']['country_code'] ) );
+							echo sprintf( esc_html__( 'Location: %1$1s, %2$2s', 'yikes-inc-easy-mailchimp-extender' ), esc_html( $user_data[ 'location' ][ 'timezone' ] ), esc_html( $user_data[ 'location' ][ 'country_code' ] ) );
 						?>
 					</span>
 				<?php } ?>
@@ -157,7 +157,7 @@ 
 			<hr class="yikes-mc-subscriber-hr" />
 
 			<?php
-			if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && filter_var( wp_unslash( $_GET['section'] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) {
+			if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && filter_var( wp_unslash( $_GET[ 'section' ] ), FILTER_SANITIZE_STRING ) === 'subscriber-data' ) ) {
 				?>
 			<section class="yikes-mc-card-body merge-variable-section">
 				<h3><?php esc_html_e( 'Fields:', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
@@ -177,12 +177,12 @@ 
 					<strong><?php esc_html_e( 'No Subscriber Data Found', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 					<?php
 				}
-				if ( isset( $user_data['ip_signup'] ) && ! empty( $user_data['ip_signup'] ) ) {
+				if ( isset( $user_data[ 'ip_signup' ] ) && ! empty( $user_data[ 'ip_signup' ] ) ) {
 					?>
 					<li>
 						<label>
 							<strong class="section-label"><?php esc_html_e( 'Signup IP', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<p class="section-value"><em><?php esc_html_e( $user_data['ip_signup'] ); ?></em></p>
+							<p class="section-value"><em><?php esc_html_e( $user_data[ 'ip_signup' ] ); ?></em></p>
 						</label>
 					</li>
 					<?php
@@ -193,7 +193,7 @@ 
 			<?php
 
 
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) {
 				?>
 				<section class="yikes-mc-card-body">
 					<?php
@@ -222,7 +222,7 @@ 
 			?>
 
 			<?php
-			if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) {
+			if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) {
 				$unsubscribe_subscriber_url = esc_url_raw( add_query_arg( array(
 					'action'         => 'yikes-easy-mc-unsubscribe-user',
 					'mailchimp-list' => $list_id,
@@ -277,36 +277,36 @@ 
 		<div id="customer-tab-wrapper">
 			<ul id="customer-tab-wrapper-list">
 
-				<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+				<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				<a title="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Subscriber Details', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $subscriber_details; ?>">
 					<?php } ?>
 
-					<li <?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'subscriber-data' ) ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons  dashicons-id"></span></li>
 
-					<?php if ( isset( $_GET['section'] ) && $_GET['section'] != 'subscriber-data' ) { ?>
+					<?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'subscriber-data' ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] != 'additional-subscriptions' ) ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'additional-subscriptions' ) ) { ?>
 				<a title="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Additional Subscriptions', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $additional_subscription_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-portfolio"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'additional-subscriptions' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'additional-subscriptions' ) ) { ?>
 				</a>
 			<?php } ?>
 
-				<?php if ( ! isset( $_GET['section'] ) || isset( $_GET['section'] ) && $_GET['section'] != 'delete-subscriber' ) { ?>
+				<?php if ( ! isset( $_GET[ 'section' ] ) || isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] != 'delete-subscriber' ) { ?>
 				<a title="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" aria-label="<?php _e( 'Delete Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="<?php echo $delete_subscriber_url; ?>">
 					<?php } ?>
 
-					<li <?php if ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
+					<li <?php if ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) { ?>class="active" <?php } else { ?>class="inactive"<?php } ?>>
 						<span class="dashicons dashicons-trash"></span></li>
 
-					<?php if ( ! isset( $_GET['section'] ) || ( isset( $_GET['section'] ) && $_GET['section'] == 'delete-subscriber' ) ) { ?>
+					<?php if ( ! isset( $_GET[ 'section' ] ) || ( isset( $_GET[ 'section' ] ) && $_GET[ 'section' ] == 'delete-subscriber' ) ) { ?>
 				</a>
 			<?php } ?>
 

admin/partials/ajax/class.ajax.php

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 		public function __construct() {
 
 			// Ajax send merge variable to form builder.
-			add_action( 'wp_ajax_add_field_to_form', array( $this , 'send_field_to_form' ), 10 );
+			add_action( 'wp_ajax_add_field_to_form', array( $this, 'send_field_to_form' ), 10 );
 
 			// Ajax send interest group to form builder.
 			add_action( 'wp_ajax_add_interest_group_to_form', array( $this, 'send_interest_group_to_form' ), 10 );
@@ -41,7 +41,7 @@ 
 		*	- return a single container
 		*/
 		public function add_notification_to_form() {
-			if ( isset( $_POST['notification_name'] ) ) {
+			if ( isset( $_POST[ 'notification_name' ] ) ) {
 				include_once YIKES_MC_PATH . 'admin/partials/ajax/add_notification_to_form.php';
 			}
 			exit();
@@ -51,7 +51,7 @@ 
 		// when the user wants to switch which form data
 		// is displayed on the dashboard
 		public function get_new_list_data() {
-			$list_id   = $_POST['list_id'];
+			$list_id   = $_POST[ 'list_id' ];
 			$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_list( $list_id );
 			if ( is_wp_error( $list_data ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -74,10 +74,10 @@ 
 		/* note: this function is called statically from the integration settings page */
 		public static function check_list_for_interest_groups( $list_id = '', $integration_type = '', $load = false ) {
 			if ( ! $list_id ) {
-				$list_id = $_POST['list_id'];
+				$list_id = $_POST[ 'list_id' ];
 			}
 			if ( ! $integration_type ) {
-				$integration_type = $_POST['integration'];
+				$integration_type = $_POST[ 'integration' ];
 			}
 
 
@@ -122,9 +122,9 @@ 
 			if ( ! check_ajax_referer( 'add-tag', 'nonce', false ) ) {
 				wp_send_json_error( '1' );
 			}
-			$tags    = isset( $_POST['tags'] ) ? wp_unslash( $_POST['tags'] ) : array();
-			$list_id = isset( $_POST['list_id'] ) ? filter_var( wp_unslash( $_POST['list_id'] ), FILTER_SANITIZE_STRING ) : '';
-			$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
+			$tags    = isset( $_POST[ 'tags' ] ) ? wp_unslash( $_POST[ 'tags' ] ) : array();
+			$list_id = isset( $_POST[ 'list_id' ] ) ? filter_var( wp_unslash( $_POST[ 'list_id' ] ), FILTER_SANITIZE_STRING ) : '';
+			$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
 
 			if ( empty( $tags ) || empty( $list_id ) || empty( $form_id ) ) {
 				wp_send_json_error( '2' );
@@ -136,13 +136,13 @@ 
 
 			// This data came from $_POST so sanitize it.
 			foreach ( $tags as $tag ) {
-				$form_tags[ filter_var( $tag['tag_id'], FILTER_SANITIZE_NUMBER_INT ) ] = array(
-					'name' => filter_var( $tag['tag_name'], FILTER_SANITIZE_STRING ),
-					'id'   => filter_var( $tag['tag_id'], FILTER_SANITIZE_NUMBER_INT ),
+				$form_tags[ filter_var( $tag[ 'tag_id' ], FILTER_SANITIZE_NUMBER_INT ) ] = array(
+					'name' => filter_var( $tag[ 'tag_name' ], FILTER_SANITIZE_STRING ),
+					'id'   => filter_var( $tag[ 'tag_id' ], FILTER_SANITIZE_NUMBER_INT ),
 				);
 			}
 
-			$form['tags'] = $form_tags + ( isset( $form['tags'] ) ? $form['tags'] : array() );
+			$form[ 'tags' ] = $form_tags + ( isset( $form[ 'tags' ] ) ? $form[ 'tags' ] : array() );
 			$form_interface->update_form( $form_id, $form );
 			wp_send_json_success( array( 'tags' => $form_tags ) );
 		}
@@ -155,9 +155,9 @@ 
 			if ( ! check_ajax_referer( 'remove-tag', 'nonce', false ) ) {
 				wp_send_json_error( '1' );
 			}
-			$tag     = isset( $_POST['tag'] ) ? filter_var( wp_unslash( $_POST['tag'] ), FILTER_SANITIZE_NUMBER_INT ) : array();
-			$list_id = isset( $_POST['list_id'] ) ? filter_var( wp_unslash( $_POST['list_id'] ), FILTER_SANITIZE_STRING ) : '';
-			$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
+			$tag     = isset( $_POST[ 'tag' ] ) ? filter_var( wp_unslash( $_POST[ 'tag' ] ), FILTER_SANITIZE_NUMBER_INT ) : array();
+			$list_id = isset( $_POST[ 'list_id' ] ) ? filter_var( wp_unslash( $_POST[ 'list_id' ] ), FILTER_SANITIZE_STRING ) : '';
+			$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : 0;
 
 			if ( empty( $tag ) || empty( $list_id ) || empty( $form_id ) ) {
 				wp_send_json_error( '2' );
@@ -165,8 +165,8 @@ 
 
 			$form_interface = yikes_easy_mailchimp_extender_get_form_interface();
 			$form           = $form_interface->get_form( $form_id );
-			if ( isset( $form['tags'] ) && isset( $form['tags'][ $tag ] ) ) {
-				unset( $form['tags'][ $tag ] );
+			if ( isset( $form[ 'tags' ] ) && isset( $form[ 'tags' ][ $tag ] ) ) {
+				unset( $form[ 'tags' ][ $tag ] );
 			}
 			$form_interface->update_form( $form_id, $form );
 			wp_send_json_success();			
@@ -190,10 +190,10 @@ 
 		public function save_field_label_edits() {
 
 			// Capture our $_POST variables
-			$list_id	= isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
-			$field_data = isset( $_POST['field_data'] ) ? $_POST['field_data'] : array();
-			$field_name = isset( $field_data['field_name'] ) ? $field_data['field_name'] : '';
-			$field_id	= isset( $field_data['field_id'] ) ? $field_data['field_id'] : '';
+			$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
+			$field_data = isset( $_POST[ 'field_data' ] ) ? $_POST[ 'field_data' ] : array();
+			$field_name = isset( $field_data[ 'field_name' ] ) ? $field_data[ 'field_name' ] : '';
+			$field_id = isset( $field_data[ 'field_id' ] ) ? $field_data[ 'field_id' ] : '';
 
 			// Make sure we have our required variables before continuing
 			if ( $list_id === '' || $field_name === '' || $field_id === '' ) {

blocks/easy-forms-block/easy-forms-block.php

Spacing +31 added lines, -31 removed lines

@@ -66,46 +66,46 @@
 	 */
 	public function render_block( $attributes, $content ) {
 
-		if ( ! isset( $attributes['form_id'] ) ) {
+		if ( ! isset( $attributes[ 'form_id' ] ) ) {
 			return;
 		}
 
 		$shortcode_attributes = array(
-			'form'                       => $attributes['form_id'],
-			'submit'                     => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '',
-			'title'                      => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0',
-			'custom_title'               => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '',
-			'description'                => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0',
-			'custom_description'         => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '',
-			'ajax'                       => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0',
-			'recaptcha'                  => ! isset( $attributes['recaptcha'] ) || isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '',
-			'recaptcha_lang'             => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '',
-			'recaptcha_type'             => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '',
-			'recaptcha_theme'            => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '',
-			'recaptcha_size'             => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '',
-			'recaptcha_data_callback'    => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '',
-			'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '',
-			'inline'                     => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0',
+			'form'                       => $attributes[ 'form_id' ],
+			'submit'                     => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '',
+			'title'                      => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0',
+			'custom_title'               => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '',
+			'description'                => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0',
+			'custom_description'         => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '',
+			'ajax'                       => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0',
+			'recaptcha'                  => ! isset( $attributes[ 'recaptcha' ] ) || isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '',
+			'recaptcha_lang'             => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '',
+			'recaptcha_type'             => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '',
+			'recaptcha_theme'            => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '',
+			'recaptcha_size'             => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '',
+			'recaptcha_data_callback'    => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '',
+			'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '',
+			'inline'                     => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0',
 		);
 
 		// We want to run process_mailchimp_shortcode() but we need to return the plaintext shortcode or Gutenberg will autop() the shortcode content.
 		return sprintf(
 			'[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s"  recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]',
-			$shortcode_attributes['form'],
-			$shortcode_attributes['submit'],
-			$shortcode_attributes['title'],
-			$shortcode_attributes['custom_title'],
-			$shortcode_attributes['description'],
-			$shortcode_attributes['custom_description'],
-			$shortcode_attributes['ajax'],
-			$shortcode_attributes['recaptcha'],
-			$shortcode_attributes['recaptcha_lang'],
-			$shortcode_attributes['recaptcha_type'],
-			$shortcode_attributes['recaptcha_theme'],
-			$shortcode_attributes['recaptcha_size'],
-			$shortcode_attributes['recaptcha_data_callback'],
-			$shortcode_attributes['recaptcha_expired_callback'],
-			$shortcode_attributes['inline']
+			$shortcode_attributes[ 'form' ],
+			$shortcode_attributes[ 'submit' ],
+			$shortcode_attributes[ 'title' ],
+			$shortcode_attributes[ 'custom_title' ],
+			$shortcode_attributes[ 'description' ],
+			$shortcode_attributes[ 'custom_description' ],
+			$shortcode_attributes[ 'ajax' ],
+			$shortcode_attributes[ 'recaptcha' ],
+			$shortcode_attributes[ 'recaptcha_lang' ],
+			$shortcode_attributes[ 'recaptcha_type' ],
+			$shortcode_attributes[ 'recaptcha_theme' ],
+			$shortcode_attributes[ 'recaptcha_size' ],
+			$shortcode_attributes[ 'recaptcha_data_callback' ],
+			$shortcode_attributes[ 'recaptcha_expired_callback' ],
+			$shortcode_attributes[ 'inline' ]
 		);
 	}
 }

admin/partials/menu/options-sections/import-export-forms.php

Spacing +17 added lines, -17 removed lines

@@ -3,15 +3,15 @@ 
 $form_interface = yikes_easy_mailchimp_extender_get_form_interface();
 $all_forms = $form_interface->get_all_forms();
 ?>
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for Mailchimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 
 		<?php if ( empty( $all_forms ) ) { ?>
@@ -20,44 +20,44 @@ 
 			</p>
 		<?php } else { ?>
 			<!-- custom list so users can export specific forms -->
-			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			<ul class="export-custom-forms-list">
-				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<?php foreach( $all_forms as $id => $form ) { ?>
-					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
+				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<?php foreach ( $all_forms as $id => $form ) { ?>
+					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
 				<?php } ?>
 			</ul>
 		<?php } ?>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings." , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Export YIKES Easy Forms for Mailchimp plugin settings.", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Import Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Select the Easy Forms for Mailchimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 		<label>
 			<input type="file" name="csv" id="forms_to_import">
 		</label>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 </div> <!-- .inside -->

admin/partials/dashboard-widgets/class.list-activity-widget.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 	// Construction
 	public function __construct() {
 
-		if ( apply_filters( 'yikes-mailchimp-dashboard-widgets-enabled', true ) === true &&  yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
+		if ( apply_filters( 'yikes-mailchimp-dashboard-widgets-enabled', true ) === true && yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
 
 			// hook in and display our list stats dashboard widget
 			add_action( 'wp_dashboard_setup', array( $this, 'yks_mc_add_dashboard_widget' ), 10 );
@@ -54,8 +54,8 @@ 
 
 			/* List Stats Dashboard Widget */
 			wp_add_dashboard_widget(
-				'yikes_easy_mc_list_stats_widget',         // Widget slug.
-				__( 'Mailchimp List Stats', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
+				'yikes_easy_mc_list_stats_widget', // Widget slug.
+				__( 'Mailchimp List Stats', 'yikes-inc-easy-mailchimp-extender' ), // Title.
 				array( $this, 'list_stats_dashboard_widget' ) // Display function.
 			);
 		}
@@ -87,7 +87,7 @@ 
 					<?php
 					foreach ( $list_data as $list ) {
 						?>
-						<option value="<?php echo $list['id']; ?>"><?php echo $list['name']; ?></option>
+						<option value="<?php echo $list[ 'id' ]; ?>"><?php echo $list[ 'name' ]; ?></option>
 						<?php
 					}
 					?>

admin/partials/front-end-widgets/front-end-widget-form.php

Spacing +18 added lines, -18 removed lines

@@ -25,7 +25,7 @@ 
 			// Widget name will appear in UI
 			__( 'Easy Mailchimp Forms', 'yikes-inc-easy-mailchimp-extender' ),
 			// Widget description
-			array( 'description' => __( 'Mailchimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ), )
+			array( 'description' => __( 'Mailchimp opt-in widget for your sidebar.', 'yikes-inc-easy-mailchimp-extender' ),)
 		);
 	}
 
@@ -39,10 +39,10 @@ 
 		// Get all form IDs so we can use the first one as a default.
 		$form_ids = $this->form_interface->get_form_ids();
 
-		$title              = isset( $instance['title'] ) ? apply_filters( 'widget_title', $instance['title'] ) : __( 'Mailchimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
-		$form_id            = isset( $instance['form_id'] ) ? $instance['form_id'] : $form_ids[0];
-		$form_description   = isset( $instance['form_description'] ) ? $instance['form_description'] : '';
-		$submit_button_text = isset( $instance['submit_text'] ) ? $instance['submit_text'] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+		$title              = isset( $instance[ 'title' ] ) ? apply_filters( 'widget_title', $instance[ 'title' ] ) : __( 'Mailchimp Signup Form', 'yikes-inc-easy-mailchimp-extender' );
+		$form_id            = isset( $instance[ 'form_id' ] ) ? $instance[ 'form_id' ] : $form_ids[ 0 ];
+		$form_description   = isset( $instance[ 'form_description' ] ) ? $instance[ 'form_description' ] : '';
+		$submit_button_text = isset( $instance[ 'submit_text' ] ) ? $instance[ 'submit_text' ] : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 
 		// Build our array based on settings chosen
 		$shortcode_attributes = array(
@@ -54,10 +54,10 @@ 
 		$shortcode_attributes = apply_filters( 'yikes_mailchimp_widget_shortcode_attributes', $shortcode_attributes, $instance );
 
 		// before and after widget arguments are defined by themes
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
 		if ( ! empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		// Custom action hooks to place content in the widget before the form
@@ -73,7 +73,7 @@ 
 		do_action( 'yikes-mailchimp-after-form-' . $form_id );
 		do_action( 'yikes-mailchimp-after-form' );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	// Widget Backend 
@@ -83,7 +83,7 @@ 
 		if ( empty( $all_forms ) ) {
 			?>
 				<section class="no-forms-widget">
-				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form' , 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form' , 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
+				<strong><span class="dashicons dashicons-no-alt no-forms-found-icon"></span><?php echo sprintf( __( 'No forms found. It looks like you need to <a href="%s" title="%s">%s</a>.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ), __( 'create a form', 'yikes-inc-easy-mailchimp-extender' ) ); ?></strong>
 				</section>
 			<?php
 			return;
@@ -110,9 +110,9 @@ 
 			$submit_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
 		}
 
-		 if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+		 if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 			?>
-				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid Mailchimp API key to connect your site to Mailchimp.' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+				<p class="enter-valid-api-error-widget"><strong><?php _e( 'Please enter a valid Mailchimp API key to connect your site to Mailchimp.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 			<?php
 			return;
 		}
@@ -129,9 +129,9 @@ 
 			<select id="<?php echo $this->get_field_id( 'form_id' ); ?>" name="<?php echo $this->get_field_name( 'form_id' ); ?>" class="widefat">
 				<?php
 				// build our array
-				foreach( $all_forms as $id => $form ) {
+				foreach ( $all_forms as $id => $form ) {
 					?>
-						<option <?php selected( $selected_form , $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form['form_name'] ); ?></option>
+						<option <?php selected( $selected_form, $id ); ?> name="<?php echo $this->get_field_name( 'form_id' ); ?>" value="<?php echo $id; ?>"><?php echo stripslashes( $form[ 'form_name' ] ); ?></option>
 					<?php
 				}
 				?>
@@ -140,7 +140,7 @@ 
 
 		<p>
 			<label for="<?php echo $this->get_field_id( 'form_description' ); ?>"><?php _e( 'Display Form Description:' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if( isset( $instance['form_description'] ) ) { checked( $instance['form_description'] , 1 ); } ?> />
+			<input class="widefat" id="<?php echo $this->get_field_id( 'form_description' ); ?>" name="<?php echo $this->get_field_name( 'form_description' ); ?>" type="checkbox" value="1" <?php if ( isset( $instance[ 'form_description' ] ) ) { checked( $instance[ 'form_description' ], 1 ); } ?> />
 		</p>
 
 		<p>
@@ -153,10 +153,10 @@ 
 	// Updating widget replacing old instances with new
 	public function update( $new_instance, $old_instance ) {
 		$instance = array();
-		$instance['title'] = ( ! empty( $new_instance['title'] ) ) ? strip_tags( $new_instance['title'] ) : '';
-		$instance['form_id'] = $new_instance['form_id'];
-		$instance['form_description'] = isset( $new_instance['form_description'] ) ? '1' : '';
-		$instance['submit_text'] = ( ! empty( $new_instance['submit_text'] ) ) ? strip_tags( $new_instance['submit_text'] ) : 'Submit';
+		$instance[ 'title' ] = ( ! empty( $new_instance[ 'title' ] ) ) ? strip_tags( $new_instance[ 'title' ] ) : '';
+		$instance[ 'form_id' ] = $new_instance[ 'form_id' ];
+		$instance[ 'form_description' ] = isset( $new_instance[ 'form_description' ] ) ? '1' : '';
+		$instance[ 'submit_text' ] = ( ! empty( $new_instance[ 'submit_text' ] ) ) ? strip_tags( $new_instance[ 'submit_text' ] ) : 'Submit';
 		return $instance;
 	}
 	

includes/third-party-integrations/visual-composer/visual-composer.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 		if ( ! empty( $all_forms ) ) {

 			// build an array to pass to our javascript

 			foreach ( $all_forms as $id => $form ) {

-				$lists[ $form['form_name'] ] = $id;

+				$lists[ $form[ 'form_name' ] ] = $id;

 			}

 		} else {

 			$lists[ __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

includes/api/class-yikes-inc-easy-mailchimp-api.php

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function patch( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -130,7 +130,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function post( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -157,7 +157,7 @@ 
 	 * @return array|WP_Error
 	 */
 	public function put( $path = '', $headers = array(), $params = array() ) {
-		if ( ! isset( $params['body'] ) ) {
+		if ( ! isset( $params[ 'body' ] ) ) {
 			return new WP_Error(
 				'yikesinc_eme_missing_body',
 				sprintf(
@@ -288,13 +288,13 @@ 
 		$authorized_args = $this->get_authorized_args();
 
 		// If we have body data, maybe convert it to JSON.
-		if ( isset( $params['body'] ) && ( is_array( $params['body'] ) || is_object( $params['body'] ) ) ) {
-			$params['body']          = json_encode( wp_parse_args( $authorized_args['body'], $params['body'] ) );
-			$headers['Content-Type'] = 'application/json';
+		if ( isset( $params[ 'body' ] ) && ( is_array( $params[ 'body' ] ) || is_object( $params[ 'body' ] ) ) ) {
+			$params[ 'body' ]          = json_encode( wp_parse_args( $authorized_args[ 'body' ], $params[ 'body' ] ) );
+			$headers[ 'Content-Type' ] = 'application/json';
 		}
 
 		// Combine the given headers and auth headers
-		$headers = wp_parse_args( $authorized_args['headers'], $headers );
+		$headers = wp_parse_args( $authorized_args[ 'headers' ], $headers );
 		/**
 		 * Filter the headers used for a request to the Mailchimp API.
 		 *
@@ -358,12 +358,12 @@ 
 
 		// Version 2.0 uses body authorization
 		if ( version_compare( '3.0', $this->api_version, '>' ) ) {
-			$args['body'] = $this->get_auth_body();
+			$args[ 'body' ] = $this->get_auth_body();
 		}
 
 		// Version 3.0 uses authorization headers.
 		if ( version_compare( '3.0', $this->api_version, '<=' ) ) {
-			$args['headers'] = $this->get_auth_headers();
+			$args[ 'headers' ] = $this->get_auth_headers();
 		}
 
 		return $args;