Completed
Pull Request — develop (#1620)
by Zack
15:37
created
future/includes/class-gv-widget.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
154 154
 
155 155
 		if ( $enable_custom_class ) {
156
-			$settings['custom_class'] = array(
156
+			$settings[ 'custom_class' ] = array(
157 157
 				'type'       => 'text',
158 158
 				'label'      => __( 'Custom CSS Class:', 'gravityview' ),
159 159
 				'desc'       => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -206,8 +206,8 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	public static function get_default_widget_areas() {
208 208
 		$default_areas = array(
209
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
210
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
209
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
210
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
211 211
 		);
212 212
 
213 213
 		/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 		}
239 239
 
240 240
 		$widgets[ $this->get_widget_id() ] = array(
241
-			'label' => $this->widget_label ,
241
+			'label' => $this->widget_label,
242 242
 			'description' => $this->widget_description,
243 243
 			'subtitle' => $this->widget_subtitle,
244 244
 			'icon' => $this->icon,
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 */
261 261
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
262 262
 		if ( $this->get_widget_id() === $widget ) {
263
-			if( $settings = $this->get_settings() ) {
263
+			if ( $settings = $this->get_settings() ) {
264 264
 				$options = array_merge( $options, $settings );
265 265
 			}
266 266
 		}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			return;
315 315
 		}
316 316
 
317
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
317
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
318 318
 	}
319 319
 
320 320
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		);
103 103
 
104 104
 		if ( ! empty( $action ) ) {
105
-			$settings['edd_action'] = esc_attr( $action );
105
+			$settings[ 'edd_action' ] = esc_attr( $action );
106 106
 		}
107 107
 
108 108
 		return array_map( 'urlencode', $settings );
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'format' => 'json',
159 159
 		) );
160 160
 
161
-		if ( $is_ajax && empty( $data['license'] ) ) {
161
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
162 162
 			die( -1 );
163 163
 		}
164 164
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 			$json = json_encode( $license_data );
188 188
 
189
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
189
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
190 190
 
191 191
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
192 192
 
193
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
193
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
194 194
 
195 195
 			if ( $is_check_action_button ) {
196 196
 				delete_transient( self::status_transient_key );
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			// most likely a mistake.
202 202
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
203 203
 
204
-				if ( ! empty( $data['field_id'] ) ) {
204
+				if ( ! empty( $data[ 'field_id' ] ) ) {
205 205
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
206 206
 				}
207 207
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$class   = 'hide';
230 230
 			$message = '';
231 231
 		} else {
232
-			if( ! empty( $license_data->error ) ) {
232
+			if ( ! empty( $license_data->error ) ) {
233 233
 				$class = 'error';
234 234
 				$string_key = $license_data->error;
235 235
 			} else { $class = $license_data->license;
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function license_details( $response = array() ) {
255 255
 
256
-		$response = (array) $response;
256
+		$response = (array)$response;
257 257
 
258 258
 		$return  = '';
259 259
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
260 260
 
261
-		if ( ! empty( $response['license_key'] ) ) {
261
+		if ( ! empty( $response[ 'license_key' ] ) ) {
262 262
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
263 263
 
264 264
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
267 267
 				}
268 268
 
269 269
 
270
-				$return .= $this->strings( $response['license'], $response );
271
-			} elseif ( ! empty( $response['license_name'] ) ) {
270
+				$return .= $this->strings( $response[ 'license' ], $response );
271
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
272 272
 				$response_keys = array(
273 273
 					'license_name'   => '',
274 274
 					'license_limit'  => '',
@@ -283,22 +283,22 @@  discard block
 block discarded – undo
283 283
 				$response = wp_parse_args( $response, $response_keys );
284 284
 
285 285
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
286
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
287
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" 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' ) );
288
-				$local_text       = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
286
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
287
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" 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' ) );
288
+				$local_text       = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
290 290
 
291 291
 
292 292
 				$details = array(
293
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
294
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
293
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
294
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
297 297
 				);
298 298
 
299
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
300
-					unset( $details['upgrade'] );
301
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
299
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
300
+					unset( $details[ 'upgrade' ] );
301
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
302 302
 				}
303 303
 
304 304
 				$return .= '<ul>';
@@ -330,20 +330,20 @@  discard block
 block discarded – undo
330 330
 		if ( ! empty( $upgrades ) ) {
331 331
 
332 332
 			$locale_parts = explode( '_', get_locale() );
333
-			$is_english = ( 'en' === $locale_parts[0] );
333
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
334 334
 
335 335
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
336 336
 			$output .= '<ul>';
337 337
 
338 338
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
339
-				$upgrade = (object) $upgrade;
339
+				$upgrade = (object)$upgrade;
340 340
 
341 341
 				$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 ) );
342 342
 
343 343
 				if ( $is_english && isset( $upgrade->description ) ) {
344 344
 					$message = esc_html( $upgrade->description );
345 345
 				} else {
346
-					switch( $upgrade->price_id ) {
346
+					switch ( $upgrade->price_id ) {
347 347
 						// Interstellar
348 348
 						case 1:
349 349
 						default:
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
423 423
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
424 424
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
425
-			'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>' ),
425
+			'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>' ),
426 426
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
427 427
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
428 428
 			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 		if ( ! empty( $license_data->renewal_url ) ) {
452 452
 			$renew_license_url = $license_data->renewal_url;
453
-		} elseif( ! empty( $license_data->license_key ) ) {
453
+		} elseif ( ! empty( $license_data->license_key ) ) {
454 454
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
455 455
 		} else {
456 456
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 	 * @return array|\WP_Error
468 468
 	 */
469 469
 	private function _license_get_remote_response( $data, $license = '' ) {
470
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
470
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
471 471
 
472 472
 		$url = add_query_arg( $api_params, self::url );
473 473
 
@@ -507,9 +507,9 @@  discard block
 block discarded – undo
507 507
 	private function license_call_update_settings( $license_data, $data ) {
508 508
 		$settings = array();
509 509
 
510
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
511
-		$settings['license_key_status'] = $license_data->license;
512
-		$settings['license_key_response'] = (array)$license_data;
510
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
511
+		$settings[ 'license_key_status' ] = $license_data->license;
512
+		$settings[ 'license_key_response' ] = (array)$license_data;
513 513
 
514 514
 		$this->settings->set( $settings );
515 515
 	}
@@ -529,9 +529,9 @@  discard block
 block discarded – undo
529 529
 		$status = trim( $this->settings->get( 'license_key_status' ) );
530 530
 		$key = trim( $this->settings->get( 'license_key' ) );
531 531
 
532
-		if (  !empty( $key ) ) {
532
+		if ( ! empty( $key ) ) {
533 533
 			$response = $this->settings->get( 'license_key_response' );
534
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
534
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
535 535
 		} else {
536 536
 			$response = array();
537 537
 		}
@@ -574,11 +574,11 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$submit = '<div class="gv-edd-button-wrapper">';
576 576
 		foreach ( $fields as $field ) {
577
-			$field['type'] = 'button';
578
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
579
-			$field['style'] = 'margin-left: 10px;';
580
-			if( $disabled_attribute ) {
581
-				$field['disabled'] = $disabled_attribute;
577
+			$field[ 'type' ] = 'button';
578
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
579
+			$field[ 'style' ] = 'margin-left: 10px;';
580
+			if ( $disabled_attribute ) {
581
+				$field[ 'disabled' ] = $disabled_attribute;
582 582
 			}
583 583
 			$submit .= $this->settings->as_html( $field, $echo );
584 584
 		}
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
657 657
 				    'url'        => home_url(),
658 658
 				    'site_data'  => $this->get_site_data(),
659 659
 			    ),
660
-			));
660
+			) );
661 661
 
662 662
 			// make sure the response came back okay
663 663
 			if ( is_wp_error( $response ) ) {
@@ -687,45 +687,45 @@  discard block
 block discarded – undo
687 687
 		$theme_data = wp_get_theme();
688 688
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
689 689
 
690
-		$data['gv_version']  = Plugin::$version;
691
-		$data['php_version']  = phpversion();
692
-		$data['wp_version']   = get_bloginfo( 'version' );
693
-		$data['gf_version']  = \GFForms::$version;
694
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
-		$data['multisite']    = is_multisite();
696
-		$data['theme']        = $theme;
697
-		$data['url']          = home_url();
698
-		$data['license_key']  = $this->settings->get( 'license_key' );
699
-		$data['beta']         = $this->settings->get( 'beta' );
690
+		$data[ 'gv_version' ]  = Plugin::$version;
691
+		$data[ 'php_version' ]  = phpversion();
692
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
693
+		$data[ 'gf_version' ]  = \GFForms::$version;
694
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
+		$data[ 'multisite' ]    = is_multisite();
696
+		$data[ 'theme' ]        = $theme;
697
+		$data[ 'url' ]          = home_url();
698
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
699
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
700 700
 
701 701
 		// View Data
702 702
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
703 703
 
704
-		$data['view_count'] = null;
705
-		$data['view_first'] = null;
706
-		$data['view_latest'] = null;
704
+		$data[ 'view_count' ] = null;
705
+		$data[ 'view_first' ] = null;
706
+		$data[ 'view_latest' ] = null;
707 707
 
708 708
 		if ( $gravityview_posts->publish ) {
709
-			$data['view_count'] = $gravityview_posts->publish;
709
+			$data[ 'view_count' ] = $gravityview_posts->publish;
710 710
 
711 711
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
712 712
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
713 713
 
714 714
 			if ( $first = array_shift( $first ) ) {
715
-				$data['view_first'] = $first->post_date;
715
+				$data[ 'view_first' ] = $first->post_date;
716 716
 			}
717 717
 			if ( $latest = array_pop( $latest ) ) {
718
-				$data['view_latest'] = $latest->post_date;
718
+				$data[ 'view_latest' ] = $latest->post_date;
719 719
 			}
720 720
 		}
721 721
 
722 722
 		// Form counts
723 723
 		if ( class_exists( 'GFFormsModel' ) ) {
724 724
 			$form_data = \GFFormsModel::get_form_count();
725
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
726
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
727
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
728
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
725
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
726
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
727
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
728
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
729 729
 		}
730 730
 
731 731
 		// Retrieve current plugin information
@@ -733,13 +733,13 @@  discard block
 block discarded – undo
733 733
 			include ABSPATH . '/wp-admin/includes/plugin.php';
734 734
 		}
735 735
 
736
-		$data['integrations']     = self::get_related_plugins_and_extensions();
737
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
738
-		$data['inactive_plugins'] = array();
739
-		$data['locale']           = get_locale();
736
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
737
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
738
+		$data[ 'inactive_plugins' ] = array();
739
+		$data[ 'locale' ]           = get_locale();
740 740
 
741 741
 		// Validate request on the GV server
742
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
742
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
743 743
 
744 744
 		return $data;
745 745
 	}
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 
770 770
 				$plugin_data = get_plugin_data( $active_plugin );
771 771
 
772
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
772
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
773 773
 			}
774 774
 
775 775
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $groups = '' ) {
118 118
 
119
-		if( '' !== $groups ) {
119
+		if ( '' !== $groups ) {
120 120
 			$return_fields = self::$_fields;
121 121
 
122
-			$groups = (array) $groups;
122
+			$groups = (array)$groups;
123 123
 
124 124
 			foreach ( $return_fields as $key => $field ) {
125
-				if( ! in_array( $field->group, $groups, true ) ) {
125
+				if ( ! in_array( $field->group, $groups, true ) ) {
126 126
 					unset( $return_fields[ $key ] );
127 127
 				}
128 128
 			}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-created-by.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
 	public function __construct() {
23 23
 		$this->label = esc_html__( 'Created By (User)', 'gravityview' );
24
-		$this->description = __('Details of the logged-in user who created the entry (if any).', 'gravityview');
24
+		$this->description = __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' );
25 25
 		$this->default_search_label = __( 'Submitted by:', 'gravityview' );
26 26
 		parent::__construct();
27 27
 	}
@@ -40,23 +40,23 @@  discard block
 block discarded – undo
40 40
 
41 41
 		$merge_tags = array(
42 42
 			array(
43
-				'label' => __('Entry Creator: Display Name', 'gravityview'),
43
+				'label' => __( 'Entry Creator: Display Name', 'gravityview' ),
44 44
 				'tag' => '{created_by:display_name}'
45 45
 			),
46 46
 			array(
47
-				'label' => __('Entry Creator: Email', 'gravityview'),
47
+				'label' => __( 'Entry Creator: Email', 'gravityview' ),
48 48
 				'tag' => '{created_by:user_email}'
49 49
 			),
50 50
 			array(
51
-				'label' => __('Entry Creator: Username', 'gravityview'),
51
+				'label' => __( 'Entry Creator: Username', 'gravityview' ),
52 52
 				'tag' => '{created_by:user_login}'
53 53
 			),
54 54
 			array(
55
-				'label' => __('Entry Creator: User ID', 'gravityview'),
55
+				'label' => __( 'Entry Creator: User ID', 'gravityview' ),
56 56
 				'tag' => '{created_by:ID}'
57 57
 			),
58 58
 			array(
59
-				'label' => __('Entry Creator: Roles', 'gravityview'),
59
+				'label' => __( 'Entry Creator: Roles', 'gravityview' ),
60 60
 				'tag' => '{created_by:roles}'
61 61
 			),
62 62
 		);
@@ -84,19 +84,19 @@  discard block
 block discarded – undo
84 84
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
85 85
 
86 86
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
87
-		if( empty( $matches ) || empty( $entry['created_by'] ) ) {
87
+		if ( empty( $matches ) || empty( $entry[ 'created_by' ] ) ) {
88 88
 			return $text;
89 89
 		}
90 90
 
91 91
 		// Get the creator of the entry
92
-		$entry_creator = new WP_User( $entry['created_by'] );
92
+		$entry_creator = new WP_User( $entry[ 'created_by' ] );
93 93
 
94 94
 		foreach ( $matches as $match ) {
95 95
 
96
-			$full_tag = $match[0];
97
-			$property = $match[1];
96
+			$full_tag = $match[ 0 ];
97
+			$property = $match[ 1 ];
98 98
 
99
-			switch( $property ) {
99
+			switch ( $property ) {
100 100
 				case '':
101 101
 					$value = $entry_creator->ID;
102 102
 					break;
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
122 122
 
123 123
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
124 124
 
125
-		if( 'edit' === $context ) {
125
+		if ( 'edit' === $context ) {
126 126
 			return $field_options;
127 127
 		}
128 128
 
129
-		$field_options['name_display'] = array(
129
+		$field_options[ 'name_display' ] = array(
130 130
 			'type' => 'select',
131 131
 			'label' => __( 'User Format', 'gravityview' ),
132 132
 			'desc' => __( 'How should the User information be displayed?', 'gravityview' ),
Please login to merge, or discard this patch.
includes/class-common.php 1 patch
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 
125 125
 		$form = false;
126 126
 
127
-		if( $entry ) {
128
-			$form = GFAPI::get_form( $entry['form_id'] );
127
+		if ( $entry ) {
128
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
129 129
 		}
130 130
 
131 131
 		return $form;
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			}
202 202
 		}
203 203
 
204
-		return (bool) $has_transaction_data;
204
+		return (bool)$has_transaction_data;
205 205
 	}
206 206
 
207 207
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
241 241
 
242
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
242
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
243 243
 
244 244
 		return $result;
245 245
 	}
@@ -259,13 +259,13 @@  discard block
 block discarded – undo
259 259
 	 *
260 260
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
261 261
 	 */
262
-	public static function get_forms(  $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
262
+	public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
263 263
 		$forms = array();
264 264
 		if ( ! class_exists( 'GFAPI' ) ) {
265 265
 			return array();
266 266
 		}
267 267
 
268
-		if( 'any' === $active ) {
268
+		if ( 'any' === $active ) {
269 269
 			$active_forms = GFAPI::get_forms( true, $trash );
270 270
 			$inactive_forms = GFAPI::get_forms( false, $trash );
271 271
 			$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
 		$has_post_fields = false;
298 298
 
299 299
 		if ( $form ) {
300
-			foreach ( $form['fields'] as $field ) {
301
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
302
-					$fields["{$field['id']}"] = array(
300
+			foreach ( $form[ 'fields' ] as $field ) {
301
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
302
+					$fields[ "{$field[ 'id' ]}" ] = array(
303 303
 						'label' => \GV\Utils::get( $field, 'label' ),
304 304
 						'parent' => null,
305 305
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -308,10 +308,10 @@  discard block
 block discarded – undo
308 308
 					);
309 309
 				}
310 310
 
311
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
312
-					foreach ( $field['inputs'] as $input ) {
311
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
312
+					foreach ( $field[ 'inputs' ] as $input ) {
313 313
 
314
-						if( ! empty( $input['isHidden'] ) ) {
314
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
315 315
 							continue;
316 316
 						}
317 317
 
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
                          * @hack
320 320
                          * In case of email/email confirmation, the input for email has the same id as the parent field
321 321
                          */
322
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
322
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
323 323
                             continue;
324 324
                         }
325
-						$fields["{$input['id']}"] = array(
325
+						$fields[ "{$input[ 'id' ]}" ] = array(
326 326
 							'label' => \GV\Utils::get( $input, 'label' ),
327 327
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
328 328
 							'parent' => $field,
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 				}
335 335
 
336 336
 
337
-				if( GFCommon::is_product_field( $field['type'] ) ){
337
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
338 338
 					$has_product_fields = true;
339 339
 				}
340 340
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 		 * @since 1.7
349 349
 		 */
350 350
 		if ( $has_post_fields ) {
351
-			$fields['post_id'] = array(
351
+			$fields[ 'post_id' ] = array(
352 352
 				'label' => __( 'Post ID', 'gravityview' ),
353 353
 				'type' => 'post_id',
354 354
 			);
@@ -361,11 +361,11 @@  discard block
 block discarded – undo
361 361
 			foreach ( $payment_fields as $payment_field ) {
362 362
 
363 363
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
364
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
364
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
365 365
 					continue;
366 366
 				}
367 367
 
368
-				$fields["{$payment_field->name}"] = array(
368
+				$fields[ "{$payment_field->name}" ] = array(
369 369
 					'label' => $payment_field->label,
370 370
 					'desc' => $payment_field->description,
371 371
 					'type' => $payment_field->name,
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
397 397
 
398 398
 		$fields = array();
399 399
 
400
-		foreach ( $extra_fields as $key => $field ){
401
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
402
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
400
+		foreach ( $extra_fields as $key => $field ) {
401
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
402
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
403 403
 			}
404 404
 		}
405 405
 
@@ -439,33 +439,33 @@  discard block
 block discarded – undo
439 439
 			'search_criteria' => null,
440 440
 			'sorting' => null,
441 441
 			'paging' => null,
442
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
442
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
443 443
 			'context_view_id' => null,
444 444
 		);
445 445
 
446 446
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
447 447
 
448
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
449
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
448
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
449
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
450 450
 
451 451
 				if ( ! is_array( $filter ) ) {
452 452
 					continue;
453 453
 				}
454 454
 
455 455
 				// By default, we want searches to be wildcard for each field.
456
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
456
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
457 457
 
458 458
 				/**
459 459
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
460 460
 				 * @param string $operator Existing search operator
461 461
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
462 462
 				 */
463
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
463
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
464 464
 			}
465 465
 
466 466
 			// don't send just the [mode] without any field filter.
467
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
468
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
467
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
468
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
469 469
 			}
470 470
 
471 471
 		}
@@ -476,33 +476,33 @@  discard block
 block discarded – undo
476 476
 		 * Prepare date formats to be in Gravity Forms DB format;
477 477
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
478 478
 		 */
479
-		foreach ( array('start_date', 'end_date' ) as $key ) {
479
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
480 480
 
481
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
481
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
482 482
 
483 483
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
484
-				$date = date_create( $criteria['search_criteria'][ $key ] );
484
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
485 485
 
486 486
 				if ( $date ) {
487 487
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
488
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
488
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
489 489
 				} else {
490
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
490
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
491 491
 
492 492
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
493
-					unset( $criteria['search_criteria'][ $key ] );
493
+					unset( $criteria[ 'search_criteria' ][ $key ] );
494 494
 				}
495 495
 			}
496 496
 		}
497 497
 
498
-		if ( empty( $criteria['context_view_id'] ) ) {
498
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
499 499
 			// Calculate the context view id and send it to the advanced filter
500 500
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
501
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
501
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
502 502
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
503
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
503
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
504 504
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
505
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
505
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
506 506
 			}
507 507
 		}
508 508
 
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 		 * @param array $form_ids Forms to search
513 513
 		 * @param int $view_id ID of the view being used to search
514 514
 		 */
515
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
515
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
516 516
 
517 517
 		return (array)$criteria;
518 518
 	}
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		/** Reduce # of database calls */
547 547
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
548 548
 
549
-		if ( ! empty( $criteria['cache'] ) ) {
549
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
550 550
 
551 551
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
552 552
 
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 
555 555
 				// Still update the total count when using cached results
556 556
 				if ( ! is_null( $total ) ) {
557
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
557
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
558 558
 				}
559 559
 
560 560
 				$return = $entries;
@@ -576,9 +576,9 @@  discard block
 block discarded – undo
576 576
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
577 577
 
578 578
 			// No entries returned from gravityview_before_get_entries
579
-			if( is_null( $entries ) ) {
579
+			if ( is_null( $entries ) ) {
580 580
 
581
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
581
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
582 582
 
583 583
 				if ( is_wp_error( $entries ) ) {
584 584
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
 				}
590 590
 			}
591 591
 
592
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
592
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
593 593
 
594 594
 				// Cache results
595 595
 				$Cache->set( $entries, 'entries' );
@@ -702,18 +702,18 @@  discard block
 block discarded – undo
702 702
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
703 703
 
704 704
 		// Is the entry allowed
705
-		if( $check_entry_display ) {
705
+		if ( $check_entry_display ) {
706 706
 
707 707
 			$gvid = \GV\Utils::_GET( 'gvid' );
708 708
 
709
-			if( $gvid ) {
709
+			if ( $gvid ) {
710 710
 				$view = \GV\View::by_id( $gvid );
711 711
 			}
712 712
 
713 713
 			$entry = self::check_entry_display( $entry, $view );
714 714
 		}
715 715
 
716
-		if( is_wp_error( $entry ) ) {
716
+		if ( is_wp_error( $entry ) ) {
717 717
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
718 718
 			return false;
719 719
 		}
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
 
748 748
 		$value = false;
749 749
 
750
-		if( 'context' === $val1 ) {
750
+		if ( 'context' === $val1 ) {
751 751
 
752 752
 			$matching_contexts = array( $val2 );
753 753
 
754 754
 			// We allow for non-standard contexts.
755
-			switch( $val2 ) {
755
+			switch ( $val2 ) {
756 756
 				// Check for either single or edit
757 757
 				case 'singular':
758 758
 					$matching_contexts = array( 'single', 'edit' );
@@ -795,18 +795,18 @@  discard block
 block discarded – undo
795 795
 				$json_val_1 = json_decode( $val1, true );
796 796
 				$json_val_2 = json_decode( $val2, true );
797 797
 
798
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
798
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
799 799
 
800 800
 					$json_in = false;
801
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
802
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
801
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
802
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
803 803
 
804 804
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
805 805
 					foreach ( $json_val_1 as $item_1 ) {
806 806
 						foreach ( $json_val_2 as $item_2 ) {
807 807
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
808 808
 
809
-							if( $json_in ) {
809
+							if ( $json_in ) {
810 810
 								break 2;
811 811
 							}
812 812
 						}
@@ -857,10 +857,10 @@  discard block
 block discarded – undo
857 857
 	public static function check_entry_display( $entry, $view = null ) {
858 858
 
859 859
 		if ( ! $entry || is_wp_error( $entry ) ) {
860
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
860
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
861 861
 		}
862 862
 
863
-		if ( empty( $entry['form_id'] ) ) {
863
+		if ( empty( $entry[ 'form_id' ] ) ) {
864 864
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
865 865
 		}
866 866
 
@@ -875,19 +875,19 @@  discard block
 block discarded – undo
875 875
 
876 876
 		$_gvid = \GV\Utils::_GET( 'gvid' );
877 877
 
878
-		if ( $_gvid && $view->ID !== (int) $_gvid ) {
878
+		if ( $_gvid && $view->ID !== (int)$_gvid ) {
879 879
 			return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID );
880 880
 		}
881 881
 
882 882
 		$view_form_id = $view->form->ID;
883 883
 
884 884
 		if ( $view->joins ) {
885
-			if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
-				$view_form_id = $entry['form_id'];
885
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
886
+				$view_form_id = $entry[ 'form_id' ];
887 887
 			}
888 888
 		}
889 889
 
890
-		if ( (int) $view_form_id !== (int) $entry['form_id'] ) {
890
+		if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) {
891 891
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
892 892
 		}
893 893
 
@@ -895,13 +895,13 @@  discard block
 block discarded – undo
895 895
 		 * Check whether the entry is in the entries subset by running a modified query.
896 896
 		 */
897 897
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
898
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
898
+			$_tmp_query = new \GF_Query( $view_form_id, array(
899 899
 				'field_filters' => array(
900 900
 					'mode' => 'all',
901 901
 					array(
902 902
 						'key' => 'id',
903 903
 						'operation' => 'is',
904
-						'value' => $entry['id']
904
+						'value' => $entry[ 'id' ]
905 905
 					)
906 906
 				)
907 907
 			) );
@@ -911,14 +911,14 @@  discard block
 block discarded – undo
911 911
 			/** @type \GF_Query $query */
912 912
 			$query_parts      = $query->_introspect();
913 913
 
914
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
914
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
915 915
 
916 916
 		}, 10, 3 );
917 917
 
918 918
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
919 919
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
920 920
 
921
-			$criteria['paging'] = array(
921
+			$criteria[ 'paging' ] = array(
922 922
 				'offset' => 0,
923 923
 				'page_size' => 25
924 924
 			);
@@ -937,20 +937,20 @@  discard block
 block discarded – undo
937 937
 		}
938 938
 
939 939
 		// This entry is on a View with joins
940
-		if ( $entries[0]->is_multi() ) {
940
+		if ( $entries[ 0 ]->is_multi() ) {
941 941
 
942 942
 			$multi_entry_ids = array();
943 943
 
944
-			foreach ( $entries[0]->entries as $multi_entry ) {
945
-				$multi_entry_ids[] = (int) $multi_entry->ID;
944
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
945
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
946 946
 			}
947 947
 
948
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
948
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
949 949
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
950 950
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
951 951
 			}
952 952
 
953
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
953
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
954 954
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
955 955
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
956 956
 		}
@@ -995,18 +995,18 @@  discard block
 block discarded – undo
995 995
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
996 996
 		 * @see GFCommon::format_date() for original code
997 997
 		 */
998
-		$date_gmt_time   = mysql2date( 'G', $date_string );
998
+		$date_gmt_time = mysql2date( 'G', $date_string );
999 999
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
1000 1000
 
1001
-		$format  = \GV\Utils::get( $atts, 'format' );
1002
-		$is_human  = ! empty( $atts['human'] );
1003
-		$is_diff  = ! empty( $atts['diff'] );
1004
-		$is_raw = ! empty( $atts['raw'] );
1005
-		$is_timestamp = ! empty( $atts['timestamp'] );
1006
-		$include_time = ! empty( $atts['time'] );
1001
+		$format = \GV\Utils::get( $atts, 'format' );
1002
+		$is_human = ! empty( $atts[ 'human' ] );
1003
+		$is_diff = ! empty( $atts[ 'diff' ] );
1004
+		$is_raw = ! empty( $atts[ 'raw' ] );
1005
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
1006
+		$include_time = ! empty( $atts[ 'time' ] );
1007 1007
 
1008 1008
 		// If we're using time diff, we want to have a different default format
1009
-		if( empty( $format ) ) {
1009
+		if ( empty( $format ) ) {
1010 1010
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
1011 1011
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
1012 1012
 		}
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
 		// If raw was specified, don't modify the stored value
1015 1015
 		if ( $is_raw ) {
1016 1016
 			$formatted_date = $date_string;
1017
-		} elseif( $is_timestamp ) {
1017
+		} elseif ( $is_timestamp ) {
1018 1018
 			$formatted_date = $date_local_timestamp;
1019 1019
 		} elseif ( $is_diff ) {
1020 1020
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 
1048 1048
 		$label = \GV\Utils::get( $field, 'label' );
1049 1049
 
1050
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
1050
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
1051 1051
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
1052 1052
 		}
1053 1053
 
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
 			$form = GFAPI::get_form( $form );
1075 1075
 		}
1076 1076
 
1077
-		if ( class_exists( 'GFFormsModel' ) ){
1077
+		if ( class_exists( 'GFFormsModel' ) ) {
1078 1078
 			return GFFormsModel::get_field( $form, $field_id );
1079 1079
 		} else {
1080 1080
 			return null;
@@ -1121,19 +1121,19 @@  discard block
 block discarded – undo
1121 1121
 			$shortcodes = array();
1122 1122
 
1123 1123
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
1124
-			if ( empty( $matches ) ){
1124
+			if ( empty( $matches ) ) {
1125 1125
 				return false;
1126 1126
 			}
1127 1127
 
1128 1128
 			foreach ( $matches as $shortcode ) {
1129
-				if ( $tag === $shortcode[2] ) {
1129
+				if ( $tag === $shortcode[ 2 ] ) {
1130 1130
 
1131 1131
 					// Changed this to $shortcode instead of true so we get the parsed atts.
1132
-					$shortcodes[] = $shortcode;
1132
+					$shortcodes[ ] = $shortcode;
1133 1133
 
1134
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
1135
-					foreach( $results as $result ) {
1136
-						$shortcodes[] = $result;
1134
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
1135
+					foreach ( $results as $result ) {
1136
+						$shortcodes[ ] = $result;
1137 1137
 					}
1138 1138
 				}
1139 1139
 			}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			'post_type'      => 'gravityview',
1166 1166
 			'posts_per_page' => 100,
1167 1167
 			'meta_key'       => '_gravityview_form_id',
1168
-			'meta_value'     => (int) $form_id,
1168
+			'meta_value'     => (int)$form_id,
1169 1169
 		);
1170 1170
 		$args     = wp_parse_args( $args, $defaults );
1171 1171
 		$views    = get_posts( $args );
@@ -1177,21 +1177,21 @@  discard block
 block discarded – undo
1177 1177
 
1178 1178
 			$data = unserialize( $view->meta_value );
1179 1179
 
1180
-			if( ! $data || ! is_array( $data ) ) {
1180
+			if ( ! $data || ! is_array( $data ) ) {
1181 1181
 				continue;
1182 1182
 			}
1183 1183
 
1184 1184
 			foreach ( $data as $datum ) {
1185
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
1186
-					$joined_forms[] = $view->post_id;
1185
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
1186
+					$joined_forms[ ] = $view->post_id;
1187 1187
 				}
1188 1188
 			}
1189 1189
 		}
1190 1190
 
1191 1191
 		if ( $joined_forms ) {
1192
-			$joined_args  = array(
1192
+			$joined_args = array(
1193 1193
 				'post_type'      => 'gravityview',
1194
-				'posts_per_page' => $args['posts_per_page'],
1194
+				'posts_per_page' => $args[ 'posts_per_page' ],
1195 1195
 				'post__in'       => $joined_forms,
1196 1196
 			);
1197 1197
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
1347 1347
 
1348 1348
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
1349 1349
 
1350
-		if( $json_decode ) {
1350
+		if ( $json_decode ) {
1351 1351
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
1352 1352
 		}
1353 1353
 
@@ -1362,7 +1362,7 @@  discard block
 block discarded – undo
1362 1362
 	 * @return string         html
1363 1363
 	 */
1364 1364
 	public static function get_sortable_fields( $formid, $current = '' ) {
1365
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) .'</option>';
1365
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default (Entry ID)', 'gravityview' ) . '</option>';
1366 1366
 
1367 1367
 		if ( empty( $formid ) ) {
1368 1368
 			return $output;
@@ -1375,11 +1375,11 @@  discard block
 block discarded – undo
1375 1375
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1376 1376
 
1377 1377
 			foreach ( $fields as $id => $field ) {
1378
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1378
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1379 1379
 					continue;
1380 1380
 				}
1381 1381
 
1382
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1382
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1383 1383
 			}
1384 1384
 		}
1385 1385
 
@@ -1418,16 +1418,16 @@  discard block
 block discarded – undo
1418 1418
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1419 1419
 
1420 1420
 		// TODO: Convert to using array_filter
1421
-		foreach( $fields as $id => $field ) {
1421
+		foreach ( $fields as $id => $field ) {
1422 1422
 
1423
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1423
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1424 1424
 				unset( $fields[ $id ] );
1425 1425
 			}
1426 1426
 
1427 1427
 			/**
1428 1428
 			 * Merge date and time subfields.
1429 1429
 			 */
1430
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
1430
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
1431 1431
 				$fields[ intval( $id ) ] = array(
1432 1432
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
1433 1433
 					'parent' => null,
@@ -1477,14 +1477,14 @@  discard block
 block discarded – undo
1477 1477
 	 * @param  int|array  $field field key or field array
1478 1478
 	 * @return boolean
1479 1479
 	 */
1480
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1480
+	public static function is_field_numeric( $form = null, $field = '' ) {
1481 1481
 
1482 1482
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1483 1483
 			$form = self::get_form( $form );
1484 1484
 		}
1485 1485
 
1486 1486
 		// If entry meta, it's a string. Otherwise, numeric
1487
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1487
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1488 1488
 			$type = $field;
1489 1489
 		} else {
1490 1490
 			$type = self::get_field_type( $form, $field );
@@ -1498,9 +1498,9 @@  discard block
 block discarded – undo
1498 1498
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1499 1499
 
1500 1500
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1501
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1502
-			if( true === $gv_field->is_numeric ) {
1503
-				$numeric_types[] = $gv_field->is_numeric;
1501
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1502
+			if ( true === $gv_field->is_numeric ) {
1503
+				$numeric_types[ ] = $gv_field->is_numeric;
1504 1504
 			}
1505 1505
 		}
1506 1506
 
@@ -1651,18 +1651,18 @@  discard block
 block discarded – undo
1651 1651
 		$final_atts = array_filter( $final_atts );
1652 1652
 
1653 1653
 		// If the href wasn't passed as an attribute, use the value passed to the function
1654
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1655
-			$final_atts['href'] = $href;
1654
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1655
+			$final_atts[ 'href' ] = $href;
1656 1656
 		}
1657 1657
 
1658
-		$final_atts['href'] = esc_url_raw( $href );
1658
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1659 1659
 
1660 1660
 		/**
1661 1661
 		 * Fix potential security issue with target=_blank
1662 1662
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
1663 1663
 		 */
1664
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1664
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
1665
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
1666 1666
 		}
1667 1667
 
1668 1668
 		// Sort the attributes alphabetically, to help testing
@@ -1674,7 +1674,7 @@  discard block
 block discarded – undo
1674 1674
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1675 1675
 		}
1676 1676
 
1677
-		if( '' !== $output ) {
1677
+		if ( '' !== $output ) {
1678 1678
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1679 1679
 		}
1680 1680
 
@@ -1701,7 +1701,7 @@  discard block
 block discarded – undo
1701 1701
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1702 1702
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1703 1703
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
1704
-				$merged[] = $value;
1704
+				$merged[ ] = $value;
1705 1705
 			} else {
1706 1706
 				$merged[ $key ] = $value;
1707 1707
 			}
@@ -1734,7 +1734,7 @@  discard block
 block discarded – undo
1734 1734
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1735 1735
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1736 1736
 		 */
1737
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1737
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1738 1738
 
1739 1739
 		return get_users( $get_users_settings );
1740 1740
 	}
@@ -1754,11 +1754,11 @@  discard block
 block discarded – undo
1754 1754
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
1755 1755
 
1756 1756
     	// If $cap is defined, only show notice if user has capability
1757
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1757
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
1758 1758
     		return '';
1759 1759
 	    }
1760 1760
 
1761
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1761
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1762 1762
     }
1763 1763
 
1764 1764
 	/**
Please login to merge, or discard this patch.
includes/admin/field-types/type_textarea.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 		?>
10 10
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11 11
 
12
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
12
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13 13
 			echo $this->get_tooltip() . $this->get_field_desc();
14 14
 		?><div>
15 15
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 	}
20 20
 
21 21
 	function render_input( $override_input = null ) {
22
-		if( isset( $override_input ) ) {
22
+		if ( isset( $override_input ) ) {
23 23
 			echo $override_input;
24 24
 			return;
25 25
 		}
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
28 28
 
29 29
 		$show_mt = $this->show_merge_tags();
30 30
 
31
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
31
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
32 32
             $class .= ' merge-tag-support mt-position-right ';
33 33
 
34
-            if( empty( $this->field['show_all_fields'] ) ) {
34
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35 35
             	$class .= ' mt-hide_all_fields ';
36 36
             }
37 37
         }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 #		$this->codemirror( $this->get_field_id() );
50 50
 
51 51
 		?>
52
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo absint( $rows ); ?>"><?php echo esc_textarea(  $this->value ); ?></textarea>
52
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo absint( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
53 53
        	<?php
54 54
 	}
55 55
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         ?>
67 67
 
68 68
         <script>
69
-	        wp.codeEditor.initialize( "<?php echo $field_id;?>", {});
69
+	        wp.codeEditor.initialize( "<?php echo $field_id; ?>", {});
70 70
         </script>
71 71
     <?php
72 72
     }
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-entry-link.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,25 +32,25 @@
 block discarded – undo
32 32
 
33 33
 	public function __construct() {
34 34
 		$this->label = esc_html__( 'Link to Single Entry', 'gravityview' );
35
-		$this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
35
+		$this->description = esc_html__( 'A dedicated link to the single entry with customizable text.', 'gravityview' );
36 36
 		parent::__construct();
37 37
 	}
38 38
 
39 39
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
40 40
 
41 41
 		// Always a link!
42
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
42
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
43 43
 
44
-		if( 'edit' === $context ) {
44
+		if ( 'edit' === $context ) {
45 45
 			return $field_options;
46 46
 		}
47 47
 
48 48
 		$add_options = array();
49
-		$add_options['entry_link_text'] = array(
49
+		$add_options[ 'entry_link_text' ] = array(
50 50
 			'type' => 'text',
51 51
 			'label' => __( 'Link Text:', 'gravityview' ),
52 52
 			'desc' => NULL,
53
-			'value' => __('View Details', 'gravityview'),
53
+			'value' => __( 'View Details', 'gravityview' ),
54 54
 			'merge_tags' => true,
55 55
 		);
56 56
 
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +40 added lines, -43 removed lines patch added patch discarded remove patch
@@ -102,8 +102,7 @@  discard block
 block discarded – undo
102 102
 			$entries = $view->get_entries( gravityview()->request );
103 103
 		}
104 104
 
105
-		$page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ?
106
-			: ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
105
+		$page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
107 106
 
108 107
 		/** Set paging, count and unwrap the entries. */
109 108
 		$paging = array(
@@ -142,17 +141,17 @@  discard block
 block discarded – undo
142 141
  * @return null|string The value of a field in an entry.
143 142
  */
144 143
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
145
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
144
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
146 145
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
147 146
 		return null;
148 147
 	}
149 148
 
150
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
151
-		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) );
152
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
149
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
150
+		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) );
151
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
153 152
 	}
154 153
 
155
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
154
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
156 155
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
157 156
 		return null;
158 157
 	}
@@ -162,18 +161,18 @@  discard block
 block discarded – undo
162 161
 	 *
163 162
 	 * Fields with a numeric ID are Gravity Forms ones.
164 163
 	 */
165
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
164
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
166 165
 
167 166
 	/** Initialize the future field. */
168 167
 	switch ( $source ):
169 168
 		/** The Gravity Forms backend. */
170 169
 		case \GV\Source::BACKEND_GRAVITYFORMS:
171
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
170
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
172 171
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
173 172
 				return null;
174 173
 			}
175 174
 
176
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
175
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
177 176
 				return null;
178 177
 			}
179 178
 
@@ -181,7 +180,7 @@  discard block
 block discarded – undo
181 180
 
182 181
 		/** Our internal backend. */
183 182
 		case \GV\Source::BACKEND_INTERNAL:
184
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
183
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
185 184
 				return null;
186 185
 			}
187 186
 
@@ -215,13 +214,13 @@  discard block
 block discarded – undo
215 214
 
216 215
 	/** A bail condition. */
217 216
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
218
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
217
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
219 218
 
220
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
219
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
221 220
 
222 221
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
223
-			if ( ! empty( $field_settings['custom_label'] ) ) {
224
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
222
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
223
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
225 224
 			}
226 225
 
227 226
 			/**
@@ -247,19 +246,19 @@  discard block
 block discarded – undo
247 246
 
248 247
 	$label = '';
249 248
 
250
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
251
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
252
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
249
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
250
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
251
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
253 252
 			$form = $_form->form;
254 253
 		}
255 254
 	}
256 255
 
257
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
256
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
258 257
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
259 258
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
260 259
 	}
261 260
 
262
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
261
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
263 262
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
264 263
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
265 264
 	}
@@ -271,31 +270,31 @@  discard block
 block discarded – undo
271 270
 	 *
272 271
 	 * Fields with a numeric ID are Gravity Forms ones.
273 272
 	 */
274
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
273
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
275 274
 
276 275
 	/** Initialize the future field. */
277 276
 	switch ( $source ):
278 277
 		/** The Gravity Forms backend. */
279 278
 		case \GV\Source::BACKEND_GRAVITYFORMS:
280
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
279
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
281 280
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
282 281
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
283 282
 			}
284 283
 
285
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
286
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
284
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
285
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
287 286
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
288 287
 			}
289
-			if ( empty( $field_settings['show_label'] ) ) {
288
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
290 289
 				/** The label never wins... */
291
-				$field_settings['label'] = '';
290
+				$field_settings[ 'label' ] = '';
292 291
 			}
293 292
 
294 293
 			break;
295 294
 
296 295
 		/** Our internal backend. */
297 296
 		case \GV\Source::BACKEND_INTERNAL:
298
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
297
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
299 298
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
300 299
 			}
301 300
 			break;
@@ -307,8 +306,8 @@  discard block
 block discarded – undo
307 306
 			break;
308 307
 	endswitch;
309 308
 
310
-	if( $force_show_label ) {
311
-		$field_settings['show_label'] = '1';
309
+	if ( $force_show_label ) {
310
+		$field_settings[ 'show_label' ] = '1';
312 311
 	}
313 312
 
314 313
 	/** Add the field settings. */
@@ -444,7 +443,7 @@  discard block
 block discarded – undo
444 443
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
445 444
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
446 445
 			'\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(),
447
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
446
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
448 447
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
449 448
 		);
450 449
 	}
@@ -532,7 +531,7 @@  discard block
 block discarded – undo
532 531
 					break;
533 532
 				case 'wp_actions[loop_start]':
534 533
 					global $wp_actions;
535
-					$wp_actions['loop_start'] = $value;
534
+					$wp_actions[ 'loop_start' ] = $value;
536 535
 					break;
537 536
 				case 'wp_query::in_the_loop':
538 537
 					global $wp_query;
@@ -629,9 +628,7 @@  discard block
 block discarded – undo
629 628
 				case 'request':
630 629
 					self::thaw( array(
631 630
 						'\GravityView_View::context' => (
632
-							$value->is_entry() ? 'single' :
633
-							( $value->is_edit_entry() ? 'edit' :
634
-									( $value->is_view() ? 'directory': null )
631
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
635 632
 								)
636 633
 						),
637 634
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -685,14 +682,14 @@  discard block
 block discarded – undo
685 682
 		global $wp_query, $wp_actions;
686 683
 
687 684
 		$wp_query->in_the_loop = false;
688
-		$wp_actions['loop_start'] = 0;
685
+		$wp_actions[ 'loop_start' ] = 0;
689 686
 	}
690 687
 }
691 688
 
692 689
 
693 690
 /** Add some global fix for field capability discrepancies. */
694 691
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
695
-	if ( empty( $fields  ) ) {
692
+	if ( empty( $fields ) ) {
696 693
 		return $fields;
697 694
 	}
698 695
 
@@ -719,11 +716,11 @@  discard block
 block discarded – undo
719 716
 		}
720 717
 
721 718
 		foreach ( $_fields as $uid => &$_field ) {
722
-			if ( ! isset( $_field['only_loggedin'] ) ) {
719
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
723 720
 				continue;
724 721
 			}
725 722
 			/** If we do not require login, we don't require a cap. */
726
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
723
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
727 724
 		}
728 725
 	}
729 726
 	return $fields;
@@ -754,8 +751,8 @@  discard block
 block discarded – undo
754 751
 		}
755 752
 
756 753
 		foreach ( $_fields as $uid => &$_field ) {
757
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
758
-				$_field['form_id'] = $view->form->ID;
754
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
755
+				$_field[ 'form_id' ] = $view->form->ID;
759 756
 			}
760 757
 		}
761 758
 	}
@@ -769,13 +766,13 @@  discard block
 block discarded – undo
769 766
 	if ( class_exists( '\GravityView_frontend' ) ) {
770 767
 		global $wp_filter;
771 768
 
772
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
769
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
773 770
 			return;
774 771
 		}
775 772
 
776
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
773
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
777 774
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
778
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
775
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
779 776
 			}
780 777
 		}
781 778
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-collection-view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 			 * @deprecated
115 115
 			 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
116 116
 			 */
117
-			$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
117
+			$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
118 118
 
119 119
 			/** What about inside post meta values? */
120 120
 			foreach ( $meta_keys as $meta_key ) {
@@ -168,12 +168,12 @@  discard block
 block discarded – undo
168 168
 
169 169
 		/** Let's find us some [gravityview] shortcodes perhaps. */
170 170
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
171
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
171
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
172 172
 				continue;
173 173
 			}
174 174
 
175
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
176
-				$view = View::by_id( $shortcode->atts['id'] );
175
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
176
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
177 177
 				if ( ! $view ) {
178 178
 					continue;
179 179
 				}
Please login to merge, or discard this patch.