Completed
Push — develop ( c89c19...8ed9a9 )
by
unknown
15:21
created
includes/widgets/search-widget/class-search-widget.php 1 patch
Spacing   +174 added lines, -174 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 				'type' => 'radio',
65 65
 				'full_width' => true,
66 66
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
67
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
67
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
68 68
 				'value' => 'any',
69 69
 				'class' => 'hide-if-js',
70 70
 				'options' => array(
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
 			// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
85 85
 			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
86
-			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
86
+			add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
87 87
 			add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
88 88
 
89 89
 			// ajax - get the searchable fields
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
226 226
 		$script_source = empty( $script_min ) ? '/source' : '';
227 227
 
228
-		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 );
228
+		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 );
229 229
 
230 230
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
231 231
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
248 248
 	 */
249 249
 	public function register_no_conflict( $allowed ) {
250
-		$allowed[] = 'gravityview_searchwidget_admin';
250
+		$allowed[ ] = 'gravityview_searchwidget_admin';
251 251
 		return $allowed;
252 252
 	}
253 253
 
@@ -259,24 +259,24 @@  discard block
 block discarded – undo
259 259
 	 */
260 260
 	public static function get_searchable_fields() {
261 261
 
262
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
262
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
263 263
 			exit( '0' );
264 264
 		}
265 265
 
266 266
 		$form = '';
267 267
 
268 268
 		// Fetch the form for the current View
269
-		if ( ! empty( $_POST['view_id'] ) ) {
269
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
270 270
 
271
-			$form = gravityview_get_form_id( $_POST['view_id'] );
271
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
272 272
 
273
-		} elseif ( ! empty( $_POST['formid'] ) ) {
273
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
274 274
 
275
-			$form = (int) $_POST['formid'];
275
+			$form = (int)$_POST[ 'formid' ];
276 276
 
277
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
277
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
278 278
 
279
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
279
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
280 280
 
281 281
 		}
282 282
 
@@ -326,14 +326,14 @@  discard block
 block discarded – undo
326 326
 		);
327 327
 
328 328
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
329
-			$custom_fields['is_approved'] = array(
329
+			$custom_fields[ 'is_approved' ] = array(
330 330
 				'text' => esc_html__( 'Approval Status', 'gravityview' ),
331 331
 				'type' => 'multi',
332 332
 			);
333 333
 		}
334 334
 
335
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
336
-			$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'] );
335
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
336
+			$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' ] );
337 337
 		}
338 338
 
339 339
 		// Get fields with sub-inputs and no parent
@@ -355,13 +355,13 @@  discard block
 block discarded – undo
355 355
 
356 356
 			foreach ( $fields as $id => $field ) {
357 357
 
358
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
358
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
359 359
 					continue;
360 360
 				}
361 361
 
362
-				$types = self::get_search_input_types( $id, $field['type'] );
362
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
363 363
 
364
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
364
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
365 365
 			}
366 366
 		}
367 367
 
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
385 385
 
386 386
 		// @todo - This needs to be improved - many fields have . including products and addresses
387
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
387
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
388 388
 			$input_type = 'boolean'; // on/off checkbox
389 389
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
390 390
 			$input_type = 'multi'; //multiselect
@@ -430,19 +430,19 @@  discard block
 block discarded – undo
430 430
 			$post_id = 0;
431 431
 
432 432
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
433
-			if ( ! empty( $widget_args['post_id'] ) ) {
434
-				$post_id = absint( $widget_args['post_id'] );
433
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
434
+				$post_id = absint( $widget_args[ 'post_id' ] );
435 435
 			}
436 436
 			// We're in the WordPress Widget context, and the base View ID should be used
437
-			else if ( ! empty( $widget_args['view_id'] ) ) {
438
-				$post_id = absint( $widget_args['view_id'] );
437
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
438
+				$post_id = absint( $widget_args[ 'view_id' ] );
439 439
 			}
440 440
 
441 441
 			$args = gravityview_get_permalink_query_args( $post_id );
442 442
 
443 443
 			// Add hidden fields to the search form
444 444
 			foreach ( $args as $key => $value ) {
445
-				$search_fields[] = array(
445
+				$search_fields[ ] = array(
446 446
 					'name'  => $key,
447 447
 					'input' => 'hidden',
448 448
 					'value' => $value,
@@ -481,28 +481,28 @@  discard block
 block discarded – undo
481 481
 		/**
482 482
 		 * Include the sidebar Widgets.
483 483
 		 */
484
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
484
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
485 485
 
486 486
 		foreach ( $widgets as $widget ) {
487
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
488
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
487
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
488
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
489 489
 					foreach ( $_fields as $field ) {
490
-						if ( empty( $field['form_id'] ) ) {
491
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
490
+						if ( empty( $field[ 'form_id' ] ) ) {
491
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
492 492
 						}
493
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
493
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
494 494
 					}
495 495
 				}
496 496
 			}
497 497
 		}
498 498
 
499 499
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
500
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
500
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
501 501
 				foreach ( $_fields as $field ) {
502
-					if ( empty( $field['form_id'] ) ) {
503
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
502
+					if ( empty( $field[ 'form_id' ] ) ) {
503
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
504 504
 					}
505
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
505
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
506 506
 				}
507 507
 			}
508 508
 		}
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
541 541
 		}
542 542
 
543
-		if( 'post' === $this->search_method ) {
543
+		if ( 'post' === $this->search_method ) {
544 544
 			$get = $_POST;
545 545
 		} else {
546 546
 			$get = $_GET;
@@ -559,15 +559,15 @@  discard block
 block discarded – undo
559 559
 		$get = gv_map_deep( $get, 'rawurldecode' );
560 560
 
561 561
 		// Make sure array key is set up
562
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
562
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
563 563
 
564 564
 		$searchable_fields = $this->get_view_searchable_fields( $view );
565 565
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
566 566
 
567 567
 		// add free search
568
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
568
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
569 569
 
570
-			$search_all_value = trim( $get['gv_search'] );
570
+			$search_all_value = trim( $get[ 'gv_search' ] );
571 571
 
572 572
 			/**
573 573
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 			}
593 593
 
594 594
 			foreach ( $words as $word ) {
595
-				$search_criteria['field_filters'][] = array(
595
+				$search_criteria[ 'field_filters' ][ ] = array(
596 596
 					'key' => null, // The field ID to search
597 597
 					'value' => $word, // The value to search
598 598
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -605,14 +605,14 @@  discard block
 block discarded – undo
605 605
 			/**
606 606
 			 * Get and normalize the dates according to the input format.
607 607
 			 */
608
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
609
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
608
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
609
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
610 610
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
611 611
 				}
612 612
 			}
613 613
 
614
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
615
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
614
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
615
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
616 616
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
617 617
 				}
618 618
 			}
@@ -647,22 +647,22 @@  discard block
 block discarded – undo
647 647
 			 */
648 648
 			if ( ! empty( $curr_start ) ) {
649 649
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
650
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
650
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
651 651
 			}
652 652
 
653 653
 			if ( ! empty( $curr_end ) ) {
654 654
 				// Fast-forward 24 hour on the end time
655 655
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
656
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
657
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
658
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
656
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
657
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
658
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
659 659
 				}
660 660
 			}
661 661
 		}
662 662
 
663 663
 		// search for a specific entry ID
664 664
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
665
-			$search_criteria['field_filters'][] = array(
665
+			$search_criteria[ 'field_filters' ][ ] = array(
666 666
 				'key' => 'id',
667 667
 				'value' => absint( $get[ 'gv_id' ] ),
668 668
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -671,20 +671,20 @@  discard block
 block discarded – undo
671 671
 
672 672
 		// search for a specific Created_by ID
673 673
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
674
-			$search_criteria['field_filters'][] = array(
674
+			$search_criteria[ 'field_filters' ][ ] = array(
675 675
 				'key' => 'created_by',
676
-				'value' => $get['gv_by'],
676
+				'value' => $get[ 'gv_by' ],
677 677
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
678 678
 			);
679 679
 		}
680 680
 
681 681
 		// Get search mode passed in URL
682
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
682
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
683 683
 
684 684
 		// get the other search filters
685 685
 		foreach ( $get as $key => $value ) {
686 686
 
687
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
687
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
688 688
 				continue; // Not a filter, or empty
689 689
 			}
690 690
 
@@ -698,19 +698,19 @@  discard block
 block discarded – undo
698 698
 				continue;
699 699
 			}
700 700
 
701
-			if ( ! isset( $filter['operator'] ) ) {
702
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
701
+			if ( ! isset( $filter[ 'operator' ] ) ) {
702
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
703 703
 			}
704 704
 
705
-			if ( isset( $filter[0]['value'] ) ) {
706
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
705
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
706
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
707 707
 
708 708
 				// if date range type, set search mode to ALL
709
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
709
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
710 710
 					$mode = 'all';
711 711
 				}
712
-			} elseif( !empty( $filter ) ) {
713
-				$search_criteria['field_filters'][] = $filter;
712
+			} elseif ( ! empty( $filter ) ) {
713
+				$search_criteria[ 'field_filters' ][ ] = $filter;
714 714
 			}
715 715
 		}
716 716
 
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 		 * @since 1.5.1
720 720
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
721 721
 		 */
722
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
722
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
723 723
 
724 724
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
725 725
 
@@ -753,19 +753,19 @@  discard block
 block discarded – undo
753 753
 
754 754
 		$query_class = $view->get_query_class();
755 755
 
756
-		if ( empty( $search_criteria['field_filters'] ) ) {
756
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
757 757
 			return;
758 758
 		}
759 759
 
760 760
 		$widgets = $view->widgets->by_id( $this->widget_id );
761 761
 		if ( $widgets->count() ) {
762 762
 			$widgets = $widgets->all();
763
-			$widget  = $widgets[0];
763
+			$widget  = $widgets[ 0 ];
764 764
 
765 765
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
766 766
 
767
-			foreach ( (array) $search_fields as $search_field ) {
768
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
767
+			foreach ( (array)$search_fields as $search_field ) {
768
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
769 769
 					$created_by_text_mode = true;
770 770
 				}
771 771
 			}
@@ -774,7 +774,7 @@  discard block
 block discarded – undo
774 774
 		$extra_conditions = array();
775 775
 		$mode = 'any';
776 776
 
777
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
777
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
778 778
 			if ( ! is_array( $filter ) ) {
779 779
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
780 780
 					$mode = $filter;
@@ -783,13 +783,13 @@  discard block
 block discarded – undo
783 783
 			}
784 784
 
785 785
 			// Construct a manual query for unapproved statuses
786
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
787
-				$_tmp_query       = new $query_class( $view->form->ID, array(
786
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
787
+				$_tmp_query = new $query_class( $view->form->ID, array(
788 788
 					'field_filters' => array(
789 789
 						array(
790 790
 							'operator' => 'in',
791 791
 							'key'      => 'is_approved',
792
-							'value'    => (array) $filter['value'],
792
+							'value'    => (array)$filter[ 'value' ],
793 793
 						),
794 794
 						array(
795 795
 							'operator' => 'is',
@@ -801,30 +801,30 @@  discard block
 block discarded – undo
801 801
 				) );
802 802
 				$_tmp_query_parts = $_tmp_query->_introspect();
803 803
 
804
-				$extra_conditions[] = $_tmp_query_parts['where'];
804
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
805 805
 
806 806
 				$filter = false;
807 807
 				continue;
808 808
 			}
809 809
 
810 810
 			// Construct manual query for text mode creator search
811
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
812
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
811
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
812
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
813 813
 				$filter = false;
814 814
 				continue;
815 815
 			}
816 816
 
817 817
 			// By default, we want searches to be wildcard for each field.
818
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
818
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
819 819
 
820 820
 			// For multichoice, let's have an in (OR) search.
821
-			if ( is_array( $filter['value'] ) ) {
822
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
821
+			if ( is_array( $filter[ 'value' ] ) ) {
822
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
823 823
 			}
824 824
 
825 825
 			// Default form with joins functionality
826
-			if ( empty( $filter['form_id'] ) ) {
827
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
826
+			if ( empty( $filter[ 'form_id' ] ) ) {
827
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
828 828
 			}
829 829
 
830 830
 			/**
@@ -834,28 +834,28 @@  discard block
 block discarded – undo
834 834
 			 * @since develop
835 835
 			 * @param \GV\View $view The View we're operating on.
836 836
 			 */
837
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
837
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
838 838
 		}
839 839
 
840
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
840
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
841 841
 			$date_criteria = array();
842 842
 
843
-			if ( isset( $search_criteria['start_date'] ) ) {
844
-				$date_criteria['start_date'] = $search_criteria['start_date'];
843
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
844
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
845 845
 			}
846 846
 
847
-			if ( isset( $search_criteria['end_date'] ) ) {
848
-				$date_criteria['end_date'] = $search_criteria['end_date'];
847
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
848
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
849 849
 			}
850 850
 
851 851
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
852 852
 			$_tmp_query_parts   = $_tmp_query->_introspect();
853
-			$extra_conditions[] = $_tmp_query_parts['where'];
853
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
854 854
 		}
855 855
 
856 856
 		$search_conditions = array();
857 857
 
858
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
858
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
859 859
 			foreach ( $filters as &$filter ) {
860 860
 				if ( ! is_array( $filter ) ) {
861 861
 					continue;
@@ -867,12 +867,12 @@  discard block
 block discarded – undo
867 867
 				 * code by reusing what's inside GF_Query already as they
868 868
 				 * take care of many small things like forcing numeric, etc.
869 869
 				 */
870
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
870
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
871 871
 				$_tmp_query_parts = $_tmp_query->_introspect();
872
-				$search_condition = $_tmp_query_parts['where'];
872
+				$search_condition = $_tmp_query_parts[ 'where' ];
873 873
 
874
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
875
-					$search_conditions[] = $search_condition;
874
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
875
+					$search_conditions[ ] = $search_condition;
876 876
 				} else {
877 877
 					$left = $search_condition->left;
878 878
 					$alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' );
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 							$on = $_join->join_on;
883 883
 							$join = $_join->join;
884 884
 
885
-							$search_conditions[] = GF_Query_Condition::_or(
885
+							$search_conditions[ ] = GF_Query_Condition::_or(
886 886
 								// Join
887 887
 								new GF_Query_Condition(
888 888
 									new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
 							);
899 899
 						}
900 900
 					} else {
901
-						$search_conditions[] = new GF_Query_Condition(
901
+						$search_conditions[ ] = new GF_Query_Condition(
902 902
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
903 903
 							$search_condition->operator,
904 904
 							$search_condition->right
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
920 920
 		/**
921 921
 		 * Combine the parts as a new WHERE clause.
922 922
 		 */
923
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
923
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
924 924
 		$query->where( $where );
925 925
 	}
926 926
 
@@ -943,7 +943,7 @@  discard block
 block discarded – undo
943 943
 		$field_id = str_replace( 'filter_', '', $key );
944 944
 
945 945
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
946
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
946
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
947 947
 			$field_id = str_replace( '_', '.', $field_id );
948 948
 		}
949 949
 
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 			// form is in searchable fields
1001 1001
 			$found = false;
1002 1002
 			foreach ( $searchable_fields as $field ) {
1003
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
1003
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
1004 1004
 					$found = true;
1005 1005
 					break;
1006 1006
 				}
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
 
1041 1041
 			case 'select':
1042 1042
 			case 'radio':
1043
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1043
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1044 1044
 				break;
1045 1045
 
1046 1046
 			case 'post_category':
@@ -1054,7 +1054,7 @@  discard block
 block discarded – undo
1054 1054
 
1055 1055
 				foreach ( $value as $val ) {
1056 1056
 					$cat = get_term( $val, 'category' );
1057
-					$filter[] = array(
1057
+					$filter[ ] = array(
1058 1058
 						'key'      => $field_id,
1059 1059
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
1060 1060
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
1073 1073
 				$filter = array();
1074 1074
 
1075 1075
 				foreach ( $value as $val ) {
1076
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
1076
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
1077 1077
 				}
1078 1078
 
1079 1079
 				break;
@@ -1082,9 +1082,9 @@  discard block
 block discarded – undo
1082 1082
 				// convert checkbox on/off into the correct search filter
1083 1083
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
1084 1084
 					foreach ( $form_field->inputs as $k => $input ) {
1085
-						if ( $input['id'] == $field_id ) {
1086
-							$filter['value'] = $form_field->choices[ $k ]['value'];
1087
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1085
+						if ( $input[ 'id' ] == $field_id ) {
1086
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
1087
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1088 1088
 							break;
1089 1089
 						}
1090 1090
 					}
@@ -1094,7 +1094,7 @@  discard block
 block discarded – undo
1094 1094
 					$filter = array();
1095 1095
 
1096 1096
 					foreach ( $value as $val ) {
1097
-						$filter[] = array(
1097
+						$filter[ ] = array(
1098 1098
 							'key'      => $field_id,
1099 1099
 							'value'    => $val,
1100 1100
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1115,9 +1115,9 @@  discard block
 block discarded – undo
1115 1115
 					foreach ( $words as $word ) {
1116 1116
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
1117 1117
 							// Keep the same key for each filter
1118
-							$filter['value'] = $word;
1118
+							$filter[ 'value' ] = $word;
1119 1119
 							// Add a search for the value
1120
-							$filters[] = $filter;
1120
+							$filters[ ] = $filter;
1121 1121
 						}
1122 1122
 					}
1123 1123
 
@@ -1131,19 +1131,19 @@  discard block
 block discarded – undo
1131 1131
 
1132 1132
 					foreach ( $searchable_fields as $searchable_field ) {
1133 1133
 
1134
-						if( $form_field->ID !== $searchable_field['field'] ) {
1134
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
1135 1135
 							continue;
1136 1136
 						}
1137 1137
 
1138 1138
 						// Only exact-match dropdowns, not text search
1139
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
1139
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
1140 1140
 							continue;
1141 1141
 						}
1142 1142
 
1143 1143
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
1144 1144
 
1145 1145
 						if ( 4 === $input_id ) {
1146
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1146
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1147 1147
 						};
1148 1148
 					}
1149 1149
 				}
@@ -1171,12 +1171,12 @@  discard block
 block discarded – undo
1171 1171
 						 * @since 1.16.3
1172 1172
 						 * Safeguard until GF implements '<=' operator
1173 1173
 						 */
1174
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
1174
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
1175 1175
 							$operator = '<';
1176 1176
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
1177 1177
 						}
1178 1178
 
1179
-						$filter[] = array(
1179
+						$filter[ ] = array(
1180 1180
 							'key'      => $field_id,
1181 1181
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
1182 1182
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1184,12 +1184,12 @@  discard block
 block discarded – undo
1184 1184
 					}
1185 1185
 				} else {
1186 1186
 					$date = $value;
1187
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
1188
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1187
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
1188
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1189 1189
 				}
1190 1190
 
1191
-				if ('payment_date' === $key) {
1192
-					$filter['operator'] = 'contains';
1191
+				if ( 'payment_date' === $key ) {
1192
+					$filter[ 'operator' ] = 'contains';
1193 1193
 				}
1194 1194
 
1195 1195
 				break;
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
1218 1218
 			'ymd_dot' => 'Y.m.d',
1219 1219
 		);
1220 1220
 
1221
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
1221
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
1222 1222
 			$format = $datepicker[ $field->dateFormat ];
1223 1223
 		}
1224 1224
 
@@ -1255,7 +1255,7 @@  discard block
 block discarded – undo
1255 1255
 	public function add_template_path( $file_paths ) {
1256 1256
 
1257 1257
 		// Index 100 is the default GravityView template path.
1258
-		$file_paths[102] = self::$file . 'templates/';
1258
+		$file_paths[ 102 ] = self::$file . 'templates/';
1259 1259
 
1260 1260
 		return $file_paths;
1261 1261
 	}
@@ -1274,7 +1274,7 @@  discard block
 block discarded – undo
1274 1274
 		$has_date = false;
1275 1275
 
1276 1276
 		foreach ( $search_fields as $k => $field ) {
1277
-			if ( in_array( $field['input'], array( 'date', 'date_range', 'entry_date' ) ) ) {
1277
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range', 'entry_date' ) ) ) {
1278 1278
 				$has_date = true;
1279 1279
 				break;
1280 1280
 			}
@@ -1303,7 +1303,7 @@  discard block
 block discarded – undo
1303 1303
 		$view = \GV\View::by_id( $gravityview_view->view_id );
1304 1304
 
1305 1305
 		// get configured search fields
1306
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
1306
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
1307 1307
 
1308 1308
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
1309 1309
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1317,40 +1317,40 @@  discard block
 block discarded – undo
1317 1317
 
1318 1318
 			$updated_field = $this->get_search_filter_details( $updated_field, $context );
1319 1319
 
1320
-			switch ( $field['field'] ) {
1320
+			switch ( $field[ 'field' ] ) {
1321 1321
 
1322 1322
 				case 'search_all':
1323
-					$updated_field['key'] = 'search_all';
1324
-					$updated_field['input'] = 'search_all';
1325
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
1323
+					$updated_field[ 'key' ] = 'search_all';
1324
+					$updated_field[ 'input' ] = 'search_all';
1325
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
1326 1326
 					break;
1327 1327
 
1328 1328
 				case 'entry_date':
1329
-					$updated_field['key'] = 'entry_date';
1330
-					$updated_field['input'] = 'entry_date';
1331
-					$updated_field['value'] = array(
1329
+					$updated_field[ 'key' ] = 'entry_date';
1330
+					$updated_field[ 'input' ] = 'entry_date';
1331
+					$updated_field[ 'value' ] = array(
1332 1332
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
1333 1333
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
1334 1334
 					);
1335 1335
 					break;
1336 1336
 
1337 1337
 				case 'entry_id':
1338
-					$updated_field['key'] = 'entry_id';
1339
-					$updated_field['input'] = 'entry_id';
1340
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
1338
+					$updated_field[ 'key' ] = 'entry_id';
1339
+					$updated_field[ 'input' ] = 'entry_id';
1340
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
1341 1341
 					break;
1342 1342
 
1343 1343
 				case 'created_by':
1344
-					$updated_field['key'] = 'created_by';
1345
-					$updated_field['name'] = 'gv_by';
1346
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
1347
-					$updated_field['choices'] = self::get_created_by_choices( $view );
1344
+					$updated_field[ 'key' ] = 'created_by';
1345
+					$updated_field[ 'name' ] = 'gv_by';
1346
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
1347
+					$updated_field[ 'choices' ] = self::get_created_by_choices( $view );
1348 1348
 					break;
1349 1349
 
1350 1350
 				case 'is_approved':
1351
-					$updated_field['key'] = 'is_approved';
1352
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
1353
-					$updated_field['choices'] = self::get_is_approved_choices();
1351
+					$updated_field[ 'key' ] = 'is_approved';
1352
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
1353
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
1354 1354
 					break;
1355 1355
 			}
1356 1356
 
@@ -1371,16 +1371,16 @@  discard block
 block discarded – undo
1371 1371
 
1372 1372
 		$gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args );
1373 1373
 
1374
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
1374
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
1375 1375
 
1376 1376
 		/** @since 1.14 */
1377
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
1377
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
1378 1378
 
1379
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
1379
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
1380 1380
 
1381 1381
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
1382 1382
 
1383
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
1383
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
1384 1384
 
1385 1385
 		if ( $this->has_date_field( $search_fields ) ) {
1386 1386
 			// enqueue datepicker stuff only if needed!
@@ -1402,10 +1402,10 @@  discard block
 block discarded – undo
1402 1402
 	public static function get_search_class( $custom_class = '' ) {
1403 1403
 		$gravityview_view = GravityView_View::getInstance();
1404 1404
 
1405
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
1405
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
1406 1406
 
1407
-		if ( ! empty( $custom_class )  ) {
1408
-			$search_class .= ' '.$custom_class;
1407
+		if ( ! empty( $custom_class ) ) {
1408
+			$search_class .= ' ' . $custom_class;
1409 1409
 		}
1410 1410
 
1411 1411
 		/**
@@ -1456,9 +1456,9 @@  discard block
 block discarded – undo
1456 1456
 
1457 1457
 		if ( ! $label ) {
1458 1458
 
1459
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
1459
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
1460 1460
 
1461
-			switch( $field['field'] ) {
1461
+			switch ( $field[ 'field' ] ) {
1462 1462
 				case 'search_all':
1463 1463
 					$label = __( 'Search Entries:', 'gravityview' );
1464 1464
 					break;
@@ -1470,10 +1470,10 @@  discard block
 block discarded – undo
1470 1470
 					break;
1471 1471
 				default:
1472 1472
 					// If this is a field input, not a field
1473
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
1473
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
1474 1474
 
1475 1475
 						// Get the label for the field in question, which returns an array
1476
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
1476
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
1477 1477
 
1478 1478
 						// Get the item with the `label` key
1479 1479
 						$values = wp_list_pluck( $items, 'label' );
@@ -1514,13 +1514,13 @@  discard block
 block discarded – undo
1514 1514
 		$form = $gravityview_view->getForm();
1515 1515
 
1516 1516
 		// for advanced field ids (eg, first name / last name )
1517
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
1517
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
1518 1518
 
1519 1519
 		// get searched value from $_GET/$_POST (string or array)
1520 1520
 		$value = $this->rgget_or_rgpost( $name );
1521 1521
 
1522 1522
 		// get form field details
1523
-		$form_field = gravityview_get_field( $form, $field['field'] );
1523
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
1524 1524
 
1525 1525
 		$form_field_type = \GV\Utils::get( $form_field, 'type' );
1526 1526
 
@@ -1534,17 +1534,17 @@  discard block
 block discarded – undo
1534 1534
 		);
1535 1535
 
1536 1536
 		// collect choices
1537
-		if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
1538
-			$filter['choices'] = gravityview_get_terms_choices();
1539
-		} elseif ( ! empty( $form_field['choices'] ) ) {
1540
-			$filter['choices'] = $form_field['choices'];
1537
+		if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
1538
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
1539
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
1540
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
1541 1541
 		}
1542 1542
 
1543
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
1544
-			$filter['value'] = array( 'start' => '', 'end' => '' );
1543
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
1544
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
1545 1545
 		}
1546 1546
 
1547
-		if ( ! empty( $filter['choices'] ) ) {
1547
+		if ( ! empty( $filter[ 'choices' ] ) ) {
1548 1548
 			/**
1549 1549
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
1550 1550
 			 * @param[in,out] bool Yes or no.
@@ -1552,7 +1552,7 @@  discard block
 block discarded – undo
1552 1552
 			 * @param \GV\Context The context.
1553 1553
 			 */
1554 1554
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
1555
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
1555
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
1556 1556
 			}
1557 1557
 		}
1558 1558
 
@@ -1581,11 +1581,11 @@  discard block
 block discarded – undo
1581 1581
 	 * @return array The filter choices.
1582 1582
 	 */
1583 1583
 	private function sieve_filter_choices( $filter, $context ) {
1584
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
1584
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
1585 1585
 			return $filter; // @todo Populate plugins might give us empty choices
1586 1586
 		}
1587 1587
 
1588
-		if ( ! is_numeric( $filter['key'] ) ) {
1588
+		if ( ! is_numeric( $filter[ 'key' ] ) ) {
1589 1589
 			return $filter;
1590 1590
 		}
1591 1591
 
@@ -1595,29 +1595,29 @@  discard block
 block discarded – undo
1595 1595
 
1596 1596
 		$table = GFFormsModel::get_entry_meta_table_name();
1597 1597
 
1598
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
1598
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
1599 1599
 
1600 1600
 		switch ( \GV\Utils::get( $filter, 'type' ) ):
1601 1601
 			case 'post_category':
1602 1602
 				$choices = $wpdb->get_col( $wpdb->prepare(
1603 1603
 					"SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1604
-					$key_like, $filter['key'], $form_id
1604
+					$key_like, $filter[ 'key' ], $form_id
1605 1605
 				) );
1606 1606
 				break;
1607 1607
 			default:
1608 1608
 				$choices = $wpdb->get_col( $wpdb->prepare(
1609 1609
 					"SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1610
-					$key_like, $filter['key'], $form_id
1610
+					$key_like, $filter[ 'key' ], $form_id
1611 1611
 				) );
1612 1612
 
1613
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
1613
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
1614 1614
 					$choices = array_map( 'json_decode', $choices );
1615 1615
 					$_choices_array = array();
1616 1616
 					foreach ( $choices as $choice ) {
1617 1617
 						if ( is_array( $choice ) ) {
1618 1618
 							$_choices_array = array_merge( $_choices_array, $choice );
1619 1619
 						} else {
1620
-							$_choices_array []= $choice;
1620
+							$_choices_array [ ] = $choice;
1621 1621
 						}
1622 1622
 					}
1623 1623
 					$choices = array_unique( $_choices_array );
@@ -1627,9 +1627,9 @@  discard block
 block discarded – undo
1627 1627
 		endswitch;
1628 1628
 
1629 1629
 		$filter_choices = array();
1630
-		foreach ( $filter['choices'] as $choice ) {
1631
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
1632
-				$filter_choices[] = $choice;
1630
+		foreach ( $filter[ 'choices' ] as $choice ) {
1631
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
1632
+				$filter_choices[ ] = $choice;
1633 1633
 			}
1634 1634
 		}
1635 1635
 
@@ -1664,7 +1664,7 @@  discard block
 block discarded – undo
1664 1664
 			 * @param \GV\View $view The view.
1665 1665
 			 */
1666 1666
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
1667
-			$choices[] = array(
1667
+			$choices[ ] = array(
1668 1668
 				'value' => $user->ID,
1669 1669
 				'text' => $text,
1670 1670
 			);
@@ -1684,9 +1684,9 @@  discard block
 block discarded – undo
1684 1684
 
1685 1685
 		$choices = array();
1686 1686
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
1687
-			$choices[] = array(
1688
-				'value' => $status['value'],
1689
-				'text' => $status['label'],
1687
+			$choices[ ] = array(
1688
+				'value' => $status[ 'value' ],
1689
+				'text' => $status[ 'label' ],
1690 1690
 			);
1691 1691
 		}
1692 1692
 
@@ -1738,7 +1738,7 @@  discard block
 block discarded – undo
1738 1738
 	 */
1739 1739
 	public function add_datepicker_js_dependency( $js_dependencies ) {
1740 1740
 
1741
-		$js_dependencies[] = 'jquery-ui-datepicker';
1741
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
1742 1742
 
1743 1743
 		return $js_dependencies;
1744 1744
 	}
@@ -1782,7 +1782,7 @@  discard block
 block discarded – undo
1782 1782
 			'isRTL'             => is_rtl(),
1783 1783
 		), $view_data );
1784 1784
 
1785
-		$localizations['datepicker'] = $datepicker_settings;
1785
+		$localizations[ 'datepicker' ] = $datepicker_settings;
1786 1786
 
1787 1787
 		return $localizations;
1788 1788
 
@@ -1809,7 +1809,7 @@  discard block
 block discarded – undo
1809 1809
 	 * @return void
1810 1810
 	 */
1811 1811
 	private function maybe_enqueue_flexibility() {
1812
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
1812
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
1813 1813
 			wp_enqueue_script( 'gv-flexibility' );
1814 1814
 		}
1815 1815
 	}
@@ -1831,7 +1831,7 @@  discard block
 block discarded – undo
1831 1831
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
1832 1832
 
1833 1833
 		$scheme = is_ssl() ? 'https://' : 'http://';
1834
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1834
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1835 1835
 
1836 1836
 		/**
1837 1837
 		 * @filter `gravityview_search_datepicker_class`
@@ -1910,7 +1910,7 @@  discard block
 block discarded – undo
1910 1910
 	public function add_preview_inputs() {
1911 1911
 		global $wp;
1912 1912
 
1913
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
1913
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
1914 1914
 			return;
1915 1915
 		}
1916 1916
 
@@ -1962,7 +1962,7 @@  discard block
 block discarded – undo
1962 1962
  */
1963 1963
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
1964 1964
 	public function __construct( $filter, $view ) {
1965
-		$this->value = $filter['value'];
1965
+		$this->value = $filter[ 'value' ];
1966 1966
 		$this->view = $view;
1967 1967
 	}
1968 1968
 
@@ -1994,11 +1994,11 @@  discard block
 block discarded – undo
1994 1994
 		$conditions = array();
1995 1995
 
1996 1996
 		foreach ( $user_fields as $user_field ) {
1997
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
1997
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
1998 1998
 		}
1999 1999
 
2000 2000
 		foreach ( $user_meta_fields as $meta_field ) {
2001
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
2001
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
2002 2002
 		}
2003 2003
 
2004 2004
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';
Please login to merge, or discard this patch.