gravityview / GravityView

includes/admin/class.render.settings.php

Spacing +86 added lines, -86 removed lines

@@ -53,7 +53,7 @@ 
 
 		$is_table_layout = preg_match( '/table/ism', $template_id );
 
-		if( 'field' === $field_type ) {
+		if ( 'field' === $field_type ) {
 
 			// Default options - fields
 			$field_options = array(
@@ -105,11 +105,11 @@ 
 			);
 
 			// Match Table as well as DataTables
-			if( $is_table_layout && 'directory' === $context ) {
-				$field_options['width'] = array(
+			if ( $is_table_layout && 'directory' === $context ) {
+				$field_options[ 'width' ] = array(
 					'type' => 'number',
-					'label' => __('Percent Width', 'gk-gravityview'),
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gk-gravityview'),
+					'label' => __( 'Percent Width', 'gk-gravityview' ),
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gk-gravityview' ),
 					'class' => 'code widefat',
 					'value' => '',
 					'priority' => 200,
@@ -121,7 +121,7 @@ 
 
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
 		foreach ( $field_options as $key => $field_option ) {
-			$field_options[ $key ]['label'] = trim( $field_option['label'], ':' );
+			$field_options[ $key ][ 'label' ] = trim( $field_option[ 'label' ], ':' );
 		}
 
 		/**
@@ -146,8 +146,8 @@ 
 		 */
 		$field_options = apply_filters( "gravityview_template_{$input_type}_options", $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-		if ( 'directory' === $context && isset( $field_options['show_as_link'] ) && ! isset( $field_options['new_window'] ) ) {
-			$field_options['new_window'] = array(
+		if ( 'directory' === $context && isset( $field_options[ 'show_as_link' ] ) && ! isset( $field_options[ 'new_window' ] ) ) {
+			$field_options[ 'new_window' ] = array(
 				'type'     => 'checkbox',
 				'label'    => __( 'Open link in a new tab or window?', 'gk-gravityview' ),
 				'value'    => false,
@@ -168,7 +168,7 @@ 
 				switch ( $key ) {
 					case 'show_as_link':
 						$_group = 'display';
-						$field_option['priority'] = 100;
+						$field_option[ 'priority' ] = 100;
 						break;
 					default:
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -183,7 +183,7 @@ 
 			}
 
 			$field_options = array();
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
 			}
 
@@ -214,7 +214,7 @@ 
 			return 0;
 		}
 
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
+		return ( $a_priority < $b_priority ) ? -1 : 1;
 	}
 
 	/**
@@ -239,8 +239,8 @@ 
 			'manage_options' => __( 'Administrator', 'gk-gravityview' ),
 		);
 
-		if( is_multisite() ) {
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gk-gravityview' );
+		if ( is_multisite() ) {
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gk-gravityview' );
 		}
 
 		/**
@@ -253,7 +253,7 @@ 
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
 		 */
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
 
 		return $select_cap_choices;
 	}
@@ -279,9 +279,9 @@ 
 	 * @return string HTML of dialog box
 	 */
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
-		if( empty( $uniqid ) ) {
+		if ( empty( $uniqid ) ) {
 			//generate a unique field id
-			$uniqid = uniqid('', false);
+			$uniqid = uniqid( '', false );
 		}
 
 		$grouped = ( 'field' === $field_type );
@@ -289,24 +289,24 @@ 
 		// get field/widget options
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
 
-		if( ! $grouped ) {
+		if ( ! $grouped ) {
 			$option_groups = array( $option_groups );
 		}
 
 		$option_groups = array_filter( $option_groups );
 
 		// two different post arrays, depending of the field type
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
 
 		// build output
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
 
 		$form_title = '';
 		if ( $form_id ) {
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
 			$form = GVCommon::get_form_or_form_template( $form_id );
-			$form_title = $form['title'];
+			$form_title = $form[ 'title' ];
 		}
 
 		// If there are no options, return what we got.
@@ -314,14 +314,14 @@ 
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
 		}
 
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gk-gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gk-gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
 
 		$field_details = '';
 
 		// Get the pretty name for the input type
 		$gv_field = GravityView_Fields::get( $input_type );
 
-		if( $gv_field ) {
+		if ( $gv_field ) {
 			$input_type_label = $gv_field->label;
 		} else {
 			$input_type_label = $input_type;
@@ -335,7 +335,7 @@ 
 			}
 
 			if ( $grouped ) {
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
 			}
@@ -352,15 +352,15 @@ 
 				}
 
 				$show_if = '';
-				if ( ! empty( $option['requires'] ) ) {
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
+				if ( ! empty( $option[ 'requires' ] ) ) {
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
 				}
 
-				if ( ! empty( $option['requires_not'] ) ) {
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
 				}
 
-				switch ( $option['type'] ) {
+				switch ( $option[ 'type' ] ) {
 					// Hide hidden fields
 					case 'hidden':
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -378,30 +378,30 @@ 
 		$item_details = '';
 		$subtitle = '';
 
-		if( 'field' === $field_type ) {
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
+		if ( 'field' === $field_type ) {
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
 
 			$item_details .= '
 			<div class="gv-field-details--container">
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gk-gravityview' ) .' <i class="dashicons dashicons-arrow-right"></i></label>
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gk-gravityview' ) . ' <i class="dashicons dashicons-arrow-right"></i></label>
 				<section class="gv-field-details gv-field-details--closed">';
 
 				if ( $field_id && is_numeric( $field_id ) ) {
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--field">
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gk-gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gk-gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
 					</div>';
 			    }
 
 				$item_details .= '
 					<div class="gv-field-detail gv-field-detail--type">
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gk-gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gk-gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
 					</div>';
 
-				if( $form_id ) {
+				if ( $form_id ) {
 					$item_details .= '
 					<div class="gv-field-detail gv-field-detail--form">
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gk-gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gk-gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
 					</div>';
 				}
 
@@ -409,7 +409,7 @@ 
 				</section>
 			</div>';
 		} else {
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle']  . '</div>' : '';
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
 			$widget_details_content = \GV\Utils::get( $item, 'description', '' );
 
 			// Intentionally not escaping to allow HTML.
@@ -476,17 +476,17 @@ 
 		 * @deprecated setting index 'default' was replaced by 'value'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
-			$option['value'] = $option['default'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
+			$option[ 'value' ] = $option[ 'default' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
 		}
 
 		// prepare to render option field type
-		if( isset( $option['type'] ) ) {
+		if ( isset( $option[ 'type' ] ) ) {
 
 			$type_class = self::load_type_class( $option );
 
-			if( class_exists( $type_class ) ) {
+			if ( class_exists( $type_class ) ) {
 
 				/** @type GravityView_FieldType $render_type */
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -503,7 +503,7 @@ 
 				 * @param string $output field class name
 				 * @param array $option  option field data
 				 */
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
 			}
 
 		} // isset option[type]
@@ -538,27 +538,27 @@ 
 		 * @deprecated setting index 'name' was replaced by 'label'
 		 * @see GravityView_FieldType::get_field_defaults
 		 */
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
-			$setting['label'] = $setting['name'];
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
+			$setting[ 'label' ] = $setting[ 'name' ];
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
 		}
 
 		$name = esc_attr( sprintf( $name, $key ) );
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
-		$setting['tooltip'] = 'gv_' . $key;
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
+		$setting[ 'tooltip' ] = 'gv_' . $key;
 
 		// Use default if current setting isn't set.
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
 
 		// default setting type = text
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
 
 		// merge tags
-		if( !isset( $setting['merge_tags'] ) ) {
-			if( $setting['type'] === 'text' ) {
-				$setting['merge_tags'] = true;
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
+			if ( $setting[ 'type' ] === 'text' ) {
+				$setting[ 'merge_tags' ] = true;
 			} else {
-				$setting['merge_tags'] = false;
+				$setting[ 'merge_tags' ] = false;
 			}
 		}
 
@@ -566,7 +566,7 @@ 
 
 		// render the setting
 		$type_class = self::load_type_class( $setting );
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			/** @type GravityView_FieldType $render_type */
 			$render_type = new $type_class( $name, $setting, $curr_value );
 			ob_start();
@@ -575,25 +575,25 @@ 
 		}
 
 		// Check if setting is specific for a template
-		if( !empty( $setting['show_in_template'] ) ) {
-			if( !is_array( $setting['show_in_template'] ) ) {
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
 			}
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
 		} else {
 			$show_if = '';
 		}
 
-		if( ! empty( $setting['requires'] ) ) {
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
+		if ( ! empty( $setting[ 'requires' ] ) ) {
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
 		}
 
-		if( ! empty( $setting['requires_not'] ) ) {
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
 		}
 
 		// output
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
 
 	}
 
@@ -605,7 +605,7 @@ 
 	 */
 	public static function load_type_class( $field = NULL ) {
 
-		if( empty( $field['type'] ) ) {
+		if ( empty( $field[ 'type' ] ) ) {
 			return NULL;
 		}
 
@@ -614,9 +614,9 @@ 
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
 		 * @param array $field   field data
 		 */
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
 
-		if( class_exists( $type_class ) ) {
+		if ( class_exists( $type_class ) ) {
 			return $type_class;
 		}
 
@@ -625,9 +625,9 @@ 
 		 * @param string  $field_type_include_path field class file path
 		 * @param array $field  field data
 		 */
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
 
-		if( $class_file && file_exists( $class_file ) ) {
+		if ( $class_file && file_exists( $class_file ) ) {
 			require_once( $class_file );
 		}
 
@@ -649,8 +649,8 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
 
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
 
 		return $output;
 	}
@@ -670,22 +670,22 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
 
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
 	}
 
 	/**
@@ -702,21 +702,21 @@ 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
 
 		// Show the merge tags if the field is a list view
-		$is_list = ( preg_match( '/_list-/ism', $name ));
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
 
 		// Or is a single entry view
-		$is_single = ( preg_match( '/single_/ism', $name ));
+		$is_single = ( preg_match( '/single_/ism', $name ) );
 		$show = ( $is_single || $is_list );
 
 		$class = '';
 		// and $add_merge_tags is not false
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
 		}
 
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
 
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
 	}
 
 	/**
@@ -732,9 +732,9 @@ 
 
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
 
-		$output = '<select name="'. $name .'" id="'. $id .'">';
-		foreach( $choices as $value => $label ) {
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
+		$output = '<select name="' . $name . '" id="' . $id . '">';
+		foreach ( $choices as $value => $label ) {
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
 		}
 		$output .= '</select>';
 

includes/widgets/search-widget/class-search-widget.php

Spacing +192 added lines, -192 removed lines

@@ -55,7 +55,7 @@ 
 			'search_clear' => array(
 				'type'  => 'checkbox',
 				'label' => __( 'Show Clear button', 'gk-gravityview' ),
-				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gk-gravityview'),
+				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gk-gravityview' ),
 				'value' => true,
 			),
 			'search_fields' => array(
@@ -68,7 +68,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gk-gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gk-gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gk-gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -83,7 +83,7 @@ 
 				// translators: Do not translate [b], [/b], [link], or [/link]; they are placeholders for HTML and links to documentation.
 				'desc' => strtr(
 					esc_html__( 'For fields with choices: Instead of showing all choices for each field, show only field choices that exist in submitted form entries.', 'gk-gravityview' ) .
-					'<p><strong>⚠️ ' . esc_html__('This setting affects security.', 'gk-gravityview' ) . '</strong> ' . esc_html__( '[link]Learn about the Pre-Filter Choices setting[/link] before enabling it.', 'gk-gravityview') . '</p>',
+					'<p><strong>⚠️ ' . esc_html__( 'This setting affects security.', 'gk-gravityview' ) . '</strong> ' . esc_html__( '[link]Learn about the Pre-Filter Choices setting[/link] before enabling it.', 'gk-gravityview' ) . '</p>',
 					array(
 						'[b]' => '<strong>',
 						'[/b]' => '</strong>',
@@ -109,7 +109,7 @@ 
 
 			// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
 			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
+			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
 
 			// ajax - get the searchable fields
@@ -145,19 +145,19 @@ 
 	 */
 	public function add_reserved_args( $args ) {
 
-		$args[] = 'gv_search';
-		$args[] = 'gv_start';
-		$args[] = 'gv_end';
-		$args[] = 'gv_id';
-		$args[] = 'gv_by';
-		$args[] = 'mode';
+		$args[ ] = 'gv_search';
+		$args[ ] = 'gv_start';
+		$args[ ] = 'gv_end';
+		$args[ ] = 'gv_id';
+		$args[ ] = 'gv_by';
+		$args[ ] = 'mode';
 
-		$get = (array) $_GET;
+		$get = (array)$_GET;
 
 		// If the fields being searched as reserved; not to be considered user-passed variables
 		foreach ( $get as $key => $value ) {
 			if ( $key !== $this->convert_request_key_to_filter_key( $key ) ) {
-				$args[] = $key;
+				$args[ ] = $key;
 			}
 		}
 
@@ -281,7 +281,7 @@ 
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 		$script_source = empty( $script_min ) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), \GV\Plugin::$version );
 
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -303,7 +303,7 @@ 
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
 	 */
 	public function register_no_conflict( $allowed ) {
-		$allowed[] = 'gravityview_searchwidget_admin';
+		$allowed[ ] = 'gravityview_searchwidget_admin';
 		return $allowed;
 	}
 
@@ -315,24 +315,24 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
 			exit( '0' );
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST[ 'formid' ];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 
 		}
 
@@ -382,14 +382,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Approval Status', 'gk-gravityview' ),
 				'type' => 'multi',
 			);
 		}
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
 		}
 
 		// Get fields with sub-inputs and no parent
@@ -411,13 +411,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blocklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -440,7 +440,7 @@ 
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
 			$input_type = 'boolean'; // on/off checkbox
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
 			$input_type = 'multi'; //multiselect
@@ -486,19 +486,19 @@ 
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'post_id' ] );
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
+				$post_id = absint( $widget_args[ 'view_id' ] );
 			}
 
 			$args = gravityview_get_permalink_query_args( $post_id );
 
 			// Add hidden fields to the search form
 			foreach ( $args as $key => $value ) {
-				$search_fields[] = array(
+				$search_fields[ ] = array(
 					'name'  => $key,
 					'input' => 'hidden',
 					'value' => $value,
@@ -537,28 +537,28 @@ 
 		/**
 		 * Include the sidebar Widgets.
 		 */
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
 
 		foreach ( $widgets as $widget ) {
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
 					foreach ( $_fields as $field ) {
-						if ( empty( $field['form_id'] ) ) {
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
+						if ( empty( $field[ 'form_id' ] ) ) {
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 						}
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 					}
 				}
 			}
 		}
 
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
 				foreach ( $_fields as $field ) {
-					if ( empty( $field['form_id'] ) ) {
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
+					if ( empty( $field[ 'form_id' ] ) ) {
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 					}
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
 				}
 			}
 		}
@@ -604,7 +604,7 @@ 
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
 		}
 
-		if( 'post' === $this->search_method ) {
+		if ( 'post' === $this->search_method ) {
 			$get = $_POST;
 		} else {
 			$get = $_GET;
@@ -627,7 +627,7 @@ 
 		}
 
 		// Make sure array key is set up
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
 
 		$searchable_fields = $this->get_view_searchable_fields( $view );
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
@@ -647,9 +647,9 @@ 
 		$trim_search_value = apply_filters( 'gravityview/search-trim-input', true );
 
 		// add free search
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
 
-			$search_all_value = $trim_search_value ? trim( $get['gv_search'] ) : $get['gv_search'];
+			$search_all_value = $trim_search_value ? trim( $get[ 'gv_search' ] ) : $get[ 'gv_search' ];
 
 			if ( $split_words ) {
 				// Search for a piece
@@ -665,7 +665,7 @@ 
 			}
 
 			foreach ( $words as $word ) {
-				$search_criteria['field_filters'][] = array(
+				$search_criteria[ 'field_filters' ][ ] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -678,14 +678,14 @@ 
 			/**
 			 * Get and normalize the dates according to the input format.
 			 */
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
 				}
 			}
 
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
 				}
 			}
@@ -721,22 +721,22 @@ 
 			 */
 			if ( ! empty( $curr_start ) ) {
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
 			}
 
 			if ( ! empty( $curr_end ) ) {
 				// Fast-forward 24 hour on the end time
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
 				}
 			}
 		}
 
 		// search for a specific entry ID
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'id',
 				'value' => absint( $get[ 'gv_id' ] ),
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -745,15 +745,15 @@ 
 
 		// search for a specific Created_by ID
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
-			$search_criteria['field_filters'][] = array(
+			$search_criteria[ 'field_filters' ][ ] = array(
 				'key' => 'created_by',
-				'value' => $get['gv_by'],
+				'value' => $get[ 'gv_by' ],
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
 			);
 		}
 
 		// Get search mode passed in URL
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
 
 		// get the other search filters
 		foreach ( $get as $key => $value ) {
@@ -771,7 +771,7 @@ 
 				$value = is_array( $value ) ? array_map( 'trim', $value ) : trim( $value );
 			}
 
-			if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
+			if ( gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
 				/**
 				 * @filter `gravityview/search/ignore-empty-values` Filter to control if empty field values should be ignored or strictly matched (default: true)
 				 * @since  2.14.2.1
@@ -802,21 +802,21 @@ 
 				continue;
 			}
 
-			if ( ! isset( $filter['operator'] ) ) {
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
+			if ( ! isset( $filter[ 'operator' ] ) ) {
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
 			}
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$filter[0]['value'] = $trim_search_value ? trim( $filter[0]['value'] ) : $filter[0]['value'];
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
+				$filter[ 0 ][ 'value' ] = $trim_search_value ? trim( $filter[ 0 ][ 'value' ] ) : $filter[ 0 ][ 'value' ];
 
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
-				$search_criteria['field_filters'][] = $filter;
+			} elseif ( ! empty( $filter ) ) {
+				$search_criteria[ 'field_filters' ][ ] = $filter;
 			}
 		}
 
@@ -825,7 +825,7 @@ 
 		 * @since 1.5.1
 		 * @param string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
 
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
 
@@ -859,19 +859,19 @@ 
 
 		$query_class = $view->get_query_class();
 
-		if ( empty( $search_criteria['field_filters'] ) ) {
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
 			return;
 		}
 
 		$widgets = $view->widgets->by_id( $this->widget_id );
 		if ( $widgets->count() ) {
 			$widgets = $widgets->all();
-			$widget  = $widgets[0];
+			$widget  = $widgets[ 0 ];
 
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
 
-			foreach ( (array) $search_fields as $search_field ) {
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
+			foreach ( (array)$search_fields as $search_field ) {
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
 					$created_by_text_mode = true;
 				}
 			}
@@ -880,7 +880,7 @@ 
 		$extra_conditions = array();
 		$mode = 'any';
 
-		foreach ( $search_criteria['field_filters'] as $key => &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as $key => &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
 					$mode = $filter;
@@ -889,13 +889,13 @@ 
 			}
 
 			// Construct a manual query for unapproved statuses
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
-				$_tmp_query       = new $query_class( $view->form->ID, array(
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
+				$_tmp_query = new $query_class( $view->form->ID, array(
 					'field_filters' => array(
 						array(
 							'operator' => 'in',
 							'key'      => 'is_approved',
-							'value'    => (array) $filter['value'],
+							'value'    => (array)$filter[ 'value' ],
 						),
 						array(
 							'operator' => 'is',
@@ -907,30 +907,30 @@ 
 				) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
 
-				$extra_conditions[] = $_tmp_query_parts['where'];
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 
 				$filter = false;
 				continue;
 			}
 
 			// Construct manual query for text mode creator search
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
 				$filter = false;
 				continue;
 			}
 
 			// By default, we want searches to be wildcard for each field.
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 			// For multichoice, let's have an in (OR) search.
-			if ( is_array( $filter['value'] ) ) {
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
+			if ( is_array( $filter[ 'value' ] ) ) {
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
 			}
 
 			// Default form with joins functionality
-			if ( empty( $filter['form_id'] ) ) {
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
+			if ( empty( $filter[ 'form_id' ] ) ) {
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
 			}
 
 			/**
@@ -940,32 +940,32 @@ 
 			 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 			 * @param \GV\View $view The View we're operating on.
 			 */
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
 
-			if ( 'is' !== $filter['operator'] && '' === $filter['value'] ) {
-				unset( $search_criteria['field_filters'][ $key ] );
+			if ( 'is' !== $filter[ 'operator' ] && '' === $filter[ 'value' ] ) {
+				unset( $search_criteria[ 'field_filters' ][ $key ] );
 			}
 		}
 
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
 			$date_criteria = array();
 
-			if ( isset( $search_criteria['start_date'] ) ) {
-				$date_criteria['start_date'] = $search_criteria['start_date'];
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
 			}
 
-			if ( isset( $search_criteria['end_date'] ) ) {
-				$date_criteria['end_date'] = $search_criteria['end_date'];
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
 			}
 
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
 			$_tmp_query_parts   = $_tmp_query->_introspect();
-			$extra_conditions[] = $_tmp_query_parts['where'];
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
 		}
 
 		$search_conditions = array();
 
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
 			foreach ( $filters as &$filter ) {
 				if ( ! is_array( $filter ) ) {
 					continue;
@@ -977,12 +977,12 @@ 
 				 * code by reusing what's inside GF_Query already as they
 				 * take care of many small things like forcing numeric, etc.
 				 */
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
 				$_tmp_query_parts = $_tmp_query->_introspect();
-				$search_condition = $_tmp_query_parts['where'];
+				$search_condition = $_tmp_query_parts[ 'where' ];
 
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
-					$search_conditions[] = $search_condition;
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
+					$search_conditions[ ] = $search_condition;
 				} else {
 					$left = $search_condition->left;
 
@@ -994,8 +994,8 @@ 
 
 							$value = $reflectionProperty->getValue( $left );
 
-							if ( ! empty( $value[0] ) && $value[0] instanceof GF_Query_Column ) {
-								$left = $value[0];
+							if ( ! empty( $value[ 0 ] ) && $value[ 0 ] instanceof GF_Query_Column ) {
+								$left = $value[ 0 ];
 							} else {
 								continue;
 							}
@@ -1011,7 +1011,7 @@ 
 							$on = $_join->join_on;
 							$join = $_join->join;
 
-							$search_conditions[] = GF_Query_Condition::_or(
+							$search_conditions[ ] = GF_Query_Condition::_or(
 								// Join
 								new GF_Query_Condition(
 									new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
@@ -1027,7 +1027,7 @@ 
 							);
 						}
 					} else {
-						$search_conditions[] = new GF_Query_Condition(
+						$search_conditions[ ] = new GF_Query_Condition(
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
 							$search_condition->operator,
 							$search_condition->right
@@ -1049,7 +1049,7 @@ 
 		/**
 		 * Combine the parts as a new WHERE clause.
 		 */
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
 		$query->where( $where );
 	}
 
@@ -1072,7 +1072,7 @@ 
 		$field_id = str_replace( array( 'filter_', 'input_' ), '', $key );
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
 			$field_id = str_replace( '_', '.', $field_id );
 		}
 
@@ -1129,7 +1129,7 @@ 
 			// form is in searchable fields
 			$found = false;
 			foreach ( $searchable_fields as $field ) {
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
 					$found = true;
 					break;
 				}
@@ -1169,7 +1169,7 @@ 
 
 			case 'select':
 			case 'radio':
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				break;
 
 			case 'post_category':
@@ -1183,7 +1183,7 @@ 
 
 				foreach ( $value as $val ) {
 					$cat = get_term( $val, 'category' );
-					$filter[] = array(
+					$filter[ ] = array(
 						'key'      => $field_id,
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1202,7 +1202,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
@@ -1211,9 +1211,9 @@ 
 				// convert checkbox on/off into the correct search filter
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
 					foreach ( $form_field->inputs as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field->choices[ $k ]['value'];
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+						if ( $input[ 'id' ] == $field_id ) {
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 							break;
 						}
 					}
@@ -1223,7 +1223,7 @@ 
 					$filter = array();
 
 					foreach ( $value as $val ) {
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => $val,
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1244,9 +1244,9 @@ 
 					foreach ( $words as $word ) {
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
 							// Keep the same key for each filter
-							$filter['value'] = $word;
+							$filter[ 'value' ] = $word;
 							// Add a search for the value
-							$filters[] = $filter;
+							$filters[ ] = $filter;
 						}
 					}
 
@@ -1260,19 +1260,19 @@ 
 
 					foreach ( $searchable_fields as $searchable_field ) {
 
-						if( $form_field->ID !== $searchable_field['field'] ) {
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
 							continue;
 						}
 
 						// Only exact-match dropdowns, not text search
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
 							continue;
 						}
 
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
 
 						if ( 4 === $input_id ) {
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 						};
 					}
 				}
@@ -1300,12 +1300,12 @@ 
 						 * @since 1.16.3
 						 * Safeguard until GF implements '<=' operator
 						 */
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
 							$operator = '<';
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
 						}
 
-						$filter[] = array(
+						$filter[ ] = array(
 							'key'      => $field_id,
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1313,12 +1313,12 @@ 
 					}
 				} else {
 					$date = $value;
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
 				}
 
-				if ('payment_date' === $key) {
-					$filter['operator'] = 'contains';
+				if ( 'payment_date' === $key ) {
+					$filter[ 'operator' ] = 'contains';
 				}
 
 				break;
@@ -1347,7 +1347,7 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
 			$format = $datepicker[ $field->dateFormat ];
 		}
 
@@ -1384,7 +1384,7 @@ 
 	public function add_template_path( $file_paths ) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[ 102 ] = self::$file . 'templates/';
 
 		return $file_paths;
 	}
@@ -1403,7 +1403,7 @@ 
 		$has_date = false;
 
 		foreach ( $search_fields as $k => $field ) {
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
 				$has_date = true;
 				break;
 			}
@@ -1432,7 +1432,7 @@ 
 		$view = \GV\View::by_id( $gravityview_view->view_id );
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
 
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1446,39 +1446,39 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field, $context, $widget_args );
 
-			switch ( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 
 				case 'search_all':
-					$updated_field['key'] = 'search_all';
-					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
+					$updated_field[ 'key' ] = 'search_all';
+					$updated_field[ 'input' ] = 'search_all';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
 					break;
 
 				case 'entry_date':
-					$updated_field['key'] = 'entry_date';
-					$updated_field['input'] = 'entry_date';
-					$updated_field['value'] = array(
+					$updated_field[ 'key' ] = 'entry_date';
+					$updated_field[ 'input' ] = 'entry_date';
+					$updated_field[ 'value' ] = array(
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
 					);
 					break;
 
 				case 'entry_id':
-					$updated_field['key'] = 'entry_id';
-					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
+					$updated_field[ 'key' ] = 'entry_id';
+					$updated_field[ 'input' ] = 'entry_id';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
 					break;
 
 				case 'created_by':
-					$updated_field['key'] = 'created_by';
-					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
+					$updated_field[ 'key' ] = 'created_by';
+					$updated_field[ 'name' ] = 'gv_by';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
 					break;
 
 				case 'is_approved':
-					$updated_field['key'] = 'is_approved';
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
-					$updated_field['choices'] = self::get_is_approved_choices();
+					$updated_field[ 'key' ] = 'is_approved';
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
 					break;
 			}
 
@@ -1499,16 +1499,16 @@ 
 
 		$gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args );
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
 
 		if ( $this->has_date_field( $search_fields ) ) {
 			// enqueue datepicker stuff only if needed!
@@ -1530,10 +1530,10 @@ 
 	public static function get_search_class( $custom_class = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
-			$search_class .= ' '.$custom_class;
+		if ( ! empty( $custom_class ) ) {
+			$search_class .= ' ' . $custom_class;
 		}
 
 		/**
@@ -1584,9 +1584,9 @@ 
 
 		if ( ! $label ) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
 
-			switch( $field['field'] ) {
+			switch ( $field[ 'field' ] ) {
 				case 'search_all':
 					$label = __( 'Search Entries:', 'gk-gravityview' );
 					break;
@@ -1598,10 +1598,10 @@ 
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
 
 						// Get the item with the `label` key
 						$values = wp_list_pluck( $items, 'label' );
@@ -1645,13 +1645,13 @@ 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
 
 		// get searched value from $_GET/$_POST (string or array)
 		$value = $this->rgget_or_rgpost( $name );
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
 
 		$form_field_type = \GV\Utils::get( $form_field, 'type' );
 
@@ -1665,22 +1665,22 @@ 
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
-			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
-			$filter['choices'] = $form_field['choices'];
+		if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
 		}
 
-		if ( 'created_by' === $field['field'] ) {
-			$filter['choices'] = self::get_created_by_choices( ( isset( $context->view ) ? $context->view : null ) );
-			$filter['type'] = 'created_by';
+		if ( 'created_by' === $field[ 'field' ] ) {
+			$filter[ 'choices' ] = self::get_created_by_choices( ( isset( $context->view ) ? $context->view : null ) );
+			$filter[ 'type' ] = 'created_by';
 		}
 
-		if ( ! empty( $filter['choices'] ) ) {
+		if ( ! empty( $filter[ 'choices' ] ) ) {
 
 			$sieve_choices = \GV\Utils::get( $widget_args, 'sieve_choices', false );
 
@@ -1692,7 +1692,7 @@ 
 			 * @param \GV\Context The context.
 			 */
 			if ( apply_filters( 'gravityview/search/sieve_choices', $sieve_choices, $field, $context, $widget_args ) ) {
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
 			}
 		}
 
@@ -1721,18 +1721,18 @@ 
 	 * @return array The filter choices.
 	 */
 	private function sieve_filter_choices( $filter, $context ) {
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
 			return $filter; // @todo Populate plugins might give us empty choices
 		}
 
 		// Allow only created_by and field-ids to be sieved.
-		if ( 'created_by' !== $filter['key'] && ! is_numeric( $filter['key'] ) ) {
+		if ( 'created_by' !== $filter[ 'key' ] && ! is_numeric( $filter[ 'key' ] ) ) {
 			return $filter;
 		}
 
 		$form_id = $context->view->form->ID; // @todo Support multiple forms (joins)
 
-		$cache = new GravityView_Cache( $form_id, [ 'sieve', $filter['key'], $context->view->ID ] );
+		$cache = new GravityView_Cache( $form_id, [ 'sieve', $filter[ 'key' ], $context->view->ID ] );
 
 		$filter_choices = $cache->get();
 
@@ -1745,13 +1745,13 @@ 
 		$entry_table_name      = GFFormsModel::get_entry_table_name();
 		$entry_meta_table_name = GFFormsModel::get_entry_meta_table_name();
 
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
 
 		switch ( \GV\Utils::get( $filter, 'type' ) ) {
 			case 'post_category':
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT SUBSTRING_INDEX( `meta_value`, ':', 1) FROM $entry_meta_table_name WHERE ( `meta_key` LIKE %s OR `meta_key` = %d) AND `form_id` = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 				break;
 			case 'created_by':
@@ -1763,17 +1763,17 @@ 
 			default:
 				$choices = $wpdb->get_col( $wpdb->prepare(
 					"SELECT DISTINCT `meta_value` FROM $entry_meta_table_name WHERE ( `meta_key` LIKE %s OR `meta_key` = %d) AND `form_id` = %d",
-					$key_like, $filter['key'], $form_id
+					$key_like, $filter[ 'key' ], $form_id
 				) );
 
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
 					$choices        = array_map( 'json_decode', $choices );
 					$_choices_array = array();
 					foreach ( $choices as $choice ) {
 						if ( is_array( $choice ) ) {
 							$_choices_array = array_merge( $_choices_array, $choice );
 						} else {
-							$_choices_array [] = $choice;
+							$_choices_array [ ] = $choice;
 						}
 					}
 					$choices = array_unique( $_choices_array );
@@ -1783,9 +1783,9 @@ 
 		}
 
 		$filter_choices = array();
-		foreach ( $filter['choices'] as $choice ) {
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
-				$filter_choices[] = $choice;
+		foreach ( $filter[ 'choices' ] as $choice ) {
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
+				$filter_choices[ ] = $choice;
 			}
 		}
 
@@ -1822,7 +1822,7 @@ 
 			 * @param \GV\View|null $view The view.
 			 */
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
-			$choices[] = array(
+			$choices[ ] = array(
 				'value' => $user->ID,
 				'text' => $text,
 			);
@@ -1842,9 +1842,9 @@ 
 
 		$choices = array();
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
-			$choices[] = array(
-				'value' => $status['value'],
-				'text' => $status['label'],
+			$choices[ ] = array(
+				'value' => $status[ 'value' ],
+				'text' => $status[ 'label' ],
 			);
 		}
 
@@ -1898,7 +1898,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1942,7 +1942,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1969,7 +1969,7 @@ 
 	 * @return void
 	 */
 	private function maybe_enqueue_flexibility() {
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
 			wp_enqueue_script( 'gv-flexibility' );
 		}
 	}
@@ -1991,7 +1991,7 @@ 
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`
@@ -2070,7 +2070,7 @@ 
 	public function add_preview_inputs() {
 		global $wp;
 
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
 			return;
 		}
 
@@ -2128,7 +2128,7 @@ 
  */
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
 	public function __construct( $filter, $view ) {
-		$this->value = $filter['value'];
+		$this->value = $filter[ 'value' ];
 		$this->view = $view;
 	}
 
@@ -2160,11 +2160,11 @@ 
 		$conditions = array();
 
 		foreach ( $user_fields as $user_field ) {
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		foreach ( $user_meta_fields as $meta_field ) {
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
 		}
 
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';