Completed
Pull Request — develop (#1504)
by Zack
16:09
created
includes/widgets/search-widget/class-search-widget.php 1 patch
Spacing   +172 added lines, -172 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
 			}
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 		$view = \GV\View::by_id( $gravityview_view->view_id );
1305 1305
 
1306 1306
 		// get configured search fields
1307
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
1307
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
1308 1308
 
1309 1309
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
1310 1310
 			gravityview()->log->debug( 'No search fields configured for widget:', array( 'data' => $widget_args ) );
@@ -1318,40 +1318,40 @@  discard block
 block discarded – undo
1318 1318
 
1319 1319
 			$updated_field = $this->get_search_filter_details( $updated_field, $context );
1320 1320
 
1321
-			switch ( $field['field'] ) {
1321
+			switch ( $field[ 'field' ] ) {
1322 1322
 
1323 1323
 				case 'search_all':
1324
-					$updated_field['key'] = 'search_all';
1325
-					$updated_field['input'] = 'search_all';
1326
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_search' );
1324
+					$updated_field[ 'key' ] = 'search_all';
1325
+					$updated_field[ 'input' ] = 'search_all';
1326
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_search' );
1327 1327
 					break;
1328 1328
 
1329 1329
 				case 'entry_date':
1330
-					$updated_field['key'] = 'entry_date';
1331
-					$updated_field['input'] = 'entry_date';
1332
-					$updated_field['value'] = array(
1330
+					$updated_field[ 'key' ] = 'entry_date';
1331
+					$updated_field[ 'input' ] = 'entry_date';
1332
+					$updated_field[ 'value' ] = array(
1333 1333
 						'start' => $this->rgget_or_rgpost( 'gv_start' ),
1334 1334
 						'end' => $this->rgget_or_rgpost( 'gv_end' ),
1335 1335
 					);
1336 1336
 					break;
1337 1337
 
1338 1338
 				case 'entry_id':
1339
-					$updated_field['key'] = 'entry_id';
1340
-					$updated_field['input'] = 'entry_id';
1341
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_id' );
1339
+					$updated_field[ 'key' ] = 'entry_id';
1340
+					$updated_field[ 'input' ] = 'entry_id';
1341
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_id' );
1342 1342
 					break;
1343 1343
 
1344 1344
 				case 'created_by':
1345
-					$updated_field['key'] = 'created_by';
1346
-					$updated_field['name'] = 'gv_by';
1347
-					$updated_field['value'] = $this->rgget_or_rgpost( 'gv_by' );
1348
-					$updated_field['choices'] = self::get_created_by_choices( $view );
1345
+					$updated_field[ 'key' ] = 'created_by';
1346
+					$updated_field[ 'name' ] = 'gv_by';
1347
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'gv_by' );
1348
+					$updated_field[ 'choices' ] = self::get_created_by_choices( $view );
1349 1349
 					break;
1350 1350
 
1351 1351
 				case 'is_approved':
1352
-					$updated_field['key'] = 'is_approved';
1353
-					$updated_field['value'] = $this->rgget_or_rgpost( 'filter_is_approved' );
1354
-					$updated_field['choices'] = self::get_is_approved_choices();
1352
+					$updated_field[ 'key' ] = 'is_approved';
1353
+					$updated_field[ 'value' ] = $this->rgget_or_rgpost( 'filter_is_approved' );
1354
+					$updated_field[ 'choices' ] = self::get_is_approved_choices();
1355 1355
 					break;
1356 1356
 			}
1357 1357
 
@@ -1372,16 +1372,16 @@  discard block
 block discarded – undo
1372 1372
 
1373 1373
 		$gravityview_view->permalink_fields = $this->add_no_permalink_fields( array(), $this, $widget_args );
1374 1374
 
1375
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
1375
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
1376 1376
 
1377 1377
 		/** @since 1.14 */
1378
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
1378
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
1379 1379
 
1380
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
1380
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
1381 1381
 
1382 1382
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
1383 1383
 
1384
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
1384
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
1385 1385
 
1386 1386
 		if ( $this->has_date_field( $search_fields ) ) {
1387 1387
 			// enqueue datepicker stuff only if needed!
@@ -1403,10 +1403,10 @@  discard block
 block discarded – undo
1403 1403
 	public static function get_search_class( $custom_class = '' ) {
1404 1404
 		$gravityview_view = GravityView_View::getInstance();
1405 1405
 
1406
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
1406
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
1407 1407
 
1408
-		if ( ! empty( $custom_class )  ) {
1409
-			$search_class .= ' '.$custom_class;
1408
+		if ( ! empty( $custom_class ) ) {
1409
+			$search_class .= ' ' . $custom_class;
1410 1410
 		}
1411 1411
 
1412 1412
 		/**
@@ -1457,9 +1457,9 @@  discard block
 block discarded – undo
1457 1457
 
1458 1458
 		if ( ! $label ) {
1459 1459
 
1460
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
1460
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
1461 1461
 
1462
-			switch( $field['field'] ) {
1462
+			switch ( $field[ 'field' ] ) {
1463 1463
 				case 'search_all':
1464 1464
 					$label = __( 'Search Entries:', 'gravityview' );
1465 1465
 					break;
@@ -1471,10 +1471,10 @@  discard block
 block discarded – undo
1471 1471
 					break;
1472 1472
 				default:
1473 1473
 					// If this is a field input, not a field
1474
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
1474
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
1475 1475
 
1476 1476
 						// Get the label for the field in question, which returns an array
1477
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
1477
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
1478 1478
 
1479 1479
 						// Get the item with the `label` key
1480 1480
 						$values = wp_list_pluck( $items, 'label' );
@@ -1515,13 +1515,13 @@  discard block
 block discarded – undo
1515 1515
 		$form = $gravityview_view->getForm();
1516 1516
 
1517 1517
 		// for advanced field ids (eg, first name / last name )
1518
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
1518
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
1519 1519
 
1520 1520
 		// get searched value from $_GET/$_POST (string or array)
1521 1521
 		$value = $this->rgget_or_rgpost( $name );
1522 1522
 
1523 1523
 		// get form field details
1524
-		$form_field = gravityview_get_field( $form, $field['field'] );
1524
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
1525 1525
 
1526 1526
 		$form_field_type = \GV\Utils::get( $form_field, 'type' );
1527 1527
 
@@ -1535,17 +1535,17 @@  discard block
 block discarded – undo
1535 1535
 		);
1536 1536
 
1537 1537
 		// collect choices
1538
-		if ( 'post_category' === $form_field_type && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
1539
-			$filter['choices'] = gravityview_get_terms_choices();
1540
-		} elseif ( ! empty( $form_field['choices'] ) ) {
1541
-			$filter['choices'] = $form_field['choices'];
1538
+		if ( 'post_category' === $form_field_type && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
1539
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
1540
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
1541
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
1542 1542
 		}
1543 1543
 
1544
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
1545
-			$filter['value'] = array( 'start' => '', 'end' => '' );
1544
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
1545
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
1546 1546
 		}
1547 1547
 
1548
-		if ( ! empty( $filter['choices'] ) ) {
1548
+		if ( ! empty( $filter[ 'choices' ] ) ) {
1549 1549
 			/**
1550 1550
 			 * @filter `gravityview/search/sieve_choices` Only output used choices for this field.
1551 1551
 			 * @param[in,out] bool Yes or no.
@@ -1553,7 +1553,7 @@  discard block
 block discarded – undo
1553 1553
 			 * @param \GV\Context The context.
1554 1554
 			 */
1555 1555
 			if ( apply_filters( 'gravityview/search/sieve_choices', false, $field, $context ) ) {
1556
-				$filter['choices'] = $this->sieve_filter_choices( $filter, $context );
1556
+				$filter[ 'choices' ] = $this->sieve_filter_choices( $filter, $context );
1557 1557
 			}
1558 1558
 		}
1559 1559
 
@@ -1582,11 +1582,11 @@  discard block
 block discarded – undo
1582 1582
 	 * @return array The filter choices.
1583 1583
 	 */
1584 1584
 	private function sieve_filter_choices( $filter, $context ) {
1585
-		if ( empty( $filter['key'] ) || empty( $filter['choices'] ) ) {
1585
+		if ( empty( $filter[ 'key' ] ) || empty( $filter[ 'choices' ] ) ) {
1586 1586
 			return $filter; // @todo Populate plugins might give us empty choices
1587 1587
 		}
1588 1588
 
1589
-		if ( ! is_numeric( $filter['key'] ) ) {
1589
+		if ( ! is_numeric( $filter[ 'key' ] ) ) {
1590 1590
 			return $filter;
1591 1591
 		}
1592 1592
 
@@ -1596,29 +1596,29 @@  discard block
 block discarded – undo
1596 1596
 
1597 1597
 		$table = GFFormsModel::get_entry_meta_table_name();
1598 1598
 
1599
-		$key_like = $wpdb->esc_like( $filter['key'] ) . '.%';
1599
+		$key_like = $wpdb->esc_like( $filter[ 'key' ] ) . '.%';
1600 1600
 
1601 1601
 		switch ( \GV\Utils::get( $filter, 'type' ) ):
1602 1602
 			case 'post_category':
1603 1603
 				$choices = $wpdb->get_col( $wpdb->prepare(
1604 1604
 					"SELECT DISTINCT SUBSTRING_INDEX(meta_value, ':', 1) FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1605
-					$key_like, $filter['key'], $form_id
1605
+					$key_like, $filter[ 'key' ], $form_id
1606 1606
 				) );
1607 1607
 				break;
1608 1608
 			default:
1609 1609
 				$choices = $wpdb->get_col( $wpdb->prepare(
1610 1610
 					"SELECT DISTINCT meta_value FROM $table WHERE (meta_key LIKE %s OR meta_key = %d) AND form_id = %d",
1611
-					$key_like, $filter['key'], $form_id
1611
+					$key_like, $filter[ 'key' ], $form_id
1612 1612
 				) );
1613 1613
 
1614
-				if ( ( $field = gravityview_get_field( $form_id, $filter['key'] ) ) && 'json' === $field->storageType ) {
1614
+				if ( ( $field = gravityview_get_field( $form_id, $filter[ 'key' ] ) ) && 'json' === $field->storageType ) {
1615 1615
 					$choices = array_map( 'json_decode', $choices );
1616 1616
 					$_choices_array = array();
1617 1617
 					foreach ( $choices as $choice ) {
1618 1618
 						if ( is_array( $choice ) ) {
1619 1619
 							$_choices_array = array_merge( $_choices_array, $choice );
1620 1620
 						} else {
1621
-							$_choices_array []= $choice;
1621
+							$_choices_array [ ] = $choice;
1622 1622
 						}
1623 1623
 					}
1624 1624
 					$choices = array_unique( $_choices_array );
@@ -1628,9 +1628,9 @@  discard block
 block discarded – undo
1628 1628
 		endswitch;
1629 1629
 
1630 1630
 		$filter_choices = array();
1631
-		foreach ( $filter['choices'] as $choice ) {
1632
-			if ( in_array( $choice['text'], $choices, true ) || in_array( $choice['value'], $choices, true ) ) {
1633
-				$filter_choices[] = $choice;
1631
+		foreach ( $filter[ 'choices' ] as $choice ) {
1632
+			if ( in_array( $choice[ 'text' ], $choices, true ) || in_array( $choice[ 'value' ], $choices, true ) ) {
1633
+				$filter_choices[ ] = $choice;
1634 1634
 			}
1635 1635
 		}
1636 1636
 
@@ -1665,7 +1665,7 @@  discard block
 block discarded – undo
1665 1665
 			 * @param \GV\View $view The view.
1666 1666
 			 */
1667 1667
 			$text = apply_filters( 'gravityview/search/created_by/text', $user->display_name, $user, $view );
1668
-			$choices[] = array(
1668
+			$choices[ ] = array(
1669 1669
 				'value' => $user->ID,
1670 1670
 				'text' => $text,
1671 1671
 			);
@@ -1685,9 +1685,9 @@  discard block
 block discarded – undo
1685 1685
 
1686 1686
 		$choices = array();
1687 1687
 		foreach ( GravityView_Entry_Approval_Status::get_all() as $status ) {
1688
-			$choices[] = array(
1689
-				'value' => $status['value'],
1690
-				'text' => $status['label'],
1688
+			$choices[ ] = array(
1689
+				'value' => $status[ 'value' ],
1690
+				'text' => $status[ 'label' ],
1691 1691
 			);
1692 1692
 		}
1693 1693
 
@@ -1739,7 +1739,7 @@  discard block
 block discarded – undo
1739 1739
 	 */
1740 1740
 	public function add_datepicker_js_dependency( $js_dependencies ) {
1741 1741
 
1742
-		$js_dependencies[] = 'jquery-ui-datepicker';
1742
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
1743 1743
 
1744 1744
 		return $js_dependencies;
1745 1745
 	}
@@ -1783,7 +1783,7 @@  discard block
 block discarded – undo
1783 1783
 			'isRTL'             => is_rtl(),
1784 1784
 		), $view_data );
1785 1785
 
1786
-		$localizations['datepicker'] = $datepicker_settings;
1786
+		$localizations[ 'datepicker' ] = $datepicker_settings;
1787 1787
 
1788 1788
 		return $localizations;
1789 1789
 
@@ -1810,7 +1810,7 @@  discard block
 block discarded – undo
1810 1810
 	 * @return void
1811 1811
 	 */
1812 1812
 	private function maybe_enqueue_flexibility() {
1813
-		if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/MSIE [8-9]/', $_SERVER['HTTP_USER_AGENT'] ) ) {
1813
+		if ( isset( $_SERVER[ 'HTTP_USER_AGENT' ] ) && preg_match( '/MSIE [8-9]/', $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
1814 1814
 			wp_enqueue_script( 'gv-flexibility' );
1815 1815
 		}
1816 1816
 	}
@@ -1832,7 +1832,7 @@  discard block
 block discarded – undo
1832 1832
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
1833 1833
 
1834 1834
 		$scheme = is_ssl() ? 'https://' : 'http://';
1835
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1835
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1836 1836
 
1837 1837
 		/**
1838 1838
 		 * @filter `gravityview_search_datepicker_class`
@@ -1911,7 +1911,7 @@  discard block
 block discarded – undo
1911 1911
 	public function add_preview_inputs() {
1912 1912
 		global $wp;
1913 1913
 
1914
-		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews') ) {
1914
+		if ( ! is_preview() || ! current_user_can( 'publish_gravityviews' ) ) {
1915 1915
 			return;
1916 1916
 		}
1917 1917
 
@@ -1963,7 +1963,7 @@  discard block
 block discarded – undo
1963 1963
  */
1964 1964
 class GravityView_Widget_Search_Author_GF_Query_Condition extends \GF_Query_Condition {
1965 1965
 	public function __construct( $filter, $view ) {
1966
-		$this->value = $filter['value'];
1966
+		$this->value = $filter[ 'value' ];
1967 1967
 		$this->view = $view;
1968 1968
 	}
1969 1969
 
@@ -1995,11 +1995,11 @@  discard block
 block discarded – undo
1995 1995
 		$conditions = array();
1996 1996
 
1997 1997
 		foreach ( $user_fields as $user_field ) {
1998
-			$conditions[] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) .  '%' );
1998
+			$conditions[ ] = $wpdb->prepare( "`u`.`$user_field` LIKE %s", '%' . $wpdb->esc_like( $this->value ) . '%' );
1999 1999
 		}
2000 2000
 
2001 2001
 		foreach ( $user_meta_fields as $meta_field ) {
2002
-			$conditions[] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) .  '%' );
2002
+			$conditions[ ] = $wpdb->prepare( "(`um`.`meta_key` = %s AND `um`.`meta_value` LIKE %s)", $meta_field, '%' . $wpdb->esc_like( $this->value ) . '%' );
2003 2003
 		}
2004 2004
 
2005 2005
 		$conditions = '(' . implode( ' OR ', $conditions ) . ')';
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gravatar.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	static public function get_email( $field_settings, $entry ) {
72 72
 
73 73
 		// There was no logged in user.
74
-		switch ( $field_settings['email_field'] ) {
74
+		switch ( $field_settings[ 'email_field' ] ) {
75 75
 			case 'created_by_email':
76 76
 
77 77
 				$created_by = \GV\Utils::get( $entry, 'created_by', null );
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 			return $field_options;
103 103
 		}
104 104
 
105
-		$field_options['email_field'] = array(
105
+		$field_options[ 'email_field' ] = array(
106 106
 			'type'    => 'select',
107 107
 			'label'   => __( 'Email to Use', 'gravityview' ),
108 108
 			'value'   => 'created_by_email',
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'choices' => $this->_get_email_field_choices( $form_id ),
111 111
 		);
112 112
 
113
-		$field_options['default'] = array(
113
+		$field_options[ 'default' ] = array(
114 114
 			'type'    => 'select',
115 115
 			'label'   => __( 'Default Image', 'gravityview' ),
116 116
 			'desc'    => __( 'Choose the default image to be shown when an email has no Gravatar.', 'gravityview' ) . ' <a href="https://en.gravatar.com/site/implement/images/">' . esc_html( sprintf( __( 'Read more about %s', 'gravityview' ), __( 'Default Image', 'gravityview' ) ) ) . '</a>',
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			),
127 127
 		);
128 128
 
129
-		$field_options['size'] = array(
129
+		$field_options[ 'size' ] = array(
130 130
 			'type'  => 'number',
131 131
 			'label' => __( 'Size in Pixels', 'gravityview' ),
132 132
 			'value' => 80,
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$email_fields = GFAPI::get_fields_by_type( $form, array( 'email' ) );
160 160
 
161 161
 		foreach ( $email_fields as $email_field ) {
162
-			$email_field_id                   = $email_field['id'];
162
+			$email_field_id                   = $email_field[ 'id' ];
163 163
 			$email_field_label                = GVCommon::get_field_label( $form, $email_field_id );
164 164
 			$email_field_label                = sprintf( __( 'Field: %s', 'gravityview' ), $email_field_label );
165 165
 			$field_choices[ $email_field_id ] = esc_html( $email_field_label );
Please login to merge, or discard this patch.
future/includes/class-gv-request.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public static function is_add_oembed_preview() {
71 71
 		/** The preview request is a parse-embed AJAX call without a type set. */
72
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
72
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
73 73
 	}
74 74
 
75 75
 	/**
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @return boolean
88 88
 	 */
89 89
 	public static function is_rest() {
90
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
90
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
91 91
 	}
92 92
 
93 93
 	/**
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 					return false;
158 158
 				}
159 159
 
160
-				if ( ! in_array( $e['form_id'], $valid_forms ) ) {
160
+				if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) {
161 161
 					return false;
162 162
 				}
163 163
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 			}
174 174
 
175 175
 			$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
176
-		}  else {
176
+		} else {
177 177
 			/**
178 178
 			 * A regular one.
179 179
 			 */
@@ -231,15 +231,15 @@  discard block
 block discarded – undo
231 231
 			$get = $_GET;
232 232
 		}
233 233
 
234
-		unset( $get['mode'] );
234
+		unset( $get[ 'mode' ] );
235 235
 
236 236
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
237 237
 
238
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
238
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
239 239
 			return true;
240 240
 		}
241 241
 
242
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
242
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
243 243
 	}
244 244
 
245 245
 	/**
@@ -262,13 +262,13 @@  discard block
 block discarded – undo
262 262
 
263 263
 		$meta = array();
264 264
 		foreach ( $fields as $field ) {
265
-			if( empty( $field->_gf_field_class_name ) ) {
266
-				$meta[] = preg_quote( $field->name );
265
+			if ( empty( $field->_gf_field_class_name ) ) {
266
+				$meta[ ] = preg_quote( $field->name );
267 267
 			}
268 268
 		}
269 269
 
270 270
 		foreach ( $get as $key => $value ) {
271
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
271
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
272 272
 				$has_field_key = true;
273 273
 				break;
274 274
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-entry-list.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
 	public function get_output() {
191 191
 
192 192
 		// No Entries
193
-		if( empty( $this->entries ) ) {
194
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
193
+		if ( empty( $this->entries ) ) {
194
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
195 195
 		}
196 196
 
197 197
 		$output = '';
@@ -202,22 +202,22 @@  discard block
 block discarded – undo
202 202
 			$current_entry = GravityView_View::getInstance()->getCurrentEntry();
203 203
 		}
204 204
 
205
-		$output .= '<'. $this->wrapper_tag .'>';
205
+		$output .= '<' . $this->wrapper_tag . '>';
206 206
 
207
-		foreach( $this->entries as $entry ) {
207
+		foreach ( $this->entries as $entry ) {
208 208
 
209 209
 			if ( $entry instanceof \GV\Entry ) {
210 210
 				$entry = $entry->as_entry();
211 211
 			}
212 212
 
213
-			if( $this->skip_entry( $entry, $current_entry ) ) {
213
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
214 214
 				continue;
215 215
 			}
216 216
 
217 217
 			$output .= $this->get_item_output( $entry );
218 218
 		}
219 219
 
220
-		$output .= '</'. $this->wrapper_tag .'>';
220
+		$output .= '</' . $this->wrapper_tag . '>';
221 221
 
222 222
 		/**
223 223
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -240,15 +240,15 @@  discard block
 block discarded – undo
240 240
 	private function skip_entry( $entry, $current_entry ) {
241 241
 
242 242
 		// If skip entry is off, or there's no current entry, return false
243
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
243
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
244 244
 			return false;
245 245
 		}
246 246
 
247 247
 		// If in Single or Edit mode, $current_entry will be an array.
248
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
248
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
249 249
 
250 250
 		// If the entry ID matches the current entry, yes: skip
251
-		if( $entry['id'] === $current_entry_id ) {
251
+		if ( $entry[ 'id' ] === $current_entry_id ) {
252 252
 			return true;
253 253
 		}
254 254
 
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 		$item_output = gravityview_get_link( $link, $this->link_format );
285 285
 
286
-		if( !empty( $this->after_link ) ) {
286
+		if ( ! empty( $this->after_link ) ) {
287 287
 
288 288
 			/**
289 289
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -292,14 +292,14 @@  discard block
 block discarded – undo
292 292
 			 * @param array $entry Gravity Forms entry array
293 293
 			 * @param GravityView_Entry_List $this The current class instance
294 294
 			 */
295
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
295
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
296 296
 
297 297
 			$item_output .= $after_link;
298 298
 		}
299 299
 
300 300
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
301 301
 
302
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
302
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
303 303
 
304 304
 		/**
305 305
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
Please login to merge, or discard this patch.
includes/wordpress-widgets/class-gravityview-recent-entries-widget.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 	function __construct( ) {
14 14
 
15
-		$name = __('GravityView Recent Entries', 'gravityview');
15
+		$name = __( 'GravityView Recent Entries', 'gravityview' );
16 16
 
17 17
 		$widget_options = array(
18 18
 			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 	private function initialize() {
27 27
 
28
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
28
+		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
29 29
 
30 30
 		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
31 31
 
@@ -38,21 +38,21 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	function ajax_get_view_merge_tag_data() {
40 40
 
41
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
41
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajax_widget' ) ) {
42 42
 			exit( false );
43 43
 		}
44 44
 
45
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
45
+		$form_id = gravityview_get_form_id( $_POST[ 'view_id' ] );
46 46
 
47 47
 		$form = RGFormsModel::get_form_meta( $form_id );
48 48
 
49 49
 		$output = array(
50 50
 			'form' => array(
51
-				'id' => $form['id'],
52
-				'title' => $form['title'],
53
-				'fields' => $form['fields'],
51
+				'id' => $form[ 'id' ],
52
+				'title' => $form[ 'title' ],
53
+				'fields' => $form[ 'fields' ],
54 54
 			),
55
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
55
+			'mergeTags' => GFCommon::get_merge_tags( $form[ 'fields' ], '', false ),
56 56
 		);
57 57
 
58 58
 		echo json_encode( $output );
@@ -68,17 +68,17 @@  discard block
 block discarded – undo
68 68
 	function admin_enqueue_scripts() {
69 69
 		global $pagenow;
70 70
 
71
-		if( $pagenow === 'widgets.php' ) {
71
+		if ( $pagenow === 'widgets.php' ) {
72 72
 
73
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
73
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
74 74
 
75
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
75
+			wp_enqueue_script( 'gravityview_widgets', plugins_url( 'assets/js/admin-widgets' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
76 76
 
77 77
 			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
78 78
 				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
79
-			));
79
+			) );
80 80
 
81
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
81
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons' ), GravityView_Plugin::version );
82 82
 		}
83 83
 
84 84
 	}
@@ -93,19 +93,19 @@  discard block
 block discarded – undo
93 93
 	function widget( $args, $instance ) {
94 94
 
95 95
 		// Don't have the Customizer render too soon.
96
-		if( empty( $instance['view_id'] ) ) {
96
+		if ( empty( $instance[ 'view_id' ] ) ) {
97 97
 			return;
98 98
 		}
99 99
 
100
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
101
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
100
+		$args[ 'id' ]        = ( isset( $args[ 'id' ] ) ) ? $args[ 'id' ] : 'gv_recent_entries';
101
+		$instance[ 'title' ] = ( isset( $instance[ 'title' ] ) ) ? $instance[ 'title' ] : '';
102 102
 
103
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
103
+		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args[ 'id' ] );
104 104
 
105
-		echo $args['before_widget'];
105
+		echo $args[ 'before_widget' ];
106 106
 
107
-		if ( !empty( $title ) ) {
108
-			echo $args['before_title'] . $title . $args['after_title'];
107
+		if ( ! empty( $title ) ) {
108
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
109 109
 		}
110 110
 
111 111
 		/**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		 */
126 126
 		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
127 127
 
128
-		echo $args['after_widget'];
128
+		echo $args[ 'after_widget' ];
129 129
 	}
130 130
 
131 131
 	/**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	private function get_output( $instance ) {
141 141
 
142
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
142
+		$form_id = gravityview_get_form_id( $instance[ 'view_id' ] );
143 143
 
144 144
 		$form = gravityview_get_form( $form_id );
145 145
 
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
 		 * @since 1.6.1
150 150
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
151 151
 		 */
152
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
152
+		$entry_link_post_id = ( empty( $instance[ 'error_post_id' ] ) && ! empty( $instance[ 'post_id' ] ) ) ? $instance[ 'post_id' ] : $instance[ 'view_id' ];
153 153
 
154 154
 		/**
155 155
 		 * Generate list output
156 156
 		 * @since 1.7.2
157 157
 		 */
158
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget', null, $instance['view_id'] );
158
+		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance[ 'link_format' ], $instance[ 'after_link' ], 'recent-entries-widget', null, $instance[ 'view_id' ] );
159 159
 
160 160
 		$output = $List->get_output();
161 161
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
180 180
 	 */
181 181
 	private function get_entries( $instance, $form_id ) {
182 182
 
183
-		$view = \GV\View::by_id( $instance['view_id'] );
183
+		$view = \GV\View::by_id( $instance[ 'view_id' ] );
184 184
 
185
-		$limit = isset( $instance['limit'] ) ? $instance['limit'] : 10;
185
+		$limit = isset( $instance[ 'limit' ] ) ? $instance[ 'limit' ] : 10;
186 186
 
187 187
 		$view->settings->set( 'page_size', $limit );
188 188
 
@@ -205,23 +205,23 @@  discard block
 block discarded – undo
205 205
 		$instance = $new_instance;
206 206
 
207 207
 		// Force positive number
208
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
208
+		$instance[ 'limit' ] = empty( $instance[ 'limit' ] ) ? 10 : absint( $instance[ 'limit' ] );
209 209
 
210
-		$instance['view_id'] = intval( $instance['view_id'] );
210
+		$instance[ 'view_id' ] = intval( $instance[ 'view_id' ] );
211 211
 
212
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
212
+		$instance[ 'link_format' ] = trim( rtrim( $instance[ 'link_format' ] ) );
213 213
 
214
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
214
+		$instance[ 'link_format' ] = empty( $instance[ 'link_format' ] ) ? $old_instance[ 'link_format' ] : $instance[ 'link_format' ];
215 215
 
216
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
216
+		$instance[ 'post_id' ] = empty( $instance[ 'post_id' ] ) ? '' : intval( $instance[ 'post_id' ] );
217 217
 
218
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
218
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance[ 'post_id' ], $instance[ 'view_id' ] );
219 219
 
220 220
 		//check if post_id is a valid post with embedded View
221
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
221
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
222 222
 
223 223
 		// Share that the widget isn't brand new
224
-		$instance['updated']  = 1;
224
+		$instance[ 'updated' ] = 1;
225 225
 
226 226
 		/**
227 227
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -243,22 +243,22 @@  discard block
 block discarded – undo
243 243
 
244 244
 		// Set up some default widget settings.
245 245
 		$defaults = array(
246
-			'title' 			=> __('Recent Entries', 'gravityview'),
246
+			'title' 			=> __( 'Recent Entries', 'gravityview' ),
247 247
 			'view_id'           => NULL,
248 248
 			'post_id'           => NULL,
249 249
 			'limit'            => 10,
250
-			'link_format'       => __('Entry #{entry_id}', 'gravityview'),
250
+			'link_format'       => __( 'Entry #{entry_id}', 'gravityview' ),
251 251
 			'after_link'        => ''
252 252
 		);
253 253
 
254
-		$instance = wp_parse_args( (array) $instance, $defaults );
254
+		$instance = wp_parse_args( (array)$instance, $defaults );
255 255
 
256 256
 		?>
257 257
 
258 258
 		<!-- Title -->
259 259
 		<p>
260 260
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
261
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
261
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'title' ] ); ?>" />
262 262
 		</p>
263 263
 
264 264
 		<!-- Download -->
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 		$views = get_posts( $args );
272 272
 
273 273
 		// If there are no views set up yet, we get outta here.
274
-		if( empty( $views ) ) {
274
+		if ( empty( $views ) ) {
275 275
 			echo '<div id="select_gravityview_view"><div class="wrap">' . GravityView_Admin::no_views_text() . '</div></div>';
276 276
 			return;
277 277
 		}
@@ -283,10 +283,10 @@  discard block
 block discarded – undo
283 283
 		 * Display errors generated for invalid embed IDs
284 284
 		 * @see GravityView_View_Data::is_valid_embed_id
285 285
 		 */
286
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
286
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
287 287
 			?>
288 288
 			<div class="error inline hide-on-view-change">
289
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
289
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
290 290
 			</div>
291 291
 			<?php
292 292
 			unset ( $error );
@@ -294,14 +294,14 @@  discard block
 block discarded – undo
294 294
 		?>
295 295
 
296 296
 		<p>
297
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
297
+			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label>
298 298
 			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
299 299
 				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
300 300
 				<?php
301 301
 
302
-				foreach( $views as $view ) {
303
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
304
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
302
+				foreach ( $views as $view ) {
303
+					$title = empty( $view->post_title ) ? __( '(no title)', 'gravityview' ) : $view->post_title;
304
+					echo '<option value="' . $view->ID . '"' . selected( absint( $instance[ 'view_id' ] ), $view->ID ) . '>' . esc_html( sprintf( '%s #%d', $title, $view->ID ) ) . '</option>';
305 305
 				}
306 306
 
307 307
 				?>
@@ -313,10 +313,10 @@  discard block
 block discarded – undo
313 313
 		 * Display errors generated for invalid embed IDs
314 314
 		 * @see GravityView_View_Data::is_valid_embed_id
315 315
 		 */
316
-		if( !empty( $instance['error_post_id'] ) ) {
316
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
317 317
 			?>
318 318
 			<div class="error inline">
319
-				<p><?php echo $instance['error_post_id']; ?></p>
319
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
320 320
 			</div>
321 321
 			<?php
322 322
 			unset ( $error );
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
324 324
 		?>
325 325
 
326 326
 		<p>
327
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
328
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
327
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
328
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'post_id' ] ); ?>" />
329 329
 			<span class="howto"><?php
330
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
331
-				echo ' '.gravityview_get_link('https://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
330
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
331
+				echo ' ' . gravityview_get_link( 'https://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
332 332
 				?></span>
333 333
 		</p>
334 334
 
@@ -336,21 +336,21 @@  discard block
 block discarded – undo
336 336
 			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
337 337
 				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
338 338
 			</label>
339
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
339
+			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance[ 'limit' ] ); ?>" size="3" />
340 340
 		</p>
341 341
 
342 342
 		<p>
343 343
 			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
344 344
 				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
345 345
 			</label>
346
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
346
+			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance[ 'link_format' ] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
347 347
 		</p>
348 348
 
349 349
 		<p>
350 350
 			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
351 351
 				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
352 352
 			</label>
353
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
353
+			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance[ 'after_link' ] ); ?></textarea>
354 354
 		</p>
355 355
 
356 356
 		<?php
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
361 361
 		 * @param array $instance Current widget instance
362 362
 		 */
363
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
363
+		do_action( 'gravityview_recent_entries_widget_form', $this, $instance );
364 364
 
365 365
 		?>
366 366
 
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-route.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 		$format = '(?:\.(?P<format>html|json))?';
134 134
 
135
-		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ) , array(
135
+		register_rest_route( $namespace, sprintf( '/%s/(?P<id>[\d]+)/%s/(?P<s_id>[\w-]+)%s', $base, $sub_type, $format ), array(
136 136
 			array(
137 137
 				'methods'         => \WP_REST_Server::READABLE,
138 138
 				'callback'        => array( $this, 'get_sub_item' ),
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	 * @return \WP_REST_Response
383 383
 	 */
384 384
 	protected function not_implemented() {
385
-		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' )  );
385
+		$error = new \WP_Error( 'not-implemented-yet', __( 'Endpoint Not Yet Implemented.', 'gravityview' ) );
386 386
 		return new \WP_REST_Response( $error, 501 );
387 387
 	}
388 388
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-textarea.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,11 +27,11 @@  discard block
 block discarded – undo
27 27
 
28 28
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
29 29
 
30
-		if( 'edit' === $context ) {
30
+		if ( 'edit' === $context ) {
31 31
 			return $field_options;
32 32
 		}
33 33
 
34
-		$field_options['trim_words'] = array(
34
+		$field_options[ 'trim_words' ] = array(
35 35
 			'type' => 'number',
36 36
 			'merge_tags' => false,
37 37
 			'value' => null,
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
40 40
 		);
41 41
 
42
-        $field_options['make_clickable'] = array(
42
+        $field_options[ 'make_clickable' ] = array(
43 43
             'type' => 'checkbox',
44 44
             'merge_tags' => false,
45 45
             'value' => 0,
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
48 48
         );
49 49
 
50
-		$field_options['allow_html'] = array(
50
+		$field_options[ 'allow_html' ] = array(
51 51
 			'type' => 'checkbox',
52 52
 			'merge_tags' => false,
53 53
 			'value' => 1,
Please login to merge, or discard this patch.
includes/admin/field-types/type_number.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * number input type
4 4
  */
5 5
 
6
-if( !class_exists('GravityView_FieldType_text') ) {
6
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
7 7
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
8 8
 }
9 9
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 		$show_mt = $this->show_merge_tags();
22 22
 
23
-		if ( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
23
+		if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
24 24
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
25 25
 		}
26 26
 
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 		$step = \GV\Utils::get( $this->field, 'step', null );
32 32
 
33 33
 		$atts = '';
34
-		$atts .= $max ? ' max="' . (int) $max . '"' : '';
35
-		$atts .= $min ? ' min="' . (int) $min . '"' : '';
36
-		$atts .= $step ? ' step="' . (int) $step . '"' : '';
34
+		$atts .= $max ? ' max="' . (int)$max . '"' : '';
35
+		$atts .= $min ? ' min="' . (int)$min . '"' : '';
36
+		$atts .= $step ? ' step="' . (int)$step . '"' : '';
37 37
 		?>
38 38
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number"
39 39
 		       value="<?php echo esc_attr( $this->value ); ?>"
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravityformspartialentries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
55 55
 
56
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
56
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
57 57
 
58 58
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
59 59
 
@@ -66,14 +66,14 @@  discard block
 block discarded – undo
66 66
 		$partial_entry_id = \GV\Utils::get( $entry, 'partial_entry_id' );
67 67
 
68 68
 		// Set the expected $_POST key for the Add-On to use
69
-		$_POST['partial_entry_id'] = $partial_entry_id;
69
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
70 70
 
71 71
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
72 72
 			'partial_entry_id' => $partial_entry_id,
73 73
 			'entry_id'         => $entry_id
74 74
 		) );
75 75
 
76
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
76
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
77 77
 	}
78 78
 }
79 79
 
Please login to merge, or discard this patch.