yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/dashboard-widgets/templates/stats-list-template.php

Spacing +21 added lines, -21 removed lines

@@ -2,7 +2,7 @@ 
 /* The template file for displaying our stats in the Admin dashboard widget */
 
 if ( isset( $list_data ) ) {
-	if ( isset( $list_data['id'] ) ) {
+	if ( isset( $list_data[ 'id' ] ) ) {
 
 	// When a user selects a list from the dropdown, capture the array value here
 	$list = $list_data;
@@ -13,12 +13,12 @@ 
 		// Get the list IDs, capture the first list ID
 		$first_list_id = '';
 		$list_ids = array_keys( $list_data );
-		if ( is_array( $list_ids ) && isset( $list_ids[0] ) ) {
-			$first_list_id = $list_ids[0];
+		if ( is_array( $list_ids ) && isset( $list_ids[ 0 ] ) ) {
+			$first_list_id = $list_ids[ 0 ];
 		}
 
 		// Set our $list value to the first list in the list_data array
-		if ( isset( $list_data[ $first_list_id ] ) && is_array( $list_data[ $first_list_id ] ) && isset( $list_data[ $first_list_id ]['id'] ) ) {
+		if ( isset( $list_data[ $first_list_id ] ) && is_array( $list_data[ $first_list_id ] ) && isset( $list_data[ $first_list_id ][ 'id' ] ) ) {
 			$list = $list_data[ $first_list_id ];
 		}
 	}
@@ -31,36 +31,36 @@ 
 
 ?>
 <section id="yikes-easy-mc-widget-stat-holder">
-	<h3><?php echo $list['name']; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list['id'] . '' ) ); ?>" title="<?php _e( 'view List' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
+	<h3><?php echo $list[ 'name' ]; ?> <small><a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list[ 'id' ] . '' ) ); ?>" title="<?php _e( 'view List', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'view list', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></h3>
 	
 	<table class="yikes-easy-mc-stats-table">
 		<thead class="yikes-easy-mc-hidden">
 			<tr>
-				<th><?php _e( 'Subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'Unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-				<th><?php _e( 'New Since Send' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
-				<th><?php _e( 'Avg. Sub. Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'Unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+				<th><?php _e( 'New Since Send', 'yikes-inc-easy-mailchimp-extender' ); ?></th>	
+				<th><?php _e( 'Avg. Sub. Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr class="yikes-easy-mc-table-stats-tr yikes-easy-mc-table-stats-tr-first">
-				<td title="<?php _e( 'Number of active subscribers.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['member_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of active subscribers.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'member_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'subscribers', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Number of users who have unsusbscribed.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['unsubscribe_count']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of users who have unsusbscribed.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'unsubscribe_count' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'unsubscribed', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 			<tr class="yikes-easy-mc-table-stats-tr  yikes-easy-mc-table-stats-tr-second">
-				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['member_count_since_send']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Number of new subscribers since the last campaign was sent.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'member_count_since_send' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'new since send', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
-				<td title="<?php _e( 'Average number of subscribers per month.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
-					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list['stats']['avg_sub_rate']; ?></p>
-						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<td title="<?php _e( 'Average number of subscribers per month.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+					<p class="yikes-easy-mc-dashboard-stat"><?php echo $list[ 'stats' ][ 'avg_sub_rate' ]; ?></p>
+						<p class="yikes-easy-mc-stat-list-label"><?php _e( 'avg. sub. rate', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</td>
 			</tr>
 		</tbody>

admin/partials/ajax/class.ajax.php

Indentation +2 added lines, -2 removed lines

@@ -118,8 +118,8 @@
 		}
 
 		/**
-		* Save changes to a field's label
-		*/ 
+		 * Save changes to a field's label
+		 */ 
 		public function save_field_label_edits() {
 
 			// Capture our $_POST variables

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 === '' ) {

includes/class-yikes-inc-easy-mailchimp-extender-uninstall.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 			// users can only unisntall a plugin from the network dashboard page
 			// Get all blog ids
-			$blogids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
+			$blogids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
 			foreach ( $blogids as $blog_id ) {
 				switch_to_blog( $blog_id );
 				self::_uninstall_yikes_easy_mailchimp( $wpdb );
@@ -28,15 +28,15 @@ 
 	 * @since    6.0.0
 	 */
 	static function _uninstall_yikes_easy_mailchimp( $wpdb ) {
-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 		/* Clean up and delete our custom table from the databse */
-		$table = $wpdb->prefix."yikes_easy_mc_forms";
+		$table = $wpdb->prefix . "yikes_easy_mc_forms";
 		$sql = 'DROP TABLE IF EXISTS ' . $table;
 
 		//Delete any options thats stored also?
 		$wpdb->query( $sql );
-		dbDelta($sql);
+		dbDelta( $sql );
 
 		/* Clear All Transient Data */
 		delete_transient( 'yikes-easy-mailchimp-list-data' );

includes/add_ons/eu-compliance.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/incentives.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/customizer.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

public/class-yikes-inc-easy-mailchimp-extender-public.php

Indentation +5 added lines, -5 removed lines

@@ -70,10 +70,10 @@ 
 	}
 
 	/**
-	*	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
-	*
-	*	@since 6.0.3
-	*/
+	 *	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
+	 *
+	 *	@since 6.0.3
+	 */
 	public function yikes_custom_frontend_content_filter() {
 		add_filter( 'yikes-mailchimp-frontend-content', 'wptexturize' );
 		add_filter( 'yikes-mailchimp-frontend-content', 'convert_smilies' );
@@ -90,7 +90,7 @@ 
 	 *	load our checkbox classes
 	 *
 	 *	@since 6.0.0
-	**/
+	 **/
 	public function load_checkbox_integration_classes() {
 		// store our options
 		$integrations = get_option( 'optin-checkbox-init' , array() );

Braces +2 added lines, -1 removed lines

@@ -133,7 +133,8 @@
 		if( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
 			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) {
+// ensure we only process the form that was submitted
 
 					// Lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );

Spacing +22 added lines, -22 removed lines

@@ -57,9 +57,9 @@ 
 		new YIKES_Inc_Easy_Mailchimp_Public_Ajax();
 
 		// Include our error logging class
-		add_action( 'init' , array( $this , 'load_error_logging_class' ) , 1 );
+		add_action( 'init', array( $this, 'load_error_logging_class' ), 1 );
 		// load our checkbox classes
-		add_action( 'init' , array( $this , 'load_checkbox_integration_classes' ) , 1 );
+		add_action( 'init', array( $this, 'load_checkbox_integration_classes' ), 1 );
 		// custom front end filter
 		add_action( 'init', array( $this, 'yikes_custom_frontend_content_filter' ) );
 		// Process non-ajax forms in the header
@@ -94,15 +94,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , array() );
-		if( ! empty( $integrations ) && is_array( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', array() );
+		if ( ! empty( $integrations ) && is_array( $integrations ) ) {
 			// load our mail integrations class
 			require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations.php';
 			// loop over selected classes and load them up!
-			foreach( $integrations as $integration => $value ) {
-				if( isset( $value['value'] ) && $value['value'] == 'on' ) {
+			foreach ( $integrations as $integration => $value ) {
+				if ( isset( $value[ 'value' ] ) && $value[ 'value' ] == 'on' ) {
 					// load our class extensions
-					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.'.$integration.'-checkbox.php';
+					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.' . $integration . '-checkbox.php';
 				}
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function load_error_logging_class() {
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			// if error logging is enabled we should include our error logging class
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging;
@@ -129,19 +129,19 @@ 
 	*	@since 6.0.3.4
 	*/
 	public function yikes_process_non_ajax_forms( $form_submitted ) {
-		global $wpdb,$post;
-		$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? (int) $_POST['yikes-mailchimp-submitted-form'] : false; // store form id
-		if( $form_id ) {
+		global $wpdb, $post;
+		$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? (int) $_POST[ 'yikes-mailchimp-submitted-form' ] : false; // store form id
+		if ( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
-			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+			if ( isset( $_POST ) && ! empty( $_POST ) && isset( $form_id ) && $form_settings[ 'submission_settings' ][ 'ajax' ] == 0 ) {
+				if ( $_POST[ 'yikes-mailchimp-submitted-form' ] == $form_id ) { // ensure we only process the form that was submitted
 
 					// Lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
-					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {
-						if( $form_submitted == 1 ) {
+					if ( $form_settings[ 'submission_settings' ][ 'redirect_on_submission' ] == '1' ) {
+						if ( $form_submitted == 1 ) {
 							// decode our settings
-							$redirect_page = ( 'custom_url' != $form_settings['submission_settings']['redirect_page'] ) ? get_permalink( (int) $form_settings['submission_settings']['redirect_page'] ) : $form_settings['submission_settings']['custom_redirect_url'];
+							$redirect_page = ( 'custom_url' != $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) ? get_permalink( (int) $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) : $form_settings[ 'submission_settings' ][ 'custom_redirect_url' ];
 							wp_redirect( apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_page ), $form_id, $post ) );
 							exit;
 						}
@@ -169,7 +169,7 @@ 
 	 */
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return array();
 		}
 
@@ -198,13 +198,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}
@@ -233,8 +233,8 @@ 
 		}
 
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['already-subscribed'] ) && ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-			$response_text = str_replace( '[email]', $email, $form_settings['error_messages']['already-subscribed'] );
+		if ( isset( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+			$response_text = str_replace( '[email]', $email, $form_settings[ 'error_messages' ][ 'already-subscribed' ] );
 		}
 		// Return our new string
 		return $response_text;

admin/partials/helpers/free-support.php

Spacing +3 added lines, -3 removed lines

@@ -5,10 +5,10 @@ 
 	<div id="col-left">
 
 		<div class="col-wrap">
-			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 			<div class="inside">
 				<p><?php _e( 'Use your WordPress.org username to submit support requests on the WordPress Directory support forum.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 				<a href="https://wordpress.org/support/plugin/yikes-inc-easy-mailchimp-extender" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit a New WordPress.org Support Request', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			</div>
 		</div>
@@ -60,7 +60,7 @@ 
 						printf( '<h2>' . esc_attr__( 'Popular Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ) . '</h2>' );
 						printf( '<ol>' );
 						foreach ( $knowledge_base_links as $kb_link ) {
-							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link['href'] ) . '" title="' . esc_attr( $kb_link['title'] ) . '" target="_blank">' . esc_attr( $kb_link['title'] ) . '</a></li>' );
+							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link[ 'href' ] ) . '" title="' . esc_attr( $kb_link[ 'title' ] ) . '" target="_blank">' . esc_attr( $kb_link[ 'title' ] ) . '</a></li>' );
 						}
 						printf( '</ol>' );
 					}

admin/partials/helpers/premium-support.php

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 			<h2 class="premium-support-title"><?php _e( 'Priority & Add-on Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 
 			<?php
-				if ( isset( $_POST['submit-premium-support-request'] ) ) {
+				if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
 			?>
 					<h4><?php _e( 'Success!', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 					<p><?php _e( 'We have received your support request and will get in touch shortly regarding your issue.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -15,7 +15,7 @@ 
 			?>
 
 			<!-- Premium Support Form -->
-			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo (isset($_POST['submit-premium-support-request'])) ? 'class="support-form-hidden"' : ''; ?>>
+			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo ( isset( $_POST[ 'submit-premium-support-request' ] ) ) ? 'class="support-form-hidden"' : ''; ?>>
 
 				<label><?php _e( 'Add-On:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="license_key" id="license-key">
@@ -25,13 +25,13 @@ 
 								// get the license for the respective extension
 								$options = get_option( 'yikes-mailchimp-' . $extension . '-settings', array() );
 
-								if ( isset( $options['license'] ) && $options['status'] == 'valid' ) {
-									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options['license'] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
+								if ( isset( $options[ 'license' ] ) && $options[ 'status' ] == 'valid' ) {
+									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options[ 'license' ] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
 								}
 							}
 						?>
 					</select>
-					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 					<input type="hidden" name="plugin-slug" id="plugin-slug" value="">
 					<input type="hidden" name="plugin-name" id="plugin-name" value="">
@@ -39,31 +39,31 @@ 
 
 				<label><?php _e( 'Name:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="user-name" required>
-					<p class="description"><?php _e( 'Enter your name.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter your name.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Contact Email:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="email" name="user-email" required>
-					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Topic:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="support-topic" required>
-					<p class="description"><?php _e( 'Pleae enter the topic of your support request.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Pleae enter the topic of your support request.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Priority:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="support-priority">
-						<option value="1"><?php _e( 'Low' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="2"><?php _e( 'Medium' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="3"><?php _e( 'High' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="4"><?php _e( 'Urgent' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="1"><?php _e( 'Low', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="2"><?php _e( 'Medium', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="3"><?php _e( 'High', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="4"><?php _e( 'Urgent', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 					</select>
-					<p class="description"><?php _e( 'Select the priority of this ticket.' , 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
+					<p class="description"><?php _e( 'Select the priority of this ticket.', 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".', 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 				</label>
 				<label><?php _e( 'Issue:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<?php wp_editor( '', 'support-content', array( 'textarea_name' => 'support-content', 'media_buttons' => false ) ); ?>
-					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<input type="hidden" name="action" value="yikes-support-request">