gravityview / GravityView

includes/class-gv-license-handler.php

Doc Comments +4 added lines, -1 removed lines

@@ -53,6 +53,9 @@ 
 		add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) );
 	}
 
+	/**
+	 * @param boolean $echo
+	 */
 	function settings_edd_license_activation( $field, $echo ) {
 
 		wp_enqueue_script( 'gv-admin-edd-license', GRAVITYVIEW_URL . 'assets/js/admin-edd-license.js', array( 'jquery' ) );
@@ -241,7 +244,7 @@ 
 	 * Generate the status message box HTML based on the current status
 	 *
 	 * @since 1.7.4
-	 * @param $message
+	 * @param string $message
 	 * @param string $class
 	 *
 	 * @return string

Indentation +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 		// 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'] = $license_data->license_key = trim( $data['license'] );
 		$settings['license_key_status'] = $license_data->license;
 		$settings['license_key_response'] = (array)$license_data;
 

Spacing +86 added lines, -86 removed lines

@@ -33,14 +33,14 @@ 
 	 *
 	 * @return GV_License_Handler
 	 */
-	public static function get_instance( GravityView_Settings $GFAddOn ) {
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( $GFAddOn );
+	public static function get_instance(GravityView_Settings $GFAddOn) {
+		if (empty(self::$instance)) {
+			self::$instance = new self($GFAddOn);
 		}
 		return self::$instance;
 	}
 	
-	private function __construct( GravityView_Settings $GFAddOn ) {
+	private function __construct(GravityView_Settings $GFAddOn) {
 
 		$this->Addon = $GFAddOn;
 
@@ -50,25 +50,25 @@ 
 	}
 
 	private function add_hooks() {
-		add_action( 'wp_ajax_gravityview_license', array( $this, 'license_call' ) );
+		add_action('wp_ajax_gravityview_license', array($this, 'license_call'));
 	}
 
-	function settings_edd_license_activation( $field, $echo ) {
+	function settings_edd_license_activation($field, $echo) {
 
-		wp_enqueue_script( 'gv-admin-edd-license', GRAVITYVIEW_URL . 'assets/js/admin-edd-license.js', array( 'jquery' ) );
+		wp_enqueue_script('gv-admin-edd-license', GRAVITYVIEW_URL.'assets/js/admin-edd-license.js', array('jquery'));
 
-		$status = trim( $this->Addon->get_app_setting( 'license_key_status' ) );
-		$key = trim( $this->Addon->get_app_setting( 'license_key' ) );
+		$status = trim($this->Addon->get_app_setting('license_key_status'));
+		$key = trim($this->Addon->get_app_setting('license_key'));
 
-		if( !empty( $key ) ) {
-			$response = $this->Addon->get_app_setting( 'license_key_response' );
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
+		if (!empty($key)) {
+			$response = $this->Addon->get_app_setting('license_key_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 )
+		wp_localize_script('gv-admin-edd-license', 'GVGlobals', array(
+			'license_box' => $this->get_license_message($response)
 		));
 
 
@@ -85,7 +85,7 @@ 
 				'value' => __('Deactivate License', 'gravityview'),
 				'data-pending_text' => __('Deactivating license…', 'gravityview'),
 				'data-edd_action' => 'deactivate_license',
-				'class' => ( empty( $status ) ? 'button-primary hide' : 'button-primary' ),
+				'class' => (empty($status) ? 'button-primary hide' : 'button-primary'),
 			),
 			array(
 				'name'  => 'edd-check',
@@ -100,19 +100,19 @@ 
 
 		$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';
+		$disabled_attribute = GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
 
 		$submit = '<div class="gv-edd-button-wrapper">';
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$field['type'] = 'button';
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
+			$field['class'] = isset($field['class']) ? $field['class'].' '.$class : $class;
 			$field['style'] = 'margin-left: 10px;';
-			if( $disabled_attribute ) {
+			if ($disabled_attribute) {
 				$field['disabled'] = $disabled_attribute;
 			}
-			$submit .= $this->Addon->settings_submit( $field, $echo );
+			$submit .= $this->Addon->settings_submit($field, $echo);
 		}
 		$submit .= '</div>';
 
@@ -126,8 +126,8 @@ 
 	 */
 	private 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
@@ -149,10 +149,10 @@ 
 	 *
 	 * @return array
 	 */
-	function _get_edd_settings( $action = '', $license = '' ) {
+	function _get_edd_settings($action = '', $license = '') {
 
 		// retrieve our license key from the DB
-		$license_key = empty( $license ) ? trim( $this->Addon->get_app_setting( 'license_key' ) ) : $license;
+		$license_key = empty($license) ? trim($this->Addon->get_app_setting('license_key')) : $license;
 
 		$settings = array(
 			'version'   => self::version,
@@ -163,11 +163,11 @@ 
 			'url'       => home_url(),
 		);
 
-		if( !empty( $action ) ) {
-			$settings['edd_action'] = esc_attr( $action );
+		if (!empty($action)) {
+			$settings['edd_action'] = esc_attr($action);
 		}
 
-		$settings = array_map( 'urlencode', $settings );
+		$settings = array_map('urlencode', $settings);
 
 		return $settings;
 	}
@@ -176,27 +176,27 @@ 
 	 * Perform the call
 	 * @return array|WP_Error
 	 */
-	private function _license_get_remote_response( $data, $license = '' ) {
+	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 );
+		$url = add_query_arg($api_params, self::url);
 
-		$response = wp_remote_get( $url, array(
+		$response = wp_remote_get($url, array(
 			'timeout'   => 15,
 			'sslverify' => false,
 		));
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			return array();
 		}
 
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
 		// Not JSON
-		if ( empty( $license_data ) ) {
+		if (empty($license_data)) {
 
-			delete_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid' );
+			delete_transient('gravityview_'.esc_attr($data['field_id']).'_valid');
 
 			// Change status
 			return array();
@@ -216,14 +216,14 @@ 
 	 *
 	 * @return string
 	 */
-	function get_license_message( $license_data ) {
+	function get_license_message($license_data) {
 
-		if( empty( $license_data ) ) {
+		if (empty($license_data)) {
 			$class = 'hide';
 			$message = '';
 		} else {
 
-			if( ! empty( $license_data->error ) ) {
+			if (!empty($license_data->error)) {
 				$class = 'error';
 				$string_key = $license_data->error;
 			} else {
@@ -231,10 +231,10 @@ 
 				$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));
 		}
 
-		return $this->generate_license_box( $message, $class );
+		return $this->generate_license_box($message, $class);
 	}
 
 	/**
@@ -246,11 +246,11 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_license_box( $message, $class = '' ) {
+	private function generate_license_box($message, $class = '') {
 
 		$template = '<div id="gv-edd-status" class="gv-edd-message inline %s">%s</div>';
 
-		$output = sprintf( $template, esc_attr( $class ), $message );
+		$output = sprintf($template, esc_attr($class), $message);
 
 		return $output;
 	}
@@ -270,63 +270,63 @@ 
 	 *
 	 * @return mixed|string|void
 	 */
-	public function license_call( $array = array() ) {
+	public function license_call($array = array()) {
 
-		$is_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
-		$data = empty( $array ) ? $_POST['data'] : $array;
-		$has_cap = GVCommon::has_cap( 'gravityview_edit_settings' );
+		$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 ) {
+		if (!$has_cap) {
 			$license_data = new stdClass();
 			$license_data->error = 'capability';
-			$license_data->message = $this->get_license_message( $license_data );
-			$json = json_encode( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
+			$json = json_encode($license_data);
 		} else {
 
-			$license      = esc_attr( rgget( 'license', $data ) );
-			$license_data = $this->_license_get_remote_response( $data, $license );
+			$license      = esc_attr(rgget('license', $data));
+			$license_data = $this->_license_get_remote_response($data, $license);
 
 			// Empty is returned when there's an error.
-			if ( empty( $license_data ) ) {
-				if ( $is_ajax ) {
-					exit( json_encode( array() ) );
+			if (empty($license_data)) {
+				if ($is_ajax) {
+					exit(json_encode(array()));
 				} else { // Non-ajax call
-					return json_encode( array() );
+					return json_encode(array());
 				}
 			}
 
-			$license_data->message = $this->get_license_message( $license_data );
+			$license_data->message = $this->get_license_message($license_data);
 
-			$json = json_encode( $license_data );
+			$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);
 
 			// Failed is the response from trying to de-activate a license and it didn't work.
 			// This likely happened because people entered in a different key and clicked "Deactivate",
 			// meaning to deactivate the original key. We don't want to save this response, since it is
 			// most likely a mistake.
-			if ( $license_data->license !== 'failed' && ! $is_check_action_button && $update_license ) {
+			if ($license_data->license !== 'failed' && !$is_check_action_button && $update_license) {
 
-				if ( ! empty( $data['field_id'] ) ) {
-					set_transient( 'gravityview_' . esc_attr( $data['field_id'] ) . '_valid', $license_data, DAY_IN_SECONDS );
+				if (!empty($data['field_id'])) {
+					set_transient('gravityview_'.esc_attr($data['field_id']).'_valid', $license_data, DAY_IN_SECONDS);
 				}
 
-				$this->license_call_update_settings( $license_data, $data );
+				$this->license_call_update_settings($license_data, $data);
 
 			}
 		} // End $has_cap
 
-		if ( $is_ajax ) {
-			exit( $json );
+		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;
 		}
 	}
 
@@ -335,16 +335,16 @@ 
 	 * @param object $license_data
 	 * @return void
 	 */
-	private function license_call_update_settings( $license_data, $data ) {
+	private function license_call_update_settings($license_data, $data) {
 
 		// 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'] = $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 );
+		$this->Addon->update_app_settings($settings);
 	}
 
 	/**
@@ -353,8 +353,8 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return string Renewal or account URL
 	 */
-	private function get_license_renewal_url( $license_data ) {
-		$renew_license_url = ( ! empty( $license_data ) && !empty( $license_data->license_key ) ) ? sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key ) : 'https://gravityview.co/account/';
+	private function get_license_renewal_url($license_data) {
+		$renew_license_url = (!empty($license_data) && !empty($license_data->license_key)) ? sprintf('https://gravityview.co/checkout/?download_id=17&edd_license_key=%s&utm_source=admin_notice&utm_medium=admin&utm_content=expired&utm_campaign=Activation', $license_data->license_key) : 'https://gravityview.co/account/';
 		return $renew_license_url;
 	}
 
@@ -364,7 +364,7 @@ 
 	 * @param  object|null $license_data Object with license data
 	 * @return array          Modified array of content
 	 */
-	public function strings( $status = NULL, $license_data = null ) {
+	public function strings($status = NULL, $license_data = null) {
 
 
 		$strings = array(
@@ -372,14 +372,14 @@ 
 			'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'),
-			'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>' ),
+			'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__('The license key was not defined.', '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' ),
+			'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'),
@@ -387,33 +387,33 @@ 
 			'check_license' => esc_html__('Verify License', 'gravityview'),
 		);
 
-		if( empty( $status ) ) {
+		if (empty($status)) {
 			return $strings;
 		}
 
-		if( isset( $strings[ $status ] ) ) {
-			return $strings[ $status ];
+		if (isset($strings[$status])) {
+			return $strings[$status];
 		}
 
 		return NULL;
 	}
 
-	public function validate_license_key( $value, $field ) {
+	public function validate_license_key($value, $field) {
 
 		// No license? No status.
-		if( empty( $value ) ) {
+		if (empty($value)) {
 			return NULL;
 		}
 
 		$response = $this->license_call(array(
-			'license' => $this->Addon->get_app_setting( 'license_key' ),
+			'license' => $this->Addon->get_app_setting('license_key'),
 			'edd_action' => 'check_license',
 			'field_id' => $field['name'],
 		));
 
-		$response = is_string( $response ) ? json_decode( $response, true ) : $response;
+		$response = is_string($response) ? json_decode($response, true) : $response;
 
-		switch( $response['license'] ) {
+		switch ($response['license']) {
 			case 'valid':
 				$return = true;
 				break;

includes/class-gvlogic-shortcode.php

Doc Comments +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 	 * Does the if and the comparison match?
 	 * @uses GVCommon::matches_operation
 	 *
-	 * @return boolean True: yep; false: nope
+	 * @return boolean|null True: yep; false: nope
 	 */
 	function set_is_match() {
 		$this->is_match = GVCommon::matches_operation( $this->if, $this->comparison, $this->operation );

Spacing +38 added lines, -38 removed lines

@@ -5,13 +5,13 @@ 
  */
 class GVLogic_Shortcode {
 
-	private static $SUPPORTED_SCALAR_OPERATORS = array( 'is', 'isnot', 'contains', 'starts_with', 'ends_with' );
+	private static $SUPPORTED_SCALAR_OPERATORS = array('is', 'isnot', 'contains', 'starts_with', 'ends_with');
 
-	private static $SUPPORTED_NUMERIC_OPERATORS = array( 'greater_than', 'less_than' );
+	private static $SUPPORTED_NUMERIC_OPERATORS = array('greater_than', 'less_than');
 
-	private static $SUPPORTED_ARRAY_OPERATORS = array( 'in', 'not_in', 'isnot', 'contains' );
+	private static $SUPPORTED_ARRAY_OPERATORS = array('in', 'not_in', 'isnot', 'contains');
 
-	private static $SUPPORTED_CUSTOM_OPERATORS = array( 'equals', 'greater_than_or_is', 'greater_than_or_equals', 'less_than_or_is', 'less_than_or_equals', 'not_contains' );
+	private static $SUPPORTED_CUSTOM_OPERATORS = array('equals', 'greater_than_or_is', 'greater_than_or_equals', 'less_than_or_is', 'less_than_or_equals', 'not_contains');
 
 	/**
 	 * Attributes passed to the shortcode
@@ -85,7 +85,7 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -105,7 +105,7 @@ 
 	 * @return void
 	 */
 	function add_hooks() {
-		add_shortcode( 'gvlogic', array( $this, 'shortcode' ) );
+		add_shortcode('gvlogic', array($this, 'shortcode'));
 	}
 
 	/**
@@ -114,14 +114,14 @@ 
 	 *
 	 * @return array
 	 */
-	function get_operators( $with_values = false ) {
+	function get_operators($with_values = false) {
 
-		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
+		$operators = array_merge(self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS);
 
-		if( $with_values ) {
+		if ($with_values) {
 			$operators_with_values = array();
-			foreach( $operators as $key ) {
-				$operators_with_values[ $key ] = '';
+			foreach ($operators as $key) {
+				$operators_with_values[$key] = '';
 			}
 			return $operators_with_values;
 		} else {
@@ -135,16 +135,16 @@ 
 	 *
 	 * @return bool True: it's an allowed operation type and was added. False: invalid operation type
 	 */
-	function set_operation( $operation = '' ) {
+	function set_operation($operation = '') {
 
-		if( empty( $operation ) ) {
+		if (empty($operation)) {
 			return false;
 		}
 
-		$operators = $this->get_operators( false );
+		$operators = $this->get_operators(false);
 
-		if( !in_array( $operation, $operators ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ .' Attempted to add invalid operation type.', $operation );
+		if (!in_array($operation, $operators)) {
+			do_action('gravityview_log_debug', __METHOD__.' Attempted to add invalid operation type.', $operation);
 			return false;
 		}
 
@@ -164,11 +164,11 @@ 
 	 */
 	function setup_operation_and_comparison() {
 
-		foreach( $this->atts as $key => $value ) {
+		foreach ($this->atts as $key => $value) {
 
-			$valid = $this->set_operation( $key );
+			$valid = $this->set_operation($key);
 
-			if( $valid ) {
+			if ($valid) {
 				$this->comparison = $value;
 				return true;
 			}
@@ -184,10 +184,10 @@ 
 	 *
 	 * @return string|null
 	 */
-	public function shortcode( $atts = array(), $content = NULL, $shortcode_tag = '' ) {
+	public function shortcode($atts = array(), $content = NULL, $shortcode_tag = '') {
 
 		// Don't process except on frontend
-		if ( GravityView_Plugin::is_admin() ) {
+		if (GravityView_Plugin::is_admin()) {
 			return null;
 		}
 
@@ -198,16 +198,16 @@ 
 		$this->parse_atts();
 
 		// We need an "if"
-		if( false === $this->if ) {
-			do_action( 'gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->atts );
+		if (false === $this->if) {
+			do_action('gravityview_log_error', __METHOD__.' $atts->if is empty.', $this->atts);
 			return null;
 		}
 
 		$setup = $this->setup_operation_and_comparison();
 
 		// We need an operation and comparison value
-		if( ! $setup ) {
-			do_action( 'gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts );
+		if (!$setup) {
+			do_action('gravityview_log_error', __METHOD__.' No valid operators were passed.', $this->atts);
 			return null;
 		}
 
@@ -228,7 +228,7 @@ 
 	 * @return boolean True: yep; false: nope
 	 */
 	function set_is_match() {
-		$this->is_match = GVCommon::matches_operation( $this->if, $this->comparison, $this->operation );
+		$this->is_match = GVCommon::matches_operation($this->if, $this->comparison, $this->operation);
 	}
 
 	/**
@@ -238,23 +238,23 @@ 
 	 */
 	function get_output() {
 
-		if( $this->is_match ) {
+		if ($this->is_match) {
 			$output = $this->content;
 		} else {
 			$output = $this->else_content;
 		}
 
 		// Get recursive!
-		$output = do_shortcode( $output );
+		$output = do_shortcode($output);
 
 		/**
 		 * @filter `gravityview/gvlogic/output` Modify the [gvlogic] output
 		 * @param string $output HTML/text output
 		 * @param GVLogic_Shortcode $this This class
 		 */
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
+		$output = apply_filters('gravityview/gvlogic/output', $output, $this);
 
-		do_action( 'gravityview_log_debug', __METHOD__ .' Output: ', $output );
+		do_action('gravityview_log_debug', __METHOD__.' Output: ', $output);
 
 		return $output;
 	}
@@ -268,13 +268,13 @@ 
 	 */
 	function set_content_and_else_content() {
 
-		$content = explode( '[else]', $this->passed_content );
+		$content = explode('[else]', $this->passed_content);
 
 		$this->content = $content[0];
 
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
+		$else_attr = isset($this->atts['else']) ? $this->atts['else'] : NULL;
 
-		$this->else_content = isset( $content[1] ) ? $content[1] : $else_attr;
+		$this->else_content = isset($content[1]) ? $content[1] : $else_attr;
 	}
 
 	/**
@@ -288,19 +288,19 @@ 
 			'else' => false,
 		);
 
-		$supported_args = $supported + $this->get_operators( true );
+		$supported_args = $supported + $this->get_operators(true);
 
 		// Whittle down the attributes to only valid pairs
-		$this->atts = shortcode_atts( $supported_args, $this->passed_atts, $this->shortcode );
+		$this->atts = shortcode_atts($supported_args, $this->passed_atts, $this->shortcode);
 
 		// Only keep the passed attributes after making sure that they're valid pairs
-		$this->atts = function_exists( 'array_intersect_key' ) ? array_intersect_key( $this->passed_atts, $this->atts ) : $this->atts;
+		$this->atts = function_exists('array_intersect_key') ? array_intersect_key($this->passed_atts, $this->atts) : $this->atts;
 
 		// Strip whitespace if it's not default false
-		$this->if = is_string( $this->atts['if'] ) ? trim( $this->atts['if'] ) : false;
+		$this->if = is_string($this->atts['if']) ? trim($this->atts['if']) : false;
 
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
-		unset( $this->atts['if'] );
+		unset($this->atts['if']);
 	}
 }
 

includes/class-oembed.php

Doc Comments +1 added lines

@@ -211,6 +211,7 @@
 	 * @var $view_id
 	 *
 	 * @see render_handler
+	 * @param string $url
 	 */
 	private function set_vars( $matches, $attr, $url, $rawattr ) {
 

Spacing +47 added lines, -47 removed lines

@@ -10,7 +10,7 @@ 
  * @since 1.6
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -32,7 +32,7 @@ 
 
 	private function initialize() {
 
-		add_action( 'init', array( $this, 'register_handler' ) );
+		add_action('init', array($this, 'register_handler'));
 
 	}
 
@@ -42,7 +42,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -59,7 +59,7 @@ 
 	 */
 	function register_handler() {
 
-		wp_embed_register_handler( 'gravityview_entry', $this->get_handler_regex(), array( $this, 'render_handler' ), 20000 );
+		wp_embed_register_handler('gravityview_entry', $this->get_handler_regex(), array($this, 'render_handler'), 20000);
 
 	}
 
@@ -80,16 +80,16 @@ 
 		 * @filter `gravityview_slug` Modify the url part for a View. [Read the doc](http://docs.gravityview.co/article/62-changing-the-view-slug)
 		 * @param string $rewrite_slug The slug shown in the URL
 		 */
-		$rewrite_slug = apply_filters( 'gravityview_slug', 'view' );
+		$rewrite_slug = apply_filters('gravityview_slug', 'view');
 
 		// Only support embeds for current site
-		$prefix = trailingslashit( home_url() );
+		$prefix = trailingslashit(home_url());
 
 		// Using permalinks
-		$using_permalinks = $prefix . "(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
+		$using_permalinks = $prefix."(?P<is_cpt>{$rewrite_slug})?/?(?P<slug>.+?)/{$entry_var_name}/(?P<entry_slug>.+?)/?\$";
 
 		// Not using permalinks
-		$not_using_permalinks = $prefix . "(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
+		$not_using_permalinks = $prefix."(?:index.php)?\?(?P<is_cpt2>[^=]+)=(?P<slug2>[^&]+)&entry=(?P<entry_slug2>[^&]+)\$";
 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
@@ -109,11 +109,11 @@ 
 	 * @param string $slug The name of a post, used as backup way of checking for post ID
 	 * @return int 0 if not found; int of URL post ID otherwise
 	 */
-	private function get_postid_from_url_and_slug( $url = '', $slug = '' ) {
+	private function get_postid_from_url_and_slug($url = '', $slug = '') {
 
-		$post_id = url_to_postid( $url );
+		$post_id = url_to_postid($url);
 
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 
 			$args = array(
 				'post_status' => 'publish',
@@ -121,9 +121,9 @@ 
 				'post_type' => array('any', 'gravityview'),
 			);
 
-			$posts = get_posts( $args );
+			$posts = get_posts($args);
 
-			if( !empty( $posts ) ) {
+			if (!empty($posts)) {
 				$post_id = $posts[0]->ID;
 			}
 		}
@@ -154,20 +154,20 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	public function render_handler( $matches, $attr, $url, $rawattr ) {
+	public function render_handler($matches, $attr, $url, $rawattr) {
 
 		// If not using permalinks, re-assign values for matching groups
-		if( !empty( $matches['entry_slug2'] ) ) {
+		if (!empty($matches['entry_slug2'])) {
 			$matches['is_cpt'] = $matches['is_cpt2'];
 			$matches['slug'] = $matches['slug2'];
 			$matches['entry_slug'] = $matches['entry_slug2'];
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
+			unset($matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2']);
 		}
 
 		// No Entry was found
-		if( empty( $matches['entry_slug'] ) ) {
+		if (empty($matches['entry_slug'])) {
 
-			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches );
+			do_action('gravityview_log_error', 'GravityView_oEmbed[render_handler] $entry_slug not parsed by regex.', $matches);
 
 			return '';
 		}
@@ -175,17 +175,17 @@ 
 		$return = '';
 
 		// Setup the data used
-		$this->set_vars( $matches, $attr, $url, $rawattr );
+		$this->set_vars($matches, $attr, $url, $rawattr);
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
-			$return = $this->render_admin( $matches, $attr, $url, $rawattr );
+		if (is_admin() && !$this->is_full_oembed_preview) {
+			$return = $this->render_admin($matches, $attr, $url, $rawattr);
 		} else {
 
-			if( $this->is_full_oembed_preview ) {
+			if ($this->is_full_oembed_preview) {
 				$return .= $this->generate_preview_notice();
 			}
 
-			$return .= $this->render_frontend( $matches, $attr, $url, $rawattr );
+			$return .= $this->render_frontend($matches, $attr, $url, $rawattr);
 		}
 
 		return $return;
@@ -199,9 +199,9 @@ 
 	 */
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
-		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
+		$title = esc_html__('This will look better when it is embedded.', 'gravityview');
 		$message = esc_html__('Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
-		return '<div class="updated notice">'. $floaty. '<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
+		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
 	}
 
 	/**
@@ -212,18 +212,18 @@ 
 	 *
 	 * @see render_handler
 	 */
-	private function set_vars( $matches, $attr, $url, $rawattr ) {
+	private function set_vars($matches, $attr, $url, $rawattr) {
 
 		$this->entry_id = $matches['entry_slug'];
 
-		$post_id = $this->get_postid_from_url_and_slug( $url, $matches['slug'] );
+		$post_id = $this->get_postid_from_url_and_slug($url, $matches['slug']);
 
 		// The URL didn't have the View Custom Post Type structure.
-		if( empty( $matches['is_cpt'] ) || $matches['is_cpt'] !== 'gravityview' ) {
+		if (empty($matches['is_cpt']) || $matches['is_cpt'] !== 'gravityview') {
 
-			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches );
+			do_action('gravityview_log_debug', 'GravityView_oEmbed[render_handler] Embedding an entry inside a post or page', $matches);
 
-			$this->view_id = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+			$this->view_id = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 		} else {
 
@@ -232,7 +232,7 @@ 
 		}
 
 		// The inline content has $_POST['type'] set to "embed", while the "Add Media" modal doesn't set that.
-		$this->is_full_oembed_preview = ( isset( $_POST['action'] ) && $_POST['action'] === 'parse-embed' && !isset( $_POST['type'] ) );
+		$this->is_full_oembed_preview = (isset($_POST['action']) && $_POST['action'] === 'parse-embed' && !isset($_POST['type']));
 	}
 
 	/**
@@ -244,15 +244,15 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	private function render_admin( $matches, $attr, $url, $rawattr ) {
+	private function render_admin($matches, $attr, $url, $rawattr) {
 		global $wp_version;
 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		$embed_heading = sprintf( esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id );
+		$embed_heading = sprintf(esc_html__('Embed Entry %d', 'gravityview'), $this->entry_id);
 
-		$embed_text = sprintf( esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id );
+		$embed_text = sprintf(esc_html__('This entry will be displayed as it is configured in View %d', 'gravityview'), $this->view_id);
 
 		return '
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
@@ -268,21 +268,21 @@ 
 	private function generate_entry_output() {
 
 		// Tell get_gravityview() to display a single entry
-		add_filter( 'gravityview/is_single_entry', array( $this, 'set_single_entry_id' ) );
+		add_filter('gravityview/is_single_entry', array($this, 'set_single_entry_id'));
 
 		ob_start();
 
 		// Print the entry as configured in View
-		the_gravityview( $this->view_id );
+		the_gravityview($this->view_id);
 
 		$view_html = ob_get_clean();
 
 		// Clean up the filter
-		remove_filter( 'gravityview/is_single_entry', array( $this, 'set_single_entry_id' ) );
+		remove_filter('gravityview/is_single_entry', array($this, 'set_single_entry_id'));
 
 		// Strip the new lines that are generated--when editing an entry in particular, scripts are printed that
 		// then are passed through wpautop() and everything looks terrible.
-		$view_html = str_replace( "\n", ' ', $view_html );
+		$view_html = str_replace("\n", ' ', $view_html);
 
 		return $view_html;
 	}
@@ -296,7 +296,7 @@ 
 	 *
 	 * @return int The current entry ID
 	 */
-	public function set_single_entry_id( $is_single_entry = false ) {
+	public function set_single_entry_id($is_single_entry = false) {
 
 		return $this->entry_id;
 	}
@@ -310,17 +310,17 @@ 
 	 * @param array $rawattr The original unmodified attributes.
 	 * @return string The embed HTML.
 	 */
-	private function render_frontend( $matches, $attr, $url, $rawattr ) {
+	private function render_frontend($matches, $attr, $url, $rawattr) {
 
 		// If it's already been parsed, don't re-output it.
-		if( !empty( $this->output[ $this->entry_id ] ) ) {
-			return $this->output[ $this->entry_id ];
+		if (!empty($this->output[$this->entry_id])) {
+			return $this->output[$this->entry_id];
 		}
 
 		$entry_output = $this->generate_entry_output();
 
 		// Wrap a container div around the output to allow for custom styling
-		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output );
+		$output = sprintf('<div class="gravityview-oembed gravityview-oembed-entry gravityview-oembed-entry-'.$this->entry_id.'">%s</div>', $entry_output);
 
 		/**
 		 * @filter `gravityview/oembed/entry` Filter the output of the oEmbed entry embed
@@ -333,13 +333,13 @@ 
 		 *  @var string $url The original URL that was matched by the regex. \n
 		 *  @var array $rawattr The original unmodified attributes.
 		 */
-		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact( $entry_output, $matches, $attr, $url, $rawattr ) );
+		$output = apply_filters('gravityview/oembed/entry', $output, $this, compact($entry_output, $matches, $attr, $url, $rawattr));
 
-		unset( $entry_output );
+		unset($entry_output);
 
-		$this->output[ $this->entry_id ] = $output;
+		$this->output[$this->entry_id] = $output;
 
-		return $this->output[ $this->entry_id ];
+		return $this->output[$this->entry_id];
 
 	}
 

includes/class-settings.php

Doc Comments +1 added lines

@@ -301,6 +301,7 @@
 	 * Make protected public
 	 * @inheritDoc
 	 * @access public
+	 * @param string $setting_name
 	 */
 	public function get_app_setting( $setting_name ) {
 

Indentation +31 added lines, -31 removed lines

@@ -418,8 +418,8 @@ 
                     type="' . $field['type'] . '"
                     name="' . esc_attr( $name ) . '"
                     value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
-		        ' />';
+				implode( ' ', $attributes ) .
+				' />';
 
 		if ( $echo ) {
 			echo $html;
@@ -648,7 +648,7 @@ 
 					array(
 						'label' => _x( 'Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
 						'value' => 'delete',
-					    'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
+						'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
 					),
 				),
 				'description'   => sprintf( __( 'Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview' ), __( 'Permanently Delete', 'gravityview' ) ),
@@ -674,36 +674,36 @@ 
 		}
 
 
-        $sections = array(
-            array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
-                'fields'      => $fields,
-            )
-        );
+		$sections = array(
+			array(
+				'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+				'fields'      => $fields,
+			)
+		);
 
-        // custom 'update settings' button
-        $button = array(
-            'class' => 'button button-primary button-hero',
-            'type'     => 'save',
-        );
+		// custom 'update settings' button
+		$button = array(
+			'class' => 'button button-primary button-hero',
+			'type'     => 'save',
+		);
 
 		if( $disabled_attribute ) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
 
-        /**
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
-         * Extensions can tap in here to insert their own section and settings.
-         * <code>
-         *   $sections[] = array(
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
-         *      'fields' => $settings,
-         *   );
-         * </code>
-         * @param array $extension_settings Empty array, ready for extension settings!
-         */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+		/**
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
+		 * Extensions can tap in here to insert their own section and settings.
+		 * <code>
+		 *   $sections[] = array(
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
+		 *      'fields' => $settings,
+		 *   );
+		 * </code>
+		 * @param array $extension_settings Empty array, ready for extension settings!
+		 */
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
 
 		// If there are extensions, add a section for them
 		if ( ! empty( $extension_sections ) ) {
@@ -716,13 +716,13 @@ 
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
+			$k = count( $extension_sections ) - 1 ;
+			$extension_sections[ $k ]['fields'][] = $button;
 			$sections = array_merge( $sections, $extension_sections );
 		} else {
-            // add the 'update settings' button to the general section
-            $sections[0]['fields'][] = $button;
-        }
+			// add the 'update settings' button to the general section
+			$sections[0]['fields'][] = $button;
+		}
 
 		return $sections;
 	}

Spacing +126 added lines, -126 removed lines

@@ -69,9 +69,9 @@ 
 	 *
 	 * @param string $prevent_multiple_instances
 	 */
-	public function __construct( $prevent_multiple_instances = '' ) {
+	public function __construct($prevent_multiple_instances = '') {
 
-		if( $prevent_multiple_instances === 'get_instance' ) {
+		if ($prevent_multiple_instances === 'get_instance') {
 			return parent::__construct();
 		}
 
@@ -83,8 +83,8 @@ 
 	 */
 	public static function get_instance() {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new self( 'get_instance' );
+		if (empty(self::$instance)) {
+			self::$instance = new self('get_instance');
 		}
 
 		return self::$instance;
@@ -100,21 +100,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function current_user_can_any( $caps ) {
+	public function current_user_can_any($caps) {
 
 		/**
 		 * Prevent Gravity Forms from showing the uninstall tab on the settings page
 		 * @hack
 		 */
-		if( $caps === $this->_capabilities_uninstall ) {
+		if ($caps === $this->_capabilities_uninstall) {
 			return false;
 		}
 
-		if( empty( $caps ) ) {
-			$caps = array( 'gravityview_full_access' );
+		if (empty($caps)) {
+			$caps = array('gravityview_full_access');
 		}
 
-		return GVCommon::has_cap( $caps );
+		return GVCommon::has_cap($caps);
 	}
 
 	/**
@@ -130,10 +130,10 @@ 
 
 		$this->license_key_notice();
 
-		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
+		add_filter('gform_addon_app_settings_menu_gravityview', array($this, 'modify_app_settings_menu_title'));
 
 		/** @since 1.7.6 */
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
+		add_action('network_admin_menu', array($this, 'add_network_menu'));
 
 		parent::init_admin();
 	}
@@ -145,9 +145,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function modify_app_settings_menu_title( $setting_tabs ) {
+	public function modify_app_settings_menu_title($setting_tabs) {
 
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
+		$setting_tabs[0]['label'] = __('GravityView Settings', 'gravityview');
 
 		return $setting_tabs;
 	}
@@ -164,13 +164,13 @@ 
 	 */
 	private function _load_license_handler() {
 
-		if( !empty( $this->License_Handler ) ) {
+		if (!empty($this->License_Handler)) {
 			return;
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
+		require_once(GRAVITYVIEW_DIR.'includes/class-gv-license-handler.php');
 
-		$this->License_Handler = GV_License_Handler::get_instance( $this );
+		$this->License_Handler = GV_License_Handler::get_instance($this);
 	}
 
 	/**
@@ -180,18 +180,18 @@ 
 	function license_key_notice() {
 
 		// Show license notice on all GV pages, except for settings page
-		if( gravityview_is_admin_page( '', 'settings' ) ) {
+		if (gravityview_is_admin_page('', 'settings')) {
 			return;
 		}
 
 		$license_status = self::getSetting('license_key_status');
 		$license_id = self::getSetting('license_key');
-		$license_id = empty( $license_id ) ? 'license' : $license_id;
+		$license_id = empty($license_id) ? 'license' : $license_id;
 
 		$message = esc_html__('Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
 		$title = __('Inactive License', 'gravityview');
 		$status = '';
-		switch ( $license_status ) {
+		switch ($license_status) {
 			case 'invalid':
 				$title = __('Invalid License', 'gravityview');
 				$status = __('is invalid', 'gravityview');
@@ -208,13 +208,13 @@ 
 				break;
 		}
 		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
-		$message = sprintf( $message, $status, "\n\n".'<a href="'.admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' ).'" class="button button-primary">', '</a>', '<a href="'.esc_url( $url ).'" class="button button-secondary">', '</a>' );
-		if( !empty( $status ) ) {
-			GravityView_Admin_Notices::add_notice( array(
+		$message = sprintf($message, $status, "\n\n".'<a href="'.admin_url('edit.php?post_type=gravityview&amp;page=gravityview_settings').'" class="button button-primary">', '</a>', '<a href="'.esc_url($url).'" class="button button-secondary">', '</a>');
+		if (!empty($status)) {
+			GravityView_Admin_Notices::add_notice(array(
 				'message' => $message,
 				'class'	=> 'updated',
 				'title' => $title,
-				'dismiss' => sha1( $license_status.'_'.$license_id ),
+				'dismiss' => sha1($license_status.'_'.$license_id),
 			));
 		}
 	}
@@ -229,15 +229,15 @@ 
 
 		$styles[] = array(
 			'handle'  => 'gravityview_settings',
-			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
+			'src'     => plugins_url('assets/css/admin-settings.css', GRAVITYVIEW_FILE),
 			'version' => GravityView_Plugin::version,
 			"deps" => array(
 				'gaddon_form_settings_css'
 			),
 			'enqueue' => array(
-				array( 'admin_page' => array(
+				array('admin_page' => array(
 					'app_settings'
-				) ),
+				)),
 			)
 		);
 
@@ -250,8 +250,8 @@ 
 	 * @return void
 	 */
 	public function add_network_menu() {
-		if( GravityView_Plugin::is_network_activated() ) {
-			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
+		if (GravityView_Plugin::is_network_activated()) {
+			add_menu_page(__('Settings', 'gravityview'), __('GravityView', 'gravityview'), $this->_capabilities_app_settings, "{$this->_slug}_settings", array($this, 'app_tab_page'), 'none');
 		}
 	}
 
@@ -267,17 +267,17 @@ 
 		 * If multisite and not network admin, we don't want the settings to show.
 		 * @since 1.7.6
 		 */
-		$show_submenu = !is_multisite() ||  is_main_site() || !GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
+		$show_submenu = !is_multisite() || is_main_site() || !GravityView_Plugin::is_network_activated() || (is_network_admin() && GravityView_Plugin::is_network_activated());
 
 		/**
 		 * Override whether to show the Settings menu on a per-blog basis.
 		 * @since 1.7.6
 		 * @param bool $hide_if_network_activated Default: true
 		 */
-		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
+		$show_submenu = apply_filters('gravityview/show-settings-menu', $show_submenu);
 
-		if( $show_submenu ) {
-			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
+		if ($show_submenu) {
+			add_submenu_page('edit.php?post_type=gravityview', __('Settings', 'gravityview'), __('Settings', 'gravityview'), $this->_capabilities_app_settings, $this->_slug.'_settings', array($this, 'app_tab_page'));
 		}
 	}
 
@@ -302,20 +302,20 @@ 
 	 * @inheritDoc
 	 * @access public
 	 */
-	public function get_app_setting( $setting_name ) {
+	public function get_app_setting($setting_name) {
 
 		/**
 		 * Backward compatibility with Redux
 		 */
-		if( $setting_name === 'license' ) {
+		if ($setting_name === 'license') {
 			return array(
-				'license' => parent::get_app_setting( 'license_key' ),
-				'status' => parent::get_app_setting( 'license_key_status' ),
-				'response' => parent::get_app_setting( 'license_key_response' ),
+				'license' => parent::get_app_setting('license_key'),
+				'status' => parent::get_app_setting('license_key_status'),
+				'response' => parent::get_app_setting('license_key_response'),
 			);
 		}
 
-		return parent::get_app_setting( $setting_name );
+		return parent::get_app_setting($setting_name);
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 * @return array
 	 */
 	public function get_app_settings() {
-		return get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
+		return get_option('gravityformsaddon_'.$this->_slug.'_app_settings', $this->get_default_settings());
 	}
 
 
@@ -343,8 +343,8 @@ 
 	 *
 	 * @return boolean False if value was not updated and true if value was updated.
 	 */
-	public function update_app_settings( $settings ) {
-		return update_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $settings );
+	public function update_app_settings($settings) {
+		return update_option('gravityformsaddon_'.$this->_slug.'_app_settings', $settings);
 	}
 
 	/**
@@ -352,8 +352,8 @@ 
 	 * @inheritDoc
 	 * @access public
 	 */
-	public function set_field_error( $field, $error_message = '' ) {
-		parent::set_field_error( $field, $error_message );
+	public function set_field_error($field, $error_message = '') {
+		parent::set_field_error($field, $error_message);
 	}
 
 	/**
@@ -363,15 +363,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function settings_edd_license( $field, $echo = true ) {
+	protected function settings_edd_license($field, $echo = true) {
 
-		$text = self::settings_text( $field, false );
+		$text = self::settings_text($field, false);
 
-		$activation = $this->License_Handler->settings_edd_license_activation( $field, false );
+		$activation = $this->License_Handler->settings_edd_license_activation($field, false);
 
-		$return = $text . $activation;
+		$return = $text.$activation;
 
-		if( $echo ) {
+		if ($echo) {
 			echo $return;
 		}
 
@@ -396,32 +396,32 @@ 
 	 *
 	 * @return string The HTML
 	 */
-	public function settings_submit( $field, $echo = true ) {
+	public function settings_submit($field, $echo = true) {
 
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
+		$field['type'] = (isset($field['type']) && in_array($field['type'], array('submit', 'reset', 'button'))) ? $field['type'] : 'submit';
 
-		$attributes    = $this->get_field_attributes( $field );
-		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
-		$value         = $this->get_setting( $field['name'], $default_value );
+		$attributes    = $this->get_field_attributes($field);
+		$default_value = rgar($field, 'value') ? rgar($field, 'value') : rgar($field, 'default_value');
+		$value         = $this->get_setting($field['name'], $default_value);
 
 
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
+		$attributes['class'] = isset($attributes['class']) ? esc_attr($attributes['class']) : 'button-primary gfbutton';
+		$name = ($field['name'] === 'gform-settings-save') ? $field['name'] : '_gaddon_setting_'.$field['name'];
 
-		if ( empty( $value ) ) {
-			$value = __( 'Update Settings', 'gravityview' );
+		if (empty($value)) {
+			$value = __('Update Settings', 'gravityview');
 		}
 
-		$attributes = $this->get_field_attributes( $field );
+		$attributes = $this->get_field_attributes($field);
 
 		$html = '<input
-                    type="' . $field['type'] . '"
-                    name="' . esc_attr( $name ) . '"
-                    value="' . $value . '" ' .
-		        implode( ' ', $attributes ) .
+                    type="' . $field['type'].'"
+                    name="' . esc_attr($name).'"
+                    value="' . $value.'" '.
+		        implode(' ', $attributes).
 		        ' />';
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 		}
 
@@ -436,17 +436,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function settings_save( $field, $echo = true ) {
+	public function settings_save($field, $echo = true) {
 		$field['type']  = 'submit';
 		$field['name']  = 'gform-settings-save';
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
+		$field['class'] = isset($field['class']) ? $field['class'] : 'button-primary gfbutton';
 
-		if ( ! rgar( $field, 'value' ) )
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+		if (!rgar($field, 'value'))
+			$field['value'] = __('Update Settings', 'gravityview');
 
-		$output = $this->settings_submit( $field, false );
+		$output = $this->settings_submit($field, false);
 
-		if( $echo ) {
+		if ($echo) {
 			echo $output;
 		}
 
@@ -458,22 +458,22 @@ 
 	 * @inheritDoc
 	 * @param $field array
 	 */
-	public function single_setting_label( $field ) {
+	public function single_setting_label($field) {
 
 		echo $field['label'];
 
 
-		if ( isset( $field['tooltip'] ) ) {
-			echo ' ' . gform_tooltip( $field['tooltip'], rgar( $field, 'tooltip_class' ), true );
+		if (isset($field['tooltip'])) {
+			echo ' '.gform_tooltip($field['tooltip'], rgar($field, 'tooltip_class'), true);
 		}
 
-		if ( rgar( $field, 'required' ) ) {
-			echo ' ' . $this->get_required_indicator( $field );
+		if (rgar($field, 'required')) {
+			echo ' '.$this->get_required_indicator($field);
 		}
 
 		// Added by GravityView
-		if ( isset( $field['description'] ) ) {
-			echo '<span class="description">'. $field['description'] .'</span>';
+		if (isset($field['description'])) {
+			echo '<span class="description">'.$field['description'].'</span>';
 		}
 
 	}
@@ -489,10 +489,10 @@ 
 
 		$defaults = array(
 			// Set the default license in wp-config.php
-			'license_key' => defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : '',
+			'license_key' => defined('GRAVITYVIEW_LICENSE_KEY') ? GRAVITYVIEW_LICENSE_KEY : '',
 			'license_key_response' => '',
 			'license_key_status' => '',
-			'support-email' => get_bloginfo( 'admin_email' ),
+			'support-email' => get_bloginfo('admin_email'),
 			'no-conflict-mode' => '0',
 			'support_port' => '1',
 			'delete-on-uninstall' => '0',
@@ -510,10 +510,10 @@ 
 	 */
 	public function maybe_save_app_settings() {
 
-		if ( $this->is_save_postback() ) {
-			if ( ! GVCommon::has_cap( 'gravityview_edit_settings' ) ) {
+		if ($this->is_save_postback()) {
+			if (!GVCommon::has_cap('gravityview_edit_settings')) {
 				$_POST = array(); // If you don't reset the $_POST array, it *looks* like the settings were changed, but they weren't
-				GFCommon::add_error_message( __( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ) );
+				GFCommon::add_error_message(__('You don\'t have the ability to edit plugin settings.', 'gravityview'));
 				return;
 			}
 		}
@@ -532,10 +532,10 @@ 
 
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
-		if( isset( $posted_settings['license_key'] ) && isset( $posted_settings['license_key_response']['license_key'] ) && $posted_settings['license_key'] !== $posted_settings['license_key_response']['license_key'] ) {
-			unset( $posted_settings['license_key_response'] );
-			unset( $posted_settings['license_key_status'] );
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
+		if (isset($posted_settings['license_key']) && isset($posted_settings['license_key_response']['license_key']) && $posted_settings['license_key'] !== $posted_settings['license_key_response']['license_key']) {
+			unset($posted_settings['license_key_response']);
+			unset($posted_settings['license_key_status']);
+			GFCommon::add_error_message(__('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview'));
 		}
 
 		return $posted_settings;
@@ -549,8 +549,8 @@ 
 	 *
 	 * @return string - Returns markup of the required indicator symbol
 	 */
-	public function get_required_indicator( $field ) {
-		return '<span class="required" title="' . esc_attr__( 'Required', 'gravityview' ) . '">*</span>';
+	public function get_required_indicator($field) {
+		return '<span class="required" title="'.esc_attr__('Required', 'gravityview').'">*</span>';
 	}
 
 	/**
@@ -561,18 +561,18 @@ 
 
 		$default_settings = $this->get_default_settings();
 
-		$disabled_attribute = GVCommon::has_cap( 'gravityview_edit_settings' ) ? false : 'disabled';
+		$disabled_attribute = GVCommon::has_cap('gravityview_edit_settings') ? false : 'disabled';
 
-		$fields = apply_filters( 'gravityview_settings_fields', array(
+		$fields = apply_filters('gravityview_settings_fields', array(
 			array(
 				'name'                => 'license_key',
 				'required'               => true,
-				'label'             => __( 'License Key', 'gravityview' ),
-				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
+				'label'             => __('License Key', 'gravityview'),
+				'description'          => __('Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview'),
 				'type'              => 'edd_license',
 				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
 				'default_value'           => $default_settings['license_key'],
-				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
+				'class'             => ('' == $this->get_app_setting('license_key')) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
 			),
 			array(
 				'name'       => 'license_key_response',
@@ -589,8 +589,8 @@ 
 				'type'     => 'text',
 				'validate' => 'email',
 				'default_value'  => $default_settings['support-email'],
-				'label'    => __( 'Support Email', 'gravityview' ),
-				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
+				'label'    => __('Support Email', 'gravityview'),
+				'description' => __('In order to provide responses to your support requests, please provide your email address.', 'gravityview'),
 				'class'    => 'code regular-text',
 			),
 			/**
@@ -599,7 +599,7 @@ 
 			array(
 				'name'         => 'support_port',
 				'type'       => 'radio',
-				'label'      => __( 'Show Support Port?', 'gravityview' ),
+				'label'      => __('Show Support Port?', 'gravityview'),
 				'default_value'    => $default_settings['support_port'],
 				'horizontal' => 1,
 				'choices'    => array(
@@ -612,13 +612,13 @@ 
 						'value' => '0',
 					),
 				),
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
-				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
+				'tooltip' => '<p><img src="'.esc_url_raw(plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE)).'" alt="'.esc_attr__('The Support Port looks like this.', 'gravityview').'" class="alignright" style="max-width:40px; margin:.5em;" />'.esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview').'</p>',
+				'description'   => __('Show the Support Port on GravityView pages?', 'gravityview'),
 			),
 			array(
 				'name'         => 'no-conflict-mode',
 				'type'       => 'radio',
-				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
+				'label'      => __('No-Conflict Mode', 'gravityview'),
 				'default_value'    => $default_settings['no-conflict-mode'],
 				'horizontal' => 1,
 				'choices'    => array(
@@ -631,30 +631,30 @@ 
 						'value' => '0',
 					),
 				),
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
+				'description'   => __('Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview').' '.__('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
 			),
 			array(
 				'name'       => 'delete-on-uninstall',
 				'type'       => 'radio',
-				'label'      => __( 'Remove Data on Delete?', 'gravityview' ),
+				'label'      => __('Remove Data on Delete?', 'gravityview'),
 				'default_value'    => $default_settings['delete-on-uninstall'],
 				'horizontal' => 1,
 				'choices'    => array(
 					array(
-						'label' => _x( 'Keep GravityView Data', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
+						'label' => _x('Keep GravityView Data', 'Setting: what to do when uninstalling plugin', 'gravityview'),
 						'value' => '0',
-						'tooltip' => sprintf( '<h6>%s</h6><p>%s</p>', __( 'Keep GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install the plugin, all GravityView data will be kept. Views, settings, etc. will be untouched.', 'gravityview' ) ),
+						'tooltip' => sprintf('<h6>%s</h6><p>%s</p>', __('Keep GravityView content and settings', 'gravityview'), __('If you delete then re-install the plugin, all GravityView data will be kept. Views, settings, etc. will be untouched.', 'gravityview')),
 					),
 					array(
-						'label' => _x( 'Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview' ),
+						'label' => _x('Permanently Delete', 'Setting: what to do when uninstalling plugin', 'gravityview'),
 						'value' => 'delete',
-					    'tooltip' => sprintf( '<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __( 'Delete all GravityView content and settings', 'gravityview' ), __( 'If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview' ), __( 'When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview' ) ),
+					    'tooltip' => sprintf('<h6>%s</h6><p><span class="howto">%s</span></p><p>%s</p>', __('Delete all GravityView content and settings', 'gravityview'), __('If you delete then re-install GravityView, it will be like installing GravityView for the first time.', 'gravityview'), __('When GravityView is uninstalled and deleted, delete all Views, GravityView entry approvals, GravityView-generated entry notes (including approval and entry creator changes), and GravityView plugin settings. No Gravity Forms data will be touched.', 'gravityview')),
 					),
 				),
-				'description'   => sprintf( __( 'Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview' ), __( 'Permanently Delete', 'gravityview' ) ),
+				'description'   => sprintf(__('Should GravityView content and entry approval status be removed from the site when the GravityView plugin is deleted?', 'gravityview'), __('Permanently Delete', 'gravityview')),
 			),
 
-		) );
+		));
 
 
 
@@ -662,21 +662,21 @@ 
 		 * Redux backward compatibility
 		 * @since 1.7.4
 		 */
-		foreach ( $fields as &$field ) {
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
-
-			if( $disabled_attribute ) {
-				$field['disabled']  = $disabled_attribute;
+		foreach ($fields as &$field) {
+			$field['name']          = isset($field['name']) ? $field['name'] : rgget('id', $field);
+			$field['label']         = isset($field['label']) ? $field['label'] : rgget('title', $field);
+			$field['default_value'] = isset($field['default_value']) ? $field['default_value'] : rgget('default', $field);
+			$field['description']   = isset($field['description']) ? $field['description'] : rgget('subtitle', $field);
+
+			if ($disabled_attribute) {
+				$field['disabled'] = $disabled_attribute;
 			}
 		}
 
 
         $sections = array(
             array(
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
+                'description' =>      sprintf('<span class="version-info description">%s</span>', sprintf(__('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version)),
                 'fields'      => $fields,
             )
         );
@@ -687,7 +687,7 @@ 
             'type'     => 'save',
         );
 
-		if( $disabled_attribute ) {
+		if ($disabled_attribute) {
 			$button['disabled'] = $disabled_attribute;
 		}
 
@@ -703,22 +703,22 @@ 
          * </code>
          * @param array $extension_settings Empty array, ready for extension settings!
          */
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
+        $extension_sections = apply_filters('gravityview/settings/extension/sections', array());
 
 		// If there are extensions, add a section for them
-		if ( ! empty( $extension_sections ) ) {
+		if (!empty($extension_sections)) {
 
-			if( $disabled_attribute ) {
-				foreach ( $extension_sections as &$section ) {
-					foreach ( $section['fields'] as &$field ) {
+			if ($disabled_attribute) {
+				foreach ($extension_sections as &$section) {
+					foreach ($section['fields'] as &$field) {
 						$field['disabled'] = $disabled_attribute;
 					}
 				}
 			}
 
-            $k = count( $extension_sections ) - 1 ;
-            $extension_sections[ $k ]['fields'][] = $button;
-			$sections = array_merge( $sections, $extension_sections );
+            $k = count($extension_sections) - 1;
+            $extension_sections[$k]['fields'][] = $button;
+			$sections = array_merge($sections, $extension_sections);
 		} else {
             // add the 'update settings' button to the general section
             $sections[0]['fields'][] = $button;
@@ -734,8 +734,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	static public function getSetting( $key ) {
-		return self::get_instance()->get_app_setting( $key );
+	static public function getSetting($key) {
+		return self::get_instance()->get_app_setting($key);
 	}
 
 }

Braces +3 added lines, -2 removed lines

@@ -441,8 +441,9 @@
 		$field['name']  = 'gform-settings-save';
 		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
 
-		if ( ! rgar( $field, 'value' ) )
-			$field['value'] = __( 'Update Settings', 'gravityview' );
+		if ( ! rgar( $field, 'value' ) ) {
+					$field['value'] = __( 'Update Settings', 'gravityview' );
+		}
 
 		$output = $this->settings_submit( $field, false );
 

includes/connector-functions.php

Doc Comments +3 added lines, -5 removed lines

@@ -41,7 +41,6 @@ 
  *
  * @see GVCommon::get_forms()
  * @access public
- * @param mixed $form_id
  * @return array (id, title)
  */
 function gravityview_get_forms() {
@@ -53,7 +52,7 @@ 
  *
  * @see GVCommon::get_form_fields()
  * @access public
- * @param string|array $form_id (default: '') or $form object
+ * @param string|array $form (default: '') or $form object
  * @return array
  */
 function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
@@ -91,6 +90,7 @@ 
  * @param int|array $form_ids The ID of the form or an array IDs of the Forms. Zero for all forms.
  * @param mixed $passed_criteria (default: null)
  * @param mixed &$total (default: null)
+ * @param integer $total
  * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
  */
 function gravityview_get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
@@ -103,7 +103,6 @@ 
  * Since 1.4, supports custom entry slugs. The way that GravityView fetches an entry based on the custom slug is by searching `gravityview_unique_id` meta. The `$entry_slug` is fetched by getting the current query var set by `is_single_entry()`
  *
  * @access public
- * @param mixed $entry_id
  * @param boolean $force_allow_ids Force the get_entry() method to allow passed entry IDs, even if the `gravityview_custom_entry_slug_allow_id` filter returns false.
  * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14}
  * @return array|boolean
@@ -177,7 +176,7 @@ 
  *
  * @param int $view_id ID of the View you want the form of
  *
- * @return int
+ * @return string
  */
 function gravityview_get_form_id( $view_id ) {
 	return GVCommon::get_meta_form_id( $view_id );
@@ -188,7 +187,6 @@ 
  *
  * @see GravityView_Template::template_id
  *
- * @param int $view_id The ID of the View to get the layout of
  *
  * @return string GravityView_Template::template_id value. Empty string if not.
  */

Spacing +53 added lines, -53 removed lines

@@ -21,8 +21,8 @@ 
  * @param mixed $form_id
  * @return mixed False: no form ID specified or Gravity Forms isn't active. Array: Form returned from Gravity Forms
  */
-function gravityview_get_form( $form_id ) {
-	return GVCommon::get_form( $form_id );
+function gravityview_get_form($form_id) {
+	return GVCommon::get_form($form_id);
 }
 
 
@@ -32,8 +32,8 @@ 
  * @param  int|string $entry_slug Entry slug
  * @return array           Gravity Forms form array
  */
-function gravityview_get_form_from_entry_id( $entry_slug ) {
-	return GVCommon::get_form_from_entry_id( $entry_slug );
+function gravityview_get_form_from_entry_id($entry_slug) {
+	return GVCommon::get_form_from_entry_id($entry_slug);
 }
 
 /**
@@ -56,8 +56,8 @@ 
  * @param string|array $form_id (default: '') or $form object
  * @return array
  */
-function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
-	return GVCommon::get_form_fields( $form, $add_default_properties, $include_parent_field );
+function gravityview_get_form_fields($form = '', $add_default_properties = false, $include_parent_field = true) {
+	return GVCommon::get_form_fields($form, $add_default_properties, $include_parent_field);
 }
 
 /**
@@ -65,8 +65,8 @@ 
  * @param  string $form_id (default: '')
  * @return array
  */
-function gravityview_get_entry_meta( $form_id, $only_default_column = true ) {
-	return GVCommon::get_entry_meta( $form_id, $only_default_column );
+function gravityview_get_entry_meta($form_id, $only_default_column = true) {
+	return GVCommon::get_entry_meta($form_id, $only_default_column);
 }
 
 /**
@@ -77,8 +77,8 @@ 
  * @since  1.1.6
  * @return array          Array of entry IDs
  */
-function gravityview_get_entry_ids( $form_id, $search_criteria = array() ) {
-	return GVCommon::get_entry_ids( $form_id, $search_criteria );
+function gravityview_get_entry_ids($form_id, $search_criteria = array()) {
+	return GVCommon::get_entry_ids($form_id, $search_criteria);
 }
 
 
@@ -93,8 +93,8 @@ 
  * @param mixed &$total (default: null)
  * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
  */
-function gravityview_get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
-	return GVCommon::get_entries( $form_ids, $passed_criteria, $total );
+function gravityview_get_entries($form_ids = null, $passed_criteria = null, &$total = null) {
+	return GVCommon::get_entries($form_ids, $passed_criteria, $total);
 }
 
 /**
@@ -108,8 +108,8 @@ 
  * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14}
  * @return array|boolean
  */
-function gravityview_get_entry( $entry_slug, $force_allow_ids = false, $check_entry_display = true ) {
-	return GVCommon::get_entry( $entry_slug, $force_allow_ids, $check_entry_display );
+function gravityview_get_entry($entry_slug, $force_allow_ids = false, $check_entry_display = true) {
+	return GVCommon::get_entry($entry_slug, $force_allow_ids, $check_entry_display);
 }
 
 /**
@@ -120,8 +120,8 @@ 
  * @param mixed $field_id
  * @return string
  */
-function gravityview_get_field_label( $form, $field_id ) {
-	return GVCommon::get_field_label( $form, $field_id );
+function gravityview_get_field_label($form, $field_id) {
+	return GVCommon::get_field_label($form, $field_id);
 }
 
 
@@ -137,8 +137,8 @@ 
  * @param string|int $field_id
  * @return array
  */
-function gravityview_get_field( $form, $field_id ) {
-	return GVCommon::get_field( $form, $field_id );
+function gravityview_get_field($form, $field_id) {
+	return GVCommon::get_field($form, $field_id);
 }
 
 
@@ -151,16 +151,16 @@ 
  * @param  WP_Post      $post WordPress post object
  * @return boolean           True: yep, GravityView; No: not!
  */
-function has_gravityview_shortcode( $post = NULL ) {
-	return GVCommon::has_gravityview_shortcode( $post );
+function has_gravityview_shortcode($post = NULL) {
+	return GVCommon::has_gravityview_shortcode($post);
 }
 
 /**
  * Placeholder until the recursive has_shortcode() patch is merged
  * @see https://core.trac.wordpress.org/ticket/26343#comment:10
  */
-function gravityview_has_shortcode_r( $content, $tag = 'gravityview' ) {
-	return GVCommon::has_shortcode_r( $content, $tag );
+function gravityview_has_shortcode_r($content, $tag = 'gravityview') {
+	return GVCommon::has_shortcode_r($content, $tag);
 }
 
 /**
@@ -168,8 +168,8 @@ 
  * @param  int $form_id Gravity Forms form ID
  * @return array          Array with view details
  */
-function gravityview_get_connected_views( $form_id ) {
-	return GVCommon::get_connected_views( $form_id );
+function gravityview_get_connected_views($form_id) {
+	return GVCommon::get_connected_views($form_id);
 }
 
 /**
@@ -179,8 +179,8 @@ 
  *
  * @return int
  */
-function gravityview_get_form_id( $view_id ) {
-	return GVCommon::get_meta_form_id( $view_id );
+function gravityview_get_form_id($view_id) {
+	return GVCommon::get_meta_form_id($view_id);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  *
  * @return string GravityView_Template::template_id value. Empty string if not.
  */
-function gravityview_get_template_id( $post_id ) {
-	return GVCommon::get_meta_template_id( $post_id );
+function gravityview_get_template_id($post_id) {
+	return GVCommon::get_meta_template_id($post_id);
 }
 
 /**
@@ -203,8 +203,8 @@ 
  * @param  int $post_id View ID
  * @return array          Associative array of settings with plugin defaults used if not set by the View
  */
-function gravityview_get_template_settings( $post_id ) {
-	return GVCommon::get_template_settings( $post_id );
+function gravityview_get_template_settings($post_id) {
+	return GVCommon::get_template_settings($post_id);
 }
 
 /**
@@ -216,8 +216,8 @@ 
  * @param  string $key     Key for the setting
  * @return mixed|null          Setting value, or NULL if not set.
  */
-function gravityview_get_template_setting( $post_id, $key ) {
-	return GVCommon::get_template_setting( $post_id, $key );
+function gravityview_get_template_setting($post_id, $key) {
+	return GVCommon::get_template_setting($post_id, $key);
 }
 
 /**
@@ -231,7 +231,7 @@ 
 	 * @filter `gravityview_register_directory_template` Fetch available View templates
 	 * @param array $templates Templates to show
 	 */
-	$templates = apply_filters( 'gravityview_register_directory_template', array() );
+	$templates = apply_filters('gravityview_register_directory_template', array());
 
 	return $templates;
 }
@@ -266,8 +266,8 @@ 
  * @param  int $post_id View ID
  * @return array          Multi-array of fields with first level being the field zones. See code comment.
  */
-function gravityview_get_directory_fields( $post_id ) {
-	return GVCommon::get_directory_fields( $post_id );
+function gravityview_get_directory_fields($post_id) {
+	return GVCommon::get_directory_fields($post_id);
 }
 
 /**
@@ -278,8 +278,8 @@ 
  * @param string $current Field ID of field used to sort
  * @return string         html
  */
-function gravityview_get_sortable_fields( $formid, $current = '' ) {
-	return GVCommon::get_sortable_fields( $formid, $current );
+function gravityview_get_sortable_fields($formid, $current = '') {
+	return GVCommon::get_sortable_fields($formid, $current);
 }
 
 
@@ -289,8 +289,8 @@ 
  * @param  mixed $field_id Field ID or Field array
  * @return string field type
  */
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
-	return GVCommon::get_field_type(  $form, $field_id );
+function gravityview_get_field_type($form = null, $field_id = '') {
+	return GVCommon::get_field_type($form, $field_id);
 }
 
 
@@ -302,15 +302,15 @@ 
  * @param array $atts (default: array())
  * @return string HTML of the output. Empty string if $view_id is empty.
  */
-function get_gravityview( $view_id = '', $atts = array() ) {
-	if( !empty( $view_id ) ) {
+function get_gravityview($view_id = '', $atts = array()) {
+	if (!empty($view_id)) {
 		$atts['id'] = $view_id;
-		$args = wp_parse_args( $atts, GravityView_View_Data::get_default_args() );
+		$args = wp_parse_args($atts, GravityView_View_Data::get_default_args());
 		$GravityView_frontend = GravityView_frontend::getInstance();
-		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
-		$GravityView_frontend->set_context_view_id( $view_id );
+		$GravityView_frontend->setGvOutputData(GravityView_View_Data::getInstance($view_id));
+		$GravityView_frontend->set_context_view_id($view_id);
 		$GravityView_frontend->set_entry_data();
-		return $GravityView_frontend->render_view( $args );
+		return $GravityView_frontend->render_view($args);
 	}
 	return '';
 }
@@ -323,8 +323,8 @@ 
  * @param array $atts (default: array())
  * @return void
  */
-function the_gravityview( $view_id = '', $atts = array() ) {
-	echo get_gravityview( $view_id, $atts );
+function the_gravityview($view_id = '', $atts = array()) {
+	echo get_gravityview($view_id, $atts);
 }
 
 
@@ -345,17 +345,17 @@ 
  * @param array $form Gravity Forms form
  * @param array $view_fields GravityView fields array
  */
-function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
+function gravityview_view_has_single_checkbox_or_radio($form, $view_fields) {
 
-	if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
+	if ($form_fields = GFFormsModel::get_fields_by_type($form, array('checkbox', 'radio'))) {
 
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
-		foreach( $form_fields as $form_field ) {
+		foreach ($form_fields as $form_field) {
 			$field_id = $form_field->id;
-			foreach( $view_fields as $zone ) {
-				foreach( $zone as $field ) {
+			foreach ($view_fields as $zone) {
+				foreach ($zone as $field) {
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
+					if ((strpos($field['id'], '.') > 0) && floor($field['id']) === floor($field_id)) {
 						return true;
 					}
 				}

includes/extensions/delete-entry/class-delete-entry.php

Doc Comments -1 removed lines

@@ -170,7 +170,6 @@
 	 *
 	 * @since 1.5.1
 	 * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
-	 * @param  string      $field_type  Type of field options to render (`field` or `widget`)
 	 * @param  string      $template_id Table slug
 	 * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
 	 * @param  string      $context     What context are we in? Example: `single` or `directory`

Indentation +3 added lines, -3 removed lines

@@ -228,7 +228,7 @@ 
 
 		self::getInstance()->set_entry( $entry );
 
-        $base = GravityView_API::directory_link( $post_id, true );
+		$base = GravityView_API::directory_link( $post_id, true );
 
 		if( empty( $base ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
@@ -238,13 +238,13 @@ 
 		// Use the slug instead of the ID for consistent security
 		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
 
-        $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
+		$view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
 
 		$actionurl = add_query_arg( array(
 			'action'	=> 'delete',
 			'entry_id'		=> $entry_slug,
 			'gvid' => $view_id,
-            'view_id' => $view_id,
+			'view_id' => $view_id,
 		), $base );
 
 		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );

Spacing +120 added lines, -120 removed lines

@@ -12,7 +12,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -30,7 +30,7 @@ 
 
 	function __construct() {
 
-		self::$file = plugin_dir_path( __FILE__ );
+		self::$file = plugin_dir_path(__FILE__);
 
 		$this->add_hooks();
 	}
@@ -39,22 +39,22 @@ 
 	 * @since 1.9.2
 	 */
 	private function add_hooks() {
-		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
+		add_action('wp', array($this, 'process_delete'), 10000);
 
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
+		add_filter('gravityview_entry_default_fields', array($this, 'add_default_field'), 10, 3);
 
-		add_action( 'gravityview_before', array( $this, 'display_message' ) );
+		add_action('gravityview_before', array($this, 'display_message'));
 
 		// For the Delete Entry Link, you don't want visible to all users.
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
+		add_filter('gravityview_field_visibility_caps', array($this, 'modify_visibility_caps'), 10, 5);
 
 		// Modify the field options based on the name of the field type
-		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
+		add_filter('gravityview_template_delete_link_options', array($this, 'delete_link_field_options'), 10, 5);
 
 		// add template path to check for field
-		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+		add_filter('gravityview_template_paths', array($this, 'add_template_path'));
 
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
+		add_action('gravityview/edit-entry/publishing-action/after', array($this, 'add_delete_button'), 10, 3);
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -78,11 +78,11 @@ 
 	 * @since  1.5.1
 	 * @param array $file_paths List of template paths ordered
 	 */
-	function add_template_path( $file_paths ) {
+	function add_template_path($file_paths) {
 
 		// Index 100 is the default GravityView template path.
 		// Index 110 is Edit Entry link
-		$file_paths[ 115 ] = self::$file;
+		$file_paths[115] = self::$file;
 
 		return $file_paths;
 	}
@@ -98,17 +98,17 @@ 
 	 * @param  [type] $input_type    [description]
 	 * @return [type]                [description]
 	 */
-	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+	function delete_link_field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
 		// Always a link, never a filter
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+		unset($field_options['show_as_link'], $field_options['search_filter']);
 
 		// Delete Entry link should only appear to visitors capable of editing entries
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+		unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
 
 		$add_option['delete_link'] = array(
 			'type' => 'text',
-			'label' => __( 'Delete Link Text', 'gravityview' ),
+			'label' => __('Delete Link Text', 'gravityview'),
 			'desc' => NULL,
 			'value' => __('Delete Entry', 'gravityview'),
 			'merge_tags' => true,
@@ -116,15 +116,15 @@ 
 
 		$field_options['allow_edit_cap'] = array(
 			'type' => 'select',
-			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
-			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+			'label' => __('Allow the following users to delete the entry:', 'gravityview'),
+			'choices' => GravityView_Render_Settings::get_cap_choices($template_id, $field_id, $context, $input_type),
 			'tooltip' => 'allow_edit_cap',
 			'class' => 'widefat',
 			'value' => 'read', // Default: entry creator
 		);
 
 
-		return array_merge( $add_option, $field_options );
+		return array_merge($add_option, $field_options);
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @param  string|array $form form_ID or form object
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 */
-	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+	function add_default_field($entry_default_fields, $form = array(), $zone = '') {
 
 		$entry_default_fields['delete_link'] = array(
 			'label' => __('Delete Entry', 'gravityview'),
@@ -152,10 +152,10 @@ 
 	 * @since 1.5.1
 	 * @param array $available_fields
 	 */
-	function add_available_field( $available_fields = array() ) {
+	function add_available_field($available_fields = array()) {
 
 		$available_fields['delete_link'] = array(
-			'label_text' => __( 'Delete Entry', 'gravityview' ),
+			'label_text' => __('Delete Entry', 'gravityview'),
 			'field_id' => 'delete_link',
 			'label_type' => 'field',
 			'input_type' => 'delete_link',
@@ -177,15 +177,15 @@ 
 	 * @param  string      $input_type  (textarea, list, select, etc.)
 	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
 	 */
-	public function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+	public function modify_visibility_caps($visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
 		$caps = $visibility_caps;
 
 		// If we're configuring fields in the edit context, we want a limited selection
-		if( $field_id === 'delete_link' ) {
+		if ($field_id === 'delete_link') {
 
 			// Remove other built-in caps.
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+			unset($caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts']);
 
 			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
 		}
@@ -199,8 +199,8 @@ 
 	 * @since 1.5.1
 	 * @param [type] $entry [description]
 	 */
-	function set_entry( $entry = null ) {
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
+	function set_entry($entry = null) {
+		$this->entry = empty($entry) ? GravityView_View::getInstance()->entries[0] : $entry;
 	}
 
 	/**
@@ -210,8 +210,8 @@ 
 	 * @param  int $entry_id Entry ID
 	 * @return string           Key used to validate request
 	 */
-	public static function get_nonce_key( $entry_id ) {
-		return sprintf( 'delete_%s', $entry_id );
+	public static function get_nonce_key($entry_id) {
+		return sprintf('delete_%s', $entry_id);
 	}
 
 
@@ -224,30 +224,30 @@ 
 	 * @param  array      $entry Gravity Forms entry array
 	 * @return string|null             If directory link is valid, the URL to process the delete request. Otherwise, `NULL`.
 	 */
-	public static function get_delete_link( $entry, $view_id = 0, $post_id = null ) {
+	public static function get_delete_link($entry, $view_id = 0, $post_id = null) {
 
-		self::getInstance()->set_entry( $entry );
+		self::getInstance()->set_entry($entry);
 
-        $base = GravityView_API::directory_link( $post_id, true );
+        $base = GravityView_API::directory_link($post_id, true);
 
-		if( empty( $base ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
+		if (empty($base)) {
+			do_action('gravityview_log_error', __METHOD__.' - Post ID does not exist: '.$post_id);
 			return NULL;
 		}
 
 		// Use the slug instead of the ID for consistent security
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = GravityView_API::get_entry_slug($entry['id'], $entry);
 
-        $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
+        $view_id = empty($view_id) ? gravityview_get_view_id() : $view_id;
 
-		$actionurl = add_query_arg( array(
+		$actionurl = add_query_arg(array(
 			'action'	=> 'delete',
 			'entry_id'		=> $entry_slug,
 			'gvid' => $view_id,
             'view_id' => $view_id,
-		), $base );
+		), $base);
 
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
+		$url = wp_nonce_url($actionurl, 'delete_'.$entry_slug, 'delete');
 
 		return $url;
 	}
@@ -261,10 +261,10 @@ 
 	 * @param array $entry   Gravity Forms entry array
 	 * @param int $view_id GravityView View ID
 	 */
-	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
+	function add_delete_button($form = array(), $entry = array(), $view_id = NULL) {
 
 		// Only show the link to those who are allowed to see it.
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
+		if (!self::check_user_cap_delete_entry($entry)) {
 			return;
 		}
 
@@ -272,10 +272,10 @@ 
 		 * @filter `gravityview/delete-entry/show-delete-button` Should the Delete button be shown in the Edit Entry screen?
 		 * @param boolean $show_entry Default: true
 		 */
-		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
+		$show_delete_button = apply_filters('gravityview/delete-entry/show-delete-button', true);
 
 		// If the button is hidden by the filter, don't show.
-		if( !$show_delete_button ) {
+		if (!$show_delete_button) {
 			return;
 		}
 
@@ -285,7 +285,7 @@ 
 			'onclick' => self::get_confirm_dialog(),
 		);
 
-		echo gravityview_get_link( self::get_delete_link( $entry, $view_id ), esc_attr__( 'Delete', 'gravityview' ), $attributes );
+		echo gravityview_get_link(self::get_delete_link($entry, $view_id), esc_attr__('Delete', 'gravityview'), $attributes);
 
 	}
 
@@ -305,39 +305,39 @@ 
 	function process_delete() {
 
 		// If the form is submitted
-		if( RGForms::get("action") === "delete") {
+		if (RGForms::get("action") === "delete") {
 
-			$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+			$nonce_key = self::get_nonce_key($_GET['entry_id']);
 
 			// Make sure it's a valid request
-			check_admin_referer( $nonce_key, 'delete' );
+			check_admin_referer($nonce_key, 'delete');
 
 			// Get the entry slug
-			$entry_slug = esc_attr( $_GET['entry_id'] );
+			$entry_slug = esc_attr($_GET['entry_id']);
 
 			// See if there's an entry there
-			$entry = gravityview_get_entry( $entry_slug );
+			$entry = gravityview_get_entry($entry_slug);
 
-			if( $entry ) {
+			if ($entry) {
 
-				$has_permission = $this->user_can_delete_entry( $entry );
+				$has_permission = $this->user_can_delete_entry($entry);
 
-				if( is_wp_error( $has_permission ) ) {
+				if (is_wp_error($has_permission)) {
 
 					$messages = array(
-						'message' => urlencode( $has_permission->get_error_message() ),
+						'message' => urlencode($has_permission->get_error_message()),
 						'status' => 'error',
 					);
 
 				} else {
 
 					// Delete the entry
-					$delete_response = $this->delete_or_trash_entry( $entry['id'] );
+					$delete_response = $this->delete_or_trash_entry($entry['id']);
 
-					if( is_wp_error( $delete_response ) ) {
+					if (is_wp_error($delete_response)) {
 
 						$messages = array(
-							'message' => urlencode( $delete_response->get_error_message() ),
+							'message' => urlencode($delete_response->get_error_message()),
 							'status' => 'error',
 						);
 
@@ -353,18 +353,18 @@ 
 
 			} else {
 
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
+				do_action('gravityview_log_debug', __METHOD__.' Delete entry failed: there was no entry with the entry slug '.$entry_slug);
 
 				$messages = array(
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
+					'message' => urlencode(__('The entry does not exist.', 'gravityview')),
 					'status' => 'error',
 				);
 			}
 
-			$redirect_to_base = esc_url_raw( remove_query_arg( array( 'action' ) ) );
-			$redirect_to = add_query_arg( $messages, $redirect_to_base );
+			$redirect_to_base = esc_url_raw(remove_query_arg(array('action')));
+			$redirect_to = add_query_arg($messages, $redirect_to_base);
 
-			wp_safe_redirect( $redirect_to );
+			wp_safe_redirect($redirect_to);
 
 			exit();
 
@@ -384,9 +384,9 @@ 
 		 * @since 1.13.1
 		 * @param string $delete_mode Delete mode: `trash` or `delete`. Default: `delete`
 		 */
-		$delete_mode = apply_filters( 'gravityview/delete-entry/mode', 'delete' );
+		$delete_mode = apply_filters('gravityview/delete-entry/mode', 'delete');
 
-		return ( 'trash' === $delete_mode ) ? 'trash' : 'delete';
+		return ('trash' === $delete_mode) ? 'trash' : 'delete';
 	}
 
 	/**
@@ -394,37 +394,37 @@ 
 	 * @see GFAPI::delete_entry()
 	 * @return WP_Error|boolean GFAPI::delete_entry() returns a WP_Error on error
 	 */
-	private function delete_or_trash_entry( $entry_id ) {
+	private function delete_or_trash_entry($entry_id) {
 
 		$mode = $this->get_delete_mode();
 
-		if( 'delete' === $mode ) {
+		if ('delete' === $mode) {
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
+			do_action('gravityview_log_debug', __METHOD__.' Starting delete entry: ', $entry_id);
 
 			// Delete the entry
-			$delete_response = GFAPI::delete_entry( $entry_id );
+			$delete_response = GFAPI::delete_entry($entry_id);
 
-			if( ! is_wp_error( $delete_response ) ) {
+			if (!is_wp_error($delete_response)) {
 				$delete_response = 'deleted';
 			}
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Delete response: ', $delete_response );
+			do_action('gravityview_log_debug', __METHOD__.' Delete response: ', $delete_response);
 
 		} else {
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting trash entry: ', $entry_id );
+			do_action('gravityview_log_debug', __METHOD__.' Starting trash entry: ', $entry_id);
 
-			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
+			$trashed = GFAPI::update_entry_property($entry_id, 'status', 'trash');
 			new GravityView_Cache;
 
-			if( ! $trashed ) {
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
+			if (!$trashed) {
+				$delete_response = new WP_Error('trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview'));
 			} else {
 				$delete_response = 'trashed';
 			}
 
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Trashed? ', $delete_response );
+			do_action('gravityview_log_debug', __METHOD__.' Trashed? ', $delete_response);
 		}
 
 		return $delete_response;
@@ -439,13 +439,13 @@ 
 	public function verify_nonce() {
 
 		// No delete entry request was made
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
+		if (empty($_GET['entry_id']) || empty($_GET['delete'])) {
 			return false;
 		}
 
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
+		$nonce_key = self::get_nonce_key($_GET['entry_id']);
 
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
+		$valid = wp_verify_nonce($_GET['delete'], $nonce_key);
 
 		/**
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -454,7 +454,7 @@ 
 		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
 		 * @param string $nonce_key Name of nonce action used in wp_verify_nonce. $_GET['delete'] holds the nonce value itself. Default: `delete_{entry_id}`
 		 */
-		$valid = apply_filters( 'gravityview/delete-entry/verify_nonce', $valid, $nonce_key );
+		$valid = apply_filters('gravityview/delete-entry/verify_nonce', $valid, $nonce_key);
 
 		return $valid;
 	}
@@ -473,9 +473,9 @@ 
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
 		 * @param string $confirm Default: "Are you sure you want to delete this entry? This cannot be undone."
 		 */
-		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
+		$confirm = apply_filters('gravityview/delete-entry/confirm-text', $confirm);
 
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
+		return 'return window.confirm(\''.esc_js($confirm).'\');';
 	}
 
 	/**
@@ -489,34 +489,34 @@ 
 	 * @param  array $entry Gravity Forms entry array
 	 * @return boolean|WP_Error        True: can edit form. WP_Error: nope.
 	 */
-	function user_can_delete_entry( $entry = array() ) {
+	function user_can_delete_entry($entry = array()) {
 
 		$error = NULL;
 
-		if( ! $this->verify_nonce() ) {
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
+		if (!$this->verify_nonce()) {
+			$error = __('The link to delete this entry is not valid; it may have expired.', 'gravityview');
 		}
 
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
+		if (!self::check_user_cap_delete_entry($entry)) {
+			$error = __('You do not have permission to delete this entry.', 'gravityview');
 		}
 
-		if( $entry['status'] === 'trash' ) {
-			if( 'trash' === $this->get_delete_mode() ) {
-				$error = __( 'The entry is already in the trash.', 'gravityview' );
+		if ($entry['status'] === 'trash') {
+			if ('trash' === $this->get_delete_mode()) {
+				$error = __('The entry is already in the trash.', 'gravityview');
 			} else {
-				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
+				$error = __('You cannot delete the entry; it is already in the trash.', 'gravityview');
 			}
 		}
 
 		// No errors; everything's fine here!
-		if( empty( $error ) ) {
+		if (empty($error)) {
 			return true;
 		}
 
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
+		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]'.$error);
 
-		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
+		return new WP_Error('gravityview-delete-entry-permissions', $error);
 	}
 
 
@@ -531,77 +531,77 @@ 
 	 * @param int $view_id Pass a View ID to check caps against. If not set, check against current View (optional)
 	 * @return bool
 	 */
-	public static function check_user_cap_delete_entry( $entry, $field = array(), $view_id = 0 ) {
+	public static function check_user_cap_delete_entry($entry, $field = array(), $view_id = 0) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$current_user = wp_get_current_user();
 
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
+		$entry_id = isset($entry['id']) ? $entry['id'] : NULL;
 
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
+		if (GVCommon::has_cap(array('gravityforms_delete_entries', 'gravityview_delete_others_entries'), $entry_id)) {
 
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
+			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.');
 
 			return true;
 		}
 
 
 		// If field options are passed, check if current user can view the link
-		if( !empty( $field ) ) {
+		if (!empty($field)) {
 
 			// If capability is not defined, something is not right!
-			if( empty( $field['allow_edit_cap'] ) ) {
+			if (empty($field['allow_edit_cap'])) {
 
-				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
+				do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field);
 
 				return false;
 			}
 
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
+			if (GVCommon::has_cap($field['allow_edit_cap'])) {
 
 				// Do not return true if cap is read, as we need to check if the current user created the entry
-				if( $field['allow_edit_cap'] !== 'read' ) {
+				if ($field['allow_edit_cap'] !== 'read') {
 					return true;
 				}
 
 			} else {
 
-				do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID ) );
+				do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID));
 
 				return false;
 			}
 
 		}
 
-		if( !isset( $entry['created_by'] ) ) {
+		if (!isset($entry['created_by'])) {
 
 			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
 
 			return false;
 		}
 
-		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
+		$view_id = empty($view_id) ? $gravityview_view->getViewId() : $view_id;
 
 		// Only checks user_delete view option if view is already set
-		if( $view_id ) {
+		if ($view_id) {
 
-			$current_view = gravityview_get_current_view_data( $view_id );
+			$current_view = gravityview_get_current_view_data($view_id);
 
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
+			$user_delete = isset($current_view['atts']['user_delete']) ? $current_view['atts']['user_delete'] : false;
 
-			if( empty( $user_delete ) ) {
+			if (empty($user_delete)) {
 
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
+				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.');
 
 				return false;
 			}
 		}
 
 		// If the logged-in user is the same as the user who created the entry, we're good.
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
+		if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
 
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
+			do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID));
 
 			return true;
 		}
@@ -622,27 +622,27 @@ 
 	 * @param int $current_view_id The ID of the View being rendered
 	 * @return void
 	 */
-	public function display_message( $current_view_id = 0 ) {
+	public function display_message($current_view_id = 0) {
 
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
+		if (empty($_GET['status']) || !self::verify_nonce()) {
 			return;
 		}
 
 		// Entry wasn't deleted from current View
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
+		if (intval($_GET['gvid']) !== intval($current_view_id)) {
 			return;
 		}
 
-		$status = esc_attr( $_GET['status'] );
+		$status = esc_attr($_GET['status']);
 		$message_from_url = rgget('message');
-		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
+		$message_from_url = urldecode(stripslashes_deep($message_from_url));
 		$class = '';
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'error':
 				$class = ' gv-error error';
 				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
-				$message = sprintf( $error_message, $message_from_url );
+				$message = sprintf($error_message, $message_from_url);
 				break;
 			case 'trashed':
 				$message = __('The entry was successfully moved to the trash.', 'gravityview');
@@ -659,10 +659,10 @@ 
 		 * @param string $status Message status (`error` or `success`)
 		 * @param string $message_from_url The original error message, if any, without the "There was an error deleting the entry:" prefix
 		 */
-		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
+		$message = apply_filters('gravityview/delete-entry/message', esc_attr($message), $status, $message_from_url);
 
 		// DISPLAY ERROR/SUCCESS MESSAGE
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
+		echo '<div class="gv-notice'.esc_attr($class).'">'.$message.'</div>';
 	}
 
 

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

Doc Comments -1 removed lines

@@ -69,7 +69,6 @@
      * Change wording for the Edit context to read Entry Creator
      *
      * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
-     * @param  string      $field_type  Type of field options to render (`field` or `widget`)
      * @param  string      $template_id Table slug
      * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
      * @param  string      $context     What context are we in? Example: `single` or `directory`

Indentation +160 added lines, -160 removed lines

@@ -10,175 +10,175 @@
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 
 class GravityView_Edit_Entry_Admin {
 
-    protected $loader;
+	protected $loader;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
-    function load() {
-
-        if( !is_admin() ) {
-            return;
-        }
-
-        // Add Edit Link as a default field, outside those set in the Gravity Form form
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
-
-        // For the Edit Entry Link, you don't want visible to all users.
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
+	function load() {
+
+		if( !is_admin() ) {
+			return;
+		}
+
+		// Add Edit Link as a default field, outside those set in the Gravity Form form
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
+
+		// For the Edit Entry Link, you don't want visible to all users.
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
 
-        // Modify the field options based on the name of the field type
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
+		// Modify the field options based on the name of the field type
+		add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
 
-        // add tooltips
-        add_filter( 'gravityview_tooltips', array( $this, 'tooltips') );
-
-        // custom fields' options for zone EDIT
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
-    }
-
-    /**
-     * Add Edit Link as a default field, outside those set in the Gravity Form form
-     * @param array $entry_default_fields Existing fields
-     * @param  string|array $form form_ID or form object
-     * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
-     */
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
-
-        if( $zone !== 'edit' ) {
-
-            $entry_default_fields['edit_link'] = array(
-                'label' => __('Edit Entry', 'gravityview'),
-                'type' => 'edit_link',
-                'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
-            );
-
-        }
-
-        return $entry_default_fields;
-    }
-
-    /**
-     * Change wording for the Edit context to read Entry Creator
-     *
-     * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
-     * @param  string      $field_type  Type of field options to render (`field` or `widget`)
-     * @param  string      $template_id Table slug
-     * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
-     * @param  string      $context     What context are we in? Example: `single` or `directory`
-     * @param  string      $input_type  (textarea, list, select, etc.)
-     * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
-     */
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
-
-        $caps = $visibility_caps;
-
-        // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
-
-            // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
-
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
-        }
-
-        return $caps;
-    }
-
-    /**
-     * Add "Edit Link Text" setting to the edit_link field settings
-     * @param  [type] $field_options [description]
-     * @param  [type] $template_id   [description]
-     * @param  [type] $field_id      [description]
-     * @param  [type] $context       [description]
-     * @param  [type] $input_type    [description]
-     * @return [type]                [description]
-     */
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
-
-        // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
-
-        // Edit Entry link should only appear to visitors capable of editing entries
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_option['edit_link'] = array(
-            'type' => 'text',
-            'label' => __( 'Edit Link Text', 'gravityview' ),
-            'desc' => NULL,
-            'value' => __('Edit Entry', 'gravityview'),
-            'merge_tags' => true,
-        );
-
-        return array_merge( $add_option, $field_options );
-    }
-
-    /**
-     * Add tooltips
-     * @param  array $tooltips Existing tooltips
-     * @return array           Modified tooltips
-     */
-    function tooltips( $tooltips ) {
-
-        $return = $tooltips;
-
-        $return['allow_edit_cap'] = array(
-            'title' => __('Limiting Edit Access', 'gravityview'),
-            'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
-        );
-
-        return $return;
-    }
-
-    /**
-     * Manipulate the fields' options for the EDIT ENTRY screen
-     * @param  [type] $field_options [description]
-     * @param  [type] $template_id   [description]
-     * @param  [type] $field_id      [description]
-     * @param  [type] $context       [description]
-     * @param  [type] $input_type    [description]
-     * @return [type]                [description]
-     */
-    function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
-
-        // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
-
-            /**
-             * @since 1.8.4
-             */
-            $field_options['new_window'] = array(
-                'type' => 'checkbox',
-                'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
-                'value' => false,
-            );
-
-            return $field_options;
-        }
-
-        //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
-
-        $add_options = array(
-            'allow_edit_cap' => array(
-                'type' => 'select',
-                'label' => __( 'Make field editable to:', 'gravityview' ),
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
-                'tooltip' => 'allow_edit_cap',
-                'class' => 'widefat',
-                'value' => 'read', // Default: entry creator
-            ),
-        );
-
-        return array_merge( $field_options, $add_options );
-    }
+		// add tooltips
+		add_filter( 'gravityview_tooltips', array( $this, 'tooltips') );
+
+		// custom fields' options for zone EDIT
+		add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
+	}
+
+	/**
+	 * Add Edit Link as a default field, outside those set in the Gravity Form form
+	 * @param array $entry_default_fields Existing fields
+	 * @param  string|array $form form_ID or form object
+	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
+	 */
+	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+
+		if( $zone !== 'edit' ) {
+
+			$entry_default_fields['edit_link'] = array(
+				'label' => __('Edit Entry', 'gravityview'),
+				'type' => 'edit_link',
+				'desc'	=> __('A link to edit the entry. Visible based on View settings.', 'gravityview'),
+			);
+
+		}
+
+		return $entry_default_fields;
+	}
+
+	/**
+	 * Change wording for the Edit context to read Entry Creator
+	 *
+	 * @param  array 	   $visibility_caps        Array of capabilities to display in field dropdown.
+	 * @param  string      $field_type  Type of field options to render (`field` or `widget`)
+	 * @param  string      $template_id Table slug
+	 * @param  float       $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
+	 * @param  string      $context     What context are we in? Example: `single` or `directory`
+	 * @param  string      $input_type  (textarea, list, select, etc.)
+	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
+	 */
+	function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+
+		$caps = $visibility_caps;
+
+		// If we're configuring fields in the edit context, we want a limited selection
+		if( $context === 'edit' ) {
+
+			// Remove other built-in caps.
+			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+
+			$caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+		}
+
+		return $caps;
+	}
+
+	/**
+	 * Add "Edit Link Text" setting to the edit_link field settings
+	 * @param  [type] $field_options [description]
+	 * @param  [type] $template_id   [description]
+	 * @param  [type] $field_id      [description]
+	 * @param  [type] $context       [description]
+	 * @param  [type] $input_type    [description]
+	 * @return [type]                [description]
+	 */
+	function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+
+		// Always a link, never a filter
+		unset( $field_options['show_as_link'], $field_options['search_filter'] );
+
+		// Edit Entry link should only appear to visitors capable of editing entries
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_option['edit_link'] = array(
+			'type' => 'text',
+			'label' => __( 'Edit Link Text', 'gravityview' ),
+			'desc' => NULL,
+			'value' => __('Edit Entry', 'gravityview'),
+			'merge_tags' => true,
+		);
+
+		return array_merge( $add_option, $field_options );
+	}
+
+	/**
+	 * Add tooltips
+	 * @param  array $tooltips Existing tooltips
+	 * @return array           Modified tooltips
+	 */
+	function tooltips( $tooltips ) {
+
+		$return = $tooltips;
+
+		$return['allow_edit_cap'] = array(
+			'title' => __('Limiting Edit Access', 'gravityview'),
+			'value' => __('Change this setting if you don\'t want the user who created the entry to be able to edit this field.', 'gravityview'),
+		);
+
+		return $return;
+	}
+
+	/**
+	 * Manipulate the fields' options for the EDIT ENTRY screen
+	 * @param  [type] $field_options [description]
+	 * @param  [type] $template_id   [description]
+	 * @param  [type] $field_id      [description]
+	 * @param  [type] $context       [description]
+	 * @param  [type] $input_type    [description]
+	 * @return [type]                [description]
+	 */
+	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+
+		// We only want to modify the settings for the edit context
+		if( 'edit' !== $context ) {
+
+			/**
+			 * @since 1.8.4
+			 */
+			$field_options['new_window'] = array(
+				'type' => 'checkbox',
+				'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
+				'value' => false,
+			);
+
+			return $field_options;
+		}
+
+		//  Entry field is only for logged in users
+		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+
+		$add_options = array(
+			'allow_edit_cap' => array(
+				'type' => 'select',
+				'label' => __( 'Make field editable to:', 'gravityview' ),
+				'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+				'tooltip' => 'allow_edit_cap',
+				'class' => 'widefat',
+				'value' => 'read', // Default: entry creator
+			),
+		);
+
+		return array_merge( $field_options, $add_options );
+	}
 
 
 } // end class
\ No newline at end of file

Spacing +27 added lines, -27 removed lines

@@ -9,7 +9,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     die;
 }
 
@@ -18,30 +18,30 @@ 
 
     protected $loader;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
+    function __construct(GravityView_Edit_Entry $loader) {
         $this->loader = $loader;
     }
 
     function load() {
 
-        if( !is_admin() ) {
+        if (!is_admin()) {
             return;
         }
 
         // Add Edit Link as a default field, outside those set in the Gravity Form form
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
+        add_filter('gravityview_entry_default_fields', array($this, 'add_default_field'), 10, 3);
 
         // For the Edit Entry Link, you don't want visible to all users.
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
+        add_filter('gravityview_field_visibility_caps', array($this, 'modify_visibility_caps'), 10, 5);
 
         // Modify the field options based on the name of the field type
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
+        add_filter('gravityview_template_edit_link_options', array($this, 'edit_link_field_options'), 10, 5);
 
         // add tooltips
-        add_filter( 'gravityview_tooltips', array( $this, 'tooltips') );
+        add_filter('gravityview_tooltips', array($this, 'tooltips'));
 
         // custom fields' options for zone EDIT
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
+        add_filter('gravityview_template_field_options', array($this, 'field_options'), 10, 5);
     }
 
     /**
@@ -50,9 +50,9 @@ 
      * @param  string|array $form form_ID or form object
      * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
      */
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
+    function add_default_field($entry_default_fields, $form = array(), $zone = '') {
 
-        if( $zone !== 'edit' ) {
+        if ($zone !== 'edit') {
 
             $entry_default_fields['edit_link'] = array(
                 'label' => __('Edit Entry', 'gravityview'),
@@ -76,17 +76,17 @@ 
      * @param  string      $input_type  (textarea, list, select, etc.)
      * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
      */
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
+    function modify_visibility_caps($visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '') {
 
         $caps = $visibility_caps;
 
         // If we're configuring fields in the edit context, we want a limited selection
-        if( $context === 'edit' ) {
+        if ($context === 'edit') {
 
             // Remove other built-in caps.
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
+            unset($caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts']);
 
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
+            $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
         }
 
         return $caps;
@@ -101,23 +101,23 @@ 
      * @param  [type] $input_type    [description]
      * @return [type]                [description]
      */
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+    function edit_link_field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
         // Always a link, never a filter
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
+        unset($field_options['show_as_link'], $field_options['search_filter']);
 
         // Edit Entry link should only appear to visitors capable of editing entries
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+        unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
 
         $add_option['edit_link'] = array(
             'type' => 'text',
-            'label' => __( 'Edit Link Text', 'gravityview' ),
+            'label' => __('Edit Link Text', 'gravityview'),
             'desc' => NULL,
             'value' => __('Edit Entry', 'gravityview'),
             'merge_tags' => true,
         );
 
-        return array_merge( $add_option, $field_options );
+        return array_merge($add_option, $field_options);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      * @param  array $tooltips Existing tooltips
      * @return array           Modified tooltips
      */
-    function tooltips( $tooltips ) {
+    function tooltips($tooltips) {
 
         $return = $tooltips;
 
@@ -146,17 +146,17 @@ 
      * @param  [type] $input_type    [description]
      * @return [type]                [description]
      */
-    function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
+    function field_options($field_options, $template_id, $field_id, $context, $input_type) {
 
         // We only want to modify the settings for the edit context
-        if( 'edit' !== $context ) {
+        if ('edit' !== $context) {
 
             /**
              * @since 1.8.4
              */
             $field_options['new_window'] = array(
                 'type' => 'checkbox',
-                'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
+                'label' => __('Open link in a new tab or window?', 'gravityview'),
                 'value' => false,
             );
 
@@ -164,20 +164,20 @@ 
         }
 
         //  Entry field is only for logged in users
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
+        unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
 
         $add_options = array(
             'allow_edit_cap' => array(
                 'type' => 'select',
-                'label' => __( 'Make field editable to:', 'gravityview' ),
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
+                'label' => __('Make field editable to:', 'gravityview'),
+                'choices' => GravityView_Render_Settings::get_cap_choices($template_id, $field_id, $context, $input_type),
                 'tooltip' => 'allow_edit_cap',
                 'class' => 'widefat',
                 'value' => 'read', // Default: entry creator
             ),
         );
 
-        return array_merge( $field_options, $add_options );
+        return array_merge($field_options, $add_options);
     }
 
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -1249,7 +1249,7 @@
     /**
      * Override GF Form field properties with the ones defined on the View
      * @param  GF_Field $field GF Form field object
-     * @param  array $setting  GV field options
+     * @param  array $field_setting  GV field options
      * @since  1.5
      * @return array
      */

Indentation +1160 added lines, -1160 removed lines

@@ -10,18 +10,18 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 
 class GravityView_Edit_Entry_Render {
 
-    protected $loader;
+	protected $loader;
 
 	/**
 	 * @var string String used to generate unique nonce for the entry/form/view combination. Allows access to edit page.
 	 */
-    static $nonce_key;
+	static $nonce_key;
 
 	/**
 	 * @since 1.9
@@ -41,102 +41,102 @@ 
 	 */
 	private static $supports_product_fields = false;
 
-    /**
-     * Gravity Forms entry array
-     *
-     * @var array
-     */
-    var $entry;
+	/**
+	 * Gravity Forms entry array
+	 *
+	 * @var array
+	 */
+	var $entry;
 
-    /**
-     * Gravity Forms form array
-     *
-     * @var array
-     */
-    var $form;
+	/**
+	 * Gravity Forms form array
+	 *
+	 * @var array
+	 */
+	var $form;
 
-    /**
-     * Gravity Forms form array after the form validation process
-     * @since 1.13
-     * @var array
-     */
-    var $form_after_validation = null;
+	/**
+	 * Gravity Forms form array after the form validation process
+	 * @since 1.13
+	 * @var array
+	 */
+	var $form_after_validation = null;
 
-    /**
-     * Gravity Forms form id
-     *
-     * @var array
-     */
-    var $form_id;
+	/**
+	 * Gravity Forms form id
+	 *
+	 * @var array
+	 */
+	var $form_id;
 
-    /**
-     * ID of the current view
-     *
-     * @var int
-     */
-    var $view_id;
+	/**
+	 * ID of the current view
+	 *
+	 * @var int
+	 */
+	var $view_id;
 
 
-    /**
-     * Updated entry is valid (GF Validation object)
-     *
-     * @var array
-     */
-    var $is_valid = NULL;
+	/**
+	 * Updated entry is valid (GF Validation object)
+	 *
+	 * @var array
+	 */
+	var $is_valid = NULL;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
-    function load() {
+	function load() {
 
-        /** @define "GRAVITYVIEW_DIR" "../../../" */
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		/** @define "GRAVITYVIEW_DIR" "../../../" */
+		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
 
-        // Stop Gravity Forms processing what is ours!
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
+		// Stop Gravity Forms processing what is ours!
+		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' ) );
+		add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
 
-        // Disable conditional logic if needed (since 1.9)
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
+		// Disable conditional logic if needed (since 1.9)
+		add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
 
-        // Make sure GF doesn't validate max files (since 1.9)
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
+		// Make sure GF doesn't validate max files (since 1.9)
+		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 fields expected by GFFormDisplay::validate()
+		add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
 
-    }
+	}
 
 
 
-    /**
-     * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
-     * backend form, we need to prevent them from saving twice.
-     * @return void
-     */
-    function prevent_maybe_process_form() {
+	/**
+	 * Because we're mimicking being a front-end Gravity Forms form while using a Gravity Forms
+	 * backend form, we need to prevent them from saving twice.
+	 * @return void
+	 */
+	function prevent_maybe_process_form() {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		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() && $this->verify_nonce() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-        }
-    }
+		if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
+			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+		}
+	}
 
-    /**
-     * Is the current page an Edit Entry page?
-     * @return boolean
-     */
-    public function is_edit_entry() {
+	/**
+	 * Is the current page an Edit Entry page?
+	 * @return boolean
+	 */
+	public function is_edit_entry() {
 
-        $gf_page = ( 'entry' === RGForms::get( 'view' ) );
+		$gf_page = ( 'entry' === RGForms::get( 'view' ) );
 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
-    }
+		return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
+	}
 
 	/**
 	 * Is the current page an Edit Entry page?
@@ -147,422 +147,422 @@ 
 		return !empty( $_POST[ self::$nonce_field ] );
 	}
 
-    /**
-     * When Edit entry view is requested setup the vars
-     */
-    function setup_vars() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * When Edit entry view is requested setup the vars
+	 */
+	function setup_vars() {
+		$gravityview_view = GravityView_View::getInstance();
 
 
-        $entries = $gravityview_view->getEntries();
-        $this->entry = $entries[0];
+		$entries = $gravityview_view->getEntries();
+		$this->entry = $entries[0];
 
 
-        $this->form = $gravityview_view->getForm();
-        $this->form_id = $gravityview_view->getFormId();
-        $this->view_id = $gravityview_view->getViewId();
+		$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'] );
+	}
 
 
-    /**
-     * Load required files and trigger edit flow
-     *
-     * Run when the is_edit_entry returns true.
-     *
-     * @param GravityView_View_Data $gv_data GravityView Data object
-     * @return void
-     */
-    function init( $gv_data ) {
+	/**
+	 * Load required files and trigger edit flow
+	 *
+	 * Run when the is_edit_entry returns true.
+	 *
+	 * @param GravityView_View_Data $gv_data GravityView Data object
+	 * @return void
+	 */
+	function init( $gv_data ) {
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+		require_once( GFCommon::get_base_path() . '/form_display.php' );
+		require_once( GFCommon::get_base_path() . '/entry_detail.php' );
 
-        $this->setup_vars();
+		$this->setup_vars();
 
-        // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
-            return;
-        }
+		// Multiple Views embedded, don't proceed if nonce fails
+		if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+			return;
+		}
 
-        // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
-            return;
-        }
+		// Sorry, you're not allowed here.
+		if( false === $this->user_can_edit_entry( true ) ) {
+			return;
+		}
 
-        $this->print_scripts();
+		$this->print_scripts();
 
-        $this->process_save();
+		$this->process_save();
 
-        $this->edit_entry_form();
+		$this->edit_entry_form();
 
-    }
+	}
 
 
-    /**
-     * Force Gravity Forms to output scripts as if it were in the admin
-     * @return void
-     */
-    function print_scripts() {
-        $gravityview_view = GravityView_View::getInstance();
+	/**
+	 * Force Gravity Forms to output scripts as if it were in the admin
+	 * @return void
+	 */
+	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' ) );
-    }
+		// Sack is required for images
+		wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+	}
 
 
-    /**
-     * Process edit entry form save
-     */
-    function process_save() {
+	/**
+	 * Process edit entry form save
+	 */
+	function process_save() {
 
-        if( empty( $_POST ) ) {
-            return;
-        }
+		if( empty( $_POST ) ) {
+			return;
+		}
 
-        // Make sure the entry, view, and form IDs are all correct
-        $valid = $this->verify_nonce();
+		// 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.' );
-            return;
-        }
+		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.' );
-            return;
-        }
+		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', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+		do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
 
-        $this->process_save_process_files( $this->form_id );
+		$this->process_save_process_files( $this->form_id );
 
-        $this->validate();
+		$this->validate();
 
-        if( $this->is_valid ) {
+		if( $this->is_valid ) {
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+			do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
 
-            /**
-             * @hack This step is needed to unset the adminOnly from form fields
-             */
-            $form = $this->form_prepare_for_save();
+			/**
+			 * @hack This step is needed to unset the adminOnly from form fields
+			 */
+			$form = $this->form_prepare_for_save();
 
-            /**
-             * @hack to avoid the capability validation of the method save_lead for GF 1.9+
-             */
-            unset( $_GET['page'] );
+			/**
+			 * @hack to avoid the capability validation of the method save_lead for GF 1.9+
+			 */
+			unset( $_GET['page'] );
 
-            GFFormsModel::save_lead( $form, $this->entry );
+			GFFormsModel::save_lead( $form, $this->entry );
 
-            // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
-            }
+			// If there's a post associated with the entry, process post fields
+			if( !empty( $this->entry['post_id'] ) ) {
+				$this->maybe_update_post_fields( $form );
+			}
 
-            // Perform actions normally performed after updating a lead
-            $this->after_update();
+			// Perform actions normally performed after updating a lead
+			$this->after_update();
 
-            /**
-             * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
-             * @param array $form Gravity Forms form array
-             * @param string $entry_id Numeric ID of the entry that was updated
-             */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
-        }
+			/**
+			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
+			 * @param array $form Gravity Forms form array
+			 * @param string $entry_id Numeric ID of the entry that was updated
+			 */
+			do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+		}
 
-    } // process_save
+	} // process_save
 
 
-    /**
-     * Have GF handle file uploads
-     *
-     * Copy of code from GFFormDisplay::process_form()
-     *
-     * @param int $form_id
-     */
-    function process_save_process_files( $form_id ) {
+	/**
+	 * Have GF handle file uploads
+	 *
+	 * Copy of code from GFFormDisplay::process_form()
+	 *
+	 * @param int $form_id
+	 */
+	function process_save_process_files( $form_id ) {
 
-        //Loading files that have been uploaded to temp folder
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
-        if ( ! is_array( $files ) ) {
-            $files = array();
-        }
+		//Loading files that have been uploaded to temp folder
+		$files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
+		if ( ! is_array( $files ) ) {
+			$files = array();
+		}
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
-    }
+		RGFormsModel::$uploaded_files[ $form_id ] = $files;
+	}
 
-    /**
-     * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
-     * Late validation done on self::custom_validation
-     *
-     * @param $plupload_init array Plupload settings
-     * @param $form_id
-     * @param $instance
-     * @return mixed
-     */
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
-            return $plupload_init;
-        }
+	/**
+	 * Remove max_files validation (done on gravityforms.js) to avoid conflicts with GravityView
+	 * Late validation done on self::custom_validation
+	 *
+	 * @param $plupload_init array Plupload settings
+	 * @param $form_id
+	 * @param $instance
+	 * @return mixed
+	 */
+	public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
+		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;
-    }
+		return $plupload_init;
+	}
 
 
-    /**
-     * Unset adminOnly and convert field input key to string
-     * @return array $form
-     */
-    private function form_prepare_for_save() {
-        $form = $this->form;
+	/**
+	 * Unset adminOnly and convert field input key to string
+	 * @return array $form
+	 */
+	private function form_prepare_for_save() {
+		$form = $this->form;
 
-        foreach( $form['fields'] as &$field ) {
+		foreach( $form['fields'] as &$field ) {
 
-            $field->adminOnly = false;
+			$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'];
+				}
+			}
+		}
 
-        return $form;
-    }
+		return $form;
+	}
 
 
-    /**
-     * Loop through the fields being edited and if they include Post fields, update the Entry's post object
-     *
-     * @param array $form Gravity Forms form
-     *
-     * @return void
-     */
-    function maybe_update_post_fields( $form ) {
+	/**
+	 * Loop through the fields being edited and if they include Post fields, update the Entry's post object
+	 *
+	 * @param array $form Gravity Forms form
+	 *
+	 * @return void
+	 */
+	function maybe_update_post_fields( $form ) {
 
-        $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 );
-            return;
-        }
+		// 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 );
+			return;
+		}
 
-        $update_entry = false;
+		$update_entry = false;
 
-        $updated_post = $original_post = get_post( $post_id );
+		$updated_post = $original_post = get_post( $post_id );
 
-        foreach ( $this->entry as $field_id => $value ) {
+		foreach ( $this->entry as $field_id => $value ) {
 
-            //todo: only run through the edit entry configured fields
+			//todo: only run through the edit entry configured fields
 
-            $field = RGFormsModel::get_field( $form, $field_id );
+			$field = RGFormsModel::get_field( $form, $field_id );
 
-            if( class_exists('GF_Fields') ) {
-                $field = GF_Fields::create( $field );
-            }
+			if( class_exists('GF_Fields') ) {
+				$field = GF_Fields::create( $field );
+			}
 
-            if( GFCommon::is_post_field( $field ) ) {
+			if( GFCommon::is_post_field( $field ) ) {
 
-                // Get the value of the field, including $_POSTed value
-                $value = RGFormsModel::get_field_value( $field );
+				// Get the value of the field, including $_POSTed value
+				$value = RGFormsModel::get_field_value( $field );
 
-                // Convert the field object in 1.9 to an array for backward compatibility
-                $field_array = GVCommon::get_field_array( $field );
+				// Convert the field object in 1.9 to an array for backward compatibility
+				$field_array = GVCommon::get_field_array( $field );
 
-                switch( $field_array['type'] ) {
+				switch( $field_array['type'] ) {
 
-                    case 'post_title':
-                    case 'post_content':
-                    case 'post_excerpt':
-                        $updated_post->{$field_array['type']} = $value;
-                        break;
-                    case 'post_tags':
-                        wp_set_post_tags( $post_id, $value, false );
-                        break;
-                    case 'post_category':
+					case 'post_title':
+					case 'post_content':
+					case 'post_excerpt':
+						$updated_post->{$field_array['type']} = $value;
+						break;
+					case 'post_tags':
+						wp_set_post_tags( $post_id, $value, false );
+						break;
+					case 'post_category':
 
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
-                        $categories = array_filter( $categories );
+						$categories = is_array( $value ) ? array_values( $value ) : (array)$value;
+						$categories = array_filter( $categories );
 
-                        wp_set_post_categories( $post_id, $categories, false );
+						wp_set_post_categories( $post_id, $categories, false );
 
-                        // prepare value to be saved in the entry
-                        $field = GFCommon::add_categories_as_choices( $field, '' );
+						// prepare value to be saved in the entry
+						$field = GFCommon::add_categories_as_choices( $field, '' );
 
-                        // if post_category is type checkbox, then value is an array of inputs
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
-                            foreach( $value as $input_id => $val ) {
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
-                            }
-                        } else {
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
-                        }
+						// if post_category is type checkbox, then value is an array of inputs
+						if( isset( $value[ strval( $field_id ) ] ) ) {
+							foreach( $value as $input_id => $val ) {
+								$input_name = 'input_' . str_replace( '.', '_', $input_id );
+								$this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
+							}
+						} else {
+							$input_name = 'input_' . str_replace( '.', '_', $field_id );
+							$this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+						}
 
-                        break;
-                    case 'post_custom_field':
+						break;
+					case 'post_custom_field':
 
-                        $input_type = RGFormsModel::get_input_type( $field );
-                        $custom_field_name = $field_array['postCustomFieldName'];
+						$input_type = RGFormsModel::get_input_type( $field );
+						$custom_field_name = $field_array['postCustomFieldName'];
 
-                        // Only certain custom field types are supported
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
-                            update_post_meta( $post_id, $custom_field_name, $value );
-                        }
+						// Only certain custom field types are supported
+						if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
+							update_post_meta( $post_id, $custom_field_name, $value );
+						}
 
-                        break;
+						break;
 
-                    case 'post_image':
+					case 'post_image':
 
-                        $value = '';
-                        break;
+						$value = '';
+						break;
 
-                }
+				}
 
-                //ignore fields that have not changed
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
-                    continue;
-                }
+				//ignore fields that have not changed
+				if ( $value === rgget( (string) $field_id, $this->entry ) ) {
+					continue;
+				}
 
-                // update entry
-                if( 'post_category' !== $field->type ) {
-                    $this->entry[ strval( $field_id ) ] = $value;
-                }
+				// update entry
+				if( 'post_category' !== $field->type ) {
+					$this->entry[ strval( $field_id ) ] = $value;
+				}
 
-                $update_entry = true;
+				$update_entry = true;
 
-            }
+			}
 
-        }
+		}
 
-        if( $update_entry ) {
+		if( $update_entry ) {
 
-            $return_entry = GFAPI::update_entry( $this->entry );
+			$return_entry = GFAPI::update_entry( $this->entry );
 
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
-            } else {
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
-            }
+			if( is_wp_error( $return_entry ) ) {
+				do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
+			} else {
+				do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
+			}
 
-        }
+		}
 
-        $return_post = wp_update_post( $updated_post, true );
+		$return_post = wp_update_post( $updated_post, true );
 
-        if( is_wp_error( $return_post ) ) {
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
-        } else {
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded' );
-        }
+		if( is_wp_error( $return_post ) ) {
+			do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
+		} else {
+			do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded' );
+		}
 
-    }
+	}
 
-    /**
-     * Perform actions normally performed after updating a lead
-     *
-     * @since 1.8
-     *
-     * @see GFEntryDetail::lead_detail_page()
-     *
-     * @return void
-     */
-    function after_update() {
+	/**
+	 * Perform actions normally performed after updating a lead
+	 *
+	 * @since 1.8
+	 *
+	 * @see GFEntryDetail::lead_detail_page()
+	 *
+	 * @return void
+	 */
+	function after_update() {
 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
+		do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
+		do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
 
-        // Re-define the entry now that we've updated it.
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
+		// Re-define the entry now that we've updated it.
+		$entry = RGFormsModel::get_lead( $this->entry['id'] );
 
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
+		$entry = GFFormsModel::set_entry_meta( $entry, $this->form );
 
-        // 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 );
-        }
+		// 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 );
+		}
 
-        $this->entry = $entry;
-    }
+		$this->entry = $entry;
+	}
 
 
-    /**
-     * Display the Edit Entry form
-     *
-     * @return [type] [description]
-     */
-    public function edit_entry_form() {
+	/**
+	 * Display the Edit Entry form
+	 *
+	 * @return [type] [description]
+	 */
+	public function edit_entry_form() {
 
-        $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
+		$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
 
-        ?>
+		?>
 
         <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
-             * @see https://github.com/katzwebservices/GravityView/issues/451
-             */
-            echo gravityview_strip_whitespace( $javascript );
+			/**
+			 * Fixes weird wpautop() issue
+			 * @see https://github.com/katzwebservices/GravityView/issues/451
+			 */
+			echo gravityview_strip_whitespace( $javascript );
 
-            ?><h2 class="gv-edit-entry-title">
+			?><h2 class="gv-edit-entry-title">
                 <span><?php
 
-                    /**
-                     * @filter `gravityview_edit_entry_title` Modify the edit entry title
-                     * @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 );
+					/**
+					 * @filter `gravityview_edit_entry_title` Modify the edit entry title
+					 * @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 );
 
-                    echo esc_attr( $edit_entry_title );
-            ?></span>
+					echo esc_attr( $edit_entry_title );
+			?></span>
             </h2>
 
             <?php
 
-            // Display the success message
-            if( rgpost('action') === 'update' ) {
+			// Display the success message
+			if( rgpost('action') === 'update' ) {
 
-                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);
+					// 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);
 
-                    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>' );
+				} else {
+					$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)
-                     * @since 1.5.4
-                     * @param string $entry_updated_message Existing message
-                     * @param int $view_id View ID
-                     * @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 );
+					/**
+					 * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
+					 * @since 1.5.4
+					 * @param string $entry_updated_message Existing message
+					 * @param int $view_id View ID
+					 * @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 );
 
-                    echo GVCommon::generate_notice( $message );
-                }
+					echo GVCommon::generate_notice( $message );
+				}
 
-            }
+			}
 
-            ?>
+			?>
 
             <?php // The ID of the form needs to be `gform_{form_id}` for the pluploader ?>
 
@@ -570,590 +570,590 @@ 
 
                 <?php
 
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
+				wp_nonce_field( self::$nonce_key, self::$nonce_key );
 
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
+				wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
 
-                // Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
+				// Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
 
-                ?>
+				?>
 
 
                 <?php
 
-                /**
-                 * By default, the lead_detail_edit method uses the `RGFormsModel::get_lead_field_value()` method, which doesn't fill in $_POST values when there is a validation error, because it was designed to work in the admin. We want to use the `RGFormsModel::get_field_value()` If the form has been submitted, use the values for the fields.
-                 */
-                //add_filter( 'gform_get_field_value', array( $this, 'get_field_value' ), 10, 3 );
+				/**
+				 * By default, the lead_detail_edit method uses the `RGFormsModel::get_lead_field_value()` method, which doesn't fill in $_POST values when there is a validation error, because it was designed to work in the admin. We want to use the `RGFormsModel::get_field_value()` If the form has been submitted, use the values for the fields.
+				 */
+				//add_filter( 'gform_get_field_value', array( $this, 'get_field_value' ), 10, 3 );
 
-                // Print the actual form HTML
-                $this->render_edit_form();
+				// Print the actual form HTML
+				$this->render_edit_form();
 
-                //echo $this->render_form_buttons();
+				//echo $this->render_form_buttons();
 
-                ?>
+				?>
             </form>
 
         </div>
 
     <?php
-    }
-
-    /**
-     * Display the Edit Entry form in the original Gravity Forms format
-     *
-     * @since 1.9
-     *
-     * @param $form
-     * @param $lead
-     * @param $view_id
-     *
-     * @return void
-     */
-    private function render_edit_form() {
-
-        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, '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'] );
-
-        // TODO: Make sure validation isn't handled by GF
-        // TODO: Include CSS for file upload fields
-        // TODO: Verify multiple-page forms
-        // TODO: Product fields are not editable
-        // TODO: Check Updated and Error messages
-
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
-
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
-        remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
-        remove_filter( 'gform_disable_view_counter', '__return_true' );
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
-
-        echo $html;
-    }
-
-    /**
-     * Display the Update/Cancel/Delete buttons for the Edit Entry form
-     * @since 1.8
-     * @return string
-     */
-    public function render_form_buttons() {
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
-    }
-
-
-    /**
-     * Modify the form fields that are shown when using GFFormDisplay::get_form()
-     *
-     * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
-     *
-     * @param array $form
-     * @param boolean $ajax Whether in AJAX mode
-     * @param array|string $field_values Passed parameters to the form
-     *
-     * @since 1.9
-     *
-     * @return array Modified form array
-     */
-    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 ) ) {
-            $form = $this->form_after_validation;
-        } else {
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
-        }
-
-        $form = $this->filter_conditional_logic( $form );
-
-        // for now we don't support Save and Continue feature.
-        if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
-        }
-
-        return $form;
-    }
-
-
-    /**
-     *
-     * Fill-in the saved values into the form inputs
-     *
-     * @param string $field_content Always empty.
-     * @param GF_Field $field
-     * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
-     * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
-     * @param int $form_id Form ID
-     *
-     * @return mixed
-     */
-    function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
-
-        // If the form has been submitted, then we don't need to pre-fill the values,
-        // Except for fileupload type - run always!!
-        if(
-	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
-        ||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
-        ) {
-	        return $field_content;
-        }
-
-        // Turn on Admin-style display for file upload fields only
-        if( 'fileupload' === $field->type ) {
-            $_GET['page'] = 'gf_entries';
-        }
-
-        // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
-        $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
-
-        // add categories as choices for Post Category field
-        if ( 'post_category' === $field->type ) {
-            $field = GFCommon::add_categories_as_choices( $field, $value );
-        }
-
-        /**
-         * @filter `gravityview/edit_entry/pre_populate/override` Allow the pre-populated value to override saved value in Edit Entry form. By default, pre-populate mechanism only kicks on empty fields.
-         * @param boolean True: override saved values; False: don't override (default)
-         * @param $field GF_Field object Gravity Forms field object
-         * @since 1.13
-         */
-        $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' ) ) ) {
-
-            $field_value = array();
-
-            // only accept pre-populated values if the field doesn't have any choice selected.
-            $allow_pre_populated = $field->allowsPrepopulate;
-
-	        foreach ( (array)$field->inputs as $input ) {
-
-	            $input_id = strval( $input['id'] );
-
-                if ( ! empty( $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;
-                }
-
-            }
-
-            $pre_value = $field->get_value_submission( array(), false );
-
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
-
-        } else {
-
-            $id = intval( $field->id );
-
-            // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
-
-            // 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 = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $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 && !empty( $field_value ) ) {
-                $categories = array();
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
-                }
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
-            }
+	}
 
-        }
+	/**
+	 * Display the Edit Entry form in the original Gravity Forms format
+	 *
+	 * @since 1.9
+	 *
+	 * @param $form
+	 * @param $lead
+	 * @param $view_id
+	 *
+	 * @return void
+	 */
+	private function render_edit_form() {
 
-        // if value is empty get the default value if defined
-        $field_value = $field->get_value_default_if_empty( $field_value );
-
-        /**
-         * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
-         * @since 1.11
-         * @param mixed $field_value field value used to populate the input
-         * @param object $field Gravity Forms field object ( Class GF_Field )
-         */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
-
-	    // Prevent any PHP warnings, like undefined index
-	    ob_start();
-
-	    $return = $field->get_field_input( $this->form, $field_value, $this->entry );
-
-	    // If there was output, it's an error
-	    $warnings = ob_get_clean();
+		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, 'modify_edit_field_input' ), 10, 5 );
 
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
-	    }
+		// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
+		unset( $_GET['page'] );
 
-        /**
-         * Unset hack $_GET['page'] = 'gf_entries'
-         * We need the fileupload html field to render with the proper id
-         *  ( <li id="field_80_16" ... > )
-         */
-        unset( $_GET['page'] );
+		// TODO: Make sure validation isn't handled by GF
+		// TODO: Include CSS for file upload fields
+		// TODO: Verify multiple-page forms
+		// TODO: Product fields are not editable
+		// TODO: Check Updated and Error messages
 
-        return $return;
-    }
+		$html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
 
+		remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
+		remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
+		remove_filter( 'gform_disable_view_counter', '__return_true' );
+		remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
 
-    /**
-     * Get the posted values from the edit form submission
-     *
-     * @hack
-     * @uses GFFormsModel::get_field_value()
-     * @param  mixed $value Existing field value, before edit
-     * @param  array $lead  Gravity Forms entry array
-     * @param  array $field Gravity Forms field array
-     * @return string        [description]
-     */
-    public function get_field_value( $value, $lead, $field ) {
+		echo $html;
+	}
 
-        // The form's not being edited; use the original value
-        if( ! $this->is_edit_entry_submission() ) {
-            return $value;
-        }
+	/**
+	 * Display the Update/Cancel/Delete buttons for the Edit Entry form
+	 * @since 1.8
+	 * @return string
+	 */
+	public function render_form_buttons() {
+		return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
+	}
 
-        return GFFormsModel::get_field_value( $field, $lead, true );
-    }
 
+	/**
+	 * Modify the form fields that are shown when using GFFormDisplay::get_form()
+	 *
+	 * By default, all fields will be shown. We only want the Edit Tab configured fields to be shown.
+	 *
+	 * @param array $form
+	 * @param boolean $ajax Whether in AJAX mode
+	 * @param array|string $field_values Passed parameters to the form
+	 *
+	 * @since 1.9
+	 *
+	 * @return array Modified form array
+	 */
+	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 ) ) {
+			$form = $this->form_after_validation;
+		} else {
+			$form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
+		}
 
+		$form = $this->filter_conditional_logic( $form );
 
-    // ---- Entry validation
+		// for now we don't support Save and Continue feature.
+		if( ! self::$supports_save_and_continue ) {
+			unset( $form['save'] );
+		}
 
-    /**
-     * Add field keys that Gravity Forms expects.
-     *
-     * @see GFFormDisplay::validate()
-     * @param  array $form GF Form
-     * @return array       Modified GF Form
-     */
-    function gform_pre_validation( $form ) {
+		return $form;
+	}
 
-        if( ! $this->verify_nonce() ) {
-            return $form;
-        }
 
-        // Fix PHP warning regarding undefined index.
-        foreach ( $form['fields'] as &$field) {
+	/**
+	 *
+	 * Fill-in the saved values into the form inputs
+	 *
+	 * @param string $field_content Always empty.
+	 * @param GF_Field $field
+	 * @param string|array $value If array, it's a field with multiple inputs. If string, single input.
+	 * @param int $lead_id Lead ID. Always 0 for the `gform_field_input` filter.
+	 * @param int $form_id Form ID
+	 *
+	 * @return mixed
+	 */
+	function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
+
+		// If the form has been submitted, then we don't need to pre-fill the values,
+		// Except for fileupload type - run always!!
+		if(
+			$this->is_edit_entry_submission() && 'fileupload' !== $field->type
+		||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
+		) {
+			return $field_content;
+		}
 
-            // This is because we're doing admin form pretending to be front-end, so Gravity Forms
-            // expects certain field array items to be set.
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
-            }
+		// Turn on Admin-style display for file upload fields only
+		if( 'fileupload' === $field->type ) {
+			$_GET['page'] = 'gf_entries';
+		}
+
+		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
+		$field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
+
+		// add categories as choices for Post Category field
+		if ( 'post_category' === $field->type ) {
+			$field = GFCommon::add_categories_as_choices( $field, $value );
+		}
+
+		/**
+		 * @filter `gravityview/edit_entry/pre_populate/override` Allow the pre-populated value to override saved value in Edit Entry form. By default, pre-populate mechanism only kicks on empty fields.
+		 * @param boolean True: override saved values; False: don't override (default)
+		 * @param $field GF_Field object Gravity Forms field object
+		 * @since 1.13
+		 */
+		$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' ) ) ) {
+
+			$field_value = array();
+
+			// only accept pre-populated values if the field doesn't have any choice selected.
+			$allow_pre_populated = $field->allowsPrepopulate;
+
+			foreach ( (array)$field->inputs as $input ) {
+
+				$input_id = strval( $input['id'] );
+
+				if ( ! empty( $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;
+				}
+
+			}
+
+			$pre_value = $field->get_value_submission( array(), false );
+
+			$field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
+
+		} else {
+
+			$id = intval( $field->id );
+
+			// get pre-populated value if exists
+			$pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+
+			// 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 = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $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 && !empty( $field_value ) ) {
+				$categories = array();
+				foreach ( explode( ',', $field_value ) as $cat_string ) {
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
+				}
+				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
+			}
+
+		}
+
+		// if value is empty get the default value if defined
+		$field_value = $field->get_value_default_if_empty( $field_value );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
+		 * @since 1.11
+		 * @param mixed $field_value field value used to populate the input
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
+
+		// Prevent any PHP warnings, like undefined index
+		ob_start();
+
+		$return = $field->get_field_input( $this->form, $field_value, $this->entry );
+
+		// If there was output, it's an error
+		$warnings = ob_get_clean();
+
+		if( !empty( $warnings ) ) {
+			do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
+		}
+
+		/**
+		 * Unset hack $_GET['page'] = 'gf_entries'
+		 * We need the fileupload html field to render with the proper id
+		 *  ( <li id="field_80_16" ... > )
+		 */
+		unset( $_GET['page'] );
+
+		return $return;
+	}
+
+
+	/**
+	 * Get the posted values from the edit form submission
+	 *
+	 * @hack
+	 * @uses GFFormsModel::get_field_value()
+	 * @param  mixed $value Existing field value, before edit
+	 * @param  array $lead  Gravity Forms entry array
+	 * @param  array $field Gravity Forms field array
+	 * @return string        [description]
+	 */
+	public function get_field_value( $value, $lead, $field ) {
+
+		// The form's not being edited; use the original value
+		if( ! $this->is_edit_entry_submission() ) {
+			return $value;
+		}
 
-            // unset emailConfirmEnabled for email type fields
-           /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
+		return GFFormsModel::get_field_value( $field, $lead, true );
+	}
+
+
+
+
+	// ---- Entry validation
+
+	/**
+	 * Add field keys that Gravity Forms expects.
+	 *
+	 * @see GFFormDisplay::validate()
+	 * @param  array $form GF Form
+	 * @return array       Modified GF Form
+	 */
+	function gform_pre_validation( $form ) {
+
+		if( ! $this->verify_nonce() ) {
+			return $form;
+		}
+
+		// Fix PHP warning regarding undefined index.
+		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.
+			foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
+			}
+
+			// unset emailConfirmEnabled for email type fields
+		   /* if( 'email' === $field['type'] && !empty( $field['emailConfirmEnabled'] ) ) {
                 $field['emailConfirmEnabled'] = '';
             }*/
 
-            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.
-                 *
-                 * What we have to do is set the value so that it doesn't get overwritten as empty on save and appears immediately in the Edit Entry screen again.
-                 *
-                 * @hack
-                 */
-                case 'fileupload':
-                case 'post_image':
+				/**
+				 * 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.
+				 *
+				 * What we have to do is set the value so that it doesn't get overwritten as empty on save and appears immediately in the Edit Entry screen again.
+				 *
+				 * @hack
+				 */
+				case 'fileupload':
+				case 'post_image':
 
-                    // Set the previous value
-                    $entry = $this->get_entry();
+					// 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;
+					$value = NULL;
 
-                    // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
-                        $value = $entry[ $field->id ];
-                    }
+					// Use the previous entry value as the default.
+					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 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'];
 
-                    } else {
+					} 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' => '' );
+						// 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' => '' );
 
-                    }
+					}
 
-                    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 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] ) ) {
 
-                            $value = empty( $value ) ? '[]' : $value;
-                            $value = stripslashes_deep( $value );
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
-                        }
+							$value = empty( $value ) ? '[]' : $value;
+							$value = stripslashes_deep( $value );
+							$value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
+						}
 
-                    } else {
+					} else {
 
-                        // A file already exists when editing an entry
-                        // We set this to solve issue when file upload fields are required.
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
+						// A file already exists when editing an entry
+						// We set this to solve issue when file upload fields are required.
+						GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
 
-                    }
+					}
 
-                    $_POST[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
 
-                    break;
-                case 'number':
-                    // Fix "undefined index" issue at line 1286 in form_display.php
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
-                        $_POST['input_'.$field->id ] = NULL;
-                    }
-                    break;
-                case 'captcha':
-                    // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
-                    $_POST['recaptcha_challenge_field'] = NULL;
-                    $_POST['recaptcha_response_field'] = NULL;
-                    break;
-            }
+					break;
+				case 'number':
+					// Fix "undefined index" issue at line 1286 in form_display.php
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
+						$_POST['input_'.$field->id ] = NULL;
+					}
+					break;
+				case 'captcha':
+					// Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
+					$_POST['recaptcha_challenge_field'] = NULL;
+					$_POST['recaptcha_response_field'] = NULL;
+					break;
+			}
 
-        }
+		}
 
-        return $form;
-    }
+		return $form;
+	}
 
 
-    /**
-     * Process validation for a edit entry submission
-     *
-     * Sets the `is_valid` object var
-     *
-     * @return void
-     */
-    function validate() {
+	/**
+	 * Process validation for a edit entry submission
+	 *
+	 * Sets the `is_valid` object var
+	 *
+	 * @return void
+	 */
+	function validate() {
 
-        // If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
-        if ( class_exists( 'GFUser' ) ) {
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
-        }
+		// If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
+		if ( class_exists( 'GFUser' ) ) {
+			remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+		}
 
-        /**
-         * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
-         * 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);
+		/**
+		 * For some crazy reason, Gravity Forms doesn't validate Edit Entry form submissions.
+		 * 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);
 
-        // Needed by the validate funtion
-        $failed_validation_page = NULL;
-        $field_values = RGForms::post( 'gform_field_values' );
+		// Needed by the validate funtion
+		$failed_validation_page = NULL;
+		$field_values = RGForms::post( 'gform_field_values' );
 
-        // Prevent entry limit from running when editing an entry, also
-        // prevent form scheduling from preventing editing
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
+		// Prevent entry limit from running when editing an entry, also
+		// prevent form scheduling from preventing editing
+		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 );
+		// Hide fields depending on Edit Entry settings
+		$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 );
+		$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 );
+	}
 
 
-    /**
-     * Make validation work for Edit Entry
-     *
-     * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
-     * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
-     * fields. This goes through all the fields and if they're an invalid post field, we
-     * set them as valid. If there are still issues, we'll return false.
-     *
-     * @param  [type] $validation_results [description]
-     * @return [type]                     [description]
-     */
-    function custom_validation( $validation_results ) {
+	/**
+	 * Make validation work for Edit Entry
+	 *
+	 * Because we're calling the GFFormDisplay::validate() in an unusual way (as a front-end
+	 * form pretending to be a back-end form), validate() doesn't know we _can't_ edit post
+	 * fields. This goes through all the fields and if they're an invalid post field, we
+	 * set them as valid. If there are still issues, we'll return false.
+	 *
+	 * @param  [type] $validation_results [description]
+	 * @return [type]                     [description]
+	 */
+	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;
+		$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 );
+			$value = RGFormsModel::get_field_value( $field );
+			$field_type = RGFormsModel::get_input_type( $field );
 
-            // Validate always
-            switch ( $field_type ) {
+			// Validate always
+			switch ( $field_type ) {
 
 
-                case 'fileupload' :
+				case 'fileupload' :
 
-                    // in case nothing is uploaded but there are already files saved
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                    }
+					// in case nothing is uploaded but there are already files saved
+					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( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					if( rgar( $field, 'maxFiles') && rgar( $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();
+						$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();
 
-                        //existent
-                        $entry = $this->get_entry();
-                        $value = NULL;
-                        if( isset( $entry[ $field->id ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
-                        }
+						//existent
+						$entry = $this->get_entry();
+						$value = NULL;
+						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 );
+						// count uploaded files and existent entry files
+						$count_files = count( $file_names ) + count( $value );
 
-                        if( $count_files > $field->maxFiles ) {
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
-                            $field->failed_validation = 1;
-                            $gv_valid = false;
+						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;
-                        }
+							// in case of error make sure the newest upload files are removed from the upload input
+							GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
+						}
 
-                    }
+					}
 
 
-                    break;
+					break;
 
-            }
+			}
 
-            // This field has failed validation.
-            if( !empty( $field->failed_validation ) ) {
+			// This field has 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 ) );
+				do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
 
-                switch ( $field_type ) {
+				switch ( $field_type ) {
 
-                    // Captchas don't need to be re-entered.
-                    case 'captcha':
+					// Captchas don't need to be re-entered.
+					case 'captcha':
 
-                        // Post Image fields aren't editable, so we un-fail them.
-                    case 'post_image':
-                        $field->failed_validation = false;
-                        unset( $field->validation_message );
-                        break;
+						// Post Image fields aren't editable, so we un-fail them.
+					case 'post_image':
+						$field->failed_validation = false;
+						unset( $field->validation_message );
+						break;
 
-                }
+				}
 
-                // You can't continue inside a switch, so we do it after.
-                if( empty( $field->failed_validation ) ) {
-                    continue;
-                }
+				// You can't continue inside a switch, so we do it after.
+				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 ) ) {
+				// 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 ) ) {
 
-                    $entry = $this->get_entry();
+					$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 value submitted was not changed, then don't validate
-                        $field->failed_validation = false;
+					// 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 value submitted was not changed, then don't validate
+						$field->failed_validation = false;
 
-                        unset( $field->validation_message );
+						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;
-                    }
-                }
+						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 ) ) {
-                    unset( $field->validation_message );
-	                $field->validation_message = false;
-                    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 ) ) {
+					unset( $field->validation_message );
+					$field->validation_message = false;
+					continue;
+				}
 
-                $gv_valid = false;
+				$gv_valid = false;
 
-            }
+			}
 
-        }
+		}
 
-        $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'];
+		// We'll need this result when rendering the form ( on GFFormDisplay::get_form )
+		$this->form_after_validation = $validation_results['form'];
 
-        return $validation_results;
-    }
+		return $validation_results;
+	}
 
 
-    /**
-     * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
-     * Get the current entry and set it if it's not yet set.
-     * @return array Gravity Forms entry array
-     */
-    private function get_entry() {
+	/**
+	 * TODO: This seems to be hacky... we should remove it. Entry is set when updating the form using setup_vars()!
+	 * Get the current entry and set it if it's not yet set.
+	 * @return array Gravity Forms entry array
+	 */
+	private function get_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() );
-        }
+		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() );
+		}
 
-        return $this->entry;
-    }
+		return $this->entry;
+	}
 
 
 
-    // --- Filters
+	// --- Filters
 
-    /**
-     * Get the Edit Entry fields as configured in the View
-     *
-     * @since 1.8
-     *
-     * @param int $view_id
-     *
-     * @return array Array of fields that are configured in the Edit tab in the Admin
-     */
-    private function get_configured_edit_fields( $form, $view_id ) {
+	/**
+	 * Get the Edit Entry fields as configured in the View
+	 *
+	 * @since 1.8
+	 *
+	 * @param int $view_id
+	 *
+	 * @return array Array of fields that are configured in the Edit tab in the Admin
+	 */
+	private function get_configured_edit_fields( $form, $view_id ) {
 
-        // Get all fields for form
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
+		// Get all fields for form
+		$properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
 
-        // If edit tab not yet configured, show all fields
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
+		// If edit tab not yet configured, show all fields
+		$edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
 
-	    // Show hidden fields as text fields
-	    $form = $this->fix_hidden_fields( $form );
+		// Show hidden fields as text fields
+		$form = $this->fix_hidden_fields( $form );
 
-        // Hide fields depending on admin settings
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
+		// Hide fields depending on admin settings
+		$fields = $this->filter_fields( $form['fields'], $edit_fields );
 
-	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
+		// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
+		$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
 
-        return $fields;
-    }
+		return $fields;
+	}
 
 	/**
 	 * @since 1.9.2
@@ -1177,364 +1177,364 @@ 
 	}
 
 
-    /**
-     * Filter area fields based on specified conditions
-     *
-     * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
-     * @access private
-     * @param GF_Field[] $fields
-     * @param array $configured_fields
-     * @since  1.5
-     * @return array $fields
-     */
-    private function filter_fields( $fields, $configured_fields ) {
-
-        if( empty( $fields ) || !is_array( $fields ) ) {
-            return $fields;
-        }
-
-        $edit_fields = array();
-
-        $field_type_blacklist = array(
-            'page',
-        );
-
-	    /**
-	     * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
-	     * @since 1.9.1
-         * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
-	     */
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
-
-	    if( $hide_product_fields ) {
-		    $field_type_blacklist[] = 'option';
-		    $field_type_blacklist[] = 'quantity';
-            $field_type_blacklist[] = 'product';
-            $field_type_blacklist[] = 'total';
-            $field_type_blacklist[] = 'shipping';
-            $field_type_blacklist[] = 'calculation';
-	    }
-
-        // First, remove blacklist
-        foreach ( $fields as $key => $field ) {
-            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 ) ) {
-            return $fields;
-        }
-
-        // The edit tab has been configured, so we loop through to configured settings
-        foreach ( $configured_fields as $configured_field ) {
-
-	        /** @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 );
-                    break;
-                }
-
-            }
-
-        }
-
-        return $edit_fields;
-
-    }
-
-    /**
-     * Override GF Form field properties with the ones defined on the View
-     * @param  GF_Field $field GF Form field object
-     * @param  array $setting  GV field options
-     * @since  1.5
-     * @return array
-     */
-    private function merge_field_properties( $field, $field_setting ) {
-
-        $return_field = $field;
-
-        if( empty( $field_setting['show_label'] ) ) {
-            $return_field->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'] );
-        }
-
-        /**
-         * Normalize page numbers - avoid conflicts with page validation
-         * @since 1.6
-         */
-        $return_field->pageNumber = 1;
-
-        return $return_field;
-
-    }
-
-    /**
-     * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
-     *
-     * @since 1.9.1
-     *
-     * @param array|GF_Field[] $fields Gravity Forms form fields
-     * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
-     * @param array $form GF Form array
-     * @param int $view_id View ID
-     *
-     * @return array Possibly modified form array
-     */
-    function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
-
-	    /**
-         * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
-	     * 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
-	     * @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
-	     */
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
-
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
-            return $fields;
-        }
-
-	    foreach( $fields as &$field ) {
-		    $field->adminOnly = false;
-        }
-
-        return $fields;
-    }
-
-    // --- Conditional Logic
-
-    /**
-     * Remove the conditional logic rules from the form button and the form fields, if needed.
-     *
-     * @since 1.9
-     *
-     * @param array $form Gravity Forms form
-     * @return array Modified form, if not using Conditional Logic
-     */
-    function filter_conditional_logic( $form ) {
-
-        /**
-         * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
-         * @since 1.9
-         * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
-         * @param array $form Gravity Forms form
-         */
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
-
-        if( $use_conditional_logic ) {
-            return $form;
-        }
-
-        foreach( $form['fields'] as &$field ) {
-            /* @var GF_Field $field */
-            $field->conditionalLogic = null;
-        }
-
-        unset( $form['button']['conditionalLogic'] );
-
-        return $form;
-
-    }
-
-    /**
-     * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
-     *
-     * @since 1.9
-     *
-     * @param $has_conditional_logic
-     * @param $form
-     * @return mixed|void
-     */
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
-
-        if( ! $this->is_edit_entry() ) {
-            return $has_conditional_logic;
-        }
-
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
-
-    }
-
-
-    // --- User checks and nonces
-
-    /**
-     * Check if the user can edit the entry
-     *
-     * - Is the nonce valid?
-     * - Does the user have the right caps for the entry
-     * - Is the entry in the trash?
-     *
-     * @todo Move to GVCommon
-     *
-     * @param  boolean $echo Show error messages in the form?
-     * @return boolean        True: can edit form. False: nope.
-     */
-    function user_can_edit_entry( $echo = false ) {
-
-        $error = NULL;
-
-        /**
-         *  1. Permalinks are turned off
-         *  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'] ) ) {
-
-            $error = true;
-
-        }
+	/**
+	 * Filter area fields based on specified conditions
+	 *
+	 * @uses GravityView_Edit_Entry::user_can_edit_field() Check caps
+	 * @access private
+	 * @param GF_Field[] $fields
+	 * @param array $configured_fields
+	 * @since  1.5
+	 * @return array $fields
+	 */
+	private function filter_fields( $fields, $configured_fields ) {
 
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+		if( empty( $fields ) || !is_array( $fields ) ) {
+			return $fields;
+		}
 
-            $error = true;
+		$edit_fields = array();
+
+		$field_type_blacklist = array(
+			'page',
+		);
+
+		/**
+		 * @filter `gravityview/edit_entry/hide-product-fields` Hide product fields from being editable.
+		 * @since 1.9.1
+		 * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
+		 */
+		$hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
+
+		if( $hide_product_fields ) {
+			$field_type_blacklist[] = 'option';
+			$field_type_blacklist[] = 'quantity';
+			$field_type_blacklist[] = 'product';
+			$field_type_blacklist[] = 'total';
+			$field_type_blacklist[] = 'shipping';
+			$field_type_blacklist[] = 'calculation';
+		}
 
-        } elseif( ! $this->verify_nonce() ) {
+		// First, remove blacklist
+		foreach ( $fields as $key => $field ) {
+			if( in_array( $field->type, $field_type_blacklist ) ) {
+				unset( $fields[ $key ] );
+			}
+		}
 
-            /**
-             * 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() ) {
-                $error = true;
-            } else {
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
-            }
+		// The Edit tab has not been configured, so we return all fields by default.
+		if( empty( $configured_fields ) ) {
+			return $fields;
+		}
 
-        }
+		// The edit tab has been configured, so we loop through to configured settings
+		foreach ( $configured_fields as $configured_field ) {
 
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
-        }
+			/** @var GF_Field $field */
+			foreach ( $fields as $field ) {
 
-        if( $this->entry['status'] === 'trash' ) {
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
-        }
+				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;
+				}
 
-        // No errors; everything's fine here!
-        if( empty( $error ) ) {
-            return true;
-        }
+			}
 
-        if( $echo && $error !== true ) {
+		}
 
-	        $error = esc_html( $error );
+		return $edit_fields;
 
-	        /**
-	         * @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;" ) );
-	        }
+	}
 
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
-        }
+	/**
+	 * Override GF Form field properties with the ones defined on the View
+	 * @param  GF_Field $field GF Form field object
+	 * @param  array $setting  GV field options
+	 * @since  1.5
+	 * @return array
+	 */
+	private function merge_field_properties( $field, $field_setting ) {
 
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
+		$return_field = $field;
 
-        return false;
-    }
+		if( empty( $field_setting['show_label'] ) ) {
+			$return_field->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'] );
+		}
 
-    /**
-     * Check whether a field is editable by the current user, and optionally display an error message
-     * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
-     * @param  array  $field Field or field settings array
-     * @param  boolean $echo  Whether to show error message telling user they aren't allowed
-     * @return boolean         True: user can edit the current field; False: nope, they can't.
-     */
-    private function user_can_edit_field( $field, $echo = false ) {
+		/**
+		 * Normalize page numbers - avoid conflicts with page validation
+		 * @since 1.6
+		 */
+		$return_field->pageNumber = 1;
 
-        $error = NULL;
+		return $return_field;
 
-        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 ) ) {
-            return true;
-        }
+	/**
+	 * Remove fields that shouldn't be visible based on the Gravity Forms adminOnly field property
+	 *
+	 * @since 1.9.1
+	 *
+	 * @param array|GF_Field[] $fields Gravity Forms form fields
+	 * @param array|null $edit_fields Fields for the Edit Entry tab configured in the View Configuration
+	 * @param array $form GF Form array
+	 * @param int $view_id View ID
+	 *
+	 * @return array Possibly modified form array
+	 */
+	function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
+		 * 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
+		 * @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
+		 */
+		$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
+
+		if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
+			return $fields;
+		}
 
-        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 );
+		foreach( $fields as &$field ) {
+			$field->adminOnly = false;
+		}
 
-        return false;
+		return $fields;
+	}
 
-    }
+	// --- Conditional Logic
 
+	/**
+	 * Remove the conditional logic rules from the form button and the form fields, if needed.
+	 *
+	 * @since 1.9
+	 *
+	 * @param array $form Gravity Forms form
+	 * @return array Modified form, if not using Conditional Logic
+	 */
+	function filter_conditional_logic( $form ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
+		 * @since 1.9
+		 * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
+		 * @param array $form Gravity Forms form
+		 */
+		$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
+
+		if( $use_conditional_logic ) {
+			return $form;
+		}
 
-    /**
-     * checks if user has permissions to edit a specific field
-     *
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
-     *
-     * @param  [type] $field [description]
-     * @return bool
-     */
-    private function check_user_cap_edit_field( $field ) {
+		foreach( $form['fields'] as &$field ) {
+			/* @var GF_Field $field */
+			$field->conditionalLogic = null;
+		}
 
-        // 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' ) ) ) {
-            return true;
-        }
+		unset( $form['button']['conditionalLogic'] );
 
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
+		return $form;
 
-        // If the field has custom editing capaibilities set, check those
-        if( $field_cap ) {
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
-        }
-
-        return false;
-    }
+	}
 
+	/**
+	 * Disable the Gravity Forms conditional logic script and features on the Edit Entry screen
+	 *
+	 * @since 1.9
+	 *
+	 * @param $has_conditional_logic
+	 * @param $form
+	 * @return mixed|void
+	 */
+	function manage_conditional_logic( $has_conditional_logic, $form ) {
+
+		if( ! $this->is_edit_entry() ) {
+			return $has_conditional_logic;
+		}
+
+		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
+
+	}
+
+
+	// --- User checks and nonces
+
+	/**
+	 * Check if the user can edit the entry
+	 *
+	 * - Is the nonce valid?
+	 * - Does the user have the right caps for the entry
+	 * - Is the entry in the trash?
+	 *
+	 * @todo Move to GVCommon
+	 *
+	 * @param  boolean $echo Show error messages in the form?
+	 * @return boolean        True: can edit form. False: nope.
+	 */
+	function user_can_edit_entry( $echo = false ) {
+
+		$error = NULL;
+
+		/**
+		 *  1. Permalinks are turned off
+		 *  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'] ) ) {
+
+			$error = true;
+
+		}
+
+		if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
+
+			$error = true;
+
+		} 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() ) {
+				$error = true;
+			} else {
+				$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( $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 ) ) {
+			return true;
+		}
+
+		if( $echo && $error !== true ) {
+
+			$error = esc_html( $error );
+
+			/**
+			 * @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;" ) );
+			}
+
+			echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
+		}
 
-    /**
-     * Is the current nonce valid for editing the entry?
-     * @return boolean
-     */
-    public function verify_nonce() {
+		do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
 
-        // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
-        }
+		return false;
+	}
+
+
+	/**
+	 * Check whether a field is editable by the current user, and optionally display an error message
+	 * @uses  GravityView_Edit_Entry->check_user_cap_edit_field() Check user capabilities
+	 * @param  array  $field Field or field settings array
+	 * @param  boolean $echo  Whether to show error message telling user they aren't allowed
+	 * @return boolean         True: user can edit the current field; False: nope, they can't.
+	 */
+	private function user_can_edit_field( $field, $echo = false ) {
+
+		$error = NULL;
+
+		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 ) ) {
+			return true;
+		}
 
-        // Verify
-        else if( ! $this->is_edit_entry() ) {
-            $valid = false;
-        }
+		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 );
+
+		return false;
+
+	}
 
-        else {
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
-        }
 
-        /**
-         * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
-         * @since 1.13
-         * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
-         * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
-         */
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+	/**
+	 * checks if user has permissions to edit a specific field
+	 *
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_field for maximum security!!
+	 *
+	 * @param  [type] $field [description]
+	 * @return bool
+	 */
+	private function check_user_cap_edit_field( $field ) {
 
-        return $valid;
-    }
+		// 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' ) ) ) {
+			return true;
+		}
+
+		$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'] );
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Is the current nonce valid for editing the entry?
+	 * @return boolean
+	 */
+	public function verify_nonce() {
+
+		// Verify form submitted for editing single
+		if( $this->is_edit_entry_submission() ) {
+			$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
+		}
+
+		// Verify
+		else if( ! $this->is_edit_entry() ) {
+			$valid = false;
+		}
+
+		else {
+			$valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
+		}
+
+		/**
+		 * @filter `gravityview/edit_entry/verify_nonce` Override Edit Entry nonce validation. Return true to declare nonce valid.
+		 * @since 1.13
+		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
+		 * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
+		 */
+		$valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+
+		return $valid;
+	}
 
 
 

Spacing +285 added lines, -285 removed lines

@@ -9,7 +9,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     die;
 }
 
@@ -84,30 +84,30 @@ 
      */
     var $is_valid = NULL;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
+    function __construct(GravityView_Edit_Entry $loader) {
         $this->loader = $loader;
     }
 
     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');
 
         // 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' ) );
+        add_action('gravityview_edit_entry', array($this, 'init'));
 
         // Disable conditional logic if needed (since 1.9)
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
+        add_filter('gform_has_conditional_logic', array($this, 'manage_conditional_logic'), 10, 2);
 
         // Make sure GF doesn't validate max files (since 1.9)
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
+        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'));
 
     }
 
@@ -120,10 +120,10 @@ 
      */
     function prevent_maybe_process_form() {
 
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        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() && $this->verify_nonce() ) {
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
+        if ($this->is_edit_entry_submission() && $this->verify_nonce()) {
+            remove_action('wp', array('RGForms', 'maybe_process_form'), 9);
         }
     }
 
@@ -133,9 +133,9 @@ 
      */
     public function is_edit_entry() {
 
-        $gf_page = ( 'entry' === RGForms::get( 'view' ) );
+        $gf_page = ('entry' === RGForms::get('view'));
 
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
+        return ($gf_page && isset($_GET['edit']) || RGForms::post('action') === 'update');
     }
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @return boolean
 	 */
 	public function is_edit_entry_submission() {
-		return !empty( $_POST[ self::$nonce_field ] );
+		return !empty($_POST[self::$nonce_field]);
 	}
 
     /**
@@ -162,7 +162,7 @@ 
         $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']);
     }
 
 
@@ -174,20 +174,20 @@ 
      * @param GravityView_View_Data $gv_data GravityView Data object
      * @return void
      */
-    function init( $gv_data ) {
+    function init($gv_data) {
 
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
+        require_once(GFCommon::get_base_path().'/form_display.php');
+        require_once(GFCommon::get_base_path().'/entry_detail.php');
 
         $this->setup_vars();
 
         // Multiple Views embedded, don't proceed if nonce fails
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
+        if ($gv_data->has_multiple_views() && !wp_verify_nonce($_GET['edit'], self::$nonce_key)) {
             return;
         }
 
         // Sorry, you're not allowed here.
-        if( false === $this->user_can_edit_entry( true ) ) {
+        if (false === $this->user_can_edit_entry(true)) {
             return;
         }
 
@@ -207,12 +207,12 @@ 
     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);
 
         // Sack is required for images
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
+        wp_print_scripts(array('sack', 'gform_gravityforms'));
     }
 
 
@@ -221,32 +221,32 @@ 
      */
     function process_save() {
 
-        if( empty( $_POST ) ) {
+        if (empty($_POST)) {
             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', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
 
-        $this->process_save_process_files( $this->form_id );
+        $this->process_save_process_files($this->form_id);
 
         $this->validate();
 
-        if( $this->is_valid ) {
+        if ($this->is_valid) {
 
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
+            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.');
 
             /**
              * @hack This step is needed to unset the adminOnly from form fields
@@ -256,13 +256,13 @@ 
             /**
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
              */
-            unset( $_GET['page'] );
+            unset($_GET['page']);
 
-            GFFormsModel::save_lead( $form, $this->entry );
+            GFFormsModel::save_lead($form, $this->entry);
 
             // If there's a post associated with the entry, process post fields
-            if( !empty( $this->entry['post_id'] ) ) {
-                $this->maybe_update_post_fields( $form );
+            if (!empty($this->entry['post_id'])) {
+                $this->maybe_update_post_fields($form);
             }
 
             // Perform actions normally performed after updating a lead
@@ -273,7 +273,7 @@ 
              * @param array $form Gravity Forms form array
              * @param string $entry_id Numeric ID of the entry that was updated
              */
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
+            do_action('gravityview/edit_entry/after_update', $this->form, $this->entry['id']);
         }
 
     } // process_save
@@ -286,15 +286,15 @@ 
      *
      * @param int $form_id
      */
-    function process_save_process_files( $form_id ) {
+    function process_save_process_files($form_id) {
 
         //Loading files that have been uploaded to temp folder
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
-        if ( ! is_array( $files ) ) {
+        $files = GFCommon::json_decode(stripslashes(RGForms::post('gform_uploaded_files')));
+        if (!is_array($files)) {
             $files = array();
         }
 
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
+        RGFormsModel::$uploaded_files[$form_id] = $files;
     }
 
     /**
@@ -306,8 +306,8 @@ 
      * @param $instance
      * @return mixed
      */
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
-        if( ! $this->is_edit_entry() ) {
+    public function modify_fileupload_settings($plupload_init, $form_id, $instance) {
+        if (!$this->is_edit_entry()) {
             return $plupload_init;
         }
 
@@ -324,13 +324,13 @@ 
     private function form_prepare_for_save() {
         $form = $this->form;
 
-        foreach( $form['fields'] as &$field ) {
+        foreach ($form['fields'] as &$field) {
 
             $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'];
                 }
             }
         }
@@ -346,39 +346,39 @@ 
      *
      * @return void
      */
-    function maybe_update_post_fields( $form ) {
+    function maybe_update_post_fields($form) {
 
         $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;
         }
 
         $update_entry = false;
 
-        $updated_post = $original_post = get_post( $post_id );
+        $updated_post = $original_post = get_post($post_id);
 
-        foreach ( $this->entry as $field_id => $value ) {
+        foreach ($this->entry as $field_id => $value) {
 
             //todo: only run through the edit entry configured fields
 
-            $field = RGFormsModel::get_field( $form, $field_id );
+            $field = RGFormsModel::get_field($form, $field_id);
 
-            if( class_exists('GF_Fields') ) {
-                $field = GF_Fields::create( $field );
+            if (class_exists('GF_Fields')) {
+                $field = GF_Fields::create($field);
             }
 
-            if( GFCommon::is_post_field( $field ) ) {
+            if (GFCommon::is_post_field($field)) {
 
                 // Get the value of the field, including $_POSTed value
-                $value = RGFormsModel::get_field_value( $field );
+                $value = RGFormsModel::get_field_value($field);
 
                 // Convert the field object in 1.9 to an array for backward compatibility
-                $field_array = GVCommon::get_field_array( $field );
+                $field_array = GVCommon::get_field_array($field);
 
-                switch( $field_array['type'] ) {
+                switch ($field_array['type']) {
 
                     case 'post_title':
                     case 'post_content':
@@ -386,38 +386,38 @@ 
                         $updated_post->{$field_array['type']} = $value;
                         break;
                     case 'post_tags':
-                        wp_set_post_tags( $post_id, $value, false );
+                        wp_set_post_tags($post_id, $value, false);
                         break;
                     case 'post_category':
 
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
-                        $categories = array_filter( $categories );
+                        $categories = is_array($value) ? array_values($value) : (array)$value;
+                        $categories = array_filter($categories);
 
-                        wp_set_post_categories( $post_id, $categories, false );
+                        wp_set_post_categories($post_id, $categories, false);
 
                         // prepare value to be saved in the entry
-                        $field = GFCommon::add_categories_as_choices( $field, '' );
+                        $field = GFCommon::add_categories_as_choices($field, '');
 
                         // if post_category is type checkbox, then value is an array of inputs
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
-                            foreach( $value as $input_id => $val ) {
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
+                        if (isset($value[strval($field_id)])) {
+                            foreach ($value as $input_id => $val) {
+                                $input_name = 'input_'.str_replace('.', '_', $input_id);
+                                $this->entry[strval($input_id)] = RGFormsModel::prepare_value($form, $field, $val, $input_name, $this->entry['id']);
                             }
                         } else {
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
+                            $input_name = 'input_'.str_replace('.', '_', $field_id);
+                            $this->entry[strval($field_id)] = RGFormsModel::prepare_value($form, $field, $value, $input_name, $this->entry['id']);
                         }
 
                         break;
                     case 'post_custom_field':
 
-                        $input_type = RGFormsModel::get_input_type( $field );
+                        $input_type = RGFormsModel::get_input_type($field);
                         $custom_field_name = $field_array['postCustomFieldName'];
 
                         // Only certain custom field types are supported
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
-                            update_post_meta( $post_id, $custom_field_name, $value );
+                        if (!in_array($input_type, array('list', 'fileupload'))) {
+                            update_post_meta($post_id, $custom_field_name, $value);
                         }
 
                         break;
@@ -430,13 +430,13 @@ 
                 }
 
                 //ignore fields that have not changed
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
+                if ($value === rgget((string)$field_id, $this->entry)) {
                     continue;
                 }
 
                 // update entry
-                if( 'post_category' !== $field->type ) {
-                    $this->entry[ strval( $field_id ) ] = $value;
+                if ('post_category' !== $field->type) {
+                    $this->entry[strval($field_id)] = $value;
                 }
 
                 $update_entry = true;
@@ -445,24 +445,24 @@ 
 
         }
 
-        if( $update_entry ) {
+        if ($update_entry) {
 
-            $return_entry = GFAPI::update_entry( $this->entry );
+            $return_entry = GFAPI::update_entry($this->entry);
 
-            if( is_wp_error( $return_entry ) ) {
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
+            if (is_wp_error($return_entry)) {
+                do_action('gravityview_log_error', 'Updating the entry post fields failed', $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 );
+        $return_post = wp_update_post($updated_post, true);
 
-        if( is_wp_error( $return_post ) ) {
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
+        if (is_wp_error($return_post)) {
+            do_action('gravityview_log_error', 'Updating the post content failed', $return_post);
         } else {
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded' );
+            do_action('gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded');
         }
 
     }
@@ -478,18 +478,18 @@ 
      */
     function after_update() {
 
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
+        do_action('gform_after_update_entry', $this->form, $this->entry['id']);
+        do_action("gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id']);
 
         // 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 );
+        $entry = GFFormsModel::set_entry_meta($entry, $this->form);
 
         // 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 );
+            GFFormsModel::refresh_lead_field_value($entry['id'], $field->id);
         }
 
         $this->entry = $entry;
@@ -503,19 +503,19 @@ 
      */
     public function edit_entry_form() {
 
-        $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
+        $back_link = esc_url(remove_query_arg(array('page', 'view', 'edit')));
 
         ?>
 
         <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
              * @see https://github.com/katzwebservices/GravityView/issues/451
              */
-            echo gravityview_strip_whitespace( $javascript );
+            echo gravityview_strip_whitespace($javascript);
 
             ?><h2 class="gv-edit-entry-title">
                 <span><?php
@@ -525,27 +525,27 @@ 
                      * @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 );
+                    echo esc_attr($edit_entry_title);
             ?></span>
             </h2>
 
             <?php
 
             // Display the success message
-            if( rgpost('action') === 'update' ) {
+            if (rgpost('action') === 'update') {
 
-                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>";
+                    $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)
@@ -555,9 +555,9 @@ 
                      * @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 );
+                    echo GVCommon::generate_notice($message);
                 }
 
             }
@@ -570,9 +570,9 @@ 
 
                 <?php
 
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
+                wp_nonce_field(self::$nonce_key, self::$nonce_key);
 
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
+                wp_nonce_field(self::$nonce_field, self::$nonce_field, false);
 
                 // Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
 
@@ -612,13 +612,13 @@ 
      */
     private function render_edit_form() {
 
-        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, 'modify_edit_field_input' ), 10, 5 );
+        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, '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: Make sure validation isn't handled by GF
         // TODO: Include CSS for file upload fields
@@ -626,12 +626,12 @@ 
         // TODO: Product fields are not editable
         // TODO: Check Updated and Error messages
 
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
+        $html = GFFormDisplay::get_form($this->form['id'], false, false, true, $this->entry);
 
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
-        remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
-        remove_filter( 'gform_disable_view_counter', '__return_true' );
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
+	    remove_filter('gform_pre_render', array($this, 'filter_modify_form_fields'), 5000);
+        remove_filter('gform_submit_button', array($this, 'render_form_buttons'));
+        remove_filter('gform_disable_view_counter', '__return_true');
+        remove_filter('gform_field_input', array($this, 'modify_edit_field_input'), 10);
 
         echo $html;
     }
@@ -642,7 +642,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);
     }
 
 
@@ -659,20 +659,20 @@ 
      *
      * @return array Modified form array
      */
-    public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
+    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 );
+        $form = $this->filter_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;
@@ -691,19 +691,19 @@ 
      *
      * @return mixed
      */
-    function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
+    function modify_edit_field_input($field_content = '', $field, $value, $lead_id = 0, $form_id) {
 
         // If the form has been submitted, then we don't need to pre-fill the values,
         // Except for fileupload type - run always!!
-        if(
+        if (
 	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
-        ||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
+        ||  GFCommon::is_product_field($field->type) // Prevent product fields from appearing editable
         ) {
 	        return $field_content;
         }
 
         // Turn on Admin-style display for file upload fields only
-        if( 'fileupload' === $field->type ) {
+        if ('fileupload' === $field->type) {
             $_GET['page'] = 'gf_entries';
         }
 
@@ -711,8 +711,8 @@ 
         $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
 
         // add categories as choices for Post Category field
-        if ( 'post_category' === $field->type ) {
-            $field = GFCommon::add_categories_as_choices( $field, $value );
+        if ('post_category' === $field->type) {
+            $field = GFCommon::add_categories_as_choices($field, $value);
         }
 
         /**
@@ -721,55 +721,55 @@ 
          * @param $field GF_Field object Gravity Forms field object
          * @since 1.13
          */
-        $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
+        $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();
 
             // only accept pre-populated values if the field doesn't have any choice selected.
             $allow_pre_populated = $field->allowsPrepopulate;
 
-	        foreach ( (array)$field->inputs as $input ) {
+	        foreach ((array)$field->inputs as $input) {
 
-	            $input_id = strval( $input['id'] );
+	            $input_id = strval($input['id']);
 
-                if ( ! empty( $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 ];
+                if (!empty($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;
                 }
 
             }
 
-            $pre_value = $field->get_value_submission( array(), false );
+            $pre_value = $field->get_value_submission(array(), false);
 
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
+            $field_value = !$allow_pre_populated && !($override_saved_value && !empty($pre_value)) ? $field_value : $pre_value;
 
         } else {
 
-            $id = intval( $field->id );
+            $id = intval($field->id);
 
             // get pre-populated value if exists
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
+            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value($field->inputName, array(), $field) : '';
 
             // 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 = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $this->entry[ $id ] : $pre_value;
+            $field_value = !empty($this->entry[$id]) && !($override_saved_value && !empty($pre_value)) ? $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 && !empty( $field_value ) ) {
+            if ('post_category' === $field->type && !empty($field_value)) {
                 $categories = array();
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
+                foreach (explode(',', $field_value) as $cat_string) {
+                    $categories[] = GFCommon::format_post_category($cat_string, true);
                 }
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
+                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode('', $categories);
             }
 
         }
 
         // if value is empty get the default value if defined
-        $field_value = $field->get_value_default_if_empty( $field_value );
+        $field_value = $field->get_value_default_if_empty($field_value);
 
         /**
          * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
@@ -777,18 +777,18 @@ 
          * @param mixed $field_value field value used to populate the input
          * @param object $field Gravity Forms field object ( Class GF_Field )
          */
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
+        $field_value = apply_filters('gravityview/edit_entry/field_value', $field_value, $field);
 
 	    // Prevent any PHP warnings, like undefined index
 	    ob_start();
 
-	    $return = $field->get_field_input( $this->form, $field_value, $this->entry );
+	    $return = $field->get_field_input($this->form, $field_value, $this->entry);
 
 	    // If there was output, it's an error
 	    $warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
+	    if (!empty($warnings)) {
+		    do_action('gravityview_log_error', __METHOD__.$warnings, $field_value);
 	    }
 
         /**
@@ -796,7 +796,7 @@ 
          * We need the fileupload html field to render with the proper id
          *  ( <li id="field_80_16" ... > )
          */
-        unset( $_GET['page'] );
+        unset($_GET['page']);
 
         return $return;
     }
@@ -812,14 +812,14 @@ 
      * @param  array $field Gravity Forms field array
      * @return string        [description]
      */
-    public function get_field_value( $value, $lead, $field ) {
+    public function get_field_value($value, $lead, $field) {
 
         // The form's not being edited; use the original value
-        if( ! $this->is_edit_entry_submission() ) {
+        if (!$this->is_edit_entry_submission()) {
             return $value;
         }
 
-        return GFFormsModel::get_field_value( $field, $lead, true );
+        return GFFormsModel::get_field_value($field, $lead, true);
     }
 
 
@@ -834,19 +834,19 @@ 
      * @param  array $form GF Form
      * @return array       Modified GF Form
      */
-    function gform_pre_validation( $form ) {
+    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.
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
+            foreach (array('noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions') as $key) {
+	            $field->{$key} = isset($field->{$key} ) ? $field->{$key} : NULL;
             }
 
             // unset emailConfirmEnabled for email type fields
@@ -854,7 +854,7 @@ 
                 $field['emailConfirmEnabled'] = '';
             }*/
 
-            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.
@@ -875,49 +875,49 @@ 
                     $value = NULL;
 
                     // Use the previous entry value as the default.
-                    if( isset( $entry[ $field->id ] ) ) {
-                        $value = $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'] );
+                    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 = empty($value) ? '[]' : $value;
+                            $value = stripslashes_deep($value);
+                            $value = GFFormsModel::prepare_value($form, $field, $value, $input_name, $entry['id'], array());
                         }
 
                     } else {
 
                         // A file already exists when editing an entry
                         // We set this to solve issue when file upload fields are required.
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
+                        GFFormsModel::$uploaded_files[$form_id][$input_name] = $value;
 
                     }
 
-                    $_POST[ $input_name ] = $value;
+                    $_POST[$input_name] = $value;
 
                     break;
                 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;
                 case 'captcha':
@@ -943,8 +943,8 @@ 
     function validate() {
 
         // If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
-        if ( class_exists( 'GFUser' ) ) {
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
+        if (class_exists('GFUser')) {
+            remove_filter('gform_validation', array('GFUser', 'user_registration_validation'));
         }
 
         /**
@@ -952,22 +952,22 @@ 
          * 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;
-        $field_values = RGForms::post( 'gform_field_values' );
+        $field_values = RGForms::post('gform_field_values');
 
         // 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 );
+        $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);
     }
 
 
@@ -982,55 +982,55 @@ 
      * @param  [type] $validation_results [description]
      * @return [type]                     [description]
      */
-    function custom_validation( $validation_results ) {
+    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 );
+            $value = RGFormsModel::get_field_value($field);
+            $field_type = RGFormsModel::get_input_type($field);
 
             // Validate always
-            switch ( $field_type ) {
+            switch ($field_type) {
 
 
                 case 'fileupload' :
 
                     // 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 );
+                        unset($field->validation_message);
                     }
 
                     // validate if multi file upload reached max number of files [maxFiles] => 2
-                    if( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
+                    if (rgar($field, 'maxFiles') && rgar($field, 'multipleFiles')) {
 
-                        $input_name = 'input_' . $field->id;
+                        $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 ] ) ) {
-                            $value = json_decode( $entry[ $field->id ], true );
+                        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 );
+                        $count_files = count($file_names) + count($value);
 
-                        if( $count_files > $field->maxFiles ) {
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
+                        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;
                         }
 
                     }
@@ -1041,11 +1041,11 @@ 
             }
 
             // 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 ) );
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array('field' => $field, 'value' => $value));
 
-                switch ( $field_type ) {
+                switch ($field_type) {
 
                     // Captchas don't need to be re-entered.
                     case 'captcha':
@@ -1053,39 +1053,39 @@ 
                         // Post Image fields aren't editable, so we un-fail them.
                     case 'post_image':
                         $field->failed_validation = false;
-                        unset( $field->validation_message );
+                        unset($field->validation_message);
                         break;
 
                 }
 
                 // 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 );
+                        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 ) ) {
-                    unset( $field->validation_message );
+                if (GFFormDisplay::is_empty($field, $this->form_id) && empty($field->isRequired)) {
+                    unset($field->validation_message);
 	                $field->validation_message = false;
                     continue;
                 }
@@ -1098,7 +1098,7 @@ 
 
         $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'];
@@ -1114,9 +1114,9 @@ 
      */
     private 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() );
+            $this->entry = gravityview_get_entry(GravityView_frontend::is_single_entry());
         }
 
         return $this->entry;
@@ -1135,22 +1135,22 @@ 
      *
      * @return array Array of fields that are configured in the Edit tab in the Admin
      */
-    private function get_configured_edit_fields( $form, $view_id ) {
+    private function get_configured_edit_fields($form, $view_id) {
 
         // Get all fields for form
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
+        $properties = GravityView_View_Data::getInstance()->get_fields($view_id);
 
         // 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;
 
 	    // Show hidden fields as text fields
-	    $form = $this->fix_hidden_fields( $form );
+	    $form = $this->fix_hidden_fields($form);
 
         // 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 adminOnly field settings. Otherwise, don't.
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
+	    $fields = $this->filter_admin_only_fields($fields, $edit_fields, $form, $view_id);
 
         return $fields;
     }
@@ -1162,14 +1162,14 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function fix_hidden_fields( $form ) {
+	private function fix_hidden_fields($form) {
 
 		/** @var GF_Field $field */
-		foreach( $form['fields'] as $key => $field ) {
-			if( 'hidden' === $field->type ) {
-				$text_field = new GF_Field_Text( $field );
+		foreach ($form['fields'] as $key => $field) {
+			if ('hidden' === $field->type) {
+				$text_field = new GF_Field_Text($field);
 				$text_field->type = 'text';
-				$form['fields'][ $key ] = $text_field;
+				$form['fields'][$key] = $text_field;
 			}
 		}
 
@@ -1187,9 +1187,9 @@ 
      * @since  1.5
      * @return array $fields
      */
-    private function filter_fields( $fields, $configured_fields ) {
+    private function filter_fields($fields, $configured_fields) {
 
-        if( empty( $fields ) || !is_array( $fields ) ) {
+        if (empty($fields) || !is_array($fields)) {
             return $fields;
         }
 
@@ -1204,9 +1204,9 @@ 
 	     * @since 1.9.1
          * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
 	     */
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
+	    $hide_product_fields = apply_filters('gravityview/edit_entry/hide-product-fields', empty(self::$supports_product_fields));
 
-	    if( $hide_product_fields ) {
+	    if ($hide_product_fields) {
 		    $field_type_blacklist[] = 'option';
 		    $field_type_blacklist[] = 'quantity';
             $field_type_blacklist[] = 'product';
@@ -1216,25 +1216,25 @@ 
 	    }
 
         // First, remove blacklist
-        foreach ( $fields as $key => $field ) {
-            if( in_array( $field->type, $field_type_blacklist ) ) {
-                unset( $fields[ $key ] );
+        foreach ($fields as $key => $field) {
+            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;
         }
 
         // The edit tab has been configured, so we loop through to configured settings
-        foreach ( $configured_fields as $configured_field ) {
+        foreach ($configured_fields as $configured_field) {
 
 	        /** @var GF_Field $field */
-	        foreach ( $fields as $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;
                 }
 
@@ -1253,18 +1253,18 @@ 
      * @since  1.5
      * @return array
      */
-    private function merge_field_properties( $field, $field_setting ) {
+    private function merge_field_properties($field, $field_setting) {
 
         $return_field = $field;
 
-        if( empty( $field_setting['show_label'] ) ) {
+        if (empty($field_setting['show_label'])) {
             $return_field->label = '';
-        } elseif ( !empty( $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']);
         }
 
         /**
@@ -1289,7 +1289,7 @@ 
      *
      * @return array Possibly modified form array
      */
-    function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
+    function filter_admin_only_fields($fields = array(), $edit_fields = null, $form = array(), $view_id = 0) {
 
 	    /**
          * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
@@ -1300,13 +1300,13 @@ 
 	     * @param array $form GF Form array
 	     * @param int $view_id View ID
 	     */
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
+	    $use_gf_adminonly_setting = apply_filters('gravityview/edit_entry/use_gf_admin_only_setting', empty($edit_fields), $form, $view_id);
 
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
+	    if ($use_gf_adminonly_setting && false === GVCommon::has_cap('gravityforms_edit_entries', $this->entry['id'])) {
             return $fields;
         }
 
-	    foreach( $fields as &$field ) {
+	    foreach ($fields as &$field) {
 		    $field->adminOnly = false;
         }
 
@@ -1323,7 +1323,7 @@ 
      * @param array $form Gravity Forms form
      * @return array Modified form, if not using Conditional Logic
      */
-    function filter_conditional_logic( $form ) {
+    function filter_conditional_logic($form) {
 
         /**
          * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -1331,18 +1331,18 @@ 
          * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
          * @param array $form Gravity Forms form
          */
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
+        $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;
 
@@ -1357,13 +1357,13 @@ 
      * @param $form
      * @return mixed|void
      */
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
+    function manage_conditional_logic($has_conditional_logic, $form) {
 
-        if( ! $this->is_edit_entry() ) {
+        if (!$this->is_edit_entry()) {
             return $has_conditional_logic;
         }
 
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
+        return apply_filters('gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form);
 
     }
 
@@ -1382,7 +1382,7 @@ 
      * @param  boolean $echo Show error messages in the form?
      * @return boolean        True: can edit form. False: nope.
      */
-    function user_can_edit_entry( $echo = false ) {
+    function user_can_edit_entry($echo = false) {
 
         $error = NULL;
 
@@ -1391,58 +1391,58 @@ 
          *  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 );
+	        $error = esc_html($error);
 
 	        /**
 	         * @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;" ) );
+	        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;"));
 	        }
 
-            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;
     }
@@ -1455,24 +1455,24 @@ 
      * @param  boolean $echo  Whether to show error message telling user they aren't allowed
      * @return boolean         True: user can edit the current field; False: nope, they can't.
      */
-    private function user_can_edit_field( $field, $echo = false ) {
+    private function user_can_edit_field($field, $echo = false) {
 
         $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;
 
@@ -1487,18 +1487,18 @@ 
      * @param  [type] $field [description]
      * @return bool
      */
-    private function check_user_cap_edit_field( $field ) {
+    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;
@@ -1512,17 +1512,17 @@ 
     public function verify_nonce() {
 
         // Verify form submitted for editing single
-        if( $this->is_edit_entry_submission() ) {
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
+        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);
         }
 
         /**
@@ -1531,7 +1531,7 @@ 
          * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
          * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
          */
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
+        $valid = apply_filters('gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field);
 
         return $valid;
     }

Braces +1 added lines, -3 removed lines

@@ -1519,9 +1519,7 @@
         // Verify
         else if( ! $this->is_edit_entry() ) {
             $valid = false;
-        }
-
-        else {
+        } else {
             $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
         }
 

includes/extensions/edit-entry/class-edit-entry-user-registration.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      * @since 1.11
      *
      * @param array $form Gravity Forms form array
-     * @param string $entry_id Gravity Forms entry ID
+     * @param integer $entry_id Gravity Forms entry ID
      * @return void
      */
     public function update_user( $form = array(), $entry_id = 0 ) {

Indentation +225 added lines, -225 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'WPINC' ) ) {
-    die;
+	die;
 }
 
 /**
@@ -22,237 +22,237 @@ 
 	/**
 	 * @var GravityView_Edit_Entry
 	 */
-    protected $loader;
+	protected $loader;
 
-    /**
-     * @var WP_User|null Temporary storage used by restore_user_details()
-     */
-    private $_user_before_update = null;
+	/**
+	 * @var WP_User|null Temporary storage used by restore_user_details()
+	 */
+	private $_user_before_update = null;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
-        $this->loader = $loader;
-    }
+	function __construct( GravityView_Edit_Entry $loader ) {
+		$this->loader = $loader;
+	}
 
 	/**
 	 * @since 1.11
 	 */
 	public function load() {
 
-        /**
-	     * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
-	     * @since 1.11
-	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
-	     */
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
-
-            // last resort in case the current user display name don't match any of the defaults
-            add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
-        }
-    }
-
-    /**
-     * Update the WordPress user profile based on the GF User Registration create feed
-     *
-     * @since 1.11
-     *
-     * @param array $form Gravity Forms form array
-     * @param string $entry_id Gravity Forms entry ID
-     * @return void
-     */
-    public function update_user( $form = array(), $entry_id = 0 ) {
-
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
-            return;
-        }
-
-        $entry = GFAPI::get_entry( $entry_id );
-
-	    /**
-	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
-	     * @since 1.11
-	     * @param array $entry Gravity Forms entry
-	     * @param array $form Gravity Forms form
-	     */
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
-
-        /**
-         * @since 1.14
-         */
-        $config = GFUser::get_active_config( $form, $entry );
-
-        /**
-         * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
-         * @since 1.15
-         * @param[in,out] boolean $preserve_role Preserve current user role Default: true
-         * @param[in] array $config Gravity Forms User Registration feed configuration for the form
-         * @param[in] array $form Gravity Forms form array
-         * @param[in] array $entry Gravity Forms entry being edited
-         */
-        $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
-
-        if( $preserve_role ) {
-            $config['meta']['role'] = 'gfur_preserve_role';
-        }
-
-        /**
-         * Make sure the current display name is not changed with the update user method.
-         * @since 1.15
-         */
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
-
-
-        /**
-         * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
-         * @since 1.14
-         * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
-         * @param[in] array $form Gravity Forms form array
-         * @param[in] array $entry Gravity Forms entry being edited
-         */
-        $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
-
-        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
-
-        // Only update if it's a create feed
-        if( ! $is_create_feed ) {
-            return;
-        }
-
-        // The priority is set to 3 so that default priority (10) will still override it
-        add_filter( 'send_password_change_email', '__return_false', 3 );
-        add_filter( 'send_email_change_email', '__return_false', 3 );
-
-        // Trigger the User Registration update user method
-        GFUser::update_user( $entry, $form, $config );
-
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
-
-    }
-
-    /**
-     * Calculate the user display name format
-     *
-     * @since 1.15
-     *
-     * @param int $user_id WP User ID
-     * @return string Display name format as used inside Gravity Forms User Registration
-     */
-    public function match_current_display_name( $user_id ) {
-
-        $user = get_userdata( $user_id );
-
-        $names = $this->generate_display_names( $user );
-
-        $format = array_search( $user->display_name, $names, true );
-
-        // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
-        //   trigger last resort method at the 'gform_user_updated' hook
-        if( false === $format || 'nickname' === $format ) {
-            $this->_user_before_update = $user;
-            $format = 'nickname';
-        }
-
-        return $format;
-
-    }
-
-    /**
-     * Generate an array of all the user display names possibilities
-     *
-     * @since 1.15
-     *
-     * @param object $profileuser WP_User object
-     * @return array List all the possible display names for a certain User object
-     */
-    public function generate_display_names( $profileuser ) {
-
-        $public_display = array();
-        $public_display['nickname']  = $profileuser->nickname;
-        $public_display['username']  = $profileuser->user_login;
-
-        if ( !empty($profileuser->first_name) )
-            $public_display['firstname'] = $profileuser->first_name;
-
-        if ( !empty($profileuser->last_name) )
-            $public_display['lastname'] = $profileuser->last_name;
-
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
-        }
-
-        $public_display = array_map( 'trim', $public_display );
-        $public_display = array_unique( $public_display );
-
-        return $public_display;
-    }
-
-
-    /**
-     * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
-     *
-     * @see GFUser::update_user()
-     * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
-     * @param array $config Gravity Forms User Registration Addon form feed configuration
-     * @param array $entry The Gravity Forms entry that was just updated
-     * @param string $password User password
-     * @return void
-     */
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
-
-        /**
-         * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
-         * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
-         * @since 1.14.4
-         * @param boolean $restore_display_name Restore Display Name? Default: true
-         */
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
-
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
-
-        /**
-         * Don't restore display name:
-         *   - either disabled,
-         *   - or it is an Update feed (we only care about Create feed)
-         *   - or we don't need as we found the correct format before updating user.
-         * @since 1.14.4
-         */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
-            return;
-        }
-
-        $user_after_update = get_userdata( $user_id );
-
-        $restored_user = $user_after_update;
-
-	    // Restore previous display_name
-        $restored_user->display_name = $this->_user_before_update->display_name;
-
-	    // Don't have WP update the password.
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
-
-        /**
-         * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
-         * @since 1.14
-         * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
-         * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
-         * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
-         * @param array   $entry The Gravity Forms entry that was just updated
-         */
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
-
-        $updated = wp_update_user( $restored_user );
-
-        if( is_wp_error( $updated ) ) {
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
-        } else {
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
-        }
-
-        $this->_user_before_update = null;
-
-        unset( $updated, $restored_user, $user_after_update );
-    }
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/trigger_update` Choose whether to update user information via User Registration add-on when an entry is updated?
+		 * @since 1.11
+		 * @param boolean $boolean Whether to trigger update on user registration (default: true)
+		 */
+		if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
+			add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+
+			// last resort in case the current user display name don't match any of the defaults
+			add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
+		}
+	}
+
+	/**
+	 * Update the WordPress user profile based on the GF User Registration create feed
+	 *
+	 * @since 1.11
+	 *
+	 * @param array $form Gravity Forms form array
+	 * @param string $entry_id Gravity Forms entry ID
+	 * @return void
+	 */
+	public function update_user( $form = array(), $entry_id = 0 ) {
+
+		if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
+			return;
+		}
+
+		$entry = GFAPI::get_entry( $entry_id );
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
+		 * @since 1.11
+		 * @param array $entry Gravity Forms entry
+		 * @param array $form Gravity Forms form
+		 */
+		$entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
+
+		/**
+		 * @since 1.14
+		 */
+		$config = GFUser::get_active_config( $form, $entry );
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
+		 * @since 1.15
+		 * @param[in,out] boolean $preserve_role Preserve current user role Default: true
+		 * @param[in] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
+
+		if( $preserve_role ) {
+			$config['meta']['role'] = 'gfur_preserve_role';
+		}
+
+		/**
+		 * Make sure the current display name is not changed with the update user method.
+		 * @since 1.15
+		 */
+		$config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
+
+
+		/**
+		 * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
+		 * @since 1.14
+		 * @param[in,out] array $config Gravity Forms User Registration feed configuration for the form
+		 * @param[in] array $form Gravity Forms form array
+		 * @param[in] array $entry Gravity Forms entry being edited
+		 */
+		$config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
+
+		$is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
+
+		// Only update if it's a create feed
+		if( ! $is_create_feed ) {
+			return;
+		}
+
+		// The priority is set to 3 so that default priority (10) will still override it
+		add_filter( 'send_password_change_email', '__return_false', 3 );
+		add_filter( 'send_email_change_email', '__return_false', 3 );
+
+		// Trigger the User Registration update user method
+		GFUser::update_user( $entry, $form, $config );
+
+		remove_filter( 'send_password_change_email', '__return_false', 3 );
+		remove_filter( 'send_email_change_email', '__return_false', 3 );
+
+	}
+
+	/**
+	 * Calculate the user display name format
+	 *
+	 * @since 1.15
+	 *
+	 * @param int $user_id WP User ID
+	 * @return string Display name format as used inside Gravity Forms User Registration
+	 */
+	public function match_current_display_name( $user_id ) {
+
+		$user = get_userdata( $user_id );
+
+		$names = $this->generate_display_names( $user );
+
+		$format = array_search( $user->display_name, $names, true );
+
+		// In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
+		//   trigger last resort method at the 'gform_user_updated' hook
+		if( false === $format || 'nickname' === $format ) {
+			$this->_user_before_update = $user;
+			$format = 'nickname';
+		}
+
+		return $format;
+
+	}
+
+	/**
+	 * Generate an array of all the user display names possibilities
+	 *
+	 * @since 1.15
+	 *
+	 * @param object $profileuser WP_User object
+	 * @return array List all the possible display names for a certain User object
+	 */
+	public function generate_display_names( $profileuser ) {
+
+		$public_display = array();
+		$public_display['nickname']  = $profileuser->nickname;
+		$public_display['username']  = $profileuser->user_login;
+
+		if ( !empty($profileuser->first_name) )
+			$public_display['firstname'] = $profileuser->first_name;
+
+		if ( !empty($profileuser->last_name) )
+			$public_display['lastname'] = $profileuser->last_name;
+
+		if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
+			$public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
+			$public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+		}
+
+		$public_display = array_map( 'trim', $public_display );
+		$public_display = array_unique( $public_display );
+
+		return $public_display;
+	}
+
+
+	/**
+	 * Restore the Display Name and roles of a user after being updated by Gravity Forms User Registration Addon
+	 *
+	 * @see GFUser::update_user()
+	 * @param int $user_id WP User ID that was updated by Gravity Forms User Registration Addon
+	 * @param array $config Gravity Forms User Registration Addon form feed configuration
+	 * @param array $entry The Gravity Forms entry that was just updated
+	 * @param string $password User password
+	 * @return void
+	 */
+	public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
+
+		/**
+		 * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
+		 * Otherwise, display names will be reset to the format specified in Gravity Forms User Registration "Update" feed
+		 * @since 1.14.4
+		 * @param boolean $restore_display_name Restore Display Name? Default: true
+		 */
+		$restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
+
+		$is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
+
+		/**
+		 * Don't restore display name:
+		 *   - either disabled,
+		 *   - or it is an Update feed (we only care about Create feed)
+		 *   - or we don't need as we found the correct format before updating user.
+		 * @since 1.14.4
+		 */
+		if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+			return;
+		}
+
+		$user_after_update = get_userdata( $user_id );
+
+		$restored_user = $user_after_update;
+
+		// Restore previous display_name
+		$restored_user->display_name = $this->_user_before_update->display_name;
+
+		// Don't have WP update the password.
+		unset( $restored_user->data->user_pass, $restored_user->user_pass );
+
+		/**
+		 * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
+		 * @since 1.14
+		 * @param WP_User $restored_user The user with restored details about to be updated by wp_update_user()
+		 * @param WP_User $user_before_update The user before being updated by Gravity Forms User Registration
+		 * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
+		 * @param array   $entry The Gravity Forms entry that was just updated
+		 */
+		$restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
+
+		$updated = wp_update_user( $restored_user );
+
+		if( is_wp_error( $updated ) ) {
+			do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
+		} else {
+			do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
+		}
+
+		$this->_user_before_update = null;
+
+		unset( $updated, $restored_user, $user_after_update );
+	}
 
 } //end class

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
  * @copyright Copyright 2015, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     die;
 }
 
@@ -29,7 +29,7 @@ 
      */
     private $_user_before_update = null;
 
-    function __construct( GravityView_Edit_Entry $loader ) {
+    function __construct(GravityView_Edit_Entry $loader) {
         $this->loader = $loader;
     }
 
@@ -43,11 +43,11 @@ 
 	     * @since 1.11
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
 	     */
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
+        if (apply_filters('gravityview/edit_entry/user_registration/trigger_update', true)) {
+            add_action('gravityview/edit_entry/after_update', array($this, 'update_user'), 10, 2);
 
             // last resort in case the current user display name don't match any of the defaults
-            add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
+            add_action('gform_user_updated', array($this, 'restore_display_name'), 10, 4);
         }
     }
 
@@ -60,13 +60,13 @@ 
      * @param string $entry_id Gravity Forms entry ID
      * @return void
      */
-    public function update_user( $form = array(), $entry_id = 0 ) {
+    public function update_user($form = array(), $entry_id = 0) {
 
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
+        if (!class_exists('GFAPI') || !class_exists('GFUser') || empty($entry_id)) {
             return;
         }
 
-        $entry = GFAPI::get_entry( $entry_id );
+        $entry = GFAPI::get_entry($entry_id);
 
 	    /**
 	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
@@ -74,12 +74,12 @@ 
 	     * @param array $entry Gravity Forms entry
 	     * @param array $form Gravity Forms form
 	     */
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
+        $entry = apply_filters('gravityview/edit_entry/user_registration/entry', $entry, $form);
 
         /**
          * @since 1.14
          */
-        $config = GFUser::get_active_config( $form, $entry );
+        $config = GFUser::get_active_config($form, $entry);
 
         /**
          * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
@@ -89,9 +89,9 @@ 
          * @param[in] array $form Gravity Forms form array
          * @param[in] array $entry Gravity Forms entry being edited
          */
-        $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
+        $preserve_role = apply_filters('gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry);
 
-        if( $preserve_role ) {
+        if ($preserve_role) {
             $config['meta']['role'] = 'gfur_preserve_role';
         }
 
@@ -99,7 +99,7 @@ 
          * Make sure the current display name is not changed with the update user method.
          * @since 1.15
          */
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
+        $config['meta']['displayname'] = $this->match_current_display_name($entry['created_by']);
 
 
         /**
@@ -109,24 +109,24 @@ 
          * @param[in] array $form Gravity Forms form array
          * @param[in] array $entry Gravity Forms entry being edited
          */
-        $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
+        $config = apply_filters('gravityview/edit_entry/user_registration/config', $config, $form, $entry);
 
-        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
+        $is_create_feed = ($config && rgars($config, 'meta/feed_type') === 'create');
 
         // Only update if it's a create feed
-        if( ! $is_create_feed ) {
+        if (!$is_create_feed) {
             return;
         }
 
         // The priority is set to 3 so that default priority (10) will still override it
-        add_filter( 'send_password_change_email', '__return_false', 3 );
-        add_filter( 'send_email_change_email', '__return_false', 3 );
+        add_filter('send_password_change_email', '__return_false', 3);
+        add_filter('send_email_change_email', '__return_false', 3);
 
         // Trigger the User Registration update user method
-        GFUser::update_user( $entry, $form, $config );
+        GFUser::update_user($entry, $form, $config);
 
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
+        remove_filter('send_password_change_email', '__return_false', 3);
+        remove_filter('send_email_change_email', '__return_false', 3);
 
     }
 
@@ -138,17 +138,17 @@ 
      * @param int $user_id WP User ID
      * @return string Display name format as used inside Gravity Forms User Registration
      */
-    public function match_current_display_name( $user_id ) {
+    public function match_current_display_name($user_id) {
 
-        $user = get_userdata( $user_id );
+        $user = get_userdata($user_id);
 
-        $names = $this->generate_display_names( $user );
+        $names = $this->generate_display_names($user);
 
-        $format = array_search( $user->display_name, $names, true );
+        $format = array_search($user->display_name, $names, true);
 
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
         //   trigger last resort method at the 'gform_user_updated' hook
-        if( false === $format || 'nickname' === $format ) {
+        if (false === $format || 'nickname' === $format) {
             $this->_user_before_update = $user;
             $format = 'nickname';
         }
@@ -165,25 +165,25 @@ 
      * @param object $profileuser WP_User object
      * @return array List all the possible display names for a certain User object
      */
-    public function generate_display_names( $profileuser ) {
+    public function generate_display_names($profileuser) {
 
         $public_display = array();
         $public_display['nickname']  = $profileuser->nickname;
         $public_display['username']  = $profileuser->user_login;
 
-        if ( !empty($profileuser->first_name) )
+        if (!empty($profileuser->first_name))
             $public_display['firstname'] = $profileuser->first_name;
 
-        if ( !empty($profileuser->last_name) )
+        if (!empty($profileuser->last_name))
             $public_display['lastname'] = $profileuser->last_name;
 
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+        if (!empty($profileuser->first_name) && !empty($profileuser->last_name)) {
+            $public_display['firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+            $public_display['lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
         }
 
-        $public_display = array_map( 'trim', $public_display );
-        $public_display = array_unique( $public_display );
+        $public_display = array_map('trim', $public_display);
+        $public_display = array_unique($public_display);
 
         return $public_display;
     }
@@ -199,7 +199,7 @@ 
      * @param string $password User password
      * @return void
      */
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
+    public function restore_display_name($user_id = 0, $config = array(), $entry = array(), $password = '') {
 
         /**
          * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
@@ -207,9 +207,9 @@ 
          * @since 1.14.4
          * @param boolean $restore_display_name Restore Display Name? Default: true
          */
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
+        $restore_display_name = apply_filters('gravityview/edit_entry/restore_display_name', true);
 
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
+        $is_update_feed = ($config && rgars($config, 'meta/feed_type') === 'update');
 
         /**
          * Don't restore display name:
@@ -218,11 +218,11 @@ 
          *   - or we don't need as we found the correct format before updating user.
          * @since 1.14.4
          */
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
+        if (!$restore_display_name || $is_update_feed || is_null($this->_user_before_update)) {
             return;
         }
 
-        $user_after_update = get_userdata( $user_id );
+        $user_after_update = get_userdata($user_id);
 
         $restored_user = $user_after_update;
 
@@ -230,7 +230,7 @@ 
         $restored_user->display_name = $this->_user_before_update->display_name;
 
 	    // Don't have WP update the password.
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
+	    unset($restored_user->data->user_pass, $restored_user->user_pass);
 
         /**
          * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
@@ -240,19 +240,19 @@ 
          * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
          * @param array   $entry The Gravity Forms entry that was just updated
          */
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
+        $restored_user = apply_filters('gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry);
 
-        $updated = wp_update_user( $restored_user );
+        $updated = wp_update_user($restored_user);
 
-        if( is_wp_error( $updated ) ) {
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
+        if (is_wp_error($updated)) {
+            do_action('gravityview_log_error', __METHOD__.sprintf(' - There was an error updating user #%d details', $user_id), $updated);
         } else {
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
+            do_action('gravityview_log_debug', __METHOD__.sprintf(' - User #%d details restored', $user_id));
         }
 
         $this->_user_before_update = null;
 
-        unset( $updated, $restored_user, $user_after_update );
+        unset($updated, $restored_user, $user_after_update);
     }
 
 } //end class

Braces +6 added lines, -4 removed lines

@@ -171,11 +171,13 @@
         $public_display['nickname']  = $profileuser->nickname;
         $public_display['username']  = $profileuser->user_login;
 
-        if ( !empty($profileuser->first_name) )
-            $public_display['firstname'] = $profileuser->first_name;
+        if ( !empty($profileuser->first_name) ) {
+                    $public_display['firstname'] = $profileuser->first_name;
+        }
 
-        if ( !empty($profileuser->last_name) )
-            $public_display['lastname'] = $profileuser->last_name;
+        if ( !empty($profileuser->last_name) ) {
+                    $public_display['lastname'] = $profileuser->last_name;
+        }
 
         if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
             $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;