Completed
Push — develop ( 19745f...1770cc )
by Zack
17:28
created
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
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			'type'  => $this->name
176 176
 		);
177 177
 
178
-		$fields["{$this->entry_meta_key}"] = $added_field;
178
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
179 179
 
180 180
 		return $fields;
181 181
 	}
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
197 197
 
198
-		if( $this->name === $field['field'] && '' === $label ) {
198
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
199 199
 			$label = esc_html( $this->default_search_label );
200 200
 		}
201 201
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 *
217 217
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
218 218
 	 */
219
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
219
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
220 220
 
221 221
 		// Is there is field merge tag? Strip whitespace off the ned, too.
222 222
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -249,19 +249,19 @@  discard block
 block discarded – undo
249 249
 	 */
250 250
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
251 251
 
252
-		foreach( $matches as $match ) {
252
+		foreach ( $matches as $match ) {
253 253
 
254
-			$full_tag = $match[0];
254
+			$full_tag = $match[ 0 ];
255 255
 
256 256
 			// Strip the Merge Tags
257
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
257
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
258 258
 
259 259
 			// Replace the value from the entry, if exists
260
-			if( isset( $entry[ $tag ] ) ) {
260
+			if ( isset( $entry[ $tag ] ) ) {
261 261
 
262 262
 				$value = $entry[ $tag ];
263 263
 
264
-				if( is_callable( array( $this, 'get_content') ) ) {
264
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
265 265
 					$value = $this->get_content( $value );
266 266
 				}
267 267
 
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public function _filter_sortable_fields( $not_sortable ) {
336 336
 
337
-		if( ! $this->is_sortable ) {
338
-			$not_sortable[] = $this->name;
337
+		if ( ! $this->is_sortable ) {
338
+			$not_sortable[ ] = $this->name;
339 339
 		}
340 340
 
341 341
 		return $not_sortable;
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	 */
353 353
 	function add_entry_meta( $entry_meta ) {
354 354
 
355
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
355
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
356 356
 
357 357
 			$added_meta = array(
358 358
 				'label'             => $this->label,
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 			);
362 362
 
363 363
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
364
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
364
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
365 365
 			}
366 366
 
367
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
367
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
368 368
 
369 369
 		} else {
370
-			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta["{$this->entry_meta_key}"] ) );
370
+			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta[ "{$this->entry_meta_key}" ] ) );
371 371
 		}
372 372
 
373 373
 		return $entry_meta;
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 			'date_display' => array(
397 397
 				'type' => 'text',
398 398
 				'label' => __( 'Override Date Format', 'gravityview' ),
399
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
399
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
400 400
 				/**
401 401
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
402 402
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 
422 422
 		$options = $this->field_support_options();
423 423
 
424
-		if( isset( $options[ $key ] ) ) {
424
+		if ( isset( $options[ $key ] ) ) {
425 425
 			$field_options[ $key ] = $options[ $key ];
426 426
 		}
427 427
 
@@ -485,11 +485,11 @@  discard block
 block discarded – undo
485 485
 		$connected_form = \GV\Utils::_POST( 'form_id' );
486 486
 
487 487
 		// Otherwise, get the Form ID from the Post page
488
-		if( empty( $connected_form ) ) {
488
+		if ( empty( $connected_form ) ) {
489 489
 			$connected_form = gravityview_get_form_id( get_the_ID() );
490 490
 		}
491 491
 
492
-		if( empty( $connected_form ) ) {
492
+		if ( empty( $connected_form ) ) {
493 493
 			gravityview()->log->error( 'Form not found for form ID "{form_id}"', array( 'form_id' => $connected_form ) );
494 494
 			return false;
495 495
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-total.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total.
52 52
 	 */
53
-	public function add_to_blacklist( $blacklist = array(), $context = NULL  ){
53
+	public function add_to_blacklist( $blacklist = array(), $context = NULL ) {
54 54
 
55
-		if( empty( $context ) || $context !== 'edit' ) {
55
+		if ( empty( $context ) || $context !== 'edit' ) {
56 56
 			return $blacklist;
57 57
 		}
58 58
 
59
-		$blacklist[] = 'total';
59
+		$blacklist[ ] = 'total';
60 60
 
61 61
 		return $blacklist;
62 62
 	}
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
76 76
 
77
-		$original_form = GFAPI::get_form( $form['id'] );
77
+		$original_form = GFAPI::get_form( $form[ 'id' ] );
78 78
 
79 79
 		$total_fields = GFCommon::get_fields_by_type( $original_form, 'total' );
80 80
 
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 
86 86
 			/** @var GF_Field_Total $total_field */
87 87
 			foreach ( $total_fields as $total_field ) {
88
-				$entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry );
88
+				$entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry );
89 89
 			}
90 90
 
91 91
 			$return_entry = GFAPI::update_entry( $entry );
92 92
 
93
-			if( is_wp_error( $return_entry ) ) {
93
+			if ( is_wp_error( $return_entry ) ) {
94 94
 				gravityview()->log->error( 'Updating the entry total fields failed', array( 'data' => $return_entry ) );
95 95
 			} else {
96 96
 				gravityview()->log->debug( 'Updating the entry total fields succeeded' );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-multiselect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * @see GFCommon::get_field_filter_settings Gravity Forms suggests checkboxes should just be "contains"
14 14
 	 * @var array
15 15
 	 */
16
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
16
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
17 17
 
18 18
 	var $is_searchable = true;
19 19
 
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 		// Set the $_field_id var
46 46
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
47 47
 
48
-		if( $this->is_choice_value_enabled() ) {
49
-			$field_options['choice_display'] = array(
48
+		if ( $this->is_choice_value_enabled() ) {
49
+			$field_options[ 'choice_display' ] = array(
50 50
 				'type'    => 'radio',
51 51
 				'value'   => 'value',
52 52
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 
61 61
 			if ( 'address' === \GV\Utils::get( $search_field, 'type' ) ) {
62 62
 
63
-				$field_id = intval( floor( $search_field['key'] ) );
64
-				$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
63
+				$field_id = intval( floor( $search_field[ 'key' ] ) );
64
+				$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
65 65
 				$form = GravityView_View::getInstance()->getForm();
66 66
 
67 67
 				/** @var GF_Field_Address $address_field */
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$choices = array();
71 71
 
72 72
 				$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
73
-				if( method_exists( $this, $method_name ) ) {
73
+				if ( method_exists( $this, $method_name ) ) {
74 74
 					/**
75 75
 					 * @uses GravityView_Field_Address::get_choices_country()
76 76
 					 * @uses GravityView_Field_Address::get_choices_state()
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
 					$choices = $this->{$method_name}( $address_field );
79 79
 				}
80 80
 
81
-				if( ! empty( $choices ) ) {
82
-					$search_field['choices'] = $choices;
83
-					$search_field['type'] = \GV\Utils::get( $search_field, 'input');
81
+				if ( ! empty( $choices ) ) {
82
+					$search_field[ 'choices' ] = $choices;
83
+					$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
84 84
 				} else {
85
-					$search_field['type'] = 'text';
86
-					$search_field['input'] = 'input_text';
85
+					$search_field[ 'type' ] = 'text';
86
+					$search_field[ 'input' ] = 'input_text';
87 87
 				}
88 88
 			}
89 89
 		}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 		$country_choices = array();
110 110
 
111 111
 		foreach ( $countries as $key => $country ) {
112
-			$country_choices[] = array(
112
+			$country_choices[ ] = array(
113 113
 				'value' => $country,
114 114
 				'text' => $country,
115 115
 			);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	private function get_choices_state( $address_field ) {
135 135
 
136
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
136
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
137 137
 
138 138
 		$state_choices = array();
139 139
 
@@ -145,12 +145,12 @@  discard block
 block discarded – undo
145 145
 				$states = GFCommon::get_canadian_provinces();
146 146
 				break;
147 147
 			default:
148
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
148
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
149 149
 				break;
150 150
 		}
151 151
 
152 152
 		foreach ( $states as $key => $state ) {
153
-			$state_choices[] = array(
153
+			$state_choices[ ] = array(
154 154
 				'value' => $state,
155 155
 				'text' => $state,
156 156
 			);
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 		// Use the same inputs as the "text" input type allows
174 174
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
175 175
 
176
-		$input_types['street'] = $text_inputs;
177
-		$input_types['street2'] = $text_inputs;
178
-		$input_types['city'] = $text_inputs;
176
+		$input_types[ 'street' ] = $text_inputs;
177
+		$input_types[ 'street2' ] = $text_inputs;
178
+		$input_types[ 'city' ] = $text_inputs;
179 179
 
180
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
-		$input_types['zip'] = array( 'input_text' );
182
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
180
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
181
+		$input_types[ 'zip' ] = array( 'input_text' );
182
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
183 183
 
184 184
 		return $input_types;
185 185
 	}
@@ -200,10 +200,10 @@  discard block
 block discarded – undo
200 200
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
201 201
 		$input_id = gravityview_get_input_id_from_id( $field_id );
202 202
 
203
-		if( 'address' === $field_type && $input_id ) {
203
+		if ( 'address' === $field_type && $input_id ) {
204 204
 
205 205
 			// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
206
-			if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
206
+			if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
207 207
 				$input_type = $address_field_name;
208 208
 			}
209 209
 		}
@@ -252,20 +252,20 @@  discard block
 block discarded – undo
252 252
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
253 253
 
254 254
 		// If this is NOT the full address field, return default options.
255
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
255
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
256 256
 			return $field_options;
257 257
 		}
258 258
 
259
-		if( 'edit' === $context ) {
259
+		if ( 'edit' === $context ) {
260 260
 			return $field_options;
261 261
 		}
262 262
 
263 263
 		$add_options = array();
264 264
 
265
-		$add_options['show_map_link'] = array(
265
+		$add_options[ 'show_map_link' ] = array(
266 266
 			'type' => 'checkbox',
267 267
 			'label' => __( 'Show Map Link:', 'gravityview' ),
268
-			'desc' => __('Display a "Map It" link below the address', 'gravityview'),
268
+			'desc' => __( 'Display a "Map It" link below the address', 'gravityview' ),
269 269
 			'value' => true,
270 270
 			'merge_tags' => false,
271 271
 		);
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-date-created.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 
36 36
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
37 37
 
38
-		if( 'edit' === $context ) {
38
+		if ( 'edit' === $context ) {
39 39
 			return $field_options;
40 40
 		}
41 41
 
42
-		$this->add_field_support('date_display', $field_options );
42
+		$this->add_field_support( 'date_display', $field_options );
43 43
 
44 44
 		return $field_options;
45 45
 	}
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
62 62
 
63 63
 		/** Overridden by a template. */
64
-		if( ! empty( $field['field_path'] ) ) { return $output; }
64
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
65 65
 
66
-		return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
66
+		return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
67 67
 	}
68 68
 
69 69
 	/**
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 *
82 82
 	 * @return string Original text if {date_created} isn't found. Otherwise, replaced text.
83 83
 	 */
84
-	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
84
+	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
85 85
 
86 86
 		$return = $text;
87 87
 
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 
91 91
 		foreach ( $matches as $match ) {
92 92
 
93
-			$full_tag          = $match[0];
94
-			$property          = $match[1];
93
+			$full_tag          = $match[ 0 ];
94
+			$property          = $match[ 1 ];
95 95
 
96 96
 			$formatted_date = GravityView_Merge_Tags::format_date( $date_created, $property );
97 97
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-category.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
17 17
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		$entry = GFAPI::get_entry( $entry_id );
45 45
 		$post_id = \GV\Utils::get( $entry, 'post_id' );
46 46
 
47
-		if( empty( $post_id ) ) {
47
+		if ( empty( $post_id ) ) {
48 48
 			return false;
49 49
 		}
50 50
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 
53 53
 		$post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' );
54 54
 
55
-		if( $post_category_fields ) {
55
+		if ( $post_category_fields ) {
56 56
 
57 57
 			$updated_categories = array();
58 58
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	 *
120 120
 	 * @return mixed
121 121
 	 */
122
-	function edit_entry_post_category_choices( $choices, $field, $form_id  ) {
122
+	function edit_entry_post_category_choices( $choices, $field, $form_id ) {
123 123
 
124
-		$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
124
+		$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
125 125
 
126 126
 		// $entry['post_id'] should always be set, but we check to make sure.
127
-		if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) {
127
+		if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) {
128 128
 
129 129
 			$post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) );
130 130
 
131 131
 			// Always use the live value
132 132
 			foreach ( $choices as &$choice ) {
133
-				$choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) );
133
+				$choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) );
134 134
 			}
135 135
 		}
136 136
 
@@ -139,12 +139,12 @@  discard block
 block discarded – undo
139 139
 
140 140
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
141 141
 
142
-		if( 'edit' === $context ) {
142
+		if ( 'edit' === $context ) {
143 143
 			return $field_options;
144 144
 		}
145 145
 
146
-		$this->add_field_support('dynamic_data', $field_options );
147
-		$this->add_field_support('link_to_term', $field_options );
146
+		$this->add_field_support( 'dynamic_data', $field_options );
147
+		$this->add_field_support( 'link_to_term', $field_options );
148 148
 
149 149
 		return $field_options;
150 150
 	}
Please login to merge, or discard this patch.
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 				'parent' => 'gravityview',
104 104
 				'title' => __( 'Edit Entry', 'gravityview' ),
105 105
 				'meta' => array(
106
-					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry['id'], $entry ) ),
106
+					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ) ),
107 107
 				),
108
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
108
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
109 109
 			) );
110 110
 
111 111
 		}
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 		/** @var WP_Admin_Bar $wp_admin_bar */
122 122
 		global $wp_admin_bar;
123 123
 
124
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
124
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
125 125
 
126 126
 			$view_data = GravityView_View_Data::getInstance();
127 127
 			$views = $view_data->get_views();
@@ -133,21 +133,21 @@  discard block
 block discarded – undo
133 133
 				$added_views = array();
134 134
 
135 135
 				foreach ( $views as $view ) {
136
-					$view = \GV\View::by_id( $view['id'] );
136
+					$view = \GV\View::by_id( $view[ 'id' ] );
137 137
 					$view_id = $view->ID;
138 138
 					$form_id = $view->form ? $view->form->ID : null;
139 139
 
140 140
 					$edit_view_title = __( 'Edit View', 'gravityview' );
141 141
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
142 142
 
143
-					if( sizeof( $views ) > 1 ) {
143
+					if ( sizeof( $views ) > 1 ) {
144 144
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
145 145
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
146 146
 					}
147 147
 
148
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
148
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
149 149
 
150
-						$added_views[] = $view_id;
150
+						$added_views[ ] = $view_id;
151 151
 
152 152
 						$wp_admin_bar->add_menu( array(
153 153
 							'id'    => 'edit-view-' . $view_id,
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 						) );
158 158
 					}
159 159
 
160
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
160
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
161 161
 
162
-						$added_forms[] = $form_id;
162
+						$added_forms[ ] = $form_id;
163 163
 
164 164
 						$wp_admin_bar->add_menu( array(
165 165
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     	/**
11 11
     	 * @since  1.5.1
12 12
     	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
13
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
14 14
 
15 15
     	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
16
+    	if ( ! is_admin() ) { return; }
17 17
 
18 18
 	    /**
19 19
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20 20
 	     * @since 1.7.4
21 21
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22 22
 	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
23
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
24 24
 		    return;
25 25
 	    }
26 26
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
          * Use `init` to fix bbPress warning
29 29
          * @see https://bbpress.trac.wordpress.org/ticket/2309
30 30
          */
31
-    	add_action('init', array( $this, 'load'), 100 );
31
+    	add_action( 'init', array( $this, 'load' ), 100 );
32 32
 
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
33
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
34 34
 
35 35
     }
36 36
 
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57 57
 
58 58
     	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
59
+    	if ( empty( $assign_to_lead ) ) {
60 60
     		return;
61 61
     	}
62 62
 
63 63
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
64
+    	$result = RGFormsModel::update_lead_property( $entry[ 'id' ], 'created_by', $user_id, false, true );
65 65
 
66
-    	if( empty( $result ) ) {
67
-    		$status = __('Error', 'gravityview');
66
+    	if ( empty( $result ) ) {
67
+    		$status = __( 'Error', 'gravityview' );
68 68
     	} else {
69
-    		$status = __('Success', 'gravityview');
69
+    		$status = __( 'Success', 'gravityview' );
70 70
     	}
71 71
 
72
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
72
+    	$note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
73 73
 
74 74
     	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note', $note ) );
75 75
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 	     * @since 1.21.5
79 79
 	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
80 80
 	     */
81
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
81
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) {
82 82
 		    return;
83 83
 	    }
84 84
 
85
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
85
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
86 86
 
87 87
     }
88 88
 
@@ -94,20 +94,20 @@  discard block
 block discarded – undo
94 94
 
95 95
     	// Plugin that was provided here:
96 96
     	// @link https://gravityview.co/support/documentation/201991205/
97
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
97
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
98
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
99 99
 
100 100
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
101
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
101
+    	if ( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
102 102
 
103 103
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
104 104
 
105 105
     		// Now, no validation is required in the methods; let's hook in.
106
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
106
+    		remove_action( 'admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
107 107
 
108
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
108
+    		remove_action( "gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10 );
109 109
 
110
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
110
+    		remove_action( "gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10 );
111 111
     	}
112 112
 
113 113
     }
@@ -119,26 +119,26 @@  discard block
 block discarded – undo
119 119
     function load() {
120 120
 
121 121
     	// Does GF exist?
122
-        if( !class_exists('GFCommon') ) {
122
+        if ( ! class_exists( 'GFCommon' ) ) {
123 123
             return;
124 124
         }
125 125
 
126 126
         // Can the user edit entries?
127
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
127
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
128 128
             return;
129 129
         }
130 130
 
131 131
         // If screen mode isn't set, then we're in the wrong place.
132
-        if( empty( $_REQUEST['screen_mode'] ) ) {
132
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
133 133
             return;
134 134
         }
135 135
 
136 136
         // Now, no validation is required in the methods; let's hook in.
137
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
137
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
138 138
 
139
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
139
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
140 140
 
141
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
141
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
142 142
 
143 143
     }
144 144
 
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
     function set_screen_mode() {
150 150
 
151 151
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
152
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
-            $_POST["screen_mode"] = 'edit';
152
+        if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
153
+            $_POST[ "screen_mode" ] = 'edit';
154 154
         }
155 155
 
156 156
     }
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
      * @param  int $entry_id Entry ID
162 162
      * @return void
163 163
      */
164
-    function update_entry_creator($form, $entry_id) {
164
+    function update_entry_creator( $form, $entry_id ) {
165 165
             global $current_user;
166 166
 
167 167
         // Update the entry
168
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
168
+        $created_by = absint( \GV\Utils::_POST( 'created_by' ) );
169 169
 
170 170
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
171 171
 
@@ -173,30 +173,30 @@  discard block
 block discarded – undo
173 173
         $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
174 174
 
175 175
         // If there's no owner and there didn't used to be, keep going
176
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
176
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
177 177
             return;
178 178
         }
179 179
 
180 180
         // If the values have changed
181
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
181
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
182 182
 
183
-            $user_data = get_userdata($current_user->ID);
183
+            $user_data = get_userdata( $current_user->ID );
184 184
 
185
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
185
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
186 186
 
187
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
187
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
188 188
 
189
-            if( !empty( $originally_created_by ) ) {
190
-                $originally_created_by_user_data = get_userdata($originally_created_by);
189
+            if ( ! empty( $originally_created_by ) ) {
190
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
191 191
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
192 192
             }
193 193
 
194
-            if( !empty( $created_by ) ) {
195
-                $created_by_user_data =  get_userdata($created_by);
194
+            if ( ! empty( $created_by ) ) {
195
+                $created_by_user_data = get_userdata( $created_by );
196 196
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
197 197
             }
198 198
 
199
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
199
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
200 200
         }
201 201
 
202 202
     }
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
      * @param array $entry    GF entry array
208 208
      * @return void
209 209
      */
210
-    function add_select($form_id, $entry ) {
210
+    function add_select( $form_id, $entry ) {
211 211
 
212
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
212
+        if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
213 213
             return;
214 214
         }
215 215
 
@@ -228,23 +228,23 @@  discard block
 block discarded – undo
228 228
 	    }
229 229
 
230 230
         $output = '<label for="change_created_by">';
231
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
231
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
232 232
         $output .= '</label>';
233 233
 
234 234
 	    // If there are users who are not being shown, show a warning.
235 235
 	    // TODO: Use AJAX instead of <select>
236 236
 	    $count_users = count_users();
237
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
237
+	    if ( sizeof( $users ) < $count_users[ 'total_users' ] ) {
238 238
 		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
239 239
 	    }
240 240
 
241 241
 	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
242
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
243
-        foreach($users as $user) {
244
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
242
+        $output .= '<option value="' . selected( $entry[ 'created_by' ], '0', false ) . '"> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
243
+        foreach ( $users as $user ) {
244
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
245 245
         }
246 246
         $output .= '</select>';
247
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
247
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
248 248
 
249 249
 	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
250 250
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-legacy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 		global $post;
35 35
 
36 36
 		if ( $post ) {
37
-			$context['post'] = $post;
37
+			$context[ 'post' ] = $post;
38 38
 		}
39 39
 
40 40
 		\GV\Mocks\Legacy_Context::push( $context );
Please login to merge, or discard this patch.