Completed
Push — develop ( ac8bbb...7bff29 )
by Zack
37:04 queued 17:09
created
future/includes/class-gv-entry.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			/** Must be an embed of some sort. */
124 124
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
125 125
 				$permalink = get_permalink( $post->ID );
126
-				$args['gvid'] = $view_id;
126
+				$args[ 'gvid' ] = $view_id;
127 127
 			}
128 128
 		}
129 129
 		
@@ -151,21 +151,21 @@  discard block
 block discarded – undo
151 151
 			 */
152 152
 			$link_parts = explode( '?', $permalink );
153 153
 
154
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
154
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
155 155
 
156
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
156
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
157 157
 		} else {
158 158
 			$args[ $entry_endpoint_name ] = $entry_slug;
159 159
 		}
160 160
 
161 161
 		if ( $track_directory ) {
162
-			if ( ! empty( $_GET['pagenum'] ) ) {
163
-				$args['pagenum'] = intval( $_GET['pagenum'] );
162
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
163
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
164 164
 			}
165 165
 
166 166
 			if ( $sort = Utils::_GET( 'sort' ) ) {
167
-				$args['sort'] = $sort;
168
-				$args['dir'] = Utils::_GET( 'dir' );
167
+				$args[ 'sort' ] = $sort;
168
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
169 169
 			}
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
 
403 403
 		// If we've saved the permalink in memory, use it
404 404
 		// @since 1.3
405
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
405
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
406 406
 
407
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
407
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
408 408
 			$link = home_url();
409 409
 		}
410 410
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 
414 414
 			// If not yet saved, cache the permalink.
415 415
 			// @since 1.3
416
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
416
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
417 417
 		}
418 418
 
419 419
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@  discard block
 block discarded – undo
421 421
 
422 422
 			$args = array();
423 423
 
424
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
-				$args['pagenum'] = intval( $pagenum );
424
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
425
+				$args[ 'pagenum' ] = intval( $pagenum );
426 426
 			}
427 427
 
428
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
-				$args['sort'] = $sort;
430
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
428
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
429
+				$args[ 'sort' ] = $sort;
430
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
431 431
 			}
432 432
 
433 433
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
465 465
 
466 466
 		// Generate an unique hash to use as the default value
467
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
467
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
468 468
 
469 469
 		/**
470 470
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
476 476
 
477 477
 		// Make sure we have something - use the original ID as backup.
478
-		if( empty( $slug ) ) {
478
+		if ( empty( $slug ) ) {
479 479
 			$slug = $id;
480 480
 		}
481 481
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
505 505
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
506 506
 		 */
507
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
507
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
508 508
 
509 509
 		// If we're using custom slug...
510 510
 		if ( $custom ) {
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 			// If it does have a hash set, and the hash is expected, use it.
519 519
 			// This check allows users to change the hash structure using the
520 520
 			// gravityview_entry_hash filter and have the old hashes expire.
521
-			if( empty( $value ) || $value !== $hash ) {
521
+			if ( empty( $value ) || $value !== $hash ) {
522 522
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
523 523
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
524 524
 			}
@@ -545,15 +545,15 @@  discard block
 block discarded – undo
545 545
          * @param boolean $custom Should we process the custom entry slug?
546 546
          */
547 547
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
548
-        if( $custom ) {
548
+        if ( $custom ) {
549 549
             // create the gravityview_unique_id and save it
550 550
 
551 551
             // Get the entry hash
552
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
552
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
553 553
 
554
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
554
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
555 555
 
556
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
556
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
557 557
 
558 558
         }
559 559
     }
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 
573 573
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
574 574
 			$entry = GVCommon::get_entry( $entry );
575
-		} else if( empty( $entry ) ) {
575
+		} else if ( empty( $entry ) ) {
576 576
 			// @deprecated path
577 577
 			$entry = GravityView_frontend::getInstance()->getEntry();
578 578
 		}
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
 
593 593
 		$query_arg_name = \GV\Entry::get_endpoint_name();
594 594
 
595
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
595
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
596 596
 
597
-		if ( get_option('permalink_structure') && !is_preview() ) {
597
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
598 598
 
599 599
 			$args = array();
600 600
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 			 */
605 605
 			$link_parts = explode( '?', $directory_link );
606 606
 
607
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
607
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
608 608
 
609
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
609
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
610 610
 
611 611
 		} else {
612 612
 
@@ -618,22 +618,22 @@  discard block
 block discarded – undo
618 618
 		 */
619 619
 		if ( $add_directory_args ) {
620 620
 
621
-			if ( ! empty( $_GET['pagenum'] ) ) {
622
-				$args['pagenum'] = intval( $_GET['pagenum'] );
621
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
622
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
623 623
 			}
624 624
 
625 625
 			/**
626 626
 			 * @since 1.7
627 627
 			 */
628 628
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
629
-				$args['sort'] = $sort;
630
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
629
+				$args[ 'sort' ] = $sort;
630
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
631 631
 			}
632 632
 
633 633
 		}
634 634
 
635 635
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
636
-			$args['gvid'] = gravityview_get_view_id();
636
+			$args[ 'gvid' ] = gravityview_get_view_id();
637 637
 		}
638 638
 
639 639
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@  discard block
 block discarded – undo
654 654
 }
655 655
 
656 656
 function gv_class( $field, $form = NULL, $entry = array() ) {
657
-	return GravityView_API::field_class( $field, $form, $entry  );
657
+	return GravityView_API::field_class( $field, $form, $entry );
658 658
 }
659 659
 
660 660
 /**
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 		$view_id = 0;
678 678
 		if ( $context->view ) {
679 679
 			$view_id = $context->view->ID;
680
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
680
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
681 681
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
682 682
 			}
683 683
 		}
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 		$default_css_class .= ' gv-container-no-results';
706 706
 	}
707 707
 
708
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
708
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
709 709
 
710 710
 	/**
711 711
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@  discard block
 block discarded – undo
732 732
 
733 733
 	$value = GravityView_API::field_value( $entry, $field );
734 734
 
735
-	if( $value === '' ) {
735
+	if ( $value === '' ) {
736 736
 		/**
737 737
 		 * @filter `gravityview_empty_value` What to display when a field is empty
738 738
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
  */
840 840
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
841 841
 
842
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
842
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
843 843
 
844 844
 		// For the complete field value as generated by Gravity Forms
845 845
 		return $display_value;
@@ -873,16 +873,16 @@  discard block
 block discarded – undo
873 873
 		$terms = explode( ', ', $value );
874 874
 	}
875 875
 
876
-	foreach ($terms as $term_name ) {
876
+	foreach ( $terms as $term_name ) {
877 877
 
878 878
 		// If we're processing a category,
879
-		if( $taxonomy === 'category' ) {
879
+		if ( $taxonomy === 'category' ) {
880 880
 
881 881
 			// Use rgexplode to prevent errors if : doesn't exist
882 882
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
883 883
 
884 884
 			// The explode was succesful; we have the category ID
885
-			if( !empty( $term_id )) {
885
+			if ( ! empty( $term_id ) ) {
886 886
 				$term = get_term_by( 'id', $term_id, $taxonomy );
887 887
 			} else {
888 888
 			// We have to fall back to the name
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 		}
896 896
 
897 897
 		// There's still a tag/category here.
898
-		if( $term ) {
898
+		if ( $term ) {
899 899
 
900 900
 			$term_link = get_term_link( $term, $taxonomy );
901 901
 
@@ -904,11 +904,11 @@  discard block
 block discarded – undo
904 904
 			    continue;
905 905
 			}
906 906
 
907
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
907
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
908 908
 		}
909 909
 	}
910 910
 
911
-	return implode(', ', $output );
911
+	return implode( ', ', $output );
912 912
 }
913 913
 
914 914
 /**
@@ -922,8 +922,8 @@  discard block
 block discarded – undo
922 922
 
923 923
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
924 924
 
925
-	if( empty( $link ) ) {
926
-		return strip_tags( $output);
925
+	if ( empty( $link ) ) {
926
+		return strip_tags( $output );
927 927
 	}
928 928
 
929 929
 	return $output;
@@ -942,7 +942,7 @@  discard block
 block discarded – undo
942 942
 	$fe = GravityView_frontend::getInstance();
943 943
 
944 944
 	// Solve problem when loading content via admin-ajax.php
945
-	if( ! $fe->getGvOutputData() ) {
945
+	if ( ! $fe->getGvOutputData() ) {
946 946
 
947 947
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
948 948
 
@@ -950,7 +950,7 @@  discard block
 block discarded – undo
950 950
 	}
951 951
 
952 952
 	// Make 100% sure that we're dealing with a properly called situation
953
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
953
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
954 954
 
955 955
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
956 956
 
@@ -1124,11 +1124,11 @@  discard block
 block discarded – undo
1124 1124
 	 */
1125 1125
 	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
1126 1126
 
1127
-	if( $is_edit_entry ) {
1127
+	if ( $is_edit_entry ) {
1128 1128
 		$context = 'edit';
1129
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
1129
+	} else if ( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
1130 1130
 		$context = 'single';
1131
-	} else if( class_exists( 'GravityView_View' ) ) {
1131
+	} else if ( class_exists( 'GravityView_View' ) ) {
1132 1132
 		$context = GravityView_View::getInstance()->getContext();
1133 1133
 	}
1134 1134
 
@@ -1158,12 +1158,12 @@  discard block
 block discarded – undo
1158 1158
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1159 1159
 	/** @define "GRAVITYVIEW_DIR" "../" */
1160 1160
 
1161
-	if( !class_exists( 'GravityView_Field' ) ) {
1162
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1161
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1162
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1163 1163
 	}
1164 1164
 
1165
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1166
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1165
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1166
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1167 1167
 	}
1168 1168
 
1169 1169
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1262,21 +1262,21 @@  discard block
 block discarded – undo
1262 1262
 	} else {
1263 1263
 		// @deprecated path
1264 1264
 		// Required fields.
1265
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1265
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1266 1266
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1267 1267
 			return '';
1268 1268
 		}
1269 1269
 	}
1270 1270
 
1271 1271
 	if ( $context instanceof \GV\Template_Context ) {
1272
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1273
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1274
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1272
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1273
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1274
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1275 1275
 	} else {
1276 1276
 		// @deprecated path
1277
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1278
-		$field = $args['field'];
1279
-		$form = $args['form'];
1277
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1278
+		$field = $args[ 'field' ];
1279
+		$form = $args[ 'form' ];
1280 1280
 	}
1281 1281
 
1282 1282
 	/**
@@ -1294,46 +1294,46 @@  discard block
 block discarded – undo
1294 1294
 	);
1295 1295
 
1296 1296
 	if ( $context instanceof \GV\Template_Context ) {
1297
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1297
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1298 1298
 	} else {
1299 1299
 		// @deprecated path
1300
-		$placeholders['value'] = gv_value( $entry, $field );
1300
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1301 1301
 	}
1302 1302
 
1303 1303
 	// If the value is empty and we're hiding empty, return empty.
1304
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1304
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1305 1305
 		return '';
1306 1306
 	}
1307 1307
 
1308
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1309
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1308
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1309
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1310 1310
 	}
1311 1311
 
1312 1312
 	// Get width setting, if exists
1313
-	$placeholders['width'] = GravityView_API::field_width( $field );
1313
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1314 1314
 
1315 1315
 	// If replacing with CSS inline formatting, let's do it.
1316
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1316
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1317 1317
 
1318 1318
 	// Grab the Class using `gv_class`
1319
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1320
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1319
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1320
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1321 1321
 
1322 1322
 
1323 1323
 	// Get field label if needed
1324
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
1325
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
1324
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
1325
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
1326 1326
 	}
1327 1327
 
1328 1328
 	if ( $context instanceof \GV\Template_Context ) {
1329
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1329
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1330 1330
 	} else {
1331 1331
 		// Default Label value
1332
-		$placeholders['label_value'] = gv_label( $field, $entry );
1332
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1333 1333
 	}
1334 1334
 
1335
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1336
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1335
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1336
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1337 1337
 	}
1338 1338
 
1339 1339
 	/**
@@ -1344,7 +1344,7 @@  discard block
 block discarded – undo
1344 1344
 	 * @since 2.0
1345 1345
 	 * @param \GV\Template_Context $context The context.
1346 1346
 	 */
1347
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1347
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1348 1348
 
1349 1349
 	/**
1350 1350
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1371,7 +1371,7 @@  discard block
 block discarded – undo
1371 1371
 	foreach ( $placeholders as $tag => $value ) {
1372 1372
 
1373 1373
 		// If the tag doesn't exist just skip it
1374
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1374
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1375 1375
 			continue;
1376 1376
 		}
1377 1377
 
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
57 57
 
58
-		if( $acf_keys ) {
58
+		if ( $acf_keys ) {
59 59
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
60 60
 		}
61 61
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return void
71 71
 	 */
72 72
 	private function fix_posted_fields() {
73
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
74
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
75
-				$_POST['fields'] = _gravityview_process_posted_fields();
73
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
74
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
75
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		);
101 101
 
102 102
 		if ( ! empty( $action ) ) {
103
-			$settings['edd_action'] = esc_attr( $action );
103
+			$settings[ 'edd_action' ] = esc_attr( $action );
104 104
 		}
105 105
 
106 106
 		return array_map( 'urlencode', $settings );
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			'format' => 'json',
157 157
 		) );
158 158
 
159
-		if ( $is_ajax && empty( $data['license'] ) ) {
159
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
160 160
 			die( -1 );
161 161
 		}
162 162
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			// most likely a mistake.
198 198
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
199 199
 
200
-				if ( ! empty( $data['field_id'] ) ) {
200
+				if ( ! empty( $data[ 'field_id' ] ) ) {
201 201
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
202 202
 				}
203 203
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		if ( empty( $license_data ) ) {
225 225
 			$message = '';
226 226
 		} else {
227
-			if( ! empty( $license_data->error ) ) {
227
+			if ( ! empty( $license_data->error ) ) {
228 228
 				$class = 'error';
229 229
 				$string_key = $license_data->error;
230 230
 			} else { $class = $license_data->license;
@@ -250,17 +250,17 @@  discard block
 block discarded – undo
250 250
 	 */
251 251
 	public function license_details( $response = array() ) {
252 252
 
253
-		$response = (array) $response;
253
+		$response = (array)$response;
254 254
 
255 255
 		$return = '';
256 256
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
257 257
 
258
-		if ( ! empty( $response['license_key'] ) ) {
258
+		if ( ! empty( $response[ 'license_key' ] ) ) {
259 259
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
260 260
 
261 261
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
262
-				$return .= $this->strings( $response['license'], $response );
263
-			} elseif ( ! empty( $response['license_name'] ) ) {
262
+				$return .= $this->strings( $response[ 'license' ], $response );
263
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
264 264
 				$response_keys = array(
265 265
 					'license_name'   => '',
266 266
 					'license_limit'  => '',
@@ -274,19 +274,19 @@  discard block
 block discarded – undo
274 274
 				// Make sure all the keys are set
275 275
 				$response = wp_parse_args( $response, $response_keys );
276 276
 
277
-				$login_link = sprintf( '<a href="%s" class="howto" 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' ) );
278
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
277
+				$login_link = sprintf( '<a href="%s" class="howto" 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' ) );
278
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
279 279
 				$details    = array(
280
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
281
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
282
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
283
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
284
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
280
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
281
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
282
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
283
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
284
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
285 285
 				);
286 286
 
287
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
288
-					unset( $details['upgrade'] );
289
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
287
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
288
+					unset( $details[ 'upgrade' ] );
289
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
290 290
 				}
291 291
 
292 292
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -312,20 +312,20 @@  discard block
 block discarded – undo
312 312
 		if ( ! empty( $upgrades ) ) {
313 313
 
314 314
 			$locale_parts = explode( '_', get_locale() );
315
-			$is_english = ( 'en' === $locale_parts[0] );
315
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
316 316
 
317 317
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
318 318
 			$output .= '<ul class="ul-disc">';
319 319
 
320 320
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
321
-				$upgrade = (object) $upgrade;
321
+				$upgrade = (object)$upgrade;
322 322
 
323 323
 				$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 ) );
324 324
 
325 325
 				if ( $is_english && isset( $upgrade->description ) ) {
326 326
 					$message = esc_html( $upgrade->description );
327 327
 				} else {
328
-					switch( $upgrade->price_id ) {
328
+					switch ( $upgrade->price_id ) {
329 329
 						// Interstellar
330 330
 						case 1:
331 331
 						default:
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
384 384
 			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
385 385
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
386
-			'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>' ),
386
+			'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>' ),
387 387
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
388 388
 
389 389
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 
407 407
 		if ( ! empty( $license_data->renewal_url ) ) {
408 408
 			$renew_license_url = $license_data->renewal_url;
409
-		} elseif( ! empty( $license_data->license_key ) ) {
409
+		} elseif ( ! empty( $license_data->license_key ) ) {
410 410
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
411 411
 		} else {
412 412
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @return array|WP_Error
424 424
 	 */
425 425
 	private function _license_get_remote_response( $data, $license = '' ) {
426
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
426
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
427 427
 
428 428
 		$url = add_query_arg( $api_params, self::url );
429 429
 
@@ -463,9 +463,9 @@  discard block
 block discarded – undo
463 463
 	private function license_call_update_settings( $license_data, $data ) {
464 464
 		$settings = array();
465 465
 
466
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
467
-		$settings['license_key_status'] = $license_data->license;
468
-		$settings['license_key_response'] = (array)$license_data;
466
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
467
+		$settings[ 'license_key_status' ] = $license_data->license;
468
+		$settings[ 'license_key_response' ] = (array)$license_data;
469 469
 
470 470
 		$this->settings->set( $settings );
471 471
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 
481 481
 		if ( ! empty( $key ) ) {
482 482
 			$response = $this->settings->get( 'license_key_response' );
483
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
483
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
484 484
 		} else {
485 485
 			$response = array();
486 486
 		}
@@ -522,11 +522,11 @@  discard block
 block discarded – undo
522 522
 
523 523
 		$submit = '<div class="gv-edd-button-wrapper">';
524 524
 		foreach ( $fields as $field ) {
525
-			$field['type'] = 'button';
526
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
527
-			$field['style'] = 'margin-left: 10px;';
528
-			if( $disabled_attribute ) {
529
-				$field['disabled'] = $disabled_attribute;
525
+			$field[ 'type' ] = 'button';
526
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
527
+			$field[ 'style' ] = 'margin-left: 10px;';
528
+			if ( $disabled_attribute ) {
529
+				$field[ 'disabled' ] = $disabled_attribute;
530 530
 			}
531 531
 			$submit .= $this->settings->as_html( $field, $echo );
532 532
 		}
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 				    'url'        => home_url(),
606 606
 				    'site_data'  => $this->get_site_data(),
607 607
 			    ),
608
-			));
608
+			) );
609 609
 
610 610
 			// make sure the response came back okay
611 611
 			if ( is_wp_error( $response ) ) {
@@ -636,45 +636,45 @@  discard block
 block discarded – undo
636 636
 		$theme_data = wp_get_theme();
637 637
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
638 638
 
639
-		$data['gv_version']  = Plugin::$version;
640
-		$data['php_version']  = phpversion();
641
-		$data['wp_version']   = get_bloginfo( 'version' );
642
-		$data['gf_version']  = \GFForms::$version;
643
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
-		$data['multisite']    = is_multisite();
645
-		$data['theme']        = $theme;
646
-		$data['url']          = home_url();
647
-		$data['license_key']  = $this->settings->get( 'license_key' );
648
-		$data['beta']         = $this->settings->get( 'beta' );
639
+		$data[ 'gv_version' ]  = Plugin::$version;
640
+		$data[ 'php_version' ]  = phpversion();
641
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
642
+		$data[ 'gf_version' ]  = \GFForms::$version;
643
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
+		$data[ 'multisite' ]    = is_multisite();
645
+		$data[ 'theme' ]        = $theme;
646
+		$data[ 'url' ]          = home_url();
647
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
648
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
649 649
 
650 650
 		// View Data
651 651
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
652 652
 
653
-		$data['view_count'] = null;
654
-		$data['view_first'] = null;
655
-		$data['view_latest'] = null;
653
+		$data[ 'view_count' ] = null;
654
+		$data[ 'view_first' ] = null;
655
+		$data[ 'view_latest' ] = null;
656 656
 
657 657
 		if ( $gravityview_posts->publish ) {
658
-			$data['view_count'] = $gravityview_posts->publish;
658
+			$data[ 'view_count' ] = $gravityview_posts->publish;
659 659
 
660 660
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
661 661
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
662 662
 
663 663
 			if ( $first = array_shift( $first ) ) {
664
-				$data['view_first'] = $first->post_date;
664
+				$data[ 'view_first' ] = $first->post_date;
665 665
 			}
666 666
 			if ( $latest = array_pop( $latest ) ) {
667
-				$data['view_latest'] = $latest->post_date;
667
+				$data[ 'view_latest' ] = $latest->post_date;
668 668
 			}
669 669
 		}
670 670
 
671 671
 		// Form counts
672 672
 		if ( class_exists( 'GFFormsModel' ) ) {
673 673
 			$form_data = \GFFormsModel::get_form_count();
674
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
675
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
676
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
677
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
674
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
675
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
676
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
677
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
678 678
 		}
679 679
 
680 680
 		// Retrieve current plugin information
@@ -682,13 +682,13 @@  discard block
 block discarded – undo
682 682
 			include ABSPATH . '/wp-admin/includes/plugin.php';
683 683
 		}
684 684
 
685
-		$data['integrations']     = self::get_related_plugins_and_extensions();
686
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
687
-		$data['inactive_plugins'] = array();
688
-		$data['locale']           = get_locale();
685
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
686
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
687
+		$data[ 'inactive_plugins' ] = array();
688
+		$data[ 'locale' ]           = get_locale();
689 689
 
690 690
 		// Validate request on the GV server
691
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
691
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
692 692
 
693 693
 		return $data;
694 694
 	}
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 
719 719
 				$plugin_data = get_plugin_data( $active_plugin );
720 720
 
721
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
721
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
722 722
 			}
723 723
 
724 724
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @return array
102 102
 	 */
103 103
 	public function modify_app_settings_menu_title( $setting_tabs ) {
104
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
104
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
105 105
 		return $setting_tabs;
106 106
 	}
107 107
 
@@ -304,15 +304,15 @@  discard block
 block discarded – undo
304 304
             </ul>
305 305
             <div class="gv-followup widefat">
306 306
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
307
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
307
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
308 308
             </div>
309 309
             <div class="scale-description">
310 310
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
311 311
                 <ul class="inline">
312 312
 					<?php
313 313
 					$i = 0;
314
-					while( $i < 11 ) {
315
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
314
+					while ( $i < 11 ) {
315
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
316 316
 						$i++;
317 317
 					}
318 318
 					?>
@@ -529,15 +529,15 @@  discard block
 block discarded – undo
529 529
 	 * @return string The HTML
530 530
 	 */
531 531
 	public function as_html( $field, $echo = true ) {
532
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
532
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
533 533
 
534 534
 		$attributes    = $this->get_field_attributes( $field );
535 535
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
536
-		$value         = $this->get( $field['name'], $default_value );
536
+		$value         = $this->get( $field[ 'name' ], $default_value );
537 537
 
538 538
 
539
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
540
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
539
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
540
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
541 541
 
542 542
 		if ( empty( $value ) ) {
543 543
 			$value = __( 'Update Settings', 'gravityview' );
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		$attributes = $this->get_field_attributes( $field );
547 547
 
548 548
 		$html = '<input
549
-                    type="' . $field['type'] . '"
549
+                    type="' . $field[ 'type' ] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552 552
 		        implode( ' ', $attributes ) .
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	 */
575 575
 	public function license_key_notice() {
576 576
 
577
-	    if( $this->is_save_postback() ) {
577
+	    if ( $this->is_save_postback() ) {
578 578
 		    $settings = $this->get_posted_settings();
579 579
 		    $license_key = \GV\Utils::get( $settings, 'license_key' );
580 580
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 		 * but didn't want to mess up the translation strings for the translators.
593 593
 		 */
594 594
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
595
-		$title = __ ( 'Inactive License', 'gravityview');
595
+		$title = __( 'Inactive License', 'gravityview' );
596 596
 		$status = '';
597 597
 		$update_below = false;
598 598
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
623 623
 				break;
624 624
 		}
625
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
625
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
626 626
 
627 627
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
628 628
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 	public function scripts() {
665 665
 		$scripts = parent::scripts();
666 666
 
667
-		$scripts[] = array(
667
+		$scripts[ ] = array(
668 668
 			'handle'  => 'gform_tooltip_init',
669 669
 			'enqueue' => array(
670 670
                 array(
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 	public function styles() {
684 684
 		$styles = parent::styles();
685 685
 
686
-		$styles[] = array(
686
+		$styles[ ] = array(
687 687
 			'handle'  => 'gravityview_settings',
688 688
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
689 689
 			'version' => Plugin::$version,
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 		 * If multisite and not network admin, we don't want the settings to show.
715 715
 		 * @since 1.7.6
716 716
 		 */
717
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
717
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
718 718
 
719 719
 		/**
720 720
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -762,26 +762,26 @@  discard block
 block discarded – undo
762 762
 				'label' => __( 'License Key', 'gravityview' ),
763 763
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
764 764
 				'type' => 'edd_license',
765
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
765
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
766 766
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
767
-				'default_value' => $default_settings['license_key'],
767
+				'default_value' => $default_settings[ 'license_key' ],
768 768
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
769 769
 			),
770 770
 			array(
771 771
 				'name' => 'license_key_response',
772
-				'default_value' => $default_settings['license_key_response'],
772
+				'default_value' => $default_settings[ 'license_key_response' ],
773 773
 				'type' => 'hidden',
774 774
 			),
775 775
 			array(
776 776
 				'name' => 'license_key_status',
777
-				'default_value' => $default_settings['license_key_status'],
777
+				'default_value' => $default_settings[ 'license_key_status' ],
778 778
 				'type' => 'hidden',
779 779
 			),
780 780
 			array(
781 781
 				'name' => 'support-email',
782 782
 				'type' => 'text',
783 783
 				'validate' => 'email',
784
-				'default_value' => $default_settings['support-email'],
784
+				'default_value' => $default_settings[ 'support-email' ],
785 785
 				'label' => __( 'Support Email', 'gravityview' ),
786 786
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
787 787
 				'class' => 'code regular-text',
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 				'name' => 'support_port',
794 794
 				'type' => 'radio',
795 795
 				'label' => __( 'Show Support Port?', 'gravityview' ),
796
-				'default_value' => $default_settings['support_port'],
796
+				'default_value' => $default_settings[ 'support_port' ],
797 797
 				'horizontal' => 1,
798 798
 				'choices' => array(
799 799
 					array(
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
 				'name' => 'no-conflict-mode',
813 813
 				'type' => 'radio',
814 814
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
815
-				'default_value' => $default_settings['no-conflict-mode'],
815
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
816 816
 				'horizontal' => 1,
817 817
 				'choices' => array(
818 818
 					array(
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 					'name' => 'rest_api',
835 835
 					'type' => 'radio',
836 836
 					'label' => __( 'REST API', 'gravityview' ),
837
-					'default_value' => $default_settings['rest_api'],
837
+					'default_value' => $default_settings[ 'rest_api' ],
838 838
 					'horizontal' => 1,
839 839
 					'choices' => array(
840 840
 						array(
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
 				'name' => 'beta',
854 854
 				'type' => 'checkbox',
855 855
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
856
-				'default_value' => $default_settings['beta'],
856
+				'default_value' => $default_settings[ 'beta' ],
857 857
 				'horizontal' => 1,
858 858
 				'choices' => array(
859 859
 					array(
@@ -886,17 +886,17 @@  discard block
 block discarded – undo
886 886
 		 * @since 1.7.4
887 887
 		 */
888 888
 		foreach ( $fields as &$field ) {
889
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
890
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
891
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
892
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
889
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
890
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
891
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
892
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
893 893
 
894 894
 			if ( $disabled_attribute ) {
895
-				$field['disabled']  = $disabled_attribute;
895
+				$field[ 'disabled' ] = $disabled_attribute;
896 896
 			}
897 897
 
898
-			if ( empty( $field['disabled'] ) ) {
899
-				unset( $field['disabled'] );
898
+			if ( empty( $field[ 'disabled' ] ) ) {
899
+				unset( $field[ 'disabled' ] );
900 900
             }
901 901
 		}
902 902
 
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
914 914
         );
915 915
 
916 916
 		if ( $disabled_attribute ) {
917
-			$button['disabled'] = $disabled_attribute;
917
+			$button[ 'disabled' ] = $disabled_attribute;
918 918
 		}
919 919
 
920 920
         /**
@@ -933,20 +933,20 @@  discard block
 block discarded – undo
933 933
 		// If there are extensions, add a section for them
934 934
 		if ( ! empty( $extension_sections ) ) {
935 935
 
936
-			if( $disabled_attribute ) {
936
+			if ( $disabled_attribute ) {
937 937
 				foreach ( $extension_sections as &$section ) {
938
-					foreach ( $section['fields'] as &$field ) {
939
-						$field['disabled'] = $disabled_attribute;
938
+					foreach ( $section[ 'fields' ] as &$field ) {
939
+						$field[ 'disabled' ] = $disabled_attribute;
940 940
 					}
941 941
 				}
942 942
 			}
943 943
 
944
-            $k = count( $extension_sections ) - 1 ;
945
-            $extension_sections[ $k ]['fields'][] = $button;
944
+            $k = count( $extension_sections ) - 1;
945
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
946 946
 			$sections = array_merge( $sections, $extension_sections );
947 947
 		} else {
948 948
             // add the 'update settings' button to the general section
949
-            $sections[0]['fields'][] = $button;
949
+            $sections[ 0 ][ 'fields' ][ ] = $button;
950 950
         }
951 951
 
952 952
 		return $sections;
@@ -1002,7 +1002,7 @@  discard block
 block discarded – undo
1002 1002
 	protected function settings_edd_license( $field, $echo = true ) {
1003 1003
 
1004 1004
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1005
-		    $field['input_type'] = 'password';
1005
+		    $field[ 'input_type' ] = 'password';
1006 1006
         }
1007 1007
 
1008 1008
 		$text = $this->settings_text( $field, false );
@@ -1051,7 +1051,7 @@  discard block
 block discarded – undo
1051 1051
 	public function single_setting_row_html( $field ) {
1052 1052
 		?>
1053 1053
 
1054
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1054
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1055 1055
             <td colspan="2">
1056 1056
 				<?php $this->single_setting( $field ); ?>
1057 1057
             </td>
@@ -1069,10 +1069,10 @@  discard block
 block discarded – undo
1069 1069
 	 * @return string
1070 1070
 	 */
1071 1071
 	public function settings_save( $field, $echo = true ) {
1072
-		$field['type']  = 'submit';
1073
-		$field['name']  = 'gform-settings-save';
1074
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1075
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1072
+		$field[ 'type' ]  = 'submit';
1073
+		$field[ 'name' ]  = 'gform-settings-save';
1074
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1075
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1076 1076
 
1077 1077
 		$output = $this->settings_submit( $field, false );
1078 1078
 
@@ -1103,8 +1103,8 @@  discard block
 block discarded – undo
1103 1103
      * @return void
1104 1104
 	 */
1105 1105
 	public function single_setting_row( $field ) {
1106
-		$field['gv_description'] = Utils::get( $field, 'description' );
1107
-		$field['description']    = Utils::get( $field, 'subtitle' );
1106
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1107
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1108 1108
 		parent::single_setting_row( $field );
1109 1109
 	}
1110 1110
 
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 	public function single_setting_label( $field ) {
1117 1117
 		parent::single_setting_label( $field );
1118 1118
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1119
-			echo '<span class="description">'. $description .'</span>';
1119
+			echo '<span class="description">' . $description . '</span>';
1120 1120
 		}
1121 1121
 	}
1122 1122
 
@@ -1153,9 +1153,9 @@  discard block
 block discarded – undo
1153 1153
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
1154 1154
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1155 1155
 		if ( $local_key !== $response_key ) {
1156
-			unset( $posted_settings['license_key_response'] );
1157
-			unset( $posted_settings['license_key_status'] );
1158
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1156
+			unset( $posted_settings[ 'license_key_response' ] );
1157
+			unset( $posted_settings[ 'license_key_status' ] );
1158
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1159 1159
 		}
1160 1160
 		return $posted_settings;
1161 1161
 	}
Please login to merge, or discard this patch.