Completed
Push — develop ( adcc2c...e29763 )
by Zack
17:41
created
includes/class-api.php 1 patch
Spacing   +100 added lines, -100 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
 
@@ -569,15 +569,15 @@  discard block
 block discarded – undo
569 569
          * @param boolean $custom Should we process the custom entry slug?
570 570
          */
571 571
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
572
-        if( $custom ) {
572
+        if ( $custom ) {
573 573
             // create the gravityview_unique_id and save it
574 574
 
575 575
             // Get the entry hash
576
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
576
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
577 577
 
578
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
578
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
579 579
 
580
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
580
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
581 581
 
582 582
         }
583 583
     }
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 
597 597
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
598 598
 			$entry = GVCommon::get_entry( $entry );
599
-		} else if( empty( $entry ) ) {
599
+		} else if ( empty( $entry ) ) {
600 600
 			// @deprecated path
601 601
 			$entry = GravityView_frontend::getInstance()->getEntry();
602 602
 		}
@@ -616,9 +616,9 @@  discard block
 block discarded – undo
616 616
 
617 617
 		$query_arg_name = \GV\Entry::get_endpoint_name();
618 618
 
619
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
619
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
620 620
 
621
-		if ( get_option('permalink_structure') && !is_preview() ) {
621
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
622 622
 
623 623
 			$args = array();
624 624
 
@@ -628,9 +628,9 @@  discard block
 block discarded – undo
628 628
 			 */
629 629
 			$link_parts = explode( '?', $directory_link );
630 630
 
631
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
631
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
632 632
 
633
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
633
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
634 634
 
635 635
 		} else {
636 636
 
@@ -642,22 +642,22 @@  discard block
 block discarded – undo
642 642
 		 */
643 643
 		if ( $add_directory_args ) {
644 644
 
645
-			if ( ! empty( $_GET['pagenum'] ) ) {
646
-				$args['pagenum'] = intval( $_GET['pagenum'] );
645
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
646
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
647 647
 			}
648 648
 
649 649
 			/**
650 650
 			 * @since 1.7
651 651
 			 */
652 652
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
653
-				$args['sort'] = $sort;
654
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
653
+				$args[ 'sort' ] = $sort;
654
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
655 655
 			}
656 656
 
657 657
 		}
658 658
 
659 659
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
660
-			$args['gvid'] = gravityview_get_view_id();
660
+			$args[ 'gvid' ] = gravityview_get_view_id();
661 661
 		}
662 662
 
663 663
 		return add_query_arg( $args, $directory_link );
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 }
679 679
 
680 680
 function gv_class( $field, $form = NULL, $entry = array() ) {
681
-	return GravityView_API::field_class( $field, $form, $entry  );
681
+	return GravityView_API::field_class( $field, $form, $entry );
682 682
 }
683 683
 
684 684
 /**
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
 		$view_id = 0;
702 702
 		if ( $context->view ) {
703 703
 			$view_id = $context->view->ID;
704
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
704
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
705 705
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
706 706
 			}
707 707
 		}
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 		$default_css_class .= ' gv-container-no-results';
730 730
 	}
731 731
 
732
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
732
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
733 733
 
734 734
 	/**
735 735
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 
757 757
 	$value = GravityView_API::field_value( $entry, $field );
758 758
 
759
-	if( $value === '' ) {
759
+	if ( $value === '' ) {
760 760
 		/**
761 761
 		 * @filter `gravityview_empty_value` What to display when a field is empty
762 762
 		 * @param string $value (empty string)
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
  */
870 870
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
871 871
 
872
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
872
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
873 873
 
874 874
 		// For the complete field value as generated by Gravity Forms
875 875
 		return $display_value;
@@ -903,16 +903,16 @@  discard block
 block discarded – undo
903 903
 		$terms = explode( ', ', $value );
904 904
 	}
905 905
 
906
-	foreach ($terms as $term_name ) {
906
+	foreach ( $terms as $term_name ) {
907 907
 
908 908
 		// If we're processing a category,
909
-		if( $taxonomy === 'category' ) {
909
+		if ( $taxonomy === 'category' ) {
910 910
 
911 911
 			// Use rgexplode to prevent errors if : doesn't exist
912 912
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
913 913
 
914 914
 			// The explode was succesful; we have the category ID
915
-			if( !empty( $term_id )) {
915
+			if ( ! empty( $term_id ) ) {
916 916
 				$term = get_term_by( 'id', $term_id, $taxonomy );
917 917
 			} else {
918 918
 			// We have to fall back to the name
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 		}
926 926
 
927 927
 		// There's still a tag/category here.
928
-		if( $term ) {
928
+		if ( $term ) {
929 929
 
930 930
 			$term_link = get_term_link( $term, $taxonomy );
931 931
 
@@ -934,11 +934,11 @@  discard block
 block discarded – undo
934 934
 			    continue;
935 935
 			}
936 936
 
937
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
937
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
938 938
 		}
939 939
 	}
940 940
 
941
-	return implode(', ', $output );
941
+	return implode( ', ', $output );
942 942
 }
943 943
 
944 944
 /**
@@ -952,8 +952,8 @@  discard block
 block discarded – undo
952 952
 
953 953
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
954 954
 
955
-	if( empty( $link ) ) {
956
-		return strip_tags( $output);
955
+	if ( empty( $link ) ) {
956
+		return strip_tags( $output );
957 957
 	}
958 958
 
959 959
 	return $output;
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
 	$fe = GravityView_frontend::getInstance();
973 973
 
974 974
 	// Solve problem when loading content via admin-ajax.php
975
-	if( ! $fe->getGvOutputData() ) {
975
+	if ( ! $fe->getGvOutputData() ) {
976 976
 
977 977
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
978 978
 
@@ -980,7 +980,7 @@  discard block
 block discarded – undo
980 980
 	}
981 981
 
982 982
 	// Make 100% sure that we're dealing with a properly called situation
983
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
983
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
984 984
 
985 985
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
986 986
 
@@ -1202,12 +1202,12 @@  discard block
 block discarded – undo
1202 1202
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1203 1203
 	/** @define "GRAVITYVIEW_DIR" "../" */
1204 1204
 
1205
-	if( !class_exists( 'GravityView_Field' ) ) {
1206
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1205
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1206
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1207 1207
 	}
1208 1208
 
1209
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1210
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1209
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1210
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1211 1211
 	}
1212 1212
 
1213 1213
 	if ( is_null( $context ) ) {
@@ -1310,21 +1310,21 @@  discard block
 block discarded – undo
1310 1310
 	} else {
1311 1311
 		// @deprecated path
1312 1312
 		// Required fields.
1313
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1313
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1314 1314
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1315 1315
 			return '';
1316 1316
 		}
1317 1317
 	}
1318 1318
 
1319 1319
 	if ( $context instanceof \GV\Template_Context ) {
1320
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1321
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1322
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1320
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1321
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1322
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1323 1323
 	} else {
1324 1324
 		// @deprecated path
1325
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1326
-		$field = $args['field'];
1327
-		$form = $args['form'];
1325
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1326
+		$field = $args[ 'field' ];
1327
+		$form = $args[ 'form' ];
1328 1328
 	}
1329 1329
 
1330 1330
 	/**
@@ -1342,40 +1342,40 @@  discard block
 block discarded – undo
1342 1342
 	);
1343 1343
 
1344 1344
 	if ( $context instanceof \GV\Template_Context ) {
1345
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1345
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1346 1346
 	} else {
1347 1347
 		// @deprecated path
1348
-		$placeholders['value'] = gv_value( $entry, $field );
1348
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1349 1349
 	}
1350 1350
 
1351 1351
 	// If the value is empty and we're hiding empty, return empty.
1352
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1352
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1353 1353
 		return '';
1354 1354
 	}
1355 1355
 
1356
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1357
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1356
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1357
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1358 1358
 	}
1359 1359
 
1360 1360
 	// Get width setting, if exists
1361
-	$placeholders['width'] = GravityView_API::field_width( $field );
1361
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1362 1362
 
1363 1363
 	// If replacing with CSS inline formatting, let's do it.
1364
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1364
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1365 1365
 
1366 1366
 	// Grab the Class using `gv_class`
1367
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1368
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1367
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1368
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1369 1369
 
1370 1370
 	if ( $context instanceof \GV\Template_Context ) {
1371
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1371
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1372 1372
 	} else {
1373 1373
 		// Default Label value
1374
-		$placeholders['label_value'] = gv_label( $field, $entry );
1374
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1375 1375
 	}
1376 1376
 
1377
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1378
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1377
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1378
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1379 1379
 	}
1380 1380
 
1381 1381
 	/**
@@ -1386,7 +1386,7 @@  discard block
 block discarded – undo
1386 1386
 	 * @since 2.0
1387 1387
 	 * @param \GV\Template_Context $context The context.
1388 1388
 	 */
1389
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1389
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1390 1390
 
1391 1391
 	/**
1392 1392
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1413,7 +1413,7 @@  discard block
 block discarded – undo
1413 1413
 	foreach ( $placeholders as $tag => $value ) {
1414 1414
 
1415 1415
 		// If the tag doesn't exist just skip it
1416
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1416
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1417 1417
 			continue;
1418 1418
 		}
1419 1419
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $entry || is_wp_error( $entry ) ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -261,10 +261,10 @@  discard block
 block discarded – undo
261 261
 		}
262 262
 
263 263
 		// Set default
264
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
264
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
265 265
 
266 266
 		// Then check for if there is an approval column, and use that value instead
267
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
267
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
268 268
 	}
269 269
 
270 270
 	/**
@@ -278,12 +278,12 @@  discard block
 block discarded – undo
278 278
 	 */
279 279
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
280 280
 
281
-		$approved_column = self::get_approved_column( $form['id'] );
281
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
282 282
 
283 283
 		/**
284 284
 		 * If the form doesn't contain the approve field, don't assume anything.
285 285
 		 */
286
-		if( empty( $approved_column ) ) {
286
+		if ( empty( $approved_column ) ) {
287 287
 			return;
288 288
 		}
289 289
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 			$value = GravityView_Entry_Approval_Status::APPROVED;
298 298
 		}
299 299
 
300
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
300
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
301 301
 	}
302 302
 
303 303
 	/**
@@ -315,12 +315,12 @@  discard block
 block discarded – undo
315 315
 	 */
316 316
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
317 317
 
318
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
318
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
319 319
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
320 320
 			return NULL;
321 321
 		}
322 322
 
323
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
323
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
324 324
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
325 325
 			return NULL;
326 326
 		}
@@ -335,10 +335,10 @@  discard block
 block discarded – undo
335 335
 		$approved_column_id = self::get_approved_column( $form_id );
336 336
 
337 337
 		$success = true;
338
-		foreach( $entries as $entry_id ) {
338
+		foreach ( $entries as $entry_id ) {
339 339
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
340 340
 
341
-			if( ! $update_success ) {
341
+			if ( ! $update_success ) {
342 342
 				$success = false;
343 343
 			}
344 344
 		}
@@ -362,12 +362,12 @@  discard block
 block discarded – undo
362 362
 	 */
363 363
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
364 364
 
365
-		if( !class_exists( 'GFAPI' ) ) {
365
+		if ( ! class_exists( 'GFAPI' ) ) {
366 366
 			gravityview()->log->error( 'GFAPI does not exist' );
367 367
 			return false;
368 368
 		}
369 369
 
370
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
370
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
371 371
 			gravityview()->log->error( 'Not a valid approval value.' );
372 372
 			return false;
373 373
 		}
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 		// If the form has an Approve/Reject field, update that value
385 385
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
386 386
 
387
-		if( is_wp_error( $result ) ) {
387
+		if ( is_wp_error( $result ) ) {
388 388
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
389 389
 			return false;
390 390
 		}
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 
397 397
 		// add note to entry if approval field updating worked or there was no approved field
398 398
 		// There's no validation for the meta
399
-		if( true === $result ) {
399
+		if ( true === $result ) {
400 400
 
401 401
 			// Add an entry note
402 402
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
 
450 450
 		$note_id = false;
451 451
 
452
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
452
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
453 453
 
454 454
 			$current_user = wp_get_current_user();
455 455
 
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
 	 */
472 472
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
473 473
 
474
-		if( empty( $approvedcolumn ) ) {
474
+		if ( empty( $approvedcolumn ) ) {
475 475
 			$approvedcolumn = self::get_approved_column( $form_id );
476 476
 		}
477 477
 
@@ -494,12 +494,12 @@  discard block
 block discarded – undo
494 494
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
495 495
 
496 496
 		$new_value = '';
497
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
497
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
498 498
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
499 499
 		}
500 500
 
501 501
 		//update entry
502
-		$entry["{$approvedcolumn}"] = $new_value;
502
+		$entry[ "{$approvedcolumn}" ] = $new_value;
503 503
 
504 504
 		/**
505 505
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -530,12 +530,12 @@  discard block
 block discarded – undo
530 530
 		// If the user has enabled a different value than the label (for some reason), use it.
531 531
 		// This is highly unlikely
532 532
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
533
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
533
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
534 534
 		}
535 535
 
536 536
 		// Otherwise, fall back on the inputs array
537 537
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
538
-			return $field->inputs[0]['label'];
538
+			return $field->inputs[ 0 ][ 'label' ];
539 539
 		}
540 540
 
541 541
 		return null;
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		 * @since 1.18 Added "unapproved"
588 588
 		 * @param  int $entry_id ID of the Gravity Forms entry
589 589
 		 */
590
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
590
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
591 591
 	}
592 592
 
593 593
 	/**
@@ -600,11 +600,11 @@  discard block
 block discarded – undo
600 600
 	 */
601 601
 	static public function get_approved_column( $form ) {
602 602
 
603
-		if( empty( $form ) ) {
603
+		if ( empty( $form ) ) {
604 604
 			return null;
605 605
 		}
606 606
 
607
-		if( !is_array( $form ) ) {
607
+		if ( ! is_array( $form ) ) {
608 608
 			$form = GVCommon::get_form( $form );
609 609
 		}
610 610
 
@@ -614,22 +614,22 @@  discard block
 block discarded – undo
614 614
 		 * @var string $key
615 615
 		 * @var GF_Field $field
616 616
 		 */
617
-		foreach( $form['fields'] as $key => $field ) {
617
+		foreach ( $form[ 'fields' ] as $key => $field ) {
618 618
 
619 619
 			$inputs = $field->get_entry_inputs();
620 620
 
621
-			if( !empty( $field->gravityview_approved ) ) {
622
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
623
-					$approved_column_id = $inputs[0]['id'];
621
+			if ( ! empty( $field->gravityview_approved ) ) {
622
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
623
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
624 624
 					break;
625 625
 				}
626 626
 			}
627 627
 
628 628
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
629
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
629
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
630 630
 				foreach ( $inputs as $input ) {
631
-					if ( 'approved' === strtolower( $input['label'] ) ) {
632
-						$approved_column_id = $input['id'];
631
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
632
+						$approved_column_id = $input[ 'id' ];
633 633
 						break;
634 634
 					}
635 635
 				}
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 
656 656
 		$view_keys = array_keys( $gv_data->get_views() );
657 657
 
658
-		$view = \GV\View::by_id( $view_keys[0] );
658
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
659 659
 
660 660
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
661 661
 			return;
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 			return;
666 666
 		}
667 667
 
668
-		self::update_approved_meta( $entry_id, GravityView_Entry_Approval_Status::UNAPPROVED, $form['id'] );
668
+		self::update_approved_meta( $entry_id, GravityView_Entry_Approval_Status::UNAPPROVED, $form[ 'id' ] );
669 669
 	}
670 670
 
671 671
 }
Please login to merge, or discard this patch.