gravityview / GravityView

includes/fields/class-gravityview-field-password.php

Spacing +12 added lines, -12 removed lines

@@ -49,17 +49,17 @@ 
 	 *
 	 * @return string If a custom field label isn't set, return the field label for the password field
 	 */
-	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ){
+	function field_label( $label = '', $field = array(), $form = array(), $entry = array() ) {
 
 		// If using a custom label, no need to fetch the parent label
-		if( ! is_numeric( $field['id'] ) || ! empty( $field['custom_label'] ) ) {
+		if ( ! is_numeric( $field[ 'id' ] ) || ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$field_object = GFFormsModel::get_field( $form, $field['id'] );
+		$field_object = GFFormsModel::get_field( $form, $field[ 'id' ] );
 
-		if( $field_object && 'password' === $field_object->type ) {
-			$label = $field['label'];
+		if ( $field_object && 'password' === $field_object->type ) {
+			$label = $field[ 'label' ];
 		}
 
 		return $label;
@@ -79,17 +79,17 @@ 
 	function add_form_fields( $fields = array(), $form = array(), $include_parent_field = true ) {
 
 		foreach ( $fields as $key => $field ) {
-			if( 'password' === $field['type'] ) {
+			if ( 'password' === $field[ 'type' ] ) {
 
 				// The Enter Password input
-				if( floor( $key ) === floatval( $key ) ) {
+				if ( floor( $key ) === floatval( $key ) ) {
 
-					if( ! empty( $field['parent'] ) ) {
-						$field['label']      = $field['parent']->label;
-						$field['adminOnly']  = $field['parent']->adminOnly;
-						$field['adminLabel'] = $field['parent']->adminLabel;
+					if ( ! empty( $field[ 'parent' ] ) ) {
+						$field[ 'label' ]      = $field[ 'parent' ]->label;
+						$field[ 'adminOnly' ]  = $field[ 'parent' ]->adminOnly;
+						$field[ 'adminLabel' ] = $field[ 'parent' ]->adminLabel;
 						// Don't show as a child input
-						unset( $field['parent'] );
+						unset( $field[ 'parent' ] );
 					}
 
 					$fields[ $key ] = $field;

includes/admin/class-gravityview-admin-view-widget.php

Spacing +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 
 		$field_info_items = array();
 
-		if( !empty( $this->item['description'] ) ) {
+		if ( ! empty( $this->item[ 'description' ] ) ) {
 
-			$field_info_items[] = array(
-				'value' => $this->item['description']
+			$field_info_items[ ] = array(
+				'value' => $this->item[ 'description' ]
 			);
 
 		}

includes/admin/class-gravityview-admin-view-field.php

Spacing +12 added lines, -12 removed lines

@@ -15,29 +15,29 @@
 		$field_info_items = array();
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if ( is_numeric( $this->id ) ) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title )
 			);
 
-			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
 			);
 
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
-			$field_info_items[] = array(
-				'value' => $this->item['desc']
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => $this->item[ 'desc' ]
 			);
 		}
 
-		if( !empty( $this->item['adminLabel'] ) ) {
-			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
+			$field_info_items[ ] = array(
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
 				'class'	=> 'gv-sublabel'
 			);
 		}

includes/fields/class-gravityview-field-workflow_step.php

Spacing +11 added lines, -11 removed lines

@@ -47,11 +47,11 @@ 
 	function modify_entry_value_workflow_step( $output, $entry, $field_settings, $field ) {
 
 		// If not set, the entry hasn't started a workflow
-		$has_workflow_step = isset( $entry['workflow_step'] );
+		$has_workflow_step = isset( $entry[ 'workflow_step' ] );
 
-		if( $has_workflow_step ) {
+		if ( $has_workflow_step ) {
 
-			$GFlow = new Gravity_Flow_API( $entry['form_id'] );
+			$GFlow = new Gravity_Flow_API( $entry[ 'form_id' ] );
 
 			if ( $current_step = $GFlow->get_current_step( $entry ) ) {
 				$output = esc_html( $current_step->get_name() );
@@ -79,7 +79,7 @@ 
 		preg_match( '/workflow_step_status_(\d+)/', $key, $matches );
 
 		if ( ! empty( $matches ) ) {
-			$workflow_step_id = intval( $matches[1] );
+			$workflow_step_id = intval( $matches[ 1 ] );
 		}
 
 		return $workflow_step_id;
@@ -98,7 +98,7 @@ 
 
 		$return = $label;
 
-		if ( '' === $label && $workflow_step_id = $this->get_step_id_from_key( $field['field'] ) ) {
+		if ( '' === $label && $workflow_step_id = $this->get_step_id_from_key( $field[ 'field' ] ) ) {
 
 			$step = $this->get_workflow_step( $workflow_step_id );
 
@@ -128,7 +128,7 @@ 
 
 		$workflow_step = $GFlow->get_step( $workflow_step_id );
 
-		if( ! $GFlow || ! $workflow_step ) {
+		if ( ! $GFlow || ! $workflow_step ) {
 			return false;
 		}
 
@@ -150,7 +150,7 @@ 
 		
 		foreach ( $search_fields as & $search_field ) {
 
-			if ( $this->name === $search_field['key'] ) {
+			if ( $this->name === $search_field[ 'key' ] ) {
 
 				$form_id = GravityView_View::getInstance()->getFormId();
 
@@ -159,21 +159,21 @@ 
 				$choices = array();
 
 				foreach ( $workflow_steps as $step ) {
-					$choices[] = array(
+					$choices[ ] = array(
 						'text'   => $step->get_name(),
 						'value'   => $step->get_id(),
 					);
 				}
 
-				$search_field['choices'] = $choices;
+				$search_field[ 'choices' ] = $choices;
 			}
 
 			// Workflow Step Statuses
-			else if ( $workflow_step_id = $this->get_step_id_from_key( $search_field['key'] ) ) {
+			else if ( $workflow_step_id = $this->get_step_id_from_key( $search_field[ 'key' ] ) ) {
 
 				$status_key = sprintf( 'workflow_step_status_%d', $workflow_step_id );
 
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options( null, $status_key );
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options( null, $status_key );
 			}
 		}
 		

includes/fields/class-gravityview-field-workflow_final_status.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
 
-		if( ! empty( $output ) ) {
+		if ( ! empty( $output ) ) {
 			$output = gravity_flow()->translate_status_label( $output );
 		}
 
@@ -59,8 +59,8 @@ 
 	function modify_search_filters( $search_fields = array(), GravityView_Widget_Search $widget, $widget_args = array() ) {
 
 		foreach ( $search_fields as & $search_field ) {
-			if ( $this->name === $search_field['key'] ) {
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
+			if ( $this->name === $search_field[ 'key' ] ) {
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
 			}
 		}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
 
 		parent::add_hooks();
 
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
 
 	}
 	
@@ -52,13 +52,13 @@ 
 	 */
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
 
-		if( empty( $form_id ) ) {
+		if ( empty( $form_id ) ) {
 			$form_id = GravityView_View::getInstance()->getFormId();
 		}
 
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
 
-		return (array) rgars( $entry_meta, $status_key . '/filter/choices' );
+		return (array)rgars( $entry_meta, $status_key . '/filter/choices' );
 	}
 
 
@@ -80,7 +80,7 @@ 
 
 		$workflow_steps = $GFlow->get_steps();
 
-		if( $workflow_steps ) {
+		if ( $workflow_steps ) {
 
 			foreach ( $workflow_steps as $step ) {
 
@@ -92,12 +92,12 @@ 
 				);
 			}
 
-			$fields['workflow_step'] = array(
+			$fields[ 'workflow_step' ] = array(
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
 				'type'  => 'select',
 			);
 
-			$fields['workflow_final_status'] = array(
+			$fields[ 'workflow_final_status' ] = array(
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
 				'type'  => 'select',
 			);

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-forms-survey.php

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
 
 		$return = $input_type;
 
-		if( 'survey' === $field_type ) {
+		if ( 'survey' === $field_type ) {
 			$return = 'select';
 		}
 
@@ -65,8 +65,8 @@ 
 	public function fix_survey_fields( $fields ) {
 
 		/** @var GF_Field $field */
-		foreach( $fields as &$field ) {
-			if( 'survey' === $field->type ) {
+		foreach ( $fields as &$field ) {
+			if ( 'survey' === $field->type ) {
 				$field->allowsPrepopulate = true;
 			}
 		}
@@ -82,7 +82,7 @@ 
 	 * @return void
 	 */
 	function add_render_hooks() {
-		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10, 3 );
+		add_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10, 3 );
 	}
 
 	/**
@@ -95,7 +95,7 @@ 
 	 * @return void
 	 */
 	function remove_render_hooks() {
-		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value'), 10 );
+		remove_filter( 'gform_field_value', array( $this, 'fix_survey_field_value' ), 10 );
 	}
 
 	/**
@@ -113,9 +113,9 @@ 
 	 */
 	public function fix_survey_field_value( $value, $field, $name ) {
 
-		if( 'survey' === $field->type ) {
+		if ( 'survey' === $field->type ) {
 
-			$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
+			$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
 
 			// We need to run through each survey row until we find a match for expected values
 			foreach ( $entry as $field_id => $field_value ) {
@@ -124,11 +124,11 @@ 
 					continue;
 				}
 
-				if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
+				if ( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) {
 					list( $row_val, $col_val ) = explode( ':', $field_value, 2 );
 
 					// If the $name matches the $row_val, we are processing the correct row
-					if( $row_val === $name ) {
+					if ( $row_val === $name ) {
 						$value = $field_value;
 						break;
 					}

includes/admin/class-gravityview-admin-view-item.php

Spacing +16 added lines, -16 removed lines

@@ -42,9 +42,9 @@ 
 	function __construct( $title = '', $item_id, $item = array(), $settings = array() ) {
 
 		// Backward compat
-		if ( ! empty( $item['type'] ) ) {
-			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+		if ( ! empty( $item[ 'type' ] ) ) {
+			$item[ 'input_type' ] = $item[ 'type' ];
+			unset( $item[ 'type' ] );
 		}
 
 		// Prevent items from not having index set
@@ -64,7 +64,7 @@ 
 		$this->item       = $item;
 		$this->id         = $item_id;
 		$this->settings   = $settings;
-		$this->label_type = $item['label_type'];
+		$this->label_type = $item[ 'label_type' ];
 	}
 
 	/**
@@ -107,10 +107,10 @@ 
 		if ( $html ) {
 
 			foreach ( $field_info_items as $item ) {
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="' . $class . '">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html( $item[ 'value' ] );
 				$output .= '</span>';
 			}
 
@@ -138,29 +138,29 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
 
 		// When a field label is empty, use the Field ID
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
-			$label = $this->settings['custom_label'];
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
-			$label = $this->item['customLabel'];
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
+			$label = $this->settings[ 'custom_label' ];
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
+			$label = $this->item[ 'customLabel' ];
 		}
 
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
 
 		$label = esc_attr( $label );
 
-		if ( ! empty( $this->item['parent'] ) ) {
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
 		}
 
 		// Name of field / widget
@@ -176,9 +176,9 @@ 
 
 		$output .= '</h5>';
 
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
 
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
 
 		return $output;
 	}

includes/class-gravityview-migrate.php

Spacing +42 added lines, -42 removed lines

@@ -63,7 +63,7 @@ 
 
 		$disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) );
 
-		if( false === $approved_result || false === $disapproved_result ) {
+		if ( false === $approved_result || false === $disapproved_result ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ': There was an error processing the query.', $wpdb->last_error );
 		} else {
 			// All done: Meta values are migrated
@@ -96,11 +96,11 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if ( false === $redux_settings ) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
 		}
 
@@ -114,8 +114,8 @@ 
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
 
 		// And now remove the previous option, so this is a one-time thing.
-		delete_option('gravityview_settings');
-		delete_option('gravityview_settings-transients');
+		delete_option( 'gravityview_settings' );
+		delete_option( 'gravityview_settings-transients' );
 	}
 
 	/**
@@ -131,16 +131,16 @@ 
 
 		$data = array(
 			'edd_action' => 'check_license',
-			'license' => rgget('license_key', $redux_settings ),
+			'license' => rgget( 'license_key', $redux_settings ),
 			'update' => false,
 			'format' => 'object',
 		);
 
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
-			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
 		}
 
 		return $redux_settings;
@@ -154,10 +154,10 @@ 
 	function get_redux_settings() {
 
 		// Previous settings set by Redux
-		$redux_option = get_option('gravityview_settings');
+		$redux_option = get_option( 'gravityview_settings' );
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if ( false === $redux_option ) {
 			return false;
 		}
 
@@ -167,21 +167,21 @@ 
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
 		);
 
-		if( $license_array = rgget( 'license', $redux_option ) ) {
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
 
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
 
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
 
-				$saved_license = rgget('license', $saved_values );
+				$saved_license = rgget( 'license', $saved_values );
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
 				}
 			}
 		}
@@ -193,8 +193,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
 		}
 
 		// Loop through all the views
@@ -206,20 +206,20 @@ 
 
 		$views = get_posts( $query_args );
 
-		foreach( $views as $view ) {
+		foreach ( $views as $view ) {
 
 			$widgets = gravityview_get_directory_widgets( $view->ID );
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
 
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ( $widgets as $area => $ws ) {
+				foreach ( $ws as $k => $widget ) {
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
 
-					if( is_null( $search_fields ) ) {
+					if ( is_null( $search_fields ) ) {
 						$search_fields = $this->get_search_fields( $view->ID );
 					}
 
@@ -227,24 +227,24 @@ 
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
 					}
 
 					$search_config = array_merge( $search_generic, $search_fields );
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if ( empty( $search_config ) ) {
 						$search_config = '';
 					} else {
 						$search_config = json_encode( $search_config );
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
 
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
 				}
@@ -272,26 +272,26 @@ 
 		// check view fields' settings
 		$fields = gravityview_get_directory_fields( $view_id, false );
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ( $fields as $t => $fs ) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ( $fs as $k => $field ) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
 
-					if( empty( $form_field['type'] ) ) {
+					if ( empty( $form_field[ 'type' ] ) ) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
 
 				}
 			}