Completed
Push — develop ( 189ab7...217520 )
by Zack
17:21
created
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		// Prevent items from not having index set
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		$this->id         = $item_id;
72 72
 		$this->form_id    = $form_id;
73 73
 		$this->settings   = $settings;
74
-		$this->label_type = $item['label_type'];
74
+		$this->label_type = $item[ 'label_type' ];
75 75
 	}
76 76
 
77 77
 	/**
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 		if ( $html ) {
115 115
 
116 116
 			foreach ( $field_info_items as $item ) {
117
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
117
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
118 118
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
119 119
 				$output .= '<span class="' . $class . '">';
120
-				$output .= esc_html( $item['value'] );
120
+				$output .= esc_html( $item[ 'value' ] );
121 121
 				$output .= '</span>';
122 122
 			}
123 123
 
@@ -145,29 +145,29 @@  discard block
 block discarded – undo
145 145
 
146 146
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
147 147
 		// TODO: Un-hack this
148
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
148
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
149 149
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
150 150
 
151 151
 		// Should we show the icon that the field is being used as a link to single entry?
152
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
152
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
153 153
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
154 154
 
155 155
 		// When a field label is empty, use the Field ID
156 156
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
157 157
 
158 158
 		// If there's a custom label, and show label is checked, use that as the field heading
159
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
160
-			$label = $this->settings['custom_label'];
161
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
162
-			$label = $this->item['customLabel'];
159
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
160
+			$label = $this->settings[ 'custom_label' ];
161
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
162
+			$label = $this->item[ 'customLabel' ];
163 163
 		}
164 164
 
165 165
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
166 166
 
167 167
 		$label = esc_attr( $label );
168 168
 
169
-		if ( ! empty( $this->item['parent'] ) ) {
170
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
169
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
170
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
171 171
 		}
172 172
 
173 173
 		// Name of field / widget
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
 
184 184
 		$output .= '</h5>';
185 185
 
186
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
187
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
186
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
187
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
188 188
 
189
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
189
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
190 190
 
191 191
 		return $output;
192 192
 	}
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/view-configuration.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -10,32 +10,32 @@  discard block
 block discarded – undo
10 10
 
11 11
 		<div id="directory-fields" class="gv-section">
12 12
 
13
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
13
+			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
14 14
 
15
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
15
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
16 16
 
17
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
17
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
18 18
 
19 19
 			<div id="directory-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
20
-				<?php if(!empty( $curr_template ) ) {
21
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
20
+				<?php if ( ! empty( $curr_template ) ) {
21
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
22 22
 				} ?>
23 23
 			</div>
24 24
 
25
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
25
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4>
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
32 32
 
33 33
             ?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
37 37
                 <span class="close"><i class="dashicons dashicons-dismiss"></i></span>
38
-				<?php do_action('gravityview_render_available_widgets' ); ?>
38
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
39 39
             </div>
40 40
 
41 41
 		</div>
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 
52 52
 		<div id="single-fields" class="gv-section">
53 53
 
54
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
54
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
58
+                if ( ! empty( $curr_template ) ) {
59
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60 60
                 }
61 61
 			    ?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+                do_action( 'gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -71,16 +71,16 @@  discard block
 block discarded – undo
71 71
 
72 72
 		<div id="edit-fields" class="gv-section">
73 73
 
74
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
74
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
75 75
 
76 76
 			<div id="edit-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
77 77
 				<?php
78
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
78
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
79 79
 				?>
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +116 added lines, -116 removed lines patch added patch discarded remove patch
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 
126 126
 		$form = false;
127 127
 
128
-		if( $entry ) {
129
-			$form = GFAPI::get_form( $entry['form_id'] );
128
+		if ( $entry ) {
129
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
130 130
 		}
131 131
 
132 132
 		return $form;
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
 
193 193
 			$has_transaction_data = \GV\Utils::get( $entry, $meta, false );
194 194
 
195
-			if( ! empty( $has_transaction_data ) ) {
195
+			if ( ! empty( $has_transaction_data ) ) {
196 196
 				break;
197 197
 			}
198 198
 		}
199 199
 
200
-		return (bool) $has_transaction_data;
200
+		return (bool)$has_transaction_data;
201 201
 	}
202 202
 
203 203
 	/**
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 
236 236
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
237 237
 
238
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
238
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
239 239
 
240 240
 		return $result;
241 241
 	}
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
 	 *
253 253
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
254 254
 	 */
255
-	public static function get_forms(  $active = true, $trash = false ) {
255
+	public static function get_forms( $active = true, $trash = false ) {
256 256
 		$forms = array();
257 257
 		if ( class_exists( 'GFAPI' ) ) {
258
-			if( 'any' === $active ) {
258
+			if ( 'any' === $active ) {
259 259
 				$active_forms = GFAPI::get_forms( true, $trash );
260 260
 				$inactive_forms = GFAPI::get_forms( false, $trash );
261 261
 				$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -286,9 +286,9 @@  discard block
 block discarded – undo
286 286
 		$has_post_fields = false;
287 287
 
288 288
 		if ( $form ) {
289
-			foreach ( $form['fields'] as $field ) {
290
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
291
-					$fields["{$field['id']}"] = array(
289
+			foreach ( $form[ 'fields' ] as $field ) {
290
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
291
+					$fields[ "{$field[ 'id' ]}" ] = array(
292 292
 						'label' => \GV\Utils::get( $field, 'label' ),
293 293
 						'parent' => null,
294 294
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -297,10 +297,10 @@  discard block
 block discarded – undo
297 297
 					);
298 298
 				}
299 299
 
300
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
301
-					foreach ( $field['inputs'] as $input ) {
300
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
301
+					foreach ( $field[ 'inputs' ] as $input ) {
302 302
 
303
-						if( ! empty( $input['isHidden'] ) ) {
303
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
304 304
 							continue;
305 305
 						}
306 306
 
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
308 308
                          * @hack
309 309
                          * In case of email/email confirmation, the input for email has the same id as the parent field
310 310
                          */
311
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
311
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
312 312
                             continue;
313 313
                         }
314
-						$fields["{$input['id']}"] = array(
314
+						$fields[ "{$input[ 'id' ]}" ] = array(
315 315
 							'label' => \GV\Utils::get( $input, 'label' ),
316 316
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
317 317
 							'parent' => $field,
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 				}
324 324
 
325 325
 
326
-				if( GFCommon::is_product_field( $field['type'] ) ){
326
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
327 327
 					$has_product_fields = true;
328 328
 				}
329 329
 
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 		 * @since 1.7
338 338
 		 */
339 339
 		if ( $has_post_fields ) {
340
-			$fields['post_id'] = array(
340
+			$fields[ 'post_id' ] = array(
341 341
 				'label' => __( 'Post ID', 'gravityview' ),
342 342
 				'type' => 'post_id',
343 343
 			);
@@ -350,11 +350,11 @@  discard block
 block discarded – undo
350 350
 			foreach ( $payment_fields as $payment_field ) {
351 351
 
352 352
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
353
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
353
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
354 354
 					continue;
355 355
 				}
356 356
 
357
-				$fields["{$payment_field->name}"] = array(
357
+				$fields[ "{$payment_field->name}" ] = array(
358 358
 					'label' => $payment_field->label,
359 359
 					'desc' => $payment_field->description,
360 360
 					'type' => $payment_field->name,
@@ -386,9 +386,9 @@  discard block
 block discarded – undo
386 386
 
387 387
 		$fields = array();
388 388
 
389
-		foreach ( $extra_fields as $key => $field ){
390
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
391
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
389
+		foreach ( $extra_fields as $key => $field ) {
390
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
391
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
392 392
 			}
393 393
 		}
394 394
 
@@ -428,33 +428,33 @@  discard block
 block discarded – undo
428 428
 			'search_criteria' => null,
429 429
 			'sorting' => null,
430 430
 			'paging' => null,
431
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
431
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
432 432
 			'context_view_id' => null,
433 433
 		);
434 434
 
435 435
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
436 436
 
437
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
438
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
437
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
438
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
439 439
 
440 440
 				if ( ! is_array( $filter ) ) {
441 441
 					continue;
442 442
 				}
443 443
 
444 444
 				// By default, we want searches to be wildcard for each field.
445
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
445
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
446 446
 
447 447
 				/**
448 448
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
449 449
 				 * @param string $operator Existing search operator
450 450
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
451 451
 				 */
452
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
452
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
453 453
 			}
454 454
 
455 455
 			// don't send just the [mode] without any field filter.
456
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
457
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
456
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
457
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
458 458
 			}
459 459
 
460 460
 		}
@@ -465,33 +465,33 @@  discard block
 block discarded – undo
465 465
 		 * Prepare date formats to be in Gravity Forms DB format;
466 466
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
467 467
 		 */
468
-		foreach ( array('start_date', 'end_date' ) as $key ) {
468
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
469 469
 
470
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
470
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
471 471
 
472 472
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
473
-				$date = date_create( $criteria['search_criteria'][ $key ] );
473
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
474 474
 
475 475
 				if ( $date ) {
476 476
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
477
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
477
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
478 478
 				} else {
479
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
479
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
480 480
 
481 481
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
482
-					unset( $criteria['search_criteria'][ $key ] );
482
+					unset( $criteria[ 'search_criteria' ][ $key ] );
483 483
 				}
484 484
 			}
485 485
 		}
486 486
 
487
-		if ( empty( $criteria['context_view_id'] ) ) {
487
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
488 488
 			// Calculate the context view id and send it to the advanced filter
489 489
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
490
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
490
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
491 491
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
492
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
492
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
493 493
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
494
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
494
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
495 495
 			}
496 496
 		}
497 497
 
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 		 * @param array $form_ids Forms to search
502 502
 		 * @param int $view_id ID of the view being used to search
503 503
 		 */
504
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
504
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
505 505
 
506 506
 		return (array)$criteria;
507 507
 	}
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 		/** Reduce # of database calls */
532 532
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
533 533
 
534
-		if ( ! empty( $criteria['cache'] ) ) {
534
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
535 535
 
536 536
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
537 537
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 
540 540
 				// Still update the total count when using cached results
541 541
 				if ( ! is_null( $total ) ) {
542
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
542
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
543 543
 				}
544 544
 
545 545
 				$return = $entries;
@@ -560,9 +560,9 @@  discard block
 block discarded – undo
560 560
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
561 561
 
562 562
 			// No entries returned from gravityview_before_get_entries
563
-			if( is_null( $entries ) ) {
563
+			if ( is_null( $entries ) ) {
564 564
 
565
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
565
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
566 566
 
567 567
 				if ( is_wp_error( $entries ) ) {
568 568
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -573,7 +573,7 @@  discard block
 block discarded – undo
573 573
 				}
574 574
 			}
575 575
 
576
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
576
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
577 577
 
578 578
 				// Cache results
579 579
 				$Cache->set( $entries, 'entries' );
@@ -680,12 +680,12 @@  discard block
 block discarded – undo
680 680
 		 */
681 681
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
682 682
 
683
-		if( $check_entry_display ) {
683
+		if ( $check_entry_display ) {
684 684
 			// Is the entry allowed
685 685
 			$entry = self::check_entry_display( $entry );
686 686
 		}
687 687
 
688
-		if( is_wp_error( $entry ) ) {
688
+		if ( is_wp_error( $entry ) ) {
689 689
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
690 690
 			return false;
691 691
 		}
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 	 */
714 714
 	public static function matches_operation( $val1, $val2, $operation ) {
715 715
 
716
-		$json_function = function_exists('wp_json_encode') ? 'wp_json_encode' : 'json_encode';
716
+		$json_function = function_exists( 'wp_json_encode' ) ? 'wp_json_encode' : 'json_encode';
717 717
 
718 718
 		// Only process strings
719 719
 		$val1 = ! is_string( $val1 ) ? $json_function( $val1 ) : $val1;
@@ -721,12 +721,12 @@  discard block
 block discarded – undo
721 721
 
722 722
 		$value = false;
723 723
 
724
-		if( 'context' === $val1 ) {
724
+		if ( 'context' === $val1 ) {
725 725
 
726 726
 			$matching_contexts = array( $val2 );
727 727
 
728 728
 			// We allow for non-standard contexts.
729
-			switch( $val2 ) {
729
+			switch ( $val2 ) {
730 730
 				// Check for either single or edit
731 731
 				case 'singular':
732 732
 					$matching_contexts = array( 'single', 'edit' );
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 				$json_val_1 = json_decode( $val1, true );
770 770
 				$json_val_2 = json_decode( $val2, true );
771 771
 
772
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
772
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
773 773
 
774 774
 					$json_in = false;
775 775
 					$json_val_1 = $json_val_1 ? $json_val_1 : array( $val1 );
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
 						foreach ( $json_val_2 as $item_2 ) {
781 781
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
782 782
 
783
-							if( $json_in ) {
783
+							if ( $json_in ) {
784 784
 								break 2;
785 785
 							}
786 786
 						}
@@ -828,62 +828,62 @@  discard block
 block discarded – undo
828 828
 	public static function check_entry_display( $entry ) {
829 829
 
830 830
 		if ( ! $entry || is_wp_error( $entry ) ) {
831
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
831
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
832 832
 		}
833 833
 
834
-		if ( empty( $entry['form_id'] ) ) {
834
+		if ( empty( $entry[ 'form_id' ] ) ) {
835 835
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
836 836
 		}
837 837
 
838 838
 		$criteria = self::calculate_get_entries_criteria();
839 839
 
840
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
840
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
841 841
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No search criteria found:', array( 'data' => $criteria ) );
842 842
 			return $entry;
843 843
 		}
844 844
 
845 845
 		// Make sure the current View is connected to the same form as the Entry
846
-		if( ! empty( $criteria['context_view_id'] ) ) {
847
-			$context_view_id = intval( $criteria['context_view_id'] );
846
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
847
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
848 848
 			$context_form_id = gravityview_get_form_id( $context_view_id );
849
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
850
-				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
849
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
850
+				return new WP_Error( 'view_id_not_match', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
851 851
 			}
852 852
 		}
853 853
 
854
-		$search_criteria = $criteria['search_criteria'];
854
+		$search_criteria = $criteria[ 'search_criteria' ];
855 855
 
856 856
 		// check entry status
857
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
858
-			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
857
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
858
+			return new WP_Error( 'status_not_valid', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
859 859
 		}
860 860
 
861 861
 		// check entry date
862 862
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
863 863
 
864 864
 		// field_filters
865
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
865
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
866 866
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved! No field filters criteria found:', array( 'data' => $search_criteria ) );
867 867
 			return $entry;
868 868
 		}
869 869
 
870
-		$filters = $search_criteria['field_filters'];
870
+		$filters = $search_criteria[ 'field_filters' ];
871 871
 
872
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
872
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
873 873
 
874 874
 		// Prevent the mode from being processed below
875
-		unset( $filters['mode'] );
875
+		unset( $filters[ 'mode' ] );
876 876
 
877
-		$form = self::get_form( $entry['form_id'] );
877
+		$form = self::get_form( $entry[ 'form_id' ] );
878 878
 
879 879
 		foreach ( $filters as $filter ) {
880 880
 
881
-			if ( ! isset( $filter['key'] ) ) {
881
+			if ( ! isset( $filter[ 'key' ] ) ) {
882 882
 				gravityview()->log->debug( '[apply_filters_to_entry] Filter key not set: {filter}', array( 'filter' => $filter ) );
883 883
 				continue;
884 884
 			}
885 885
 
886
-			$k = $filter['key'];
886
+			$k = $filter[ 'key' ];
887 887
 
888 888
 			$field = self::get_field( $form, $k );
889 889
 
@@ -891,14 +891,14 @@  discard block
 block discarded – undo
891 891
 				$field_value = isset( $entry[ $k ] ) ? $entry[ $k ] : null;
892 892
 				$field = $k;
893 893
 			} else {
894
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
894
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
895 895
 				 // If it's a complex field, then fetch the input's value, if exists at the current key. Otherwise, let GF handle it
896 896
 				$field_value = ( is_array( $field_value ) && isset( $field_value[ $k ] ) ) ? \GV\Utils::get( $field_value, $k ) : $field_value;
897 897
 			}
898 898
 
899
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
899
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
900 900
 
901
-			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
901
+			$is_value_match = GravityView_GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
902 902
 
903 903
 			// Any match is all we need to know
904 904
 			if ( $is_value_match && 'any' === $mode ) {
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 
908 908
 			// Any failed match is a total fail
909 909
 			if ( ! $is_value_match && 'all' === $mode ) {
910
-				return new WP_Error('failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
910
+				return new WP_Error( 'failed_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed a criterium for ALL mode', $filter );
911 911
 			}
912 912
 		}
913 913
 
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
 			gravityview()->log->debug( '[apply_filters_to_entry] Entry approved: all conditions were met' );
918 918
 			return $entry;
919 919
 		} else {
920
-			return new WP_Error('failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
920
+			return new WP_Error( 'failed_any_criteria', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
921 921
 		}
922 922
 
923 923
 	}
@@ -958,18 +958,18 @@  discard block
 block discarded – undo
958 958
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
959 959
 		 * @see GFCommon::format_date() for original code
960 960
 		 */
961
-		$date_gmt_time   = mysql2date( 'G', $date_string );
961
+		$date_gmt_time = mysql2date( 'G', $date_string );
962 962
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
963 963
 
964
-		$format  = \GV\Utils::get( $atts, 'format' );
965
-		$is_human  = ! empty( $atts['human'] );
966
-		$is_diff  = ! empty( $atts['diff'] );
967
-		$is_raw = ! empty( $atts['raw'] );
968
-		$is_timestamp = ! empty( $atts['timestamp'] );
969
-		$include_time = ! empty( $atts['time'] );
964
+		$format = \GV\Utils::get( $atts, 'format' );
965
+		$is_human = ! empty( $atts[ 'human' ] );
966
+		$is_diff = ! empty( $atts[ 'diff' ] );
967
+		$is_raw = ! empty( $atts[ 'raw' ] );
968
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
969
+		$include_time = ! empty( $atts[ 'time' ] );
970 970
 
971 971
 		// If we're using time diff, we want to have a different default format
972
-		if( empty( $format ) ) {
972
+		if ( empty( $format ) ) {
973 973
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
974 974
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
975 975
 		}
@@ -977,7 +977,7 @@  discard block
 block discarded – undo
977 977
 		// If raw was specified, don't modify the stored value
978 978
 		if ( $is_raw ) {
979 979
 			$formatted_date = $date_string;
980
-		} elseif( $is_timestamp ) {
980
+		} elseif ( $is_timestamp ) {
981 981
 			$formatted_date = $date_local_timestamp;
982 982
 		} elseif ( $is_diff ) {
983 983
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1011,7 +1011,7 @@  discard block
 block discarded – undo
1011 1011
 
1012 1012
 		$label = \GV\Utils::get( $field, 'label' );
1013 1013
 
1014
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1014
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1015 1015
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1016 1016
 		}
1017 1017
 
@@ -1039,7 +1039,7 @@  discard block
 block discarded – undo
1039 1039
 			$form = GFAPI::get_form( $form );
1040 1040
 		}
1041 1041
 
1042
-		if ( class_exists( 'GFFormsModel' ) ){
1042
+		if ( class_exists( 'GFFormsModel' ) ) {
1043 1043
 			return GFFormsModel::get_field( $form, $field_id );
1044 1044
 		} else {
1045 1045
 			return null;
@@ -1086,19 +1086,19 @@  discard block
 block discarded – undo
1086 1086
 			$shortcodes = array();
1087 1087
 
1088 1088
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1089
-			if ( empty( $matches ) ){
1089
+			if ( empty( $matches ) ) {
1090 1090
 				return false;
1091 1091
 			}
1092 1092
 
1093 1093
 			foreach ( $matches as $shortcode ) {
1094
-				if ( $tag === $shortcode[2] ) {
1094
+				if ( $tag === $shortcode[ 2 ] ) {
1095 1095
 
1096 1096
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1097
-					$shortcodes[] = $shortcode;
1097
+					$shortcodes[ ] = $shortcode;
1098 1098
 
1099
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1100
-					foreach( $results as $result ) {
1101
-						$shortcodes[] = $result;
1099
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1100
+					foreach ( $results as $result ) {
1101
+						$shortcodes[ ] = $result;
1102 1102
 					}
1103 1103
 				}
1104 1104
 			}
@@ -1130,7 +1130,7 @@  discard block
 block discarded – undo
1130 1130
 			'post_type'      => 'gravityview',
1131 1131
 			'posts_per_page' => 100,
1132 1132
 			'meta_key'       => '_gravityview_form_id',
1133
-			'meta_value'     => (int) $form_id,
1133
+			'meta_value'     => (int)$form_id,
1134 1134
 		);
1135 1135
 		$args     = wp_parse_args( $args, $defaults );
1136 1136
 		$views    = get_posts( $args );
@@ -1140,13 +1140,13 @@  discard block
 block discarded – undo
1140 1140
 		$joined_forms = array();
1141 1141
 		foreach ( $views_with_joins as $view ) {
1142 1142
 			$data = unserialize( $view->meta_value );
1143
-			if ( ! empty( $data[0][2] ) && (int) $data[0][2] === (int) $form_id ) {
1144
-				$joined_forms[] = $view->post_id;
1143
+			if ( ! empty( $data[ 0 ][ 2 ] ) && (int)$data[ 0 ][ 2 ] === (int)$form_id ) {
1144
+				$joined_forms[ ] = $view->post_id;
1145 1145
 			}
1146 1146
 		}
1147 1147
 
1148 1148
 		if ( $joined_forms ) {
1149
-			$args  = array(
1149
+			$args = array(
1150 1150
 				'post_type'      => 'gravityview',
1151 1151
 				'posts_per_page' => 100,
1152 1152
 				'post__in'       => $joined_forms,
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 
1305 1305
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1306 1306
 
1307
-		if( $json_decode ) {
1307
+		if ( $json_decode ) {
1308 1308
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1309 1309
 		}
1310 1310
 
@@ -1320,7 +1320,7 @@  discard block
 block discarded – undo
1320 1320
 	 * @return string         html
1321 1321
 	 */
1322 1322
 	public static function get_sortable_fields( $formid, $current = '' ) {
1323
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
1323
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
1324 1324
 
1325 1325
 		if ( empty( $formid ) ) {
1326 1326
 			return $output;
@@ -1333,11 +1333,11 @@  discard block
 block discarded – undo
1333 1333
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1334 1334
 
1335 1335
 			foreach ( $fields as $id => $field ) {
1336
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1336
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1337 1337
 					continue;
1338 1338
 				}
1339 1339
 
1340
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1340
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1341 1341
 			}
1342 1342
 		}
1343 1343
 
@@ -1372,9 +1372,9 @@  discard block
 block discarded – undo
1372 1372
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1373 1373
 
1374 1374
 		// TODO: Convert to using array_filter
1375
-		foreach( $fields as $id => $field ) {
1375
+		foreach ( $fields as $id => $field ) {
1376 1376
 
1377
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1377
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1378 1378
 				unset( $fields[ $id ] );
1379 1379
 			}
1380 1380
 		}
@@ -1415,14 +1415,14 @@  discard block
 block discarded – undo
1415 1415
 	 * @param  int|array  $field field key or field array
1416 1416
 	 * @return boolean
1417 1417
 	 */
1418
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1418
+	public static function is_field_numeric( $form = null, $field = '' ) {
1419 1419
 
1420 1420
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1421 1421
 			$form = self::get_form( $form );
1422 1422
 		}
1423 1423
 
1424 1424
 		// If entry meta, it's a string. Otherwise, numeric
1425
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1425
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1426 1426
 			$type = $field;
1427 1427
 		} else {
1428 1428
 			$type = self::get_field_type( $form, $field );
@@ -1436,9 +1436,9 @@  discard block
 block discarded – undo
1436 1436
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1437 1437
 
1438 1438
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1439
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1440
-			if( true === $gv_field->is_numeric ) {
1441
-				$numeric_types[] = $gv_field->is_numeric;
1439
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1440
+			if ( true === $gv_field->is_numeric ) {
1441
+				$numeric_types[ ] = $gv_field->is_numeric;
1442 1442
 			}
1443 1443
 		}
1444 1444
 
@@ -1588,18 +1588,18 @@  discard block
 block discarded – undo
1588 1588
 		$final_atts = array_filter( $final_atts );
1589 1589
 
1590 1590
 		// If the href wasn't passed as an attribute, use the value passed to the function
1591
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1592
-			$final_atts['href'] = $href;
1591
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1592
+			$final_atts[ 'href' ] = $href;
1593 1593
 		}
1594 1594
 
1595
-		$final_atts['href'] = esc_url_raw( $href );
1595
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1596 1596
 
1597 1597
 		/**
1598 1598
 		 * Fix potential security issue with target=_blank
1599 1599
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1600 1600
 		 */
1601
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1602
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1601
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1602
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1603 1603
 		}
1604 1604
 
1605 1605
 		// Sort the attributes alphabetically, to help testing
@@ -1611,7 +1611,7 @@  discard block
 block discarded – undo
1611 1611
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1612 1612
 		}
1613 1613
 
1614
-		if( '' !== $output ) {
1614
+		if ( '' !== $output ) {
1615 1615
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1616 1616
 		}
1617 1617
 
@@ -1638,7 +1638,7 @@  discard block
 block discarded – undo
1638 1638
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1639 1639
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1640 1640
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1641
-				$merged[] = $value;
1641
+				$merged[ ] = $value;
1642 1642
 			} else {
1643 1643
 				$merged[ $key ] = $value;
1644 1644
 			}
@@ -1671,7 +1671,7 @@  discard block
 block discarded – undo
1671 1671
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1672 1672
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1673 1673
 		 */
1674
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1674
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1675 1675
 
1676 1676
 		return get_users( $get_users_settings );
1677 1677
 	}
@@ -1691,11 +1691,11 @@  discard block
 block discarded – undo
1691 1691
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1692 1692
 
1693 1693
     	// If $cap is defined, only show notice if user has capability
1694
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1694
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1695 1695
     		return '';
1696 1696
 	    }
1697 1697
 
1698
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1698
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1699 1699
     }
1700 1700
 
1701 1701
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-template-legacy-override.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 		$additional = array();
99 99
 
100 100
 		// form-19-table-body.php
101
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
101
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
102 102
 
103 103
 		// view-3-table-body.php
104
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
104
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
105 105
 
106 106
 		global $post;
107 107
 		if ( $post ) {
108 108
 			// page-19-table-body.php
109
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
109
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
110 110
 		}
111 111
 
112 112
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		ob_start();
131 131
 
132 132
 		$request = new Mock_Request();
133
-		$request->returns['is_view'] = $this->view;
133
+		$request->returns[ 'is_view' ] = $this->view;
134 134
 
135 135
 		/**
136 136
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@  discard block
 block discarded – undo
144 144
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
145 145
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
146 146
 			if ( is_array( $wp_filter[ $hook ] ) ) {
147
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
148
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
147
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
148
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
149 149
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
150
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
150
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
151 151
 						}
152 152
 					}
153 153
 				}
154 154
 			} else {
155
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
155
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
156 156
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
157
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
157
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
158 158
 					}
159 159
 				}
160 160
 			}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		 */
166 166
 		if ( $this->entry ) {
167 167
 
168
-			$request->returns['is_entry'] = $this->entry;
168
+			$request->returns[ 'is_entry' ] = $this->entry;
169 169
 
170 170
 			global $post;
171 171
 
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
 					'fields' => $this->view->fields->by_visible(),
210 210
 					'in_the_loop' => true,
211 211
 				), empty( $parameters ) ? array() : array(
212
-					'paging' => $parameters['paging'],
213
-					'sorting' => $parameters['sorting'],
212
+					'paging' => $parameters[ 'paging' ],
213
+					'sorting' => $parameters[ 'sorting' ],
214 214
 				), $post ? array(
215 215
 					'post' => $post,
216 216
 				) : array() ) );
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		);
101 101
 
102 102
 		if ( ! empty( $action ) ) {
103
-			$settings['edd_action'] = esc_attr( $action );
103
+			$settings[ 'edd_action' ] = esc_attr( $action );
104 104
 		}
105 105
 
106 106
 		return array_map( 'urlencode', $settings );
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 			'format' => 'json',
157 157
 		) );
158 158
 
159
-		if ( $is_ajax && empty( $data['license'] ) ) {
159
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
160 160
 			die( -1 );
161 161
 		}
162 162
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
 			$json = json_encode( $license_data );
186 186
 
187
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
187
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
188 188
 
189 189
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
190 190
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			// most likely a mistake.
198 198
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
199 199
 
200
-				if ( ! empty( $data['field_id'] ) ) {
200
+				if ( ! empty( $data[ 'field_id' ] ) ) {
201 201
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
202 202
 				}
203 203
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		if ( empty( $license_data ) ) {
225 225
 			$message = '';
226 226
 		} else {
227
-			if( ! empty( $license_data->error ) ) {
227
+			if ( ! empty( $license_data->error ) ) {
228 228
 				$class = 'error';
229 229
 				$string_key = $license_data->error;
230 230
 			} else { $class = $license_data->license;
@@ -250,17 +250,17 @@  discard block
 block discarded – undo
250 250
 	 */
251 251
 	public function license_details( $response = array() ) {
252 252
 
253
-		$response = (array) $response;
253
+		$response = (array)$response;
254 254
 
255 255
 		$return = '';
256 256
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
257 257
 
258
-		if ( ! empty( $response['license_key'] ) ) {
258
+		if ( ! empty( $response[ 'license_key' ] ) ) {
259 259
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
260 260
 
261 261
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
262
-				$return .= $this->strings( $response['license'], $response );
263
-			} elseif ( ! empty( $response['license_name'] ) ) {
262
+				$return .= $this->strings( $response[ 'license' ], $response );
263
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
264 264
 				$response_keys = array(
265 265
 					'license_name'   => '',
266 266
 					'license_limit'  => '',
@@ -274,19 +274,19 @@  discard block
 block discarded – undo
274 274
 				// Make sure all the keys are set
275 275
 				$response = wp_parse_args( $response, $response_keys );
276 276
 
277
-				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
278
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
277
+				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
278
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
279 279
 				$details    = array(
280
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
281
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
282
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
283
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
284
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
280
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
281
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
282
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
283
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
284
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
285 285
 				);
286 286
 
287
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
288
-					unset( $details['upgrade'] );
289
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
287
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
288
+					unset( $details[ 'upgrade' ] );
289
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
290 290
 				}
291 291
 
292 292
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -312,20 +312,20 @@  discard block
 block discarded – undo
312 312
 		if ( ! empty( $upgrades ) ) {
313 313
 
314 314
 			$locale_parts = explode( '_', get_locale() );
315
-			$is_english = ( 'en' === $locale_parts[0] );
315
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
316 316
 
317 317
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
318 318
 			$output .= '<ul class="ul-disc">';
319 319
 
320 320
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
321
-				$upgrade = (object) $upgrade;
321
+				$upgrade = (object)$upgrade;
322 322
 
323 323
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
324 324
 
325 325
 				if ( $is_english && isset( $upgrade->description ) ) {
326 326
 					$message = esc_html( $upgrade->description );
327 327
 				} else {
328
-					switch( $upgrade->price_id ) {
328
+					switch ( $upgrade->price_id ) {
329 329
 						// Interstellar
330 330
 						case 1:
331 331
 						default:
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
384 384
 			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
385 385
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
386
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
386
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
387 387
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
388 388
 
389 389
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 
407 407
 		if ( ! empty( $license_data->renewal_url ) ) {
408 408
 			$renew_license_url = $license_data->renewal_url;
409
-		} elseif( ! empty( $license_data->license_key ) ) {
409
+		} elseif ( ! empty( $license_data->license_key ) ) {
410 410
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
411 411
 		} else {
412 412
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @return array|\WP_Error
424 424
 	 */
425 425
 	private function _license_get_remote_response( $data, $license = '' ) {
426
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
426
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
427 427
 
428 428
 		$url = add_query_arg( $api_params, self::url );
429 429
 
@@ -463,9 +463,9 @@  discard block
 block discarded – undo
463 463
 	private function license_call_update_settings( $license_data, $data ) {
464 464
 		$settings = array();
465 465
 
466
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
467
-		$settings['license_key_status'] = $license_data->license;
468
-		$settings['license_key_response'] = (array)$license_data;
466
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
467
+		$settings[ 'license_key_status' ] = $license_data->license;
468
+		$settings[ 'license_key_response' ] = (array)$license_data;
469 469
 
470 470
 		$this->settings->set( $settings );
471 471
 	}
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 
481 481
 		if ( ! empty( $key ) ) {
482 482
 			$response = $this->settings->get( 'license_key_response' );
483
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
483
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
484 484
 		} else {
485 485
 			$response = array();
486 486
 		}
@@ -522,11 +522,11 @@  discard block
 block discarded – undo
522 522
 
523 523
 		$submit = '<div class="gv-edd-button-wrapper">';
524 524
 		foreach ( $fields as $field ) {
525
-			$field['type'] = 'button';
526
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
527
-			$field['style'] = 'margin-left: 10px;';
528
-			if( $disabled_attribute ) {
529
-				$field['disabled'] = $disabled_attribute;
525
+			$field[ 'type' ] = 'button';
526
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
527
+			$field[ 'style' ] = 'margin-left: 10px;';
528
+			if ( $disabled_attribute ) {
529
+				$field[ 'disabled' ] = $disabled_attribute;
530 530
 			}
531 531
 			$submit .= $this->settings->as_html( $field, $echo );
532 532
 		}
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
 				    'url'        => home_url(),
606 606
 				    'site_data'  => $this->get_site_data(),
607 607
 			    ),
608
-			));
608
+			) );
609 609
 
610 610
 			// make sure the response came back okay
611 611
 			if ( is_wp_error( $response ) ) {
@@ -636,45 +636,45 @@  discard block
 block discarded – undo
636 636
 		$theme_data = wp_get_theme();
637 637
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
638 638
 
639
-		$data['gv_version']  = Plugin::$version;
640
-		$data['php_version']  = phpversion();
641
-		$data['wp_version']   = get_bloginfo( 'version' );
642
-		$data['gf_version']  = \GFForms::$version;
643
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
-		$data['multisite']    = is_multisite();
645
-		$data['theme']        = $theme;
646
-		$data['url']          = home_url();
647
-		$data['license_key']  = $this->settings->get( 'license_key' );
648
-		$data['beta']         = $this->settings->get( 'beta' );
639
+		$data[ 'gv_version' ]  = Plugin::$version;
640
+		$data[ 'php_version' ]  = phpversion();
641
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
642
+		$data[ 'gf_version' ]  = \GFForms::$version;
643
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
644
+		$data[ 'multisite' ]    = is_multisite();
645
+		$data[ 'theme' ]        = $theme;
646
+		$data[ 'url' ]          = home_url();
647
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
648
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
649 649
 
650 650
 		// View Data
651 651
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
652 652
 
653
-		$data['view_count'] = null;
654
-		$data['view_first'] = null;
655
-		$data['view_latest'] = null;
653
+		$data[ 'view_count' ] = null;
654
+		$data[ 'view_first' ] = null;
655
+		$data[ 'view_latest' ] = null;
656 656
 
657 657
 		if ( $gravityview_posts->publish ) {
658
-			$data['view_count'] = $gravityview_posts->publish;
658
+			$data[ 'view_count' ] = $gravityview_posts->publish;
659 659
 
660 660
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
661 661
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
662 662
 
663 663
 			if ( $first = array_shift( $first ) ) {
664
-				$data['view_first'] = $first->post_date;
664
+				$data[ 'view_first' ] = $first->post_date;
665 665
 			}
666 666
 			if ( $latest = array_pop( $latest ) ) {
667
-				$data['view_latest'] = $latest->post_date;
667
+				$data[ 'view_latest' ] = $latest->post_date;
668 668
 			}
669 669
 		}
670 670
 
671 671
 		// Form counts
672 672
 		if ( class_exists( 'GFFormsModel' ) ) {
673 673
 			$form_data = \GFFormsModel::get_form_count();
674
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
675
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
676
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
677
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
674
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
675
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
676
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
677
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
678 678
 		}
679 679
 
680 680
 		// Retrieve current plugin information
@@ -682,13 +682,13 @@  discard block
 block discarded – undo
682 682
 			include ABSPATH . '/wp-admin/includes/plugin.php';
683 683
 		}
684 684
 
685
-		$data['integrations']     = self::get_related_plugins_and_extensions();
686
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
687
-		$data['inactive_plugins'] = array();
688
-		$data['locale']           = get_locale();
685
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
686
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
687
+		$data[ 'inactive_plugins' ] = array();
688
+		$data[ 'locale' ]           = get_locale();
689 689
 
690 690
 		// Validate request on the GV server
691
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
691
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
692 692
 
693 693
 		return $data;
694 694
 	}
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 
719 719
 				$plugin_data = get_plugin_data( $active_plugin );
720 720
 
721
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
721
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
722 722
 			}
723 723
 
724 724
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.