Completed
Push — develop ( abc512...a6f2a8 )
by Gennady
16:18
created
includes/widgets/search-widget/class-search-widget.php 1 patch
Spacing   +175 added lines, -175 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
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
228 228
 		$script_source = empty( $script_min ) ? '/source' : '';
229 229
 
230
-		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 );
230
+		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 );
231 231
 
232 232
 		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
233 233
 			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 	 * @return array Scripts allowed in no-conflict mode, plus the search widget script
250 250
 	 */
251 251
 	public function register_no_conflict( $allowed ) {
252
-		$allowed[] = 'gravityview_searchwidget_admin';
252
+		$allowed[ ] = 'gravityview_searchwidget_admin';
253 253
 		return $allowed;
254 254
 	}
255 255
 
@@ -262,24 +262,24 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function get_searchable_fields() {
264 264
 
265
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
265
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
266 266
 			exit( '0' );
267 267
 		}
268 268
 
269 269
 		$form = '';
270 270
 
271 271
 		// Fetch the form for the current View
272
-		if ( ! empty( $_POST['view_id'] ) ) {
272
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
273 273
 
274
-			$form = gravityview_get_form_id( $_POST['view_id'] );
274
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
275 275
 
276
-		} elseif ( ! empty( $_POST['formid'] ) ) {
276
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
277 277
 
278
-			$form = (int) $_POST['formid'];
278
+			$form = (int)$_POST[ 'formid' ];
279 279
 
280
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
280
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
281 281
 
282
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
282
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
283 283
 
284 284
 		}
285 285
 
@@ -329,14 +329,14 @@  discard block
 block discarded – undo
329 329
 		);
330 330
 
331 331
 		if ( gravityview()->plugin->supports( \GV\Plugin::FEATURE_GFQUERY ) ) {
332
-			$custom_fields['is_approved'] = array(
332
+			$custom_fields[ 'is_approved' ] = array(
333 333
 				'text' => esc_html__( 'Approval Status', 'gravityview' ),
334 334
 				'type' => 'multi',
335 335
 			);
336 336
 		}
337 337
 
338
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
339
-			$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'] );
338
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
339
+			$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' ] );
340 340
 		}
341 341
 
342 342
 		// Get fields with sub-inputs and no parent
@@ -358,13 +358,13 @@  discard block
 block discarded – undo
358 358
 
359 359
 			foreach ( $fields as $id => $field ) {
360 360
 
361
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
361
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
362 362
 					continue;
363 363
 				}
364 364
 
365
-				$types = self::get_search_input_types( $id, $field['type'] );
365
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
366 366
 
367
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
367
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
368 368
 			}
369 369
 		}
370 370
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
 	public static function get_search_input_types( $field_id = '', $field_type = null ) {
388 388
 
389 389
 		// @todo - This needs to be improved - many fields have . including products and addresses
390
-		if ( false !== strpos( (string) $field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
390
+		if ( false !== strpos( (string)$field_id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $field_id, array( 'is_fulfilled' ) ) ) {
391 391
 			$input_type = 'boolean'; // on/off checkbox
392 392
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
393 393
 			$input_type = 'multi'; //multiselect
@@ -433,19 +433,19 @@  discard block
 block discarded – undo
433 433
 			$post_id = 0;
434 434
 
435 435
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
436
-			if ( ! empty( $widget_args['post_id'] ) ) {
437
-				$post_id = absint( $widget_args['post_id'] );
436
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
437
+				$post_id = absint( $widget_args[ 'post_id' ] );
438 438
 			}
439 439
 			// We're in the WordPress Widget context, and the base View ID should be used
440
-			else if ( ! empty( $widget_args['view_id'] ) ) {
441
-				$post_id = absint( $widget_args['view_id'] );
440
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
441
+				$post_id = absint( $widget_args[ 'view_id' ] );
442 442
 			}
443 443
 
444 444
 			$args = gravityview_get_permalink_query_args( $post_id );
445 445
 
446 446
 			// Add hidden fields to the search form
447 447
 			foreach ( $args as $key => $value ) {
448
-				$search_fields[] = array(
448
+				$search_fields[ ] = array(
449 449
 					'name'  => $key,
450 450
 					'input' => 'hidden',
451 451
 					'value' => $value,
@@ -484,28 +484,28 @@  discard block
 block discarded – undo
484 484
 		/**
485 485
 		 * Include the sidebar Widgets.
486 486
 		 */
487
-		$widgets = (array) get_option( 'widget_gravityview_search', array() );
487
+		$widgets = (array)get_option( 'widget_gravityview_search', array() );
488 488
 
489 489
 		foreach ( $widgets as $widget ) {
490
-			if ( ! empty( $widget['view_id'] ) && $widget['view_id'] == $view->ID ) {
491
-				if( $_fields = json_decode( $widget['search_fields'], true ) ) {
490
+			if ( ! empty( $widget[ 'view_id' ] ) && $widget[ 'view_id' ] == $view->ID ) {
491
+				if ( $_fields = json_decode( $widget[ 'search_fields' ], true ) ) {
492 492
 					foreach ( $_fields as $field ) {
493
-						if ( empty( $field['form_id'] ) ) {
494
-							$field['form_id'] = $view->form ? $view->form->ID : 0;
493
+						if ( empty( $field[ 'form_id' ] ) ) {
494
+							$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
495 495
 						}
496
-						$searchable_fields[] = $with_full_field ? $field : $field['field'];
496
+						$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
497 497
 					}
498 498
 				}
499 499
 			}
500 500
 		}
501 501
 
502 502
 		foreach ( $view->widgets->by_id( $this->get_widget_id() )->all() as $widget ) {
503
-			if( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
503
+			if ( $_fields = json_decode( $widget->configuration->get( 'search_fields' ), true ) ) {
504 504
 				foreach ( $_fields as $field ) {
505
-					if ( empty( $field['form_id'] ) ) {
506
-						$field['form_id'] = $view->form ? $view->form->ID : 0;
505
+					if ( empty( $field[ 'form_id' ] ) ) {
506
+						$field[ 'form_id' ] = $view->form ? $view->form->ID : 0;
507 507
 					}
508
-					$searchable_fields[] = $with_full_field ? $field : $field['field'];
508
+					$searchable_fields[ ] = $with_full_field ? $field : $field[ 'field' ];
509 509
 				}
510 510
 			}
511 511
 		}
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
 			return $search_criteria; // Return the original criteria, GF_Query modification kicks in later
544 544
 		}
545 545
 
546
-		if( 'post' === $this->search_method ) {
546
+		if ( 'post' === $this->search_method ) {
547 547
 			$get = $_POST;
548 548
 		} else {
549 549
 			$get = $_GET;
@@ -562,15 +562,15 @@  discard block
 block discarded – undo
562 562
 		$get = gv_map_deep( $get, 'rawurldecode' );
563 563
 
564 564
 		// Make sure array key is set up
565
-		$search_criteria['field_filters'] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
565
+		$search_criteria[ 'field_filters' ] = \GV\Utils::get( $search_criteria, 'field_filters', array() );
566 566
 
567 567
 		$searchable_fields = $this->get_view_searchable_fields( $view );
568 568
 		$searchable_field_objects = $this->get_view_searchable_fields( $view, true );
569 569
 
570 570
 		// add free search
571
-		if ( isset( $get['gv_search'] ) && '' !== $get['gv_search'] && in_array( 'search_all', $searchable_fields ) ) {
571
+		if ( isset( $get[ 'gv_search' ] ) && '' !== $get[ 'gv_search' ] && in_array( 'search_all', $searchable_fields ) ) {
572 572
 
573
-			$search_all_value = trim( $get['gv_search'] );
573
+			$search_all_value = trim( $get[ 'gv_search' ] );
574 574
 
575 575
 			/**
576 576
 			 * @filter `gravityview/search-all-split-words` Search for each word separately or the whole phrase?
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 			}
596 596
 
597 597
 			foreach ( $words as $word ) {
598
-				$search_criteria['field_filters'][] = array(
598
+				$search_criteria[ 'field_filters' ][ ] = array(
599 599
 					'key' => null, // The field ID to search
600 600
 					'value' => $word, // The value to search
601 601
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -608,14 +608,14 @@  discard block
 block discarded – undo
608 608
 			/**
609 609
 			 * Get and normalize the dates according to the input format.
610 610
 			 */
611
-			if ( $curr_start = ! empty( $get['gv_start'] ) ? $get['gv_start'] : '' ) {
612
-				if( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
611
+			if ( $curr_start = ! empty( $get[ 'gv_start' ] ) ? $get[ 'gv_start' ] : '' ) {
612
+				if ( $curr_start_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_start ) ) {
613 613
 					$curr_start = $curr_start_date->format( 'Y-m-d' );
614 614
 				}
615 615
 			}
616 616
 
617
-			if ( $curr_end = ! empty( $get['gv_start'] ) ? ( ! empty( $get['gv_end'] ) ? $get['gv_end'] : '' ) : '' ) {
618
-				if( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
617
+			if ( $curr_end = ! empty( $get[ 'gv_start' ] ) ? ( ! empty( $get[ 'gv_end' ] ) ? $get[ 'gv_end' ] : '' ) : '' ) {
618
+				if ( $curr_end_date = date_create_from_format( $this->get_datepicker_format( true ), $curr_end ) ) {
619 619
 					$curr_end = $curr_end_date->format( 'Y-m-d' );
620 620
 				}
621 621
 			}
@@ -650,22 +650,22 @@  discard block
 block discarded – undo
650 650
 			 */
651 651
 			if ( ! empty( $curr_start ) ) {
652 652
 				$curr_start = date( 'Y-m-d H:i:s', strtotime( $curr_start ) );
653
-				$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
653
+				$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
654 654
 			}
655 655
 
656 656
 			if ( ! empty( $curr_end ) ) {
657 657
 				// Fast-forward 24 hour on the end time
658 658
 				$curr_end = date( 'Y-m-d H:i:s', strtotime( $curr_end ) + DAY_IN_SECONDS );
659
-				$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
660
-				if ( strpos( $search_criteria['end_date'], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
661
-					$search_criteria['end_date'] = date( 'Y-m-d H:i:s', strtotime( $search_criteria['end_date'] ) - 1 );
659
+				$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
660
+				if ( strpos( $search_criteria[ 'end_date' ], '00:00:00' ) ) { // See https://github.com/gravityview/GravityView/issues/1056
661
+					$search_criteria[ 'end_date' ] = date( 'Y-m-d H:i:s', strtotime( $search_criteria[ 'end_date' ] ) - 1 );
662 662
 				}
663 663
 			}
664 664
 		}
665 665
 
666 666
 		// search for a specific entry ID
667 667
 		if ( ! empty( $get[ 'gv_id' ] ) && in_array( 'entry_id', $searchable_fields ) ) {
668
-			$search_criteria['field_filters'][] = array(
668
+			$search_criteria[ 'field_filters' ][ ] = array(
669 669
 				'key' => 'id',
670 670
 				'value' => absint( $get[ 'gv_id' ] ),
671 671
 				'operator' => $this->get_operator( $get, 'gv_id', array( '=' ), '=' ),
@@ -674,20 +674,20 @@  discard block
 block discarded – undo
674 674
 
675 675
 		// search for a specific Created_by ID
676 676
 		if ( ! empty( $get[ 'gv_by' ] ) && in_array( 'created_by', $searchable_fields ) ) {
677
-			$search_criteria['field_filters'][] = array(
677
+			$search_criteria[ 'field_filters' ][ ] = array(
678 678
 				'key' => 'created_by',
679
-				'value' => $get['gv_by'],
679
+				'value' => $get[ 'gv_by' ],
680 680
 				'operator' => $this->get_operator( $get, 'gv_by', array( '=' ), '=' ),
681 681
 			);
682 682
 		}
683 683
 
684 684
 		// Get search mode passed in URL
685
-		$mode = isset( $get['mode'] ) && in_array( $get['mode'], array( 'any', 'all' ) ) ?  $get['mode'] : 'any';
685
+		$mode = isset( $get[ 'mode' ] ) && in_array( $get[ 'mode' ], array( 'any', 'all' ) ) ? $get[ 'mode' ] : 'any';
686 686
 
687 687
 		// get the other search filters
688 688
 		foreach ( $get as $key => $value ) {
689 689
 
690
-			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[0], false, false ) ) ) {
690
+			if ( 0 !== strpos( $key, 'filter_' ) || gv_empty( $value, false, false ) || ( is_array( $value ) && count( $value ) === 1 && gv_empty( $value[ 0 ], false, false ) ) ) {
691 691
 				continue; // Not a filter, or empty
692 692
 			}
693 693
 
@@ -701,19 +701,19 @@  discard block
 block discarded – undo
701 701
 				continue;
702 702
 			}
703 703
 
704
-			if ( ! isset( $filter['operator'] ) ) {
705
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
704
+			if ( ! isset( $filter[ 'operator' ] ) ) {
705
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'contains' ), 'contains' );
706 706
 			}
707 707
 
708
-			if ( isset( $filter[0]['value'] ) ) {
709
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
708
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
709
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
710 710
 
711 711
 				// if date range type, set search mode to ALL
712
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>=', '<=', '>', '<' ) ) ) {
712
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>=', '<=', '>', '<' ) ) ) {
713 713
 					$mode = 'all';
714 714
 				}
715
-			} elseif( !empty( $filter ) ) {
716
-				$search_criteria['field_filters'][] = $filter;
715
+			} elseif ( ! empty( $filter ) ) {
716
+				$search_criteria[ 'field_filters' ][ ] = $filter;
717 717
 			}
718 718
 		}
719 719
 
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
 		 * @since 1.5.1
723 723
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
724 724
 		 */
725
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
725
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
726 726
 
727 727
 		gravityview()->log->debug( 'Returned Search Criteria: ', array( 'data' => $search_criteria ) );
728 728
 
@@ -756,19 +756,19 @@  discard block
 block discarded – undo
756 756
 
757 757
 		$query_class = $view->get_query_class();
758 758
 
759
-		if ( empty( $search_criteria['field_filters'] ) ) {
759
+		if ( empty( $search_criteria[ 'field_filters' ] ) ) {
760 760
 			return;
761 761
 		}
762 762
 
763 763
 		$widgets = $view->widgets->by_id( $this->widget_id );
764 764
 		if ( $widgets->count() ) {
765 765
 			$widgets = $widgets->all();
766
-			$widget  = $widgets[0];
766
+			$widget  = $widgets[ 0 ];
767 767
 
768 768
 			$search_fields = json_decode( $widget->configuration->get( 'search_fields' ), true );
769 769
 
770
-			foreach ( (array) $search_fields as $search_field ) {
771
-				if ( 'created_by' === $search_field['field'] && 'input_text' === $search_field['input'] ) {
770
+			foreach ( (array)$search_fields as $search_field ) {
771
+				if ( 'created_by' === $search_field[ 'field' ] && 'input_text' === $search_field[ 'input' ] ) {
772 772
 					$created_by_text_mode = true;
773 773
 				}
774 774
 			}
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 		$extra_conditions = array();
778 778
 		$mode = 'any';
779 779
 
780
-		foreach ( $search_criteria['field_filters'] as &$filter ) {
780
+		foreach ( $search_criteria[ 'field_filters' ] as &$filter ) {
781 781
 			if ( ! is_array( $filter ) ) {
782 782
 				if ( in_array( strtolower( $filter ), array( 'any', 'all' ) ) ) {
783 783
 					$mode = $filter;
@@ -786,13 +786,13 @@  discard block
 block discarded – undo
786 786
 			}
787 787
 
788 788
 			// Construct a manual query for unapproved statuses
789
-			if ( 'is_approved' === $filter['key'] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array) $filter['value'] ) ) {
790
-				$_tmp_query       = new $query_class( $view->form->ID, array(
789
+			if ( 'is_approved' === $filter[ 'key' ] && in_array( \GravityView_Entry_Approval_Status::UNAPPROVED, (array)$filter[ 'value' ] ) ) {
790
+				$_tmp_query = new $query_class( $view->form->ID, array(
791 791
 					'field_filters' => array(
792 792
 						array(
793 793
 							'operator' => 'in',
794 794
 							'key'      => 'is_approved',
795
-							'value'    => (array) $filter['value'],
795
+							'value'    => (array)$filter[ 'value' ],
796 796
 						),
797 797
 						array(
798 798
 							'operator' => 'is',
@@ -804,30 +804,30 @@  discard block
 block discarded – undo
804 804
 				) );
805 805
 				$_tmp_query_parts = $_tmp_query->_introspect();
806 806
 
807
-				$extra_conditions[] = $_tmp_query_parts['where'];
807
+				$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
808 808
 
809 809
 				$filter = false;
810 810
 				continue;
811 811
 			}
812 812
 
813 813
 			// Construct manual query for text mode creator search
814
-			if ( 'created_by' === $filter['key'] && ! empty( $created_by_text_mode ) ) {
815
-				$extra_conditions[] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
814
+			if ( 'created_by' === $filter[ 'key' ] && ! empty( $created_by_text_mode ) ) {
815
+				$extra_conditions[ ] = new GravityView_Widget_Search_Author_GF_Query_Condition( $filter, $view );
816 816
 				$filter = false;
817 817
 				continue;
818 818
 			}
819 819
 
820 820
 			// By default, we want searches to be wildcard for each field.
821
-			$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
821
+			$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
822 822
 
823 823
 			// For multichoice, let's have an in (OR) search.
824
-			if ( is_array( $filter['value'] ) ) {
825
-				$filter['operator'] = 'in'; // @todo what about in contains (OR LIKE chains)?
824
+			if ( is_array( $filter[ 'value' ] ) ) {
825
+				$filter[ 'operator' ] = 'in'; // @todo what about in contains (OR LIKE chains)?
826 826
 			}
827 827
 
828 828
 			// Default form with joins functionality
829
-			if ( empty( $filter['form_id'] ) ) {
830
-				$filter['form_id'] = $view->form ? $view->form->ID : 0;
829
+			if ( empty( $filter[ 'form_id' ] ) ) {
830
+				$filter[ 'form_id' ] = $view->form ? $view->form->ID : 0;
831 831
 			}
832 832
 
833 833
 			/**
@@ -837,28 +837,28 @@  discard block
 block discarded – undo
837 837
 			 * @since develop
838 838
 			 * @param \GV\View $view The View we're operating on.
839 839
 			 */
840
-			$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter, $view );
840
+			$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter, $view );
841 841
 		}
842 842
 
843
-		if ( ! empty( $search_criteria['start_date'] ) || ! empty( $search_criteria['end_date'] ) ) {
843
+		if ( ! empty( $search_criteria[ 'start_date' ] ) || ! empty( $search_criteria[ 'end_date' ] ) ) {
844 844
 			$date_criteria = array();
845 845
 
846
-			if ( isset( $search_criteria['start_date'] ) ) {
847
-				$date_criteria['start_date'] = $search_criteria['start_date'];
846
+			if ( isset( $search_criteria[ 'start_date' ] ) ) {
847
+				$date_criteria[ 'start_date' ] = $search_criteria[ 'start_date' ];
848 848
 			}
849 849
 
850
-			if ( isset( $search_criteria['end_date'] ) ) {
851
-				$date_criteria['end_date'] = $search_criteria['end_date'];
850
+			if ( isset( $search_criteria[ 'end_date' ] ) ) {
851
+				$date_criteria[ 'end_date' ] = $search_criteria[ 'end_date' ];
852 852
 			}
853 853
 
854 854
 			$_tmp_query         = new $query_class( $view->form->ID, $date_criteria );
855 855
 			$_tmp_query_parts   = $_tmp_query->_introspect();
856
-			$extra_conditions[] = $_tmp_query_parts['where'];
856
+			$extra_conditions[ ] = $_tmp_query_parts[ 'where' ];
857 857
 		}
858 858
 
859 859
 		$search_conditions = array();
860 860
 
861
-		if ( $filters = array_filter( $search_criteria['field_filters'] ) ) {
861
+		if ( $filters = array_filter( $search_criteria[ 'field_filters' ] ) ) {
862 862
 			foreach ( $filters as &$filter ) {
863 863
 				if ( ! is_array( $filter ) ) {
864 864
 					continue;
@@ -870,12 +870,12 @@  discard block
 block discarded – undo
870 870
 				 * code by reusing what's inside GF_Query already as they
871 871
 				 * take care of many small things like forcing numeric, etc.
872 872
 				 */
873
-				$_tmp_query       = new $query_class( $filter['form_id'], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
873
+				$_tmp_query       = new $query_class( $filter[ 'form_id' ], array( 'mode' => 'any', 'field_filters' => array( $filter ) ) );
874 874
 				$_tmp_query_parts = $_tmp_query->_introspect();
875
-				$search_condition = $_tmp_query_parts['where'];
875
+				$search_condition = $_tmp_query_parts[ 'where' ];
876 876
 
877
-				if ( empty( $filter['key'] ) && $search_condition->expressions ) {
878
-					$search_conditions[] = $search_condition;
877
+				if ( empty( $filter[ 'key' ] ) && $search_condition->expressions ) {
878
+					$search_conditions[ ] = $search_condition;
879 879
 				} else {
880 880
 					$left = $search_condition->left;
881 881
 					$alias = $query->_alias( $left->field_id, $left->source, $left->is_entry_column() ? 't' : 'm' );
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 							$on = $_join->join_on;
886 886
 							$join = $_join->join;
887 887
 
888
-							$search_conditions[] = GF_Query_Condition::_or(
888
+							$search_conditions[ ] = GF_Query_Condition::_or(
889 889
 								// Join
890 890
 								new GF_Query_Condition(
891 891
 									new GF_Query_Column( GF_Query_Column::META, $join->ID, $query->_alias( GF_Query_Column::META, $join->ID, 'm' ) ),
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 							);
902 902
 						}
903 903
 					} else {
904
-						$search_conditions[] = new GF_Query_Condition(
904
+						$search_conditions[ ] = new GF_Query_Condition(
905 905
 							new GF_Query_Column( $left->field_id, $left->source, $alias ),
906 906
 							$search_condition->operator,
907 907
 							$search_condition->right
@@ -923,7 +923,7 @@  discard block
 block discarded – undo
923 923
 		/**
924 924
 		 * Combine the parts as a new WHERE clause.
925 925
 		 */
926
-		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts['where'] ), $search_conditions, $extra_conditions ) );
926
+		$where = call_user_func_array( '\GF_Query_Condition::_and', array_merge( array( $query_parts[ 'where' ] ), $search_conditions, $extra_conditions ) );
927 927
 		$query->where( $where );
928 928
 	}
929 929
 
@@ -946,7 +946,7 @@  discard block
 block discarded – undo
946 946
 		$field_id = str_replace( 'filter_', '', $key );
947 947
 
948 948
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
949
-		if ( preg_match('/^[0-9_]+$/ism', $field_id ) ) {
949
+		if ( preg_match( '/^[0-9_]+$/ism', $field_id ) ) {
950 950
 			$field_id = str_replace( '_', '.', $field_id );
951 951
 		}
952 952
 
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
 			// form is in searchable fields
1004 1004
 			$found = false;
1005 1005
 			foreach ( $searchable_fields as $field ) {
1006
-				if ( $field_id == $field['field'] && $form->ID == $field['form_id'] ) {
1006
+				if ( $field_id == $field[ 'field' ] && $form->ID == $field[ 'form_id' ] ) {
1007 1007
 					$found = true;
1008 1008
 					break;
1009 1009
 				}
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
1043 1043
 
1044 1044
 			case 'select':
1045 1045
 			case 'radio':
1046
-				$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1046
+				$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1047 1047
 				break;
1048 1048
 
1049 1049
 			case 'post_category':
@@ -1057,7 +1057,7 @@  discard block
 block discarded – undo
1057 1057
 
1058 1058
 				foreach ( $value as $val ) {
1059 1059
 					$cat = get_term( $val, 'category' );
1060
-					$filter[] = array(
1060
+					$filter[ ] = array(
1061 1061
 						'key'      => $field_id,
1062 1062
 						'value'    => esc_attr( $cat->name ) . ':' . $val,
1063 1063
 						'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
1076 1076
 				$filter = array();
1077 1077
 
1078 1078
 				foreach ( $value as $val ) {
1079
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
1079
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
1080 1080
 				}
1081 1081
 
1082 1082
 				break;
@@ -1085,9 +1085,9 @@  discard block
 block discarded – undo
1085 1085
 				// convert checkbox on/off into the correct search filter
1086 1086
 				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field->inputs ) && ! empty( $form_field->choices ) ) {
1087 1087
 					foreach ( $form_field->inputs as $k => $input ) {
1088
-						if ( $input['id'] == $field_id ) {
1089
-							$filter['value'] = $form_field->choices[ $k ]['value'];
1090
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1088
+						if ( $input[ 'id' ] == $field_id ) {
1089
+							$filter[ 'value' ] = $form_field->choices[ $k ][ 'value' ];
1090
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1091 1091
 							break;
1092 1092
 						}
1093 1093
 					}
@@ -1097,7 +1097,7 @@  discard block
 block discarded – undo
1097 1097
 					$filter = array();
1098 1098
 
1099 1099
 					foreach ( $value as $val ) {
1100
-						$filter[] = array(
1100
+						$filter[ ] = array(
1101 1101
 							'key'      => $field_id,
1102 1102
 							'value'    => $val,
1103 1103
 							'operator' => $this->get_operator( $get, $key, array( 'is' ), 'is' ),
@@ -1118,9 +1118,9 @@  discard block
 block discarded – undo
1118 1118
 					foreach ( $words as $word ) {
1119 1119
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
1120 1120
 							// Keep the same key for each filter
1121
-							$filter['value'] = $word;
1121
+							$filter[ 'value' ] = $word;
1122 1122
 							// Add a search for the value
1123
-							$filters[] = $filter;
1123
+							$filters[ ] = $filter;
1124 1124
 						}
1125 1125
 					}
1126 1126
 
@@ -1134,19 +1134,19 @@  discard block
 block discarded – undo
1134 1134
 
1135 1135
 					foreach ( $searchable_fields as $searchable_field ) {
1136 1136
 
1137
-						if( $form_field->ID !== $searchable_field['field'] ) {
1137
+						if ( $form_field->ID !== $searchable_field[ 'field' ] ) {
1138 1138
 							continue;
1139 1139
 						}
1140 1140
 
1141 1141
 						// Only exact-match dropdowns, not text search
1142
-						if( in_array( $searchable_field['input'], array( 'text', 'search' ), true ) ) {
1142
+						if ( in_array( $searchable_field[ 'input' ], array( 'text', 'search' ), true ) ) {
1143 1143
 							continue;
1144 1144
 						}
1145 1145
 
1146 1146
 						$input_id = gravityview_get_input_id_from_id( $form_field->ID );
1147 1147
 
1148 1148
 						if ( 4 === $input_id ) {
1149
-							$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1149
+							$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1150 1150
 						};
1151 1151
 					}
1152 1152
 				}
@@ -1173,12 +1173,12 @@  discard block
 block discarded – undo
1173 1173
 						 * @since 1.16.3
1174 1174
 						 * Safeguard until GF implements '<=' operator
1175 1175
 						 */
1176
-						if( !GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
1176
+						if ( ! GFFormsModel::is_valid_operator( $operator ) && $operator === '<=' ) {
1177 1177
 							$operator = '<';
1178 1178
 							$date = date( 'Y-m-d', strtotime( self::get_formatted_date( $date, 'Y-m-d', $date_format ) . ' +1 day' ) );
1179 1179
 						}
1180 1180
 
1181
-						$filter[] = array(
1181
+						$filter[ ] = array(
1182 1182
 							'key'      => $field_id,
1183 1183
 							'value'    => self::get_formatted_date( $date, 'Y-m-d', $date_format ),
1184 1184
 							'operator' => $this->get_operator( $get, $key, array( $operator ), $operator ),
@@ -1186,8 +1186,8 @@  discard block
 block discarded – undo
1186 1186
 					}
1187 1187
 				} else {
1188 1188
 					$date = $value;
1189
-					$filter['value'] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
1190
-					$filter['operator'] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1189
+					$filter[ 'value' ] = self::get_formatted_date( $date, 'Y-m-d', $date_format );
1190
+					$filter[ 'operator' ] = $this->get_operator( $get, $key, array( 'is' ), 'is' );
1191 1191
 				}
1192 1192
 
1193 1193
 				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
 			}
@@ -1301,7 +1301,7 @@  discard block
 block discarded – undo
1301 1301
 		}
1302 1302
 
1303 1303
 		// get configured search fields
1304
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
1304
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
1305 1305
 
1306 1306
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
1307 1307
 			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
 		/**
@@ -1449,9 +1449,9 @@  discard block
 block discarded – undo
1449 1449
 
1450 1450
 		if ( ! $label ) {
1451 1451
 
1452
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
1452
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
1453 1453
 
1454
-			switch( $field['field'] ) {
1454
+			switch ( $field[ 'field' ] ) {
1455 1455
 				case 'search_all':
1456 1456
 					$label = __( 'Search Entries:', 'gravityview' );
1457 1457
 					break;
@@ -1463,10 +1463,10 @@  discard block
 block discarded – undo
1463 1463
 					break;
1464 1464
 				default:
1465 1465
 					// If this is a field input, not a field
1466
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
1466
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
1467 1467
 
1468 1468
 						// Get the label for the field in question, which returns an array
1469
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
1469
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
1470 1470
 
1471 1471
 						// Get the item with the `label` key
1472 1472
 						$values = wp_list_pluck( $items, 'label' );
@@ -1507,35 +1507,35 @@  discard block
 block discarded – undo
1507 1507
 		$form = $gravityview_view->getForm();
1508 1508
 
1509 1509
 		// for advanced field ids (eg, first name / last name )
1510
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
1510
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
1511 1511
 
1512 1512
 		// get searched value from $_GET/$_POST (string or array)
1513 1513
 		$value = $this->rgget_or_rgpost( $name );
1514 1514
 
1515 1515
 		// get form field details
1516
-		$form_field = gravityview_get_field( $form, $field['field'] );
1516
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
1517 1517
 
1518 1518
 		$filter = array(
1519
-			'key' => $field['field'],
1519
+			'key' => $field[ 'field' ],
1520 1520
 			'name' => $name,
1521 1521
 			'label' => self::get_field_label( $field, $form_field ),
1522
-			'input' => $field['input'],
1522
+			'input' => $field[ 'input' ],
1523 1523
 			'value' => $value,
1524
-			'type' => $form_field['type'],
1524
+			'type' => $form_field[ 'type' ],
1525 1525
 		);
1526 1526
 
1527 1527
 		// collect choices
1528
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
1529
-			$filter['choices'] = gravityview_get_terms_choices();
1530
-		} elseif ( ! empty( $form_field['choices'] ) ) {
1531
-			$filter['choices'] = $form_field['choices'];
1528
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
1529
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
1530
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
1531
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
1532 1532
 		}
1533 1533
 
1534
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
1535
-			$filter['value'] = array( 'start' => '', 'end' => '' );
1534
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
1535
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
1536 1536
 		}
1537 1537
 
1538
-		if ( ! empty( $filter['choices'] ) ) {
1538
+		if ( ! empty( $filter[ 'choices' ] ) ) {
1539 1539
 			/**
1540 1540
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
1541 1541
 			 * @param[in,out] bool Yes or no.
@@ -1543,7 +1543,7 @@  discard block
 block discarded – undo
1543 1543
 			 * @param \GV\Context The context.
1544 1544
 			 */
1545 1545
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
1546
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
1546
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
1547 1547
 			}
1548 1548
 		}
1549 1549
 
@@ -1572,11 +1572,11 @@  discard block
 block discarded – undo
1572 1572
 	 * @return array The filter choices.
1573 1573
 	 */
1574 1574
 	private function sieve_filter_choices( $filter, $context ) {
1575
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
1575
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
1576 1576
 			return $filter; // @todo Populate plugins might give us empty choices
1577 1577
 		}
1578 1578
 
1579
-		if ( ! is_numeric( $filter['key'] ) ) {
1579
+		if ( ! is_numeric( $filter[ 'key' ] ) ) {
1580 1580
 			return $filter;
1581 1581
 		}
1582 1582
 
@@ -1586,29 +1586,29 @@  discard block
 block discarded – undo
1586 1586
 
1587 1587
 		$table = GFFormsModel::get_entry_meta_table_name();
1588 1588
 
1589
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
1589
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
1590 1590
 
1591 1591
 		switch ( \GV\Utils::get( $filter, 'type' ) ):
1592 1592
 			case 'post_category':
1593 1593
 				$choices = $wpdb->get_col( $wpdb->prepare(
1594 1594
 					"SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1595
-					$key_like, $filter['key'], $form_id
1595
+					$key_like, $filter[ 'key' ], $form_id
1596 1596
 				) );
1597 1597
 				break;
1598 1598
 			default:
1599 1599
 				$choices = $wpdb->get_col( $wpdb->prepare(
1600 1600
 					"SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1601
-					$key_like, $filter['key'], $form_id
1601
+					$key_like, $filter[ 'key' ], $form_id
1602 1602
 				) );
1603 1603
 
1604
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
1604
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
1605 1605
 					$choices = array_map( 'json_decode', $choices );
1606 1606
 					$_choices_array = array();
1607 1607
 					foreach ( $choices as $choice ) {
1608 1608
 						if ( is_array( $choice ) ) {
1609 1609
 							$_choices_array = array_merge( $_choices_array, $choice );
1610 1610
 						} else {
1611
-							$_choices_array []= $choice;
1611
+							$_choices_array [ ] = $choice;
1612 1612
 						}
1613 1613
 					}
1614 1614
 					$choices = array_unique( $_choices_array );
@@ -1618,9 +1618,9 @@  discard block
 block discarded – undo
1618 1618
 		endswitch;
1619 1619
 
1620 1620
 		$filter_choices = array();
1621
-		foreach ( $filter['choices'] as $choice ) {
1622
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
1623
-				$filter_choices[] = $choice;
1621
+		foreach ( $filter[ 'choices' ] as $choice ) {
1622
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
1623
+				$filter_choices[ ] = $choice;
1624 1624
 			}
1625 1625
 		}
1626 1626
 
@@ -1655,7 +1655,7 @@  discard block
 block discarded – undo
1655 1655
 			 * @param \GV\View $view The view.
1656 1656
 			 */
1657 1657
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
1658
-			$choices[] = array(
1658
+			$choices[ ] = array(
1659 1659
 				'value' => $user->ID,
1660 1660
 				'text' => $text,
1661 1661
 			);
@@ -1675,9 +1675,9 @@  discard block
 block discarded – undo
1675 1675
 
1676 1676
 		$choices = array();
1677 1677
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
1678
-			$choices[] = array(
1679
-				'value' => $status['value'],
1680
-				'text' => $status['label'],
1678
+			$choices[ ] = array(
1679
+				'value' => $status[ 'value' ],
1680
+				'text' => $status[ 'label' ],
1681 1681
 			);
1682 1682
 		}
1683 1683
 
@@ -1729,7 +1729,7 @@  discard block
 block discarded – undo
1729 1729
 	 */
1730 1730
 	public function add_datepicker_js_dependency( $js_dependencies ) {
1731 1731
 
1732
-		$js_dependencies[] = 'jquery-ui-datepicker';
1732
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
1733 1733
 
1734 1734
 		return $js_dependencies;
1735 1735
 	}
@@ -1773,7 +1773,7 @@  discard block
 block discarded – undo
1773 1773
 			'isRTL'             => is_rtl(),
1774 1774
 		), $view_data );
1775 1775
 
1776
-		$localizations['datepicker'] = $datepicker_settings;
1776
+		$localizations[ 'datepicker' ] = $datepicker_settings;
1777 1777
 
1778 1778
 		return $localizations;
1779 1779
 
@@ -1800,7 +1800,7 @@  discard block
 block discarded – undo
1800 1800
 	 * @return void
1801 1801
 	 */
1802 1802
 	private function maybe_enqueue_flexibility() {
1803
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
1803
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
1804 1804
 			wp_enqueue_script( 'gv-flexibility' );
1805 1805
 		}
1806 1806
 	}
@@ -1822,7 +1822,7 @@  discard block
 block discarded – undo
1822 1822
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
1823 1823
 
1824 1824
 		$scheme = is_ssl() ? 'https://' : 'http://';
1825
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1825
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1826 1826
 
1827 1827
 		/**
1828 1828
 		 * @filter `gravityview_search_datepicker_class`
@@ -1901,7 +1901,7 @@  discard block
 block discarded – undo
1901 1901
 	public function add_preview_inputs() {
1902 1902
 		global $wp;
1903 1903
 
1904
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
1904
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
1905 1905
 			return;
1906 1906
 		}
1907 1907
 
@@ -1953,7 +1953,7 @@  discard block
 block discarded – undo
1953 1953
  */
1954 1954
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
1955 1955
 	public function __construct( $filter, $view ) {
1956
-		$this->value = $filter['value'];
1956
+		$this->value = $filter[ 'value' ];
1957 1957
 		$this->view = $view;
1958 1958
 	}
1959 1959
 
@@ -1985,11 +1985,11 @@  discard block
 block discarded – undo
1985 1985
 		$conditions = array();
1986 1986
 
1987 1987
 		foreach ( $user_fields as $user_field ) {
1988
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
1988
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
1989 1989
 		}
1990 1990
 
1991 1991
 		foreach ( $user_meta_fields as $meta_field ) {
1992
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
1992
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
1993 1993
 		}
1994 1994
 
1995 1995
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';
Please login to merge, or discard this patch.