gravityview / GravityView

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

Spacing +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
 
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
 
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 	function filter_gravityview_back_link( $link ) {
 		global $wpml_url_filters;
 
-		if( $wpml_url_filters ) {
+		if ( $wpml_url_filters ) {
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
 		}
 
@@ -101,7 +101,7 @@ 
 	private function remove_url_hooks() {
 		global $wpml_url_filters;
 
-		if( ! $wpml_url_filters ) {
+		if ( ! $wpml_url_filters ) {
 			return;
 		}
 
@@ -129,7 +129,7 @@ 
 	private function add_url_hooks() {
 		global $wpml_url_filters;
 
-		if( ! $wpml_url_filters ) {
+		if ( ! $wpml_url_filters ) {
 			return;
 		}
 
@@ -178,10 +178,10 @@ 
 
 			$this->remove_url_hooks();
 
-			if( $translations ) {
+			if ( $translations ) {
 				foreach ( $languages as $lang_code => $language ) {
 
-					if( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
+					if ( ! isset( $translations[ $lang_code ] ) || ! is_object( $translations[ $lang_code ] ) ) {
 						continue;
 					}
 
@@ -215,7 +215,7 @@ 
 							break;
 					}
 
-					$languages[ $lang_code ]['url'] = $entry_link;
+					$languages[ $lang_code ][ 'url' ] = $entry_link;
 				}
 			}
 

includes/class-gv-license-handler.php

Spacing +107 added lines, -107 removed lines

@@ -47,7 +47,7 @@ 
 	 * @return GV_License_Handler
 	 */
 	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self( $GFAddOn );
 		}
 		return self::$instance;
@@ -123,7 +123,7 @@ 
 				    'url'        => home_url(),
 				    'site_data'  => $this->get_site_data(),
 			    ),
-			));
+			) );
 
 			// make sure the response came back okay
 			if ( is_wp_error( $response ) ) {
@@ -149,16 +149,16 @@ 
 	 */
 	public function refresh_license_status() {
 
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
 			return;
 		}
 
 		global $pagenow;
 
-		$is_force_check = ( isset( $pagenow ) && 'update-core.php' === $pagenow && isset( $_REQUEST['force-check'] ) && '1' === $_REQUEST['force-check'] );
+		$is_force_check = ( isset( $pagenow ) && 'update-core.php' === $pagenow && isset( $_REQUEST[ 'force-check' ] ) && '1' === $_REQUEST[ 'force-check' ] );
 
 		// The transient is fresh; don't fetch.
-		if( $status = get_transient( self::status_transient_key ) && ! $is_force_check ) {
+		if ( $status = get_transient( self::status_transient_key ) && ! $is_force_check ) {
 			return;
 		}
 
@@ -191,49 +191,49 @@ 
 		$theme_data = wp_get_theme();
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
 
-		$data['gv_version']  = GravityView_Plugin::version;
-		$data['php_version']  = phpversion();
-		$data['wp_version']   = get_bloginfo( 'version' );
-		$data['gf_version']  = GFForms::$version;
-		$data['server']       = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '';
-		$data['multisite']    = is_multisite();
-		$data['theme']        = $theme;
-		$data['url']          = home_url();
-		$data['license_key']  = GravityView_Settings::get_instance()->get_app_setting( 'license_key' );
-		$data['beta']         = GravityView_Settings::get_instance()->get_app_setting( 'beta' );
+		$data[ 'gv_version' ]  = GravityView_Plugin::version;
+		$data[ 'php_version' ]  = phpversion();
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
+		$data[ 'gf_version' ]  = GFForms::$version;
+		$data[ 'server' ]       = isset( $_SERVER[ 'SERVER_SOFTWARE' ] ) ? $_SERVER[ 'SERVER_SOFTWARE' ] : '';
+		$data[ 'multisite' ]    = is_multisite();
+		$data[ 'theme' ]        = $theme;
+		$data[ 'url' ]          = home_url();
+		$data[ 'license_key' ]  = GravityView_Settings::get_instance()->get_app_setting( 'license_key' );
+		$data[ 'beta' ]         = GravityView_Settings::get_instance()->get_app_setting( 'beta' );
 
 		// View Data
-		$gravityview_posts = get_posts('numberposts=-1&post_type=gravityview&post_status=publish&order=ASC');
+		$gravityview_posts = get_posts( 'numberposts=-1&post_type=gravityview&post_status=publish&order=ASC' );
 
 		if ( ! empty( $gravityview_posts ) ) {
 			$first = array_shift( $gravityview_posts );
 			$latest = array_pop( $gravityview_posts );
-			$data['view_count'] = count( $gravityview_posts );
-			$data['view_first'] = $first->post_date;
-			$data['view_latest'] = $latest->post_date;
+			$data[ 'view_count' ] = count( $gravityview_posts );
+			$data[ 'view_first' ] = $first->post_date;
+			$data[ 'view_latest' ] = $latest->post_date;
 		}
 
 		// Form counts
 		if ( class_exists( 'GFFormsModel' ) ) {
 			$form_data = GFFormsModel::get_form_count();
-			$data['forms_total'] = rgar( $form_data, 'total', 0 );
-			$data['forms_active'] = rgar( $form_data, 'active', 0 );
-			$data['forms_inactive'] = rgar( $form_data, 'inactive', 0 );
-			$data['forms_trash'] = rgar( $form_data, 'inactive', 0 );
+			$data[ 'forms_total' ] = rgar( $form_data, 'total', 0 );
+			$data[ 'forms_active' ] = rgar( $form_data, 'active', 0 );
+			$data[ 'forms_inactive' ] = rgar( $form_data, 'inactive', 0 );
+			$data[ 'forms_trash' ] = rgar( $form_data, 'inactive', 0 );
 		}
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			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;
 	}
@@ -265,10 +265,10 @@ 
 
 				$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 ) ) {
+			if ( ! empty( $extensions ) ) {
 				set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS );
 			} else {
 				return 'There was an error fetching related plugins.';
@@ -287,37 +287,37 @@ 
 		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
 		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
 
-		if( !empty( $key ) ) {
+		if ( ! empty( $key ) ) {
 			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
 		} else {
 			$response = array();
 		}
 
 		wp_localize_script( 'gv-admin-edd-license', 'GVGlobals', array(
 			'license_box' => $this->get_license_message( $response )
-		));
+		) );
 
 
 		$fields = array(
 			array(
 				'name'  => 'edd-activate',
-				'value' => __('Activate License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Activate License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'data-edd_action' => 'activate_license',
 				'class' => 'button-primary',
 			),
 			array(
 				'name'  => 'edd-deactivate',
-				'value' => __('Deactivate License', 'gravityview'),
-				'data-pending_text' => __('Deactivating license…', 'gravityview'),
+				'value' => __( 'Deactivate License', 'gravityview' ),
+				'data-pending_text' => __( 'Deactivating license…', 'gravityview' ),
 				'data-edd_action' => 'deactivate_license',
 				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
 			),
 			array(
 				'name'  => 'edd-check',
-				'value' => __('Check License', 'gravityview'),
-				'data-pending_text' => __('Verifying license…', 'gravityview'),
+				'value' => __( 'Check License', 'gravityview' ),
+				'data-pending_text' => __( 'Verifying license…', 'gravityview' ),
 				'title' => 'Check the license before saving it',
 				'data-edd_action' => 'check_license',
 				'class' => 'button-secondary',
@@ -327,17 +327,17 @@ 
 
 		$class = 'button gv-edd-action';
 
-		$class .= ( !empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
+		$class .= ( ! empty( $key ) && $status !== 'valid' ) ? '' : ' hide';
 
 		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
 
 		$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->Addon->settings_submit( $field, $echo );
 		}
@@ -356,8 +356,8 @@ 
 	 */
 	public function setup_edd() {
 
-		if( !class_exists('EDD_SL_Plugin_Updater') ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php');
+		if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+			require_once( GRAVITYVIEW_DIR . 'includes/lib/EDD_SL_Plugin_Updater.php' );
 		}
 
 		// setup the updater
@@ -395,8 +395,8 @@ 
 		    'beta'      => $this->Addon->get_app_setting( 'beta' ),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if ( ! empty( $action ) ) {
+			$settings[ 'edd_action' ] = esc_attr( $action );
 		}
 
 		$settings = array_map( 'urlencode', $settings );
@@ -410,14 +410,14 @@ 
 	 */
 	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 );
 
 		$response = wp_remote_get( $url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
-		));
+		) );
 
 		if ( is_wp_error( $response ) ) {
 
@@ -455,11 +455,11 @@ 
 	 */
 	function get_license_message( $license_data ) {
 
-		if( empty( $license_data ) ) {
+		if ( empty( $license_data ) ) {
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if ( ! empty( $license_data->error ) ) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else {
@@ -467,7 +467,7 @@ 
 				$string_key = $license_data->license;
 			}
 
-			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings('status'), $this->strings( $string_key, $license_data ) );
+			$message = sprintf( '<p><strong>%s: %s</strong></p>', $this->strings( 'status' ), $this->strings( $string_key, $license_data ) );
 
 			$message = $this->generate_license_box( $message, $class );
 		}
@@ -504,18 +504,18 @@ 
 	 */
 	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( rgar( $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'   => '',
@@ -530,19 +530,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>';
@@ -565,11 +565,11 @@ 
 
 		$output = '';
 
-		if( ! empty( $upgrades ) ) {
+		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>';
 
@@ -577,14 +577,14 @@ 
 
 			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 ) ) {
+				if ( $is_english && isset( $upgrade->description ) ) {
 					$message = esc_html( $upgrade->description );
 				} else {
-					switch( $upgrade->price_id ) {
+					switch ( $upgrade->price_id ) {
 						// Interstellar
 						case 1:
 						default:
@@ -622,16 +622,16 @@ 
 	 */
 	public function license_call( $array = array() ) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
+		$is_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+		$data = empty( $array ) ? $_POST[ 'data' ] : $array;
 		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
 
-		if ( $is_ajax && empty( $data['license'] ) ) {
-			die( - 1 );
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
+			die( -1 );
 		}
 
 		// If the user isn't allowed to edit settings, show an error message
-		if( ! $has_cap && empty( $data['all_caps'] ) ) {
+		if ( ! $has_cap && empty( $data[ 'all_caps' ] ) ) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
 			$license_data->message = $this->get_license_message( $license_data );
@@ -655,11 +655,11 @@ 
 
 			$json = json_encode( $license_data );
 
-			$update_license = ( ! isset( $data['update'] ) || ! empty( $data['update'] ) );
+			$update_license = ( ! isset( $data[ 'update' ] ) || ! empty( $data[ 'update' ] ) );
 
-			$is_check_action_button = ( 'check_license' === $data['edd_action'] && defined( 'DOING_AJAX' ) && DOING_AJAX );
+			$is_check_action_button = ( 'check_license' === $data[ 'edd_action' ] && defined( 'DOING_AJAX' ) && DOING_AJAX );
 
-			if( $is_check_action_button ) {
+			if ( $is_check_action_button ) {
 				delete_transient( self::status_transient_key );
 			}
 			// Failed is the response from trying to de-activate a license and it didn't work.
@@ -668,7 +668,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 );
 				}
 
@@ -679,7 +679,7 @@ 
 		if ( $is_ajax ) {
 			exit( $json );
 		} else { // Non-ajax call
-			return ( rgget('format', $data ) === 'object' ) ? $license_data : $json;
+			return ( rgget( 'format', $data ) === 'object' ) ? $license_data : $json;
 		}
 	}
 
@@ -693,9 +693,9 @@ 
 		// Update option with passed data license
 		$settings = $this->Addon->get_app_settings();
 
-        $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->Addon->update_app_settings( $settings );
 	}
@@ -710,9 +710,9 @@ 
 
 		$license_data = is_array( $license_data ) ? (object)$license_data : $license_data;
 
-		if( ! empty( $license_data->renewal_url ) ) {
+		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/';
@@ -734,31 +734,31 @@ 
 
 
 		$strings = array(
-			'status' => esc_html__('Status', 'gravityview'),
-			'error' => esc_html__('There was an error processing the request.', 'gravityview'),
-			'failed'  => esc_html__('Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview'),
-			'site_inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'inactive' => esc_html__('The license key is valid, but it has not been activated for this site.', 'gravityview'),
-			'no_activations_left' => esc_html__('Invalid: this license has reached its activation limit.', 'gravityview') . ' ' . sprintf( esc_html__('You can manage license activations %son your GravityView account page%s.', 'gravityview'), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
-			'deactivated' => esc_html__('The license has been deactivated.', 'gravityview'),
-			'valid' => esc_html__('The license key is valid and active.', 'gravityview'),
-			'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>' ),
+			'status' => esc_html__( 'Status', 'gravityview' ),
+			'error' => esc_html__( 'There was an error processing the request.', 'gravityview' ),
+			'failed'  => esc_html__( 'Could not deactivate the license. The license key you attempted to deactivate may not be active or valid.', 'gravityview' ),
+			'site_inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ),
+			'inactive' => esc_html__( 'The license key is valid, but it has not been activated for this site.', 'gravityview' ),
+			'no_activations_left' => esc_html__( 'Invalid: this license has reached its activation limit.', 'gravityview' ) . ' ' . sprintf( esc_html__( 'You can manage license activations %son your GravityView account page%s.', 'gravityview' ), '<a href="https://gravityview.co/account/#licenses">', '</a>' ),
+			'deactivated' => esc_html__( 'The license has been deactivated.', 'gravityview' ),
+			'valid' => esc_html__( 'The license key is valid and active.', 'gravityview' ),
+			'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>' ),
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
 
-			'verifying_license' => esc_html__('Verifying license&hellip;', 'gravityview'),
-			'activate_license' => esc_html__('Activate License', 'gravityview'),
-			'deactivate_license' => esc_html__('Deactivate License', 'gravityview'),
-			'check_license' => esc_html__('Verify License', 'gravityview'),
+			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
+			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
+			'deactivate_license' => esc_html__( 'Deactivate License', 'gravityview' ),
+			'check_license' => esc_html__( 'Verify License', 'gravityview' ),
 		);
 
-		if( empty( $status ) ) {
+		if ( empty( $status ) ) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
+		if ( isset( $strings[ $status ] ) ) {
 			return $strings[ $status ];
 		}
 

includes/fields/class-gravityview-field-hidden.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	function edit_entry_fix_hidden_fields( $fields ) {
 
 		/** @var GF_Field $field */
-		foreach( $fields as &$field ) {
+		foreach ( $fields as &$field ) {
 			if ( 'hidden' === $field->type ) {
 
 				/**
@@ -60,7 +60,7 @@ 
 				 */
 				$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', true, $field );
 
-				if( ! $reveal_hidden_field ) {
+				if ( ! $reveal_hidden_field ) {
 					continue;
 				}
 

includes/extensions/edit-entry/class-edit-entry-render.php

Indentation +23 added lines, -23 removed lines

@@ -359,9 +359,9 @@ 
 
 		/**
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
-         * @since 1.22.2
-         * @param bool $unset_hidden_field_values Default: true
-         * @param GravityView_Edit_Entry_Render $this This object
+		 * @since 1.22.2
+		 * @param bool $unset_hidden_field_values Default: true
+		 * @param GravityView_Edit_Entry_Render $this This object
 		 */
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
 
@@ -369,7 +369,7 @@ 
 			return;
 		}
 
-        if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
+		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
 		} else {
@@ -1288,7 +1288,7 @@ 
 
 			// TODO: Remove when minimum GF Version is 2.0.6.5
 			if( ! isset( $field->visibility ) && ! isset( $field->adminOnly ) ) {
-			    $field->adminOnly = NULL;
+				$field->adminOnly = NULL;
 			}
 
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1771,8 +1771,8 @@ 
 		 * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators.
 		 * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions
 		 * @since 1.9.1
-         * @since 1.22.6 Deprecated
-         * @deprecated Use gravityview/edit_entry/use_gf_visibility_setting instead
+		 * @since 1.22.6 Deprecated
+		 * @deprecated Use gravityview/edit_entry/use_gf_visibility_setting instead
 		 * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions.
 		 * @param array $form GF Form array
 		 * @param int $view_id View ID
@@ -1798,7 +1798,7 @@ 
 						unset( $fields[ $k ] );
 					}
 				} else{
-				    if( 'administrative' === $field->visibility ) {
+					if( 'administrative' === $field->visibility ) {
 						unset( $fields[ $k ] );
 					}
 				}
@@ -1808,25 +1808,25 @@ 
 
 		foreach( $fields as &$field ) {
 
-		    // TODO: Remove when minimum GF Version is 2.0.6.5
-		    if( ! isset( $field->visibility ) ) {
+			// TODO: Remove when minimum GF Version is 2.0.6.5
+			if( ! isset( $field->visibility ) ) {
 
-			    $field->adminOnly = false;
+				$field->adminOnly = false;
 
-		    } else {
+			} else {
 
-			    /**
-			     * @filter `gravityview/edit_entry/make_all_fields_visible` Set field visibility to "visible" for all fields
-			     * @since 1.22.6
-			     *
-			     * @param string $visibility 'visible' by default. Default options are 'hidden', 'visible', and 'administrative'
-			     * @param GF_Field $field Form field being modified
-			     * @param int $view_id Current View ID
-			     */
-			    $visibility = apply_filters( 'gravityview/edit_entry/field_visibility', 'visible', $field, $view_id );
+				/**
+				 * @filter `gravityview/edit_entry/make_all_fields_visible` Set field visibility to "visible" for all fields
+				 * @since 1.22.6
+				 *
+				 * @param string $visibility 'visible' by default. Default options are 'hidden', 'visible', and 'administrative'
+				 * @param GF_Field $field Form field being modified
+				 * @param int $view_id Current View ID
+				 */
+				$visibility = apply_filters( 'gravityview/edit_entry/field_visibility', 'visible', $field, $view_id );
 
-			    $field->visibility = $visibility;
-		    }
+				$field->visibility = $visibility;
+			}
 		}
 
 		return $fields;

Spacing +237 added lines, -237 removed lines

@@ -106,16 +106,16 @@ 
 	function load() {
 
 		/** @define "GRAVITYVIEW_DIR" "../../../" */
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		// Don't display an embedded form when editing an entry
 		add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
 		add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
 
 		// Stop Gravity Forms processing what is ours!
-		add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
 
-		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
+		add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
 
 		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
@@ -126,7 +126,7 @@ 
 		add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
 
 		// Add fields expected by GFFormDisplay::validate()
-		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
 
 		// Fix multiselect value for GF 2.2
 		add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 );
@@ -143,8 +143,8 @@ 
 	 * @return void
 	 */
 	public function prevent_render_form() {
-		if( $this->is_edit_entry() ) {
-			if( 'wp_head' === current_filter() ) {
+		if ( $this->is_edit_entry() ) {
+			if ( 'wp_head' === current_filter() ) {
 				add_filter( 'gform_shortcode_form', '__return_empty_string' );
 			} else {
 				remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -159,13 +159,13 @@ 
 	 */
 	public function prevent_maybe_process_form() {
 
-		if( ! empty( $_POST ) ) {
+		if ( ! empty( $_POST ) ) {
 			do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 		}
 
-		if( $this->is_edit_entry_submission() ) {
-			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+		if ( $this->is_edit_entry_submission() ) {
+			remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
+			remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 );
 		}
 	}
 
@@ -175,7 +175,7 @@ 
 	 */
 	public function is_edit_entry() {
 
-		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] );
+		$is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] );
 
 		return ( $is_edit_entry || $this->is_edit_entry_submission() );
 	}
@@ -186,7 +186,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return ! empty( $_POST[ self::$nonce_field ] );
 	}
 
 	/**
@@ -197,15 +197,15 @@ 
 
 
 		$entries = $gravityview_view->getEntries();
-		self::$original_entry = $entries[0];
-		$this->entry = $entries[0];
+		self::$original_entry = $entries[ 0 ];
+		$this->entry = $entries[ 0 ];
 
 		self::$original_form = $gravityview_view->getForm();
 		$this->form = $gravityview_view->getForm();
 		$this->form_id = $gravityview_view->getFormId();
 		$this->view_id = $gravityview_view->getViewId();
 
-		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
+		self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
 	}
 
 
@@ -226,14 +226,14 @@ 
 
 		// Multiple Views embedded, don't proceed if nonce fails
 		$multiple_views = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? gravityview()->views->count() > 1 : $gv_data->has_multiple_views();
-		if( $multiple_views && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
+		if ( $multiple_views && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' );
 			return;
 		}
 
 		// Sorry, you're not allowed here.
-		if( false === $this->user_can_edit_entry( true ) ) {
-			do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
+		if ( false === $this->user_can_edit_entry( true ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry );
 			return;
 		}
 
@@ -253,9 +253,9 @@ 
 	private function print_scripts() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
+		wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
 
-		GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
+		GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
 
 		// Sack is required for images
 		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
@@ -267,32 +267,32 @@ 
 	 */
 	private function process_save() {
 
-		if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) {
+		if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) {
 			return;
 		}
 
 		// Make sure the entry, view, and form IDs are all correct
 		$valid = $this->verify_nonce();
 
-		if( !$valid ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
+		if ( ! $valid ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
 			return;
 		}
 
-		if( $this->entry['id'] !== $_POST['lid'] ) {
-			do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
+		if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
 			return;
 		}
 
-		do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$this->process_save_process_files( $this->form_id );
 
 		$this->validate();
 
-		if( $this->is_valid ) {
+		if ( $this->is_valid ) {
 
-			do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
+			do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' );
 
 			/**
 			 * @hack This step is needed to fix field visibility, to add the calculation fields
@@ -302,22 +302,22 @@ 
 			/**
 			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
 			 */
-			unset( $_GET['page'] );
+			unset( $_GET[ 'page' ] );
 
-			$date_created = $this->entry['date_created'];
+			$date_created = $this->entry[ 'date_created' ];
 
 			/**
 			 * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead()
 			 * @since 1.17.2
 			 */
-			unset( $this->entry['date_created'] );
+			unset( $this->entry[ 'date_created' ] );
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
 			// Delete the values for hidden inputs
 			$this->unset_hidden_field_values();
 			
-			$this->entry['date_created'] = $date_created;
+			$this->entry[ 'date_created' ] = $date_created;
 
 			// Process calculation fields
 			$this->update_calculation_fields();
@@ -337,10 +337,10 @@ 
 			 * @param string $entry_id Numeric ID of the entry that was updated
 			 * @param GravityView_Edit_Entry_Render $this This object
 			 */
-			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this );
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this );
 
 		} else {
-			do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
+			do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry );
 		}
 
 	} // process_save
@@ -365,16 +365,16 @@ 
 		 */
 		$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this );
 
-		if( ! $unset_hidden_field_values ) {
+		if ( ! $unset_hidden_field_values ) {
 			return;
 		}
 
         if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = GFFormsModel::get_entry_meta_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) );
 		} else {
 			$lead_detail_table = GFFormsModel::get_lead_details_table_name();
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) );
 		}
 
 		foreach ( $this->entry as $input_id => $field_value ) {
@@ -455,7 +455,7 @@ 
 		}
 
 		/** No file is being uploaded. */
-		if ( empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 			/** So return the original upload */
 			return $entry[ $input_id ];
 		}
@@ -473,11 +473,11 @@ 
 	 * @return mixed
 	 */
 	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $plupload_init;
 		}
 
-		$plupload_init['gf_vars']['max_files'] = 0;
+		$plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
 
 		return $plupload_init;
 	}
@@ -492,22 +492,22 @@ 
 		$form = $this->form;
 
 		/** @var GF_Field $field */
-		foreach( $form['fields'] as $k => &$field ) {
+		foreach ( $form[ 'fields' ] as $k => &$field ) {
 
 			/**
 			 * Remove the fields with calculation formulas before save to avoid conflicts with GF logic
 			 * @since 1.16.3
 			 * @var GF_Field $field
 			 */
-			if( $field->has_calculation() ) {
-				unset( $form['fields'][ $k ] );
+			if ( $field->has_calculation() ) {
+				unset( $form[ 'fields' ][ $k ] );
 			}
 
 			$field->adminOnly = false;
 
-			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
-				foreach( $field->inputs as $key => $input ) {
-					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key => $input ) {
+					$field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
 				}
 			}
 		}
@@ -521,21 +521,21 @@ 
 		$update = false;
 
 		// get the most up to date entry values
-		$entry = GFAPI::get_entry( $this->entry['id'] );
+		$entry = GFAPI::get_entry( $this->entry[ 'id' ] );
 
-		if( !empty( $this->fields_with_calculation ) ) {
+		if ( ! empty( $this->fields_with_calculation ) ) {
 			$update = true;
 			foreach ( $this->fields_with_calculation as $calc_field ) {
 				$inputs = $calc_field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
 					foreach ( $inputs as $input ) {
-						$input_name = 'input_' . str_replace( '.', '_', $input['id'] );
+						$input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] );
 						list( $prefix, $field_id, $input_id ) = rgexplode( '_', $input_name, 3 );
 
 						switch ( $input_id ) {
 							case 1:
 								/** Never void the labels. */
-								$value = $entry[ $input['id'] ];
+								$value = $entry[ $input[ 'id' ] ];
 								break;
 							case 2:
 								/** Always recalcualte the final price. */
@@ -543,25 +543,25 @@ 
 								break;
 							case 3:
 								/** Fetch the quantity form the request. */
-								$value = rgpost( $input_name, $entry[ $input['id'] ] );
+								$value = rgpost( $input_name, $entry[ $input[ 'id' ] ] );
 								break;
 						}
 
-						$entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry['id'], $entry );
+						$entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, $value, $input_name, $entry[ 'id' ], $entry );
 					}
 				} else {
-					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id);
-					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry );
+					$input_name = 'input_' . str_replace( '.', '_', $calc_field->id );
+					$entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry );
 				}
 			}
 
 		}
 
-		if( $update ) {
+		if ( $update ) {
 
 			$return_entry = GFAPI::update_entry( $entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 				do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry );
 			} else {
 				do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' );
@@ -592,19 +592,19 @@ 
 
 		$input_name = 'input_' . $field_id;
 
-		if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
+		if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
 
 			// We have a new image
 
-			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
+			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
 			$ary = stripslashes_deep( $ary );
 			$img_url = rgar( $ary, 0 );
 
-			$img_title	   = count( $ary ) > 1 ? $ary[1] : '';
-			$img_caption	 = count( $ary ) > 2 ? $ary[2] : '';
-			$img_description = count( $ary ) > 3 ? $ary[3] : '';
+			$img_title	   = count( $ary ) > 1 ? $ary[ 1 ] : '';
+			$img_caption	 = count( $ary ) > 2 ? $ary[ 2 ] : '';
+			$img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
 
 			$image_meta = array(
 				'post_excerpt' => $img_caption,
@@ -613,7 +613,7 @@ 
 
 			//adding title only if it is not empty. It will default to the file name if it is not in the array
 			if ( ! empty( $img_title ) ) {
-				$image_meta['post_title'] = $img_title;
+				$image_meta[ 'post_title' ] = $img_title;
 			}
 
 			/**
@@ -627,11 +627,11 @@ 
 				set_post_thumbnail( $post_id, $media_id );
 			}
 
-		} elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
+		} elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
 
 			$img_url         = rgpost( $input_name );
-			$img_title	     = rgpost( $input_name . '_1' );
-			$img_caption	 = rgpost( $input_name . '_4' );
+			$img_title = rgpost( $input_name . '_1' );
+			$img_caption = rgpost( $input_name . '_4' );
 			$img_description = rgpost( $input_name . '_7' );
 
 			$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
@@ -670,16 +670,16 @@ 
 	 */
 	private function maybe_update_post_fields( $form ) {
 
-		if( empty( $this->entry['post_id'] ) ) {
+		if ( empty( $this->entry[ 'post_id' ] ) ) {
 			do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' );
 			return;
 		}
 
-		$post_id = $this->entry['post_id'];
+		$post_id = $this->entry[ 'post_id' ];
 
 		// Security check
-		if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
-			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
+		if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
+			do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
 			return;
 		}
 
@@ -691,25 +691,25 @@ 
 
 			$field = RGFormsModel::get_field( $form, $field_id );
 
-			if( ! $field ) {
+			if ( ! $field ) {
 				continue;
 			}
 
-			if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
+			if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) {
 
 				// Get the value of the field, including $_POSTed value
 				$value = RGFormsModel::get_field_value( $field );
 
 				// Use temporary entry variable, to make values available to fill_post_template() and update_post_image()
 				$entry_tmp = $this->entry;
-				$entry_tmp["{$field_id}"] = $value;
+				$entry_tmp[ "{$field_id}" ] = $value;
 
-				switch( $field->type ) {
+				switch ( $field->type ) {
 
 					case 'post_title':
 						$post_title = $value;
-						if( rgar( $form, 'postTitleTemplateEnabled' ) ) {
-							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+						if ( rgar( $form, 'postTitleTemplateEnabled' ) ) {
+							$post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp );
 						}
 						$updated_post->post_title = $post_title;
 						$updated_post->post_name  = $post_title;
@@ -718,8 +718,8 @@ 
 
 					case 'post_content':
 						$post_content = $value;
-						if( rgar( $form, 'postContentTemplateEnabled' ) ) {
-							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+						if ( rgar( $form, 'postContentTemplateEnabled' ) ) {
+							$post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true );
 						}
 						$updated_post->post_content = $post_content;
 						unset( $post_content );
@@ -737,12 +737,12 @@ 
 							$value = $value[ $field_id ];
 						}
 
-						if( ! empty( $field->customFieldTemplateEnabled ) ) {
+						if ( ! empty( $field->customFieldTemplateEnabled ) ) {
 							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
 						}
 
 						if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) {
-							$value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
+							$value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
 						}
 
 						update_post_meta( $post_id, $field->postCustomFieldName, $value );
@@ -755,7 +755,7 @@ 
 				}
 
 				// update entry after
-				$this->entry["{$field_id}"] = $value;
+				$this->entry[ "{$field_id}" ] = $value;
 
 				$update_entry = true;
 
@@ -764,25 +764,25 @@ 
 
 		}
 
-		if( $update_entry ) {
+		if ( $update_entry ) {
 
 			$return_entry = GFAPI::update_entry( $this->entry );
 
-			if( is_wp_error( $return_entry ) ) {
+			if ( is_wp_error( $return_entry ) ) {
 			   do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) );
 			} else {
-				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
 			}
 
 		}
 
 		$return_post = wp_update_post( $updated_post, true );
 
-		if( is_wp_error( $return_post ) ) {
+		if ( is_wp_error( $return_post ) ) {
 			$return_post->add_data( $updated_post, '$updated_post' );
 			do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) );
 		} else {
-			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
 		}
 	}
 
@@ -800,7 +800,7 @@ 
 		$input_type = RGFormsModel::get_input_type( $field );
 
 		// Only certain custom field types are supported
-		switch( $input_type ) {
+		switch ( $input_type ) {
 			case 'fileupload':
 			case 'list':
 			case 'multiselect':
@@ -837,7 +837,7 @@ 
 		$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false );
 
 		// replace conditional shortcodes
-		if( $do_shortcode ) {
+		if ( $do_shortcode ) {
 			$output = do_shortcode( $output );
 		}
 
@@ -856,19 +856,19 @@ 
 	 */
 	private function after_update() {
 
-		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry );
-		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry );
+		do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry );
+		do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry );
 
 		// Re-define the entry now that we've updated it.
-		$entry = RGFormsModel::get_lead( $this->entry['id'] );
+		$entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
 
 		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
 		if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) {
 			// We need to clear the cache because Gravity Forms caches the field values, which
 			// we have just updated.
-			foreach ($this->form['fields'] as $key => $field) {
-				GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
+			foreach ( $this->form[ 'fields' ] as $key => $field ) {
+				GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
 			}
 		}
 
@@ -887,7 +887,7 @@ 
 
 		<div class="gv-edit-entry-wrapper"><?php
 
-			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
+			$javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
 
 			/**
 			 * Fixes weird wpautop() issue
@@ -903,7 +903,7 @@ 
 					 * @param string $edit_entry_title Modify the "Edit Entry" title
 					 * @param GravityView_Edit_Entry_Render $this This object
 					 */
-					$edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
+					$edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
 
 					echo esc_attr( $edit_entry_title );
 			?></span>
@@ -949,20 +949,20 @@ 
 	 */
 	private function maybe_print_message() {
 
-		if( rgpost('action') === 'update' ) {
+		if ( rgpost( 'action' ) === 'update' ) {
 
 			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-			if( ! $this->is_valid ){
+			if ( ! $this->is_valid ) {
 
 				// Keeping this compatible with Gravity Forms.
-				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
-				$message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
+				$validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
+				$message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
 
-				echo GVCommon::generate_notice( $message , 'gv-error' );
+				echo GVCommon::generate_notice( $message, 'gv-error' );
 
 			} else {
-				$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
+				$entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' );
 
 				/**
 				 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -972,7 +972,7 @@ 
 				 * @param array $entry Gravity Forms entry array
 				 * @param string $back_link URL to return to the original entry. @since 1.6
 				 */
-				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
+				$message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
 
 				echo GVCommon::generate_notice( $message );
 			}
@@ -996,21 +996,21 @@ 
 		 */
 		do_action( 'gravityview/edit-entry/render/before', $this );
 
-		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
-		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
+		add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
+		add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
 		add_filter( 'gform_disable_view_counter', '__return_true' );
 
 		add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
 		add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
 
 		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
-		unset( $_GET['page'] );
+		unset( $_GET[ 'page' ] );
 
 		// TODO: Verify multiple-page forms
 
 		ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic
 
-		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+		$html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
 
 		ob_get_clean();
 
@@ -1036,7 +1036,7 @@ 
 	 * @return string
 	 */
 	public function render_form_buttons() {
-		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+		return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
 	}
 
 
@@ -1056,10 +1056,10 @@ 
 	public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
 
 		// In case we have validated the form, use it to inject the validation results into the form render
-		if( isset( $this->form_after_validation ) ) {
+		if ( isset( $this->form_after_validation ) ) {
 			$form = $this->form_after_validation;
 		} else {
-			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+			$form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
 		}
 
 		$form = $this->filter_conditional_logic( $form );
@@ -1067,8 +1067,8 @@ 
 		$form = $this->prefill_conditional_logic( $form );
 
 		// for now we don't support Save and Continue feature.
-		if( ! self::$supports_save_and_continue ) {
-			unset( $form['save'] );
+		if ( ! self::$supports_save_and_continue ) {
+			unset( $form[ 'save' ] );
 		}
 
 		return $form;
@@ -1089,29 +1089,29 @@ 
 	 */
 	public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
 
-		if( GFCommon::is_post_field( $field ) ) {
+		if ( GFCommon::is_post_field( $field ) ) {
 
 			$message = null;
 
 			// First, make sure they have the capability to edit the post.
-			if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+			if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
 
 				/**
 				 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
 				 * @param string $message The existing "You don't have permission..." text
 				 */
-				$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+				$message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
 
-			} elseif( null === get_post( $this->entry['post_id'] ) ) {
+			} elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
 				/**
 				 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
 				 * @param string $message The existing "This field is not editable; the post no longer exists." text
 				 */
-				$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+				$message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
 			}
 
-			if( $message ) {
-				$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+			if ( $message ) {
+				$field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
 			}
 		}
 
@@ -1136,8 +1136,8 @@ 
 
 		// If the form has been submitted, then we don't need to pre-fill the values,
 		// Except for fileupload type and when a field input is overridden- run always!!
-		if(
-			( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
+		if (
+			( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
 			&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
 			&& ! GFCommon::is_product_field( $field->type )
 			|| ! empty( $field_content )
@@ -1157,7 +1157,7 @@ 
 		$return = null;
 
 		/** @var GravityView_Field $gv_field */
-		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
+		if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
 		} else {
 			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -1166,7 +1166,7 @@ 
 		// If there was output, it's an error
 		$warnings = ob_get_clean();
 
-		if( !empty( $warnings ) ) {
+		if ( ! empty( $warnings ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
 		}
 
@@ -1191,7 +1191,7 @@ 
 		$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
 
 		// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
-		if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
+		if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
 
 			$field_value = array();
 
@@ -1200,10 +1200,10 @@ 
 
 			foreach ( (array)$field->inputs as $input ) {
 
-				$input_id = strval( $input['id'] );
+				$input_id = strval( $input[ 'id' ] );
 				
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
-					$field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
+					$field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
 					$allow_pre_populated = false;
 				}
 
@@ -1211,7 +1211,7 @@ 
 
 			$pre_value = $field->get_value_submission( array(), false );
 
-			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
 
 		} else {
 
@@ -1222,13 +1222,13 @@ 
 
 			// saved field entry value (if empty, fallback to the pre-populated value, if exists)
 			// or pre-populated value if not empty and set to override saved value
-			$field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
+			$field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
 
 			// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
-			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
+			if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
 				$categories = array();
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
-					$categories[] = GFCommon::format_post_category( $cat_string, true );
+					$categories[ ] = GFCommon::format_post_category( $cat_string, true );
 				}
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
 			}
@@ -1256,7 +1256,7 @@ 
 		 * @param GF_Field $field Gravity Forms field object
 		 * @param GravityView_Edit_Entry_Render $this Current object
 		 */
-		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this );
 
 		return $field_value;
 	}
@@ -1273,12 +1273,12 @@ 
 	 */
 	public function gform_pre_validation( $form ) {
 
-		if( ! $this->verify_nonce() ) {
+		if ( ! $this->verify_nonce() ) {
 			return $form;
 		}
 
 		// Fix PHP warning regarding undefined index.
-		foreach ( $form['fields'] as &$field) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
 			// This is because we're doing admin form pretending to be front-end, so Gravity Forms
 			// expects certain field array items to be set.
@@ -1287,11 +1287,11 @@ 
 			}
 
 			// TODO: Remove when minimum GF Version is 2.0.6.5
-			if( ! isset( $field->visibility ) && ! isset( $field->adminOnly ) ) {
+			if ( ! isset( $field->visibility ) && ! isset( $field->adminOnly ) ) {
 			    $field->adminOnly = NULL;
 			}
 
-			switch( RGFormsModel::get_input_type( $field ) ) {
+			switch ( RGFormsModel::get_input_type( $field ) ) {
 
 				/**
 				 * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1305,37 +1305,37 @@ 
 					// Set the previous value
 					$entry = $this->get_entry();
 
-					$input_name = 'input_'.$field->id;
-					$form_id = $form['id'];
+					$input_name = 'input_' . $field->id;
+					$form_id = $form[ 'id' ];
 
 					$value = NULL;
 
 					// Use the previous entry value as the default.
-					if( isset( $entry[ $field->id ] ) ) {
+					if ( isset( $entry[ $field->id ] ) ) {
 						$value = $entry[ $field->id ];
 					}
 
 					// If this is a single upload file
-					if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
-						$file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
-						$value = $file_path['url'];
+					if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
+						$file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
+						$value = $file_path[ 'url' ];
 
 					} else {
 
 						// Fix PHP warning on line 1498 of form_display.php for post_image fields
 						// Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
-						$_FILES[ $input_name ] = array('name' => '', 'size' => '' );
+						$_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
 
 					}
 
-					if( rgar($field, "multipleFiles") ) {
+					if ( rgar( $field, "multipleFiles" ) ) {
 
 						// If there are fresh uploads, process and merge them.
 						// Otherwise, use the passed values, which should be json-encoded array of URLs
-						if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
+						if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
 							$value = empty( $value ) ? '[]' : $value;
 							$value = stripslashes_deep( $value );
-							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
 						}
 
 					} else {
@@ -1353,8 +1353,8 @@ 
 
 				case 'number':
 					// Fix "undefined index" issue at line 1286 in form_display.php
-					if( !isset( $_POST['input_'.$field->id ] ) ) {
-						$_POST['input_'.$field->id ] = NULL;
+					if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
+						$_POST[ 'input_' . $field->id ] = NULL;
 					}
 					break;
 			}
@@ -1396,7 +1396,7 @@ 
 		 * You can enter whatever you want!
 		 * We try validating, and customize the results using `self::custom_validation()`
 		 */
-		add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
+		add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
 
 		// Needed by the validate funtion
 		$failed_validation_page = NULL;
@@ -1404,14 +1404,14 @@ 
 
 		// Prevent entry limit from running when editing an entry, also
 		// prevent form scheduling from preventing editing
-		unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
 
 		// Hide fields depending on Edit Entry settings
-		$this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
+		$this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
 
 		$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
 
-		remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
+		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
 		remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'user_registration_validation' ), 10 );
 	}
 
@@ -1428,7 +1428,7 @@ 
 		$user_registration = GF_User_Registration::get_instance();
 
 		$entry = $this->get_entry();
-		$form = $validation_results['form'];
+		$form = $validation_results[ 'form' ];
 
 		if ( ! $feed = $user_registration->get_single_submission_feed( $entry, $form ) ) {
 			return $validation_results;
@@ -1444,18 +1444,18 @@ 
 		if ( $user_email != $value && email_exists( $value ) ) {
 			$email_field->failed_validation = 1;
 			$email_field->validation_message = __( 'This email is already in use', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		$value = RGFormsModel::get_field_value( $username_field );
 		if ( $username != $value ) {
 			$username_field->failed_validation = 1;
 			$username_field->validation_message = __( 'Usernames cannot be changed', 'gravityview' );
-			$validation_results['is_valid'] = false;
+			$validation_results[ 'is_valid' ] = false;
 		}
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1473,13 +1473,13 @@ 
 	 */
 	public function custom_validation( $validation_results ) {
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
 		$gv_valid = true;
 
-		foreach ( $validation_results['form']['fields'] as $key => &$field ) {
+		foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
 
 			$value = RGFormsModel::get_field_value( $field );
 			$field_type = RGFormsModel::get_input_type( $field );
@@ -1492,35 +1492,35 @@ 
 				case 'post_image':
 
 					// in case nothing is uploaded but there are already files saved
-					if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
+					if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
 						$field->failed_validation = false;
 						unset( $field->validation_message );
 					}
 
 					// validate if multi file upload reached max number of files [maxFiles] => 2
-					if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
+					if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) {
 
 						$input_name = 'input_' . $field->id;
 						//uploaded
-						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
+						$file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
 
 						//existent
 						$entry = $this->get_entry();
 						$value = NULL;
-						if( isset( $entry[ $field->id ] ) ) {
+						if ( isset( $entry[ $field->id ] ) ) {
 							$value = json_decode( $entry[ $field->id ], true );
 						}
 
 						// count uploaded files and existent entry files
 						$count_files = count( $file_names ) + count( $value );
 
-						if( $count_files > $field->maxFiles ) {
+						if ( $count_files > $field->maxFiles ) {
 							$field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
 							$field->failed_validation = 1;
 							$gv_valid = false;
 
 							// in case of error make sure the newest upload files are removed from the upload input
-							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+							GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
 						}
 
 					}
@@ -1531,7 +1531,7 @@ 
 			}
 
 			// This field has failed validation.
-			if( !empty( $field->failed_validation ) ) {
+			if ( ! empty( $field->failed_validation ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
@@ -1549,32 +1549,32 @@ 
 				}
 
 				// You can't continue inside a switch, so we do it after.
-				if( empty( $field->failed_validation ) ) {
+				if ( empty( $field->failed_validation ) ) {
 					continue;
 				}
 
 				// checks if the No Duplicates option is not validating entry against itself, since
 				// we're editing a stored entry, it would also assume it's a duplicate.
-				if( !empty( $field->noDuplicates ) ) {
+				if ( ! empty( $field->noDuplicates ) ) {
 
 					$entry = $this->get_entry();
 
 					// If the value of the entry is the same as the stored value
 					// Then we can assume it's not a duplicate, it's the same.
-					if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
+					if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
 						//if value submitted was not changed, then don't validate
 						$field->failed_validation = false;
 
 						unset( $field->validation_message );
 
-						do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
+						do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
 
 						continue;
 					}
 				}
 
 				// if here then probably we are facing the validation 'At least one field must be filled out'
-				if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
+				if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
 					unset( $field->validation_message );
 					$field->validation_message = false;
 					continue;
@@ -1586,12 +1586,12 @@ 
 
 		}
 
-		$validation_results['is_valid'] = $gv_valid;
+		$validation_results[ 'is_valid' ] = $gv_valid;
 
-		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
+		do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
 
 		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
-		$this->form_after_validation = $validation_results['form'];
+		$this->form_after_validation = $validation_results[ 'form' ];
 
 		return $validation_results;
 	}
@@ -1604,7 +1604,7 @@ 
 	 */
 	public function get_entry() {
 
-		if( empty( $this->entry ) ) {
+		if ( empty( $this->entry ) ) {
 			// Get the database value of the entry that's being edited
 			$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
 		}
@@ -1639,10 +1639,10 @@ 
 		}
 
 		// If edit tab not yet configured, show all fields
-		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		$edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
 
 		// Hide fields depending on admin settings
-		$fields = $this->filter_fields( $form['fields'], $edit_fields );
+		$fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
 
 		// If Edit Entry fields are configured, remove hidden/administrative field settings. Otherwise, don't.
 		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1674,7 +1674,7 @@ 
 	 */
 	private function filter_fields( $fields, $configured_fields ) {
 
-		if( empty( $fields ) || !is_array( $fields ) ) {
+		if ( empty( $fields ) || ! is_array( $fields ) ) {
 			return $fields;
 		}
 
@@ -1687,18 +1687,18 @@ 
 
 			// Remove the fields that have calculation properties and keep them to be used later
 			// @since 1.16.2
-			if( $field->has_calculation() ) {
-				$this->fields_with_calculation[] = $field;
+			if ( $field->has_calculation() ) {
+				$this->fields_with_calculation[ ] = $field;
 				// don't remove the calculation fields on form render.
 			}
 
-			if( in_array( $field->type, $field_type_blacklist ) ) {
+			if ( in_array( $field->type, $field_type_blacklist ) ) {
 				unset( $fields[ $key ] );
 			}
 		}
 
 		// The Edit tab has not been configured, so we return all fields by default.
-		if( empty( $configured_fields ) ) {
+		if ( empty( $configured_fields ) ) {
 			return $fields;
 		}
 
@@ -1708,8 +1708,8 @@ 
 			/** @var GF_Field $field */
 			foreach ( $fields as $field ) {
 
-				if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
-					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+				if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
+					$edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
 					break;
 				}
 
@@ -1732,14 +1732,14 @@ 
 
 		$return_field = $field;
 
-		if( empty( $field_setting['show_label'] ) ) {
+		if ( empty( $field_setting[ 'show_label' ] ) ) {
 			$return_field->label = '';
-		} elseif ( !empty( $field_setting['custom_label'] ) ) {
-			$return_field->label = $field_setting['custom_label'];
+		} elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
+			$return_field->label = $field_setting[ 'custom_label' ];
 		}
 
-		if( !empty( $field_setting['custom_class'] ) ) {
-			$return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
+		if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
+			$return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
 		}
 
 		/**
@@ -1790,15 +1790,15 @@ 
 		 */
 		$use_gf_visibility_setting = apply_filters( 'gravityview/edit_entry/use_gf_visibility_setting', empty( $edit_fields ), $form, $view_id );
 
-		if( $use_gf_adminonly_setting && $use_gf_visibility_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-			foreach( $fields as $k => $field ) {
+		if ( $use_gf_adminonly_setting && $use_gf_visibility_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
+			foreach ( $fields as $k => $field ) {
 				// TODO: Remove when minimum GF Version is 2.0.6.5
-				if( ! isset( $field->visibility ) ) {
-					if( $field->adminOnly ) {
+				if ( ! isset( $field->visibility ) ) {
+					if ( $field->adminOnly ) {
 						unset( $fields[ $k ] );
 					}
-				} else{
-				    if( 'administrative' === $field->visibility ) {
+				} else {
+				    if ( 'administrative' === $field->visibility ) {
 						unset( $fields[ $k ] );
 					}
 				}
@@ -1806,10 +1806,10 @@ 
 			return $fields;
 		}
 
-		foreach( $fields as &$field ) {
+		foreach ( $fields as &$field ) {
 
 		    // TODO: Remove when minimum GF Version is 2.0.6.5
-		    if( ! isset( $field->visibility ) ) {
+		    if ( ! isset( $field->visibility ) ) {
 
 			    $field->adminOnly = false;
 
@@ -1849,22 +1849,22 @@ 
 	 */
 	function prefill_conditional_logic( $form ) {
 
-		if( ! GFFormDisplay::has_conditional_logic( $form ) ) {
+		if ( ! GFFormDisplay::has_conditional_logic( $form ) ) {
 			return $form;
 		}
 
 		// Have Conditional Logic pre-fill fields as if the data were default values
 		/** @var GF_Field $field */
-		foreach ( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 
-			if( 'checkbox' === $field->type ) {
+			if ( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-					$input_id = $input['id'];
+					$input_id = $input[ 'id' ];
 					$choice = $field->choices[ $key ];
 					$value = rgar( $this->entry, $input_id );
 					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
-					if( $match ) {
-						$field->choices[ $key ]['isSelected'] = true;
+					if ( $match ) {
+						$field->choices[ $key ][ 'isSelected' ] = true;
 					}
 				}
 			} else {
@@ -1872,15 +1872,15 @@ 
 				// We need to run through each field to set the default values
 				foreach ( $this->entry as $field_id => $field_value ) {
 
-					if( floatval( $field_id ) === floatval( $field->id ) ) {
+					if ( floatval( $field_id ) === floatval( $field->id ) ) {
 
-						if( 'list' === $field->type ) {
+						if ( 'list' === $field->type ) {
 							$list_rows = maybe_unserialize( $field_value );
 
 							$list_field_value = array();
-							foreach ( (array) $list_rows as $row ) {
-								foreach ( (array) $row as $column ) {
-									$list_field_value[] = $column;
+							foreach ( (array)$list_rows as $row ) {
+								foreach ( (array)$row as $column ) {
+									$list_field_value[ ] = $column;
 								}
 							}
 
@@ -1915,16 +1915,16 @@ 
 		 */
 		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
 
-		if( $use_conditional_logic ) {
+		if ( $use_conditional_logic ) {
 			return $form;
 		}
 
-		foreach( $form['fields'] as &$field ) {
+		foreach ( $form[ 'fields' ] as &$field ) {
 			/* @var GF_Field $field */
 			$field->conditionalLogic = null;
 		}
 
-		unset( $form['button']['conditionalLogic'] );
+		unset( $form[ 'button' ][ 'conditionalLogic' ] );
 
 		return $form;
 
@@ -1941,7 +1941,7 @@ 
 	 */
 	public function manage_conditional_logic( $has_conditional_logic, $form ) {
 
-		if( ! $this->is_edit_entry() ) {
+		if ( ! $this->is_edit_entry() ) {
 			return $has_conditional_logic;
 		}
 
@@ -1973,44 +1973,44 @@ 
 		 *  2. There are two entries embedded using oEmbed
 		 *  3. One of the entries has just been saved
 		 */
-		if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
+		if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
 
 			$error = true;
 
 		}
 
-		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+		if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
 
 			$error = true;
 
-		} elseif( ! $this->verify_nonce() ) {
+		} elseif ( ! $this->verify_nonce() ) {
 
 			/**
 			 * If the Entry is embedded, there may be two entries on the same page.
 			 * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
 			 */
-			if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
+			if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
 				$error = true;
 			} else {
-				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
+				$error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
 			}
 
 		}
 
-		if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-			$error = __( 'You do not have permission to edit this entry.', 'gravityview');
+		if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
+			$error = __( 'You do not have permission to edit this entry.', 'gravityview' );
 		}
 
-		if( $this->entry['status'] === 'trash' ) {
-			$error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
+		if ( $this->entry[ 'status' ] === 'trash' ) {
+			$error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo && $error !== true ) {
+		if ( $echo && $error !== true ) {
 
 			$error = esc_html( $error );
 
@@ -2018,13 +2018,13 @@ 
 			 * @since 1.9
 			 */
 			if ( ! empty( $this->entry ) ) {
-				$error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
+				$error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
 			}
 
-			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
 
 		return false;
 	}
@@ -2041,20 +2041,20 @@ 
 
 		$error = NULL;
 
-		if( ! $this->check_user_cap_edit_field( $field ) ) {
-			$error = __( 'You do not have permission to edit this field.', 'gravityview');
+		if ( ! $this->check_user_cap_edit_field( $field ) ) {
+			$error = __( 'You do not have permission to edit this field.', 'gravityview' );
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if ( empty( $error ) ) {
 			return true;
 		}
 
-		if( $echo ) {
-			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
+		if ( $echo ) {
+			echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
+		do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
 
 		return false;
 
@@ -2072,15 +2072,15 @@ 
 	private function check_user_cap_edit_field( $field ) {
 
 		// If they can edit any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
 			return true;
 		}
 
-		$field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		$field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
 
 		// If the field has custom editing capaibilities set, check those
-		if( $field_cap ) {
-			return GVCommon::has_cap( $field['allow_edit_cap'] );
+		if ( $field_cap ) {
+			return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
 		}
 
 		return false;
@@ -2094,17 +2094,17 @@ 
 	public function verify_nonce() {
 
 		// Verify form submitted for editing single
-		if( $this->is_edit_entry_submission() ) {
+		if ( $this->is_edit_entry_submission() ) {
 			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
 		}
 
 		// Verify
-		else if( ! $this->is_edit_entry() ) {
+		else if ( ! $this->is_edit_entry() ) {
 			$valid = false;
 		}
 
 		else {
-			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+			$valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
 		}
 
 		/**

Braces +3 added lines, -5 removed lines

@@ -953,7 +953,7 @@ 
 
 			$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-			if( ! $this->is_valid ){
+			if( ! $this->is_valid ) {
 
 				// Keeping this compatible with Gravity Forms.
 				$validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
@@ -1797,7 +1797,7 @@ 
 					if( $field->adminOnly ) {
 						unset( $fields[ $k ] );
 					}
-				} else{
+				} else {
 				    if( 'administrative' === $field->visibility ) {
 						unset( $fields[ $k ] );
 					}
@@ -2101,9 +2101,7 @@ 
 		// Verify
 		else if( ! $this->is_edit_entry() ) {
 			$valid = false;
-		}
-
-		else {
+		} else {
 			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
 		}
 

includes/class-gravityview-migrate.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 			$table_name = GFFormsModel::get_lead_meta_table_name();
 		}
 
-		$sql = "UPDATE {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
+		$sql = "update {$table_name} SET `meta_value` = %s WHERE `meta_key` = 'is_approved' AND `meta_value` = %s";
 
 		$approved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::APPROVED, 'Approved' ) );
 

includes/wordpress-widgets/class-gravityview-search-wp-widget.php

Spacing +57 added lines, -57 removed lines

@@ -11,7 +11,7 @@ 
 
 		$widget_ops = array(
 			'classname' => 'widget_gravityview_search',
-			'description' => __( 'A search form for a specific GravityView.', 'gravityview')
+			'description' => __( 'A search form for a specific GravityView.', 'gravityview' )
 		);
 
 		$widget_display = array(
@@ -34,7 +34,7 @@ 
 	}
 
 	private function load_required_files() {
-		if( !class_exists( 'GravityView_Widget_Search' ) ) {
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
 			gravityview_register_gravityview_widgets();
 		}
 	}
@@ -53,30 +53,30 @@ 
 	public function widget( $args, $instance ) {
 
 		// Don't show unless a View ID has been set.
-		if( empty( $instance['view_id'] ) ) {
+		if ( empty( $instance[ 'view_id' ] ) ) {
 
-			do_action('gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class($this)), $instance );
+			do_action( 'gravityview_log_debug', sprintf( '%s[widget]: No View ID has been defined. Not showing the widget.', get_class( $this ) ), $instance );
 
 			return;
 		}
 
 		/** This filter is documented in wp-includes/default-widgets.php */
-		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
+		$title = apply_filters( 'widget_title', empty( $instance[ 'title' ] ) ? '' : $instance[ 'title' ], $instance, $this->id_base );
 
-		echo $args['before_widget'];
+		echo $args[ 'before_widget' ];
 
 		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+			echo $args[ 'before_title' ] . $title . $args[ 'after_title' ];
 		}
 
 		// @todo Add to the widget configuration form
-		$instance['search_layout'] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
+		$instance[ 'search_layout' ] = apply_filters( 'gravityview/widget/search/layout', 'vertical', $instance );
 
-		$instance['context'] = 'wp_widget';
+		$instance[ 'context' ] = 'wp_widget';
 
 		// form
-		$instance['form_id'] = GVCommon::get_meta_form_id( $instance['view_id'] );
-		$instance['form'] = GVCommon::get_form( $instance['form_id'] );
+		$instance[ 'form_id' ] = GVCommon::get_meta_form_id( $instance[ 'view_id' ] );
+		$instance[ 'form' ] = GVCommon::get_form( $instance[ 'form_id' ] );
 
 		// We don't want to overwrite existing context, etc.
 		$previous_view = GravityView_View::getInstance();
@@ -92,7 +92,7 @@ 
 		 */
 		new GravityView_View( $previous_view );
 
-		echo $args['after_widget'];
+		echo $args[ 'after_widget' ];
 	}
 
 	/**
@@ -102,27 +102,27 @@ 
 
 		$instance = $old_instance;
 
-		if( $this->is_preview() ) {
+		if ( $this->is_preview() ) {
 			//Oh! Sorry but still not fully compatible with customizer
 			return $instance;
 		}
 
-		$new_instance = wp_parse_args( (array) $new_instance, self::get_defaults() );
+		$new_instance = wp_parse_args( (array)$new_instance, self::get_defaults() );
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
-		$instance['view_id'] = absint( $new_instance['view_id'] );
-		$instance['search_fields'] = $new_instance['search_fields'];
-		$instance['post_id'] = $new_instance['post_id'];
-		$instance['search_clear'] = $new_instance['search_clear'];
-		$instance['search_mode'] = $new_instance['search_mode'];
+		$instance[ 'title' ] = strip_tags( $new_instance[ 'title' ] );
+		$instance[ 'view_id' ] = absint( $new_instance[ 'view_id' ] );
+		$instance[ 'search_fields' ] = $new_instance[ 'search_fields' ];
+		$instance[ 'post_id' ] = $new_instance[ 'post_id' ];
+		$instance[ 'search_clear' ] = $new_instance[ 'search_clear' ];
+		$instance[ 'search_mode' ] = $new_instance[ 'search_mode' ];
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance['post_id'], $instance['view_id'], true );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $new_instance[ 'post_id' ], $instance[ 'view_id' ], true );
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance[ 'error_post_id' ] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance[ 'updated' ] = 1;
 
 		return $instance;
 	}
@@ -133,28 +133,28 @@ 
 	public function form( $instance ) {
 
 		// @todo Make compatible with Customizer
-		if( $this->is_preview() ) {
+		if ( $this->is_preview() ) {
 
-			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="'.admin_url('widgets.php').'">', '</a>' );
+			$warning = sprintf( esc_html__( 'This widget is not configurable from this screen. Please configure it on the %sWidgets page%s.', 'gravityview' ), '<a href="' . admin_url( 'widgets.php' ) . '">', '</a>' );
 
 			echo wpautop( GravityView_Admin::get_floaty() . $warning );
 
 			return;
 		}
 
-		$instance = wp_parse_args( (array) $instance, self::get_defaults() );
+		$instance = wp_parse_args( (array)$instance, self::get_defaults() );
 
-		$title    = $instance['title'];
-		$view_id  = $instance['view_id'];
-		$post_id  = $instance['post_id'];
-		$search_fields = $instance['search_fields'];
-		$search_clear = $instance['search_clear'];
-		$search_mode = $instance['search_mode'];
+		$title    = $instance[ 'title' ];
+		$view_id  = $instance[ 'view_id' ];
+		$post_id  = $instance[ 'post_id' ];
+		$search_fields = $instance[ 'search_fields' ];
+		$search_clear = $instance[ 'search_clear' ];
+		$search_mode = $instance[ 'search_mode' ];
 
 		$views = GVCommon::get_all_views();
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) { ?>
+		if ( empty( $views ) ) { ?>
 			<div id="select_gravityview_view">
 				<div class="wrap"><?php echo GravityView_Admin::no_views_text(); ?></div>
 			</div>
@@ -162,17 +162,17 @@ 
 		}
 		?>
 
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'gravityview'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'gravityview' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></label></p>
 
 		<?php
 		/**
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if ( isset( $instance[ 'updated' ] ) && empty( $instance[ 'view_id' ] ) ) {
 			?>
 			<div class="error inline hide-on-view-change">
-				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
+				<p><?php esc_html_e( 'Please select a View to search.', 'gravityview' ); ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -181,12 +181,12 @@ 
 
 		<p>
 			<label for="gravityview_view_id"><?php _e( 'View:', 'gravityview' ); ?></label>
-			<select id="gravityview_view_id" name="<?php echo $this->get_field_name('view_id'); ?>" class="widefat">
+			<select id="gravityview_view_id" name="<?php echo $this->get_field_name( 'view_id' ); ?>" class="widefat">
 				<option value=""><?php esc_html_e( '&mdash; Select a View &mdash;', 'gravityview' ); ?></option>
 				<?php
-				foreach( $views as $view_option ) {
-					$title = empty( $view_option->post_title ) ? __('(no title)', 'gravityview') : $view_option->post_title;
-					echo '<option value="'. $view_option->ID .'" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>'. esc_html( sprintf('%s #%d', $title, $view_option->ID ) ) .'</option>';
+				foreach ( $views as $view_option ) {
+					$title = empty( $view_option->post_title ) ? __( '(no title)', 'gravityview' ) : $view_option->post_title;
+					echo '<option value="' . $view_option->ID . '" ' . selected( esc_attr( $view_id ), $view_option->ID, false ) . '>' . esc_html( sprintf( '%s #%d', $title, $view_option->ID ) ) . '</option>';
 				}
 				?>
 			</select>
@@ -198,10 +198,10 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if ( ! empty( $instance[ 'error_post_id' ] ) ) {
 			?>
 			<div class="error inline">
-				<p><?php echo $instance['error_post_id']; ?></p>
+				<p><?php echo $instance[ 'error_post_id' ]; ?></p>
 			</div>
 			<?php
 			unset ( $error );
@@ -209,40 +209,40 @@ 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
+			<label for="<?php echo $this->get_field_id( 'post_id' ); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id( 'post_id' ); ?>" name="<?php echo $this->get_field_name( 'post_id' ); ?>" type="text" value="<?php echo esc_attr( $post_id ); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e( 'To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
+				echo ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
 				?></span>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('search_clear'); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
-			<input name="<?php echo $this->get_field_name('search_clear'); ?>" type="hidden" value="0">
-			<input id="<?php echo $this->get_field_id('search_clear'); ?>" name="<?php echo $this->get_field_name('search_clear'); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_clear' ); ?>"><?php esc_html_e( 'Show Clear button', 'gravityview' ); ?>:</label>
+			<input name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="hidden" value="0">
+			<input id="<?php echo $this->get_field_id( 'search_clear' ); ?>" name="<?php echo $this->get_field_name( 'search_clear' ); ?>" type="checkbox" class="checkbox" value="1" <?php checked( $search_clear, 1, true ); ?>>
 		</p>
 
 		<p>
 			<label><?php esc_html_e( 'Search Mode', 'gravityview' ); ?>:</label>
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_any">
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_any" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_any">
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_any" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="any" <?php checked( $search_mode, 'any', true ); ?>>
 				<?php esc_html_e( 'Match Any Fields', 'gravityview' ); ?>
 			</label>
-			<label for="<?php echo $this->get_field_id('search_mode'); ?>_all">
-				<input id="<?php echo $this->get_field_id('search_mode'); ?>_all" name="<?php echo $this->get_field_name('search_mode'); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
+			<label for="<?php echo $this->get_field_id( 'search_mode' ); ?>_all">
+				<input id="<?php echo $this->get_field_id( 'search_mode' ); ?>_all" name="<?php echo $this->get_field_name( 'search_mode' ); ?>" type="radio" class="radio" value="all" <?php checked( $search_mode, 'all', true ); ?>>
 				<?php esc_html_e( 'Match All Fields', 'gravityview' ); ?>
 			</label>
-			<span class="howto"><?php esc_html_e('Should search results match all search fields, or any?', 'gravityview' ); ?></span
+			<span class="howto"><?php esc_html_e( 'Should search results match all search fields, or any?', 'gravityview' ); ?></span
 		</p>
 
 		<hr />
 
 		<?php // @todo: move style to CSS ?>
 		<div style="margin-bottom: 1em;">
-			<label class="screen-reader-text" for="<?php echo $this->get_field_id('search_fields'); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
-			<div class="gv-widget-search-fields" title="<?php esc_html_e('Search Fields', 'gravityview'); ?>">
-				<input id="<?php echo $this->get_field_id('search_fields'); ?>" name="<?php echo $this->get_field_name('search_fields'); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
+			<label class="screen-reader-text" for="<?php echo $this->get_field_id( 'search_fields' ); ?>"><?php _e( 'Searchable fields:', 'gravityview' ); ?></label>
+			<div class="gv-widget-search-fields" title="<?php esc_html_e( 'Search Fields', 'gravityview' ); ?>">
+				<input id="<?php echo $this->get_field_id( 'search_fields' ); ?>" name="<?php echo $this->get_field_name( 'search_fields' ); ?>" type="hidden" value="<?php echo esc_attr( $search_fields ); ?>" class="gv-search-fields-value">
 			</div>
 
 		</div>