Completed
Push — develop ( 8c385e...3fb87e )
by Zack
08:06
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->form->get_query_class( $view );
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/presets/default-table/class-gravityview-default-template-table.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -88,15 +88,15 @@
 block discarded – undo
88 88
 	 */
89 89
 	public function maybe_modify_button_label( $label = '', $atts = array() ) {
90 90
 
91
-		if( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
91
+		if ( $this->template_id !== \GV\Utils::get( $atts, 'template_id' ) ) {
92 92
 			return $label;
93 93
 		}
94 94
 
95
-		if( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
95
+		if ( 'field' !== \GV\Utils::get( $atts, 'type' ) ) {
96 96
 			return $label;
97 97
 		}
98 98
 
99
-		if( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
99
+		if ( 'edit' === \GV\Utils::get( $atts, 'zone' ) ) {
100 100
 			return $label;
101 101
 		}
102 102
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 				continue;
63 63
 			}
64 64
 
65
-			$field_id = intval( floor( $search_field['key'] ) );
66
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
65
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
66
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
67 67
 			$form = GravityView_View::getInstance()->getForm();
68 68
 
69 69
 			/** @var GF_Field_Address $address_field */
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 			$choices = array();
73 73
 
74 74
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
75
-			if( method_exists( $this, $method_name ) ) {
75
+			if ( method_exists( $this, $method_name ) ) {
76 76
 				/**
77 77
 				 * @uses GravityView_Field_Address::get_choices_country()
78 78
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -80,12 +80,12 @@  discard block
 block discarded – undo
80 80
 				$choices = $this->{$method_name}( $address_field, $form );
81 81
 			}
82 82
 
83
-			if( ! empty( $choices ) ) {
84
-				$search_field['choices'] = $choices;
85
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
83
+			if ( ! empty( $choices ) ) {
84
+				$search_field[ 'choices' ] = $choices;
85
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
86 86
 			} else {
87
-				$search_field['type'] = 'text';
88
-				$search_field['input'] = 'input_text';
87
+				$search_field[ 'type' ] = 'text';
88
+				$search_field[ 'input' ] = 'input_text';
89 89
 			}
90 90
 		}
91 91
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		$country_choices = array();
111 111
 
112 112
 		foreach ( $countries as $key => $country ) {
113
-			$country_choices[] = array(
113
+			$country_choices[ ] = array(
114 114
 				'value' => $country,
115 115
 				'text' => $country,
116 116
 			);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	private function get_choices_state( $address_field, $form ) {
137 137
 
138
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
138
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
139 139
 
140 140
 		$state_choices = array();
141 141
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 				$states = GFCommon::get_canadian_provinces();
148 148
 				break;
149 149
 			default:
150
-				$address_types = $address_field->get_address_types( $form['id'] );
151
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
150
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
151
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
152 152
 				break;
153 153
 		}
154 154
 
@@ -157,19 +157,19 @@  discard block
 block discarded – undo
157 157
 				$state_subchoices = array();
158 158
 
159 159
 				foreach ( $state as $key => $substate ) {
160
-					$state_subchoices[] = array(
160
+					$state_subchoices[ ] = array(
161 161
 						'value' => is_numeric( $key ) ? $substate : $key,
162 162
 						'text' => $substate,
163 163
 					);
164 164
 				}
165 165
 
166
-				$state_choices[] = array(
166
+				$state_choices[ ] = array(
167 167
 					'text' => $key,
168 168
 					'value' => $state_subchoices,
169 169
 				);
170 170
 
171 171
 			} else {
172
-				$state_choices[] = array(
172
+				$state_choices[ ] = array(
173 173
 					'value' => is_numeric( $key ) ? $state : $key,
174 174
 					'text' => $state,
175 175
 				);
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 		// Use the same inputs as the "text" input type allows
194 194
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
195 195
 
196
-		$input_types['street'] = $text_inputs;
197
-		$input_types['street2'] = $text_inputs;
198
-		$input_types['city'] = $text_inputs;
196
+		$input_types[ 'street' ] = $text_inputs;
197
+		$input_types[ 'street2' ] = $text_inputs;
198
+		$input_types[ 'city' ] = $text_inputs;
199 199
 
200
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
201
-		$input_types['zip'] = array( 'input_text' );
202
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
200
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
201
+		$input_types[ 'zip' ] = array( 'input_text' );
202
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
203 203
 
204 204
 		return $input_types;
205 205
 	}
@@ -220,12 +220,12 @@  discard block
 block discarded – undo
220 220
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
221 221
 		$input_id = gravityview_get_input_id_from_id( $field_id );
222 222
 
223
-		if( 'address' !== $field_type && $input_id ) {
223
+		if ( 'address' !== $field_type && $input_id ) {
224 224
 			return $input_type;
225 225
 		}
226 226
 
227 227
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
228
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
228
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
229 229
 			$input_type = $address_field_name;
230 230
 		}
231 231
 
@@ -273,20 +273,20 @@  discard block
 block discarded – undo
273 273
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
274 274
 
275 275
 		// If this is NOT the full address field, return default options.
276
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
276
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
277 277
 			return $field_options;
278 278
 		}
279 279
 
280
-		if( 'edit' === $context ) {
280
+		if ( 'edit' === $context ) {
281 281
 			return $field_options;
282 282
 		}
283 283
 
284 284
 		$add_options = array();
285 285
 
286
-		$add_options['show_map_link'] = array(
286
+		$add_options[ 'show_map_link' ] = array(
287 287
 			'type' => 'checkbox',
288 288
 			'label' => __( 'Show Map Link:', 'gravityview' ),
289
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
289
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
290 290
 			'value' => true,
291 291
 			'merge_tags' => false,
292 292
 		);
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function maybe_add_article_to_tooltip( $tooltip = '', $article = array(), $url = '', $atts = '', $css_class = '', $anchor_text = '' ) {
55 55
 
56
-		if ( empty( $article['id'] ) ) {
56
+		if ( empty( $article[ 'id' ] ) ) {
57 57
 			return $tooltip;
58 58
 		}
59 59
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
 
70 70
 		$css_class .= ' gv_tooltip';
71 71
 
72
-		if ( ! empty( $article['type'] ) ) {
73
-			$atts = sprintf( 'data-beacon-article-%s="%s"', $article['type'], $article['id'] );
72
+		if ( ! empty( $article[ 'type' ] ) ) {
73
+			$atts = sprintf( 'data-beacon-article-%s="%s"', $article[ 'type' ], $article[ 'id' ] );
74 74
 		} else {
75
-			$atts = sprintf( 'data-beacon-article="%s"', $article['id'] );
75
+			$atts = sprintf( 'data-beacon-article="%s"', $article[ 'id' ] );
76 76
 		}
77 77
 
78 78
 		$url = \GV\Utils::get( $article, 'url', '#' );
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 		) );
172 172
 
173 173
 		// This is just HTML we don't need.
174
-		unset( $response['message'] );
174
+		unset( $response[ 'message' ] );
175 175
 
176
-		switch ( intval( $response['price_id'] ) ) {
176
+		switch ( intval( $response[ 'price_id' ] ) ) {
177 177
 			default:
178 178
 			case 1:
179 179
 				$package = 'Core';
@@ -199,12 +199,12 @@  discard block
 block discarded – undo
199 199
 			'email'                 => $current_user->user_email,
200 200
 			'name'                  => mb_substr( $current_user->display_name, 0, 80 ),
201 201
 			'signature'             => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ),
202
-			'License Key'           => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')',
202
+			'License Key'           => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')',
203 203
 			'License Level'         => $package,
204 204
 			'Alt Emails'            => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ),
205
-			'Payment Details'       => $response['customer_name'] . ' ' . $response['customer_email'],
205
+			'Payment Details'       => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ],
206 206
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
207
-			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ),
207
+			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ),
208 208
 			'No-Conflict Mode'      => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled',
209 209
 			'GravityView Version'   => \GV\Plugin::$version,
210 210
 			'Gravity Forms Version' => GFForms::$version,
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 		ob_get_clean();
215 215
 
216 216
 		// Help Scout length limit is 200 characters
217
-		foreach( $data as $key => $value ) {
217
+		foreach ( $data as $key => $value ) {
218 218
 			if ( ! is_string( $value ) ) {
219 219
                 continue;
220 220
 			}
Please login to merge, or discard this patch.
includes/admin/class.field.type.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
         $defaults = self::get_field_defaults();
34 34
 
35 35
         // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
36
+        if ( ! empty( $field[ 'choices' ] ) ) {
37
+        	$field[ 'options' ] = $field[ 'choices' ];
38
+        	unset( $field[ 'choices' ] );
39 39
         }
40 40
 
41
-        $this->field =  wp_parse_args( $field, $defaults );
41
+        $this->field = wp_parse_args( $field, $defaults );
42 42
 
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
43
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
44 44
 
45 45
     }
46 46
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
 
81 81
     function get_tooltip() {
82
-        if( ! function_exists('gform_tooltip') ) {
82
+        if ( ! function_exists( 'gform_tooltip' ) ) {
83 83
             return null;
84 84
         }
85 85
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	    	'url' => '#',
90 90
 	    ) );
91 91
 
92
-        return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null;
92
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . $this->tooltip( $this->field[ 'tooltip' ], false, true, $article ) : null;
93 93
     }
94 94
 
95 95
     /**
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 	     * Below this line has been modified by GravityView.
133 133
 	     */
134 134
 
135
-		if ( empty( $tooltip_text ) && empty( $article['id'] ) ) {
135
+		if ( empty( $tooltip_text ) && empty( $article[ 'id' ] ) ) {
136 136
 			return '';
137 137
 		}
138 138
 
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
168 168
      * @return string
169 169
      */
170 170
     function get_field_id() {
171
-        if( isset( $this->field['id'] ) ) {
172
-            return esc_attr( $this->field['id'] );
171
+        if ( isset( $this->field[ 'id' ] ) ) {
172
+            return esc_attr( $this->field[ 'id' ] );
173 173
         }
174 174
         return esc_attr( sanitize_html_class( $this->name ) );
175 175
     }
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      * @return string
180 180
      */
181 181
     function get_field_label() {
182
-        return esc_html( trim( $this->field['label'] ) );
182
+        return esc_html( trim( $this->field[ 'label' ] ) );
183 183
     }
184 184
 
185 185
 	/**
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 	 * @return string
191 191
 	 */
192 192
 	function get_field_left_label() {
193
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
193
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
194 194
 	}
195 195
 
196 196
     /**
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
      * @return string
199 199
      */
200 200
     function get_label_class() {
201
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
201
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
202 202
     }
203 203
 
204 204
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
      * @return string
208 208
      */
209 209
     function get_field_desc() {
210
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
210
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
211 211
     }
212 212
 
213 213
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     function render_setting( $override_input = NULL ) {
242 242
 
243
-        if( !empty( $this->field['full_width'] ) ) { ?>
243
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
244 244
             <th scope="row" colspan="2">
245 245
                 <div>
246 246
                     <label for="<?php echo $this->get_field_id(); ?>">
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 		$is_table_layout = preg_match( '/table/ism', $template_id );
32 32
 
33
-		if( 'field' === $field_type ) {
33
+		if ( 'field' === $field_type ) {
34 34
 
35 35
 			// Default options - fields
36 36
 			$field_options = array(
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 				'custom_class' => array(
50 50
 					'type' => 'text',
51 51
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
52
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
52
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
53 53
 					'value' => '',
54 54
 					'merge_tags' => true,
55 55
 					'tooltip' => 'gv_css_merge_tags',
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 			);
71 71
 
72 72
 			// Match Table as well as DataTables
73
-			if( $is_table_layout && 'directory' === $context ) {
74
-				$field_options['width'] = array(
73
+			if ( $is_table_layout && 'directory' === $context ) {
74
+				$field_options[ 'width' ] = array(
75 75
 					'type' => 'number',
76
-					'label' => __('Percent Width', 'gravityview'),
77
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
76
+					'label' => __( 'Percent Width', 'gravityview' ),
77
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
78 78
 					'class' => 'code widefat',
79 79
 					'value' => '',
80 80
 				);
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 			'manage_options' => __( 'Administrator', 'gravityview' ),
130 130
 		);
131 131
 
132
-		if( is_multisite() ) {
133
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
132
+		if ( is_multisite() ) {
133
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
134 134
 		}
135 135
 
136 136
 		/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
144 144
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
145 145
 		 */
146
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
146
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
147 147
 
148 148
 		return $select_cap_choices;
149 149
 	}
@@ -171,27 +171,27 @@  discard block
 block discarded – undo
171 171
 	 */
172 172
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
173 173
 
174
-		if( empty( $uniqid ) ) {
174
+		if ( empty( $uniqid ) ) {
175 175
 			//generate a unique field id
176
-			$uniqid = uniqid('', false);
176
+			$uniqid = uniqid( '', false );
177 177
 		}
178 178
 
179 179
 		// get field/widget options
180 180
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id );
181 181
 
182 182
 		// two different post arrays, depending of the field type
183
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
183
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
184 184
 
185 185
 		// build output
186 186
 		$output = '';
187
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
188
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
187
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
188
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
189 189
 		if ( $form_id ) {
190
-			$output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
190
+			$output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
191 191
 		}
192 192
 
193 193
 		// If there are no options, return what we got.
194
-		if(empty($options)) {
194
+		if ( empty( $options ) ) {
195 195
 
196 196
 			// This is here for checking if the output is empty in render_label()
197 197
 			$output .= '<!-- No Options -->';
@@ -199,33 +199,33 @@  discard block
 block discarded – undo
199 199
 			return $output;
200 200
 		}
201 201
 
202
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
202
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
203 203
 
204 204
 		/**
205 205
 		 * @since 1.8
206 206
 		 */
207
-		if( !empty( $item['subtitle'] ) ) {
208
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
207
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
208
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
209 209
 		}
210 210
 
211
-		foreach( $options as $key => $option ) {
211
+		foreach ( $options as $key => $option ) {
212 212
 
213 213
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
214 214
 
215
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
215
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
216 216
 
217 217
 			// The setting is empty
218
-			if( empty( $field_output ) ) {
218
+			if ( empty( $field_output ) ) {
219 219
 				continue;
220 220
 			}
221 221
 
222
-			switch( $option['type'] ) {
222
+			switch ( $option[ 'type' ] ) {
223 223
 				// Hide hidden fields
224 224
 				case 'hidden':
225
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
225
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
226 226
 					break;
227 227
 				default:
228
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
228
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
229 229
 			}
230 230
 		}
231 231
 
@@ -254,17 +254,17 @@  discard block
 block discarded – undo
254 254
 		 * @deprecated setting index 'default' was replaced by 'value'
255 255
 		 * @see GravityView_FieldType::get_field_defaults
256 256
 		 */
257
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
258
-			$option['value'] = $option['default'];
259
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
257
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
258
+			$option[ 'value' ] = $option[ 'default' ];
259
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
260 260
 		}
261 261
 
262 262
 		// prepare to render option field type
263
-		if( isset( $option['type'] ) ) {
263
+		if ( isset( $option[ 'type' ] ) ) {
264 264
 
265 265
 			$type_class = self::load_type_class( $option );
266 266
 
267
-			if( class_exists( $type_class ) ) {
267
+			if ( class_exists( $type_class ) ) {
268 268
 
269 269
 				/** @var GravityView_FieldType $render_type */
270 270
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 				 * @param[in,out] string $output field class name
282 282
 				 * @param[in] array $option  option field data
283 283
 				 */
284
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
284
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
285 285
 			}
286 286
 
287 287
 		} // isset option[type]
@@ -316,27 +316,27 @@  discard block
 block discarded – undo
316 316
 		 * @deprecated setting index 'name' was replaced by 'label'
317 317
 		 * @see GravityView_FieldType::get_field_defaults
318 318
 		 */
319
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
320
-			$setting['label'] = $setting['name'];
321
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
319
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
320
+			$setting[ 'label' ] = $setting[ 'name' ];
321
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
322 322
 		}
323 323
 
324 324
 		$name = esc_attr( sprintf( $name, $key ) );
325
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
326
-		$setting['tooltip'] = 'gv_' . $key;
325
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
326
+		$setting[ 'tooltip' ] = 'gv_' . $key;
327 327
 
328 328
 		// Use default if current setting isn't set.
329
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
329
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
330 330
 
331 331
 		// default setting type = text
332
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
332
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
333 333
 
334 334
 		// merge tags
335
-		if( !isset( $setting['merge_tags'] ) ) {
336
-			if( $setting['type'] === 'text' ) {
337
-				$setting['merge_tags'] = true;
335
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
336
+			if ( $setting[ 'type' ] === 'text' ) {
337
+				$setting[ 'merge_tags' ] = true;
338 338
 			} else {
339
-				$setting['merge_tags'] = false;
339
+				$setting[ 'merge_tags' ] = false;
340 340
 			}
341 341
 		}
342 342
 
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 
345 345
 		// render the setting
346 346
 		$type_class = self::load_type_class( $setting );
347
-		if( class_exists( $type_class ) ) {
347
+		if ( class_exists( $type_class ) ) {
348 348
 			/** @var GravityView_FieldType $render_type */
349 349
 			$render_type = new $type_class( $name, $setting, $curr_value );
350 350
 			ob_start();
@@ -353,25 +353,25 @@  discard block
 block discarded – undo
353 353
 		}
354 354
 
355 355
 		// Check if setting is specific for a template
356
-		if( !empty( $setting['show_in_template'] ) ) {
357
-			if( !is_array( $setting['show_in_template'] ) ) {
358
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
356
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
357
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
358
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
359 359
 			}
360
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
360
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
361 361
 		} else {
362 362
 			$show_if = '';
363 363
 		}
364 364
 
365
-		if( ! empty( $setting['requires'] ) ) {
366
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
365
+		if ( ! empty( $setting[ 'requires' ] ) ) {
366
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
367 367
 		}
368 368
 
369
-		if( ! empty( $setting['requires_not'] ) ) {
370
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
369
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
370
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
371 371
 		}
372 372
 
373 373
 		// output
374
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
374
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
375 375
 
376 376
 	}
377 377
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 	 */
384 384
 	public static function load_type_class( $field = NULL ) {
385 385
 
386
-		if( empty( $field['type'] ) ) {
386
+		if ( empty( $field[ 'type' ] ) ) {
387 387
 			return NULL;
388 388
 		}
389 389
 
@@ -392,9 +392,9 @@  discard block
 block discarded – undo
392 392
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
393 393
 		 * @param array $field   field data
394 394
 		 */
395
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
395
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
396 396
 
397
-		if( class_exists( $type_class ) ) {
397
+		if ( class_exists( $type_class ) ) {
398 398
 			return $type_class;
399 399
 		}
400 400
 
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 		 * @param string  $field_type_include_path field class file path
404 404
 		 * @param array $field  field data
405 405
 		 */
406
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
406
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
407 407
 
408
-		if( $class_file && file_exists( $class_file ) ) {
408
+		if ( $class_file && file_exists( $class_file ) ) {
409 409
 			require_once( $class_file );
410 410
 		}
411 411
 
@@ -427,8 +427,8 @@  discard block
 block discarded – undo
427 427
 
428 428
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
429 429
 
430
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
431
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
430
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
431
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
432 432
 
433 433
 		return $output;
434 434
 	}
@@ -448,22 +448,22 @@  discard block
 block discarded – undo
448 448
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
449 449
 
450 450
 		// Show the merge tags if the field is a list view
451
-		$is_list = ( preg_match( '/_list-/ism', $name ));
451
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
452 452
 
453 453
 		// Or is a single entry view
454
-		$is_single = ( preg_match( '/single_/ism', $name ));
454
+		$is_single = ( preg_match( '/single_/ism', $name ) );
455 455
 		$show = ( $is_single || $is_list );
456 456
 
457 457
 		$class = '';
458 458
 		// and $add_merge_tags is not false
459
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
459
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
460 460
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
461 461
 		}
462 462
 
463
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
464
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
463
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
464
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
465 465
 
466
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
466
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
467 467
 	}
468 468
 
469 469
 	/**
@@ -480,21 +480,21 @@  discard block
 block discarded – undo
480 480
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
481 481
 
482 482
 		// Show the merge tags if the field is a list view
483
-		$is_list = ( preg_match( '/_list-/ism', $name ));
483
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
484 484
 
485 485
 		// Or is a single entry view
486
-		$is_single = ( preg_match( '/single_/ism', $name ));
486
+		$is_single = ( preg_match( '/single_/ism', $name ) );
487 487
 		$show = ( $is_single || $is_list );
488 488
 
489 489
 		$class = '';
490 490
 		// and $add_merge_tags is not false
491
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
491
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
492 492
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
493 493
 		}
494 494
 
495
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
495
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
496 496
 
497
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
497
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
498 498
 	}
499 499
 
500 500
 	/**
@@ -510,9 +510,9 @@  discard block
 block discarded – undo
510 510
 
511 511
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
512 512
 
513
-		$output = '<select name="'. $name .'" id="'. $id .'">';
514
-		foreach( $choices as $value => $label ) {
515
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
513
+		$output = '<select name="' . $name . '" id="' . $id . '">';
514
+		foreach ( $choices as $value => $label ) {
515
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
516 516
 		}
517 517
 		$output .= '</select>';
518 518
 
Please login to merge, or discard this patch.
future/includes/class-gv-utils.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 		 * Try subkeys after split.
92 92
 		 */
93 93
 		if ( count( $parts = explode( '/', $key, 2 ) ) > 1 ) {
94
-			return self::get( self::get( $array, $parts[0] ), $parts[1], $default );
94
+			return self::get( self::get( $array, $parts[ 0 ] ), $parts[ 1 ], $default );
95 95
 		}
96 96
 
97 97
 		return $default;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	public static function gf_query_debug( $query ) {
146 146
 		$introspect = $query->_introspect();
147 147
 		return array(
148
-			'where' => $query->_where_unwrap( $introspect['where'] )
148
+			'where' => $query->_where_unwrap( $introspect[ 'where' ] )
149 149
 		);
150 150
 	}
151 151
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		if ( $condition->expressions ) {
159 159
 			$conditions = array();
160 160
 			foreach ( $condition->expressions as $expression ) {
161
-				$conditions[] = self::gf_query_strip_condition_column_aliases( $expression );
161
+				$conditions[ ] = self::gf_query_strip_condition_column_aliases( $expression );
162 162
 			}
163 163
 			return call_user_func_array(
164 164
 				array( '\GF_Query_Condition', $condition->operator == 'AND' ? '_and' : '_or' ),
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$this->id         = $item_id;
76 76
 		$this->form_id    = $form_id;
77 77
 		$this->settings   = $settings;
78
-		$this->label_type = $item['label_type'];
78
+		$this->label_type = $item[ 'label_type' ];
79 79
 	}
80 80
 
81 81
 	/**
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 
120 120
 			foreach ( $field_info_items as $item ) {
121 121
 
122
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
122
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123 123
 					continue;
124 124
 				}
125 125
 
126
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
126
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
127 127
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
128 128
 				$output .= '<span class="' . $class . '">';
129
-				$output .= esc_html( $item['value'] );
129
+				$output .= esc_html( $item[ 'value' ] );
130 130
 				$output .= '</span>';
131 131
 			}
132 132
 
@@ -154,21 +154,21 @@  discard block
 block discarded – undo
154 154
 
155 155
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
156 156
 		// TODO: Un-hack this
157
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
-		$settings_link      = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
157
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158
+		$settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
159 159
 
160 160
 		// Should we show the icon that the field is being used as a link to single entry?
161
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
161
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
162 162
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
163 163
 
164 164
 		// When a field label is empty, use the Field ID
165 165
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
166 166
 
167 167
 		// If there's a custom label, and show label is checked, use that as the field heading
168
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
169
-			$label = $this->settings['custom_label'];
170
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
171
-			$label = $this->item['customLabel'];
168
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
169
+			$label = $this->settings[ 'custom_label' ];
170
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
171
+			$label = $this->item[ 'customLabel' ];
172 172
 		}
173 173
 		$label = esc_attr( $label );
174 174
 
@@ -177,8 +177,8 @@  discard block
 block discarded – undo
177 177
 		$output .= '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
178 178
 
179 179
 		$parent_label = '';
180
-		if ( ! empty( $this->item['parent'] ) ) {
181
-			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
180
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
181
+			$parent_label = ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
182 182
 		}
183 183
 
184 184
 		// Name of field / widget
@@ -193,10 +193,10 @@  discard block
 block discarded – undo
193 193
 
194 194
 		$output .= '</h5>';
195 195
 
196
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
197
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
196
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
197
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
198 198
 
199
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
199
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
200 200
 
201 201
 		return $output;
202 202
 	}
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
94 94
 	 */
95 95
 	public function _filter_sortable_fields( $fields ) {
96 96
 
97
-		$fields = (array) $fields;
97
+		$fields = (array)$fields;
98 98
 
99
-		$fields[] = 'duplicate_link';
99
+		$fields[ ] = 'duplicate_link';
100 100
 
101 101
 		return $fields;
102 102
 	}
@@ -135,12 +135,12 @@  discard block
 block discarded – undo
135 135
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
136 136
 
137 137
 		// Always a link, never a filter, always same window
138
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
138
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
139 139
 
140 140
 		// Duplicate Entry link should only appear to visitors capable of editing entries
141
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
141
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
142 142
 
143
-		$add_option['duplicate_link'] = array(
143
+		$add_option[ 'duplicate_link' ] = array(
144 144
 			'type' => 'text',
145 145
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
146 146
 			'desc' => NULL,
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			'merge_tags' => true,
149 149
 		);
150 150
 
151
-		$field_options['allow_duplicate_cap'] = array(
151
+		$field_options[ 'allow_duplicate_cap' ] = array(
152 152
 			'type' => 'select',
153 153
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
154 154
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
176 176
 
177 177
 		if ( 'edit' !== $zone ) {
178
-			$entry_default_fields['duplicate_link'] = array(
178
+			$entry_default_fields[ 'duplicate_link' ] = array(
179 179
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
180 180
 				'type'  => 'duplicate_link',
181 181
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 	 */
197 197
 	public function add_available_field( $available_fields = array() ) {
198 198
 
199
-		$available_fields['duplicate_link'] = array(
199
+		$available_fields[ 'duplicate_link' ] = array(
200 200
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
201 201
 			'field_id' => 'duplicate_link',
202 202
 			'label_type' => 'field',
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
 		if ( 'duplicate_link' === $field_id ) {
230 230
 
231 231
 			// Remove other built-in caps.
232
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
232
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
233 233
 
234
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
234
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
235 235
 		}
236 236
 
237 237
 		return $caps;
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
268 268
 
269
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
269
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
270 270
 
271 271
 		if ( empty( $base ) ) {
272 272
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
 
276 276
 		$actionurl = add_query_arg( array(
277 277
 			'action'	=> 'duplicate',
278
-			'entry_id'	=> $entry['id'],
278
+			'entry_id'	=> $entry[ 'id' ],
279 279
 			'gvid' => $view_id,
280 280
             'view_id' => $view_id,
281 281
 		), $base );
282 282
 
283
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
283
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
284 284
 	}
285 285
 
286 286
 	/**
@@ -301,12 +301,12 @@  discard block
 block discarded – undo
301 301
 	public function process_duplicate() {
302 302
 
303 303
 		// If the form is submitted
304
-		if ( ( ! isset( $_GET['action'] ) ) || 'duplicate' !== $_GET['action'] || ( ! isset( $_GET['entry_id'] ) ) ) {
304
+		if ( ( ! isset( $_GET[ 'action' ] ) ) || 'duplicate' !== $_GET[ 'action' ] || ( ! isset( $_GET[ 'entry_id' ] ) ) ) {
305 305
 			return;
306 306
 		}
307 307
 
308 308
 		// Make sure it's a GravityView request
309
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
309
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
310 310
 
311 311
 		if ( ! $valid_nonce_key ) {
312 312
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 		}
315 315
 
316 316
 		// Get the entry slug
317
-		$entry_slug = esc_attr( $_GET['entry_id'] );
317
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
318 318
 
319 319
 		// See if there's an entry there
320 320
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -408,17 +408,17 @@  discard block
 block discarded – undo
408 408
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
409 409
 		}
410 410
 
411
-		$form = GFAPI::get_form( $entry['form_id'] );
411
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
412 412
 
413
-		$row['id'] = null;
414
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
415
-		$row['date_updated'] = $row['date_created'];
416
-		$row['is_starred'] = false;
417
-		$row['is_read'] = false;
418
-		$row['ip'] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
419
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
420
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
421
-		$row['created_by'] = wp_get_current_user()->ID;
413
+		$row[ 'id' ] = null;
414
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
415
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
416
+		$row[ 'is_starred' ] = false;
417
+		$row[ 'is_read' ] = false;
418
+		$row[ 'ip' ] = rgars( $form, 'personalData/preventIP' ) ? '' : GFFormsModel::get_ip();
419
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid', 'result', 'duplicate', 'entry_id' ) ) );
420
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
421
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
422 422
 
423 423
 		/**
424 424
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -446,15 +446,15 @@  discard block
 block discarded – undo
446 446
 
447 447
 		$save_this_meta = array();
448 448
 		foreach ( $duplicate_meta->get_output() as $m ) {
449
-			$save_this_meta[] = array(
450
-				'meta_key' => $m['meta_key'],
451
-				'meta_value' => $m['meta_value'],
452
-				'item_index' => $m['item_index'],
449
+			$save_this_meta[ ] = array(
450
+				'meta_key' => $m[ 'meta_key' ],
451
+				'meta_value' => $m[ 'meta_value' ],
452
+				'item_index' => $m[ 'item_index' ],
453 453
 			);
454 454
 		}
455 455
 
456 456
 		// Update the row ID for later usage
457
-		$row['id'] = $duplicated_id;
457
+		$row[ 'id' ] = $duplicated_id;
458 458
 
459 459
 		/**
460 460
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -465,8 +465,8 @@  discard block
 block discarded – undo
465 465
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
466 466
 
467 467
 		foreach ( $save_this_meta as $data ) {
468
-			$data['form_id'] = $entry['form_id'];
469
-			$data['entry_id'] = $duplicated_id;
468
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
469
+			$data[ 'entry_id' ] = $duplicated_id;
470 470
 
471 471
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
472 472
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -500,13 +500,13 @@  discard block
 block discarded – undo
500 500
 	public function verify_nonce() {
501 501
 
502 502
 		// No duplicate entry request was made
503
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
503
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
504 504
 			return false;
505 505
 		}
506 506
 
507
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
507
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
508 508
 
509
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
509
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
510 510
 
511 511
 		/**
512 512
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 			return '';
543 543
 		}
544 544
 
545
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
545
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
546 546
 	}
547 547
 
548 548
 	/**
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
597 597
 		$current_user = wp_get_current_user();
598 598
 
599
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
599
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
600 600
 
601 601
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
602 602
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -611,17 +611,17 @@  discard block
 block discarded – undo
611 611
 		if ( ! empty( $field ) ) {
612 612
 
613 613
 			// If capability is not defined, something is not right!
614
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
614
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
615 615
 
616 616
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
617 617
 
618 618
 				return false;
619 619
 			}
620 620
 
621
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
621
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
622 622
 
623 623
 				// Do not return true if cap is read, as we need to check if the current user created the entry
624
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
624
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
625 625
 					return true;
626 626
 				}
627 627
 
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 
635 635
 		}
636 636
 
637
-		if ( ! isset( $entry['created_by'] ) ) {
637
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
638 638
 
639 639
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
640 640
 
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 		}
660 660
 
661 661
 		// If the logged-in user is the same as the user who created the entry, we're good.
662
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
662
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
663 663
 
664 664
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
665 665
 
@@ -683,12 +683,12 @@  discard block
 block discarded – undo
683 683
 	 * @return void
684 684
 	 */
685 685
 	public function maybe_display_message( $current_view_id = 0 ) {
686
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
686
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
687 687
 			return;
688 688
 		}
689 689
 
690 690
 		// Entry wasn't duplicated from current View
691
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
691
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
692 692
 			return;
693 693
 		}
694 694
 
@@ -696,11 +696,11 @@  discard block
 block discarded – undo
696 696
 	}
697 697
 
698 698
 	public function display_message() {
699
-		if ( empty( $_GET['status'] ) || empty( $_GET['duplicate'] ) ) {
699
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
700 700
 			return;
701 701
 		}
702 702
 
703
-		$status = esc_attr( $_GET['status'] );
703
+		$status = esc_attr( $_GET[ 'status' ] );
704 704
 		$message_from_url = \GV\Utils::_GET( 'message' );
705 705
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
706 706
 		$class = '';
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
727 727
 
728 728
 		// DISPLAY ERROR/SUCCESS MESSAGE
729
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
729
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
730 730
 	}
731 731
 
732 732
 	/**
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 		?>
757 757
 		<span class="gv-duplicate">
758 758
 			|
759
-			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry['id'] ), self::get_nonce_key( $entry['id'] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
759
+			<a href="<?php echo wp_nonce_url( add_query_arg( 'entry_id', $entry[ 'id' ] ), self::get_nonce_key( $entry[ 'id' ] ), 'duplicate' ); ?>"><?php esc_html_e( 'Duplicate', 'gravityview' ); ?></a>
760 760
 		</span>
761 761
 		<?php
762 762
 	}
@@ -778,9 +778,9 @@  discard block
 block discarded – undo
778 778
 
779 779
 		if ( 'success' === \GV\Utils::_GET( 'result' ) ) {
780 780
 			add_filter( 'gform_admin_messages', function( $messages ) {
781
-				$messages = (array) $messages;
781
+				$messages = (array)$messages;
782 782
 
783
-				$messages[] = esc_html__( 'Entry duplicated.', 'gravityview' );
783
+				$messages[ ] = esc_html__( 'Entry duplicated.', 'gravityview' );
784 784
 				return $messages;
785 785
 			} );
786 786
 		}
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 
792 792
 			$check_logs_message = '';
793 793
 
794
-			if( $is_logging_active ) {
794
+			if ( $is_logging_active ) {
795 795
 				$check_logs_message = sprintf( ' <a href="%s">%s</a>',
796 796
 					esc_url( admin_url( 'admin.php?page=gf_settings&subview=gravityformslogging' ) ),
797 797
 					esc_html_x( 'Check the GravityView logs for more information.', 'Error message links to logging page', 'gravityview' )
@@ -799,9 +799,9 @@  discard block
 block discarded – undo
799 799
 			}
800 800
 
801 801
 			add_filter( 'gform_admin_error_messages', function( $messages ) use ( $check_logs_message ) {
802
-				$messages = (array) $messages;
802
+				$messages = (array)$messages;
803 803
 
804
-				$messages[] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
804
+				$messages[ ] = esc_html__( 'There was an error duplicating the entry.', 'gravityview' ) . $check_logs_message;
805 805
 
806 806
 				return $messages;
807 807
 			} );
Please login to merge, or discard this patch.