Completed
Push — develop ( f84522...45f991 )
by Zack
30:47 queued 10:47
created
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -40,17 +40,17 @@  discard block
 block discarded – undo
40 40
 	public static function is_value_match( $field_value, $target_value, $operation = 'is', $source_field = null, $rule = null, $form = null ) {
41 41
 
42 42
 		if ( in_array( $source_field, array( 'date_created', 'date_updated', 'payment_date' ), true ) ) {
43
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
44
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
43
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
44
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
45 45
 		}
46 46
 
47 47
 		if ( $source_field instanceof GF_Field && $source_field->type == 'date' ) {
48
-			$field_value = is_int( $field_value )? $field_value : strtotime( $field_value );
49
-			$target_value = is_int( $target_value )? $target_value : strtotime( $target_value );
48
+			$field_value = is_int( $field_value ) ? $field_value : strtotime( $field_value );
49
+			$target_value = is_int( $target_value ) ? $target_value : strtotime( $target_value );
50 50
 		}
51 51
 
52 52
 		if ( in_array( $_operation = str_replace( ' ', '_', trim( $operation ) ), array( 'in', 'not_in' ) ) ) {
53
-			return GVCommon::matches_operation( (array) $field_value, (array) $target_value, $_operation );
53
+			return GVCommon::matches_operation( (array)$field_value, (array)$target_value, $_operation );
54 54
 		}
55 55
 
56 56
 		return parent::is_value_match( $field_value, $target_value, $operation, $source_field, $rule, $form );
@@ -74,18 +74,18 @@  discard block
 block discarded – undo
74 74
 
75 75
         $post_data = self::get_post_fields( $form, $entry );
76 76
 
77
-        $media = get_attached_media( 'image', $entry['post_id'] );
77
+        $media = get_attached_media( 'image', $entry[ 'post_id' ] );
78 78
 
79 79
         $post_images = array();
80 80
 
81 81
         foreach ( $media as $media_item ) {
82
-            foreach( (array) $post_data['images'] as $post_data_item ) {
83
-                if(
82
+            foreach ( (array)$post_data[ 'images' ] as $post_data_item ) {
83
+                if (
84 84
                     \GV\Utils::get( $post_data_item, 'title' ) === $media_item->post_title &&
85 85
                     \GV\Utils::get( $post_data_item, 'description' ) === $media_item->post_content &&
86 86
                     \GV\Utils::get( $post_data_item, 'caption' ) === $media_item->post_excerpt
87 87
                 ) {
88
-                    $post_images["{$post_data_item['field_id']}"] = $media_item->ID;
88
+                    $post_images[ "{$post_data_item[ 'field_id' ]}" ] = $media_item->ID;
89 89
                 }
90 90
             }
91 91
         }
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
          * If the method changes to public, use Gravity Forms' method
114 114
          * @todo: If/when the method is public, remove the unneeded copied code.
115 115
          */
116
-        if( $reflection->isPublic() ) {
116
+        if ( $reflection->isPublic() ) {
117 117
             return parent::get_post_fields( $form, $entry );
118 118
         }
119 119
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
          * If the method changes to public, use Gravity Forms' method
141 141
          * @todo: If/when the method is public, remove the unneeded copied code.
142 142
          */
143
-        if( $reflection->isPublic() ) {
143
+        if ( $reflection->isPublic() ) {
144 144
             return parent::copy_post_image( $url, $post_id );
145 145
         }
146 146
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
          * If the method changes to public, use Gravity Forms' method
176 176
          * @todo: If/when the method is public, remove the unneeded copied code.
177 177
          */
178
-        if( $reflection->isPublic() ) {
178
+        if ( $reflection->isPublic() ) {
179 179
             return parent::media_handle_upload( $url, $post_id, $post_data );
180 180
         }
181 181
 
Please login to merge, or discard this patch.
future/includes/class-gv-collection-entry.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
 		/** Call all lazy callbacks. */
106 106
 		foreach ( $this->callbacks as $callback ) {
107
-			if ( $callback[0] != 'count' ) {
107
+			if ( $callback[ 0 ] != 'count' ) {
108 108
 				continue;
109 109
 			}
110 110
 
111
-			$total += $callback[1]( $this->filters );
111
+			$total += $callback[ 1 ]( $this->filters );
112 112
 		}
113 113
 
114 114
 		if ( ! $total ) {
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 
186 186
 		/** Call all lazy callbacks. */
187 187
 		foreach ( $this->callbacks as $i => $callback ) {
188
-			if ( $callback[0] != 'fetch' ) {
188
+			if ( $callback[ 0 ] != 'fetch' ) {
189 189
 				continue;
190 190
 			}
191 191
 
192
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
192
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
193 193
 		}
194 194
 
195 195
 		$this->fetched = parent::count();
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			return;
346 346
 		}
347 347
 
348
-		$this->callbacks []= array( $type, $callback );
348
+		$this->callbacks [ ] = array( $type, $callback );
349 349
 	}
350 350
 
351 351
 	/**
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Spacing   +87 added lines, -87 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 );
@@ -236,12 +236,12 @@  discard block
 block discarded – undo
236 236
 
237 237
 			$this->context_view_id = $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 = $_GET['gvid'];
244
+			$this->context_view_id = $_GET[ 'gvid' ];
245 245
 
246 246
 		} elseif ( ! $multiple_views ) {
247 247
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
@@ -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;
@@ -443,20 +443,20 @@  discard block
 block discarded – undo
443 443
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
444 444
 		 * @param array $entry Current entry
445 445
 		 */
446
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
446
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
447 447
 
448 448
 		if ( ! $apply_outside_loop ) {
449 449
 			return $title;
450 450
 		}
451 451
 
452 452
 		// User reported WooCommerce doesn't pass two args.
453
-		if ( empty( $passed_post_id ) )  {
453
+		if ( empty( $passed_post_id ) ) {
454 454
 			return $title;
455 455
 		}
456 456
 
457 457
 		// Don't modify the title for anything other than the current view/post.
458 458
 		// This is true for embedded shortcodes and Views.
459
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
459
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
460 460
 			return $title;
461 461
 		}
462 462
 
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
469 469
 		} else {
470 470
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
471
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
471
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
472 472
 					$view_meta = $view_data;
473 473
 					break;
474 474
 				}
@@ -476,12 +476,12 @@  discard block
 block discarded – undo
476 476
 		}
477 477
 
478 478
 		/** Deprecated stuff in the future. See the branch above. */
479
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
479
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
480 480
 
481
-			$title = $view_meta['atts']['single_title'];
481
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
482 482
 
483 483
 			// We are allowing HTML in the fields, so no escaping the output
484
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
484
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
485 485
 
486 486
 			$title = do_shortcode( $title );
487 487
 		}
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 
553 553
 		$context = GravityView_View::getInstance()->getContext();
554 554
 
555
-		switch( $context ) {
555
+		switch ( $context ) {
556 556
 			case 'directory':
557 557
 				$tab = __( 'Multiple Entries', 'gravityview' );
558 558
 				break;
@@ -566,12 +566,12 @@  discard block
 block discarded – undo
566 566
 		}
567 567
 
568 568
 
569
-		$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 );
569
+		$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 );
570 570
 		$edit_link = admin_url( sprintf( 'post.php?post=%d&action=edit#%s-view', $view_id, $context ) );
571
-		$action_text = sprintf( esc_html__('Add fields to %s', 'gravityview' ), $tab );
571
+		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
572 572
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
573 573
 
574
-		$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 ) ) );
574
+		$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 ) ) );
575 575
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
576 576
 
577 577
 		echo GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $view_id );
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
 		$direct_access = apply_filters( 'gravityview_direct_access', true, $view->ID );
620 620
 		$embed_only = $view->settings->get( 'embed_only' );
621 621
 
622
-		if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
622
+		if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
623 623
 			return __( 'You are not allowed to view this content.', 'gravityview' );
624 624
 		}
625 625
 
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 				$datetime_format = 'Y-m-d H:i:s';
667 667
 				$search_is_outside_view_bounds = false;
668 668
 
669
-				if( ! empty( $search_criteria[ $key ] ) ) {
669
+				if ( ! empty( $search_criteria[ $key ] ) ) {
670 670
 
671 671
 					$search_date = strtotime( $search_criteria[ $key ] );
672 672
 
@@ -694,14 +694,14 @@  discard block
 block discarded – undo
694 694
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
695 695
 
696 696
 					// Then we override the search and re-set the start date
697
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
697
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
698 698
 				}
699 699
 			}
700 700
 		}
701 701
 
702
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
702
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
703 703
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
704
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
704
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
705 705
 				gravityview()->log->error( 'Invalid search: the start date is after the end date.', array( 'data' => $return_search_criteria ) );
706 706
 			}
707 707
 		}
@@ -720,19 +720,19 @@  discard block
 block discarded – undo
720 720
 	public static function process_search_only_approved( $args, $search_criteria ) {
721 721
 
722 722
 		/** @since 1.19 */
723
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
723
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
724 724
 			gravityview()->log->debug( 'User can moderate entries; showing all approval statuses' );
725 725
 			return $search_criteria;
726 726
 		}
727 727
 
728
-		if ( ! empty( $args['show_only_approved'] ) ) {
728
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
729 729
 
730
-			$search_criteria['field_filters'][] = array(
730
+			$search_criteria[ 'field_filters' ][ ] = array(
731 731
 				'key' => GravityView_Entry_Approval::meta_key,
732 732
 				'value' => GravityView_Entry_Approval_Status::APPROVED
733 733
 			);
734 734
 
735
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
735
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
736 736
 
737 737
 			gravityview()->log->debug( '[process_search_only_approved] Search Criteria if show only approved: ', array( 'data' => $search_criteria ) );
738 738
 		}
@@ -759,18 +759,18 @@  discard block
 block discarded – undo
759 759
 	 */
760 760
 	public static function is_entry_approved( $entry, $args = array() ) {
761 761
 
762
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
762
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
763 763
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
764 764
 			return true;
765 765
 		}
766 766
 
767 767
 		/** @since 1.19 */
768
-		if( ! empty( $args['admin_show_all_statuses'] ) && GVCommon::has_cap('gravityview_moderate_entries') ) {
768
+		if ( ! empty( $args[ 'admin_show_all_statuses' ] ) && GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
769 769
 			gravityview()->log->debug( 'User can moderate entries, so entry is approved for viewing' );
770 770
 			return true;
771 771
 		}
772 772
 
773
-		$is_approved = gform_get_meta( $entry['id'], GravityView_Entry_Approval::meta_key );
773
+		$is_approved = gform_get_meta( $entry[ 'id' ], GravityView_Entry_Approval::meta_key );
774 774
 
775 775
 		return GravityView_Entry_Approval_Status::is_approved( $is_approved );
776 776
 	}
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 		 * Compatibility with filters hooking in `gravityview_search_criteria` instead of `gravityview_fe_search_criteria`.
795 795
 		 */
796 796
 		$criteria = apply_filters( 'gravityview_search_criteria', array(), array( $form_id ), \GV\Utils::get( $args, 'id' ) );
797
-		$search_criteria = isset( $criteria['search_criteria'] ) ? $criteria['search_criteria'] : array( 'field_filters' => array() );
797
+		$search_criteria = isset( $criteria[ 'search_criteria' ] ) ? $criteria[ 'search_criteria' ] : array( 'field_filters' => array() );
798 798
 
799 799
 		/**
800 800
 		 * @filter `gravityview_fe_search_criteria` Modify the search criteria
@@ -810,29 +810,29 @@  discard block
 block discarded – undo
810 810
 		gravityview()->log->debug( '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', array( 'data' =>$search_criteria ) );
811 811
 
812 812
 		// implicity search
813
-		if ( ! empty( $args['search_value'] ) ) {
813
+		if ( ! empty( $args[ 'search_value' ] ) ) {
814 814
 
815 815
 			// Search operator options. Options: `is` or `contains`
816
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
816
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
817 817
 
818
-			$search_criteria['field_filters'][] = array(
818
+			$search_criteria[ 'field_filters' ][ ] = array(
819 819
 				'key' => \GV\Utils::_GET( 'search_field', \GV\Utils::get( $args, 'search_field' ) ), // The field ID to search
820
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
820
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
821 821
 				'operator' => $operator,
822 822
 			);
823 823
 
824 824
 			// Lock search mode to "all" with implicit presearch filter.
825
-			$search_criteria['field_filters']['mode'] = 'all';
825
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
826 826
 		}
827 827
 
828
-		if( $search_criteria !== $original_search_criteria ) {
828
+		if ( $search_criteria !== $original_search_criteria ) {
829 829
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after implicity search: ', array( 'data' => $search_criteria ) );
830 830
 		}
831 831
 
832 832
 		// Handle setting date range
833 833
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
834 834
 
835
-		if( $search_criteria !== $original_search_criteria ) {
835
+		if ( $search_criteria !== $original_search_criteria ) {
836 836
 			gravityview()->log->debug( '[get_search_criteria] Search Criteria after date params: ', array( 'data' => $search_criteria ) );
837 837
 		}
838 838
 
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
844 844
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
845 845
 		 */
846
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
846
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
847 847
 
848 848
 		return $search_criteria;
849 849
 	}
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
 			'search_criteria' => $search_criteria,
957 957
 			'sorting' => self::updateViewSorting( $args, $form_id ),
958 958
 			'paging' => $paging,
959
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
959
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
960 960
 		);
961 961
 
962 962
 		/**
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
982 982
 		 * @param array $args View configuration args.
983 983
 		 */
984
-		$parameters = apply_filters( 'gravityview_get_entries_'.\GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
984
+		$parameters = apply_filters( 'gravityview_get_entries_' . \GV\Utils::get( $args, 'id' ), $parameters, $args, $form_id );
985 985
 
986 986
 		gravityview()->log->debug( '$parameters passed to gravityview_get_entries(): ', array( 'data' => $parameters ) );
987 987
 
@@ -1006,17 +1006,17 @@  discard block
 block discarded – undo
1006 1006
 		$default_page_size = apply_filters( 'gravityview_default_page_size', 25 );
1007 1007
 
1008 1008
 		// Paging & offset
1009
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : $default_page_size;
1009
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : $default_page_size;
1010 1010
 
1011 1011
 		if ( -1 === $page_size ) {
1012 1012
 			$page_size = PHP_INT_MAX;
1013 1013
 		}
1014 1014
 
1015
-		$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
1015
+		$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
1016 1016
 		$offset = ( $curr_page - 1 ) * $page_size;
1017 1017
 
1018
-		if ( ! empty( $args['offset'] ) ) {
1019
-			$offset += intval( $args['offset'] );
1018
+		if ( ! empty( $args[ 'offset' ] ) ) {
1019
+			$offset += intval( $args[ 'offset' ] );
1020 1020
 		}
1021 1021
 
1022 1022
 		$paging = array(
@@ -1040,8 +1040,8 @@  discard block
 block discarded – undo
1040 1040
 	 */
1041 1041
 	public static function updateViewSorting( $args, $form_id ) {
1042 1042
 		$sorting = array();
1043
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : \GV\Utils::get( $args, 'sort_field' );
1044
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : \GV\Utils::get( $args, 'sort_direction' );
1043
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : \GV\Utils::get( $args, 'sort_field' );
1044
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : \GV\Utils::get( $args, 'sort_direction' );
1045 1045
 
1046 1046
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
1047 1047
 
@@ -1058,12 +1058,12 @@  discard block
 block discarded – undo
1058 1058
 			$form = GFAPI::get_form( $form_id );
1059 1059
 
1060 1060
 			// Get the first GF_Field field ID, set as the key for entry randomization
1061
-			if( ! empty( $form['fields'] ) ) {
1061
+			if ( ! empty( $form[ 'fields' ] ) ) {
1062 1062
 
1063 1063
 				/** @var GF_Field $field */
1064
-				foreach ( $form['fields'] as $field ) {
1064
+				foreach ( $form[ 'fields' ] as $field ) {
1065 1065
 
1066
-					if( ! is_a( $field, 'GF_Field' ) ) {
1066
+					if ( ! is_a( $field, 'GF_Field' ) ) {
1067 1067
 						continue;
1068 1068
 					}
1069 1069
 
@@ -1107,11 +1107,11 @@  discard block
 block discarded – undo
1107 1107
 
1108 1108
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1109 1109
 
1110
-		if( ! $sort_field ) {
1110
+		if ( ! $sort_field ) {
1111 1111
 			return $sort_field_id;
1112 1112
 		}
1113 1113
 
1114
-		switch ( $sort_field['type'] ) {
1114
+		switch ( $sort_field[ 'type' ] ) {
1115 1115
 
1116 1116
 			case 'address':
1117 1117
 				// Sorting by full address
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
 					 */
1129 1129
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1130 1130
 
1131
-					switch( strtolower( $address_part ) ){
1131
+					switch ( strtolower( $address_part ) ) {
1132 1132
 						case 'street':
1133 1133
 							$sort_field_id .= '.1';
1134 1134
 							break;
@@ -1208,7 +1208,7 @@  discard block
 block discarded – undo
1208 1208
 		 */
1209 1209
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1210 1210
 
1211
-		if ( empty( $single_entry ) ){
1211
+		if ( empty( $single_entry ) ) {
1212 1212
 			return false;
1213 1213
 		} else {
1214 1214
 			return $single_entry;
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
 			$views = $this->getGvOutputData()->get_views();
1231 1231
 
1232 1232
 			foreach ( $views as $view_id => $data ) {
1233
-				$view = \GV\View::by_id( $data['id'] );
1233
+				$view = \GV\View::by_id( $data[ 'id' ] );
1234 1234
 				$view_id = $view->ID;
1235 1235
 				$template_id = gravityview_get_template_id( $view->ID );
1236 1236
 				$data = $view->as_data();
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1240 1240
 				 * @since 1.15
1241 1241
 				 */
1242
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1242
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1243 1243
 					continue;
1244 1244
 				}
1245 1245
 
@@ -1256,13 +1256,13 @@  discard block
 block discarded – undo
1256 1256
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
1257 1257
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
1258 1258
 					 */
1259
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
1259
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
1260 1260
 
1261 1261
 					/**
1262 1262
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
1263 1263
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
1264 1264
 					 */
1265
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
1265
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
1266 1266
 				}
1267 1267
 
1268 1268
 				/**
@@ -1270,19 +1270,19 @@  discard block
 block discarded – undo
1270 1270
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1271 1271
 				 * @since 1.15
1272 1272
 				 */
1273
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1274
-					$css_dependencies[] = 'dashicons';
1273
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1274
+					$css_dependencies[ ] = 'dashicons';
1275 1275
 				}
1276 1276
 
1277 1277
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1278 1278
 
1279 1279
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1280 1280
 
1281
-				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 );
1281
+				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 );
1282 1282
 
1283 1283
 				wp_enqueue_script( 'gravityview-fe-view' );
1284 1284
 
1285
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1285
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1286 1286
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1287 1287
 				}
1288 1288
 
@@ -1345,7 +1345,7 @@  discard block
 block discarded – undo
1345 1345
 	public static function add_style( $template_id ) {
1346 1346
 
1347 1347
 		if ( ! empty( $template_id ) && wp_style_is( 'gravityview_style_' . $template_id, 'registered' ) ) {
1348
-			gravityview()->log->debug(  'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1348
+			gravityview()->log->debug( 'Adding extra template style for {template_id}', array( 'template_id' => $template_id ) );
1349 1349
 			wp_enqueue_style( 'gravityview_style_' . $template_id );
1350 1350
 		} elseif ( empty( $template_id ) ) {
1351 1351
 			gravityview()->log->error( 'Cannot add template style; template_id is empty' );
@@ -1376,11 +1376,11 @@  discard block
 block discarded – undo
1376 1376
 		 * Not a table-based template; don't add sort icons
1377 1377
 		 * @since 1.12
1378 1378
 		 */
1379
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1379
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1380 1380
 			return $label;
1381 1381
 		}
1382 1382
 
1383
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1383
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1384 1384
 			return $label;
1385 1385
 		}
1386 1386
 
@@ -1388,29 +1388,29 @@  discard block
 block discarded – undo
1388 1388
 
1389 1389
 		$class = 'gv-sort';
1390 1390
 
1391
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1391
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1392 1392
 
1393 1393
 		$sort_args = array(
1394
-			'sort' => $field['id'],
1394
+			'sort' => $field[ 'id' ],
1395 1395
 			'dir' => 'asc',
1396 1396
 		);
1397 1397
 
1398
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1398
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1399 1399
 			//toggle sorting direction.
1400
-			if ( 'asc' === $sorting['direction'] ) {
1401
-				$sort_args['dir'] = 'desc';
1400
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1401
+				$sort_args[ 'dir' ] = 'desc';
1402 1402
 				$class .= ' gv-icon-sort-desc';
1403 1403
 			} else {
1404
-				$sort_args['dir'] = 'asc';
1404
+				$sort_args[ 'dir' ] = 'asc';
1405 1405
 				$class .= ' gv-icon-sort-asc';
1406 1406
 			}
1407 1407
 		} else {
1408 1408
 			$class .= ' gv-icon-caret-up-down';
1409 1409
 		}
1410 1410
 
1411
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1411
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1412 1412
 
1413
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1413
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1414 1414
 
1415 1415
 	}
1416 1416
 
@@ -1428,7 +1428,7 @@  discard block
 block discarded – undo
1428 1428
 
1429 1429
 		$field_type = $field_id;
1430 1430
 
1431
-		if( is_numeric( $field_id ) ) {
1431
+		if ( is_numeric( $field_id ) ) {
1432 1432
 			$field = GFFormsModel::get_field( $form, $field_id );
1433 1433
 			$field_type = $field ? $field->type : $field_id;
1434 1434
 		}
@@ -1451,7 +1451,7 @@  discard block
 block discarded – undo
1451 1451
 			return false;
1452 1452
 		}
1453 1453
 
1454
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1454
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1455 1455
 
1456 1456
 	}
1457 1457
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18
-if( is_array( $search_field['value'] ) ) {
18
+if ( is_array( $search_field[ 'value' ] ) ) {
19 19
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
20
-	$search_field['value'] = reset( $search_field['value'] );
20
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
21 21
 }
22 22
 
23 23
 /**
@@ -26,19 +26,19 @@  discard block
 block discarded – undo
26 26
  * @param string $default_option Default: `&mdash;` (—)
27 27
  * @param string $field_type Field type: "select" or "multiselect"
28 28
  */
29
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'select' );
29
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'select' );
30 30
 
31 31
 ?>
32 32
 <div class="gv-search-box gv-search-field-select">
33
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
34
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
33
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
34
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
35 35
 	<?php } ?>
36 36
 	<p>
37
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
38
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
37
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
38
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
39 39
 			<?php
40
-			foreach( $search_field['choices'] as $choice ) : ?>
41
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
40
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
41
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
42 42
 			<?php endforeach; ?>
43 43
 		</select>
44 44
 	</p>
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-field.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -15,34 +15,34 @@
 block discarded – undo
15 15
 		$field_info_items = array();
16 16
 
17 17
 		// Fields with IDs, not like Source URL or Entry ID
18
-		if( is_numeric( $this->id ) ) {
18
+		if ( is_numeric( $this->id ) ) {
19 19
 
20
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
20
+			$field_type_title = GFCommon::get_field_type_title( $this->item[ 'input_type' ] );
21 21
 
22
-			$field_info_items[] = array(
23
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
22
+			$field_info_items[ ] = array(
23
+				'value' => sprintf( __( 'Type: %s', 'gravityview' ), $field_type_title )
24 24
 			);
25 25
 
26
-			$field_info_items[] = array(
27
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
26
+			$field_info_items[ ] = array(
27
+				'value' => sprintf( __( 'Field ID: %s', 'gravityview' ), $this->id ),
28 28
 			);
29 29
 		}
30 30
 
31
-		if( !empty( $this->item['desc'] ) ) {
32
-			$field_info_items[] = array(
33
-				'value' => $this->item['desc']
31
+		if ( ! empty( $this->item[ 'desc' ] ) ) {
32
+			$field_info_items[ ] = array(
33
+				'value' => $this->item[ 'desc' ]
34 34
 			);
35 35
 		}
36 36
 
37
-		if( !empty( $this->item['adminLabel'] ) ) {
38
-			$field_info_items[] = array(
39
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
37
+		if ( ! empty( $this->item[ 'adminLabel' ] ) ) {
38
+			$field_info_items[ ] = array(
39
+				'value' => sprintf( __( 'Admin Label: %s', 'gravityview' ), $this->item[ 'adminLabel' ] ),
40 40
 				'class'	=> 'gv-sublabel'
41 41
 			);
42 42
 		}
43 43
 
44
-		$field_info_items[] = array(
45
-			'value'          => sprintf( __('Form ID: %s', 'gravityview' ), $this->form_id ),
44
+		$field_info_items[ ] = array(
45
+			'value'          => sprintf( __( 'Form ID: %s', 'gravityview' ), $this->form_id ),
46 46
 			'hide_in_picker' => true,
47 47
 		);
48 48
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		// Prevent items from not having index set
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		$this->id         = $item_id;
72 72
 		$this->form_id    = $form_id;
73 73
 		$this->settings   = $settings;
74
-		$this->label_type = $item['label_type'];
74
+		$this->label_type = $item[ 'label_type' ];
75 75
 	}
76 76
 
77 77
 	/**
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 
116 116
 			foreach ( $field_info_items as $item ) {
117 117
 
118
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
118
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
119 119
 					continue;
120 120
 				}
121 121
 
122
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
122
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
123 123
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
124 124
 				$output .= '<span class="' . $class . '">';
125
-				$output .= esc_html( $item['value'] );
125
+				$output .= esc_html( $item[ 'value' ] );
126 126
 				$output .= '</span>';
127 127
 			}
128 128
 
@@ -150,29 +150,29 @@  discard block
 block discarded – undo
150 150
 
151 151
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
152 152
 		// TODO: Un-hack this
153
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
153
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
154 154
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
155 155
 
156 156
 		// Should we show the icon that the field is being used as a link to single entry?
157
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
157
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
158 158
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
159 159
 
160 160
 		// When a field label is empty, use the Field ID
161 161
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
162 162
 
163 163
 		// If there's a custom label, and show label is checked, use that as the field heading
164
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
165
-			$label = $this->settings['custom_label'];
166
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
167
-			$label = $this->item['customLabel'];
164
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
165
+			$label = $this->settings[ 'custom_label' ];
166
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
167
+			$label = $this->item[ 'customLabel' ];
168 168
 		}
169 169
 
170 170
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
171 171
 
172 172
 		$label = esc_attr( $label );
173 173
 
174
-		if ( ! empty( $this->item['parent'] ) ) {
175
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
174
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
175
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
176 176
 		}
177 177
 
178 178
 		// Name of field / widget
@@ -188,10 +188,10 @@  discard block
 block discarded – undo
188 188
 
189 189
 		$output .= '</h5>';
190 190
 
191
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
192
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
191
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
192
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
193 193
 
194
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
194
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
195 195
 
196 196
 		return $output;
197 197
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-renderer-entry.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,16 +58,16 @@
 block discarded – undo
58 58
 		if ( $view->joins ) {
59 59
 			$form_ids = array();
60 60
 			foreach ( $view->joins as $join ) {
61
-				$form_ids[] = $join->join->ID;
62
-				$form_ids[] = $join->join_on->ID;
61
+				$form_ids[ ] = $join->join->ID;
62
+				$form_ids[ ] = $join->join_on->ID;
63 63
 			}
64 64
 			foreach ( $entry->entries as $e ) {
65
-				if ( ! in_array( $e['form_id'], $form_ids ) ) {
65
+				if ( ! in_array( $e[ 'form_id' ], $form_ids ) ) {
66 66
 					gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $e->ID, 'view_id' => $view->ID ) );
67 67
 					return null;
68 68
 				}
69 69
 			}
70
-		} else if ( $view->form && $view->form->ID != $entry['form_id'] ) {
70
+		} else if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) {
71 71
 			gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) );
72 72
 			return null;
73 73
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-entry-multi.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 			if ( ! $entry instanceof Entry ) {
45 45
 				continue;
46 46
 			}
47
-			$_entry->entries[ $entry['form_id'] ]  = &$entry;
47
+			$_entry->entries[ $entry[ 'form_id' ] ] = &$entry;
48 48
 		}
49 49
 		return $_entry;
50 50
 	}
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
 			foreach ( $this->entries as $entry ) {
67 67
 				$entry = $entry->as_entry();
68
-				$_entry['_multi'][ $entry['form_id'] ] = $entry;
68
+				$_entry[ '_multi' ][ $entry[ 'form_id' ] ] = $entry;
69 69
 			}
70 70
 		}
71 71
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	public function get_permalink( \GV\View $view = null, \GV\Request $request = null, $track_directory = true ) {
88 88
 		$slugs = array();
89 89
 		add_filter( 'gravityview/entry/slug', $callback = function( $slug ) use ( &$slugs ) {
90
-			$slugs[] = $slug;
90
+			$slugs[ ] = $slug;
91 91
 			return implode( ',', $slugs );
92 92
 		}, 10, 1 );
93 93
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-field.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	public function __destruct() {
95
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
95
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
96 96
 	}
97 97
 
98 98
 	/**
@@ -175,55 +175,55 @@  discard block
 block discarded – undo
175 175
 
176 176
 			if ( $is_view && $post ) {
177 177
 				if ( $field_type ) {
178
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
178
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
186 186
 				}
187 187
 
188
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
188
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
192 192
 			}
193 193
 			
194 194
 			/** Field-specific */
195 195
 			if ( $field_id && $form_id ) {
196 196
 
197 197
 				if ( $field_id ) {
198
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
198
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
200 200
 				}
201 201
 
202 202
 				if ( $field_type ) {
203
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
204
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
205
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
206
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
207
-
208
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
209
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
210
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
211
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
212
-
213
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
214
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
215
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
216
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
203
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
204
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
205
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
206
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
207
+
208
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
209
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
210
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
211
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
212
+
213
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
214
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
215
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
216
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
217 217
 				}
218 218
 			}
219 219
 
220 220
 			if ( $form_id ) {
221 221
 				/** Generic field templates */
222
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
223
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
222
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
223
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
224 224
 
225
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
226
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
225
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
226
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
227 227
 			}
228 228
 
229 229
 			/**
@@ -231,12 +231,12 @@  discard block
 block discarded – undo
231 231
 			 * Ignore some types that conflict.
232 232
 			 */
233 233
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
234
-				$specifics []= sprintf( '%s.php', $field_type );
235
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
234
+				$specifics [ ] = sprintf( '%s.php', $field_type );
235
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
236 236
 			}
237 237
 
238
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
239
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
238
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
239
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
240 240
 
241 241
 			return array_merge( $specifics, $templates );
242 242
 		};
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 			/** Prevent any PHP warnings that may be generated. */
268 268
 			ob_start();
269 269
 
270
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry['currency'], false, 'html' );
270
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
271 271
 
272 272
 			if ( $errors = ob_get_clean() ) {
273 273
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );
Please login to merge, or discard this patch.