gravityview / GravityView

includes/class-gvlogic-shortcode.php

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

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-post-types.php

Spacing +37 added lines, -37 removed lines

@@ -17,10 +17,10 @@ 
 
 		// Load custom post types. It's a static method.
 		// Load even when invalid to allow for export
-		add_action( 'init', array( 'GravityView_Post_Types', 'init_post_types' ) );
+		add_action('init', array('GravityView_Post_Types', 'init_post_types'));
 
-		if( GravityView_Compatibility::is_valid() ) {
-			add_action( 'init', array( 'GravityView_Post_Types', 'init_rewrite' ) );
+		if (GravityView_Compatibility::is_valid()) {
+			add_action('init', array('GravityView_Post_Types', 'init_rewrite'));
 		}
 	}
 
@@ -39,11 +39,11 @@ 
 		 * @since 1.13
 		 * @param boolean $is_hierarchical Default: false
 		 */
-		$is_hierarchical = (bool)apply_filters( 'gravityview_is_hierarchical', false );
+		$is_hierarchical = (bool)apply_filters('gravityview_is_hierarchical', false);
 
-		$supports = array( 'title', 'revisions' );
+		$supports = array('title', 'revisions');
 
-		if( $is_hierarchical ) {
+		if ($is_hierarchical) {
 			$supports[] = 'page-attributes';
 		}
 
@@ -54,30 +54,30 @@ 
 		 * @param array $supports Array of features associated with a functional area of the edit screen. Default: 'title', 'revisions'. If $is_hierarchical, also 'page-attributes'
 		 * @param[in] boolean $is_hierarchical Do Views support parent/child relationships? See `gravityview_is_hierarchical` filter.
 		 */
-		$supports = apply_filters( 'gravityview_post_type_support', $supports, $is_hierarchical );
+		$supports = apply_filters('gravityview_post_type_support', $supports, $is_hierarchical);
 
 		//Register Custom Post Type - gravityview
 		$labels = array(
-			'name'                => _x( 'Views', 'Post Type General Name', 'gravityview' ),
-			'singular_name'       => _x( 'View', 'Post Type Singular Name', 'gravityview' ),
-			'menu_name'           => _x( 'Views', 'Menu name', 'gravityview' ),
-			'parent_item_colon'   => __( 'Parent View:', 'gravityview' ),
-			'all_items'           => __( 'All Views', 'gravityview' ),
-			'view_item'           => _x( 'View', 'View Item', 'gravityview' ),
-			'add_new_item'        => __( 'Add New View', 'gravityview' ),
-			'add_new'             => __( 'New View', 'gravityview' ),
-			'edit_item'           => __( 'Edit View', 'gravityview' ),
-			'update_item'         => __( 'Update View', 'gravityview' ),
-			'search_items'        => __( 'Search Views', 'gravityview' ),
+			'name'                => _x('Views', 'Post Type General Name', 'gravityview'),
+			'singular_name'       => _x('View', 'Post Type Singular Name', 'gravityview'),
+			'menu_name'           => _x('Views', 'Menu name', 'gravityview'),
+			'parent_item_colon'   => __('Parent View:', 'gravityview'),
+			'all_items'           => __('All Views', 'gravityview'),
+			'view_item'           => _x('View', 'View Item', 'gravityview'),
+			'add_new_item'        => __('Add New View', 'gravityview'),
+			'add_new'             => __('New View', 'gravityview'),
+			'edit_item'           => __('Edit View', 'gravityview'),
+			'update_item'         => __('Update View', 'gravityview'),
+			'search_items'        => __('Search Views', 'gravityview'),
 			'not_found'           => self::no_views_text(),
-			'not_found_in_trash'  => __( 'No Views found in Trash', 'gravityview' ),
-			'filter_items_list'     => __( 'Filter Views list', 'gravityview' ),
-			'items_list_navigation' => __( 'Views list navigation', 'gravityview' ),
-			'items_list'            => __( 'Views list', 'gravityview' ),
+			'not_found_in_trash'  => __('No Views found in Trash', 'gravityview'),
+			'filter_items_list'     => __('Filter Views list', 'gravityview'),
+			'items_list_navigation' => __('Views list navigation', 'gravityview'),
+			'items_list'            => __('Views list', 'gravityview'),
 		);
 		$args = array(
-			'label'               => __( 'view', 'gravityview' ),
-			'description'         => __( 'Create views based on a Gravity Forms form', 'gravityview' ),
+			'label'               => __('view', 'gravityview'),
+			'description'         => __('Create views based on a Gravity Forms form', 'gravityview'),
 			'labels'              => $labels,
 			'supports'            => $supports,
 			'hierarchical'        => $is_hierarchical,
@@ -88,7 +88,7 @@ 
 			 * @param[in,out] boolean `true`: allow Views to be accessible directly. `false`: Only allow Views to be embedded via shortcode. Default: `true`
 			 * @param int $view_id The ID of the View currently being requested. `0` for general setting
 			 */
-			'public'              => apply_filters( 'gravityview_direct_access', GravityView_Compatibility::is_valid(), 0 ),
+			'public'              => apply_filters('gravityview_direct_access', GravityView_Compatibility::is_valid(), 0),
 			'show_ui'             => GravityView_Compatibility::is_valid(),
 			'show_in_menu'        => GravityView_Compatibility::is_valid(),
 			'show_in_nav_menus'   => true,
@@ -101,7 +101,7 @@ 
 			 * @since 1.7.3
 			 * @param boolean False: don't have frontend archive; True: yes, have archive. Default: false
 			 */
-			'has_archive'         => apply_filters( 'gravityview_has_archive', false ),
+			'has_archive'         => apply_filters('gravityview_has_archive', false),
 			'exclude_from_search' => true,
 			'rewrite'             => array(
 				/**
@@ -109,13 +109,13 @@ 
 				 * @see http://docs.gravityview.co/article/62-changing-the-view-slug
 				 * @param string $slug The slug shown in the URL
 				 */
-				'slug' => apply_filters( 'gravityview_slug', 'view' )
+				'slug' => apply_filters('gravityview_slug', 'view')
 			),
 			'capability_type'     => 'gravityview',
 			'map_meta_cap'        => true,
 		);
 
-		register_post_type( 'gravityview', $args );
+		register_post_type('gravityview', $args);
 
 	}
 
@@ -131,7 +131,7 @@ 
 		$endpoint = self::get_entry_var_name();
 
 		//add_permastruct( "{$endpoint}", $endpoint.'/%'.$endpoint.'%/?', true);
-		add_rewrite_endpoint( "{$endpoint}", EP_ALL );
+		add_rewrite_endpoint("{$endpoint}", EP_ALL);
 	}
 
 	/**
@@ -147,9 +147,9 @@ 
 		 * @filter `gravityview_directory_endpoint` Change the slug used for single entries
 		 * @param[in,out] string $endpoint Slug to use when accessing single entry. Default: `entry`
 		 */
-		$endpoint = apply_filters( 'gravityview_directory_endpoint', 'entry' );
+		$endpoint = apply_filters('gravityview_directory_endpoint', 'entry');
 
-		return sanitize_title( $endpoint );
+		return sanitize_title($endpoint);
 	}
 
 	/**
@@ -159,20 +159,20 @@ 
 	 */
 	static function no_views_text() {
 
-		if( !class_exists( 'GravityView_Admin' ) ) {
-			require_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		if (!class_exists('GravityView_Admin')) {
+			require_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
 		}
 
 		// Floaty the astronaut
 		$image = GravityView_Admin::get_floaty();
 
-		if( GVCommon::has_cap( 'edit_gravityviews' ) ) {
-			$output = sprintf( esc_attr__( "%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview' ), '<h3>', '<a href="' . admin_url( 'post-new.php?post_type=gravityview' ) . '">', '</a>', '</h3>', '<a href="' . admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) . '">', '</a>' );
+		if (GVCommon::has_cap('edit_gravityviews')) {
+			$output = sprintf(esc_attr__("%sYou don't have any active views. Let&rsquo;s go %screate one%s!%s\n\nIf you feel like you're lost in space and need help getting started, check out the %sGetting Started%s page.", 'gravityview'), '<h3>', '<a href="'.admin_url('post-new.php?post_type=gravityview').'">', '</a>', '</h3>', '<a href="'.admin_url('edit.php?post_type=gravityview&page=gv-getting-started').'">', '</a>');
 		} else {
-			$output = esc_attr__( 'There are no active Views', 'gravityview' );
+			$output = esc_attr__('There are no active Views', 'gravityview');
 		}
 
-		return $image . wpautop( $output );
+		return $image.wpautop($output);
 	}
 
 

includes/connector-functions.php

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/default-widgets.php

Spacing +1 added lines, -1 removed lines

@@ -5,4 +5,4 @@
  * @deprecated 1.7.5
  */
 
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+include_once(GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php');

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

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/delete-entry/fields/delete_link.php

Spacing +6 added lines, -6 removed lines

@@ -4,21 +4,21 @@
 
 $view_id = $gravityview_view->getViewId();
 
-extract( $gravityview_view->getCurrentField() );
+extract($gravityview_view->getCurrentField());
 
 // Only show the link to logged-in users with the rigth caps.
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
+if (!GravityView_Delete_Entry::check_user_cap_delete_entry($entry, $field_settings)) {
 	return;
 }
 
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
+$link_text = empty($field_settings['delete_link']) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
 
-$link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
+$link_text = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
 
-$href = GravityView_Delete_Entry::get_delete_link( $entry, $view_id );
+$href = GravityView_Delete_Entry::get_delete_link($entry, $view_id);
 
 $attributes = array(
 	'onclick' => GravityView_Delete_Entry::get_confirm_dialog()
 );
 
-echo gravityview_get_link( $href, $link_text, $attributes );
+echo gravityview_get_link($href, $link_text, $attributes);

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

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

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;
     }