Completed
Push — develop ( c01197...097d6f )
by
unknown
19:43
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
 
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 
357 357
 		$this->setIsGravityviewPostType( $is_GV_post_type );
358 358
 
359
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
359
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
360 360
 		$this->setPostId( $post_id );
361 361
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
362 362
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 
393 393
 		$search_method = GravityView_Widget_Search::getInstance()->get_search_method();
394 394
 
395
-		if( 'post' === $search_method ) {
395
+		if ( 'post' === $search_method ) {
396 396
 			$get = $_POST;
397 397
 		} else {
398 398
 			$get = $_GET;
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 		$gventry = gravityview()->request->is_entry();
445 445
 
446 446
 		// If this is the directory view, return.
447
-		if( ! $gventry ) {
447
+		if ( ! $gventry ) {
448 448
 			return $passed_title;
449 449
 		}
450 450
 
@@ -462,19 +462,19 @@  discard block
 block discarded – undo
462 462
 		}
463 463
 
464 464
 		// WooCommerce doesn't $post_id
465
-		if ( empty( $passed_post_id ) )  {
465
+		if ( empty( $passed_post_id ) ) {
466 466
 			return $passed_title;
467 467
 		}
468 468
 
469 469
 		// Don't modify the title for anything other than the current view/post.
470 470
 		// This is true for embedded shortcodes and Views.
471
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
471
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
472 472
 			return $passed_title;
473 473
 		}
474 474
 
475 475
 		$view = gravityview()->request->is_view();
476 476
 
477
-		if( $view ) {
477
+		if ( $view ) {
478 478
 			return $this->_get_single_entry_title( $view, $entry, $passed_title );
479 479
 		}
480 480
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 		$view_collection = \GV\View_Collection::from_post( $post );
498 498
 
499 499
 		// We have multiple Views, but no gvid...this isn't valid security
500
-		if( 1 < $view_collection->count() ) {
500
+		if ( 1 < $view_collection->count() ) {
501 501
 			return $passed_title;
502 502
 		}
503 503
 
@@ -531,18 +531,18 @@  discard block
 block discarded – undo
531 531
 		 */
532 532
 		$check_entry_display = apply_filters( 'gravityview/single/title/check_entry_display', true, $entry, $view );
533 533
 
534
-		if( $check_entry_display ) {
534
+		if ( $check_entry_display ) {
535 535
 
536 536
 			$check_display = GVCommon::check_entry_display( $entry, $view );
537 537
 
538
-			if( is_wp_error( $check_display ) ) {
538
+			if ( is_wp_error( $check_display ) ) {
539 539
 				return $passed_title;
540 540
 			}
541 541
 		}
542 542
 
543 543
 		$title = $view->settings->get( 'single_title', $passed_title );
544 544
 
545
-		$form = GVCommon::get_form( $entry['form_id'] );
545
+		$form = GVCommon::get_form( $entry[ 'form_id' ] );
546 546
 
547 547
 		// We are allowing HTML in the fields, so no escaping the output
548 548
 		$title = GravityView_API::replace_variables( $title, $form, $entry );
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 
614 614
 		$context = GravityView_View::getInstance()->getContext();
615 615
 
616
-		switch( $context ) {
616
+		switch ( $context ) {
617 617
 			case 'directory':
618 618
 				$tab = __( 'Multiple Entries', 'gravityview' );
619 619
 				break;
@@ -627,12 +627,12 @@  discard block
 block discarded – undo
627 627
 		}
628 628
 
629 629
 
630
-		$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 );
630
+		$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 );
631 631
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
632
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
632
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
633 633
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
634 634
 
635
-		$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 ) ) );
635
+		$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 ) ) );
636 636
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
637 637
 
638 638
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
680 680
 		$embed_only = $view->settings->get( 'embed_only' );
681 681
 
682
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
682
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
683 683
 			return __( 'You are not allowed to view this content.', 'gravityview' );
684 684
 		}
685 685
 
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
 				$datetime_format = 'Y-m-d H:i:s';
727 727
 				$search_is_outside_view_bounds = false;
728 728
 
729
-				if( ! empty( $search_criteria[ $key ] ) ) {
729
+				if ( ! empty( $search_criteria[ $key ] ) ) {
730 730
 
731 731
 					$search_date = strtotime( $search_criteria[ $key ], GFCommon::get_local_timestamp() );
732 732
 
@@ -754,14 +754,14 @@  discard block
 block discarded – undo
754 754
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
755 755
 
756 756
 					// Then we override the search and re-set the start date
757
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
757
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
758 758
 				}
759 759
 			}
760 760
 		}
761 761
 
762
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
762
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
763 763
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
764
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
764
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
765 765
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
766 766
 			}
767 767
 		}
@@ -780,19 +780,19 @@  discard block
 block discarded – undo
780 780
 	public static function process_search_only_approved( $args, $search_criteria ) {
781 781
 
782 782
 		/** @since 1.19 */
783
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
783
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
784 784
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
785 785
 			return $search_criteria;
786 786
 		}
787 787
 
788
-		if ( ! empty( $args['show_only_approved'] ) ) {
788
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
789 789
 
790
-			$search_criteria['field_filters'][] = array(
790
+			$search_criteria[ 'field_filters' ][ ] = array(
791 791
 				'key' => GravityView_Entry_Approval::meta_key,
792 792
 				'value' => GravityView_Entry_Approval_Status::APPROVED
793 793
 			);
794 794
 
795
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
795
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
796 796
 
797 797
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
798 798
 		}
@@ -819,18 +819,18 @@  discard block
 block discarded – undo
819 819
 	 */
820 820
 	public static function is_entry_approved( $entry, $args = array() ) {
821 821
 
822
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
822
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
823 823
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
824 824
 			return true;
825 825
 		}
826 826
 
827 827
 		/** @since 1.19 */
828
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
828
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
829 829
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
830 830
 			return true;
831 831
 		}
832 832
 
833
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
833
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
834 834
 
835 835
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
836 836
 	}
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
855 855
 		 */
856 856
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
857
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
857
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
858 858
 
859 859
 		/**
860 860
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -874,29 +874,29 @@  discard block
 block discarded – undo
874 874
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
875 875
 
876 876
 		// implicity search
877
-		if ( ! empty( $args['search_value'] ) ) {
877
+		if ( ! empty( $args[ 'search_value' ] ) ) {
878 878
 
879 879
 			// Search operator options. Options: `is` or `contains`
880
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
880
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
881 881
 
882
-			$search_criteria['field_filters'][] = array(
882
+			$search_criteria[ 'field_filters' ][ ] = array(
883 883
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
884
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
884
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
885 885
 				'operator' => $operator,
886 886
 			);
887 887
 
888 888
 			// Lock search mode to "all" with implicit presearch filter.
889
-			$search_criteria['field_filters']['mode'] = 'all';
889
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
890 890
 		}
891 891
 
892
-		if( $search_criteria !== $original_search_criteria ) {
892
+		if ( $search_criteria !== $original_search_criteria ) {
893 893
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
894 894
 		}
895 895
 
896 896
 		// Handle setting date range
897 897
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
898 898
 
899
-		if( $search_criteria !== $original_search_criteria ) {
899
+		if ( $search_criteria !== $original_search_criteria ) {
900 900
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
901 901
 		}
902 902
 
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
908 908
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
909 909
 		 */
910
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
910
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
911 911
 
912 912
 		return $search_criteria;
913 913
 	}
@@ -1019,7 +1019,7 @@  discard block
 block discarded – undo
1019 1019
 			'search_criteria' => $search_criteria,
1020 1020
 			'sorting' => self::updateViewSorting( $args, $form_id ),
1021 1021
 			'paging' => $paging,
1022
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
1022
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
1023 1023
 		);
1024 1024
 
1025 1025
 		/**
@@ -1044,7 +1044,7 @@  discard block
 block discarded – undo
1044 1044
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
1045 1045
 		 * @param array $args View configuration args.
1046 1046
 		 */
1047
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1047
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
1048 1048
 
1049 1049
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
1050 1050
 
@@ -1069,17 +1069,17 @@  discard block
 block discarded – undo
1069 1069
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
1070 1070
 
1071 1071
 		// Paging & offset
1072
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
1072
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
1073 1073
 
1074 1074
 		if ( -1 === $page_size ) {
1075 1075
 			$page_size = PHP_INT_MAX;
1076 1076
 		}
1077 1077
 
1078
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
1078
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
1079 1079
 		$offset = ( $curr_page - 1 ) * $page_size;
1080 1080
 
1081
-		if ( ! empty( $args['offset'] ) ) {
1082
-			$offset += intval( $args['offset'] );
1081
+		if ( ! empty( $args[ 'offset' ] ) ) {
1082
+			$offset += intval( $args[ 'offset' ] );
1083 1083
 		}
1084 1084
 
1085 1085
 		$paging = array(
@@ -1104,11 +1104,11 @@  discard block
 block discarded – undo
1104 1104
 	public static function updateViewSorting( $args, $form_id ) {
1105 1105
 		$sorting = array();
1106 1106
 
1107
-		$has_values = isset( $_GET['sort'] );
1107
+		$has_values = isset( $_GET[ 'sort' ] );
1108 1108
 
1109
-		if ( $has_values && is_array( $_GET['sort'] ) ) {
1110
-			$sorts = array_keys( $_GET['sort'] );
1111
-			$dirs  = array_values( $_GET['sort'] );
1109
+		if ( $has_values && is_array( $_GET[ 'sort' ] ) ) {
1110
+			$sorts = array_keys( $_GET[ 'sort' ] );
1111
+			$dirs  = array_values( $_GET[ 'sort' ] );
1112 1112
 
1113 1113
 			if ( $has_values = array_filter( $dirs ) ) {
1114 1114
 				$sort_field_id = end( $sorts );
@@ -1117,11 +1117,11 @@  discard block
 block discarded – undo
1117 1117
 		}
1118 1118
 
1119 1119
 		if ( ! isset( $sort_field_id ) ) {
1120
-			$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
1120
+			$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
1121 1121
 		}
1122 1122
 
1123 1123
 		if ( ! isset( $sort_direction ) ) {
1124
-			$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
1124
+			$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
1125 1125
 		}
1126 1126
 
1127 1127
 		if ( is_array( $sort_field_id ) ) {
@@ -1153,10 +1153,10 @@  discard block
 block discarded – undo
1153 1153
 				$form = GFAPI::get_form( $form_id );
1154 1154
 
1155 1155
 				// Get the first GF_Field field ID, set as the key for entry randomization
1156
-				if ( ! empty( $form['fields'] ) ) {
1156
+				if ( ! empty( $form[ 'fields' ] ) ) {
1157 1157
 
1158 1158
 					/** @var GF_Field $field */
1159
-					foreach ( $form['fields'] as $field ) {
1159
+					foreach ( $form[ 'fields' ] as $field ) {
1160 1160
 						if ( ! is_a( $field, 'GF_Field' ) ) {
1161 1161
 							continue;
1162 1162
 						}
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
 		if ( is_array( $sort_field_id ) ) {
1202 1202
 			$modified_ids = array();
1203 1203
 			foreach ( $sort_field_id as $_sort_field_id ) {
1204
-				$modified_ids []= self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1204
+				$modified_ids [ ] = self::_override_sorting_id_by_field_type( $_sort_field_id, $form_id );
1205 1205
 			}
1206 1206
 			return $modified_ids;
1207 1207
 		}
@@ -1210,11 +1210,11 @@  discard block
 block discarded – undo
1210 1210
 
1211 1211
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1212 1212
 
1213
-		if( ! $sort_field ) {
1213
+		if ( ! $sort_field ) {
1214 1214
 			return $sort_field_id;
1215 1215
 		}
1216 1216
 
1217
-		switch ( $sort_field['type'] ) {
1217
+		switch ( $sort_field[ 'type' ] ) {
1218 1218
 
1219 1219
 			case 'address':
1220 1220
 				// Sorting by full address
@@ -1231,7 +1231,7 @@  discard block
 block discarded – undo
1231 1231
 					 */
1232 1232
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1233 1233
 
1234
-					switch( strtolower( $address_part ) ){
1234
+					switch ( strtolower( $address_part ) ) {
1235 1235
 						case 'street':
1236 1236
 							$sort_field_id .= '.1';
1237 1237
 							break;
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 		if ( ! class_exists( '\GV\Entry' ) ) {
1305 1305
 
1306 1306
 			// Not using gravityview()->log->error(), since that may not exist yet either!
1307
-			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary()  );
1307
+			do_action( 'gravityview_log_error', '\GV\Entry not defined yet. Backtrace: ' . wp_debug_backtrace_summary() );
1308 1308
 
1309 1309
 			return null;
1310 1310
 		}
@@ -1321,7 +1321,7 @@  discard block
 block discarded – undo
1321 1321
 		 */
1322 1322
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1323 1323
 
1324
-		if ( empty( $single_entry ) ){
1324
+		if ( empty( $single_entry ) ) {
1325 1325
 			return false;
1326 1326
 		} else {
1327 1327
 			return $single_entry;
@@ -1342,7 +1342,7 @@  discard block
 block discarded – undo
1342 1342
 			$views = $this->getGvOutputData()->get_views();
1343 1343
 
1344 1344
 			foreach ( $views as $view_id => $data ) {
1345
-				$view = \GV\View::by_id( $data['id'] );
1345
+				$view = \GV\View::by_id( $data[ 'id' ] );
1346 1346
 				$view_id = $view->ID;
1347 1347
 				$template_id = gravityview_get_template_id( $view->ID );
1348 1348
 				$data = $view->as_data();
@@ -1351,7 +1351,7 @@  discard block
 block discarded – undo
1351 1351
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1352 1352
 				 * @since 1.15
1353 1353
 				 */
1354
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1354
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1355 1355
 					continue;
1356 1356
 				}
1357 1357
 
@@ -1380,7 +1380,7 @@  discard block
 block discarded – undo
1380 1380
 					 * @param \GV\View The View.
1381 1381
 					 */
1382 1382
 					$js_dependency = apply_filters( 'gravityview_lightbox_script', $js_dependency, $view );
1383
-					$js_dependencies[] = $js_dependency;
1383
+					$js_dependencies[ ] = $js_dependency;
1384 1384
 
1385 1385
 					/**
1386 1386
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
@@ -1396,7 +1396,7 @@  discard block
 block discarded – undo
1396 1396
 					 * @param \GV\View The View.
1397 1397
 					 */
1398 1398
 					$css_dependency = apply_filters( 'gravityview_lightbox_style', $css_dependency, $view );
1399
-					$css_dependencies[] = $css_dependency;
1399
+					$css_dependencies[ ] = $css_dependency;
1400 1400
 				}
1401 1401
 
1402 1402
 				/**
@@ -1404,19 +1404,19 @@  discard block
 block discarded – undo
1404 1404
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1405 1405
 				 * @since 1.15
1406 1406
 				 */
1407
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1408
-					$css_dependencies[] = 'dashicons';
1407
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1408
+					$css_dependencies[ ] = 'dashicons';
1409 1409
 				}
1410 1410
 
1411 1411
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1412 1412
 
1413 1413
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1414 1414
 
1415
-				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 );
1415
+				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 );
1416 1416
 
1417 1417
 				wp_enqueue_script( 'gravityview-fe-view' );
1418 1418
 
1419
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1419
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1420 1420
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1421 1421
 				}
1422 1422
 
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
 	public static function add_style( $template_id ) {
1480 1480
 
1481 1481
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
1482
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1482
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1483 1483
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
1484 1484
 		} elseif ( empty( $template_id ) ) {
1485 1485
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1510,11 +1510,11 @@  discard block
 block discarded – undo
1510 1510
 		 * Not a table-based template; don't add sort icons
1511 1511
 		 * @since 1.12
1512 1512
 		 */
1513
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1513
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1514 1514
 			return $label;
1515 1515
 		}
1516 1516
 
1517
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1517
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1518 1518
 			return $label;
1519 1519
 		}
1520 1520
 
@@ -1522,29 +1522,29 @@  discard block
 block discarded – undo
1522 1522
 
1523 1523
 		$class = 'gv-sort';
1524 1524
 
1525
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1525
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1526 1526
 
1527 1527
 		$sort_args = array(
1528
-			'sort' => $field['id'],
1528
+			'sort' => $field[ 'id' ],
1529 1529
 			'dir' => 'asc',
1530 1530
 		);
1531 1531
 
1532
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1532
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1533 1533
 			//toggle sorting direction.
1534
-			if ( 'asc' === $sorting['direction'] ) {
1535
-				$sort_args['dir'] = 'desc';
1534
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1535
+				$sort_args[ 'dir' ] = 'desc';
1536 1536
 				$class .= ' gv-icon-sort-desc';
1537 1537
 			} else {
1538
-				$sort_args['dir'] = 'asc';
1538
+				$sort_args[ 'dir' ] = 'asc';
1539 1539
 				$class .= ' gv-icon-sort-asc';
1540 1540
 			}
1541 1541
 		} else {
1542 1542
 			$class .= ' gv-icon-caret-up-down';
1543 1543
 		}
1544 1544
 
1545
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1545
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1546 1546
 
1547
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1547
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1548 1548
 
1549 1549
 	}
1550 1550
 
@@ -1562,7 +1562,7 @@  discard block
 block discarded – undo
1562 1562
 
1563 1563
 		$field_type = $field_id;
1564 1564
 
1565
-		if( is_numeric( $field_id ) ) {
1565
+		if ( is_numeric( $field_id ) ) {
1566 1566
 			$field = GFFormsModel::get_field( $form, $field_id );
1567 1567
 			$field_type = $field ? $field->type : $field_id;
1568 1568
 		}
@@ -1585,7 +1585,7 @@  discard block
 block discarded – undo
1585 1585
 			return false;
1586 1586
 		}
1587 1587
 
1588
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1588
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1589 1589
 
1590 1590
 	}
1591 1591
 
Please login to merge, or discard this patch.