Completed
Pull Request — develop (#1523)
by Zack
19:02
created
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 		add_filter( 'gravityview/admin/available_fields', array( $this, 'maybe_add_non_default_fields' ), 10, 3 );
39 39
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 * @return void
54 54
 	 */
55 55
 	public function clear_cache_after_workflow( $form, $entry_id, $step_id, $starting_step_id ) {
56
-		do_action( 'gravityview_clear_form_cache', $form['id'] );
56
+		do_action( 'gravityview_clear_form_cache', $form[ 'id' ] );
57 57
 	}
58 58
 
59 59
 	/**
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
72 72
 
73
-		if( empty( $form_id ) ) {
73
+		if ( empty( $form_id ) ) {
74 74
 			$form_id = GravityView_View::getInstance()->getFormId();
75 75
 		}
76 76
 
77 77
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
78 78
 
79
-		return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
79
+		return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
80 80
 	}
81 81
 
82 82
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 		$workflow_steps = $GFlow->get_steps();
100 100
 
101
-		if( $workflow_steps ) {
101
+		if ( $workflow_steps ) {
102 102
 
103 103
 			foreach ( $workflow_steps as $step ) {
104 104
 
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 				);
111 111
 			}
112 112
 
113
-			$fields['workflow_step'] = array(
113
+			$fields[ 'workflow_step' ] = array(
114 114
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
115 115
 				'type'  => 'select',
116 116
 			);
117 117
 
118
-			$fields['workflow_final_status'] = array(
118
+			$fields[ 'workflow_final_status' ] = array(
119 119
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
120 120
 				'type'  => 'select',
121 121
 			);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		if ( ( $insert_at = array_search( 'workflow_final_status', wp_list_pluck( $fields, 'key' ) ) ) !== false ) {
132 132
 			$fields_end = array_splice( $fields, $insert_at + 1 );
133 133
 
134
-			$fields[] = array(
134
+			$fields[ ] = array(
135 135
 				'text' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
136 136
 				'operators' => array( '>', '<' ),
137 137
 				'placeholder' => 'yyyy-mm-dd',
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 				$keys_end = array_splice( $keys, $insert_at + 1 );
158 158
 				$values_end = array_splice( $values, $insert_at + 1 );
159 159
 
160
-				$keys[] = 'workflow_current_status_timestamp';
161
-				$values[] = array(
160
+				$keys[ ] = 'workflow_current_status_timestamp';
161
+				$values[ ] = array(
162 162
 					'label' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
163 163
 					'type' => 'workflow_current_status_timestamp',
164 164
 				);
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +112 added lines, -112 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
 		}
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 
318 318
 			$output = esc_html__( 'This search returned no results.', 'gravityview' );
319 319
 
320
-			if( $context ) {
320
+			if ( $context ) {
321 321
 				$setting = $context->view->settings->get( 'no_search_results_text', $output );
322 322
 			}
323 323
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 
326 326
 			$output = esc_html__( 'No entries match your request.', 'gravityview' );
327 327
 
328
-			if( $context ) {
328
+			if ( $context ) {
329 329
 				$setting = $context->view->settings->get( 'no_results_text', $output );
330 330
 			}
331 331
 		}
@@ -443,9 +443,9 @@  discard block
 block discarded – undo
443 443
 
444 444
 		// If we've saved the permalink in memory, use it
445 445
 		// @since 1.3
446
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
446
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
447 447
 
448
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
448
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
449 449
 			$link = home_url();
450 450
 		}
451 451
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 
455 455
 			// If not yet saved, cache the permalink.
456 456
 			// @since 1.3
457
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
457
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
458 458
 		}
459 459
 
460 460
 		// Deal with returning to proper pagination for embedded views
@@ -462,13 +462,13 @@  discard block
 block discarded – undo
462 462
 
463 463
 			$args = array();
464 464
 
465
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
466
-				$args['pagenum'] = intval( $pagenum );
465
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
466
+				$args[ 'pagenum' ] = intval( $pagenum );
467 467
 			}
468 468
 
469
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
470
-				$args['sort'] = $sort;
471
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
469
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
470
+				$args[ 'sort' ] = $sort;
471
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
472 472
 			}
473 473
 
474 474
 			$link = add_query_arg( $args, $link );
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
506 506
 
507 507
 		// Generate an unique hash to use as the default value
508
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
508
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
509 509
 
510 510
 		/**
511 511
 		 * @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}`
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
517 517
 
518 518
 		// Make sure we have something - use the original ID as backup.
519
-		if( empty( $slug ) ) {
519
+		if ( empty( $slug ) ) {
520 520
 			$slug = $id;
521 521
 		}
522 522
 
@@ -610,15 +610,15 @@  discard block
 block discarded – undo
610 610
          * @param boolean $custom Should we process the custom entry slug?
611 611
          */
612 612
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
613
-        if( $custom ) {
613
+        if ( $custom ) {
614 614
             // create the gravityview_unique_id and save it
615 615
 
616 616
             // Get the entry hash
617
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
617
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
618 618
 
619
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
619
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
620 620
 
621
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
621
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
622 622
 
623 623
         }
624 624
     }
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 
644 644
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
645 645
 			$entry = GVCommon::get_entry( $entry );
646
-		} else if( empty( $entry ) ) {
646
+		} else if ( empty( $entry ) ) {
647 647
 			// @deprecated path
648 648
 			$entry = GravityView_frontend::getInstance()->getEntry();
649 649
 		}
@@ -663,38 +663,38 @@  discard block
 block discarded – undo
663 663
 
664 664
 		$query_arg_name = \GV\Entry::get_endpoint_name();
665 665
 
666
-		if ( ! empty( $entry['_multi'] ) ) {
666
+		if ( ! empty( $entry[ '_multi' ] ) ) {
667 667
 			$entry_slugs = array();
668 668
 
669
-			foreach ( $entry['_multi'] as $_multi ) {
669
+			foreach ( $entry[ '_multi' ] as $_multi ) {
670 670
 
671
-				if( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
672
-					$entry_slugs[] = $gv_multi->get_slug();
671
+				if ( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
672
+					$entry_slugs[ ] = $gv_multi->get_slug();
673 673
 				} else {
674 674
 					// TODO: This path isn't covered by unit tests
675
-					$entry_slugs[] = \GravityView_API::get_entry_slug( $_multi['id'], $_multi );
675
+					$entry_slugs[ ] = \GravityView_API::get_entry_slug( $_multi[ 'id' ], $_multi );
676 676
 				}
677 677
 
678 678
 				unset( $gv_multi );
679 679
 
680
-				$forms[] = $_multi['form_id'];
680
+				$forms[ ] = $_multi[ 'form_id' ];
681 681
 			}
682 682
 
683 683
 			$entry_slug = implode( ',', $entry_slugs );
684 684
 		} else {
685 685
 
686 686
 			// Fallback when
687
-			if( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
687
+			if ( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
688 688
 				$entry_slug = $gv_entry->get_slug();
689 689
 			} else {
690 690
 				// TODO: This path isn't covered by unit tests
691
-				$entry_slug = \GravityView_API::get_entry_slug( $entry['id'], $entry );
691
+				$entry_slug = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
692 692
 			}
693 693
 
694 694
 			unset( $gv_entry );
695 695
 		}
696 696
 
697
-		if ( get_option('permalink_structure') && !is_preview() ) {
697
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
698 698
 
699 699
 			$args = array();
700 700
 
@@ -704,9 +704,9 @@  discard block
 block discarded – undo
704 704
 			 */
705 705
 			$link_parts = explode( '?', $directory_link );
706 706
 
707
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
707
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
708 708
 
709
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
709
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
710 710
 
711 711
 		} else {
712 712
 
@@ -718,21 +718,21 @@  discard block
 block discarded – undo
718 718
 		 */
719 719
 		if ( $add_directory_args ) {
720 720
 
721
-			if ( ! empty( $_GET['pagenum'] ) ) {
722
-				$args['pagenum'] = intval( $_GET['pagenum'] );
721
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
722
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
723 723
 			}
724 724
 
725 725
 			/**
726 726
 			 * @since 1.7
727 727
 			 */
728 728
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
729
-				$args['sort'] = $sort;
730
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
729
+				$args[ 'sort' ] = $sort;
730
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
731 731
 			}
732 732
 
733 733
 		}
734 734
 
735
-		if( $post_id ) {
735
+		if ( $post_id ) {
736 736
 			$passed_post = get_post( $post_id );
737 737
 			$views       = \GV\View_Collection::from_post( $passed_post );
738 738
 			$has_multiple_views = $views->count() > 1;
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 		}
742 742
 
743 743
 		if ( $has_multiple_views ) {
744
-			$args['gvid'] = $view_id ? $view_id : gravityview_get_view_id();
744
+			$args[ 'gvid' ] = $view_id ? $view_id : gravityview_get_view_id();
745 745
 		}
746 746
 
747 747
 		return add_query_arg( $args, $directory_link );
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
 }
763 763
 
764 764
 function gv_class( $field, $form = NULL, $entry = array() ) {
765
-	return GravityView_API::field_class( $field, $form, $entry  );
765
+	return GravityView_API::field_class( $field, $form, $entry );
766 766
 }
767 767
 
768 768
 /**
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 		$view_id = 0;
786 786
 		if ( $context->view ) {
787 787
 			$view_id = $context->view->ID;
788
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
788
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
789 789
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
790 790
 			}
791 791
 		}
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 		$default_css_class .= ' ' . $context->view->settings->get( 'class', '' );
818 818
 	}
819 819
 
820
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
820
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
821 821
 
822 822
 	/**
823 823
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 
845 845
 	$value = GravityView_API::field_value( $entry, $field );
846 846
 
847
-	if( $value === '' ) {
847
+	if ( $value === '' ) {
848 848
 		/**
849 849
 		 * @filter `gravityview_empty_value` What to display when a field is empty
850 850
 		 * @param string $value (empty string)
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
  */
958 958
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
959 959
 
960
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
960
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
961 961
 
962 962
 		// For the complete field value as generated by Gravity Forms
963 963
 		return $display_value;
@@ -991,16 +991,16 @@  discard block
 block discarded – undo
991 991
 		$terms = explode( ', ', $value );
992 992
 	}
993 993
 
994
-	foreach ($terms as $term_name ) {
994
+	foreach ( $terms as $term_name ) {
995 995
 
996 996
 		// If we're processing a category,
997
-		if( $taxonomy === 'category' ) {
997
+		if ( $taxonomy === 'category' ) {
998 998
 
999 999
 			// Use rgexplode to prevent errors if : doesn't exist
1000 1000
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
1001 1001
 
1002 1002
 			// The explode was succesful; we have the category ID
1003
-			if( !empty( $term_id )) {
1003
+			if ( ! empty( $term_id ) ) {
1004 1004
 				$term = get_term_by( 'id', $term_id, $taxonomy );
1005 1005
 			} else {
1006 1006
 			// We have to fall back to the name
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
 		}
1014 1014
 
1015 1015
 		// There's still a tag/category here.
1016
-		if( $term ) {
1016
+		if ( $term ) {
1017 1017
 
1018 1018
 			$term_link = get_term_link( $term, $taxonomy );
1019 1019
 
@@ -1022,11 +1022,11 @@  discard block
 block discarded – undo
1022 1022
 			    continue;
1023 1023
 			}
1024 1024
 
1025
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1025
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1026 1026
 		}
1027 1027
 	}
1028 1028
 
1029
-	return implode(', ', $output );
1029
+	return implode( ', ', $output );
1030 1030
 }
1031 1031
 
1032 1032
 /**
@@ -1040,8 +1040,8 @@  discard block
 block discarded – undo
1040 1040
 
1041 1041
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
1042 1042
 
1043
-	if( empty( $link ) ) {
1044
-		return strip_tags( $output);
1043
+	if ( empty( $link ) ) {
1044
+		return strip_tags( $output );
1045 1045
 	}
1046 1046
 
1047 1047
 	return $output;
@@ -1060,7 +1060,7 @@  discard block
 block discarded – undo
1060 1060
 	$fe = GravityView_frontend::getInstance();
1061 1061
 
1062 1062
 	// Solve problem when loading content via admin-ajax.php
1063
-	if( ! $fe->getGvOutputData() ) {
1063
+	if ( ! $fe->getGvOutputData() ) {
1064 1064
 
1065 1065
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
1066 1066
 
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
 	}
1069 1069
 
1070 1070
 	// Make 100% sure that we're dealing with a properly called situation
1071
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1071
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1072 1072
 
1073 1073
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
1074 1074
 
@@ -1299,12 +1299,12 @@  discard block
 block discarded – undo
1299 1299
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1300 1300
 	/** @define "GRAVITYVIEW_DIR" "../" */
1301 1301
 
1302
-	if( !class_exists( 'GravityView_Field' ) ) {
1303
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1302
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1303
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1304 1304
 	}
1305 1305
 
1306
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1307
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1306
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1307
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1308 1308
 	}
1309 1309
 
1310 1310
 	if ( is_null( $context ) ) {
@@ -1407,21 +1407,21 @@  discard block
 block discarded – undo
1407 1407
 	} else {
1408 1408
 		// @deprecated path
1409 1409
 		// Required fields.
1410
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1410
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1411 1411
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1412 1412
 			return '';
1413 1413
 		}
1414 1414
 	}
1415 1415
 
1416 1416
 	if ( $context instanceof \GV\Template_Context ) {
1417
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1418
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1419
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1417
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1418
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1419
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1420 1420
 	} else {
1421 1421
 		// @deprecated path
1422
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1423
-		$field = $args['field'];
1424
-		$form = $args['form'];
1422
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1423
+		$field = $args[ 'field' ];
1424
+		$form = $args[ 'form' ];
1425 1425
 	}
1426 1426
 
1427 1427
 	/**
@@ -1441,43 +1441,43 @@  discard block
 block discarded – undo
1441 1441
 	);
1442 1442
 
1443 1443
 	if ( $context instanceof \GV\Template_Context ) {
1444
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1444
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1445 1445
 	} else {
1446 1446
 		// @deprecated path
1447
-		$placeholders['value'] = gv_value( $entry, $field );
1447
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1448 1448
 	}
1449 1449
 
1450 1450
 	// If the value is empty and we're hiding empty, return empty.
1451
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1451
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1452 1452
 		return '';
1453 1453
 	}
1454 1454
 
1455
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1456
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1455
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1456
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1457 1457
 	}
1458 1458
 
1459 1459
 	// Get width setting, if exists
1460
-	$placeholders['width'] = GravityView_API::field_width( $field );
1460
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1461 1461
 
1462 1462
 	// If replacing with CSS inline formatting, let's do it.
1463
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1463
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1464 1464
 
1465 1465
 	// Grab the Class using `gv_class`
1466
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1467
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1466
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1467
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1468 1468
 
1469 1469
 	if ( $context instanceof \GV\Template_Context ) {
1470
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1470
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1471 1471
 	} else {
1472 1472
 		// Default Label value
1473
-		$placeholders['label_value'] = gv_label( $field, $entry );
1473
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1474 1474
 	}
1475 1475
 
1476
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1477
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1476
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1477
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1478 1478
 
1479
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1480
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1479
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1480
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1481 1481
 	}
1482 1482
 
1483 1483
 	/**
@@ -1488,7 +1488,7 @@  discard block
 block discarded – undo
1488 1488
 	 * @since 2.0
1489 1489
 	 * @param \GV\Template_Context $context The context.
1490 1490
 	 */
1491
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1491
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1492 1492
 
1493 1493
 	/**
1494 1494
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
 	foreach ( $placeholders as $tag => $value ) {
1516 1516
 
1517 1517
 		// If the tag doesn't exist just skip it
1518
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1518
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1519 1519
 			continue;
1520 1520
 		}
1521 1521
 
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gravityview.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 			'class' => '',
44 44
 		) );
45 45
 
46
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
47
-			if ( $atts['detail'] && $view = $request->is_view() ) {
46
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
47
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
48 48
 				$view_id = $view->ID;
49 49
 			}
50 50
 		}
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 			}
115 115
 		}
116 116
 
117
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
117
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
118 118
 
119 119
 		/**
120 120
 		 * View details.
121 121
 		 */
122
-		if ( $atts['detail'] ) {
122
+		if ( $atts[ 'detail' ] ) {
123 123
 			$entries = $view->get_entries( $request );
124 124
 			return self::_return( $this->detail( $view, $entries, $atts ) );
125 125
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 				return self::_return( '' );
137 137
 			}
138 138
 
139
-			if ( $entry['status'] != 'active' ) {
139
+			if ( $entry[ 'status' ] != 'active' ) {
140 140
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
141 141
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
142 142
 			}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			}
148 148
 
149 149
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
150
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
150
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
151 151
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
152 152
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
153 153
 				}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			$entryset = $entry->is_multi() ? $entry->entries : array( $entry );
171 171
 
172 172
 			foreach ( $entryset as $e ) {
173
-				if ( $e['status'] != 'active' ) {
173
+				if ( $e[ 'status' ] != 'active' ) {
174 174
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
175 175
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
176 176
 				}
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 				}
182 182
 
183 183
 				if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
184
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
184
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
185 185
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
186 186
 						return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
187 187
 					}
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
206 206
 
207 207
 				// Mock the request with the actual View, not the global one
208 208
 				$mock_request = new \GV\Mock_Request();
209
-				$mock_request->returns['is_view'] = $view;
210
-				$mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 );
211
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
212
-				$mock_request->returns['is_search'] = $request->is_search();
209
+				$mock_request->returns[ 'is_view' ] = $view;
210
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 );
211
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
212
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
213 213
 
214 214
 				$request = $mock_request;
215 215
 			}
@@ -245,16 +245,16 @@  discard block
 block discarded – undo
245 245
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
246 246
 
247 247
 		// Only keep the passed attributes after making sure that they're valid pairs
248
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
248
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
249 249
 
250 250
 		$atts = array();
251 251
 
252
-		foreach( $filtered_atts as $key => $passed_value ) {
252
+		foreach ( $filtered_atts as $key => $passed_value ) {
253 253
 
254 254
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
255 255
 			$passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value );
256 256
 
257
-			switch( $defaults[ $key ]['type'] ) {
257
+			switch ( $defaults[ $key ][ 'type' ] ) {
258 258
 
259 259
 				/**
260 260
 				 * Make sure number fields are numeric.
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
263 263
 				 */
264 264
 				case 'number':
265
-					if( is_numeric( $passed_value ) ) {
265
+					if ( is_numeric( $passed_value ) ) {
266 266
 						$atts[ $key ] = ( $passed_value + 0 );
267 267
 					}
268 268
 					break;
@@ -277,8 +277,8 @@  discard block
 block discarded – undo
277 277
 				 */
278 278
 				case 'select':
279 279
 				case 'radio':
280
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
281
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
280
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
281
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
282 282
 						$atts[ $key ] = $passed_value;
283 283
 					}
284 284
 					break;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			}
291 291
 		}
292 292
 
293
-		$atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null );
293
+		$atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
294 294
 
295 295
 		return $atts;
296 296
 	}
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	private function detail( $view, $entries, $atts ) {
308 308
 		$output = '';
309 309
 
310
-		switch ( $key = $atts['detail'] ):
310
+		switch ( $key = $atts[ 'detail' ] ):
311 311
 			case 'total_entries':
312 312
 				$output = number_format_i18n( $entries->total() );
313 313
 				break;
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-gravityforms.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	function __construct() {
15 15
 
16
-		$this->widget_description = __('Display a Gravity Forms form.', 'gravityview' );
16
+		$this->widget_description = __( 'Display a Gravity Forms form.', 'gravityview' );
17 17
 
18 18
 		$default_values = array(
19 19
 			'header' => 1,
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 		add_filter( 'gravityview/widget/hide_until_searched/whitelist', array( $this, 'add_to_allowlist' ) );
56 56
 
57
-		parent::__construct( __( 'Gravity Forms', 'gravityview' ) , 'gravityforms', $default_values, $settings );
57
+		parent::__construct( __( 'Gravity Forms', 'gravityview' ), 'gravityforms', $default_values, $settings );
58 58
 	}
59 59
 
60 60
 	/**
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
81 81
 		 * gravityview_get_forms() is currently running too early as widgets_init runs before init and
82 82
 		 * when most Gravity Forms plugins register their own fields like GP Terms of Service.
83 83
 		 */
84
-		if( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
84
+		if ( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
85 85
 
86 86
 			// check for available gravity forms
87 87
 			$forms = gravityview_get_forms();
88 88
 
89 89
 			foreach ( $forms as $form ) {
90
-				$choices[ $form['id'] ] = $form['title'];
90
+				$choices[ $form[ 'id' ] ] = $form[ 'title' ];
91 91
 			}
92 92
 		}
93 93
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	function add_to_allowlist( $allowlist ) {
105 105
 
106
-		$allowlist[] = 'gravityforms';
106
+		$allowlist[ ] = 'gravityforms';
107 107
 
108 108
 		return $allowlist;
109 109
 	}
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 * @param string $content
114 114
 	 * @param string $context
115 115
 	 */
116
-	public function render_frontend( $widget_args, $content = '', $context = '') {
116
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
117 117
 
118 118
 		if ( ! $this->pre_render_frontend() ) {
119 119
 			return;
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
48 48
 		$this->api_data    = $_api_data;
49 49
 		$this->name        = plugin_basename( $_plugin_file );
50 50
 		$this->slug        = basename( $_plugin_file, '.php' );
51
-		$this->version     = $_api_data['version'];
52
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
53
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
54
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
51
+		$this->version     = $_api_data[ 'version' ];
52
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
53
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
54
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
55 55
 
56 56
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
57 57
 
@@ -170,11 +170,11 @@  discard block
 block discarded – undo
170 170
 			return;
171 171
 		}
172 172
 
173
-		if( ! current_user_can( 'update_plugins' ) ) {
173
+		if ( ! current_user_can( 'update_plugins' ) ) {
174 174
 			return;
175 175
 		}
176 176
 
177
-		if( ! is_multisite() ) {
177
+		if ( ! is_multisite() ) {
178 178
 			return;
179 179
 		}
180 180
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
282 282
 					esc_html( $version_info->new_version ),
283 283
 					'</a>',
284
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
284
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
285 285
 					'</a>'
286 286
 				);
287 287
 			}
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
366 366
 		}
367 367
 
368
-		if( ! isset( $_data->plugin ) ) {
368
+		if ( ! isset( $_data->plugin ) ) {
369 369
 			$_data->plugin = $this->name;
370 370
 		}
371 371
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 
405 405
 		$verify_ssl = $this->verify_ssl();
406 406
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
407
-			$args['sslverify'] = $verify_ssl;
407
+			$args[ 'sslverify' ] = $verify_ssl;
408 408
 		}
409 409
 		return $args;
410 410
 
@@ -432,9 +432,9 @@  discard block
 block discarded – undo
432 432
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
433 433
 			$test_url_parts = parse_url( $this->api_url );
434 434
 
435
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
436
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
437
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
435
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
436
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
437
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
438 438
 
439 439
 			if ( empty( $host ) ) {
440 440
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -451,27 +451,27 @@  discard block
 block discarded – undo
451 451
 
452 452
 		$data = array_merge( $this->api_data, $_data );
453 453
 
454
-		if ( $data['slug'] != $this->slug ) {
454
+		if ( $data[ 'slug' ] != $this->slug ) {
455 455
 			return;
456 456
 		}
457 457
 
458
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
458
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
459 459
 			return false; // Don't allow a plugin to ping itself
460 460
 		}
461 461
 
462 462
 		$api_params = array(
463 463
 			'edd_action' => 'get_version',
464
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
465
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
466
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
467
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
468
-			'slug'       => $data['slug'],
469
-			'author'     => $data['author'],
464
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
465
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
466
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
467
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
468
+			'slug'       => $data[ 'slug' ],
469
+			'author'     => $data[ 'author' ],
470 470
 			'url'        => home_url(),
471
-			'beta'       => ! empty( $data['beta'] ),
471
+			'beta'       => ! empty( $data[ 'beta' ] ),
472 472
 		);
473 473
 
474
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
474
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
475 475
 
476 476
 		if ( ! is_wp_error( $request ) ) {
477 477
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -491,9 +491,9 @@  discard block
 block discarded – undo
491 491
 			$request->icons = maybe_unserialize( $request->icons );
492 492
 		}
493 493
 
494
-		if( ! empty( $request->sections ) ) {
495
-			foreach( $request->sections as $key => $section ) {
496
-				$request->$key = (array) $section;
494
+		if ( ! empty( $request->sections ) ) {
495
+			foreach ( $request->sections as $key => $section ) {
496
+				$request->$key = (array)$section;
497 497
 			}
498 498
 		}
499 499
 
@@ -507,35 +507,35 @@  discard block
 block discarded – undo
507 507
 
508 508
 		global $edd_plugin_data;
509 509
 
510
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
510
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
511 511
 			return;
512 512
 		}
513 513
 
514
-		if( empty( $_REQUEST['plugin'] ) ) {
514
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
515 515
 			return;
516 516
 		}
517 517
 
518
-		if( empty( $_REQUEST['slug'] ) ) {
518
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
519 519
 			return;
520 520
 		}
521 521
 
522
-		if( ! current_user_can( 'update_plugins' ) ) {
522
+		if ( ! current_user_can( 'update_plugins' ) ) {
523 523
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
524 524
 		}
525 525
 
526
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
526
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
527 527
 		$version_info = $this->get_cached_version_info();
528 528
 
529
-		if( false === $version_info ) {
529
+		if ( false === $version_info ) {
530 530
 
531 531
 			$api_params = array(
532 532
 				'edd_action' => 'get_version',
533
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
534
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
535
-				'slug'       => $_REQUEST['slug'],
536
-				'author'     => $data['author'],
533
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
534
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
535
+				'slug'       => $_REQUEST[ 'slug' ],
536
+				'author'     => $data[ 'author' ],
537 537
 				'url'        => home_url(),
538
-				'beta'       => ! empty( $data['beta'] )
538
+				'beta'       => ! empty( $data[ 'beta' ] )
539 539
 			);
540 540
 
541 541
 			$verify_ssl = $this->verify_ssl();
@@ -551,22 +551,22 @@  discard block
 block discarded – undo
551 551
 				$version_info = false;
552 552
 			}
553 553
 
554
-			if( ! empty( $version_info ) ) {
555
-				foreach( $version_info->sections as $key => $section ) {
556
-					$version_info->$key = (array) $section;
554
+			if ( ! empty( $version_info ) ) {
555
+				foreach ( $version_info->sections as $key => $section ) {
556
+					$version_info->$key = (array)$section;
557 557
 				}
558 558
 			}
559 559
 
560 560
 			$this->set_version_info_cache( $version_info );
561 561
 
562 562
 			// Delete the unneeded option
563
-			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $this->beta . '_version_info' ) );
563
+			delete_option( md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $this->beta . '_version_info' ) );
564 564
 		}
565 565
 
566 566
 		if ( isset( $version_info->sections ) ) {
567 567
 			$sections = $this->convert_object_to_array( $version_info->sections );
568
-			if ( ! empty( $sections['changelog'] ) ) {
569
-				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections['changelog'] ) . '</div>';
568
+			if ( ! empty( $sections[ 'changelog' ] ) ) {
569
+				echo '<div style="background:#fff;padding:10px;">' . wp_kses_post( $sections[ 'changelog' ] ) . '</div>';
570 570
 			}
571 571
 		}
572 572
 
@@ -581,25 +581,25 @@  discard block
 block discarded – undo
581 581
 	 */
582 582
 	public function get_cached_version_info( $cache_key = '' ) {
583 583
 
584
-		if( empty( $cache_key ) ) {
584
+		if ( empty( $cache_key ) ) {
585 585
 			$cache_key = $this->cache_key;
586 586
 		}
587 587
 
588 588
 		$cache = get_option( $cache_key );
589 589
 
590
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
590
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
591 591
 			return false; // Cache is expired
592 592
 		}
593 593
 
594 594
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
595
-		$cache['value'] = json_decode( $cache['value'] );
596
-		if ( ! empty( $cache['value']->icons ) ) {
597
-			$cache['value']->icons = (array) $cache['value']->icons;
595
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
596
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
597
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
598 598
 		} else {
599
-			$cache['value']->icons = array();
599
+			$cache[ 'value' ]->icons = array();
600 600
 		}
601 601
 
602
-		return $cache['value'];
602
+		return $cache[ 'value' ];
603 603
 
604 604
 	}
605 605
 
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
 	 */
612 612
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
613 613
 
614
-		if( empty( $cache_key ) ) {
614
+		if ( empty( $cache_key ) ) {
615 615
 			$cache_key = $this->cache_key;
616 616
 		}
617 617
 
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 		update_option( $cache_key, $data, 'no' );
624 624
 
625 625
 		// Delete the duplicate option
626
-		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ) );
626
+		delete_option( 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ) );
627 627
 	}
628 628
 
629 629
 	/**
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 	 * @return bool
634 634
 	 */
635 635
 	private function verify_ssl() {
636
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
636
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
637 637
 	}
638 638
 
639 639
 }
Please login to merge, or discard this patch.
includes/load-plugin-and-theme-hooks.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 $plugin_hooks_files = glob( $include_path . 'class-gravityview-plugin-hooks-*.php' );
22 22
 
23 23
 // Load all plugin files automatically
24
-foreach ( (array) $plugin_hooks_files as $plugin_hooks_file ) {
24
+foreach ( (array)$plugin_hooks_files as $plugin_hooks_file ) {
25 25
 	include $plugin_hooks_file;
26 26
 }
27 27
 
28 28
 $theme_hooks_files = glob( $include_path . 'class-gravityview-theme-hooks-*.php' );
29 29
 
30 30
 // Load all theme files automatically
31
-foreach ( (array) $theme_hooks_files as $theme_hooks_file ) {
31
+foreach ( (array)$theme_hooks_files as $theme_hooks_file ) {
32 32
 	include $theme_hooks_file;
33 33
 }
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
66 66
 
67
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
67
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
68 68
 	}
69 69
 
70 70
 	/**
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	function filter_gravityview_back_link( $link ) {
85 85
 		global $wpml_url_filters;
86 86
 
87
-		if( $wpml_url_filters ) {
87
+		if ( $wpml_url_filters ) {
88 88
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
89 89
 		}
90 90
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	private function remove_url_hooks() {
102 102
 		global $wpml_url_filters;
103 103
 
104
-		if( ! $wpml_url_filters ) {
104
+		if ( ! $wpml_url_filters ) {
105 105
 			return;
106 106
 		}
107 107
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	private function add_url_hooks() {
130 130
 		global $wpml_url_filters;
131 131
 
132
-		if( ! $wpml_url_filters ) {
132
+		if ( ! $wpml_url_filters ) {
133 133
 			return;
134 134
 		}
135 135
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 					break;
227 227
 			}
228 228
 
229
-			$languages[ $lang_code ]['url'] = $entry_link;
229
+			$languages[ $lang_code ][ 'url' ] = $entry_link;
230 230
 		}
231 231
 
232 232
 		$this->add_url_hooks();
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
 
135 135
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
136 136
 
137
-		if( $this->entry_meta_key ) {
137
+		if ( $this->entry_meta_key ) {
138 138
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
139 139
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
140 140
 		}
141 141
 
142
-		if( $this->_custom_merge_tag ) {
142
+		if ( $this->_custom_merge_tag ) {
143 143
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
144 144
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
145 145
 		}
146 146
 
147
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
147
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
148 148
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
149 149
 		}
150 150
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * Auto-assign label from Gravity Forms label, if exists
153 153
 		 * @since 1.20
154 154
 		 */
155
-		if( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
155
+		if ( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
156 156
 			$this->label = ucfirst( GF_Fields::get( $this->name )->get_form_editor_field_title() );
157 157
 		}
158 158
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 			'type'  => $this->name
180 180
 		);
181 181
 
182
-		$fields["{$this->entry_meta_key}"] = $added_field;
182
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
183 183
 
184 184
 		return $fields;
185 185
 	}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 	 */
200 200
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
201 201
 
202
-		if( $this->name === $field['field'] && '' === $label ) {
202
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
203 203
 			$label = esc_html( $this->default_search_label );
204 204
 		}
205 205
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 *
221 221
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
222 222
 	 */
223
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
223
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
224 224
 
225 225
 		// Is there is field merge tag? Strip whitespace off the ned, too.
226 226
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -253,19 +253,19 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
255 255
 
256
-		foreach( $matches as $match ) {
256
+		foreach ( $matches as $match ) {
257 257
 
258
-			$full_tag = $match[0];
258
+			$full_tag = $match[ 0 ];
259 259
 
260 260
 			// Strip the Merge Tags
261
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
261
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
262 262
 
263 263
 			// Replace the value from the entry, if exists
264
-			if( isset( $entry[ $tag ] ) ) {
264
+			if ( isset( $entry[ $tag ] ) ) {
265 265
 
266 266
 				$value = $entry[ $tag ];
267 267
 
268
-				if( is_callable( array( $this, 'get_content') ) ) {
268
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
269 269
 					$value = $this->get_content( $value );
270 270
 				}
271 271
 
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function _filter_sortable_fields( $not_sortable ) {
340 340
 
341
-		if( ! $this->is_sortable ) {
342
-			$not_sortable[] = $this->name;
341
+		if ( ! $this->is_sortable ) {
342
+			$not_sortable[ ] = $this->name;
343 343
 		}
344 344
 
345 345
 		return $not_sortable;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 	 */
357 357
 	function add_entry_meta( $entry_meta ) {
358 358
 
359
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
359
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
360 360
 
361 361
 			$added_meta = array(
362 362
 				'label'             => $this->label,
@@ -365,13 +365,13 @@  discard block
 block discarded – undo
365 365
 			);
366 366
 
367 367
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
368
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
368
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
369 369
 			}
370 370
 
371
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
371
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
372 372
 
373 373
 		} else {
374
-			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta["{$this->entry_meta_key}"] ) );
374
+			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta[ "{$this->entry_meta_key}" ] ) );
375 375
 		}
376 376
 
377 377
 		return $entry_meta;
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			'date_display' => array(
401 401
 				'type' => 'text',
402 402
 				'label' => __( 'Override Date Format', 'gravityview' ),
403
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
403
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://wordpress.org/support/article/formatting-date-and-time/" rel="external">', '</a>' ),
404 404
 				/**
405 405
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
406 406
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 
427 427
 		$options = $this->field_support_options();
428 428
 
429
-		if( isset( $options[ $key ] ) ) {
429
+		if ( isset( $options[ $key ] ) ) {
430 430
 			$field_options[ $key ] = $options[ $key ];
431 431
 		}
432 432
 
@@ -490,11 +490,11 @@  discard block
 block discarded – undo
490 490
 		$connected_form = \GV\Utils::_POST( 'form_id' );
491 491
 
492 492
 		// Otherwise, get the Form ID from the Post page
493
-		if( empty( $connected_form ) ) {
493
+		if ( empty( $connected_form ) ) {
494 494
 			$connected_form = gravityview_get_form_id( get_the_ID() );
495 495
 		}
496 496
 
497
-		if( empty( $connected_form ) ) {
497
+		if ( empty( $connected_form ) ) {
498 498
 			gravityview()->log->error( 'Form not found for form ID "{form_id}"', array( 'form_id' => $connected_form ) );
499 499
 			return false;
500 500
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
64 64
 
65
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
65
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
66 66
 	}
67 67
 
68 68
 	/**
@@ -103,35 +103,35 @@  discard block
 block discarded – undo
103 103
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
104 104
 
105 105
 		// If the search is not being sorted, return early
106
-		if( empty( $criteria['sorting']['key'] ) ) {
106
+		if ( empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
107 107
 			return $criteria;
108 108
 		}
109 109
 
110
-		$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
110
+		$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
111 111
 
112 112
 		/**
113 113
 		 * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL
114 114
 		 * @see modify_sort_id()
115 115
 		 */
116
-		if( empty( $pieces[1] ) ) {
116
+		if ( empty( $pieces[ 1 ] ) ) {
117 117
 			return $criteria;
118 118
 		}
119 119
 
120 120
 		// Pass these to the _modify_query_sort_by_time_hack() method
121
-		$this->_time_format = $pieces[1];
122
-		$this->_date_format = $pieces[2];
121
+		$this->_time_format = $pieces[ 1 ];
122
+		$this->_date_format = $pieces[ 2 ];
123 123
 
124 124
 		// Remove fake input IDs (5.1 doesn't exist. Use 5)
125
-		$criteria['sorting']['key'] = floor( $pieces[0] );
125
+		$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
126 126
 
127 127
 		/**
128 128
 		 * Make sure sorting is numeric (# of seconds). IMPORTANT.
129 129
 		 * @see GVCommon::is_field_numeric() is_numeric should also be set here
130 130
 		 */
131
-		$criteria['sorting']['is_numeric'] = true;
131
+		$criteria[ 'sorting' ][ 'is_numeric' ] = true;
132 132
 
133 133
 		// Modify the Gravity Forms WP Query
134
-		add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
134
+		add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
135 135
 
136 136
 		return $criteria;
137 137
 	}
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 		 * then we want to modify the query.
153 153
 		 * @see GFFormsModel::sort_by_field_query()
154 154
 		 */
155
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
155
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
156 156
 
157
-			if( $this->_time_format === '24' ) {
157
+			if ( $this->_time_format === '24' ) {
158 158
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
159 159
 			} else {
160 160
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -200,18 +200,18 @@  discard block
 block discarded – undo
200 200
 		// Set variables
201 201
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
202 202
 
203
-		if( 'edit' === $context ) {
203
+		if ( 'edit' === $context ) {
204 204
 			return $field_options;
205 205
 		}
206 206
 
207 207
 		/**
208 208
 		 * Set default date format based on field ID and Form ID
209 209
 		 */
210
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
210
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
211 211
 
212
-		$this->add_field_support('date_display', $field_options );
212
+		$this->add_field_support( 'date_display', $field_options );
213 213
 
214
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
214
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
215 215
 
216 216
 		return $field_options;
217 217
 	}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	private function _get_time_format() {
227 227
 		global $post;
228 228
 
229
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
229
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
230 230
 
231 231
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
232 232
 	}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 		// GF defaults to 12, so should we.
246 246
 		$time_format = '12';
247 247
 
248
-		if( $form_id ) {
248
+		if ( $form_id ) {
249 249
 			$form = GFAPI::get_form( $form_id );
250 250
 
251 251
 			if ( $form ) {
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 		$default = 'h:i A';
293 293
 
294 294
 		// This doesn't take into account 24-hour
295
-		switch( $field_input_id ) {
295
+		switch ( $field_input_id ) {
296 296
 			// Hours
297 297
 			case 1:
298 298
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.