gravityview / GravityView

includes/class-admin-views.php

Indentation +83 added lines, -83 removed lines

@@ -63,28 +63,28 @@ 
 	}
 
 	/**
-     * When on the Add/Edit View screen, suggest most popular articles related to that
-     *
+	 * When on the Add/Edit View screen, suggest most popular articles related to that
+	 *
 	 * @param array $localization_data Data to be passed to the Support Port JS
 	 *
 	 * @return array
 	 */
 	function suggest_support_articles( $localization_data = array() ) {
 
-	    if( ! gravityview()->request->is_view() ) {
-	        return $localization_data;
-        }
+		if( ! gravityview()->request->is_view() ) {
+			return $localization_data;
+		}
 
 		$localization_data['suggest'] = array(
-            '57ef23539033602e61d4a560',
-            '54c67bb9e4b0512429885513',
-            '54c67bb9e4b0512429885512',
-            '54c67bbbe4b07997ea3f3f6b',
-            '54d1a33ae4b086c0c0964ce9',
-            '57ef253c9033602e61d4a563',
-            '552355bfe4b0221aadf2572b',
-            '54c67bcde4b051242988553e',
-        );
+			'57ef23539033602e61d4a560',
+			'54c67bb9e4b0512429885513',
+			'54c67bb9e4b0512429885512',
+			'54c67bbbe4b07997ea3f3f6b',
+			'54d1a33ae4b086c0c0964ce9',
+			'57ef253c9033602e61d4a563',
+			'552355bfe4b0221aadf2572b',
+			'54c67bcde4b051242988553e',
+		);
 
 		return $localization_data;
 	}
@@ -170,11 +170,11 @@ 
 
 		if( 'form_list' === GFForms::get_page() ) {
 			$priority = 790;
-        }
+		}
 
 		if( empty( $connected_views ) ) {
 
-		    $menu_items['gravityview'] = array(
+			$menu_items['gravityview'] = array(
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -205,13 +205,13 @@ 
 		// If there were no items added, then let's create the parent menu
 		if( $sub_menu_items ) {
 
-		    $sub_menu_items[] = array(
-			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
-                'link_class' => 'gv-create-view',
-			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
-			    'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
-			    'capabilities'   => array( 'edit_gravityviews' ),
-            );
+			$sub_menu_items[] = array(
+				'label' => esc_attr__( 'Create a View', 'gravityview' ),
+				'link_class' => 'gv-create-view',
+				'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
+				'url'   => admin_url( 'post-new.php?post_type=gravityview&form_id=' . $id ),
+				'capabilities'   => array( 'edit_gravityviews' ),
+			);
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
 			$sub_menu_items[] = array(
@@ -596,12 +596,12 @@ 
 	 * Render html for displaying available fields based on a Form ID
 	 * $blacklist_field_types - contains the field types which are not proper to be shown in a directory.
 	 *
-     * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
+	 * @see GravityView_Ajax::get_available_fields_html() Triggers `gravityview_render_available_fields` action
 	 * @access public
-     *
+	 *
 	 * @param int $form Gravity Forms Form ID (default: '')
 	 * @param string $context (default: 'single')
-     *
+	 *
 	 * @return void
 	 */
 	function render_available_fields( $form = 0, $context = 'single' ) {
@@ -615,7 +615,7 @@ 
 
 		if ( ! is_array( $blacklist_field_types ) ) {
 
-		    gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
+			gravityview()->log->error( '$blacklist_field_types is not an array', array( 'data' => print_r( $blacklist_field_types, true ) ) );
 
 			$blacklist_field_types = array();
 		}
@@ -747,12 +747,12 @@ 
 				/**
 				 * @since 1.7.2
 				 */
-			    'other_entries' => array(
-				    'label'	=> __('Other Entries', 'gravityview'),
-				    'type'	=> 'other_entries',
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
-			    ),
-	        );
+				'other_entries' => array(
+					'label'	=> __('Other Entries', 'gravityview'),
+					'type'	=> 'other_entries',
+					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+				),
+			);
 
 			if( 'single' !== $zone) {
 
@@ -885,9 +885,9 @@ 
 
 				$joined_forms = gravityview_get_joined_forms( $post->ID );
 
-                foreach ( $joined_forms as $form ) {
-                    $available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
-                }
+				foreach ( $joined_forms as $form ) {
+					$available_items[ $form->ID ] = $this->get_available_fields( $form->ID, $zone );
+				}
 			} else {
 				$available_items[ $form ] = $this->get_registered_widgets();
 			}
@@ -917,9 +917,9 @@ 
 
 										if ( $form_id ) {
 											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
-                                        } else {
+										} else {
 											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
-                                        }
+										}
 
 										if ( !$original_item ) {
 											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
@@ -1001,13 +1001,13 @@ 
 	}
 
 	/**
-     * Renders "Add Field" tooltips
-     *
-     * @since 2.0.11
-     *
+	 * Renders "Add Field" tooltips
+	 *
+	 * @since 2.0.11
+	 *
 	 * @param string $context "directory", "single", or "edit"
-     *
-     * @return void
+	 *
+	 * @return void
 	 */
 	function render_field_pickers( $context = 'directory' ) {
 
@@ -1034,7 +1034,7 @@ 
             </div>
 			<?php
 		}
-    }
+	}
 
 	/**
 	 * Render the Template Active Areas and configured active fields for a given template id and post id
@@ -1100,7 +1100,7 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
+		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
 
 		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
@@ -1108,63 +1108,63 @@ 
 		if( GFForms::get_page() === 'form_list' ) {
 			wp_enqueue_style( 'gravityview_views_styles' );
 			return;
-        }
+		}
 
 		// Don't process any scripts below here if it's not a GravityView page.
 		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
-		    return;
+			return;
 		}
 
-        wp_enqueue_script( 'jquery-ui-datepicker' );
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
-
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
-
-        //enqueue scripts
-        wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
-
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
-            'cookiepath' => COOKIEPATH,
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
-            'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-            'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-            'label_close' => __( 'Close', 'gravityview' ),
-            'label_cancel' => __( 'Cancel', 'gravityview' ),
-            'label_continue' => __( 'Continue', 'gravityview' ),
-            'label_ok' => __( 'Ok', 'gravityview' ),
-            'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-            'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-            'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-            'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-            'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-        ));
+		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
+
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+
+		//enqueue scripts
+		wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
+
+		wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			'cookiepath' => COOKIEPATH,
+			'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
+			'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
+			'label_viewname' => __( 'Enter View name here', 'gravityview' ),
+			'label_close' => __( 'Close', 'gravityview' ),
+			'label_cancel' => __( 'Cancel', 'gravityview' ),
+			'label_continue' => __( 'Continue', 'gravityview' ),
+			'label_ok' => __( 'Ok', 'gravityview' ),
+			'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
+			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
+			'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
+			'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
+			'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
+		));
 
 		wp_enqueue_style( 'gravityview_views_styles' );
 
-        // Enqueue scripts needed for merge tags
-        self::enqueue_gravity_forms_scripts();
+		// Enqueue scripts needed for merge tags
+		self::enqueue_gravity_forms_scripts();
 	}
 
 	/**
 	 * Enqueue Gravity Forms scripts, needed for Merge Tags
-     *
-     * @since 1.0.5-beta
-     *
-     * @return void
+	 *
+	 * @since 1.0.5-beta
+	 *
+	 * @return void
 	 */
 	static function enqueue_gravity_forms_scripts() {
 		GFForms::register_scripts();
 
 		$scripts = array(
-		    'sack',
-		    'gform_gravityforms',
-		    'gform_forms',
-		    'gform_form_admin',
-		    'jquery-ui-autocomplete'
+			'sack',
+			'gform_gravityforms',
+			'gform_forms',
+			'gform_form_admin',
+			'jquery-ui-autocomplete'
 		);
 
 		if ( wp_is_mobile() ) {
-		    $scripts[] = 'jquery-touch-punch';
+			$scripts[] = 'jquery-touch-punch';
 		}
 
 		wp_enqueue_script( $scripts );

includes/class-gravityview-change-entry-creator.php

Indentation +209 added lines, -209 removed lines

@@ -5,239 +5,239 @@
  */
 class GravityView_Change_Entry_Creator {
 
-    function __construct() {
-
-    	/**
-    	 * @since  1.5.1
-    	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
-
-    	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
-
-	    /**
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
-	     * @since 1.7.4
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
-	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
-		    return;
-	    }
-
-        /**
-         * Use `init` to fix bbPress warning
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
-         */
-    	add_action('init', array( $this, 'load'), 100 );
-
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
-
-    }
-
-    /**
-     * When an user is created using the User Registration add-on, assign the entry to them
-     *
-     * @since  1.5.1
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
-     * @param  int $user_id  WordPress User ID
-     * @param  array $config   User registration feed configuration
-     * @param  array  $entry     GF Entry array
-     * @param  string $password User password
-     * @return void
-     */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
-
-    	/**
-    	 * Disable assigning the new user to the entry by returning false.
-    	 * @param  int $user_id  WordPress User ID
-	     * @param  array $config   User registration feed configuration
-	     * @param  array  $entry     GF Entry array
-    	 */
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
-
-    	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
-    		return;
-    	}
-
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
-
-    	if ( false === $result ) {
-    		$status = __('Error', 'gravityview');
-    		global $wpdb;
-		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
-    	} else {
-    		$status = __('Success', 'gravityview');
-    	    $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
-    	}
-
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
-
-	    /**
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
-	     * @since 1.21.5
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
-	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
-		    return;
-	    }
-
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
-
-    }
-
-    /**
-     * Disable previous functionality; use this one as the canonical.
-     * @return void
-     */
-    function prevent_conflicts() {
-
-    	// Plugin that was provided here:
-    	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
-
-    }
-
-    /**
-     * @since  3.6.3
-     * @return void
-     */
-    function load() {
-
-    	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
-            return;
-        }
-
-        // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
-            return;
-        }
-
-        // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
-            return;
-        }
-
-        // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
-
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
-
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
-
-    }
-
-    /**
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
-     * @return void
-     */
-    function set_screen_mode() {
-
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
-            $_POST["screen_mode"] = 'edit';
-        }
-
-    }
-
-    /**
-     * When the entry creator is changed, add a note to the entry
-     * @param  array $form   GF entry array
-     * @param  int $entry_id Entry ID
-     * @return void
-     */
-    function update_entry_creator($form, $entry_id) {
-            global $current_user;
+	function __construct() {
+
+		/**
+		 * @since  1.5.1
+		 */
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+
+		// ONLY ADMIN FROM HERE ON.
+		if( !is_admin() ) { return; }
+
+		/**
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
+		 * @since 1.7.4
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
+		 */
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+			return;
+		}
+
+		/**
+		 * Use `init` to fix bbPress warning
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
+		 */
+		add_action('init', array( $this, 'load'), 100 );
+
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+
+	}
+
+	/**
+	 * When an user is created using the User Registration add-on, assign the entry to them
+	 *
+	 * @since  1.5.1
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
+	 * @param  int $user_id  WordPress User ID
+	 * @param  array $config   User registration feed configuration
+	 * @param  array  $entry     GF Entry array
+	 * @param  string $password User password
+	 * @return void
+	 */
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+
+		/**
+		 * Disable assigning the new user to the entry by returning false.
+		 * @param  int $user_id  WordPress User ID
+		 * @param  array $config   User registration feed configuration
+		 * @param  array  $entry     GF Entry array
+		 */
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
+
+		// If filter returns false, do not process
+		if( empty( $assign_to_lead ) ) {
+			return;
+		}
+
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
+		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
+
+		if ( false === $result ) {
+			$status = __('Error', 'gravityview');
+			global $wpdb;
+			$note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
+		} else {
+			$status = __('Success', 'gravityview');
+			$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+		}
+
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
+
+		/**
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
+		 * @since 1.21.5
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
+		 */
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
+			return;
+		}
+
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+
+	}
+
+	/**
+	 * Disable previous functionality; use this one as the canonical.
+	 * @return void
+	 */
+	function prevent_conflicts() {
+
+		// Plugin that was provided here:
+		// @link https://gravityview.co/support/documentation/201991205/
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
+
+	}
+
+	/**
+	 * @since  3.6.3
+	 * @return void
+	 */
+	function load() {
+
+		// Does GF exist?
+		if( !class_exists('GFCommon') ) {
+			return;
+		}
+
+		// Can the user edit entries?
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+			return;
+		}
+
+		// If screen mode isn't set, then we're in the wrong place.
+		if( empty( $_REQUEST['screen_mode'] ) ) {
+			return;
+		}
+
+		// Now, no validation is required in the methods; let's hook in.
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+
+	}
+
+	/**
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
+	 * @return void
+	 */
+	function set_screen_mode() {
+
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
+			$_POST["screen_mode"] = 'edit';
+		}
+
+	}
+
+	/**
+	 * When the entry creator is changed, add a note to the entry
+	 * @param  array $form   GF entry array
+	 * @param  int $entry_id Entry ID
+	 * @return void
+	 */
+	function update_entry_creator($form, $entry_id) {
+			global $current_user;
 
-        // Update the entry
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
+		// Update the entry
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
 
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
 
-        // If the creator has changed, let's add a note about who it used to be.
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
+		// If the creator has changed, let's add a note about who it used to be.
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
 
-        // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
-            return;
-        }
+		// If there's no owner and there didn't used to be, keep going
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
+			return;
+		}
 
-        // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+		// If the values have changed
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
 
-            $user_data = get_userdata($current_user->ID);
+			$user_data = get_userdata($current_user->ID);
 
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
 
-            if( !empty( $originally_created_by ) ) {
-                $originally_created_by_user_data = get_userdata($originally_created_by);
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
-            }
+			if( !empty( $originally_created_by ) ) {
+				$originally_created_by_user_data = get_userdata($originally_created_by);
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
+			}
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
-            }
+			if( !empty( $created_by ) ) {
+				$created_by_user_data =  get_userdata($created_by);
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
+			}
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
-        }
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+		}
 
-    }
+	}
 
-    /**
-     * Output the select to change the entry creator
-     * @param int $form_id GF Form ID
-     * @param array $entry    GF entry array
-     * @return void
-     */
-    function add_select($form_id, $entry ) {
+	/**
+	 * Output the select to change the entry creator
+	 * @param int $form_id GF Form ID
+	 * @param array $entry    GF entry array
+	 * @return void
+	 */
+	function add_select($form_id, $entry ) {
 
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
-            return;
-        }
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
+			return;
+		}
 
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+		$users = GVCommon::get_users( 'change_entry_creator' );
 
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
 
-        // Make sure that the entry creator is included in the users list. If not, add them.
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
+		// Make sure that the entry creator is included in the users list. If not, add them.
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
 
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
-	            $users = array_merge( $users, $created_by_user );
-	        }
-	    }
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
+				$users = array_merge( $users, $created_by_user );
+			}
+		}
 
-        $output = '<label for="change_created_by">';
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
-        $output .= '</label>';
+		$output = '<label for="change_created_by">';
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
+		$output .= '</label>';
 
-	    // If there are users who are not being shown, show a warning.
-	    // TODO: Use AJAX instead of <select>
-	    $count_users = count_users();
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
-		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
-	    }
+		// If there are users who are not being shown, show a warning.
+		// TODO: Use AJAX instead of <select>
+		$count_users = count_users();
+		if( sizeof( $users ) < $count_users['total_users'] ) {
+			$output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
+		}
 
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
-        }
-        $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
+		foreach($users as $user) {
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+		}
+		$output .= '</select>';
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
 
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
 
-        echo $output;
-    }
+		echo $output;
+	}
 
 }
 

includes/widgets/search-widget/templates/search-field-select.php

Indentation +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 }
 
 if( is_array( $search_field['value'] ) ) {
-    gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
+	gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
 	$search_field['value'] = reset( $search_field['value'] );
 }
 

includes/admin/class-gravityview-support-port.php

Indentation +22 added lines, -22 removed lines

@@ -13,7 +13,7 @@ 
 
 	/**
 	 * @var string The hash key used to generate secure message history
-     * @since 2.2.5
+	 * @since 2.2.5
 	 */
 	const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w=';
 
@@ -110,7 +110,7 @@ 
 			'payment_id'       => '',
 			'customer_name'    => '',
 			'customer_email'   => '',
-            'price_id'         => '0',
+			'price_id'         => '0',
 		) );
 
 		// This is just HTML we don't need.
@@ -127,9 +127,9 @@ 
 			case 3:
 				$package = 'All Access';
 				break;
-            case 4:
-                $package = 'Lifetime';
-                break;
+			case 4:
+				$package = 'Lifetime';
+				break;
 		}
 
 		$current_user = wp_get_current_user();
@@ -159,27 +159,27 @@ 
 		// Help Scout length limit is 200 characters
 		foreach( $data as $key => $value ) {
 			if ( ! is_string( $value ) ) {
-                continue;
+				continue;
 			}
-		    $data[ $key ] = mb_substr( $value, 0, 200 );
-        }
+			$data[ $key ] = mb_substr( $value, 0, 200 );
+		}
 
 		$localization_data = array(
 			'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ),
 			'data' => $data,
 			'translation' => $translation,
-            'suggest' => array(),
+			'suggest' => array(),
 		);
 
 		/**
-         * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
+		 * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
 		 * @since 2.0
-         * @param array $localization_data {
-         *   @type int $contactEnabled Can the user contact support?
-         *   @type array $data Support/license info
-         *   @type array $translation i18n strings
-         *   @type array $suggest Article IDs to recommend to the user (per page in the admin
-         * }
+		 * @param array $localization_data {
+		 *   @type int $contactEnabled Can the user contact support?
+		 *   @type array $data Support/license info
+		 *   @type array $translation i18n strings
+		 *   @type array $suggest Article IDs to recommend to the user (per page in the admin
+		 * }
 		 */
 		$localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data );
 
@@ -193,11 +193,11 @@ 
 	 *
 	 * If the user doesn't have the `gravityview_support_port` capability, returns false; then
 	 * If global setting is "hide", returns false; then
-     * If user preference is not set, return global setting; then
-     * If user preference is set, return that setting.
+	 * If user preference is not set, return global setting; then
+	 * If user preference is set, return that setting.
 	 *
 	 * @since 1.15
-     * @since 1.17.5 Changed behavior to respect global setting
+	 * @since 1.17.5 Changed behavior to respect global setting
 	 *
 	 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
 	 *
@@ -212,7 +212,7 @@ 
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
 
 		if ( empty( $global_setting ) ) {
-            return false;
+			return false;
 		}
 
 		// Get the per-user Support Port setting
@@ -248,7 +248,7 @@ 
 	 * Modifies the output of profile.php to add GravityView Support preference
 	 *
 	 * @since 1.15
-     * @since 1.17.5 Only show if global setting is active
+	 * @since 1.17.5 Only show if global setting is active
 	 *
 	 * @param WP_User $user Current user info
 	 *
@@ -259,7 +259,7 @@ 
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
 
 		if ( empty( $global_setting ) ) {
-            return;
+			return;
 		}
 
 		/**

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

Indentation +289 added lines, -289 removed lines

@@ -102,10 +102,10 @@ 
 
 	/**
 	 * ID of the current post. May also be ID of the current View.
-     *
-     * @since 2.0.13
-     * 
-     * @var int
+	 *
+	 * @since 2.0.13
+	 * 
+	 * @var int
 	 */
 	public $post_id;
 
@@ -177,12 +177,12 @@ 
 	public function prevent_maybe_process_form() {
 
 		if( ! empty( $_POST ) ) {
-	        gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
+			gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) );
 		}
 
 		if( $this->is_edit_entry_submission() ) {
 			remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
-	        remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
+			remove_action( 'wp',  array( 'GFForms', 'maybe_process_form'), 9 );
 		}
 	}
 
@@ -210,14 +210,14 @@ 
 	 * When Edit entry view is requested setup the vars
 	 */
 	private function setup_vars() {
-        global $post;
+		global $post;
 
 		$gravityview_view = GravityView_View::getInstance();
 
 
 		$entries = $gravityview_view->getEntries();
-	    self::$original_entry = $entries[0];
-	    $this->entry = $entries[0];
+		self::$original_entry = $entries[0];
+		$this->entry = $entries[0];
 
 		self::$original_form = $gravityview_view->getForm();
 		$this->form = $gravityview_view->getForm();
@@ -359,8 +359,8 @@ 
 
 			GFFormsModel::save_lead( $form, $this->entry );
 
-	        // Delete the values for hidden inputs
-	        $this->unset_hidden_field_values();
+			// Delete the values for hidden inputs
+			$this->unset_hidden_field_values();
 			
 			$this->entry['date_created'] = $date_created;
 
@@ -370,7 +370,7 @@ 
 			// Perform actions normally performed after updating a lead
 			$this->after_update();
 
-	        /**
+			/**
 			 * Must be AFTER after_update()!
 			 * @see https://github.com/gravityview/GravityView/issues/764
 			 */
@@ -378,7 +378,7 @@ 
 
 			/**
 			 * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry
-             * @since 2.1 Added $gv_data parameter
+			 * @since 2.1 Added $gv_data parameter
 			 * @param array $form Gravity Forms form array
 			 * @param string $entry_id Numeric ID of the entry that was updated
 			 * @param GravityView_Edit_Entry_Render $this This object
@@ -402,7 +402,7 @@ 
 	 * @return void
 	 */
 	private function unset_hidden_field_values() {
-	    global $wpdb;
+		global $wpdb;
 
 		/**
 		 * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic
@@ -424,29 +424,29 @@ 
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) );
 		}
 
-	    foreach ( $this->entry as $input_id => $field_value ) {
+		foreach ( $this->entry as $input_id => $field_value ) {
 
-		    $field = RGFormsModel::get_field( $this->form, $input_id );
+			$field = RGFormsModel::get_field( $this->form, $input_id );
 
-		    // Reset fields that are hidden
-		    // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
-		    if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
+			// Reset fields that are hidden
+			// Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic
+			if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) {
 
 				$empty_value = $field->get_value_save_entry(
 					is_array( $field->get_entry_inputs() ) ? array() : '',
 					$this->form, '', $this->entry['id'], $this->entry
 				);
 
-			    $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
+				$lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id );
 
-			    GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
+				GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value );
 
-			    // Prevent the $_POST values of hidden fields from being used as default values when rendering the form
+				// Prevent the $_POST values of hidden fields from being used as default values when rendering the form
 				// after submission
-			    $post_input_id = 'input_' . str_replace( '.', '_', $input_id );
-			    $_POST[ $post_input_id ] = '';
-		    }
-	    }
+				$post_input_id = 'input_' . str_replace( '.', '_', $input_id );
+				$_POST[ $post_input_id ] = '';
+			}
+		}
 	}
 
 	/**
@@ -542,7 +542,7 @@ 
 
 		$non_submitted_fields = array();
 
-	    /** @var GF_Field $field */
+		/** @var GF_Field $field */
 		foreach( $form['fields'] as $k => &$field ) {
 
 			/**
@@ -558,7 +558,7 @@ 
 
 			if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
 				foreach( $field->inputs as $key => $input ) {
-				    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
+					$field->inputs[ $key ][ 'id' ] = (string)$input['id'];
 				}
 			}
 
@@ -619,7 +619,7 @@ 
 			foreach ( $this->fields_with_calculation as $field ) {
 				$inputs = $field->get_entry_inputs();
 				if ( is_array( $inputs ) ) {
-				    foreach ( $inputs as $input ) {
+					foreach ( $inputs as $input ) {
 						list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 );
 
 						if ( 'product' === $field->type ) {
@@ -638,7 +638,7 @@ 
 						}
 
 						GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] );
-				    }
+					}
 				} else {
 					// Set to what it previously was if it's not editable
 					if ( ! in_array( $field->id, $allowed_fields ) ) {
@@ -684,7 +684,7 @@ 
 			$value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] );
 
 			$ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
-	        $ary = stripslashes_deep( $ary );
+			$ary = stripslashes_deep( $ary );
 			$img_url = \GV\Utils::get( $ary, 0 );
 
 			$img_title       = count( $ary ) > 1 ? $ary[1] : '';
@@ -757,7 +757,7 @@ 
 	private function maybe_update_post_fields( $form ) {
 
 		if( empty( $this->entry['post_id'] ) ) {
-	        gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
+			gravityview()->log->debug( 'This entry has no post fields. Continuing...' );
 			return;
 		}
 
@@ -792,49 +792,49 @@ 
 
 				switch( $field->type ) {
 
-				    case 'post_title':
-				        $post_title = $value;
-				        if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
-				            $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
-				        }
-				        $updated_post->post_title = $post_title;
-				        $updated_post->post_name  = $post_title;
-				        unset( $post_title );
-				        break;
-
-				    case 'post_content':
-				        $post_content = $value;
-				        if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
-				            $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
-				        }
-				        $updated_post->post_content = $post_content;
-				        unset( $post_content );
-				        break;
-				    case 'post_excerpt':
-				        $updated_post->post_excerpt = $value;
-				        break;
-				    case 'post_tags':
-				        wp_set_post_tags( $post_id, $value, false );
-				        break;
-				    case 'post_category':
-				        break;
-				    case 'post_custom_field':
+					case 'post_title':
+						$post_title = $value;
+						if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) {
+							$post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp );
+						}
+						$updated_post->post_title = $post_title;
+						$updated_post->post_name  = $post_title;
+						unset( $post_title );
+						break;
+
+					case 'post_content':
+						$post_content = $value;
+						if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) {
+							$post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true );
+						}
+						$updated_post->post_content = $post_content;
+						unset( $post_content );
+						break;
+					case 'post_excerpt':
+						$updated_post->post_excerpt = $value;
+						break;
+					case 'post_tags':
+						wp_set_post_tags( $post_id, $value, false );
+						break;
+					case 'post_category':
+						break;
+					case 'post_custom_field':
 						if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) {
 							$value = $value[ $field_id ];
 						}
 
-				        if( ! empty( $field->customFieldTemplateEnabled ) ) {
-				            $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
-				        }
+						if( ! empty( $field->customFieldTemplateEnabled ) ) {
+							$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true );
+						}
 
 						$value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry );
 
-				        update_post_meta( $post_id, $field->postCustomFieldName, $value );
-				        break;
+						update_post_meta( $post_id, $field->postCustomFieldName, $value );
+						break;
 
-				    case 'post_image':
-				        $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
-				        break;
+					case 'post_image':
+						$value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id );
+						break;
 
 				}
 
@@ -991,14 +991,14 @@ 
 			?><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 );
+					echo esc_attr( $edit_entry_title );
 			?></span>
 			</h2>
 
@@ -1061,26 +1061,26 @@ 
 
 				switch ( $edit_redirect ) {
 
-                    case '0':
-	                    $redirect_url = $back_link;
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
-                        break;
-
-                    case '1':
-	                    $redirect_url = $directory_link = GravityView_API::directory_link();
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
-	                    break;
-
-                    case '2':
-	                    $redirect_url = $edit_redirect_url;
-	                    $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
-	                    $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
-                        break;
-
-                    case '':
-                    default:
-					    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
-                        break;
+					case '0':
+						$redirect_url = $back_link;
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' );
+						break;
+
+					case '1':
+						$redirect_url = $directory_link = GravityView_API::directory_link();
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' );
+						break;
+
+					case '2':
+						$redirect_url = $edit_redirect_url;
+						$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' );
+						$entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' );
+						break;
+
+					case '':
+					default:
+						$entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' );
+						break;
 				}
 
 				if ( isset( $redirect_url ) ) {
@@ -1137,7 +1137,7 @@ 
 
 		ob_get_clean();
 
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
+		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, 'verify_user_can_edit_post' ), 5 );
@@ -1191,7 +1191,7 @@ 
 
 		// for now we don't support Save and Continue feature.
 		if( ! self::$supports_save_and_continue ) {
-	        unset( $form['save'] );
+			unset( $form['save'] );
 		}
 
 		$form = $this->unselect_default_values( $form );
@@ -1218,30 +1218,30 @@ 
 			return $field_content;
 		}
 
-        $message = null;
+		$message = null;
 
-        // First, make sure they have the capability to edit the post.
-        if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
+		// First, make sure they have the capability to edit the post.
+		if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
 
-            /**
-             * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
-             * @param string $message The existing "You don't have permission..." text
-             */
-            $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
+			/**
+			 * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
+			 * @param string $message The existing "You don't have permission..." text
+			 */
+			$message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
 
-        } elseif( null === get_post( $this->entry['post_id'] ) ) {
-            /**
-             * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
-             * @param string $message The existing "This field is not editable; the post no longer exists." text
-             */
-            $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
-        }
+		} elseif( null === get_post( $this->entry['post_id'] ) ) {
+			/**
+			 * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
+			 * @param string $message The existing "This field is not editable; the post no longer exists." text
+			 */
+			$message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
+		}
 
-        if( $message ) {
-            $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
-        }
+		if( $message ) {
+			$field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
+		}
 
-        return $field_content;
+		return $field_content;
 	}
 
 	/**
@@ -1269,7 +1269,7 @@ 
 			|| ! empty( $field_content )
 			|| in_array( $field->type, array( 'honeypot' ) )
 		) {
-	        return $field_content;
+			return $field_content;
 		}
 
 		// SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -1277,24 +1277,24 @@ 
 
 		$field_value = $this->get_field_value( $field );
 
-	    // Prevent any PHP warnings, like undefined index
-	    ob_start();
+		// Prevent any PHP warnings, like undefined index
+		ob_start();
 
-	    $return = null;
+		$return = null;
 
 		/** @var GravityView_Field $gv_field */
 		if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
 			$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
 		} else {
-	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
-	    }
+			$return = $field->get_field_input( $this->form, $field_value, $this->entry );
+		}
 
-	    // If there was output, it's an error
-	    $warnings = ob_get_clean();
+		// If there was output, it's an error
+		$warnings = ob_get_clean();
 
-	    if( !empty( $warnings ) ) {
-		    gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
-	    }
+		if( !empty( $warnings ) ) {
+			gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) );
+		}
 
 		return $return;
 	}
@@ -1329,8 +1329,8 @@ 
 				$input_id = strval( $input['id'] );
 
 				if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
-				    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
-				    $allow_pre_populated = false;
+					$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;
 				}
 
 			}
@@ -1354,7 +1354,7 @@ 
 			if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
 				$categories = array();
 				foreach ( explode( ',', $field_value ) as $cat_string ) {
-				    $categories[] = GFCommon::format_post_category( $cat_string, true );
+					$categories[] = GFCommon::format_post_category( $cat_string, true );
 				}
 				$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
 			}
@@ -1364,25 +1364,25 @@ 
 		// 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
-	     * @since 1.20 Added third param
-	     * @param mixed $field_value field value used to populate the input
-	     * @param object $field Gravity Forms field object ( Class GF_Field )
-	     * @param GravityView_Edit_Entry_Render $this Current object
-	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
-
-	    /**
-	     * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
-	     * @since 1.17
-	     * @since 1.20 Added third param
-	     * @param mixed $field_value field value used to populate the input
-	     * @param GF_Field $field Gravity Forms field object
-	     * @param GravityView_Edit_Entry_Render $this Current object
-	     */
-	    $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
+		/**
+		 * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
+		 * @since 1.11
+		 * @since 1.20 Added third param
+		 * @param mixed $field_value field value used to populate the input
+		 * @param object $field Gravity Forms field object ( Class GF_Field )
+		 * @param GravityView_Edit_Entry_Render $this Current object
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this );
+
+		/**
+		 * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type
+		 * @since 1.17
+		 * @since 1.20 Added third param
+		 * @param mixed $field_value field value used to populate the input
+		 * @param GF_Field $field Gravity Forms field object
+		 * @param GravityView_Edit_Entry_Render $this Current object
+		 */
+		$field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this );
 
 		return $field_value;
 	}
@@ -1409,7 +1409,7 @@ 
 			// 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;
+				$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
 			}
 
 			switch( RGFormsModel::get_input_type( $field ) ) {
@@ -1423,61 +1423,61 @@ 
 				 */
 				case 'fileupload':
 
-				    // 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 ( \GV\Utils::get( $field, "multipleFiles" ) ) {
+					if ( \GV\Utils::get( $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] ) ) {
-				            $value = empty( $value ) ? '[]' : $value;
-				            $value = stripslashes_deep( $value );
-				            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
-				        }
+						// 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());
+						}
 
-				    } 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;
 
-				    }
+					}
 
-				    $this->entry[ $input_name ] = $value;
-				    $_POST[ $input_name ] = $value;
+					$this->entry[ $input_name ] = $value;
+					$_POST[ $input_name ] = $value;
 
-				    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;
+					// Fix "undefined index" issue at line 1286 in form_display.php
+					if( !isset( $_POST['input_'.$field->id ] ) ) {
+						$_POST['input_'.$field->id ] = NULL;
+					}
+					break;
 			}
 
 		}
@@ -1562,43 +1562,43 @@ 
 				case 'fileupload' :
 				case 'post_image':
 
-				    // 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( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) {
+					// validate if multi file upload reached max number of files [maxFiles] => 2
+					if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $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 = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
-						               ( is_array( $value ) ? count( $value ) : 0 );
+						// count uploaded files and existent entry files
+						$count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) +
+									   ( is_array( $value ) ? count( $value ) : 0 );
 
-				        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;
 
 			}
 
@@ -1609,47 +1609,47 @@ 
 
 				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;
+					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 ) ) {
 
-				    $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 );
 
-				        gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) );
+						gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $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;
+					unset( $field->validation_message );
+					$field->validation_message = false;
+					continue;
 				}
 
 				$gv_valid = false;
@@ -1713,8 +1713,8 @@ 
 		// 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 );
 
 		/**
 		 * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form
@@ -1774,11 +1774,11 @@ 
 		// 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 ) {
+			/** @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;
+					$edit_fields[] = $this->merge_field_properties( $field, $configured_field );
+					break;
 				}
 
 			}
@@ -1834,28 +1834,28 @@ 
 	 */
 	private 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'] ) ) {
+		 * 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'] ) ) {
 			foreach( $fields as $k => $field ) {
 				if( $field->adminOnly ) {
-				    unset( $fields[ $k ] );
+					unset( $fields[ $k ] );
 				}
 			}
 			return array_values( $fields );
 		}
 
-	    foreach( $fields as &$field ) {
-		    $field->adminOnly = false;
+		foreach( $fields as &$field ) {
+			$field->adminOnly = false;
 		}
 
 		return $fields;
@@ -1875,13 +1875,13 @@ 
 	 */
 	private function unselect_default_values( $form ) {
 
-	    foreach ( $form['fields'] as &$field ) {
+		foreach ( $form['fields'] as &$field ) {
 
 			if ( empty( $field->choices ) ) {
-                continue;
+				continue;
 			}
 
-            foreach ( $field->choices as &$choice ) {
+			foreach ( $field->choices as &$choice ) {
 				if ( \GV\Utils::get( $choice, 'isSelected' ) ) {
 					$choice['isSelected'] = false;
 				}
@@ -1918,36 +1918,36 @@ 
 
 			if( 'checkbox' === $field->type ) {
 				foreach ( $field->get_entry_inputs() as $key => $input ) {
-				    $input_id = $input['id'];
-				    $choice = $field->choices[ $key ];
-				    $value = \GV\Utils::get( $this->entry, $input_id );
-				    $match = RGFormsModel::choice_value_match( $field, $choice, $value );
-				    if( $match ) {
-				        $field->choices[ $key ]['isSelected'] = true;
-				    }
+					$input_id = $input['id'];
+					$choice = $field->choices[ $key ];
+					$value = \GV\Utils::get( $this->entry, $input_id );
+					$match = RGFormsModel::choice_value_match( $field, $choice, $value );
+					if( $match ) {
+						$field->choices[ $key ]['isSelected'] = true;
+					}
 				}
 			} else {
 
 				// We need to run through each field to set the default values
 				foreach ( $this->entry as $field_id => $field_value ) {
 
-				    if( floatval( $field_id ) === floatval( $field->id ) ) {
+					if( floatval( $field_id ) === floatval( $field->id ) ) {
 
-				        if( 'list' === $field->type ) {
-				            $list_rows = maybe_unserialize( $field_value );
+						if( 'list' === $field->type ) {
+							$list_rows = maybe_unserialize( $field_value );
 
-				            $list_field_value = array();
-				            foreach ( (array) $list_rows as $row ) {
-				                foreach ( (array) $row as $column ) {
-				                    $list_field_value[] = $column;
-				                }
-				            }
+							$list_field_value = array();
+							foreach ( (array) $list_rows as $row ) {
+								foreach ( (array) $row as $column ) {
+									$list_field_value[] = $column;
+								}
+							}
 
-				            $field->defaultValue = serialize( $list_field_value );
-				        } else {
-				            $field->defaultValue = $field_value;
-				        }
-				    }
+							$field->defaultValue = serialize( $list_field_value );
+						} else {
+							$field->defaultValue = $field_value;
+						}
+					}
 				}
 			}
 		}
@@ -2004,7 +2004,7 @@ 
 			return $has_conditional_logic;
 		}
 
-	    /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
+		/** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */
 		return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
 	}
 
@@ -2071,14 +2071,14 @@ 
 
 		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;" ) );
-	        }
+			/**
+			 * @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');
 		}

future/includes/class-gv-template-view-table.php

Indentation +88 added lines, -88 removed lines

@@ -19,8 +19,8 @@ 
 
 
 	/**
-     * Constructor. Add filters to modify output.
-     *
+	 * Constructor. Add filters to modify output.
+	 *
 	 * @since 2.0.4
 	 *
 	 * @param View $view
@@ -29,19 +29,19 @@ 
 	 */
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
 
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
 
 		parent::__construct( $view, $entries, $request );
 	}
 
 	/**
-     * Add sorting links to HTML columns that support sorting
-     *
-     * @since 2.0.4
-     * @since 2.0.5 Made static
-     *
-     * @static
-     *
+	 * Add sorting links to HTML columns that support sorting
+	 *
+	 * @since 2.0.4
+	 * @since 2.0.5 Made static
+	 *
+	 * @static
+	 *
 	 * @param string $column_label Label for the table column
 	 * @param \GV\Template_Context $context
 	 *
@@ -52,7 +52,7 @@ 
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
 
 		if ( empty( $sort_columns ) ) {
-            return $column_label;
+			return $column_label;
 		}
 
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -102,22 +102,22 @@ 
 		// If we are already sorting by the current field...
 		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
 
-		    switch( $sorting['direction'] ) {
-		        // No sort
-                case '':
-	                $sort_args[1] = 'asc';
-	                $class .= ' gv-icon-caret-up-down';
-                    break;
-                case 'desc':
-	                $sort_args[1] = '';
-	                $class .= ' gv-icon-sort-asc';
-	                break;
-                case 'asc':
-                default:
-                    $sort_args[1] = 'desc';
-                    $class .= ' gv-icon-sort-desc';
-                    break;
-            }
+			switch( $sorting['direction'] ) {
+				// No sort
+				case '':
+					$sort_args[1] = 'asc';
+					$class .= ' gv-icon-caret-up-down';
+					break;
+				case 'desc':
+					$sort_args[1] = '';
+					$class .= ' gv-icon-sort-asc';
+					break;
+				case 'asc':
+				default:
+					$sort_args[1] = 'desc';
+					$class .= ' gv-icon-sort-desc';
+					break;
+			}
 
 		} else {
 			$class .= ' gv-icon-caret-up-down';
@@ -127,56 +127,56 @@ 
 		$url = remove_query_arg( 'sort', $url );
 		$multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID );
 
-    	$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
+		$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
 
 		return '<a href="'. esc_url_raw( $url ) .'" data-multisort-href="'. esc_url_raw( $multisort_url ) . '" class="'. $class .'" ></a>&nbsp;'. $column_label;
 	}
 
 	/**
-     * Get the multi-sort URL used in the sorting links
-     *
-     * @todo Consider moving to Utils?
-     *
-     * @since 2.3
-     *
-     * @see add_columns_sort_links
+	 * Get the multi-sort URL used in the sorting links
+	 *
+	 * @todo Consider moving to Utils?
+	 *
+	 * @since 2.3
+	 *
+	 * @see add_columns_sort_links
 	 * @param string $url Single-sort URL
 	 * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format
-     * @param string|int $field_id ID of the current field being displayed
-     *
-     * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
+	 * @param string|int $field_id ID of the current field being displayed
+	 *
+	 * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
 	 */
 	static public function _get_multisort_url( $url, $sort_args, $field_id ) {
 
 		$sorts = Utils::_GET( 'sort' );
 
 		if ( ! is_array( $sorts ) ) {
-            return $url;
+			return $url;
 		}
 
-        $multisort_url = $url;
+		$multisort_url = $url;
 
 		// If the field has already been sorted by, add the field to the URL
-        if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
-            if ( count( $keys ) ) {
-                $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
-            } else {
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
-            }
-        }
-        // Otherwise, we are just updating the sort order
-        else {
-
-            // Pass empty value to unset
-            if( '' === $sort_args[1] ) {
-	            unset( $sorts[ $field_id ] );
-            } else {
-	            $sorts[ $field_id ] = $sort_args[1];
-            }
-
-            $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
-        }
+		if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
+			if ( count( $keys ) ) {
+				$multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
+				$multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
+			} else {
+				$multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
+			}
+		}
+		// Otherwise, we are just updating the sort order
+		else {
+
+			// Pass empty value to unset
+			if( '' === $sort_args[1] ) {
+				unset( $sorts[ $field_id ] );
+			} else {
+				$sorts[ $field_id ] = $sort_args[1];
+			}
+
+			$multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
+		}
 
 		return $multisort_url;
 	}
@@ -206,10 +206,10 @@ 
 	}
 
 	/**
-     * Returns the label for a column, with support for all deprecated filters
-     *
-     * @since 2.1
-     *
+	 * Returns the label for a column, with support for all deprecated filters
+	 *
+	 * @since 2.1
+	 *
 	 * @param \GV\Field $field
 	 * @param \GV\Template_Context $context
 	 */
@@ -232,7 +232,7 @@ 
 		$column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context );
 
 		return $column_label;
-    }
+	}
 
 	/**
 	 * Output the entry row.
@@ -301,15 +301,15 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/before', $context );
 
-                /**
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param \GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/before`
-                 */
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
 
-                foreach ( $fields->all() as $field ) {
+				foreach ( $fields->all() as $field ) {
 					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
 						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
 							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
@@ -329,13 +329,13 @@ 
 				 */
 				do_action( 'gravityview/template/table/cells/after', $context );
 
-                /**
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
-                 * @since 1.0.7
+				/**
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
+				 * @since 1.0.7
 				 * @param \GravityView_View $this Current GravityView_View object
 				 * @deprecated Use `gravityview/template/table/cells/after`
-                 */
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
+				 */
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
 
 				?>
 			</tr>
@@ -376,9 +376,9 @@ 
 			'value' => $value,
 			'hide_empty' => false,
 			'zone_id' => 'directory_table-columns',
-            'label' => self::get_field_column_label( $field, $context ),
+			'label' => self::get_field_column_label( $field, $context ),
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>',
-            'form' => $form,
+			'form' => $form,
 		);
 
 		/** Output. */
@@ -403,11 +403,11 @@ 
 		do_action( 'gravityview/template/table/body/before', $context );
 
 		/**
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/before`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/before`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
 	}
 
@@ -429,11 +429,11 @@ 
 		do_action( 'gravityview/template/table/body/after', $context );
 
 		/**
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
-		* @deprecated Use `gravityview/template/table/body/after`
-		* @since 1.0.7
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
-		*/
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
+		 * @deprecated Use `gravityview/template/table/body/after`
+		 * @since 1.0.7
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
+		 */
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
 	}