gravityview / GravityView

includes/class-gravityview-entry-approval-status.php

Spacing +5 added lines, -5 removed lines

@@ -114,16 +114,16 @@ 
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -249,8 +249,8 @@ 
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
-				if( 'key' === $attr_key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return \GV\Utils::get( $choice, $attr_key, false );

includes/class-gravityview-entry-approval-merge-tags.php

Spacing +24 added lines, -24 removed lines

@@ -77,7 +77,7 @@ 
 
 		$global_default = gravityview()->plugin->settings->get( 'public_entry_moderation', '0' );
 
-		$fields['restrictions']['fields'][] = array(
+		$fields[ 'restrictions' ][ 'fields' ][ ] = array(
 			'name'          => self::FORM_SETTINGS_KEY,
 			'type'          => 'radio',
 			'horizontal'    => true,
@@ -94,7 +94,7 @@ 
 					'value' => '0',
 				),
 			),
-			'default_value' => (string) $global_default,
+			'default_value' => (string)$global_default,
 		);
 
 		return $fields;
@@ -181,11 +181,11 @@ 
 
 		foreach ( $matches as $match ) {
 
-			$full_tag         = $match[0];
-			$action           = $match[1];
-			$expiration_value = ! empty( $match[2] ) ? (int) $match[2] : self::DEFAULT_EXPIRATION_VALUE;
-			$expiration_unit  = ! empty( $match[3] ) ? $match[3] : self::DEFAULT_EXPIRATION_UNIT;
-			$privacy          = isset( $match[4] ) ? $match[4] : 'private';
+			$full_tag         = $match[ 0 ];
+			$action           = $match[ 1 ];
+			$expiration_value = ! empty( $match[ 2 ] ) ? (int)$match[ 2 ] : self::DEFAULT_EXPIRATION_VALUE;
+			$expiration_unit  = ! empty( $match[ 3 ] ) ? $match[ 3 ] : self::DEFAULT_EXPIRATION_UNIT;
+			$privacy          = isset( $match[ 4 ] ) ? $match[ 4 ] : 'private';
 
 			switch ( $expiration_unit ) {
 				case 'd':
@@ -203,7 +203,7 @@ 
 					break;
 			}
 
-			if ( false === (bool) \GV\Utils::get( $form, self::FORM_SETTINGS_KEY, false ) ) {
+			if ( false === (bool)\GV\Utils::get( $form, self::FORM_SETTINGS_KEY, false ) ) {
 				$privacy = 'private';
 			}
 
@@ -242,7 +242,7 @@ 
 	 */
 	protected function get_token( $action = false, $expiration_timestamp = 0, $privacy = 'private', $entry = array() ) {
 
-		if ( ! $action || ! $entry['id'] ) {
+		if ( ! $action || ! $entry[ 'id' ] ) {
 			return false;
 		}
 
@@ -264,7 +264,7 @@ 
 		$expiration_seconds = $expiration_timestamp - time();
 
 		$scopes = array(
-			'entry_id'           => $entry['id'],
+			'entry_id'           => $entry[ 'id' ],
 			'approval_status'    => $approval_status,
 			'expiration_seconds' => $expiration_seconds,
 			'privacy'            => $privacy,
@@ -337,8 +337,8 @@ 
 			$query_args[ self::TOKEN_URL_ARG ] = $token;
 		}
 
-		if ( 'private' === $privacy && DAY_IN_SECONDS >= (int) $expiration_seconds ) {
-			$query_args['nonce'] = wp_create_nonce( self::TOKEN_URL_ARG );
+		if ( 'private' === $privacy && DAY_IN_SECONDS >= (int)$expiration_seconds ) {
+			$query_args[ 'nonce' ] = wp_create_nonce( self::TOKEN_URL_ARG );
 		}
 
 		return add_query_arg( $query_args, $base_url );
@@ -394,10 +394,10 @@ 
 			wp_die( sprintf( __( 'Entry moderation failed: %s', 'gravityview' ), $is_request_valid->get_error_message() ) );
 		}
 
-		$scopes = $token['scopes'];
+		$scopes = $token[ 'scopes' ];
 
-		$entry_id        = $scopes['entry_id'];
-		$approval_status = $scopes['approval_status'];
+		$entry_id        = $scopes[ 'entry_id' ];
+		$approval_status = $scopes[ 'approval_status' ];
 
 		$entry = GFAPI::get_entry( $entry_id );
 
@@ -407,9 +407,9 @@ 
 			wp_die( $entry->get_error_message() );
 		}
 
-		$form_id = $entry['form_id'];
+		$form_id = $entry[ 'form_id' ];
 
-		if ( 'private' === $scopes['privacy'] ) {
+		if ( 'private' === $scopes[ 'privacy' ] ) {
 			$return_url = admin_url( '/admin.php?page=gf_entries&s=' . $entry_id . '&field_id=entry_id&operator=is&id=' . $form_id );
 		} else {
 			$return_url = home_url( '/' );
@@ -434,7 +434,7 @@ 
 			exit;
 		}
 
-		if ( 'private' === $scopes['privacy'] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
+		if ( 'private' === $scopes[ 'privacy' ] && ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry_id ) ) {
 
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
 
@@ -457,20 +457,20 @@ 
 	 */
 	protected function is_request_valid( $token ) {
 
-		if ( 'private' === $token['scopes']['privacy'] && ! is_user_logged_in() ) {
+		if ( 'private' === $token[ 'scopes' ][ 'privacy' ] && ! is_user_logged_in() ) {
 			return new WP_Error( 'user_not_logged_in', __( 'You are not allowed to perform this operation.', 'gravityview' ) );
 		}
 
-		if ( $token['exp'] < time() ) {
+		if ( $token[ 'exp' ] < time() ) {
 			gravityview()->log->error( 'The entry moderation link expired.', array( 'data' => $is_valid_token ) );
 
 			return new WP_Error( 'link_expired', esc_html__( 'The link has expired.', 'gk-gravityview' ) );
 		}
 
 		// Since nonces are only valid for 24 hours, we only check the nonce if the token is valid for less than 24 hours.
-		if ( 'private' === $token['scopes']['privacy'] && DAY_IN_SECONDS >= $token['scopes']['expiration_seconds'] ) {
+		if ( 'private' === $token[ 'scopes' ][ 'privacy' ] && DAY_IN_SECONDS >= $token[ 'scopes' ][ 'expiration_seconds' ] ) {
 
-			if ( ! isset( $_REQUEST['nonce'] ) ) {
+			if ( ! isset( $_REQUEST[ 'nonce' ] ) ) {
 				gravityview()->log->error( 'Entry moderation failed: No nonce was set for entry approval.' );
 
 				return new WP_Error( 'missing_nonce', esc_html__( 'The link is invalid.', 'gk-gravityview' ) );
@@ -511,7 +511,7 @@ 
 			return;
 		}
 
-		$approval_label = GravityView_Entry_Approval_Status::get_label( (int) $approval_status );
+		$approval_label = GravityView_Entry_Approval_Status::get_label( (int)$approval_status );
 		$approval_label = mb_strtolower( $approval_label );
 
 		if ( 'success' === $result ) {
@@ -631,7 +631,7 @@ 
 		);
 
 		foreach ( $required_scopes as $required_scope ) {
-			if ( ! isset( $token['scopes'][ $required_scope ] ) ) {
+			if ( ! isset( $token[ 'scopes' ][ $required_scope ] ) ) {
 				return new WP_Error( 'approve_link_no_' . $required_scope . '_scope', esc_html__( 'The link is invalid.', 'gk-gravityview' ) );
 			}
 		}

future/includes/class-gv-settings-plugin.php

Spacing +12 added lines, -12 removed lines

@@ -30,13 +30,13 @@ 
 	 *
 	 * @var array
 	 */
-	private $_plugin_settings = [];
+	private $_plugin_settings = [ ];
 
 	public function __construct() {
 		// GravityKitFoundation may not yet be available when this class is instantiated, so let's temporarily use the Settings framework from Foundation that's included with GravityView and then possibly replace it with the latest version.
 		$this->_foundation_settings = SettingsFramework::get_instance();
 
-		add_action( 'gk/foundation/initialized', function () {
+		add_action( 'gk/foundation/initialized', function() {
 			$this->_foundation_settings = GravityKitFoundation::settings();
 		} );
 
@@ -132,12 +132,12 @@ 
 		}
 
 		if ( empty( $legacy_settings ) ) {
-			return [];
+			return [ ];
 		}
 
 		// Migrate legacy GravityView settings that are still part of GravityView.
 		$plugin_settings = [
-			'rest_api' => (int) Arr::get( $legacy_settings, 'rest_api' ),
+			'rest_api' => (int)Arr::get( $legacy_settings, 'rest_api' ),
 		];
 
 		$this->_foundation_settings->save_plugin_settings( self::SETTINGS_PLUGIN_ID, $plugin_settings );
@@ -153,12 +153,12 @@ 
 			$gk_settings = [
 				'support_email'    => Arr::get( $legacy_settings, 'support-email' ),
 				'support_port'     => Arr::get( $legacy_settings, 'support_port' ),
-				'powered_by'       => (int) Arr::get( $legacy_settings, 'powered_by' ),
+				'powered_by'       => (int)Arr::get( $legacy_settings, 'powered_by' ),
 				'affiliate_id'     => Arr::get( $legacy_settings, 'affiliate_id' ),
-				'beta'             => (int) Arr::get( $legacy_settings, 'beta' ),
+				'beta'             => (int)Arr::get( $legacy_settings, 'beta' ),
 				'support_email'    => Arr::get( $legacy_settings, 'support-email' ),
-				'support_port'     => (int) Arr::get( $legacy_settings, 'support_port' ),
-				'no_conflict_mode' => (int) Arr::get( $legacy_settings, 'no-conflict-mode' ),
+				'support_port'     => (int)Arr::get( $legacy_settings, 'support_port' ),
+				'no_conflict_mode' => (int)Arr::get( $legacy_settings, 'no-conflict-mode' ),
 			];
 
 			$this->_foundation_settings->save_plugin_settings( $gk_settings_id, $gk_settings );
@@ -239,7 +239,7 @@ 
 							'type'        => 'checkbox',
 							'title'       => esc_html__( 'REST API', 'gk-gravityview' ),
 							'description' => esc_html__( 'Enable View and Entry access via the REST API? Regular per-View restrictions apply (private, password protected, etc.).', 'gk-gravityview' ) . ' ' . esc_html__( 'If you are unsure, disable this setting.', 'gk-gravityview' ),
-							'value'       => $this->get( 'rest_api', $default_settings['rest_api'] ),
+							'value'       => $this->get( 'rest_api', $default_settings[ 'rest_api' ] ),
 						],
 					],
 				],
@@ -259,14 +259,14 @@ 
 									'{/link}' => '<span class="screen-reader-text"> ' . esc_html__( '(This link opens in a new window.)', 'gk-gravitycalendar' ) . '</span></a>',
 								)
 							),
-							'value'       => $this->get( 'public_entry_moderation', $default_settings['public_entry_moderation'] ),
+							'value'       => $this->get( 'public_entry_moderation', $default_settings[ 'public_entry_moderation' ] ),
 						],
 					],
 				],
 			],
 		];
 
-		return array_merge( (array) $plugins_data, [ self::SETTINGS_PLUGIN_ID => $settings ] );
+		return array_merge( (array)$plugins_data, [ self::SETTINGS_PLUGIN_ID => $settings ] );
 	}
 
 	/**
@@ -328,7 +328,7 @@ 
 	public function maybe_save_app_settings() {
 		if ( $this->is_save_postback() ) {
 			if ( ! \GVCommon::has_cap( 'gravityview_edit_settings' ) ) {
-				$_POST = []; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
+				$_POST = [ ]; // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
 				\GFCommon::add_error_message( __( 'You don\'t have the ability to edit plugin settings.', 'gk-gravityview' ) );
 
 				return;

includes/class-common.php

Spacing +115 added lines, -115 removed lines

@@ -144,8 +144,8 @@ 
 
 		$form = false;
 
-		if( $entry ) {
-			$form = GFAPI::get_form( $entry['form_id'] );
+		if ( $entry ) {
+			$form = GFAPI::get_form( $entry[ 'form_id' ] );
 		}
 
 		return $form;
@@ -221,7 +221,7 @@ 
 			}
 		}
 
-		return (bool) $has_transaction_data;
+		return (bool)$has_transaction_data;
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 
 		$results = GFAPI::get_entries( intval( $form_id ), $search_criteria, null, $paging );
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
 
 		return $result;
 	}
@@ -279,13 +279,13 @@ 
 	 *
 	 * @return array Empty array if GFAPI class isn't available or no forms. Otherwise, the array of Forms
 	 */
-	public static function get_forms(  $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
+	public static function get_forms( $active = true, $trash = false, $order_by = 'id', $order = 'ASC' ) {
 		$forms = array();
 		if ( ! class_exists( 'GFAPI' ) ) {
 			return array();
 		}
 
-		if( 'any' === $active ) {
+		if ( 'any' === $active ) {
 			$active_forms = GFAPI::get_forms( true, $trash );
 			$inactive_forms = GFAPI::get_forms( false, $trash );
 			$forms = array_merge( array_filter( $active_forms ), array_filter( $inactive_forms ) );
@@ -317,9 +317,9 @@ 
 		$has_post_fields = false;
 
 		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields["{$field['id']}"] = array(
+			foreach ( $form[ 'fields' ] as $field ) {
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
+					$fields[ "{$field[ 'id' ]}" ] = array(
 						'label' => \GV\Utils::get( $field, 'label' ),
 						'parent' => null,
 						'type' => \GV\Utils::get( $field, 'type' ),
@@ -328,10 +328,10 @@ 
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
+					foreach ( $field[ 'inputs' ] as $input ) {
 
-						if( ! empty( $input['isHidden'] ) ) {
+						if ( ! empty( $input[ 'isHidden' ] ) ) {
 							continue;
 						}
 
@@ -339,10 +339,10 @@ 
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-						if( 'email' === $field['type'] && false === strpos( $input['id'], '.' ) ) {
+						if ( 'email' === $field[ 'type' ] && false === strpos( $input[ 'id' ], '.' ) ) {
                             continue;
                         }
-						$fields["{$input['id']}"] = array(
+						$fields[ "{$input[ 'id' ]}" ] = array(
 							'label' => \GV\Utils::get( $input, 'label' ),
 							'customLabel' => \GV\Utils::get( $input, 'customLabel' ),
 							'parent' => $field,
@@ -354,7 +354,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -368,7 +368,7 @@ 
 		 * @since 1.7
 		 */
 		if ( $has_post_fields ) {
-			$fields['post_id'] = array(
+			$fields[ 'post_id' ] = array(
 				'label' => __( 'Post ID', 'gk-gravityview' ),
 				'type' => 'post_id',
 			);
@@ -381,11 +381,11 @@ 
 			foreach ( $payment_fields as $payment_field ) {
 
 				// Either the field exists ($fields['shipping']) or the form explicitly contains a `shipping` field with numeric key
-				if( isset( $fields["{$payment_field->name}"] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
+				if ( isset( $fields[ "{$payment_field->name}" ] ) || GFCommon::get_fields_by_type( $form, $payment_field->name ) ) {
 					continue;
 				}
 
-				$fields["{$payment_field->name}"] = array(
+				$fields[ "{$payment_field->name}" ] = array(
 					'label' => $payment_field->label,
 					'desc' => $payment_field->description,
 					'type' => $payment_field->name,
@@ -417,9 +417,9 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ( $extra_fields as $key => $field ) {
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
 			}
 		}
 
@@ -459,33 +459,33 @@ 
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? (bool) $passed_criteria['cache'] : true),
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? (bool)$passed_criteria[ 'cache' ] : true ),
 			'context_view_id' => null,
 		);
 
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) && is_array( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) && is_array( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
 
 				if ( ! is_array( $filter ) ) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
 			}
 
 			// don't send just the [mode] without any field filter.
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
 			}
 
 		}
@@ -496,33 +496,33 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
 
 				if ( $date ) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
 				} else {
-					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria['search_criteria'][ $key ] ) );
+					gravityview()->log->error( '{key} Date format not valid:', array( 'key' => $key, $criteria[ 'search_criteria' ][ $key ] ) );
 
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset( $criteria[ 'search_criteria' ][ $key ] );
 				}
 			}
 		}
 
-		if ( empty( $criteria['context_view_id'] ) ) {
+		if ( empty( $criteria[ 'context_view_id' ] ) ) {
 			// Calculate the context view id and send it to the advanced filter
 			if ( GravityView_frontend::getInstance()->getSingleEntry() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance() && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-				$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
+				$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
 			} else if ( 'delete' === GFForms::get( 'action' ) ) {
-				$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? intval( $_GET['view_id'] ) : null;
+				$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? intval( $_GET[ 'view_id' ] ) : null;
 			}
 		}
 
@@ -532,7 +532,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
 
 		return (array)$criteria;
 	}
@@ -566,7 +566,7 @@ 
 		/** Reduce # of database calls */
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
 
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
 
@@ -574,7 +574,7 @@ 
 
 				// Still update the total count when using cached results
 				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
 				}
 
 				$return = $entries;
@@ -596,9 +596,9 @@ 
 			$entries = apply_filters_ref_array( 'gravityview_before_get_entries', array( null, $criteria, $passed_criteria, &$total ) );
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if ( is_null( $entries ) ) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
 
 				if ( is_wp_error( $entries ) ) {
 					gravityview()->log->error( '{error}', array( 'error' => $entries->get_error_message(), 'data' => $entries ) );
@@ -609,7 +609,7 @@ 
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
 
 				// Cache results
 				$Cache->set( $entries, 'entries' );
@@ -726,18 +726,18 @@ 
 		$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry, $view );
 
 		// Is the entry allowed
-		if( $check_entry_display ) {
+		if ( $check_entry_display ) {
 
 			$gvid = \GV\Utils::_GET( 'gvid' );
 
-			if( $gvid ) {
+			if ( $gvid ) {
 				$view = \GV\View::by_id( $gvid );
 			}
 
 			$entry = self::check_entry_display( $entry, $view );
 		}
 
-		if( is_wp_error( $entry ) ) {
+		if ( is_wp_error( $entry ) ) {
 			gravityview()->log->error( '{error}', array( 'error' => $entry->get_error_message() ) );
 			return false;
 		}
@@ -771,12 +771,12 @@ 
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ( 'context' === $val1 ) {
 
 			$matching_contexts = array( $val2 );
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ( $val2 ) {
 				// Check for either single or edit
 				case 'singular':
 					$matching_contexts = array( 'single', 'edit' );
@@ -796,8 +796,8 @@ 
 
 		// If both are timestamps, cast to string so we can use the > and < comparisons below.
 		if ( $timestamp_1 && $timestamp_2 ) {
-			$val1 = (string) $timestamp_1;
-			$val2 = (string) $timestamp_2;
+			$val1 = (string)$timestamp_1;
+			$val2 = (string)$timestamp_2;
 		}
 
 		switch ( $operation ) {
@@ -829,18 +829,18 @@ 
 				$json_val_1 = json_decode( $val1, true );
 				$json_val_2 = json_decode( $val2, true );
 
-				if( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
+				if ( ! empty( $json_val_1 ) || ! empty( $json_val_2 ) ) {
 
 					$json_in = false;
-					$json_val_1 = $json_val_1 ? (array) $json_val_1 : array( $val1 );
-					$json_val_2 = $json_val_2 ? (array) $json_val_2 : array( $val2 );
+					$json_val_1 = $json_val_1 ? (array)$json_val_1 : array( $val1 );
+					$json_val_2 = $json_val_2 ? (array)$json_val_2 : array( $val2 );
 
 					// For JSON, we want to compare as "in" or "not in" rather than "contains"
 					foreach ( $json_val_1 as $item_1 ) {
 						foreach ( $json_val_2 as $item_2 ) {
 							$json_in = self::matches_operation( $item_1, $item_2, 'is' );
 
-							if( $json_in ) {
+							if ( $json_in ) {
 								break 2;
 							}
 						}
@@ -891,10 +891,10 @@ 
 	public static function check_entry_display( $entry, $view = null ) {
 
 		if ( ! $entry || is_wp_error( $entry ) ) {
-			return new WP_Error('entry_not_found', 'Entry was not found.', $entry );
+			return new WP_Error( 'entry_not_found', 'Entry was not found.', $entry );
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
+		if ( empty( $entry[ 'form_id' ] ) ) {
 			return new WP_Error( 'form_id_not_set', '[apply_filters_to_entry] Entry is empty!', $entry );
 		}
 
@@ -909,19 +909,19 @@ 
 
 		$_gvid = \GV\Utils::_GET( 'gvid' );
 
-		if ( $_gvid && $view->ID !== (int) $_gvid ) {
+		if ( $_gvid && $view->ID !== (int)$_gvid ) {
 			return new WP_Error( 'view_id_not_match_gvid', 'View does not match passed $_GET["gvid"].', $view->ID );
 		}
 
 		$view_form_id = $view->form->ID;
 
 		if ( $view->joins ) {
-			if ( in_array( (int) $entry['form_id'], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
-				$view_form_id = $entry['form_id'];
+			if ( in_array( (int)$entry[ 'form_id' ], array_keys( $view::get_joined_forms( $view->ID ) ), true ) ) {
+				$view_form_id = $entry[ 'form_id' ];
 			}
 		}
 
-		if ( (int) $view_form_id !== (int) $entry['form_id'] ) {
+		if ( (int)$view_form_id !== (int)$entry[ 'form_id' ] ) {
 			return new WP_Error( 'view_id_not_match', 'View form source does not match entry form source ID.', $entry );
 		}
 
@@ -929,13 +929,13 @@ 
 		 * Check whether the entry is in the entries subset by running a modified query.
 		 */
 		add_action( 'gravityview/view/query', $entry_subset_callback = function( &$query, $view, $request ) use ( $entry, $view_form_id ) {
-			$_tmp_query       = new \GF_Query( $view_form_id, array(
+			$_tmp_query = new \GF_Query( $view_form_id, array(
 				'field_filters' => array(
 					'mode' => 'all',
 					array(
 						'key' => 'id',
 						'operation' => 'is',
-						'value' => $entry['id']
+						'value' => $entry[ 'id' ]
 					)
 				)
 			) );
@@ -945,14 +945,14 @@ 
 			/** @type \GF_Query $query */
 			$query_parts      = $query->_introspect();
 
-			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts['where'], $query_parts['where'] ) );
+			$query->where( \GF_Query_Condition::_and( $_tmp_query_parts[ 'where' ], $query_parts[ 'where' ] ) );
 
 		}, 10, 3 );
 
 		// Prevent page offset from being applied to the single entry query; it's used to return to the referring page number
 		add_filter( 'gravityview_search_criteria', $remove_pagenum = function( $criteria ) {
 
-			$criteria['paging'] = array(
+			$criteria[ 'paging' ] = array(
 				'offset' => 0,
 				'page_size' => 25
 			);
@@ -971,20 +971,20 @@ 
 		}
 
 		// This entry is on a View with joins
-		if ( $entries[0]->is_multi() ) {
+		if ( $entries[ 0 ]->is_multi() ) {
 
 			$multi_entry_ids = array();
 
-			foreach ( $entries[0]->entries as $multi_entry ) {
-				$multi_entry_ids[] = (int) $multi_entry->ID;
+			foreach ( $entries[ 0 ]->entries as $multi_entry ) {
+				$multi_entry_ids[ ] = (int)$multi_entry->ID;
 			}
 
-			if ( ! in_array( (int) $entry['id'], $multi_entry_ids, true ) ) {
+			if ( ! in_array( (int)$entry[ 'id' ], $multi_entry_ids, true ) ) {
 				remove_action( 'gravityview/view/query', $entry_subset_callback );
 				return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 			}
 
-		} elseif ( (int) $entries[0]->ID !== (int) $entry['id'] ) {
+		} elseif ( (int)$entries[ 0 ]->ID !== (int)$entry[ 'id' ] ) {
 			remove_action( 'gravityview/view/query', $entry_subset_callback );
 			return new \WP_Error( 'failed_criteria', 'Entry failed search_criteria and field_filters' );
 		}
@@ -1029,18 +1029,18 @@ 
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
+		$date_gmt_time = mysql2date( 'G', $date_string );
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
 
-		$format  = \GV\Utils::get( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = \GV\Utils::get( $atts, 'format' );
+		$is_human = ! empty( $atts[ 'human' ] );
+		$is_diff = ! empty( $atts[ 'diff' ] );
+		$is_raw = ! empty( $atts[ 'raw' ] );
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
+		$include_time = ! empty( $atts[ 'time' ] );
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
+		if ( empty( $format ) ) {
 			/* translators: %s: relative time from now, used for generic date comparisons. "1 day ago", or "20 seconds ago" */
 			$format = $is_diff ? esc_html__( '%s ago', 'gk-gravityview' ) : get_option( 'date_format' );
 		}
@@ -1048,7 +1048,7 @@ 
 		// If raw was specified, don't modify the stored value
 		if ( $is_raw ) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ( $is_timestamp ) {
 			$formatted_date = $date_local_timestamp;
 		} elseif ( $is_diff ) {
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -1081,7 +1081,7 @@ 
 
 		$label = \GV\Utils::get( $field, 'label' );
 
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
 			$label = GFFormsModel::get_choice_text( $field, $field_value, $field_id );
 		}
 
@@ -1149,19 +1149,19 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}
 
 			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+				if ( $tag === $shortcode[ 2 ] ) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
-					$shortcodes[] = $shortcode;
+					$shortcodes[ ] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $results = self::has_shortcode_r( $shortcode[5], $tag ) ) {
-					foreach( $results as $result ) {
-						$shortcodes[] = $result;
+				} else if ( isset( $shortcode[ 5 ] ) && $results = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
+					foreach ( $results as $result ) {
+						$shortcodes[ ] = $result;
 					}
 				}
 			}
@@ -1193,7 +1193,7 @@ 
 			'post_type'      => 'gravityview',
 			'posts_per_page' => 100,
 			'meta_key'       => '_gravityview_form_id',
-			'meta_value'     => (int) $form_id,
+			'meta_value'     => (int)$form_id,
 		);
 		$args     = wp_parse_args( $args, $defaults );
 		$views    = get_posts( $args );
@@ -1205,21 +1205,21 @@ 
 
 			$data = unserialize( $view->meta_value );
 
-			if( ! $data || ! is_array( $data ) ) {
+			if ( ! $data || ! is_array( $data ) ) {
 				continue;
 			}
 
 			foreach ( $data as $datum ) {
-				if ( ! empty( $datum[2] ) && (int) $datum[2] === (int) $form_id ) {
-					$joined_forms[] = $view->post_id;
+				if ( ! empty( $datum[ 2 ] ) && (int)$datum[ 2 ] === (int)$form_id ) {
+					$joined_forms[ ] = $view->post_id;
 				}
 			}
 		}
 
 		if ( $joined_forms ) {
-			$joined_args  = array(
+			$joined_args = array(
 				'post_type'      => 'gravityview',
-				'posts_per_page' => $args['posts_per_page'],
+				'posts_per_page' => $args[ 'posts_per_page' ],
 				'post__in'       => $joined_forms,
 			);
 			$views = array_merge( $views, get_posts( $joined_args ) );
@@ -1375,7 +1375,7 @@ 
 
 		$directory_widgets = wp_parse_args( $view_widgets, $defaults );
 
-		if( $json_decode ) {
+		if ( $json_decode ) {
 			$directory_widgets = gv_map_deep( $directory_widgets, 'gv_maybe_json_decode' );
 		}
 
@@ -1390,7 +1390,7 @@ 
 	 * @return string         html
 	 */
 	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default (Entry ID)', 'gk-gravityview' ) .'</option>';
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default (Entry ID)', 'gk-gravityview' ) . '</option>';
 
 		if ( empty( $formid ) ) {
 			return $output;
@@ -1407,11 +1407,11 @@ 
 			$blocklist_field_types = apply_filters( 'gravityview_blocklist_field_types', $blocklist_field_types, null );
 
 			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blocklist_field_types ) ) {
+				if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
 			}
 		}
 
@@ -1454,16 +1454,16 @@ 
 		$blocklist_field_types = apply_filters( 'gravityview_blocklist_field_types', $blocklist_field_types, null );
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ( $fields as $id => $field ) {
 
-			if( in_array( $field['type'], $blocklist_field_types ) ) {
+			if ( in_array( $field[ 'type' ], $blocklist_field_types ) ) {
 				unset( $fields[ $id ] );
 			}
 
 			/**
 			 * Merge date and time subfields.
 			 */
-			if ( in_array( $field['type'], array( 'date', 'time' ) ) && ! empty( $field['parent'] ) ) {
+			if ( in_array( $field[ 'type' ], array( 'date', 'time' ) ) && ! empty( $field[ 'parent' ] ) ) {
 				$fields[ intval( $id ) ] = array(
 					'label' => \GV\Utils::get( $field, 'parent/label' ),
 					'parent' => null,
@@ -1513,14 +1513,14 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric( $form = null, $field = '' ) {
 
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
 			$form = self::get_form( $form );
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
 			$type = $field;
 		} else {
 			$type = self::get_field_type( $form, $field );
@@ -1534,9 +1534,9 @@ 
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
-				$numeric_types[] = $gv_field->is_numeric;
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
+			if ( true === $gv_field->is_numeric ) {
+				$numeric_types[ ] = $gv_field->is_numeric;
 			}
 		}
 
@@ -1687,20 +1687,20 @@ 
 		$final_atts = array_filter( $final_atts );
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
-			$final_atts['href'] = $href;
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
+			$final_atts[ 'href' ] = $href;
 		}
 
-		if ( isset( $final_atts['href'] ) ) {
-			$final_atts['href'] = esc_url_raw( $final_atts['href'] );
+		if ( isset( $final_atts[ 'href' ] ) ) {
+			$final_atts[ 'href' ] = esc_url_raw( $final_atts[ 'href' ] );
 		}
 
 		/**
 		 * Fix potential security issue with target=_blank
 		 * @see https://dev.to/ben/the-targetblank-vulnerability-by-example
 		 */
-		if( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
-			$final_atts['rel'] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
+		if ( '_blank' === \GV\Utils::get( $final_atts, 'target' ) ) {
+			$final_atts[ 'rel' ] = trim( \GV\Utils::get( $final_atts, 'rel', '' ) . ' noopener noreferrer' );
 		}
 
 		// Sort the attributes alphabetically, to help testing
@@ -1712,7 +1712,7 @@ 
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
 		}
 
-		if( '' !== $output ) {
+		if ( '' !== $output ) {
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
 		}
 
@@ -1739,7 +1739,7 @@ 
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
 			} else if ( is_numeric( $key ) && isset( $merged[ $key ] ) ) {
-				$merged[] = $value;
+				$merged[ ] = $value;
 			} else {
 				$merged[ $key ] = $value;
 			}
@@ -1772,7 +1772,7 @@ 
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
 
 		return get_users( $get_users_settings );
 	}
@@ -1792,11 +1792,11 @@ 
     public static function generate_notice( $notice, $class = '', $cap = '', $object_id = null ) {
 
     	// If $cap is defined, only show notice if user has capability
-    	if( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
+    	if ( $cap && ! GVCommon::has_cap( $cap, $object_id ) ) {
     		return '';
 	    }
 
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
     }
 
 	/**

Braces +3 added lines, -3 removed lines

@@ -354,7 +354,7 @@ 
 				}
 
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if( GFCommon::is_product_field( $field['type'] ) ) {
 					$has_product_fields = true;
 				}
 
@@ -417,7 +417,7 @@ 
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
+		foreach ( $extra_fields as $key => $field ) {
 			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
 				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
 			}
@@ -1149,7 +1149,7 @@ 
 			$shortcodes = array();
 
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			if ( empty( $matches ) ) {
 				return false;
 			}