gravityview / GravityView

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

Spacing +15 added lines, -15 removed lines

@@ -60,7 +60,7 @@ 
 	public function remove_columns_from_searchable_fields( $fields ) {
 
 		foreach ( $fields as $key => $field ) {
-			if ( isset( $field['parent'] ) && $field['parent'] instanceof \GF_Field_List ) {
+			if ( isset( $field[ 'parent' ] ) && $field[ 'parent' ] instanceof \GF_Field_List ) {
 				unset( $fields[ $key ] );
 			}
 		}
@@ -86,7 +86,7 @@ 
 		// Add the list columns
 		foreach ( $list_fields as $list_field ) {
 
-			if( empty( $list_field->enableColumns ) ) {
+			if ( empty( $list_field->enableColumns ) ) {
 				continue;
 			}
 
@@ -107,7 +107,7 @@ 
 			}
 
 			// If there are columns, add them under the parent field
-			if( ! empty( $list_columns ) ) {
+			if ( ! empty( $list_columns ) ) {
 
 				$index = array_search( $list_field->id, array_keys( $fields ) ) + 1;
 
@@ -115,7 +115,7 @@ 
 				 * Merge the $list_columns into the $fields array at $index
 				 * @see https://stackoverflow.com/a/1783125
 				 */
-				$fields = array_slice( $fields, 0, $index, true) + $list_columns + array_slice( $fields, $index, null, true);
+				$fields = array_slice( $fields, 0, $index, true ) + $list_columns + array_slice( $fields, $index, null, true );
 			}
 
 			unset( $list_columns, $index, $input_id );
@@ -142,7 +142,7 @@ 
 
 		$list_rows = maybe_unserialize( $field_value );
 
-		if( ! is_array( $list_rows ) ) {
+		if ( ! is_array( $list_rows ) ) {
 			gravityview()->log->error( '$field_value did not unserialize', array( 'data' => $field_value ) );
 			return null;
 		}
@@ -152,18 +152,18 @@ 
 		// Each list row
 		foreach ( $list_rows as $list_row ) {
 			$current_column = 0;
-			foreach ( (array) $list_row as $column_key => $column_value ) {
+			foreach ( (array)$list_row as $column_key => $column_value ) {
 
 				// If the label of the column matches $column_id, or the numeric key value matches, add the value
-				if( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
-					$column_values[] = $column_value;
+				if ( (string)$column_key === (string)$column_id || ( is_numeric( $column_id ) && (int)$column_id === $current_column ) ) {
+					$column_values[ ] = $column_value;
 				}
 				$current_column++;
 			}
 		}
 
 		// Return the array of values
-		if( 'raw' === $format ) {
+		if ( 'raw' === $format ) {
 			return $column_values;
 		}
 		// Return the Gravity Forms Field output
@@ -186,22 +186,22 @@ 
 	 */
 	public function _filter_field_label( $label, $field, $form, $entry ) {
 
-		$field_object = RGFormsModel::get_field( $form, $field['id'] );
+		$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
 		// Not a list field
-		if( ! $field_object || 'list' !== $field_object->type ) {
+		if ( ! $field_object || 'list' !== $field_object->type ) {
 			return $label;
 		}
 
 		// Custom label is defined, so use it
-		if( ! empty( $field['custom_label'] ) ) {
+		if ( ! empty( $field[ 'custom_label' ] ) ) {
 			return $label;
 		}
 
-		$column_id = gravityview_get_input_id_from_id( $field['id'] );
+		$column_id = gravityview_get_input_id_from_id( $field[ 'id' ] );
 
 		// Parent field, not column field
-		if( false === $column_id ) {
+		if ( false === $column_id ) {
 			return $label;
 		}
 
@@ -222,7 +222,7 @@ 
 	public static function get_column_label( GF_Field_List $field, $column_id, $backup_label = '' ) {
 
 		// Doesn't have columns enabled
-		if( ! isset( $field->choices ) || ! $field->enableColumns ) {
+		if ( ! isset( $field->choices ) || ! $field->enableColumns ) {
 			return $backup_label;
 		}
 

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

Braces +3 added lines, -2 removed lines

@@ -603,7 +603,8 @@ 
 				// 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
+				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 );
 				}
 			}
@@ -874,7 +875,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 ];
 		}
 

Spacing +186 added lines, -186 removed lines

@@ -55,7 +55,7 @@ 
 			'search_clear' => array(
 				'type'  => 'checkbox',
 				'label' => __( 'Show Clear button', 'gravityview' ),
-				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gravityview'),
+				'desc'  => __( 'When a search is performed, display a button that removes all search values.', 'gravityview' ),
 				'value' => true,
 			),
 			'search_fields' => array(
@@ -68,7 +68,7 @@ 
 				'type' => 'radio',
 				'full_width' => true,
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
@@ -87,7 +87,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
@@ -123,19 +123,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;
 			}
 		}
 
@@ -259,7 +259,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' ),
@@ -281,7 +281,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;
 	}
 
@@ -293,24 +293,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' ] );
 
 		}
 
@@ -360,14 +360,14 @@ 
 		);
 
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
-			$custom_fields['is_approved'] = array(
+			$custom_fields[ 'is_approved' ] = array(
 				'text' => esc_html__( 'Approval Status', '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
@@ -389,13 +389,13 @@ 
 
 			foreach ( $fields as $id => $field ) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blacklist_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>';
 			}
 		}
 
@@ -418,7 +418,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
@@ -464,19 +464,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,
@@ -515,28 +515,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' ];
 				}
 			}
 		}
@@ -574,7 +574,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;
@@ -593,7 +593,7 @@ 
 		$get = gv_map_deep( $get, 'rawurldecode' );
 
 		// 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 );
@@ -613,9 +613,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
@@ -631,7 +631,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`
@@ -644,14 +644,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' );
 				}
 			}
@@ -687,22 +687,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( '=' ), '=' ),
@@ -711,15 +711,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 ) {
@@ -731,7 +731,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 ) ) ) {
 				continue;
 			}
 
@@ -745,21 +745,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;
 			}
 		}
 
@@ -768,7 +768,7 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] 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 ) );
 
@@ -802,19 +802,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;
 				}
 			}
@@ -823,7 +823,7 @@ 
 		$extra_conditions = array();
 		$mode = 'any';
 
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
 			if ( ! is_array( $filter ) ) {
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
 					$mode = $filter;
@@ -832,13 +832,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',
@@ -850,30 +850,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;
 			}
 
 			/**
@@ -883,28 +883,28 @@ 
 			 * @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 ( ! 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;
@@ -916,12 +916,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;
 					$alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' );
@@ -931,7 +931,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' ) ),
@@ -947,7 +947,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
@@ -969,7 +969,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 );
 	}
 
@@ -992,7 +992,7 @@ 
 		$field_id = str_replace( 'filter_', '', $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 );
 		}
 
@@ -1049,7 +1049,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;
 				}
@@ -1089,7 +1089,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':
@@ -1103,7 +1103,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' ),
@@ -1122,7 +1122,7 @@ 
 				$filter = array();
 
 				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
 				}
 
 				break;
@@ -1131,9 +1131,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;
 						}
 					}
@@ -1143,7 +1143,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' ),
@@ -1164,9 +1164,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;
 						}
 					}
 
@@ -1180,19 +1180,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' );
 						};
 					}
 				}
@@ -1220,12 +1220,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 ),
@@ -1233,12 +1233,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;
@@ -1267,7 +1267,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 ];
 		}
 
@@ -1304,7 +1304,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;
 	}
@@ -1323,7 +1323,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;
 			}
@@ -1352,7 +1352,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 ) );
@@ -1366,39 +1366,39 @@ 
 
 			$updated_field = $this->get_search_filter_details( $updated_field, $context );
 
-			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;
 			}
 
@@ -1419,16 +1419,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!
@@ -1450,10 +1450,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;
 		}
 
 		/**
@@ -1504,9 +1504,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:', 'gravityview' );
 					break;
@@ -1518,10 +1518,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' );
@@ -1562,13 +1562,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' );
 
@@ -1582,22 +1582,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( $context->view );
-			$filter['type'] = 'created_by';
+		if ( 'created_by' === $field[ 'field' ] ) {
+			$filter[ 'choices' ] = self::get_created_by_choices( $context->view );
+			$filter[ 'type' ] = 'created_by';
 		}
 
-		if ( ! empty( $filter['choices'] ) ) {
+		if ( ! empty( $filter[ 'choices' ] ) ) {
 			/**
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
 			 * @param[in,out] bool Yes or no.
@@ -1605,7 +1605,7 @@ 
 			 * @param \GV\Context The context.
 			 */
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
 			}
 		}
 
@@ -1634,12 +1634,12 @@ 
 	 * @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;
 		}
 
@@ -1650,13 +1650,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':
@@ -1668,17 +1668,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 );
@@ -1688,9 +1688,9 @@ 
 		endswitch;
 
 		$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;
 			}
 		}
 
@@ -1725,7 +1725,7 @@ 
 			 * @param \GV\View $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,
 			);
@@ -1745,9 +1745,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' ],
 			);
 		}
 
@@ -1799,7 +1799,7 @@ 
 	 */
 	public function add_datepicker_js_dependency( $js_dependencies ) {
 
-		$js_dependencies[] = 'jquery-ui-datepicker';
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
 
 		return $js_dependencies;
 	}
@@ -1843,7 +1843,7 @@ 
 			'isRTL'             => is_rtl(),
 		), $view_data );
 
-		$localizations['datepicker'] = $datepicker_settings;
+		$localizations[ 'datepicker' ] = $datepicker_settings;
 
 		return $localizations;
 
@@ -1870,7 +1870,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' );
 		}
 	}
@@ -1892,7 +1892,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`
@@ -1971,7 +1971,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;
 		}
 
@@ -2023,7 +2023,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;
 	}
 
@@ -2055,11 +2055,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 ) . ')';

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

Spacing +2 added lines, -2 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 );
 		}
 
@@ -64,7 +64,7 @@ 
 
 		foreach ( $search_fields as & $search_field ) {
 			if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) {
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
 			}
 		}
 

future/includes/class-gv-form-gravityforms.php

Spacing +9 added lines, -9 removed lines

@@ -55,7 +55,7 @@ 
 		$self = new self();
 		$self->form = $form;
 
-		$self->ID = intval( $self->form['id'] );
+		$self->ID = intval( $self->form[ 'id' ] );
 
 		return $self;
 	}
@@ -70,13 +70,13 @@ 
 	 * @return \GV\GF_Form|null An instance of this form or null if not found.
 	 */
 	public static function from_form( $form ) {
-		if ( empty( $form['id'] ) ) {
+		if ( empty( $form[ 'id' ] ) ) {
 			return null;
 		}
 
 		$self = new self();
 		$self->form = $form;
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -119,11 +119,11 @@ 
 
 			/** The offset and limit */
 			if ( ! empty( $offset->limit ) ) {
-				$paging['page_size'] = $offset->limit;
+				$paging[ 'page_size' ] = $offset->limit;
 			}
 
 			if ( ! empty( $offset->offset ) ) {
-				$paging['offset'] = $offset->offset;
+				$paging[ 'offset' ] = $offset->offset;
 			}
 
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -180,8 +180,8 @@ 
 	 */
 	public function get_fields() {
 		$fields = array();
-		foreach ( $this['fields'] as $field ) {
-			foreach ( empty( $field['inputs'] ) ? array( $field['id'] ) : wp_list_pluck( $field['inputs'], 'id' ) as $id ) {
+		foreach ( $this[ 'fields' ] as $field ) {
+			foreach ( empty( $field[ 'inputs' ] ) ? array( $field[ 'id' ] ) : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
 				if ( is_numeric( $id ) ) {
 					$fields[ $id ] = self::get_field( $this, $id );
 				} else {
@@ -218,7 +218,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->form[$offset] );
+		return isset( $this->form[ $offset ] );
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 * @return mixed The value of the requested form data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->form[$offset];
+		return $this->form[ $offset ];
 	}
 
 	/**

future/includes/class-gv-extension.php

Braces +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) ) {
 			return;
 		}
 

Indentation +7 added lines, -7 removed lines

@@ -305,13 +305,13 @@
 			$this->_remote_update_url,
 			$this->_path,
 			array(
-            	'version'	=> $this->_version, // current version number
-            	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
-	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
-            	'author' 	=> strip_tags( $this->_author )  // author of this plugin
-          	)
-        );
+				'version'	=> $this->_version, // current version number
+				'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
+				'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
+				'item_name' => $this->_title,  // name of this plugin
+				'author' 	=> strip_tags( $this->_author )  // author of this plugin
+		  	)
+		);
 	}
 
 	/**

Spacing +17 added lines, -17 removed lines

@@ -180,13 +180,13 @@ 
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
 
 		// Force the screen to be GravityView
-		$tab['screen'] = 'gravityview';
+		$tab[ 'screen' ] = 'gravityview';
 
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
 			\GravityView_Metabox_Tabs::add( $metabox );
 		} else {
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
 		}
 	}
 
@@ -211,14 +211,14 @@ 
 	 */
 	protected function is_extension_supported() {
 
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
 
 		if ( ! function_exists( 'gravityview' ) ) {
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
 		} else {
@@ -258,12 +258,12 @@ 
 
 		$locale = get_locale();
 
-		if ( function_exists('get_user_locale') && is_admin() ) {
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
 			$locale = get_user_locale();
 		}
 
 		// Traditional WordPress plugin locale filter
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
 
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
 
@@ -291,7 +291,7 @@ 
 	public function settings() {
 
 		// If doing ajax, get outta here
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
 			return;
 		}
 
@@ -308,7 +308,7 @@ 
             	'version'	=> $this->_version, // current version number
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
-            	'item_name' => $this->_title,  // name of this plugin
+            	'item_name' => $this->_title, // name of this plugin
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
           	)
         );
@@ -337,16 +337,16 @@ 
 	 */
 	public static function add_notice( $notice = array() ) {
 
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
 			return;
 		} else if ( is_string( $notice ) ) {
 			$notice = array( 'message' => $notice );
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
 
-		self::$admin_notices []= $notice;
+		self::$admin_notices [ ] = $notice;
 	}
 
 	/**
@@ -360,8 +360,8 @@ 
 		}
 
 		foreach ( self::$admin_notices as $key => $notice ) {
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
-			echo wpautop( $notice['message'] );
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
+			echo wpautop( $notice[ 'message' ] );
 			echo '<div class="clear"></div>';
 			echo '</div>';
 		}

includes/widgets/search-widget/templates/search-field-search_all.php

Spacing +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 $html_input_type = RGFormsModel::is_html5_enabled() ? 'search' : 'text';
 ?>
 
 <div class="gv-search-box gv-search-field-text gv-search-field-search_all">
 	<div class="gv-search">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 		<p><input type="<?php echo $html_input_type; ?>" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p>

includes/widgets/search-widget/templates/search-field-entry_id.php

Spacing +3 added lines, -3 removed lines

@@ -7,13 +7,13 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 ?>
 
 <div class="gv-search-box gv-search-field-entry_id">
 	<div class="gv-search">
-		<?php if( ! gv_empty( $label, false, false ) ) { ?>
+		<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 		<label for="gv_entry_id_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 		<?php } ?>
 		<p><input type="text" name="gv_id" id="gv_entry_id_<?php echo $view_id; ?>" value="<?php echo esc_attr( $value ); ?>" /></p>

includes/widgets/search-widget/templates/search-field-entry_date.php

Spacing +5 added lines, -5 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
 
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range gv-search-field-entry_date">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
 	<label for="gv_start_date_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo $value['start']; ?>">
-		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo $value['end']; ?>">
+		<input name="gv_start" id="gv_start_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo $value[ 'start' ]; ?>">
+		<input name="gv_end" id="gv_end_date_<?php echo $view_id; ?>" type="text" class="<?php echo esc_attr( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo $value[ 'end' ]; ?>">
 	</p>
 </div>
\ No newline at end of file

includes/widgets/search-widget/templates/search-field-date_range.php

Spacing +7 added lines, -7 removed lines

@@ -7,17 +7,17 @@
 
 $gravityview_view = GravityView_View::getInstance();
 $view_id = $gravityview_view->getViewId();
-$value = $gravityview_view->search_field['value'];
-$label = $gravityview_view->search_field['label'];
-$name = $gravityview_view->search_field['name'];
+$value = $gravityview_view->search_field[ 'value' ];
+$label = $gravityview_view->search_field[ 'label' ];
+$name = $gravityview_view->search_field[ 'name' ];
 ?>
 
 <div class="gv-search-box gv-search-date gv-search-date-range">
-	<?php if( ! gv_empty( $label, false, false ) ) { ?>
-	<label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label>
+	<?php if ( ! gv_empty( $label, false, false ) ) { ?>
+	<label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label>
 	<?php } ?>
 	<p>
-		<input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['start'] ); ?>">
-		<input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value['end'] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'start' ] ); ?>">
+		<input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo esc_attr( $value[ 'end' ] ); ?>">
 	</p>
 </div>
\ No newline at end of file