yikesinc / yikes-inc-easy-mailchimp-extender

src/Assets/ScriptAsset.php

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected $localizations = [];
+	protected $localizations = [ ];
 
 	/**
 	 * Instantiate a ScriptAsset object.
@@ -91,7 +91,7 @@ 
 	public function __construct(
 		$handle,
 		$source,
-		$dependencies = [],
+		$dependencies = [ ],
 		$version = self::VERSION,
 		$in_footer = self::ENQUEUE_HEADER,
 		$external = false
@@ -127,7 +127,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_register_closure() {
-		return function () {
+		return function() {
 			if ( wp_script_is( $this->handle, 'registered' ) ) {
 				return;
 			}
@@ -150,7 +150,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_enqueue_closure() {
-		return function () {
+		return function() {
 			if ( ! wp_script_is( $this->handle, 'registered' ) ) {
 				throw FailedToRegister::asset_not_registered( $this->handle );
 			}
@@ -171,7 +171,7 @@ 
 	 * @return Closure
 	 */
 	protected function get_dequeue_closure() {
-		return function () {
+		return function() {
 			wp_dequeue_script( $this->handle );
 		};
 	}

views/recaptcha-box.php

Spacing +6 added lines, -6 removed lines

@@ -18,10 +18,10 @@
 
 <div
     class="g-recaptcha"
-    data-sitekey="<?= esc_attr( $this->form->recaptcha['site_key'] ); ?>"
-    data-theme="<?= esc_attr( $this->form->recaptcha['theme'] ); ?>"
-    data-type="<?= esc_attr( $this->form->recaptcha['type'] ); ?>"
-    data-size="<?= esc_attr( $this->form->recaptcha['size'] ); ?>"
-    data-callback="<?= esc_attr( $this->form->recaptcha['success_callback'] ); ?>"
-    data-expired-callback="<?= esc_attr( $this->form->recaptcha['expired_callback'] ); ?>"
+    data-sitekey="<?= esc_attr( $this->form->recaptcha[ 'site_key' ] ); ?>"
+    data-theme="<?= esc_attr( $this->form->recaptcha[ 'theme' ] ); ?>"
+    data-type="<?= esc_attr( $this->form->recaptcha[ 'type' ] ); ?>"
+    data-size="<?= esc_attr( $this->form->recaptcha[ 'size' ] ); ?>"
+    data-callback="<?= esc_attr( $this->form->recaptcha[ 'success_callback' ] ); ?>"
+    data-expired-callback="<?= esc_attr( $this->form->recaptcha[ 'expired_callback' ] ); ?>"
 ></div>
\ No newline at end of file

src/Form/FormHelper.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 				 */
 				return apply_filters( 'yikes-mailchimp-form-description', $custom_description, $this->form_id );
 			} else {
-				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data['form_description'], $this->form_id );
+				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data[ 'form_description' ], $this->form_id );
 			}
 		} else {
             return false;
@@ -40,15 +40,15 @@ 
     }
 
     protected function reduce_field_count() {
-		$this->field_count = $this->field_count --;
+		$this->field_count = $this->field_count--;
 	}
 
 	protected function set_field_count() {
-		return isset( $this->form_data['fields'] ) ? count( $this->form_data['fields'] ) : 0;
+		return isset( $this->form_data[ 'fields' ] ) ? count( $this->form_data[ 'fields' ] ) : 0;
 	}
 
 	public function form_classes( bool $is_submitted ) {
-		$form_classes = $this->form_data['form_settings']['yikes-easy-mc-form-class-names'];
+		$form_classes = $this->form_data[ 'form_settings' ][ 'yikes-easy-mc-form-class-names' ];
 		$form_classes .= ' yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id;
 
         if ( isset( $this->form_inline ) && $this->form_inline != 0 ) {
@@ -59,7 +59,7 @@ 
 
 		$form_classes = apply_filters( 'yikes-mailchimp-form-class', $form_classes, $this->form_id );
 
-		if ( $is_submitted && $this->form_data['submission_settings']['hide_form_post_signup'] == 1 ) {
+		if ( $is_submitted && $this->form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) {
 			$form_classes .= ' yikes-easy-mc-display-none';
 		}
 
@@ -71,11 +71,11 @@ 
 	}
     
     public function edit_form_link() {
-		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+		if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
-			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			$edit_form_link .= '</span>';
-			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $this->form_id, ucwords( $this->form_data['form_name'] ) );
+			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $this->form_id, ucwords( $this->form_data[ 'form_name' ] ) );
 		} else {
 			$edit_form_link = '';
 		}

views/easy-forms-shortcode.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	?>
 
 	<form method="POST"
-		id="<?= esc_attr( sanitize_title( $form_data['form_name'] ) ); ?>-<?= esc_attr( $form_id ); ?>"
+		id="<?= esc_attr( sanitize_title( $form_data[ 'form_name' ] ) ); ?>-<?= esc_attr( $form_id ); ?>"
 		class="<?= esc_attr( $form_classes ); ?>"
 		data-attr-form-id="<?= esc_attr( $form_id ); ?>"
 	>
@@ -85,7 +85,7 @@ 
 *	for non-admins
 */
 if ( ! current_user_can( 'manage_options' ) ) {
-	$impressions = $form_data['impressions'] + 1;
+	$impressions = $form_data[ 'impressions' ] + 1;
 
 	$form_data->update_form_field( $form_id, 'impressions', $impressions );
 }

src/Form/OptinForm.php

Spacing +12 added lines, -12 removed lines

@@ -86,7 +86,7 @@ 
 	 * @since %VERSION%
 	 * @var array
 	 */
-	private $submitted_data = [];
+	private $submitted_data = [ ];
 
 	/**
 	 * The validated data for this form.
@@ -94,7 +94,7 @@ 
 	 * @since %VERSION%
 	 * @var array
 	 */
-	private $valid_data = [];
+	private $valid_data = [ ];
 
 	/**
 	 * Admin CSS Class
@@ -118,7 +118,7 @@ 
 		$this->form_id           = $form_id;
 		$this->form_data         = $form_data;
 		$this->field_count       = $this->set_field_count();
-		$this->form_inline       = $form_data['form_settings']['yikes-easy-mc-inline-form'];
+		$this->form_inline       = $form_data[ 'form_settings' ][ 'yikes-easy-mc-inline-form' ];
 		$this->recaptcha         = ( new RecaptchaModel() )->setup( $attr );
 	}
 
@@ -129,7 +129,7 @@ 
 	 */
 	private function admin_class() {
 		$is_admin = is_user_logged_in() && current_user_can(
-			apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' )
+			apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' )
 		);
 		return $is_admin ? ' admin-logged-in' : '';
 	}
@@ -161,7 +161,7 @@ 
 	 * @since %VERSION%
 	 */
 	private function create_fields() {
-		$fields = [];
+		$fields = [ ];
 
 		// // Manually add the hidden nonce and referrer fields.
 		// $fields[] = new Hidden( "yikes_easy_mc_new_subscriber", wp_create_nonce( 'yikes_easy_mc_form_submit' ), $this->form_id );
@@ -177,8 +177,8 @@ 
 		// $fields[] = new Hidden( 'yikes-mailchimp-submitted-form', $this->form_id, $this->form_id );
 
 		// Add all of the active fields.
-		foreach ( $this->form_data['fields'] as $field ) {
-			if ( isset( $field['hide'] ) && (string) $field['hide'] === '1' ) {
+		foreach ( $this->form_data[ 'fields' ] as $field ) {
+			if ( isset( $field[ 'hide' ] ) && (string) $field[ 'hide' ] === '1' ) {
 				$this->reduce_field_count();
 			}
 
@@ -193,7 +193,7 @@ 
 	 *
 	 * @since %VERSION%
 	 */
-	public function render( array $context = [] ) {
+	public function render( array $context = [ ] ) {
 		foreach ( $this->fields as $field ) {
 			$field->render();
 		}
@@ -227,7 +227,7 @@ 
 	 * @since %VERSION%
 	 */
 	public function validate_submission() {
-		$valid = [];
+		$valid = [ ];
 		foreach ( $this->fields as $field ) {
 			try {
 				$submitted = array_key_exists( $field->get_id(), $this->submitted_data )
@@ -256,7 +256,7 @@ 
 	 */
 	private function get_field_type( $field ) {
 
-		$type = array_key_exists( $field['type'], Meta::FIELD_MAP ) ? Meta::FIELD_MAP[ $field['type'] ] : Types::TEXT;
+		$type = array_key_exists( $field[ 'type' ], Meta::FIELD_MAP ) ? Meta::FIELD_MAP[ $field[ 'type' ] ] : Types::TEXT;
 
 		/**
 		 * Filter the class used to instantiate the field.
@@ -308,9 +308,9 @@ 
 		$classes     = $this->get_field_classes( $field );
 		$placeholder = $this->get_placeholder( $field );
 		$description = $this->get_description( $field );
-		$merge       = $field['merge'];
+		$merge       = $field[ 'merge' ];
 		$hidden      = $this->get_hidden( $field );
-		$required    = isset( $field['require'] ) ? true : false;
+		$required    = isset( $field[ 'require' ] ) ? true : false;
 		return [
 			new $type(
 				$classes,

src/Field/BaseInput.php

Spacing +11 added lines, -11 removed lines

@@ -31,7 +31,7 @@ 
 	 *
 	 * @var array
 	 */
-	private $classes = [];
+	private $classes = [ ];
 
 	/**
 	 * Field placeholder.
@@ -67,9 +67,9 @@ 
 		$this->placeholder = $placeholder;
 		$this->label       = $label;
 		$this->value       = $value;
-		$this->description = $description['description'];
-		$this->show_desc   = $description['show_description'];
-		$this->desc_above  = $description['description_above'];
+		$this->description = $description[ 'description' ];
+		$this->show_desc   = $description[ 'show_description' ];
+		$this->desc_above  = $description[ 'description_above' ];
 		$this->merge       = $merge;
 		$this->form_id     = $form_id;
 		$this->hidden      = $hidden;
@@ -93,14 +93,14 @@ 
 	}
 
 	public function field_classes() {
-		return $this->classes['field_classes'];
+		return $this->classes[ 'field_classes' ];
 	}
 
 	public function label_classes() {
 		if ( true === static::REQUIRED ) {
-			$this->classes['label_classes'][] = 'yikes-mailchimp-field-required';
+			$this->classes[ 'label_classes' ][ ] = 'yikes-mailchimp-field-required';
 		}
-		return $this->classes['label_classes'];
+		return $this->classes[ 'label_classes' ];
 	}
 
 	public function get_required() {
@@ -130,12 +130,12 @@ 
 	public function render() {
 
 		?>
-		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ' , $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ' , $this->label['props'] ) ); ?> >
+		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ', $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ', $this->label[ 'props' ] ) ); ?> >
 
 		<!-- dictate label visibility -->
-		<?php if ( ! isset( $this->label['hide-label'] ) ) { ?>
+		<?php if ( ! isset( $this->label[ 'hide-label' ] ) ) { ?>
 			<span class="<?= esc_attr( $this->merge ) . '-label'; ?>">
-				<?= esc_html( apply_filters( 'yikes-mailchimp-'. $this->merge .'-label' , esc_attr( $this->label['value'] ), $this->form_id ) ); ?>
+				<?= esc_html( apply_filters( 'yikes-mailchimp-' . $this->merge . '-label', esc_attr( $this->label[ 'value' ] ), $this->form_id ) ); ?>
 			</span>
 		<?php }
 
@@ -150,7 +150,7 @@ 
         endif;
 		?>
 		<input type="<?= esc_attr( $this->get_type() ); ?>"
-			class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>"
+			class="<?= esc_attr( implode( ' ', $this->field_classes() ) ); ?>"
 			name="<?= esc_attr( $this->get_name() ); ?>"
 			placeholder="<?= esc_attr( $this->get_placeholder() ); ?>"
 			id="<?= esc_attr( $this->get_id() ); ?>"

src/Form/FieldBuilder.php

Spacing +55 added lines, -55 removed lines

@@ -11,62 +11,62 @@ 
 
 trait FieldBuilder {
     protected function get_field_classes( $field ) {
-        $field_classes = [];
-        $label_classes = [];
+        $field_classes = [ ];
+        $label_classes = [ ];
 
-        $field_classes[] = 'yikes-easy-mc-' . $field['type'];
-        $label_classes[] = $field['merge'] . '-label';
+        $field_classes[ ] = 'yikes-easy-mc-' . $field[ 'type' ];
+        $label_classes[ ] = $field[ 'merge' ] . '-label';
 
-        if( $field['additional-classes'] != '' ) {
+        if ( $field[ 'additional-classes' ] != '' ) {
 
-            $field_classes = explode( ' ' , $field['additional-classes'] );
+            $field_classes = explode( ' ', $field[ 'additional-classes' ] );
 
-            if( in_array( 'field-left-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-left-half';
-                $key = array_search( 'field-left-half' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-left-half', $field_classes ) ) {
+                $$label_classes[ ] = 'field-left-half';
+                $key = array_search( 'field-left-half', $field_classes );
+                unset( $field_classes[ $key ] );
             } // input half right
-            if( in_array( 'field-right-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-right-half';
-                $key = array_search( 'field-right-half' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-right-half', $field_classes ) ) {
+                $$label_classes[ ] = 'field-right-half';
+                $key = array_search( 'field-right-half', $field_classes );
+                unset( $field_classes[ $key ] );
             } // input thirds (1/3 width, floated left)
-            if( in_array( 'field-third' , $field_classes ) ) {
-                $$label_classes[] = 'field-third';
-                $key = array_search( 'field-third' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'field-third', $field_classes ) ) {
+                $$label_classes[ ] = 'field-third';
+                $key = array_search( 'field-third', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 2 column radio
-            if( in_array( 'option-2-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-2-col';
-                $key = array_search( 'option-2-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-2-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-2-col';
+                $key = array_search( 'option-2-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 3 column radio
-            if( in_array( 'option-3-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-3-col';
-                $key = array_search( 'option-3-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-3-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-3-col';
+                $key = array_search( 'option-3-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // 4 column radio
-            if( in_array( 'option-4-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-4-col';
-                $key = array_search( 'option-4-col' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-4-col', $field_classes ) ) {
+                $$label_classes[ ] = 'option-4-col';
+                $key = array_search( 'option-4-col', $field_classes );
+                unset( $field_classes[ $key ] );
             } // inline radio & checkboxes etc
-            if( in_array( 'option-inline' , $field_classes ) ) {
-                $$label_classes[] = 'option-inline';
-                $key = array_search( 'option-inline' , $field_classes );
-                unset( $field_classes[$key] );
+            if ( in_array( 'option-inline', $field_classes ) ) {
+                $$label_classes[ ] = 'option-inline';
+                $key = array_search( 'option-inline', $field_classes );
+                unset( $field_classes[ $key ] );
             }
         }
 
         // if the form is set to inline, add the inline class to our labels
-        if( $this->form_inline ) {
-            $label_classes[] = 'label-inline';
+        if ( $this->form_inline ) {
+            $label_classes[ ] = 'label-inline';
         }
         
-        if( isset( $field['hide-label'] ) ) {
-            if( absint( $field['hide-label'] ) === 1 ) {
+        if ( isset( $field[ 'hide-label' ] ) ) {
+            if ( absint( $field[ 'hide-label' ] ) === 1 ) {
                 $this->increase_hidden_label_count();
-                $field_classes[] = 'field-no-label';
+                $field_classes[ ] = 'field-no-label';
             }
         }
 
@@ -81,37 +81,37 @@ 
     }
 
     protected function get_label( $field ) {
-        $label = [];
-        if( $field['type'] == 'email' ) {
-            $label['props']['visible'] = '';
+        $label = [ ];
+        if ( $field[ 'type' ] == 'email' ) {
+            $label[ 'props' ][ 'visible' ] = '';
         } else {
-            $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+            $label[ 'props' ][ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
         }
-        if ( isset( $field['hide-label'] ) ) {
-            $label['hide-label'] = true;
+        if ( isset( $field[ 'hide-label' ] ) ) {
+            $label[ 'hide-label' ] = true;
         }
-        if ( isset( $field['label'] ) ) {
-            $label['value'] = $field['label'];
+        if ( isset( $field[ 'label' ] ) ) {
+            $label[ 'value' ] = $field[ 'label' ];
         }
         return $label;
     }
 
     protected function get_value( $field ) {
         // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-        $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+        $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
         $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
-        return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
+        return apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $this->form_id );
     }
 
     protected function get_placeholder( $field ) {
-        return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
+        return isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : '';
     }
 
     protected function get_hidden( $field ) {
         $visible = false;
         // if both hide label and hide field are checked, we gotta hide the field!
-        if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-            if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
+        if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
+            if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
                 $visible = true;
             }
         }
@@ -120,10 +120,10 @@ 
 
     protected function get_description( $field ) {
         $description       = '';
-        $show_description  = isset( $field['description'] ) ? true : false;
-        $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
+        $show_description  = isset( $field[ 'description' ] ) ? true : false;
+        $description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false;
         if ( $show_description === true ) {
-            $description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $this->form_id );
+            $description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $this->form_id );
         }
         
         return [

src/Shortcode/EasyFormsShortcode.php

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
 
 final class EasyFormsShortcode extends BaseShortcode {
 
-    const TAG           = 'yikes-mailchimp';
+    const TAG = 'yikes-mailchimp';
 	const VIEW_URI      = 'views/easy-forms-shortcode';
 	const SUBMITTED_URI = 'views/easy-forms-shortcode-completed';
 	const TITLE_URI     = 'views/easy-forms-shortcode-title';
@@ -85,7 +85,7 @@ 
 		parent::register();
 		$this->enqueue_assets();
 		add_filter( 'safe_style_css', function( $styles ) {
-			$styles[] = 'display';
+			$styles[ ] = 'display';
 			return $styles;
 		} );
 	}
@@ -104,7 +104,7 @@ 
 	 * @throws InvalidPostID When the post ID is not valid.
 	 */
 	protected function get_context( array $attr ) {
-		$form_id   = $attr['form'] ? $attr['form'] : '1';
+		$form_id   = $attr[ 'form' ] ? $attr[ 'form' ] : '1';
 		$form_data = ( new EasyFormsModel() )->find( $form_id );
 
 		$this->is_submitted = $this->is_submitting_form();
@@ -112,7 +112,7 @@ 
 		// Set up the form object.
 		$form = $this->get_optin_form( $form_id, $form_data, $attr );
 
-		$title = $form->form_title( $attr['title'], $attr['custom_title'], $form_data['form_name'] );
+		$title = $form->form_title( $attr[ 'title' ], $attr[ 'custom_title' ], $form_data[ 'form_name' ] );
 
 		if ( false !== $title ) {
 			add_action( 'easy_forms_do_form_title', function( $view ) {
@@ -120,7 +120,7 @@ 
 			} );
 		}
 
-		$description = $form->form_description( $attr['description'], $attr['custom_description'] );
+		$description = $form->form_description( $attr[ 'description' ], $attr[ 'custom_description' ] );
 		
 		if ( false !== $description ) {
 			add_action( 'easy_forms_do_form_description', function( $view ) {
@@ -134,9 +134,9 @@ 
 			'form_classes'          => $form->form_classes( $this->is_submitted ),
 			'edit_form_link'        => $form->edit_form_link(),
 			'submit_button_classes' => $form->submit_button_classes(),
-			'submit_button_text'    => $form->submit_button_text( $attr['submit'] ),
-			'ajax'                  => $attr['ajax'],
-			'form_settings'         => $form_data['form_settings'],
+			'submit_button_text'    => $form->submit_button_text( $attr[ 'submit' ] ),
+			'ajax'                  => $attr[ 'ajax' ],
+			'form_settings'         => $form_data[ 'form_settings' ],
 			'form_data'             => $form_data,
 			'form'                  => $form,
 			'form_id'               => $form_id,
@@ -206,7 +206,7 @@ 
 	 *
 	 * @return string Rendered HTML.
 	 */
-	public function render( array $context = [] ) {
+	public function render( array $context = [ ] ) {
 		try {
 			$this->enqueue_assets();
 			$view = new FormEscapedView( new NoOverrideLocationView( $this->get_view_uri() ) );

admin/partials/ajax/add_field_to_form.php

Spacing +83 added lines, -83 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 $form_data = array(
-	'field_name' => $_POST['field_name'],
-	'merge_tag'  => $_POST['merge_tag'],
-	'field_type' => $_POST['field_type'],
-	'list_id'    => $_POST['list_id'],
+	'field_name' => $_POST[ 'field_name' ],
+	'merge_tag'  => $_POST[ 'merge_tag' ],
+	'field_type' => $_POST[ 'field_type' ],
+	'list_id'    => $_POST[ 'list_id' ],
 );
 
 // Grab our list handler.
 $list_handler = yikes_get_mc_api_manager()->get_list_handler();
 
-$available_merge_variables = $list_handler->get_merge_fields( $form_data['list_id'] );
+$available_merge_variables = $list_handler->get_merge_fields( $form_data[ 'list_id' ] );
 if ( is_wp_error( $available_merge_variables ) ) {
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 	$error_logging->maybe_write_to_log(
@@ -28,17 +28,17 @@ 
 }
 
 // find and return the location of this merge field in the array
-$index = $this->findMCListIndex( $form_data['merge_tag'], $available_merge_variables['merge_fields'], 'tag' );
+$index = $this->findMCListIndex( $form_data[ 'merge_tag' ], $available_merge_variables[ 'merge_fields' ], 'tag' );
 
 // store it and use it to pre-populate field data (only on initial add to form)
-$merge_field_data = $available_merge_variables['merge_fields'][ $index ];
+$merge_field_data = $available_merge_variables[ 'merge_fields' ][ $index ];
 ?>
-<section class="draggable" id="<?php echo $form_data['field_name']; ?>">
+<section class="draggable" id="<?php echo $form_data[ 'field_name' ]; ?>">
 	<!-- top -->
 	<a href="#" class="expansion-section-title settings-sidebar">
-		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
-		<?php echo stripslashes( $form_data['field_name'] ); ?>
-		<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data['field_type']; ?></small></span>
+		<span class="dashicons dashicons-plus yikes-mc-expansion-toggle" title="<?php _e( 'Expand Field', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>
+		<?php echo stripslashes( $form_data[ 'field_name' ] ); ?>
+		<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $form_data[ 'field_type' ]; ?></small></span>
 	</a>
 	<!-- expansion section -->
 	<div class="yikes-mc-settings-expansion-section">
@@ -46,14 +46,14 @@ 
 		<!-- Single or Double Opt-in -->
 		<p class="type-container form-field-container"><!-- necessary to prevent skipping on slideToggle(); -->
 			<!-- store the label -->
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][label]" value="<?php echo htmlspecialchars( $form_data['field_name'] ); ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][type]" value="<?php echo $form_data['field_type']; ?>" />
-			<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][merge]" value="<?php echo $merge_field_data['tag']; ?>" />
-			<input type="hidden" class="field-<?php echo $merge_field_data['tag']; ?>-position position-input" name="field[<?php echo $merge_field_data['tag']; ?>][position]" value="" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][label]" value="<?php echo htmlspecialchars( $form_data[ 'field_name' ] ); ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][type]" value="<?php echo $form_data[ 'field_type' ]; ?>" />
+			<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][merge]" value="<?php echo $merge_field_data[ 'tag' ]; ?>" />
+			<input type="hidden" class="field-<?php echo $merge_field_data[ 'tag' ]; ?>-position position-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][position]" value="" />
 
-			<?php if ( $form_data['field_type'] == 'radio' || $form_data['field_type'] == 'dropdown' ) { ?>
-				<?php $choices = ( isset( $merge_field_data['options']['choices'] ) ) ? esc_attr( json_encode( $merge_field_data['options']['choices'] ) ) : ''; ?>
-				<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][choices]" value='<?php echo $choices; ?>' />
+			<?php if ( $form_data[ 'field_type' ] == 'radio' || $form_data[ 'field_type' ] == 'dropdown' ) { ?>
+				<?php $choices = ( isset( $merge_field_data[ 'options' ][ 'choices' ] ) ) ? esc_attr( json_encode( $merge_field_data[ 'options' ][ 'choices' ] ) ) : ''; ?>
+				<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][choices]" value='<?php echo $choices; ?>' />
 			<?php } ?>
 
 			<table class="form-table form-field-container">
@@ -62,15 +62,15 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="merge-tag">
-								<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data['tag']; ?>">
+							<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $merge_field_data[ 'tag' ]; ?>">
 						</td>
 					</tr>
 
-			<?php switch( $form_data['field_type'] ) {
+			<?php switch ( $form_data[ 'field_type' ] ) {
 
 					default:
 						break;
@@ -88,12 +88,12 @@ 
 					<tr valign="top">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="<?php echo isset( $merge_field_data['placeholder'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['placeholder'] ) ): '' ; ?>" />
-							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="<?php echo isset( $merge_field_data[ 'placeholder' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'placeholder' ] ) ) : ''; ?>" />
+							<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 
@@ -102,27 +102,27 @@ 
 					*	Loop over field types and store necessary formats
 					*	( date, birthday - dateformat ; phone - phoneformat )
 					*/
-					switch( $form_data['field_type'] ) {
+					switch ( $form_data[ 'field_type' ] ) {
 
 						/* Store the date format, for properly rendering dates on the front end */
 						case 'date':
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD/YYYY';
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD/YYYY';
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
 							<?php
 						break;
 
 						case 'birthday':
-							$date_format = isset( $merge_field_data['options']['dateformat'] ) ? $merge_field_data['options']['dateformat'] : 'MM/DD';
+							$date_format = isset( $merge_field_data[ 'options' ][ 'dateformat' ] ) ? $merge_field_data[ 'options' ][ 'dateformat' ] : 'MM/DD';
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][date_format]" value="<?php echo strtolower( $date_format ); ?>" />
 							<?php
 						break;
 
 						/* Store the phone format, for properly regex pattern */
 						case 'phone':
 							?>
-							<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][phone_format]" value="<?php echo $merge_field_data['options']['phone_format']; ?>" />
+							<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][phone_format]" value="<?php echo $merge_field_data[ 'options' ][ 'phone_format' ]; ?>" />
 							<?php
 						break;
 					}
@@ -133,13 +133,13 @@ 
 						?>
 							<tr valign="top">
 								<td scope="row">
-									<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">
-										<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">
+										<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][placeholder]" value="1" />
-									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>
+									<input type="checkbox" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][placeholder]" value="1" />
+									<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>
 								</td>
 							</tr>
 						<?php
@@ -149,7 +149,7 @@ 
 			?>
 
 				<!-- Default Value -->
-				<?php switch( $form_data['field_type'] ) {
+				<?php switch ( $form_data[ 'field_type' ] ) {
 
 					default:
 					case 'text':
@@ -157,17 +157,17 @@ 
 						<tr valign="top">
 							<td scope="row">
 								<label for="placeholder">
-									<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</label>
 							</td>
 							<td>
-								<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][default]" <?php if( $form_data['field_type'] != 'url' ) { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( $merge_field_data['default_value'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data['default_value'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data['default_value'] ) ) ) : ''; } ?>" />
-								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+								<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default]" <?php if ( $form_data[ 'field_type' ] != 'url' ) { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( $merge_field_data[ 'default_value' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $merge_field_data[ 'default_value' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $merge_field_data[ 'default_value' ] ) ) ) : ''; } ?>" />
+								<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								<?php
-								switch ( $form_data['field_type'] ) {
+								switch ( $form_data[ 'field_type' ] ) {
 									case 'text':
 										?>
-										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+										<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" class="thickbox" onclick="storeGlobalClicked( jQuery( this ) );"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 										<?php
 									break;
 								} ?>
@@ -181,28 +181,28 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
-									<label for="<?php echo $merge_field_data['tag'] . '-no-default'; ?>">
-										<input id="<?php echo $merge_field_data['tag'] . '-no-default'; ?>"
+									<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
+									<label for="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>">
+										<input id="<?php echo $merge_field_data[ 'tag' ] . '-no-default'; ?>"
 										       type="radio"
-										       name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]"
+										       name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]"
 										       value="no-default" <?php checked( $pre_selected, 'no-default' ); ?>
 										>
 										No Default&nbsp;
 									</label>
 									<?php
 									$x = 0;
-									foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
+									foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
 										<label>
-											<input type="radio" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
+											<input type="radio" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $pre_selected, $choice ); ?>><?php echo $value; ?>
 										</label>
 										<?php $x++;
 									} ?>
-									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -214,18 +214,18 @@ 
 							<tr valign="top">
 								<td scope="row">
 									<label for="placeholder">
-										<?php _e( 'Default DROPDOWN Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+										<?php _e( 'Default DROPDOWN Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 									</label>
 								</td>
 								<td>
-									<select type="default" name="field[<?php echo $merge_field_data['tag']; ?>][default_choice]">
-										<?php $pre_selected = ! empty( $merge_field_data['default_choice'] ) ? $merge_field_data['default_choice'] : 'no-default'; ?>
+									<select type="default" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][default_choice]">
+										<?php $pre_selected = ! empty( $merge_field_data[ 'default_choice' ] ) ? $merge_field_data[ 'default_choice' ] : 'no-default'; ?>
 										<option value="no-default" <?php selected( $pre_selected, $choice ); ?>>No Default</option>
-										<?php foreach ( $merge_field_data['options']['choices'] as $choice => $value ) { ?>
+										<?php foreach ( $merge_field_data[ 'options' ][ 'choices' ] as $choice => $value ) { ?>
 											<option value="<?php echo $choice; ?>" <?php selected( $pre_selected, $choice ); ?>><?php echo stripslashes( $value ); ?></option>
 										<?php } ?>
 									</select>
-									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+									<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 								</td>
 							</tr>
 
@@ -238,77 +238,77 @@ 
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description]"></textarea>
-						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<textarea class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description]"></textarea>
+						<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Description Above Field -->
 				<tr valign="top" class="yikes-checkbox-container">
 					<td scope="row">
-						<label for="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>">
-							<?php _e( 'Description Above Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+						<label for="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>">
+							<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data['tag'] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data['tag']; ?>][description_above]" value="1" />
-						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+						<input type="checkbox" id="description_above_<?php echo esc_attr( $merge_field_data[ 'tag' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][description_above]" value="1" />
+						<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 					</td>
 				</tr>
 				<!-- Additional Classes -->
 				<tr valign="top">
 					<td scope="row">
 						<label for="placeholder">
-							<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 						</label>
 					</td>
 					<td>
-						<input type="text" class="widefat" name="field[<?php echo $merge_field_data['tag']; ?>][additional-classes]" value="<?php echo isset( $form_data['classes'] ) ? stripslashes( wp_strip_all_tags( $form_data['classes'] ) ) : '' ; ?>" />
-						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+						<input type="text" class="widefat" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][additional-classes]" value="<?php echo isset( $form_data[ 'classes' ] ) ? stripslashes( wp_strip_all_tags( $form_data[ 'classes' ] ) ) : ''; ?>" />
+						<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 					</td>
 				</tr>
 					<!-- Required Toggle -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="field-required">
-								<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][require]" <?php checked( $merge_field_data['required'], 1 ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][require]" <?php checked( $merge_field_data[ 'required' ], 1 ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Visible Toggle -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="hide-field">
-								<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data['tag']; ?>][hide]" <?php checked( $merge_field_data['public'], '' ); ?> <?php if( $merge_field_data['tag'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" class="widefat" value="1" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide]" <?php checked( $merge_field_data[ 'public' ], '' ); ?> <?php if ( $merge_field_data[ 'tag' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+							<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Toggle Field Label Visibility -->
 					<tr valign="top" class="yikes-checkbox-container">
 						<td scope="row">
 							<label for="placeholder">
-								<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</label>
 						</td>
 						<td>
-							<input type="checkbox" name="field[<?php echo $merge_field_data['tag']; ?>][hide-label]" value="1" />
-							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+							<input type="checkbox" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][hide-label]" value="1" />
+							<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 						</td>
 					</tr>
 					<!-- Display Phone/Date Formats back to the user -->
 					<?php
-						switch( $form_data['field_type'] ) {
+						switch ( $form_data[ 'field_type' ] ) {
 
 							/* Store the phone format, for properly regex pattern */
 							case 'phone':
@@ -319,23 +319,23 @@ 
 									<td scope="row">
 										<label for="placeholder">
 										<?php
-											switch( $form_data['field_type'] ) {
+											switch ( $form_data[ 'field_type' ] ) {
 												default:
 												case 'birthday':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['options']['date_format'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
 													$format_name = 'date_format';
 													break;
 
 												case 'date':
-													$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = $merge_field_data['options']['date_format'];
+													$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = $merge_field_data[ 'options' ][ 'date_format' ];
 													$format_name = 'date_format';
 													break;
 
 												case 'phone':
-													$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
-													$format = ( ( $merge_field_data['options']['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data['options']['phone_format'] );
+													$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
+													$format = ( ( $merge_field_data[ 'options' ][ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $merge_field_data[ 'options' ][ 'phone_format' ] );
 													$format_name = 'phone_format';
 													break;
 											}
@@ -345,7 +345,7 @@ 
 									</td>
 									<td>
 										<strong><?php echo $format; ?></strong>
-										<input type="hidden" name="field[<?php echo $merge_field_data['tag']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+										<input type="hidden" name="field[<?php echo $merge_field_data[ 'tag' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 										<p class="description"><small>
 											<?php printf( __( 'To change the %s please head over to <a href="%s" title="Mailchimp" target="_blank">Mailchimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
 										</small></p>
@@ -366,8 +366,8 @@ 
 						</td>
 						<td>
 							<span class="toggle-container">
-								<a href="#" class="hide-field"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-								<a href="#" class="remove-field" alt="<?php echo $merge_field_data['tag']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a href="#" class="hide-field"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+								<a href="#" class="remove-field" alt="<?php echo $merge_field_data[ 'tag' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</span>
 						</td>
 					</tr>