gravityview / GravityView

future/includes/class-gv-entry.php

Spacing +8 added lines, -8 removed lines

@@ -113,7 +113,7 @@ 
 
 		$args = array();
 
-		$view_id = is_null ( $view ) ? null : $view->ID;
+		$view_id = is_null( $view ) ? null : $view->ID;
 
 		$permalink = null;
 
@@ -123,7 +123,7 @@ 
 			/** Must be an embed of some sort. */
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
 				$permalink = get_permalink( $post->ID );
-				$args['gvid'] = $view_id;
+				$args[ 'gvid' ] = $view_id;
 			}
 		}
 		
@@ -151,21 +151,21 @@ 
 			 */
 			$link_parts = explode( '?', $permalink );
 
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
 		} else {
 			$args[ $entry_endpoint_name ] = $entry_slug;
 		}
 
 		if ( $track_directory ) {
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			if ( $sort = Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
 			}
 		}
 

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
 
-		if( $acf_keys ) {
+		if ( $acf_keys ) {
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
 		}
 
@@ -70,9 +70,9 @@ 
 	 * @return void
 	 */
 	private function fix_posted_fields() {
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
-				$_POST['fields'] = _gravityview_process_posted_fields();
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
 			}
 		}
 	}

future/includes/class-gv-license-handler.php

Spacing +60 added lines, -60 removed lines

@@ -100,7 +100,7 @@ 
 		);
 
 		if ( ! empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		return array_map( 'urlencode', $settings );
@@ -156,7 +156,7 @@ 
 			'format' => 'json',
 		) );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
 			die( -1 );
 		}
 
@@ -197,7 +197,7 @@ 
 			// most likely a mistake.
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
 
-				if ( ! empty( $data['field_id'] ) ) {
+				if ( ! empty( $data[ 'field_id' ] ) ) {
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
 				}
 
@@ -224,7 +224,7 @@ 
 		if ( empty( $license_data ) ) {
 			$message = '';
 		} else {
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else { $class = $license_data->license;
@@ -250,17 +250,17 @@ 
 	 */
 	public function license_details( $response = array() ) {
 
-		$response = (array) $response;
+		$response = (array)$response;
 
 		$return = '';
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
 
-		if ( ! empty( $response['license_key'] ) ) {
+		if ( ! empty( $response[ 'license_key' ] ) ) {
 			$return .= '<h3>' . esc_html__( 'License Details:', 'gravityview' ) . '</h3>';
 
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
-				$return .= $this->strings( $response['license'], $response );
-			} elseif ( ! empty( $response['license_name'] ) ) {
+				$return .= $this->strings( $response[ 'license' ], $response );
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
 				$response_keys = array(
 					'license_name'   => '',
 					'license_limit'  => '',
@@ -274,19 +274,19 @@ 
 				// Make sure all the keys are set
 				$response = wp_parse_args( $response, $response_keys );
 
-				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
-				$local_text = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
+				$login_link = sprintf( '<a href="%s" class="howto" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
+				$local_text = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
 				$details    = array(
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response['license_name'] ), esc_html( $response['license_limit'] ) ),
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . $login_link,
-					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response['site_count'] ), esc_html( $response['license_limit'] ) ) . $local_text,
-					'expires'     => 'lifetime' === $response['expires'] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) ),
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), esc_html( $response[ 'license_name' ] ), esc_html( $response[ 'license_limit' ] ) ),
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . $login_link,
+					'activations' => sprintf( esc_html__( 'Activations: %d of %s sites', 'gravityview' ), intval( $response[ 'site_count' ] ), esc_html( $response[ 'license_limit' ] ) ) . $local_text,
+					'expires'     => 'lifetime' === $response[ 'expires' ] ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) ),
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
 				);
 
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
-					unset( $details['upgrade'] );
-					$details['expires'] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
+					unset( $details[ 'upgrade' ] );
+					$details[ 'expires' ] = '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
 				}
 
 				$return .= '<ul><li>' . implode( '</li><li>', array_filter( $details ) ) . '</li></ul>';
@@ -312,20 +312,20 @@ 
 		if ( ! empty( $upgrades ) ) {
 
 			$locale_parts = explode( '_', get_locale() );
-			$is_english = ( 'en' === $locale_parts[0] );
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
 
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
 			$output .= '<ul class="ul-disc">';
 
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
-				$upgrade = (object) $upgrade;
+				$upgrade = (object)$upgrade;
 
 				$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 ) );
 
 				if ( $is_english && isset( $upgrade->description ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -383,7 +383,7 @@ 
 			'invalid' => esc_html__( 'The license key entered is invalid.', 'gravityview' ),
 			'missing' => esc_html__( 'Invalid license key.', 'gravityview' ),
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
-			'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>' ),
+			'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>' ),
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
 
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
@@ -406,7 +406,7 @@ 
 
 		if ( ! empty( $license_data->renewal_url ) ) {
 			$renew_license_url = $license_data->renewal_url;
-		} elseif( ! empty( $license_data->license_key ) ) {
+		} elseif ( ! empty( $license_data->license_key ) ) {
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
 		} else {
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -423,7 +423,7 @@ 
 	 * @return array|WP_Error
 	 */
 	private function _license_get_remote_response( $data, $license = '' ) {
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
 
 		$url = add_query_arg( $api_params, self::url );
 
@@ -463,9 +463,9 @@ 
 	private function license_call_update_settings( $license_data, $data ) {
 		$settings = array();
 
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
-		$settings['license_key_status'] = $license_data->license;
-		$settings['license_key_response'] = (array)$license_data;
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
+		$settings[ 'license_key_status' ] = $license_data->license;
+		$settings[ 'license_key_response' ] = (array)$license_data;
 
 		$this->settings->set( $settings );
 	}
@@ -480,7 +480,7 @@ 
 
 		if ( ! empty( $key ) ) {
 			$response = $this->settings->get( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
@@ -522,11 +522,11 @@ 
 
 		$submit = '<div class="gv-edd-button-wrapper">';
 		foreach ( $fields as $field ) {
-			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
-			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
-				$field['disabled'] = $disabled_attribute;
+			$field[ 'type' ] = 'button';
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
+			$field[ 'style' ] = 'margin-left: 10px;';
+			if ( $disabled_attribute ) {
+				$field[ 'disabled' ] = $disabled_attribute;
 			}
 			$submit .= $this->settings->as_html( $field, $echo );
 		}
@@ -605,7 +605,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -636,45 +636,45 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = Plugin::$version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = \GFForms::$version;
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = $this->settings->get( 'license_key' );
-		$data['beta']         = $this->settings->get( 'beta' );
+		$data[ 'gv_version' ]  = Plugin::$version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = \GFForms::$version;
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
 
 		// View Data
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
 
-		$data['view_count'] = null;
-		$data['view_first'] = null;
-		$data['view_latest'] = null;
+		$data[ 'view_count' ] = null;
+		$data[ 'view_first' ] = null;
+		$data[ 'view_latest' ] = null;
 
 		if ( $gravityview_posts->publish ) {
-			$data['view_count'] = $gravityview_posts->publish;
+			$data[ 'view_count' ] = $gravityview_posts->publish;
 
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
 
 			if ( $first = array_shift( $first ) ) {
-				$data['view_first'] = $first->post_date;
+				$data[ 'view_first' ] = $first->post_date;
 			}
 			if ( $latest = array_pop( $latest ) ) {
-				$data['view_latest'] = $latest->post_date;
+				$data[ 'view_latest' ] = $latest->post_date;
 			}
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = \GFFormsModel::get_form_count();
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
@@ -682,13 +682,13 @@ 
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
-		$data['integrations']     = self::get_related_plugins_and_extensions();
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
-		$data['inactive_plugins'] = array();
-		$data['locale']           = get_locale();
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
+		$data[ 'inactive_plugins' ] = array();
+		$data[ 'locale' ]           = get_locale();
 
 		// Validate request on the GV server
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
 
 		return $data;
 	}
@@ -718,7 +718,7 @@ 
 
 				$plugin_data = get_plugin_data( $active_plugin );
 
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
 			}
 
 			if ( ! empty( $extensions ) ) {

includes/class-api.php

Spacing +104 added lines, -104 removed lines

@@ -31,7 +31,7 @@ 
 
 		$form = $gravityview_view->getForm();
 
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
 			/** Allow to fall through for back compatibility testing purposes. */
 		} else {
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@ 
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
 
-			$label = $field['label'];
+			$label = $field[ 'label' ];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if ( class_exists( 'GF_Field' ) ) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
 
-				if( $field_object ) {
+				if ( $field_object ) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ( $input ) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
 
 					}
 
@@ -70,9 +70,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
 
 			}
 
@@ -134,11 +134,11 @@ 
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if ( ! empty( $field[ 'width' ] ) ) {
+			$width = absint( $field[ 'width' ] );
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ( '%d%%' === $format && $width > 100 ) {
 				$width = 100;
 			}
 
@@ -159,42 +159,42 @@ 
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
 
-            $custom_class = $field['custom_class'];
+            $custom_class = $field[ 'custom_class' ];
 
-            if( !empty( $entry ) ) {
+            if ( ! empty( $entry ) ) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
 
                 // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
-				$form_id = '-'.$form['id'];
+		if ( ! empty( $field[ 'id' ] ) ) {
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
 				$gravityview_view = GravityView_View::getInstance();
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
-		return esc_attr(implode(' ', $classes));
+		return esc_attr( implode( ' ', $classes ) );
 	}
 
 	/**
@@ -210,11 +210,11 @@ 
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
-		$id = $field['id'];
+		$id = $field[ 'id' ];
 
 		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
+				$form_id = '-' . $form[ 'id' ];
 			} else {
 				// @deprecated path. Form should always be given.
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@ 
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
 		}
 
 		return esc_attr( $id );
@@ -262,14 +262,14 @@ 
 	 */
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
 			return NULL;
 		}
 
 		$href = self::entry_link( $entry, $base_id );
 
-		if( '' === $href ) {
+		if ( '' === $href ) {
 			return NULL;
 		}
 
@@ -306,7 +306,7 @@ 
 		} else {
 			$gravityview_view = GravityView_View::getInstance();
 
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
 				$is_search = true;
 			}
 		}
@@ -402,9 +402,9 @@ 
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
 
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
 			$link = home_url();
 		}
 
@@ -413,7 +413,7 @@ 
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
 		}
 
 		// Deal with returning to proper pagination for embedded views
@@ -421,13 +421,13 @@ 
 
 			$args = array();
 
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
+				$args[ 'pagenum' ] = intval( $pagenum );
 			}
 
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 			$link = add_query_arg( $args, $link );
@@ -464,7 +464,7 @@ 
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -475,7 +475,7 @@ 
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if ( empty( $slug ) ) {
 			$slug = $id;
 		}
 
@@ -504,7 +504,7 @@ 
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 		 */
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
 
 		// If we're using custom slug...
 		if ( $custom ) {
@@ -518,7 +518,7 @@ 
 			// If it does have a hash set, and the hash is expected, use it.
 			// This check allows users to change the hash structure using the
 			// gravityview_entry_hash filter and have the old hashes expire.
-			if( empty( $value ) || $value !== $hash ) {
+			if ( empty( $value ) || $value !== $hash ) {
 				gravityview()->log->debug( 'Setting hash for entry {entry}: {hash}', array( 'entry' => $id_or_string, 'hash' => $hash ) );
 				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 			}
@@ -545,15 +545,15 @@ 
          * @param boolean $custom Should we process the custom entry slug?
          */
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        if ( $custom ) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
 
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
 
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
 
         }
     }
@@ -572,7 +572,7 @@ 
 
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
 			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		} else if ( empty( $entry ) ) {
 			// @deprecated path
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
@@ -592,9 +592,9 @@ 
 
 		$query_arg_name = \GV\Entry::get_endpoint_name();
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug( $entry[ 'id' ], $entry );
 
-		if ( get_option('permalink_structure') && !is_preview() ) {
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
 
 			$args = array();
 
@@ -604,9 +604,9 @@ 
 			 */
 			$link_parts = explode( '?', $directory_link );
 
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
 
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
 
 		} else {
 
@@ -618,22 +618,22 @@ 
 		 */
 		if ( $add_directory_args ) {
 
-			if ( ! empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
 			}
 
 			/**
 			 * @since 1.7
 			 */
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
-				$args['sort'] = $sort;
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
+				$args[ 'sort' ] = $sort;
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
 			}
 
 		}
 
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
-			$args['gvid'] = gravityview_get_view_id();
+			$args[ 'gvid' ] = gravityview_get_view_id();
 		}
 
 		return add_query_arg( $args, $directory_link );
@@ -654,7 +654,7 @@ 
 }
 
 function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+	return GravityView_API::field_class( $field, $form, $entry );
 }
 
 /**
@@ -677,7 +677,7 @@ 
 		$view_id = 0;
 		if ( $context->view ) {
 			$view_id = $context->view->ID;
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
 			}
 		}
@@ -705,7 +705,7 @@ 
 		$default_css_class .= ' gv-container-no-results';
 	}
 
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
 
 	/**
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -732,7 +732,7 @@ 
 
 	$value = GravityView_API::field_value( $entry, $field );
 
-	if( $value === '' ) {
+	if ( $value === '' ) {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
@@ -839,7 +839,7 @@ 
  */
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -873,16 +873,16 @@ 
 		$terms = explode( ', ', $value );
 	}
 
-	foreach ($terms as $term_name ) {
+	foreach ( $terms as $term_name ) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ( $taxonomy === 'category' ) {
 
 			// Use rgexplode to prevent errors if : doesn't exist
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
+			if ( ! empty( $term_id ) ) {
 				$term = get_term_by( 'id', $term_id, $taxonomy );
 			} else {
 			// We have to fall back to the name
@@ -895,7 +895,7 @@ 
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ( $term ) {
 
 			$term_link = get_term_link( $term, $taxonomy );
 
@@ -904,11 +904,11 @@ 
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
 		}
 	}
 
-	return implode(', ', $output );
+	return implode( ', ', $output );
 }
 
 /**
@@ -922,8 +922,8 @@ 
 
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if ( empty( $link ) ) {
+		return strip_tags( $output );
 	}
 
 	return $output;
@@ -942,7 +942,7 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if ( ! $fe->getGvOutputData() ) {
 
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
 
@@ -950,7 +950,7 @@ 
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
 
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
 
@@ -1155,12 +1155,12 @@ 
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if ( ! class_exists( 'GravityView_Field' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
 	}
 
 	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class, $context );
@@ -1259,21 +1259,21 @@ 
 	} else {
 		// @deprecated path
 		// Required fields.
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
 			return '';
 		}
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
 	} else {
 		// @deprecated path
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
-		$field = $args['field'];
-		$form = $args['form'];
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
+		$field = $args[ 'field' ];
+		$form = $args[ 'form' ];
 	}
 
 	/**
@@ -1291,46 +1291,46 @@ 
 	);
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
 	} else {
 		// @deprecated path
-		$placeholders['value'] = gv_value( $entry, $field );
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
 	}
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
 		return '';
 	}
 
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$placeholders['value'] = wpautop( $placeholders['value'] );
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
 	}
 
 	// Get width setting, if exists
-	$placeholders['width'] = GravityView_API::field_width( $field );
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
 
 	// If replacing with CSS inline formatting, let's do it.
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
 
 	// Grab the Class using `gv_class`
-	$placeholders['class'] = gv_class( $field, $form, $entry );
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
 
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) && ! empty( $args['field']['show_label'] ) ) {
-		$placeholders['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
+	if ( ! empty( $args[ 'label_markup' ] ) && ! empty( $args[ 'field' ][ 'show_label' ] ) ) {
+		$placeholders[ 'label' ] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args[ 'label_markup' ] );
 	}
 
 	if ( $context instanceof \GV\Template_Context ) {
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
 	} else {
 		// Default Label value
-		$placeholders['label_value'] = gv_label( $field, $entry );
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
 	}
 
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
 	/**
@@ -1341,7 +1341,7 @@ 
 	 * @since 2.0
 	 * @param \GV\Template_Context $context The context.
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1368,7 +1368,7 @@ 
 	foreach ( $placeholders as $tag => $value ) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
 			continue;
 		}
 

future/includes/class-gv-view.php

Spacing +21 added lines, -22 removed lines

@@ -108,7 +108,7 @@ 
 		$supports = array( 'title', 'revisions' );
 
 		if ( $is_hierarchical ) {
-			$supports[] = 'page-attributes';
+			$supports[ ] = 'page-attributes';
 		}
 
 		/**
@@ -289,13 +289,13 @@ 
 			return __( 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		/**
 		 * Editing a single entry.
 		 */
 		if ( $entry = $request->is_edit_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -306,7 +306,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -319,7 +319,7 @@ 
 		 * Viewing a single entry.
 		 */
 		} else if ( $entry = $request->is_entry() ) {
-			if ( $entry['status'] != 'active' ) {
+			if ( $entry[ 'status' ] != 'active' ) {
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 				return __( 'You are not allowed to view this content.', 'gravityview' );
 			}
@@ -330,7 +330,7 @@ 
 			}
 
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 					return __( 'You are not allowed to view this content.', 'gravityview' );
 				}
@@ -378,11 +378,11 @@ 
 		if ( ! $view->form ) {
 			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array(
 				'view_id' => $view->ID,
-				'form_id' => $view->_gravityview_form_id ? : 0,
+				'form_id' => $view->_gravityview_form_id ?: 0,
 			) );
 		} else if ( gravityview()->plugin->supports( Plugin::FEATURE_JOINS ) ) {
 			/** And the connected joins. */
-			foreach( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
+			foreach ( (array)get_post_meta( $view->ID, '_gravityview_form_joins', true ) as $_join ) {
 				if ( ! is_array( $_join ) || count( $_join ) != 4 ) {
 					continue;
 				}
@@ -394,7 +394,7 @@ 
 				$join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field( $join_column );
 				$join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field( $join_on_column );
 
-				$view->joins []= new Join( $join, $join_column, $join_on, $join_on_column );
+				$view->joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );
 			}
 		}
 
@@ -618,28 +618,27 @@ 
 			 * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead
 			 */
 			$parameters = \GravityView_frontend::get_view_entries_parameters( $this->settings->as_atts(), $this->form->ID );
-			$parameters['context_view_id'] = $this->ID;
+			$parameters[ 'context_view_id' ] = $this->ID;
 			$parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );
 
 			if ( $request instanceof REST\Request ) {
 				$atts = $this->settings->as_atts();
 				$paging_parameters = wp_parse_args( $request->get_paging(), array(
-						'paging' => array( 'page_size' => $atts['page_size'] ),
+						'paging' => array( 'page_size' => $atts[ 'page_size' ] ),
 					) );
-				$parameters['paging'] = $paging_parameters['paging'];
+				$parameters[ 'paging' ] = $paging_parameters[ 'paging' ];
 			}
 
-			$page = Utils::get( $parameters['paging'], 'current_page' ) ?
-				: ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
+			$page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
 
 			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
 				/**
 				 * New \GF_Query stuff :)
 				 */
-				$query = new \GF_Query( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );
+				$query = new \GF_Query( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );
 
-				$query->limit( $parameters['paging']['page_size'] )
-					->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );
+				$query->limit( $parameters[ 'paging' ][ 'page_size' ] )
+					->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );
 
 				/**
 				 * Any joins?
@@ -679,15 +678,15 @@ 
 				} );
 			} else {
 				$entries = $this->form->entries
-					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )
+					->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )
 					->offset( $this->settings->get( 'offset' ) )
-					->limit( $parameters['paging']['page_size'] )
+					->limit( $parameters[ 'paging' ][ 'page_size' ] )
 					->page( $page );
 				
-				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) {
+				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) {
 					$field = new \GV\Field();
-					$field->ID = $parameters['sorting']['key'];
-					$direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
+					$field->ID = $parameters[ 'sorting' ][ 'key' ];
+					$direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;
 					$entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );
 				}
 			}

future/includes/rest/class-gv-rest-views-route.php

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
 			'total' => wp_count_posts( 'gravityview' )->publish,
 		);
 		foreach ( $items as $item ) {
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
 		}
 
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@ 
 
 		$url = $request->get_url_params();
 
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 
 		$item = get_post( $view_id );
 
@@ -111,7 +111,7 @@ 
 		// Only output the fields that should be displayed.
 		$allowed = array();
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) {
-			$allowed[] = $field->ID;
+			$allowed[ ] = $field->ID;
 		}
 
 		/**
@@ -156,7 +156,7 @@ 
 	public function get_sub_items( $request ) {
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
+		$view_id = intval( $url[ 'id' ] );
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
 
 		$view = \GV\View::by_id( $view_id );
@@ -199,7 +199,7 @@ 
 
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
 
-		foreach ( $data['entries'] as &$entry ) {
+		foreach ( $data[ 'entries' ] as &$entry ) {
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
 		}
 
@@ -218,8 +218,8 @@ 
 	 */
 	public function get_sub_item( $request ) {
 		$url      = $request->get_url_params();
-		$view_id  = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id  = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
 
 		$view  = \GV\View::by_id( $view_id );
@@ -254,32 +254,32 @@ 
 		// Add all the WP_Post data
 		$view_post = $view_post->to_array();
 
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
 
 		$return = wp_parse_args( $item, $view_post );
 
-		$return['title'] = $return['post_title'];
+		$return[ 'title' ] = $return[ 'post_title' ];
 
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
-		unset( $return['atts'], $return['view_id'] );
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
 
-		$return['search_criteria'] = array(
+		$return[ 'search_criteria' ] = array(
 			'page_size' => rgars( $return, 'settings/page_size' ),
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
 			'offset' => rgars( $return, 'settings/offset' ),
 		);
 
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
 
 		// Redact for non-logged ins
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
-			unset( $return['settings'] );
-			unset( $return['search_criteria'] );
+			unset( $return[ 'settings' ] );
+			unset( $return[ 'search_criteria' ] );
 		}
 		
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
-			unset( $return['form'] );
+			unset( $return[ 'form' ] );
 		}
 
 		return $return;
@@ -290,7 +290,7 @@ 
 			$view_id = func_get_arg( 1 ); // $view_id override
 		} else {
 			$url     = $request->get_url_params();
-			$view_id = intval( $url['id'] );
+			$view_id = intval( $url[ 'id' ] );
 		}
 
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -343,8 +343,8 @@ 
 		}
 
 		$url     = $request->get_url_params();
-		$view_id = intval( $url['id'] );
-		$entry_id = intval( $url['s_id'] );
+		$view_id = intval( $url[ 'id' ] );
+		$entry_id = intval( $url[ 's_id' ] );
 
 		$view = \GV\View::by_id( $view_id );
 
@@ -352,11 +352,11 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['form_id'] != $view->form->ID ) {
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
@@ -364,10 +364,10 @@ 
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
 			}
 		}

future/includes/class-gv-shortcode-gventry.php

Spacing +16 added lines, -16 removed lines

@@ -44,16 +44,16 @@ 
 		 */
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
 
-		$view = \GV\View::by_id( $atts['view_id'] );
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
 
 		if ( ! $view ) {
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
 		}
 
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
 
-		switch( $entry_id ):
+		switch ( $entry_id ):
 			case 'last':
 				if ( class_exists( '\GF_Query' ) ) {
 					/**
@@ -62,17 +62,17 @@ 
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
 					 */
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
-						if ( ! empty( $parameters['sorting'] ) ) {
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
 							/**
 							 * Reverse existing sorts.
 							 */
-							$sort = &$parameters['sorting'];
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
+							$sort = &$parameters[ 'sorting' ];
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
 						} else {
 							/**
 							 * Otherwise, sort by date_created.
 							 */
-							$parameters['sorting'] = array(
+							$parameters[ 'sorting' ] = array(
 								'key' => 'id',
 								'direction' => 'ASC',
 								'is_numeric' => true
@@ -87,7 +87,7 @@ 
 
 					/** If a sort already exists, reverse it. */
 					if ( $sort = end( $entries->sorts ) ) {
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
 					} else {
 						/** Otherwise, sort by date_created */
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -105,12 +105,12 @@ 
 				break;
 			default:
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
 				}
 		endswitch;
 
-		if ( $view->form->ID != $entry['form_id'] ) {
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
@@ -120,7 +120,7 @@ 
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
 		}
 
-		if ( ! $view->form  ) {
+		if ( ! $view->form ) {
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
 
 			/**
@@ -143,15 +143,15 @@ 
 		}
 
 		/** Unapproved entries. */
-		if ( $entry['status'] != 'active' ) {
+		if ( $entry[ 'status' ] != 'active' ) {
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 		}
 
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
 
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
 			}
@@ -163,7 +163,7 @@ 
 		$renderer = new \GV\Entry_Renderer();
 
 		$request = new \GV\Mock_Request();
-		$request->returns['is_entry'] = $entry;
+		$request->returns[ 'is_entry' ] = $entry;
 
 		$output = $renderer->render( $entry, $view, $request );
 

future/includes/class-gv-form-gravityforms.php

Spacing +9 added lines, -9 removed lines

@@ -55,7 +55,7 @@ 
 		$self = new self();
 		$self->form = $form;
 
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -70,13 +70,13 @@ 
 	 * @return \GV\GF_Form|null An instance of this form or null if not found.
 	 */
 	public static function from_form( $form ) {
-		if ( empty( $form['id'] ) ) {
+		if ( empty( $form[ 'id' ] ) ) {
 			return null;
 		}
 
 		$self = new self();
 		$self->form = $form;
-		$self->ID = $self->form['id'];
+		$self->ID = $self->form[ 'id' ];
 
 		return $self;
 	}
@@ -119,11 +119,11 @@ 
 
 			/** The offset and limit */
 			if ( ! empty( $offset->limit ) ) {
-				$paging['page_size'] = $offset->limit;
+				$paging[ 'page_size' ] = $offset->limit;
 			}
 
 			if ( ! empty( $offset->offset ) ) {
-				$paging['offset'] = $offset->offset;
+				$paging[ 'offset' ] = $offset->offset;
 			}
 
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -180,8 +180,8 @@ 
 	 */
 	public function get_fields() {
 		$fields = array();
-		foreach ( $this['fields'] as $field ) {
-			foreach ( empty( $field['inputs'] ) ? array( $field['id'] ) : wp_list_pluck( $field['inputs'], 'id' ) as $id ) {
+		foreach ( $this[ 'fields' ] as $field ) {
+			foreach ( empty( $field[ 'inputs' ] ) ? array( $field[ 'id' ] ) : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
 				if ( is_numeric( $id ) ) {
 					$fields[ $id ] = self::get_field( $this, $id );
 				} else {
@@ -218,7 +218,7 @@ 
 	 * @return bool Whether the offset exists or not.
 	 */
 	public function offsetExists( $offset ) {
-		return isset( $this->form[$offset] );
+		return isset( $this->form[ $offset ] );
 	}
 
 	/**
@@ -233,7 +233,7 @@ 
 	 * @return mixed The value of the requested form data.
 	 */
 	public function offsetGet( $offset ) {
-		return $this->form[$offset];
+		return $this->form[ $offset ];
 	}
 
 	/**

future/includes/class-gv-field-internal.php

Spacing +2 added lines, -2 removed lines

@@ -29,12 +29,12 @@
 	 */
 	public static function from_configuration( $configuration ) {
 
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
 			return null;
 		}
 
-		$field = self::by_id( $configuration['id'] );
+		$field = self::by_id( $configuration[ 'id' ] );
 
 		$field->update_configuration( $configuration );