Completed
Pull Request — develop (#1573)
by Zack
20:26
created
includes/class-frontend-views.php 1 patch
Spacing   +95 added lines, -95 removed lines patch added patch discarded remove patch
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 	private function __construct() {}
86 86
 
87 87
 	private function initialize() {
88
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
88
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
89 89
 		add_filter( 'parse_query', array( $this, 'parse_query_fix_frontpage' ), 10 );
90
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
90
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
91 91
 
92 92
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
93 93
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -234,18 +234,18 @@  discard block
 block discarded – undo
234 234
 
235 235
 		if ( ! empty( $view_id ) ) {
236 236
 
237
-			$this->context_view_id = (int) $view_id;
237
+			$this->context_view_id = (int)$view_id;
238 238
 
239
-		} elseif ( isset( $_GET['gvid'] ) && $multiple_views ) {
239
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $multiple_views ) {
240 240
 			/**
241 241
 			 * used on a has_multiple_views context
242 242
 			 * @see GravityView_API::entry_link
243 243
 			 */
244
-			$this->context_view_id = (int) $_GET['gvid'];
244
+			$this->context_view_id = (int)$_GET[ 'gvid' ];
245 245
 
246 246
 		} elseif ( ! $multiple_views ) {
247 247
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
248
-			$this->context_view_id = (int) array_pop( $array_keys );
248
+			$this->context_view_id = (int)array_pop( $array_keys );
249 249
 			unset( $array_keys );
250 250
 		}
251 251
 
@@ -278,25 +278,25 @@  discard block
 block discarded – undo
278 278
 		global $wp_rewrite;
279 279
 
280 280
 		$is_front_page = ( $query->is_home || $query->is_page );
281
-		$show_on_front = ( 'page' === get_option('show_on_front') );
282
-		$front_page_id = get_option('page_on_front');
281
+		$show_on_front = ( 'page' === get_option( 'show_on_front' ) );
282
+		$front_page_id = get_option( 'page_on_front' );
283 283
 
284
-		if (  $is_front_page && $show_on_front && $front_page_id ) {
284
+		if ( $is_front_page && $show_on_front && $front_page_id ) {
285 285
 
286 286
 			// Force to be an array, potentially a query string ( entry=16 )
287 287
 			$_query = wp_parse_args( $query->query );
288 288
 
289 289
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
290
-			if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
291
-				unset( $_query['pagename'] );
290
+			if ( isset( $_query[ 'pagename' ] ) && '' === $_query[ 'pagename' ] ) {
291
+				unset( $_query[ 'pagename' ] );
292 292
 			}
293 293
 
294 294
 			// this is where will break from core wordpress
295 295
 			/** @internal Don't use this filter; it will be unnecessary soon - it's just a patch for specific use case */
296 296
 			$ignore = apply_filters( 'gravityview/internal/ignored_endpoints', array( 'preview', 'page', 'paged', 'cpage' ), $query );
297 297
 			$endpoints = \GV\Utils::get( $wp_rewrite, 'endpoints' );
298
-			foreach ( (array) $endpoints as $endpoint ) {
299
-				$ignore[] = $endpoint[1];
298
+			foreach ( (array)$endpoints as $endpoint ) {
299
+				$ignore[ ] = $endpoint[ 1 ];
300 300
 			}
301 301
 			unset( $endpoints );
302 302
 
@@ -306,21 +306,21 @@  discard block
 block discarded – undo
306 306
 			// - The query includes keys that are associated with registered endpoints. `entry`, for example.
307 307
 			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), $ignore ) ) {
308 308
 
309
-				$qv =& $query->query_vars;
309
+				$qv = & $query->query_vars;
310 310
 
311 311
 				// Prevent redirect when on the single entry endpoint
312
-				if( self::is_single_entry() ) {
312
+				if ( self::is_single_entry() ) {
313 313
 					add_filter( 'redirect_canonical', '__return_false' );
314 314
 				}
315 315
 
316 316
 				$query->is_page = true;
317 317
 				$query->is_home = false;
318
-				$qv['page_id']  = $front_page_id;
318
+				$qv[ 'page_id' ]  = $front_page_id;
319 319
 
320 320
 				// Correct <!--nextpage--> for page_on_front
321
-				if ( ! empty( $qv['paged'] ) ) {
322
-					$qv['page'] = $qv['paged'];
323
-					unset( $qv['paged'] );
321
+				if ( ! empty( $qv[ 'paged' ] ) ) {
322
+					$qv[ 'page' ] = $qv[ 'paged' ];
323
+					unset( $qv[ 'paged' ] );
324 324
 				}
325 325
 			}
326 326
 
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 
351 351
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
352 352
 
353
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
353
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
354 354
 		$this->setPostId( $post_id );
355 355
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
356 356
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
 
387 387
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
388 388
 
389
-		if( 'post' === $search_method ) {
389
+		if ( 'post' === $search_method ) {
390 390
 			$get = $_POST;
391 391
 		} else {
392 392
 			$get = $_GET;
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		$gventry = gravityview()->request->is_entry();
439 439
 
440 440
 		// If this is the directory view, return.
441
-		if( ! $gventry ) {
441
+		if ( ! $gventry ) {
442 442
 			return $passed_title;
443 443
 		}
444 444
 
@@ -456,19 +456,19 @@  discard block
 block discarded – undo
456 456
 		}
457 457
 
458 458
 		// WooCommerce doesn't $post_id
459
-		if ( empty( $passed_post_id ) )  {
459
+		if ( empty( $passed_post_id ) ) {
460 460
 			return $passed_title;
461 461
 		}
462 462
 
463 463
 		// Don't modify the title for anything other than the current view/post.
464 464
 		// This is true for embedded shortcodes and Views.
465
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
465
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
466 466
 			return $passed_title;
467 467
 		}
468 468
 
469 469
 		$view = gravityview()->request->is_view();
470 470
 
471
-		if( $view ) {
471
+		if ( $view ) {
472 472
 			return $this->_get_single_entry_title( $view, $entry, $passed_title );
473 473
 		}
474 474
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 		$view_collection = \GV\View_Collection::from_post( $post );
492 492
 
493 493
 		// We have multiple Views, but no gvid...this isn't valid security
494
-		if( 1 < $view_collection->count() ) {
494
+		if ( 1 < $view_collection->count() ) {
495 495
 			return $passed_title;
496 496
 		}
497 497
 
@@ -525,18 +525,18 @@  discard block
 block discarded – undo
525 525
 		 */
526 526
 		$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view );
527 527
 
528
-		if( $check_entry_display ) {
528
+		if ( $check_entry_display ) {
529 529
 
530 530
 			$check_display = GVCommon::check_entry_display( $entry, $view );
531 531
 
532
-			if( is_wp_error( $check_display ) ) {
532
+			if ( is_wp_error( $check_display ) ) {
533 533
 				return $passed_title;
534 534
 			}
535 535
 		}
536 536
 
537 537
 		$title = $view->settings->get( 'single_title', $passed_title );
538 538
 
539
-		$form = GVCommon::get_form( $entry['form_id'] );
539
+		$form = GVCommon::get_form( $entry[ 'form_id' ] );
540 540
 
541 541
 		// We are allowing HTML in the fields, so no escaping the output
542 542
 		$title = GravityView_API::replace_variables( $title, $form, $entry );
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 
608 608
 		$context = GravityView_View::getInstance()->getContext();
609 609
 
610
-		switch( $context ) {
610
+		switch ( $context ) {
611 611
 			case 'directory':
612 612
 				$tab = __( 'Multiple Entries', 'gravityview' );
613 613
 				break;
@@ -621,12 +621,12 @@  discard block
 block discarded – undo
621 621
 		}
622 622
 
623 623
 
624
-		$title = sprintf( esc_html_x('The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
624
+		$title = sprintf( esc_html_x( 'The %s layout has not been configured.', 'Displayed when a View is not configured. %s is replaced by the tab label', 'gravityview' ), $tab );
625 625
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
626
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
626
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
627 627
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
628 628
 
629
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url(plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
629
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
630 630
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
631 631
 
632 632
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
674 674
 		$embed_only = $view->settings->get( 'embed_only' );
675 675
 
676
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
676
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
677 677
 			return __( 'You are not allowed to view this content.', 'gravityview' );
678 678
 		}
679 679
 
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 				$datetime_format = 'Y-m-d H:i:s';
721 721
 				$search_is_outside_view_bounds = false;
722 722
 
723
-				if( ! empty( $search_criteria[ $key ] ) ) {
723
+				if ( ! empty( $search_criteria[ $key ] ) ) {
724 724
 
725 725
 					$search_date = strtotime( $search_criteria[ $key ], GFCommon::get_local_timestamp() );
726 726
 
@@ -748,14 +748,14 @@  discard block
 block discarded – undo
748 748
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
749 749
 
750 750
 					// Then we override the search and re-set the start date
751
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
751
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
752 752
 				}
753 753
 			}
754 754
 		}
755 755
 
756
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
756
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
757 757
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
758
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
758
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
759 759
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
760 760
 			}
761 761
 		}
@@ -774,19 +774,19 @@  discard block
 block discarded – undo
774 774
 	public static function process_search_only_approved( $args, $search_criteria ) {
775 775
 
776 776
 		/** @since 1.19 */
777
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
777
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
778 778
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
779 779
 			return $search_criteria;
780 780
 		}
781 781
 
782
-		if ( ! empty( $args['show_only_approved'] ) ) {
782
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
783 783
 
784
-			$search_criteria['field_filters'][] = array(
784
+			$search_criteria[ 'field_filters' ][ ] = array(
785 785
 				'key' => GravityView_Entry_Approval::meta_key,
786 786
 				'value' => GravityView_Entry_Approval_Status::APPROVED
787 787
 			);
788 788
 
789
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
789
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
790 790
 
791 791
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
792 792
 		}
@@ -813,18 +813,18 @@  discard block
 block discarded – undo
813 813
 	 */
814 814
 	public static function is_entry_approved( $entry, $args = array() ) {
815 815
 
816
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
816
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
817 817
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
818 818
 			return true;
819 819
 		}
820 820
 
821 821
 		/** @since 1.19 */
822
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
822
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
823 823
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
824 824
 			return true;
825 825
 		}
826 826
 
827
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
827
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
828 828
 
829 829
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
830 830
 	}
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
849 849
 		 */
850 850
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
851
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
851
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
852 852
 
853 853
 		/**
854 854
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -868,29 +868,29 @@  discard block
 block discarded – undo
868 868
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
869 869
 
870 870
 		// implicity search
871
-		if ( ! empty( $args['search_value'] ) ) {
871
+		if ( ! empty( $args[ 'search_value' ] ) ) {
872 872
 
873 873
 			// Search operator options. Options: `is` or `contains`
874
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
874
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
875 875
 
876
-			$search_criteria['field_filters'][] = array(
876
+			$search_criteria[ 'field_filters' ][ ] = array(
877 877
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
878
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
878
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
879 879
 				'operator' => $operator,
880 880
 			);
881 881
 
882 882
 			// Lock search mode to "all" with implicit presearch filter.
883
-			$search_criteria['field_filters']['mode'] = 'all';
883
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
884 884
 		}
885 885
 
886
-		if( $search_criteria !== $original_search_criteria ) {
886
+		if ( $search_criteria !== $original_search_criteria ) {
887 887
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
888 888
 		}
889 889
 
890 890
 		// Handle setting date range
891 891
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
892 892
 
893
-		if( $search_criteria !== $original_search_criteria ) {
893
+		if ( $search_criteria !== $original_search_criteria ) {
894 894
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
895 895
 		}
896 896
 
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
902 902
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
903 903
 		 */
904
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
904
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
905 905
 
906 906
 		return $search_criteria;
907 907
 	}
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
 			'search_criteria' => $search_criteria,
1014 1014
 			'sorting' => self::updateViewSorting( $args, $form_id ),
1015 1015
 			'paging' => $paging,
1016
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
1016
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
1017 1017
 		);
1018 1018
 
1019 1019
 		/**
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
1039 1039
 		 * @param array $args View configuration args.
1040 1040
 		 */
1041
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1041
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1042 1042
 
1043 1043
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
1044 1044
 
@@ -1063,17 +1063,17 @@  discard block
 block discarded – undo
1063 1063
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
1064 1064
 
1065 1065
 		// Paging & offset
1066
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
1066
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
1067 1067
 
1068 1068
 		if ( -1 === $page_size ) {
1069 1069
 			$page_size = PHP_INT_MAX;
1070 1070
 		}
1071 1071
 
1072
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
1072
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
1073 1073
 		$offset = ( $curr_page - 1 ) * $page_size;
1074 1074
 
1075
-		if ( ! empty( $args['offset'] ) ) {
1076
-			$offset += intval( $args['offset'] );
1075
+		if ( ! empty( $args[ 'offset' ] ) ) {
1076
+			$offset += intval( $args[ 'offset' ] );
1077 1077
 		}
1078 1078
 
1079 1079
 		$paging = array(
@@ -1098,11 +1098,11 @@  discard block
 block discarded – undo
1098 1098
 	public static function updateViewSorting( $args, $form_id ) {
1099 1099
 		$sorting = array();
1100 1100
 
1101
-		$has_values = isset( $_GET['sort'] );
1101
+		$has_values = isset( $_GET[ 'sort' ] );
1102 1102
 
1103
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
1104
-			$sorts = array_keys( $_GET['sort'] );
1105
-			$dirs  = array_values( $_GET['sort'] );
1103
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
1104
+			$sorts = array_keys( $_GET[ 'sort' ] );
1105
+			$dirs  = array_values( $_GET[ 'sort' ] );
1106 1106
 
1107 1107
 			if ( $has_values = array_filter( $dirs ) ) {
1108 1108
 				$sort_field_id = end( $sorts );
@@ -1111,11 +1111,11 @@  discard block
 block discarded – undo
1111 1111
 		}
1112 1112
 
1113 1113
 		if ( ! isset( $sort_field_id ) ) {
1114
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
1114
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
1115 1115
 		}
1116 1116
 
1117 1117
 		if ( ! isset( $sort_direction ) ) {
1118
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
1118
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
1119 1119
 		}
1120 1120
 
1121 1121
 		if ( is_array( $sort_field_id ) ) {
@@ -1147,10 +1147,10 @@  discard block
 block discarded – undo
1147 1147
 				$form = GFAPI::get_form( $form_id );
1148 1148
 
1149 1149
 				// Get the first GF_Field field ID, set as the key for entry randomization
1150
-				if ( ! empty( $form['fields'] ) ) {
1150
+				if ( ! empty( $form[ 'fields' ] ) ) {
1151 1151
 
1152 1152
 					/** @var GF_Field $field */
1153
-					foreach ( $form['fields'] as $field ) {
1153
+					foreach ( $form[ 'fields' ] as $field ) {
1154 1154
 						if ( ! is_a( $field, 'GF_Field' ) ) {
1155 1155
 							continue;
1156 1156
 						}
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 		if ( is_array( $sort_field_id ) ) {
1196 1196
 			$modified_ids = array();
1197 1197
 			foreach ( $sort_field_id as $_sort_field_id ) {
1198
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1198
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1199 1199
 			}
1200 1200
 			return $modified_ids;
1201 1201
 		}
@@ -1204,11 +1204,11 @@  discard block
 block discarded – undo
1204 1204
 
1205 1205
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1206 1206
 
1207
-		if( ! $sort_field ) {
1207
+		if ( ! $sort_field ) {
1208 1208
 			return $sort_field_id;
1209 1209
 		}
1210 1210
 
1211
-		switch ( $sort_field['type'] ) {
1211
+		switch ( $sort_field[ 'type' ] ) {
1212 1212
 
1213 1213
 			case 'address':
1214 1214
 				// Sorting by full address
@@ -1225,7 +1225,7 @@  discard block
 block discarded – undo
1225 1225
 					 */
1226 1226
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1227 1227
 
1228
-					switch( strtolower( $address_part ) ){
1228
+					switch ( strtolower( $address_part ) ) {
1229 1229
 						case 'street':
1230 1230
 							$sort_field_id .= '.1';
1231 1231
 							break;
@@ -1298,7 +1298,7 @@  discard block
 block discarded – undo
1298 1298
 		if ( ! class_exists( '\GV\Entry' ) ) {
1299 1299
 
1300 1300
 			// Not using gravityview()->log->error(), since that may not exist yet either!
1301
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
1301
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
1302 1302
 
1303 1303
 			return null;
1304 1304
 		}
@@ -1315,7 +1315,7 @@  discard block
 block discarded – undo
1315 1315
 		 */
1316 1316
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1317 1317
 
1318
-		if ( empty( $single_entry ) ){
1318
+		if ( empty( $single_entry ) ) {
1319 1319
 			return false;
1320 1320
 		} else {
1321 1321
 			return $single_entry;
@@ -1336,7 +1336,7 @@  discard block
 block discarded – undo
1336 1336
 			$views = $this->getGvOutputData()->get_views();
1337 1337
 
1338 1338
 			foreach ( $views as $view_id => $data ) {
1339
-				$view = \GV\View::by_id( $data['id'] );
1339
+				$view = \GV\View::by_id( $data[ 'id' ] );
1340 1340
 				$view_id = $view->ID;
1341 1341
 				$template_id = gravityview_get_template_id( $view->ID );
1342 1342
 				$data = $view->as_data();
@@ -1345,7 +1345,7 @@  discard block
 block discarded – undo
1345 1345
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1346 1346
 				 * @since 1.15
1347 1347
 				 */
1348
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1348
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1349 1349
 					continue;
1350 1350
 				}
1351 1351
 
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 					 * @param \GV\View The View.
1375 1375
 					 */
1376 1376
 					$js_dependency = apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
1377
-					$js_dependencies[] = $js_dependency;
1377
+					$js_dependencies[ ] = $js_dependency;
1378 1378
 
1379 1379
 					/**
1380 1380
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
@@ -1390,7 +1390,7 @@  discard block
 block discarded – undo
1390 1390
 					 * @param \GV\View The View.
1391 1391
 					 */
1392 1392
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
1393
-					$css_dependencies[] = $css_dependency;
1393
+					$css_dependencies[ ] = $css_dependency;
1394 1394
 				}
1395 1395
 
1396 1396
 				/**
@@ -1398,19 +1398,19 @@  discard block
 block discarded – undo
1398 1398
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1399 1399
 				 * @since 1.15
1400 1400
 				 */
1401
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1402
-					$css_dependencies[] = 'dashicons';
1401
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1402
+					$css_dependencies[ ] = 'dashicons';
1403 1403
 				}
1404 1404
 
1405 1405
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1406 1406
 
1407 1407
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1408 1408
 
1409
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
1409
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
1410 1410
 
1411 1411
 				wp_enqueue_script( 'gravityview-fe-view' );
1412 1412
 
1413
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1413
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1414 1414
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1415 1415
 				}
1416 1416
 
@@ -1473,7 +1473,7 @@  discard block
 block discarded – undo
1473 1473
 	public static function add_style( $template_id ) {
1474 1474
 
1475 1475
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
1476
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1476
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1477 1477
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
1478 1478
 		} elseif ( empty( $template_id ) ) {
1479 1479
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1504,11 +1504,11 @@  discard block
 block discarded – undo
1504 1504
 		 * Not a table-based template; don't add sort icons
1505 1505
 		 * @since 1.12
1506 1506
 		 */
1507
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1507
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1508 1508
 			return $label;
1509 1509
 		}
1510 1510
 
1511
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1511
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1512 1512
 			return $label;
1513 1513
 		}
1514 1514
 
@@ -1516,29 +1516,29 @@  discard block
 block discarded – undo
1516 1516
 
1517 1517
 		$class = 'gv-sort';
1518 1518
 
1519
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1519
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1520 1520
 
1521 1521
 		$sort_args = array(
1522
-			'sort' => $field['id'],
1522
+			'sort' => $field[ 'id' ],
1523 1523
 			'dir' => 'asc',
1524 1524
 		);
1525 1525
 
1526
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1526
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1527 1527
 			//toggle sorting direction.
1528
-			if ( 'asc' === $sorting['direction'] ) {
1529
-				$sort_args['dir'] = 'desc';
1528
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1529
+				$sort_args[ 'dir' ] = 'desc';
1530 1530
 				$class .= ' gv-icon-sort-desc';
1531 1531
 			} else {
1532
-				$sort_args['dir'] = 'asc';
1532
+				$sort_args[ 'dir' ] = 'asc';
1533 1533
 				$class .= ' gv-icon-sort-asc';
1534 1534
 			}
1535 1535
 		} else {
1536 1536
 			$class .= ' gv-icon-caret-up-down';
1537 1537
 		}
1538 1538
 
1539
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1539
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1540 1540
 
1541
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1541
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1542 1542
 
1543 1543
 	}
1544 1544
 
@@ -1556,7 +1556,7 @@  discard block
 block discarded – undo
1556 1556
 
1557 1557
 		$field_type = $field_id;
1558 1558
 
1559
-		if( is_numeric( $field_id ) ) {
1559
+		if ( is_numeric( $field_id ) ) {
1560 1560
 			$field = GFFormsModel::get_field( $form, $field_id );
1561 1561
 			$field_type = $field ? $field->type : $field_id;
1562 1562
 		}
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 			return false;
1580 1580
 		}
1581 1581
 
1582
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1582
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1583 1583
 
1584 1584
 	}
1585 1585
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -26,21 +26,21 @@  discard block
 block discarded – undo
26 26
 
27 27
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
28 28
 
29
-		unset( $field_options['search_filter'] );
29
+		unset( $field_options[ 'search_filter' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35
-		$add_options['link_to_file'] = array(
35
+		$add_options[ 'link_to_file' ] = array(
36 36
 			'type' => 'checkbox',
37 37
 			'label' => __( 'Display as a Link:', 'gravityview' ),
38
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
38
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
39 39
 			'value' => false,
40 40
 			'merge_tags' => false,
41 41
 		);
42 42
 
43
-		$add_options['image_width'] = array(
43
+		$add_options[ 'image_width' ] = array(
44 44
 			'type' => 'text',
45 45
 			'label' => __( 'Custom Width:', 'gravityview' ),
46 46
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -129,14 +129,14 @@  discard block
 block discarded – undo
129 129
 			$base_id = null;
130 130
 
131 131
 			$is_single = gravityview_get_context() === 'single';
132
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
132
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
133 133
 			$field_compat = $gravityview_view->getCurrentField();
134 134
 		}
135 135
 
136 136
 		$output_arr = array();
137 137
 
138 138
 		// Get an array of file paths for the field.
139
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
139
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
140 140
 
141 141
 		// The $value JSON was probably truncated; let's check lead_detail_long.
142 142
 		if ( ! is_array( $file_paths ) ) {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 			$rendered = null;
156 156
 
157 157
 			// If the site is HTTPS, use HTTPS
158
-			if ( function_exists('set_url_scheme') ) {
158
+			if ( function_exists( 'set_url_scheme' ) ) {
159 159
 				$file_path = set_url_scheme( $file_path );
160 160
 			}
161 161
 
@@ -166,8 +166,8 @@  discard block
 block discarded – undo
166 166
 			$file_path_info = pathinfo( $file_path );
167 167
 
168 168
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
169
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
170
-			$basename = $file_path_info['basename'];
169
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
170
+			$basename = $file_path_info[ 'basename' ];
171 171
 
172 172
 			// Get the secure download URL
173 173
 			$is_secure = false;
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 					 */
207 207
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
208 208
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
209
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
209
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
210 210
 					), $context );
211 211
 
212 212
 					/**
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 					 */
243 243
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
244 244
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
245
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
245
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
246 246
 					), $context );
247 247
 
248 248
 					/**
@@ -275,13 +275,13 @@  discard block
 block discarded – undo
275 275
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
276 276
 				$image_atts = array(
277 277
 					'src'   => $file_path,
278
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
279
-					'alt'   => $field_settings['label'],
280
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
278
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
279
+					'alt'   => $field_settings[ 'label' ],
280
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
281 281
 				);
282 282
 
283 283
 				if ( $is_secure ) {
284
-					$image_atts['validate_src'] = false;
284
+					$image_atts[ 'validate_src' ] = false;
285 285
 				}
286 286
 
287 287
 				/**
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 				unset( $gv_entry );
304 304
 
305
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) ) {
305
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) ) {
306 306
 					$lightbox_link_atts = array(
307 307
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
308 308
 						'class' => '',
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 				}
319 319
 
320 320
 				// Show as link should render the image regardless.
321
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
321
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
322 322
 					$text = $rendered;
323 323
 				}
324 324
 			}
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
336 336
 
337 337
 			// Output textualized content where
338
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
338
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
339 339
 				/**
340 340
 				 * Modify the link text (defaults to the file name)
341 341
 				 *
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 				 */
349 349
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
350 350
 
351
-				if ( empty( $field_settings['show_as_link'] ) ) {
351
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
352 352
 					/**
353 353
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
354 354
 					 * @param array|string $link_atts Array or attributes string
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 				$content = empty( $rendered ) ? $text : $rendered;
365 365
 			}
366 366
 
367
-			$output_arr[] = array(
367
+			$output_arr[ ] = array(
368 368
 				'file_path' => $file_path,
369 369
 				'content' => $content
370 370
 			);
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * @return void
164 164
 	 */
165 165
 	function maybe_add_note() {
166
-		if ( ! isset( $_POST['action'] ) || 'gv_note_add' !== $_POST['action'] ) {
166
+		if ( ! isset( $_POST[ 'action' ] ) || 'gv_note_add' !== $_POST[ 'action' ] ) {
167 167
 			return;
168 168
 		}
169 169
 
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
176 176
 		$post = wp_unslash( $_POST );
177 177
 
178 178
 		if ( $this->doing_ajax ) {
179
-			parse_str( $post['data'], $data );
179
+			parse_str( $post[ 'data' ], $data );
180 180
 		} else {
181 181
 			$data = $post;
182 182
 		}
183 183
 
184
-		$this->process_add_note( (array) $data );
184
+		$this->process_add_note( (array)$data );
185 185
 	}
186 186
 
187 187
 	/**
@@ -207,23 +207,23 @@  discard block
 block discarded – undo
207 207
 		$error = false;
208 208
 		$success = false;
209 209
 
210
-		if( empty( $data['entry-slug'] ) ) {
210
+		if ( empty( $data[ 'entry-slug' ] ) ) {
211 211
 
212
-			$error = self::strings('error-invalid');
212
+			$error = self::strings( 'error-invalid' );
213 213
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
214 214
 
215 215
 		} else {
216 216
 
217
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
217
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
218 218
 
219 219
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
220 220
 
221
-			if( ! $has_cap ) {
221
+			if ( ! $has_cap ) {
222 222
 				$error = self::strings( 'error-cap-add' );
223 223
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
224 224
 			} elseif ( $valid ) {
225 225
 
226
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
226
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
227 227
 
228 228
 				$added = $this->add_note( $entry, $data );
229 229
 
@@ -241,22 +241,22 @@  discard block
 block discarded – undo
241 241
 					$this->maybe_send_entry_notes( $note, $entry, $data );
242 242
 
243 243
 					if ( $note ) {
244
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
244
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
245 245
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
246 246
 					} else {
247
-						$error = self::strings('error-add-note');
247
+						$error = self::strings( 'error-add-note' );
248 248
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
249 249
 					}
250 250
 				}
251 251
 			} else {
252
-				$error = self::strings('error-invalid');
252
+				$error = self::strings( 'error-invalid' );
253 253
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
254 254
 			}
255 255
 		}
256 256
 
257 257
 
258
-		if( $this->doing_ajax ) {
259
-			if( $success ) {
258
+		if ( $this->doing_ajax ) {
259
+			if ( $success ) {
260 260
 				wp_send_json_success( array( 'html' => $success ) );
261 261
 			} else {
262 262
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -282,11 +282,11 @@  discard block
 block discarded – undo
282 282
 			return;
283 283
 		}
284 284
 
285
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
285
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
286 286
 
287 287
 			$post = wp_unslash( $_POST );
288 288
 			if ( $this->doing_ajax ) {
289
-				parse_str( $post['data'], $data );
289
+				parse_str( $post[ 'data' ], $data );
290 290
 			} else {
291 291
 				$data = $post;
292 292
 			}
@@ -317,18 +317,18 @@  discard block
 block discarded – undo
317 317
 	 */
318 318
 	function process_delete_notes( $data ) {
319 319
 
320
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
320
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
321 321
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
322 322
 		$success = false;
323 323
 
324 324
 		if ( $valid && $has_cap ) {
325
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
325
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
326 326
 			$success = true;
327 327
 		}
328 328
 
329
-		if( $this->doing_ajax ) {
329
+		if ( $this->doing_ajax ) {
330 330
 
331
-			if( $success ) {
331
+			if ( $success ) {
332 332
 				wp_send_json_success();
333 333
 			} else {
334 334
 				if ( ! $valid ) {
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 
362 362
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
363 363
 
364
-		unset( $field_options['show_as_link'] );
364
+		unset( $field_options[ 'show_as_link' ] );
365 365
 
366 366
 		$notes_options = array(
367 367
 			'notes' => array(
368 368
 				'type' => 'checkboxes',
369
-				'label' => __('Note Settings', 'gravityview'),
370
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
369
+				'label' => __( 'Note Settings', 'gravityview' ),
370
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
371 371
 				'options' => array(
372 372
 					'view' => array(
373 373
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
420 420
 			'other-email' => __( 'Other email address', 'gravityview' ),
421 421
 			'email-label' => __( 'Email address', 'gravityview' ),
422
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
422
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
423 423
 			'subject-label' => __( 'Subject', 'gravityview' ),
424 424
 			'subject' => __( 'Email subject', 'gravityview' ),
425 425
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 		 */
440 440
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
441 441
 
442
-		if( $key ) {
442
+		if ( $key ) {
443 443
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
444 444
 		}
445 445
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 */
462 462
 	static public function display_note( $note, $show_delete = false, $context = null ) {
463 463
 
464
-		if( ! is_object( $note ) ) {
464
+		if ( ! is_object( $note ) ) {
465 465
 			return '';
466 466
 		}
467 467
 
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		}
517 517
 
518 518
 		$replacements = array(
519
-			'{note_id}' => $note_content['note_id'],
519
+			'{note_id}' => $note_content[ 'note_id' ],
520 520
 			'{row_class}' => 'gv-note',
521 521
 			'{note_detail}' => $note_detail_html
522 522
 		);
@@ -548,13 +548,13 @@  discard block
 block discarded – undo
548 548
 
549 549
 		$user_data = get_userdata( $current_user->ID );
550 550
 
551
-		$note_content = trim( $data['gv-note-content'] );
551
+		$note_content = trim( $data[ 'gv-note-content' ] );
552 552
 
553
-		if( empty( $note_content ) ) {
553
+		if ( empty( $note_content ) ) {
554 554
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
555 555
 		}
556 556
 
557
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
557
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
558 558
 
559 559
 		return $return;
560 560
 	}
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
576 576
 
577
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
577
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
578 578
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
579 579
 			return '';
580 580
 		}
@@ -596,8 +596,8 @@  discard block
 block discarded – undo
596 596
 
597 597
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
598 598
 
599
-			if ( $atts['entry'] ) {
600
-				$entry = GFAPI::get_entry( $atts['entry'] );
599
+			if ( $atts[ 'entry' ] ) {
600
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
601 601
 			}
602 602
 
603 603
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -615,14 +615,14 @@  discard block
 block discarded – undo
615 615
 
616 616
 		// Only generate the dropdown if the field settings allow it
617 617
 		$email_fields = '';
618
-		if( ! empty( $visibility_settings['email'] ) ) {
618
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
619 619
 			$email_fields = self::get_note_email_fields( $entry_slug );
620 620
 		}
621 621
 
622 622
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
623 623
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
624
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
625
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
624
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
625
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
626 626
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
627 627
 
628 628
 		return $add_note_html;
@@ -647,8 +647,8 @@  discard block
 block discarded – undo
647 647
 		$note_emails = array();
648 648
 
649 649
 		foreach ( $email_fields as $email_field ) {
650
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
651
-				$note_emails[] = $entry["{$email_field->id}"];
650
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
651
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
652 652
 			}
653 653
 		}
654 654
 
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 		 */
661 661
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
662 662
 
663
-		return (array) $note_emails;
663
+		return (array)$note_emails;
664 664
 	}
665 665
 
666 666
 	/**
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	private static function get_note_email_fields( $entry_slug = '' ) {
678 678
 
679
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
679
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
680 680
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
681 681
 			return '';
682 682
 		}
@@ -698,27 +698,27 @@  discard block
 block discarded – undo
698 698
 
699 699
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
700 700
 			<div class="gv-note-email-container">
701
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
701
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
702 702
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
703
-					<option value=""><?php echo $strings['also-email'];  ?></option>
703
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
704 704
 					<?php foreach ( $note_emails as  $email ) {
705 705
 						?>
706 706
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
707 707
 					<?php }
708
-					if( $include_custom ) { ?>
709
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
708
+					if ( $include_custom ) { ?>
709
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
710 710
 					<?php } ?>
711 711
 				</select>
712 712
 				<fieldset class="gv-note-to-container">
713
-					<?php if( $include_custom ) { ?>
713
+					<?php if ( $include_custom ) { ?>
714 714
 					<div class='gv-note-to-custom-container'>
715
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
716
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
715
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
716
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
717 717
 					</div>
718 718
 					<?php } ?>
719 719
 		            <div class='gv-note-subject-container'>
720
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
721
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
720
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
721
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
722 722
 		            </div>
723 723
 				</fieldset>
724 724
 			</div>
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
743 743
 
744
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
744
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
745 745
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
746 746
 			return;
747 747
 		}
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
750 750
 
751 751
 		//emailing notes if configured
752
-		if ( ! empty( $data['gv-note-to'] ) ) {
752
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
753 753
 
754 754
 			$default_data = array(
755 755
 				'gv-note-to' => '',
@@ -759,11 +759,11 @@  discard block
 block discarded – undo
759 759
                 'current-url' => '',
760 760
 			);
761 761
 
762
-			$current_user  = wp_get_current_user();
762
+			$current_user = wp_get_current_user();
763 763
 			$email_data = wp_parse_args( $data, $default_data );
764 764
 
765
-			$from    = $current_user->user_email;
766
-			$to = $email_data['gv-note-to'];
765
+			$from = $current_user->user_email;
766
+			$to = $email_data[ 'gv-note-to' ];
767 767
 
768 768
 			/**
769 769
 			 * Documented in get_note_email_fields
@@ -771,8 +771,8 @@  discard block
 block discarded – undo
771 771
 			 */
772 772
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
773 773
 
774
-			if( 'custom' === $to && $include_custom ) {
775
-				$to = $email_data['gv-note-to-custom'];
774
+			if ( 'custom' === $to && $include_custom ) {
775
+				$to = $email_data[ 'gv-note-to-custom' ];
776 776
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
777 777
 			}
778 778
 
@@ -783,13 +783,13 @@  discard block
 block discarded – undo
783 783
 
784 784
 			$bcc = false;
785 785
 			$reply_to = $from;
786
-			$subject = trim( $email_data['gv-note-subject'] );
786
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
787 787
 
788 788
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
789 789
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
790
-			$message = $email_data['gv-note-content'];
790
+			$message = $email_data[ 'gv-note-content' ];
791 791
 			$email_footer = self::strings( 'email-footer' );
792
-			$from_name     = $current_user->display_name;
792
+			$from_name = $current_user->display_name;
793 793
 			$message_format = 'html';
794 794
 
795 795
 			/**
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 
821 821
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
822 822
 
823
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
823
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
824 824
 
825 825
 			/**
826 826
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 
847 847
 	    $output = '';
848 848
 
849
-		if( ! empty( $email_footer ) ) {
849
+		if ( ! empty( $email_footer ) ) {
850 850
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
851 851
 			$url = html_entity_decode( $url );
852 852
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return GravityView_Compatibility
77 77
 	 */
78 78
 	public static function getInstance() {
79
-		if( self::$instance ) {
79
+		if ( self::$instance ) {
80 80
 			return self::$instance;
81 81
 		}
82 82
 		return new self;
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
139 139
 		// show the notice, but not load any post types or process shortcodes.
140 140
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
141
-		if( ! self::is_valid() ) {
141
+		if ( ! self::is_valid() ) {
142 142
 
143 143
 			// If the plugin's not loaded, might as well hide the shortcode for people.
144
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
144
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
145 145
 
146 146
 		}
147 147
 	}
@@ -167,15 +167,15 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
169 169
 
170
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
170
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
171 171
 			return null;
172 172
 		}
173 173
 
174 174
 		$notices = self::get_notices();
175 175
 
176
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
177
-		foreach( (array)$notices as $notice ) {
178
-			$message .= wpautop( $notice['message'] );
176
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
177
+		foreach ( (array)$notices as $notice ) {
178
+			$message .= wpautop( $notice[ 'message' ] );
179 179
 		}
180 180
 		$message .= '</div>';
181 181
 
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 
196 196
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
197 197
 
198
-			self::$notices['php_version'] = array(
198
+			self::$notices[ 'php_version' ] = array(
199 199
 				'class' => 'error',
200
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
200
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
201 201
 				'cap' => 'manage_options',
202 202
 				'dismiss' => 'php_version',
203 203
 			);
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
209 209
 
210 210
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
211
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
211
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
212 212
 
213 213
 			self::$notices[ $key ] = array(
214 214
 				'class' => 'error',
215
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
215
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
216 216
 				'cap' => 'manage_options',
217 217
 				'dismiss' => $key,
218 218
 			);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
239 239
 
240
-			self::$notices['wp_version'] = array(
240
+			self::$notices[ 'wp_version' ] = array(
241 241
 				'class' => 'error',
242 242
 				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
243 243
 			    'cap' => 'update_core',
@@ -271,17 +271,17 @@  discard block
 block discarded – undo
271 271
 	public static function check_gravityforms() {
272 272
 
273 273
 		// Bypass other checks: if the class exists
274
-		if( class_exists( 'GFCommon' ) ) {
274
+		if ( class_exists( 'GFCommon' ) ) {
275 275
 
276 276
 			// Does the version meet future requirements?
277
-			if( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
277
+			if ( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
278 278
 				return true;
279 279
 			}
280 280
 
281 281
 			// Does it meet minimum requirements?
282 282
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
283 283
 
284
-			if( $meets_minimum ) {
284
+			if ( $meets_minimum ) {
285 285
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
286 286
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
287 287
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -296,14 +296,14 @@  discard block
 block discarded – undo
296 296
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
297 297
 
298 298
 			/* translators: the placeholder is the current version of Gravity Forms. */
299
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
299
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
300 300
 
301 301
 			/* translators: In this context, "get" means purchase */
302 302
 			$message .= '<p><a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
303 303
 
304 304
 
305 305
 			// Show the notice even if the future version requirements aren't met
306
-			self::$notices['gf_version'] = array(
306
+			self::$notices[ 'gf_version' ] = array(
307 307
 				'class' => $class,
308 308
 				'message' => $message,
309 309
 				'cap' => 'update_plugins',
@@ -321,42 +321,42 @@  discard block
 block discarded – undo
321 321
 		 * OR
322 322
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
323 323
 		 */
324
-		if( true === $gf_status || is_network_admin() ) {
324
+		if ( true === $gf_status || is_network_admin() ) {
325 325
 			return true;
326 326
 		}
327 327
 
328 328
 		// If GFCommon doesn't exist, assume GF not active
329 329
 		$return = false;
330 330
 
331
-		switch( $gf_status ) {
331
+		switch ( $gf_status ) {
332 332
 			case 'inactive':
333 333
 
334 334
 				// Required for multisite
335
-				if( ! function_exists('wp_create_nonce') ) {
335
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
336 336
 					require_once ABSPATH . WPINC . '/pluggable.php';
337 337
 				}
338 338
 
339 339
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
340
-				if( is_multisite() ) {
340
+				if ( is_multisite() ) {
341 341
 					wp_cookie_constants();
342 342
 				}
343 343
 
344 344
 				$return = false;
345 345
 
346
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
346
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
347 347
 
348
-				self::$notices['gf_inactive'] = array(
348
+				self::$notices[ 'gf_inactive' ] = array(
349 349
 					'class' => 'error',
350
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
350
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
351 351
 					'cap' => 'activate_plugins',
352 352
 					'dismiss' => 'gf_inactive',
353 353
 				);
354 354
 
355 355
 				break;
356 356
 			default:
357
-				self::$notices['gf_installed'] = array(
357
+				self::$notices[ 'gf_installed' ] = array(
358 358
 					'class' => 'error',
359
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
359
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
360 360
 					'cap' => 'install_plugins',
361 361
 					'dismiss' => 'gf_installed',
362 362
 				);
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
 	 */
374 374
 	private static function check_gf_directory() {
375 375
 
376
-		if( class_exists( 'GFDirectory' ) ) {
377
-			self::$notices['gf_directory'] = array(
376
+		if ( class_exists( 'GFDirectory' ) ) {
377
+			self::$notices[ 'gf_directory' ] = array(
378 378
 				'class' => 'error is-dismissible',
379
-				'title' => __('Potential Conflict', 'gravityview' ),
379
+				'title' => __( 'Potential Conflict', 'gravityview' ),
380 380
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
381 381
 				'dismiss' => 'gf_directory',
382 382
 				'cap' => 'activate_plugins',
@@ -394,21 +394,21 @@  discard block
 block discarded – undo
394 394
 	 */
395 395
 	public static function get_plugin_status( $location = '' ) {
396 396
 
397
-		if( ! function_exists('is_plugin_active') ) {
397
+		if ( ! function_exists( 'is_plugin_active' ) ) {
398 398
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
399 399
 		}
400 400
 
401
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
401
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
402 402
 			return true;
403 403
 		}
404 404
 
405
-		if( ! is_network_admin() && is_plugin_active( $location ) ) {
405
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
406 406
 			return true;
407 407
 		}
408 408
 
409
-		if(
410
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
409
+		if (
410
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
412 412
 		) {
413 413
 			return false;
414 414
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-widget.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
154 154
 
155 155
 		if ( $enable_custom_class ) {
156
-			$settings['custom_class'] = array(
156
+			$settings[ 'custom_class' ] = array(
157 157
 				'type'       => 'text',
158 158
 				'label'      => __( 'Custom CSS Class:', 'gravityview' ),
159 159
 				'desc'       => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -206,8 +206,8 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	public static function get_default_widget_areas() {
208 208
 		$default_areas = array(
209
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
210
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
209
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
210
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
211 211
 		);
212 212
 
213 213
 		/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 		}
239 239
 
240 240
 		$widgets[ $this->get_widget_id() ] = array(
241
-			'label' => $this->widget_label ,
241
+			'label' => $this->widget_label,
242 242
 			'description' => $this->widget_description,
243 243
 			'subtitle' => $this->widget_subtitle,
244 244
 			'icon' => $this->icon,
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 */
261 261
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
262 262
 		if ( $this->get_widget_id() === $widget ) {
263
-			if( $settings = $this->get_settings() ) {
263
+			if ( $settings = $this->get_settings() ) {
264 264
 				$options = array_merge( $options, $settings );
265 265
 			}
266 266
 		}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			return;
315 315
 		}
316 316
 
317
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
317
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
318 318
 	}
319 319
 
320 320
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		);
103 103
 
104 104
 		if ( ! empty( $action ) ) {
105
-			$settings['edd_action'] = esc_attr( $action );
105
+			$settings[ 'edd_action' ] = esc_attr( $action );
106 106
 		}
107 107
 
108 108
 		return array_map( 'urlencode', $settings );
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'format' => 'json',
159 159
 		) );
160 160
 
161
-		if ( $is_ajax && empty( $data['license'] ) ) {
161
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
162 162
 			die( -1 );
163 163
 		}
164 164
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 			$json = json_encode( $license_data );
188 188
 
189
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
189
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
190 190
 
191 191
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
192 192
 
193
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
193
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
194 194
 
195 195
 			if ( $is_check_action_button ) {
196 196
 				delete_transient( self::status_transient_key );
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			// most likely a mistake.
202 202
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
203 203
 
204
-				if ( ! empty( $data['field_id'] ) ) {
204
+				if ( ! empty( $data[ 'field_id' ] ) ) {
205 205
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
206 206
 				}
207 207
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$class   = 'hide';
230 230
 			$message = '';
231 231
 		} else {
232
-			if( ! empty( $license_data->error ) ) {
232
+			if ( ! empty( $license_data->error ) ) {
233 233
 				$class = 'error';
234 234
 				$string_key = $license_data->error;
235 235
 			} else { $class = $license_data->license;
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function license_details( $response = array() ) {
255 255
 
256
-		$response = (array) $response;
256
+		$response = (array)$response;
257 257
 
258 258
 		$return  = '';
259 259
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
260 260
 
261
-		if ( ! empty( $response['license_key'] ) ) {
261
+		if ( ! empty( $response[ 'license_key' ] ) ) {
262 262
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
263 263
 
264 264
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
267 267
 				}
268 268
 
269 269
 
270
-				$return .= $this->strings( $response['license'], $response );
271
-			} elseif ( ! empty( $response['license_name'] ) ) {
270
+				$return .= $this->strings( $response[ 'license' ], $response );
271
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
272 272
 				$response_keys = array(
273 273
 					'license_name'   => '',
274 274
 					'license_limit'  => '',
@@ -283,22 +283,22 @@  discard block
 block discarded – undo
283 283
 				$response = wp_parse_args( $response, $response_keys );
284 284
 
285 285
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
286
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
287
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
288
-				$local_text       = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
286
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
287
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
288
+				$local_text       = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
290 290
 
291 291
 
292 292
 				$details = array(
293
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
294
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
293
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
294
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
297 297
 				);
298 298
 
299
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
300
-					unset( $details['upgrade'] );
301
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
299
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
300
+					unset( $details[ 'upgrade' ] );
301
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
302 302
 				}
303 303
 
304 304
 				$return .= '<ul>';
@@ -330,20 +330,20 @@  discard block
 block discarded – undo
330 330
 		if ( ! empty( $upgrades ) ) {
331 331
 
332 332
 			$locale_parts = explode( '_', get_locale() );
333
-			$is_english = ( 'en' === $locale_parts[0] );
333
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
334 334
 
335 335
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
336 336
 			$output .= '<ul>';
337 337
 
338 338
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
339
-				$upgrade = (object) $upgrade;
339
+				$upgrade = (object)$upgrade;
340 340
 
341 341
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
342 342
 
343 343
 				if ( $is_english && isset( $upgrade->description ) ) {
344 344
 					$message = esc_html( $upgrade->description );
345 345
 				} else {
346
-					switch( $upgrade->price_id ) {
346
+					switch ( $upgrade->price_id ) {
347 347
 						// Interstellar
348 348
 						case 1:
349 349
 						default:
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
423 423
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
424 424
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
425
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
425
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
426 426
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
427 427
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
428 428
 			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 		if ( ! empty( $license_data->renewal_url ) ) {
452 452
 			$renew_license_url = $license_data->renewal_url;
453
-		} elseif( ! empty( $license_data->license_key ) ) {
453
+		} elseif ( ! empty( $license_data->license_key ) ) {
454 454
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
455 455
 		} else {
456 456
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 	 * @return array|\WP_Error
468 468
 	 */
469 469
 	private function _license_get_remote_response( $data, $license = '' ) {
470
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
470
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
471 471
 
472 472
 		$url = add_query_arg( $api_params, self::url );
473 473
 
@@ -507,9 +507,9 @@  discard block
 block discarded – undo
507 507
 	private function license_call_update_settings( $license_data, $data ) {
508 508
 		$settings = array();
509 509
 
510
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
511
-		$settings['license_key_status'] = $license_data->license;
512
-		$settings['license_key_response'] = (array)$license_data;
510
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
511
+		$settings[ 'license_key_status' ] = $license_data->license;
512
+		$settings[ 'license_key_response' ] = (array)$license_data;
513 513
 
514 514
 		$this->settings->set( $settings );
515 515
 	}
@@ -529,9 +529,9 @@  discard block
 block discarded – undo
529 529
 		$status = trim( $this->settings->get( 'license_key_status' ) );
530 530
 		$key = trim( $this->settings->get( 'license_key' ) );
531 531
 
532
-		if (  !empty( $key ) ) {
532
+		if ( ! empty( $key ) ) {
533 533
 			$response = $this->settings->get( 'license_key_response' );
534
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
534
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
535 535
 		} else {
536 536
 			$response = array();
537 537
 		}
@@ -574,11 +574,11 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$submit = '<div class="gv-edd-button-wrapper">';
576 576
 		foreach ( $fields as $field ) {
577
-			$field['type'] = 'button';
578
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
579
-			$field['style'] = 'margin-left: 10px;';
580
-			if( $disabled_attribute ) {
581
-				$field['disabled'] = $disabled_attribute;
577
+			$field[ 'type' ] = 'button';
578
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
579
+			$field[ 'style' ] = 'margin-left: 10px;';
580
+			if ( $disabled_attribute ) {
581
+				$field[ 'disabled' ] = $disabled_attribute;
582 582
 			}
583 583
 			$submit .= $this->settings->as_html( $field, $echo );
584 584
 		}
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
657 657
 				    'url'        => home_url(),
658 658
 				    'site_data'  => $this->get_site_data(),
659 659
 			    ),
660
-			));
660
+			) );
661 661
 
662 662
 			// make sure the response came back okay
663 663
 			if ( is_wp_error( $response ) ) {
@@ -687,45 +687,45 @@  discard block
 block discarded – undo
687 687
 		$theme_data = wp_get_theme();
688 688
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
689 689
 
690
-		$data['gv_version']  = Plugin::$version;
691
-		$data['php_version']  = phpversion();
692
-		$data['wp_version']   = get_bloginfo( 'version' );
693
-		$data['gf_version']  = \GFForms::$version;
694
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
-		$data['multisite']    = is_multisite();
696
-		$data['theme']        = $theme;
697
-		$data['url']          = home_url();
698
-		$data['license_key']  = $this->settings->get( 'license_key' );
699
-		$data['beta']         = $this->settings->get( 'beta' );
690
+		$data[ 'gv_version' ]  = Plugin::$version;
691
+		$data[ 'php_version' ]  = phpversion();
692
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
693
+		$data[ 'gf_version' ]  = \GFForms::$version;
694
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
+		$data[ 'multisite' ]    = is_multisite();
696
+		$data[ 'theme' ]        = $theme;
697
+		$data[ 'url' ]          = home_url();
698
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
699
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
700 700
 
701 701
 		// View Data
702 702
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
703 703
 
704
-		$data['view_count'] = null;
705
-		$data['view_first'] = null;
706
-		$data['view_latest'] = null;
704
+		$data[ 'view_count' ] = null;
705
+		$data[ 'view_first' ] = null;
706
+		$data[ 'view_latest' ] = null;
707 707
 
708 708
 		if ( $gravityview_posts->publish ) {
709
-			$data['view_count'] = $gravityview_posts->publish;
709
+			$data[ 'view_count' ] = $gravityview_posts->publish;
710 710
 
711 711
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
712 712
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
713 713
 
714 714
 			if ( $first = array_shift( $first ) ) {
715
-				$data['view_first'] = $first->post_date;
715
+				$data[ 'view_first' ] = $first->post_date;
716 716
 			}
717 717
 			if ( $latest = array_pop( $latest ) ) {
718
-				$data['view_latest'] = $latest->post_date;
718
+				$data[ 'view_latest' ] = $latest->post_date;
719 719
 			}
720 720
 		}
721 721
 
722 722
 		// Form counts
723 723
 		if ( class_exists( 'GFFormsModel' ) ) {
724 724
 			$form_data = \GFFormsModel::get_form_count();
725
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
726
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
727
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
728
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
725
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
726
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
727
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
728
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
729 729
 		}
730 730
 
731 731
 		// Retrieve current plugin information
@@ -733,13 +733,13 @@  discard block
 block discarded – undo
733 733
 			include ABSPATH . '/wp-admin/includes/plugin.php';
734 734
 		}
735 735
 
736
-		$data['integrations']     = self::get_related_plugins_and_extensions();
737
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
738
-		$data['inactive_plugins'] = array();
739
-		$data['locale']           = get_locale();
736
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
737
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
738
+		$data[ 'inactive_plugins' ] = array();
739
+		$data[ 'locale' ]           = get_locale();
740 740
 
741 741
 		// Validate request on the GV server
742
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
742
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
743 743
 
744 744
 		return $data;
745 745
 	}
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 
770 770
 				$plugin_data = get_plugin_data( $active_plugin );
771 771
 
772
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
772
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
773 773
 			}
774 774
 
775 775
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $groups = '' ) {
118 118
 
119
-		if( '' !== $groups ) {
119
+		if ( '' !== $groups ) {
120 120
 			$return_fields = self::$_fields;
121 121
 
122
-			$groups = (array) $groups;
122
+			$groups = (array)$groups;
123 123
 
124 124
 			foreach ( $return_fields as $key => $field ) {
125
-				if( ! in_array( $field->group, $groups, true ) ) {
125
+				if ( ! in_array( $field->group, $groups, true ) ) {
126 126
 					unset( $return_fields[ $key ] );
127 127
 				}
128 128
 			}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-created-by.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	public function __construct() {
23 23
 		$this->label = esc_html__( 'Created By (User)', 'gravityview' );
24
-		$this->description = __('Details of the logged-in user who created the entry (if any).', 'gravityview');
24
+		$this->description = __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' );
25 25
 		$this->default_search_label = __( 'Submitted by:', 'gravityview' );
26 26
 		parent::__construct();
27 27
 	}
@@ -40,23 +40,23 @@  discard block
 block discarded – undo
40 40
 
41 41
 		$merge_tags = array(
42 42
 			array(
43
-				'label' => __('Entry Creator: Display Name', 'gravityview'),
43
+				'label' => __( 'Entry Creator: Display Name', 'gravityview' ),
44 44
 				'tag' => '{created_by:display_name}'
45 45
 			),
46 46
 			array(
47
-				'label' => __('Entry Creator: Email', 'gravityview'),
47
+				'label' => __( 'Entry Creator: Email', 'gravityview' ),
48 48
 				'tag' => '{created_by:user_email}'
49 49
 			),
50 50
 			array(
51
-				'label' => __('Entry Creator: Username', 'gravityview'),
51
+				'label' => __( 'Entry Creator: Username', 'gravityview' ),
52 52
 				'tag' => '{created_by:user_login}'
53 53
 			),
54 54
 			array(
55
-				'label' => __('Entry Creator: User ID', 'gravityview'),
55
+				'label' => __( 'Entry Creator: User ID', 'gravityview' ),
56 56
 				'tag' => '{created_by:ID}'
57 57
 			),
58 58
 			array(
59
-				'label' => __('Entry Creator: Roles', 'gravityview'),
59
+				'label' => __( 'Entry Creator: Roles', 'gravityview' ),
60 60
 				'tag' => '{created_by:roles}'
61 61
 			),
62 62
 		);
@@ -84,19 +84,19 @@  discard block
 block discarded – undo
84 84
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
85 85
 
86 86
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
87
-		if( empty( $matches ) || empty( $entry['created_by'] ) ) {
87
+		if ( empty( $matches ) || empty( $entry[ 'created_by' ] ) ) {
88 88
 			return $text;
89 89
 		}
90 90
 
91 91
 		// Get the creator of the entry
92
-		$entry_creator = new WP_User( $entry['created_by'] );
92
+		$entry_creator = new WP_User( $entry[ 'created_by' ] );
93 93
 
94 94
 		foreach ( $matches as $match ) {
95 95
 
96
-			$full_tag = $match[0];
97
-			$property = $match[1];
96
+			$full_tag = $match[ 0 ];
97
+			$property = $match[ 1 ];
98 98
 
99
-			switch( $property ) {
99
+			switch ( $property ) {
100 100
 				case '':
101 101
 					$value = $entry_creator->ID;
102 102
 					break;
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 
123 123
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
124 124
 
125
-		if( 'edit' === $context ) {
125
+		if ( 'edit' === $context ) {
126 126
 			return $field_options;
127 127
 		}
128 128
 
129
-		$field_options['name_display'] = array(
129
+		$field_options[ 'name_display' ] = array(
130 130
 			'type' => 'select',
131 131
 			'label' => __( 'User Format', 'gravityview' ),
132 132
 			'desc' => __( 'How should the User information be displayed?', 'gravityview' ),
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 
125 125
 		$form = false;
126 126
 
127
-		if( $entry ) {
128
-			$form = GFAPI::get_form( $entry['form_id'] );
127
+		if ( $entry ) {
128
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
129 129
 		}
130 130
 
131 131
 		return $form;
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			}
202 202
 		}
203 203
 
204
-		return (bool) $has_transaction_data;
204
+		return (bool)$has_transaction_data;
205 205
 	}
206 206
 
207 207
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
241 241
 
242
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
242
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
243 243
 
244 244
 		return $result;
245 245
 	}
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
 	 *
260 260
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
261 261
 	 */
262
-	public static function get_forms(  $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
262
+	public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
263 263
 		$forms = array();
264 264
 		if ( ! class_exists( 'GFAPI' ) ) {
265 265
 			return array();
266 266
 		}
267 267
 
268
-		if( 'any' === $active ) {
268
+		if ( 'any' === $active ) {
269 269
 			$active_forms = GFAPI::get_forms( true, $trash );
270 270
 			$inactive_forms = GFAPI::get_forms( false, $trash );
271 271
 			$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
 		$has_post_fields = false;
298 298
 
299 299
 		if ( $form ) {
300
-			foreach ( $form['fields'] as $field ) {
301
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
302
-					$fields["{$field['id']}"] = array(
300
+			foreach ( $form[ 'fields' ] as $field ) {
301
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
302
+					$fields[ "{$field[ 'id' ]}" ] = array(
303 303
 						'label' => \GV\Utils::get( $field, 'label' ),
304 304
 						'parent' => null,
305 305
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
308 308
 					);
309 309
 				}
310 310
 
311
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
312
-					foreach ( $field['inputs'] as $input ) {
311
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
312
+					foreach ( $field[ 'inputs' ] as $input ) {
313 313
 
314
-						if( ! empty( $input['isHidden'] ) ) {
314
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
315 315
 							continue;
316 316
 						}
317 317
 
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
                          * @hack
320 320
                          * In case of email/email confirmation, the input for email has the same id as the parent field
321 321
                          */
322
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
322
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
323 323
                             continue;
324 324
                         }
325
-						$fields["{$input['id']}"] = array(
325
+						$fields[ "{$input[ 'id' ]}" ] = array(
326 326
 							'label' => \GV\Utils::get( $input, 'label' ),
327 327
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
328 328
 							'parent' => $field,
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 				}
335 335
 
336 336
 
337
-				if( GFCommon::is_product_field( $field['type'] ) ){
337
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
338 338
 					$has_product_fields = true;
339 339
 				}
340 340
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 		 * @since 1.7
349 349
 		 */
350 350
 		if ( $has_post_fields ) {
351
-			$fields['post_id'] = array(
351
+			$fields[ 'post_id' ] = array(
352 352
 				'label' => __( 'Post ID', 'gravityview' ),
353 353
 				'type' => 'post_id',
354 354
 			);
@@ -361,11 +361,11 @@  discard block
 block discarded – undo
361 361
 			foreach ( $payment_fields as $payment_field ) {
362 362
 
363 363
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
364
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
364
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
365 365
 					continue;
366 366
 				}
367 367
 
368
-				$fields["{$payment_field->name}"] = array(
368
+				$fields[ "{$payment_field->name}" ] = array(
369 369
 					'label' => $payment_field->label,
370 370
 					'desc' => $payment_field->description,
371 371
 					'type' => $payment_field->name,
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
397 397
 
398 398
 		$fields = array();
399 399
 
400
-		foreach ( $extra_fields as $key => $field ){
401
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
402
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
400
+		foreach ( $extra_fields as $key => $field ) {
401
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
402
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
403 403
 			}
404 404
 		}
405 405
 
@@ -439,33 +439,33 @@  discard block
 block discarded – undo
439 439
 			'search_criteria' => null,
440 440
 			'sorting' => null,
441 441
 			'paging' => null,
442
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
442
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
443 443
 			'context_view_id' => null,
444 444
 		);
445 445
 
446 446
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
447 447
 
448
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
449
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
448
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
449
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
450 450
 
451 451
 				if ( ! is_array( $filter ) ) {
452 452
 					continue;
453 453
 				}
454 454
 
455 455
 				// By default, we want searches to be wildcard for each field.
456
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
456
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
457 457
 
458 458
 				/**
459 459
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
460 460
 				 * @param string $operator Existing search operator
461 461
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
462 462
 				 */
463
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
463
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
464 464
 			}
465 465
 
466 466
 			// don't send just the [mode] without any field filter.
467
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
468
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
467
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
468
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
469 469
 			}
470 470
 
471 471
 		}
@@ -476,33 +476,33 @@  discard block
 block discarded – undo
476 476
 		 * Prepare date formats to be in Gravity Forms DB format;
477 477
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
478 478
 		 */
479
-		foreach ( array('start_date', 'end_date' ) as $key ) {
479
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
480 480
 
481
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
481
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
482 482
 
483 483
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
484
-				$date = date_create( $criteria['search_criteria'][ $key ] );
484
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
485 485
 
486 486
 				if ( $date ) {
487 487
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
488
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
488
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
489 489
 				} else {
490
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
490
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
491 491
 
492 492
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
493
-					unset( $criteria['search_criteria'][ $key ] );
493
+					unset( $criteria[ 'search_criteria' ][ $key ] );
494 494
 				}
495 495
 			}
496 496
 		}
497 497
 
498
-		if ( empty( $criteria['context_view_id'] ) ) {
498
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
499 499
 			// Calculate the context view id and send it to the advanced filter
500 500
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
501
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
501
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
502 502
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
503
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
503
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
504 504
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
505
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
505
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
506 506
 			}
507 507
 		}
508 508
 
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 		 * @param array $form_ids Forms to search
513 513
 		 * @param int $view_id ID of the view being used to search
514 514
 		 */
515
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
515
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
516 516
 
517 517
 		return (array)$criteria;
518 518
 	}
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		/** Reduce # of database calls */
547 547
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
548 548
 
549
-		if ( ! empty( $criteria['cache'] ) ) {
549
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
550 550
 
551 551
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
552 552
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 
555 555
 				// Still update the total count when using cached results
556 556
 				if ( ! is_null( $total ) ) {
557
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
557
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
558 558
 				}
559 559
 
560 560
 				$return = $entries;
@@ -576,9 +576,9 @@  discard block
 block discarded – undo
576 576
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
577 577
 
578 578
 			// No entries returned from gravityview_before_get_entries
579
-			if( is_null( $entries ) ) {
579
+			if ( is_null( $entries ) ) {
580 580
 
581
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
581
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
582 582
 
583 583
 				if ( is_wp_error( $entries ) ) {
584 584
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 				}
590 590
 			}
591 591
 
592
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
592
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
593 593
 
594 594
 				// Cache results
595 595
 				$Cache->set( $entries, 'entries' );
@@ -702,18 +702,18 @@  discard block
 block discarded – undo
702 702
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
703 703
 
704 704
 		// Is the entry allowed
705
-		if( $check_entry_display ) {
705
+		if ( $check_entry_display ) {
706 706
 
707 707
 			$gvid = \GV\Utils::_GET( 'gvid' );
708 708
 
709
-			if( $gvid ) {
709
+			if ( $gvid ) {
710 710
 				$view = \GV\View::by_id( $gvid );
711 711
 			}
712 712
 
713 713
 			$entry = self::check_entry_display( $entry, $view );
714 714
 		}
715 715
 
716
-		if( is_wp_error( $entry ) ) {
716
+		if ( is_wp_error( $entry ) ) {
717 717
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
718 718
 			return false;
719 719
 		}
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 
748 748
 		$value = false;
749 749
 
750
-		if( 'context' === $val1 ) {
750
+		if ( 'context' === $val1 ) {
751 751
 
752 752
 			$matching_contexts = array( $val2 );
753 753
 
754 754
 			// We allow for non-standard contexts.
755
-			switch( $val2 ) {
755
+			switch ( $val2 ) {
756 756
 				// Check for either single or edit
757 757
 				case 'singular':
758 758
 					$matching_contexts = array( 'single', 'edit' );
@@ -795,18 +795,18 @@  discard block
 block discarded – undo
795 795
 				$json_val_1 = json_decode( $val1, true );
796 796
 				$json_val_2 = json_decode( $val2, true );
797 797
 
798
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
798
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
799 799
 
800 800
 					$json_in = false;
801
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
802
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
801
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
802
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
803 803
 
804 804
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
805 805
 					foreach ( $json_val_1 as $item_1 ) {
806 806
 						foreach ( $json_val_2 as $item_2 ) {
807 807
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
808 808
 
809
-							if( $json_in ) {
809
+							if ( $json_in ) {
810 810
 								break 2;
811 811
 							}
812 812
 						}
@@ -857,10 +857,10 @@  discard block
 block discarded – undo
857 857
 	public static function check_entry_display( $entry, $view = null ) {
858 858
 
859 859
 		if ( ! $entry || is_wp_error( $entry ) ) {
860
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
860
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
861 861
 		}
862 862
 
863
-		if ( empty( $entry['form_id'] ) ) {
863
+		if ( empty( $entry[ 'form_id' ] ) ) {
864 864
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
865 865
 		}
866 866
 
@@ -875,19 +875,19 @@  discard block
 block discarded – undo
875 875
 
876 876
 		$_gvid = \GV\Utils::_GET( 'gvid' );
877 877
 
878
-		if ( $_gvid && $view->ID !== (int) $_gvid ) {
878
+		if ( $_gvid && $view->ID !== (int)$_gvid ) {
879 879
 			return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID );
880 880
 		}
881 881
 
882 882
 		$view_form_id = $view->form->ID;
883 883
 
884 884
 		if ( $view->joins ) {
885
-			if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
-				$view_form_id = $entry['form_id'];
885
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
+				$view_form_id = $entry[ 'form_id' ];
887 887
 			}
888 888
 		}
889 889
 
890
-		if ( (int) $view_form_id !== (int) $entry['form_id'] ) {
890
+		if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) {
891 891
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
892 892
 		}
893 893
 
@@ -895,13 +895,13 @@  discard block
 block discarded – undo
895 895
 		 * Check whether the entry is in the entries subset by running a modified query.
896 896
 		 */
897 897
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
898
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
898
+			$_tmp_query = new \GF_Query( $view_form_id, array(
899 899
 				'field_filters' => array(
900 900
 					'mode' => 'all',
901 901
 					array(
902 902
 						'key' => 'id',
903 903
 						'operation' => 'is',
904
-						'value' => $entry['id']
904
+						'value' => $entry[ 'id' ]
905 905
 					)
906 906
 				)
907 907
 			) );
@@ -911,14 +911,14 @@  discard block
 block discarded – undo
911 911
 			/** @type \GF_Query $query */
912 912
 			$query_parts      = $query->_introspect();
913 913
 
914
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
914
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
915 915
 
916 916
 		}, 10, 3 );
917 917
 
918 918
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
919 919
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
920 920
 
921
-			$criteria['paging'] = array(
921
+			$criteria[ 'paging' ] = array(
922 922
 				'offset' => 0,
923 923
 				'page_size' => 25
924 924
 			);
@@ -937,20 +937,20 @@  discard block
 block discarded – undo
937 937
 		}
938 938
 
939 939
 		// This entry is on a View with joins
940
-		if ( $entries[0]->is_multi() ) {
940
+		if ( $entries[ 0 ]->is_multi() ) {
941 941
 
942 942
 			$multi_entry_ids = array();
943 943
 
944
-			foreach ( $entries[0]->entries as $multi_entry ) {
945
-				$multi_entry_ids[] = (int) $multi_entry->ID;
944
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
945
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
946 946
 			}
947 947
 
948
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
948
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
949 949
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
950 950
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
951 951
 			}
952 952
 
953
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
953
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
954 954
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
955 955
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
956 956
 		}
@@ -995,18 +995,18 @@  discard block
 block discarded – undo
995 995
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
996 996
 		 * @see GFCommon::format_date() for original code
997 997
 		 */
998
-		$date_gmt_time   = mysql2date( 'G', $date_string );
998
+		$date_gmt_time = mysql2date( 'G', $date_string );
999 999
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
1000 1000
 
1001
-		$format  = \GV\Utils::get( $atts, 'format' );
1002
-		$is_human  = ! empty( $atts['human'] );
1003
-		$is_diff  = ! empty( $atts['diff'] );
1004
-		$is_raw = ! empty( $atts['raw'] );
1005
-		$is_timestamp = ! empty( $atts['timestamp'] );
1006
-		$include_time = ! empty( $atts['time'] );
1001
+		$format = \GV\Utils::get( $atts, 'format' );
1002
+		$is_human = ! empty( $atts[ 'human' ] );
1003
+		$is_diff = ! empty( $atts[ 'diff' ] );
1004
+		$is_raw = ! empty( $atts[ 'raw' ] );
1005
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
1006
+		$include_time = ! empty( $atts[ 'time' ] );
1007 1007
 
1008 1008
 		// If we're using time diff, we want to have a different default format
1009
-		if( empty( $format ) ) {
1009
+		if ( empty( $format ) ) {
1010 1010
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
1011 1011
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
1012 1012
 		}
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 		// If raw was specified, don't modify the stored value
1015 1015
 		if ( $is_raw ) {
1016 1016
 			$formatted_date = $date_string;
1017
-		} elseif( $is_timestamp ) {
1017
+		} elseif ( $is_timestamp ) {
1018 1018
 			$formatted_date = $date_local_timestamp;
1019 1019
 		} elseif ( $is_diff ) {
1020 1020
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 
1048 1048
 		$label = \GV\Utils::get( $field, 'label' );
1049 1049
 
1050
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1050
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1051 1051
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1052 1052
 		}
1053 1053
 
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
 			$form = GFAPI::get_form( $form );
1075 1075
 		}
1076 1076
 
1077
-		if ( class_exists( 'GFFormsModel' ) ){
1077
+		if ( class_exists( 'GFFormsModel' ) ) {
1078 1078
 			return GFFormsModel::get_field( $form, $field_id );
1079 1079
 		} else {
1080 1080
 			return null;
@@ -1121,19 +1121,19 @@  discard block
 block discarded – undo
1121 1121
 			$shortcodes = array();
1122 1122
 
1123 1123
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1124
-			if ( empty( $matches ) ){
1124
+			if ( empty( $matches ) ) {
1125 1125
 				return false;
1126 1126
 			}
1127 1127
 
1128 1128
 			foreach ( $matches as $shortcode ) {
1129
-				if ( $tag === $shortcode[2] ) {
1129
+				if ( $tag === $shortcode[ 2 ] ) {
1130 1130
 
1131 1131
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1132
-					$shortcodes[] = $shortcode;
1132
+					$shortcodes[ ] = $shortcode;
1133 1133
 
1134
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1135
-					foreach( $results as $result ) {
1136
-						$shortcodes[] = $result;
1134
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1135
+					foreach ( $results as $result ) {
1136
+						$shortcodes[ ] = $result;
1137 1137
 					}
1138 1138
 				}
1139 1139
 			}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			'post_type'      => 'gravityview',
1166 1166
 			'posts_per_page' => 100,
1167 1167
 			'meta_key'       => '_gravityview_form_id',
1168
-			'meta_value'     => (int) $form_id,
1168
+			'meta_value'     => (int)$form_id,
1169 1169
 		);
1170 1170
 		$args     = wp_parse_args( $args, $defaults );
1171 1171
 		$views    = get_posts( $args );
@@ -1177,21 +1177,21 @@  discard block
 block discarded – undo
1177 1177
 
1178 1178
 			$data = unserialize( $view->meta_value );
1179 1179
 
1180
-			if( ! $data || ! is_array( $data ) ) {
1180
+			if ( ! $data || ! is_array( $data ) ) {
1181 1181
 				continue;
1182 1182
 			}
1183 1183
 
1184 1184
 			foreach ( $data as $datum ) {
1185
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
1186
-					$joined_forms[] = $view->post_id;
1185
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
1186
+					$joined_forms[ ] = $view->post_id;
1187 1187
 				}
1188 1188
 			}
1189 1189
 		}
1190 1190
 
1191 1191
 		if ( $joined_forms ) {
1192
-			$joined_args  = array(
1192
+			$joined_args = array(
1193 1193
 				'post_type'      => 'gravityview',
1194
-				'posts_per_page' => $args['posts_per_page'],
1194
+				'posts_per_page' => $args[ 'posts_per_page' ],
1195 1195
 				'post__in'       => $joined_forms,
1196 1196
 			);
1197 1197
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
1347 1347
 
1348 1348
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1349 1349
 
1350
-		if( $json_decode ) {
1350
+		if ( $json_decode ) {
1351 1351
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1352 1352
 		}
1353 1353
 
@@ -1362,7 +1362,7 @@  discard block
 block discarded – undo
1362 1362
 	 * @return string         html
1363 1363
 	 */
1364 1364
 	public static function get_sortable_fields( $formid, $current = '' ) {
1365
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) .'</option>';
1365
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) . '</option>';
1366 1366
 
1367 1367
 		if ( empty( $formid ) ) {
1368 1368
 			return $output;
@@ -1375,11 +1375,11 @@  discard block
 block discarded – undo
1375 1375
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1376 1376
 
1377 1377
 			foreach ( $fields as $id => $field ) {
1378
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1378
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1379 1379
 					continue;
1380 1380
 				}
1381 1381
 
1382
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1382
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1383 1383
 			}
1384 1384
 		}
1385 1385
 
@@ -1418,16 +1418,16 @@  discard block
 block discarded – undo
1418 1418
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1419 1419
 
1420 1420
 		// TODO: Convert to using array_filter
1421
-		foreach( $fields as $id => $field ) {
1421
+		foreach ( $fields as $id => $field ) {
1422 1422
 
1423
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1423
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1424 1424
 				unset( $fields[ $id ] );
1425 1425
 			}
1426 1426
 
1427 1427
 			/**
1428 1428
 			 * Merge date and time subfields.
1429 1429
 			 */
1430
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
1430
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
1431 1431
 				$fields[ intval( $id ) ] = array(
1432 1432
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
1433 1433
 					'parent' => null,
@@ -1477,14 +1477,14 @@  discard block
 block discarded – undo
1477 1477
 	 * @param  int|array  $field field key or field array
1478 1478
 	 * @return boolean
1479 1479
 	 */
1480
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1480
+	public static function is_field_numeric( $form = null, $field = '' ) {
1481 1481
 
1482 1482
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1483 1483
 			$form = self::get_form( $form );
1484 1484
 		}
1485 1485
 
1486 1486
 		// If entry meta, it's a string. Otherwise, numeric
1487
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1487
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1488 1488
 			$type = $field;
1489 1489
 		} else {
1490 1490
 			$type = self::get_field_type( $form, $field );
@@ -1498,9 +1498,9 @@  discard block
 block discarded – undo
1498 1498
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1499 1499
 
1500 1500
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1501
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1502
-			if( true === $gv_field->is_numeric ) {
1503
-				$numeric_types[] = $gv_field->is_numeric;
1501
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1502
+			if ( true === $gv_field->is_numeric ) {
1503
+				$numeric_types[ ] = $gv_field->is_numeric;
1504 1504
 			}
1505 1505
 		}
1506 1506
 
@@ -1651,18 +1651,18 @@  discard block
 block discarded – undo
1651 1651
 		$final_atts = array_filter( $final_atts );
1652 1652
 
1653 1653
 		// If the href wasn't passed as an attribute, use the value passed to the function
1654
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1655
-			$final_atts['href'] = $href;
1654
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1655
+			$final_atts[ 'href' ] = $href;
1656 1656
 		}
1657 1657
 
1658
-		$final_atts['href'] = esc_url_raw( $href );
1658
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1659 1659
 
1660 1660
 		/**
1661 1661
 		 * Fix potential security issue with target=_blank
1662 1662
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1663 1663
 		 */
1664
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1664
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1666 1666
 		}
1667 1667
 
1668 1668
 		// Sort the attributes alphabetically, to help testing
@@ -1674,7 +1674,7 @@  discard block
 block discarded – undo
1674 1674
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1675 1675
 		}
1676 1676
 
1677
-		if( '' !== $output ) {
1677
+		if ( '' !== $output ) {
1678 1678
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1679 1679
 		}
1680 1680
 
@@ -1701,7 +1701,7 @@  discard block
 block discarded – undo
1701 1701
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1702 1702
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1703 1703
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1704
-				$merged[] = $value;
1704
+				$merged[ ] = $value;
1705 1705
 			} else {
1706 1706
 				$merged[ $key ] = $value;
1707 1707
 			}
@@ -1734,7 +1734,7 @@  discard block
 block discarded – undo
1734 1734
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1735 1735
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1736 1736
 		 */
1737
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1737
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1738 1738
 
1739 1739
 		return get_users( $get_users_settings );
1740 1740
 	}
@@ -1754,11 +1754,11 @@  discard block
 block discarded – undo
1754 1754
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1755 1755
 
1756 1756
     	// If $cap is defined, only show notice if user has capability
1757
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1757
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1758 1758
     		return '';
1759 1759
 	    }
1760 1760
 
1761
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1761
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1762 1762
     }
1763 1763
 
1764 1764
 	/**
Please login to merge, or discard this patch.