gravityview / GravityView

includes/extensions/delete-entry/fields/delete_link.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 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 ) );
 

includes/class-gravityview-migrate.php

Spacing +41 added lines, -41 removed lines

@@ -51,11 +51,11 @@ 
 		$redux_settings = $this->get_redux_settings();
 
 		// No need to process
-		if( false === $redux_settings ) {
+		if ( false === $redux_settings ) {
 			return;
 		}
 
-		if( empty(  $redux_settings['license_key_status'] ) ) {
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
 		}
 
@@ -69,8 +69,8 @@ 
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
 
 		// And now remove the previous option, so this is a one-time thing.
-		delete_option('gravityview_settings');
-		delete_option('gravityview_settings-transients');
+		delete_option( 'gravityview_settings' );
+		delete_option( 'gravityview_settings-transients' );
 	}
 
 	/**
@@ -86,16 +86,16 @@ 
 
 		$data = array(
 			'edd_action' => 'check_license',
-			'license' => rgget('license_key', $redux_settings ),
+			'license' => rgget( 'license_key', $redux_settings ),
 			'update' => false,
 			'format' => 'object',
 		);
 
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
 
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
-			$redux_settings['license_key_status'] = $license_call->license;
-			$redux_settings['license_key_response'] = json_encode( $license_call );
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
 		}
 
 		return $redux_settings;
@@ -109,10 +109,10 @@ 
 	function get_redux_settings() {
 
 		// Previous settings set by Redux
-		$redux_option = get_option('gravityview_settings');
+		$redux_option = get_option( 'gravityview_settings' );
 
 		// No Redux settings? Don't proceed.
-		if( false === $redux_option ) {
+		if ( false === $redux_option ) {
 			return false;
 		}
 
@@ -122,21 +122,21 @@ 
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
 		);
 
-		if( $license_array = rgget( 'license', $redux_option ) ) {
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
 
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
 
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
 
 			// This contains the last response for license validation
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
 
-				$saved_license = rgget('license', $saved_values );
+				$saved_license = rgget( 'license', $saved_values );
 
 				// Only use the last-saved values if they are for the same license
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
 				}
 			}
 		}
@@ -148,8 +148,8 @@ 
 	/** ----  Migrate from old search widget to new search widget  ---- */
 	function update_search_on_views() {
 
-		if( !class_exists('GravityView_Widget_Search') ) {
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
 		}
 
 		// Loop through all the views
@@ -161,20 +161,20 @@ 
 
 		$views = get_posts( $query_args );
 
-		foreach( $views as $view ) {
+		foreach ( $views as $view ) {
 
 			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
 			$search_fields = null;
 
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
 
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
 
-			foreach( $widgets as $area => $ws ) {
-				foreach( $ws as $k => $widget ) {
-					if( $widget['id'] !== 'search_bar' ) { continue; }
+			foreach ( $widgets as $area => $ws ) {
+				foreach ( $ws as $k => $widget ) {
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
 
-					if( is_null( $search_fields ) ) {
+					if ( is_null( $search_fields ) ) {
 						$search_fields = $this->get_search_fields( $view->ID );
 					}
 
@@ -182,24 +182,24 @@ 
 					//  [search_free] => 1
 			        //  [search_date] => 1
 			        $search_generic = array();
-					if( !empty( $widget['search_free'] ) ) {
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
 					}
-					if( !empty( $widget['search_date'] ) ) {
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
 					}
 
 					$search_config = array_merge( $search_generic, $search_fields );
 
 					// don't throw '[]' when json_encode an empty array
-					if( empty( $search_config ) ) {
+					if ( empty( $search_config ) ) {
 						$search_config = '';
 					} else {
 						$search_config = json_encode( $search_config );
 					}
 
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
 
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
 				}
@@ -227,26 +227,26 @@ 
 		// check view fields' settings
 		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
 
-		if( !empty( $fields ) && is_array( $fields ) ) {
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
 
-			foreach( $fields as $t => $fs ) {
+			foreach ( $fields as $t => $fs ) {
 
-				foreach( $fs as $k => $field ) {
+				foreach ( $fs as $k => $field ) {
 					// is field a search_filter ?
-					if( empty( $field['search_filter'] ) ) { continue; }
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
 
 					// get field type & calculate the input type (by default)
-					$form_field = gravityview_get_field( $form, $field['id'] );
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
 
-					if( empty( $form_field['type'] ) ) {
+					if ( empty( $form_field[ 'type' ] ) ) {
 						continue;
 					}
 
 					// depending on the field type assign a group of possible search field types
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
 
 					// add field to config
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
 
 				}
 			}

includes/class-oembed.php

Spacing +29 added lines, -29 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if ( empty( self::$instance ) ) {
 			self::$instance = new self;
 
 			self::$instance->initialize();
@@ -94,7 +94,7 @@ 
 		// Catch either
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
 
-		return '#'.$match_regex.'#i';
+		return '#' . $match_regex . '#i';
 	}
 
 	/**
@@ -113,18 +113,18 @@ 
 
 		$post_id = url_to_postid( $url );
 
-		if( empty( $post_id ) ) {
+		if ( empty( $post_id ) ) {
 
 			$args = array(
 				'post_status' => 'publish',
 				'name' => $slug,
-				'post_type' => array('any', 'gravityview'),
+				'post_type' => array( 'any', 'gravityview' ),
 			);
 
 			$posts = get_posts( $args );
 
-			if( !empty( $posts ) ) {
-				$post_id = $posts[0]->ID;
+			if ( ! empty( $posts ) ) {
+				$post_id = $posts[ 0 ]->ID;
 			}
 		}
 
@@ -157,17 +157,17 @@ 
 	public function render_handler( $matches, $attr, $url, $rawattr ) {
 
 		// If not using permalinks, re-assign values for matching groups
-		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'] );
+		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' ] );
 		}
 
 		// 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 '';
 		}
@@ -177,11 +177,11 @@ 
 		// Setup the data used
 		$this->set_vars( $matches, $attr, $url, $rawattr );
 
-		if( is_admin() && !$this->is_full_oembed_preview ) {
+		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();
 			}
 
@@ -200,8 +200,8 @@ 
 	private function generate_preview_notice() {
 		$floaty = GravityView_Admin::get_floaty();
 		$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>';
+		$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>';
 	}
 
 	/**
@@ -214,14 +214,14 @@ 
 	 */
 	private function set_vars( $matches, $attr, $url, $rawattr ) {
 
-		$this->entry_id = $matches['entry_slug'];
+		$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 );
 
@@ -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' ] ) );
 	}
 
 	/**
@@ -250,15 +250,15 @@ 
 		// 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;">
-			<h3 style="margin:0; padding:0; font-family: \'Open Sans\', sans-serif;">'.$image.$embed_heading.'</h3>
+			<h3 style="margin:0; padding:0; font-family: \'Open Sans\', sans-serif;">'.$image . $embed_heading . '</h3>
 			<p style="margin:0; padding:0; font-family: \'Open Sans\', sans-serif;">
-				'.$embed_text.'
+				'.$embed_text . '
 			</p>
 			<br style="clear: both;">
 		</div>';
@@ -313,14 +313,14 @@ 
 	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 ] ) ) {
+		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,7 +333,7 @@ 
 		 *  @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 );
 

includes/class-admin.php

Spacing +74 added lines, -74 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if ( ! is_admin() ) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if ( false === GravityView_Compatibility::is_valid() ) {
 			return;
 		}
 
@@ -25,7 +25,7 @@ 
 		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
+		if ( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && ! GFForms::is_gravity_page() ) {
 			require_once( GFCommon::get_base_path() . '/tooltips.php' );
 		}
 
@@ -50,18 +50,18 @@ 
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
 
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
 
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9 );
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000 );
+		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11 );
+		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1 );
+		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1 );
 
 	}
 
@@ -74,20 +74,20 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-label.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
 		 *
 		 * Nice place to insert extensions' backend stuff
 		 */
-		do_action('gravityview_include_backend_actions');
+		do_action( 'gravityview_include_backend_actions' );
 	}
 
 	/**
@@ -103,12 +103,12 @@ 
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
+			$actions[ ] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
 		}
 
 		return array_merge( $actions, $links );
@@ -131,12 +131,12 @@ 
 	function post_updated_messages( $messages, $bulk_counts = NULL ) {
 		global $post;
 
-		$post_id = isset($_GET['post']) ? intval($_GET['post']) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
+		$post_id = isset( $_GET[ 'post' ] ) ? intval( $_GET[ 'post' ] ) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
 
 
 		// If we're starting fresh, a new form was created.
@@ -145,53 +145,53 @@ 
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if ( ! empty( $start_fresh ) ) {
 
 			// Get the form that was created
 			$connected_form = gravityview_get_form_id( $post_id );
 
-			if( !empty( $connected_form ) ) {
+			if ( ! empty( $connected_form ) ) {
 				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+				$form_name = esc_attr( $form[ 'title' ] );
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
 				$new_form_text = wpautop( $new_form_text );
 
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
 			}
 		}
 
-		$messages['gravityview'] = array(
+		$messages[ 'gravityview' ] = array(
 			0  => '', // Unused. Messages start at index 1.
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			3  => __( 'View deleted.', 'gravityview' ),
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
 			8  => __( 'View submitted.', 'gravityview' ),
 			9  => sprintf(
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
 			) . $new_form_text,
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
 		);
 
 		return $messages;
@@ -204,13 +204,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -260,24 +260,24 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if ( ! gravityview_is_admin_page() ) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
-			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
+		if ( ! empty( $wp_styles->registered ) ) {
+			foreach ( $wp_styles->registered as $key => $style ) {
+				if ( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
 					wp_dequeue_style( $key );
 				}
 			}
 		}
 
-		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
+		$no_conflict_mode = GravityView_Settings::getSetting( 'no-conflict-mode' );
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if ( empty( $no_conflict_mode ) ) {
 			return;
 		}
 
@@ -304,7 +304,7 @@ 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
 		 */
-		do_action('gravityview_remove_conflicts_after');
+		do_action( 'gravityview_remove_conflicts_after' );
 	}
 
 	/**
@@ -326,9 +326,9 @@ 
 
         //reset queue
         $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
-                $queue[] = $object;
+        foreach ( $wp_objects->queue as $object ) {
+	        if ( in_array( $object, $required_objects ) || preg_match( '/gravityview|gf_|gravityforms/ism', $object ) ) {
+                $queue[ ] = $object;
             }
         }
         $wp_objects->queue = $queue;
@@ -337,8 +337,8 @@ 
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
+        foreach ( $wp_objects->registered as $handle => $script_registration ) {
+            if ( in_array( $handle, $required_objects ) ) {
                 $registered[ $handle ] = $script_registration;
             }
         }
@@ -351,7 +351,7 @@ 
 	 * @param [type] $registered [description]
 	 * @param [type] $scripts    [description]
 	 */
-	private function add_script_dependencies($registered, $scripts) {
+	private function add_script_dependencies( $registered, $scripts ) {
 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
@@ -360,7 +360,7 @@ 
 				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
 				foreach ( $deps as $dep ) {
 					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
-						$dependents[] = $dep;
+						$dependents[ ] = $dep;
 					}
 				}
 			}
@@ -424,29 +424,29 @@ 
 	static function is_admin_page( $hook = '', $page = NULL ) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if ( ! is_admin() ) { return false; }
 
 		$is_page = false;
 
-		$is_gv_screen = (!empty($current_screen) && isset($current_screen->post_type) && $current_screen->post_type === 'gravityview');
+		$is_gv_screen = ( ! empty( $current_screen ) && isset( $current_screen->post_type ) && $current_screen->post_type === 'gravityview' );
 
-		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
+		$is_gv_post_type_get = ( isset( $_GET[ 'post_type' ] ) && $_GET[ 'post_type' ] === 'gravityview' );
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
-			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
+		if ( empty( $post ) && $pagenow === 'post.php' && ! empty( $_GET[ 'post' ] ) ) {
+			$gv_post = get_post( intval( $_GET[ 'post' ] ) );
+			$is_gv_post_type = ( ! empty( $gv_post ) && ! empty( $gv_post->post_type ) && $gv_post->post_type === 'gravityview' );
 		} else {
-			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
+			$is_gv_post_type = ( ! empty( $post ) && ! empty( $post->post_type ) && $post->post_type === 'gravityview' );
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( ! empty( $_GET[ 'page' ] ) && $_GET[ 'page' ] === 'gravityview_settings' ) ) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -461,7 +461,7 @@ 
 		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if ( ! empty( $page ) ) {
 			return $is_page === $page;
 		}
 
@@ -482,6 +482,6 @@ 
  *
  * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
  */
-function gravityview_is_admin_page($hook = '', $page = NULL) {
+function gravityview_is_admin_page( $hook = '', $page = NULL ) {
 	return GravityView_Admin::is_admin_page( $hook, $page );
 }

includes/class-gravityview-admin-duplicate-view.php

Spacing +18 added lines, -18 removed lines

@@ -15,12 +15,12 @@ 
 	function __construct() {
 
 		// Only run on Admin
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
 		// If the Duplicate Post plugin is active, don't run.
-		if( defined('DUPLICATE_POST_CURRENT_VERSION') ) {
+		if ( defined( 'DUPLICATE_POST_CURRENT_VERSION' ) ) {
 			return;
 		}
 
@@ -60,10 +60,10 @@ 
 		global $post;
 
 		// We only want to add Clone links to the Edit View metabox
-		if( !$this->is_all_views_page() ) {
+		if ( ! $this->is_all_views_page() ) {
 
-			if( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
-				$links[] = '<span>' . $duplicate_links['edit_as_new_draft'] . '</span>';
+			if ( $duplicate_links = $this->make_duplicate_link_row( array(), $post ) ) {
+				$links[ ] = '<span>' . $duplicate_links[ 'edit_as_new_draft' ] . '</span>';
 			}
 
 		}
@@ -119,7 +119,7 @@ 
 		 * @param string|null If string, the status to set for the new View. If empty, use existing View status.
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view_status = apply_filters('gravityview/duplicate-view/status', $status, $post );
+		$new_view_status = apply_filters( 'gravityview/duplicate-view/status', $status, $post );
 
 		$new_view = array(
 			'menu_order'     => $post->menu_order,
@@ -142,11 +142,11 @@ 
 		 * @param boolean $copy_date Whether the copy the date from the existing View. Default: `false`
 		 * @param WP_Post $post View being cloned
 		 */
-		$copy_date = apply_filters('gravityview/duplicate-view/copy-date', false, $post );
+		$copy_date = apply_filters( 'gravityview/duplicate-view/copy-date', false, $post );
 
 		if ( $copy_date ) {
-			$new_view['post_date']     = $new_post_date = $post->post_date;
-			$new_view['post_date_gmt'] = get_gmt_from_date( $new_post_date );
+			$new_view[ 'post_date' ]     = $new_post_date = $post->post_date;
+			$new_view[ 'post_date_gmt' ] = get_gmt_from_date( $new_post_date );
 		}
 
 		/**
@@ -155,7 +155,7 @@ 
 		 * @param array $new_view Array of settings to be passed to wp_insert_post()
 		 * @param WP_Post $post View being cloned
 		 */
-		$new_view = apply_filters('gravityview/duplicate-view/new-view', $new_view, $post );
+		$new_view = apply_filters( 'gravityview/duplicate-view/new-view', $new_view, $post );
 
 		// Magic happens here.
 		$new_view_id = wp_insert_post( $new_view );
@@ -237,13 +237,13 @@ 
 			$clone_text = __( 'Clone', 'gravityview' );
 			$clone_title = __( 'Clone this View', 'gravityview' );
 
-			$actions['clone'] = gravityview_get_link( $clone_link, $clone_text, 'title='.$clone_title );
+			$actions[ 'clone' ] = gravityview_get_link( $clone_link, $clone_text, 'title=' . $clone_title );
 
 			$clone_draft_link = $this->get_clone_view_link( $post->ID );
 			$clone_draft_text = $this->is_all_views_page() ? __( 'New Draft', 'gravityview' ) : __( 'Clone View', 'gravityview' );
 			$clone_draft_title = __( 'Copy as a new draft View', 'gravityview' );
 
-			$actions['edit_as_new_draft'] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title='.$clone_draft_title );
+			$actions[ 'edit_as_new_draft' ] = gravityview_get_link( $clone_draft_link, esc_html( $clone_draft_text ), 'title=' . $clone_draft_title );
 		}
 
 		return $actions;
@@ -267,7 +267,7 @@ 
 		}
 
 		// Verify the View exists
-		if ( !$view = get_post( $id ) ) {
+		if ( ! $view = get_post( $id ) ) {
 			return '';
 		}
 
@@ -282,7 +282,7 @@ 
 		$post_type_object = get_post_type_object( $view->post_type );
 
 		/** If there's no gravityview post type for some reason, abort! */
-		if ( !$post_type_object ) {
+		if ( ! $post_type_object ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' No gravityview post type exists when trying to clone the View.', $view );
 			return '';
 		}
@@ -294,7 +294,7 @@ 
 		 * @param int $view_id View ID
 		 * @param string $context How to display the link. If "display", the URL is run through esc_html(). Default: `display`
 		 */
-		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php". $action ), $view->ID, $context );
+		$clone_view_link = apply_filters( 'gravityview/duplicate-view/get_clone_view_link', admin_url( "admin.php" . $action ), $view->ID, $context );
 
 		return $clone_view_link;
 	}
@@ -321,14 +321,14 @@ 
 	 */
 	public function save_as_new_view( $status = '' ) {
 
-		if ( ! ( isset( $_GET['post'] ) || isset( $_POST['post'] ) ) ) {
+		if ( ! ( isset( $_GET[ 'post' ] ) || isset( $_POST[ 'post' ] ) ) ) {
 			wp_die( __( 'No post to duplicate has been supplied!', 'gravityview' ) );
 		}
 
 		// Get the original post
-		$id   = ( isset( $_GET['post'] ) ? $_GET['post'] : $_POST['post'] );
+		$id = ( isset( $_GET[ 'post' ] ) ? $_GET[ 'post' ] : $_POST[ 'post' ] );
 
-		if( ! $this->current_user_can_copy( $id ) ) {
+		if ( ! $this->current_user_can_copy( $id ) ) {
 			wp_die( __( 'You don\'t have permission to copy this View.', 'gravityview' ) );
 		}
 

includes/class-gravityview-merge-tags.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
 	 * @param  bool       $esc_html     Pass return value through `esc_html()`
 	 * @return string                  Text with variables maybe replaced
 	 */
-	public static function replace_variables($text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) {
+	public static function replace_variables( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = true ) {
 
 		/**
 		 * @filter `gravityview_do_replace_variables` Turn off merge tag variable replacements.\n
@@ -64,9 +64,9 @@ 
 		 *
 		 * @internal Reported to GF Support on 12/3
 		 */
-		$form['title']  = isset( $form['title'] ) ? $form['title'] : '';
-		$form['id']     = isset( $form['id'] ) ? $form['id'] : '';
-		$form['fields'] = isset( $form['fields'] ) ? $form['fields'] : array();
+		$form[ 'title' ]  = isset( $form[ 'title' ] ) ? $form[ 'title' ] : '';
+		$form[ 'id' ]     = isset( $form[ 'id' ] ) ? $form[ 'id' ] : '';
+		$form[ 'fields' ] = isset( $form[ 'fields' ] ) ? $form[ 'fields' ] : array();
 
 		return GFCommon::replace_variables( $text, $form, $entry, $url_encode, $esc_html );
 	}
@@ -86,7 +86,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function replace_gv_merge_tags(  $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
+	public static function replace_gv_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
 
 		/**
 		 * This prevents the gform_replace_merge_tags filter from being called twice, as defined in:
@@ -94,7 +94,7 @@ 
 		 * @see GFCommon::replace_variables_prepopulate()
 		 * @todo Remove eventually: Gravity Forms fixed this issue in 1.9.14
 		 */
-		if( false === $form ) {
+		if ( false === $form ) {
 			return $text;
 		}
 
@@ -126,7 +126,7 @@ 
 			'diff' => in_array( 'diff', $exploded ), // {date_created:diff}
 			'raw' => in_array( 'raw', $exploded ), // {date_created:raw}
 			'timestamp' => in_array( 'timestamp', $exploded ), // {date_created:timestamp}
-			'time' => in_array( 'time', $exploded ),  // {date_created:time}
+			'time' => in_array( 'time', $exploded ), // {date_created:time}
 		);
 
 		$formatted_date = GVCommon::format_date( $date_created, $atts );
@@ -189,14 +189,14 @@ 
 		preg_match_all( "/{get:(.*?)}/ism", $text, $matches, PREG_SET_ORDER );
 
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
-		if( empty( $matches ) ) {
+		if ( empty( $matches ) ) {
 			return $text;
 		}
 
 		foreach ( $matches as $match ) {
 
-			$full_tag = $match[0];
-			$property = $match[1];
+			$full_tag = $match[ 0 ];
+			$property = $match[ 1 ];
 
 			$value = stripslashes_deep( rgget( $property ) );
 
@@ -220,7 +220,7 @@ 
 			 * @since 1.15
 			 * @param bool $esc_html Whether to esc_html() the value. Default: `true`
 			 */
-			$esc_html = apply_filters('gravityview/merge_tags/get/esc_html/' . $property, true );
+			$esc_html = apply_filters( 'gravityview/merge_tags/get/esc_html/' . $property, true );
 
 			$value = $esc_html ? esc_html( $value ) : $value;
 
@@ -231,7 +231,7 @@ 
 			 * @param[in] array $form Gravity Forms form array
 			 * @param[in] array $entry Entry array
 			 */
-			$value = apply_filters('gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
+			$value = apply_filters( 'gravityview/merge_tags/get/value/' . $property, $value, $text, $form, $entry );
 
 			$text = str_replace( $full_tag, $value, $text );
 		}

includes/class-admin-welcome.php

Spacing +18 added lines, -18 removed lines

@@ -34,10 +34,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
+		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
 	}
 
 	/**
@@ -53,8 +53,8 @@ 
 		// Add help page to GravityView menu
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__('GravityView: Getting Started', 'gravityview'),
-			__('Getting Started', 'gravityview'),
+			__( 'GravityView: Getting Started', 'gravityview' ),
+			__( 'Getting Started', 'gravityview' ),
 			$this->minimum_capability,
 			'gv-getting-started',
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@ 
 	 *
 	 * @return boolean  $is_page   True: yep; false: nope
 	 */
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
 		global $plugin_page;
 
-		if($is_page) { return $is_page; }
+		if ( $is_page ) { return $is_page; }
 
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
 	}
@@ -108,7 +108,7 @@ 
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
 
-		if( !$this->is_dashboard_page() ) { return; }
+		if ( ! $this->is_dashboard_page() ) { return; }
 
 		?>
 		<style type="text/css" media="screen">
@@ -141,20 +141,20 @@ 
 		// Don't fetch -beta, etc.
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
 
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
 		?>
 
 		<h1><img class="alignleft" src="<?php echo plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ); ?>" width="100" height="132" /><?php printf( esc_html__( 'Welcome to GravityView %s', 'gravityview' ), $display_version ); ?></h1>
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
 
 		<h2 class="nav-tab-wrapper clear">
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "Getting Started", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( "List of Changes", 'gravityview' ); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
 				<?php _e( 'Credits', 'gravityview' ); ?>
 			</a>
 		</h2>
@@ -190,7 +190,7 @@ 
 					<h2>Create a View</h2>
 
 					<ol class="ol-decimal">
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
 						<li>If you want to <strong>create a new form</strong>, click the "Start Fresh" button</li>
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -525,7 +525,7 @@ 
 					</ul>
 
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
 				</div>
 			</div>
 
@@ -565,7 +565,7 @@ 
 		global $plugin_page;
 
 		// Bail if we're just editing the plugin
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
 
 		// Bail if no activation redirect
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -576,7 +576,7 @@ 
 		$upgrade = get_option( 'gv_version_upgraded_from' );
 
 		// Don't do anything if they've already seen the new version info
-		if( $upgrade === GravityView_Plugin::version ) {
+		if ( $upgrade === GravityView_Plugin::version ) {
 			return;
 		}
 
@@ -584,10 +584,10 @@ 
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
 
 		// First time install
-		if( ! $upgrade ) {
+		if ( ! $upgrade ) {
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
 		}
 		// Update

includes/class-admin-views.php

Spacing +177 added lines, -177 removed lines

@@ -28,30 +28,30 @@ 
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
 
 		// Tooltips
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
-
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
 
 		// @todo check if this hook is needed..
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
 
 		// Add Connected Form column
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
 
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
 
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
 
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
 
@@ -66,11 +66,11 @@ 
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
 		global $pagenow;
 
-		if ( !is_admin() ) {
+		if ( ! is_admin() ) {
 			return;
 		}
 
-		if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
+		if ( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
 			return;
 		}
 
@@ -87,18 +87,18 @@ 
 	function add_view_dropdown() {
 		$current_screen = get_current_screen();
 
-		if( 'gravityview' !== $current_screen->post_type ) {
+		if ( 'gravityview' !== $current_screen->post_type ) {
 			return;
 		}
 
 		$forms = gravityview_get_forms();
 		$current_form = rgget( 'gravityview_form_id' );
 		// If there are no forms to select, show no forms.
-		if( !empty( $forms ) ) { ?>
+		if ( ! empty( $forms ) ) { ?>
 			<select name="gravityview_form_id" id="gravityview_form_id">
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
-				<?php foreach( $forms as $form ) { ?>
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
+				<?php foreach ( $forms as $form ) { ?>
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
 				<?php } ?>
 			</select>
 		<?php }
@@ -111,7 +111,7 @@ 
 	 */
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
 	}
 
 	/**
@@ -134,37 +134,37 @@ 
 
 		$connected_views = gravityview_get_connected_views( $id );
 
-		if( empty( $connected_views ) ) {
+		if ( empty( $connected_views ) ) {
 			return $menu_items;
 		}
 
 		$sub_menu_items = array();
 		foreach ( (array)$connected_views as $view ) {
 
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
 				continue;
 			}
 
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
 
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
 			);
 		}
 
 		// If there were no items added, then let's create the parent menu
-		if( $sub_menu_items ) {
+		if ( $sub_menu_items ) {
 
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
-			$sub_menu_items[] = array(
+			$sub_menu_items[ ] = array(
 				'url' => '#',
 				'label' => '',
 				'menu_class' => 'hidden',
 				'capabilities' => '',
 			);
 
-			$menu_items['gravityview'] = array(
+			$menu_items[ 'gravityview' ] = array(
 				'label'          => __( 'Connected Views', 'gravityview' ),
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -194,8 +194,8 @@ 
 		$add = array( 'captcha', 'page' );
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
-			$add[] = 'post_id';
+		if ( $context === 'edit' ) {
+			$add[ ] = 'post_id';
 		}
 
 		$return = array_merge( $array, $add );
@@ -218,32 +218,32 @@ 
 		foreach ( $default_args as $key => $arg ) {
 
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
 
 			// By default, use `tooltip` if defined.
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
 
 			// Otherwise, use the description as a tooltip.
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
-				$tooltip = $arg['desc'];
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
+				$tooltip = $arg[ 'desc' ];
 			}
 
 			// If there's no tooltip set, continue
-			if( empty( $tooltip ) ) {
+			if ( empty( $tooltip ) ) {
 				continue;
 			}
 
 			// Add the tooltip
-			$gv_tooltips[ 'gv_'.$key ] = array(
-				'title'	=> $arg['label'],
+			$gv_tooltips[ 'gv_' . $key ] = array(
+				'title'	=> $arg[ 'label' ],
 				'value'	=> $tooltip,
 			);
 
 		}
 
-		$gv_tooltips['gv_css_merge_tags'] = array(
-			'title' => __('CSS Merge Tags', 'gravityview'),
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
 		);
 
 		/**
@@ -254,9 +254,9 @@ 
 
 		foreach ( $gv_tooltips as $key => $tooltip ) {
 
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
 
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
 		}
 
 		return $tooltips;
@@ -270,7 +270,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
 
 		$output = '';
 
@@ -292,7 +292,7 @@ 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
 
-				$output = $template ? $template['label'] : $template_id_pretty;
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
 
 				break;
 
@@ -333,44 +333,44 @@ 
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
 
 		// Either the form is empty or the form ID is 0, not yet set.
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			return '';
 		}
 
 		// The $form is passed as the form ID
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$form = gravityview_get_form( $form );
 		}
 
-		$form_id = $form['id'];
+		$form_id = $form[ 'id' ];
 		$links = array();
 
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
 		} else {
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
 		}
 
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
 		}
 
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if ( ! empty( $include_form_link ) ) {
 			$output .= $form_link;
 		}
 
@@ -382,7 +382,7 @@ 
 		 */
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
 
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
 
 		return $output;
 	}
@@ -396,8 +396,8 @@ 
 		// Get the date column and save it for later to add back in.
 		// This adds it after the Data Source column.
 		// This way, we don't need to do array_slice, array_merge, etc.
-		$date = $columns['date'];
-		unset( $columns['date'] );
+		$date = $columns[ 'date' ];
+		unset( $columns[ 'date' ] );
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -408,14 +408,14 @@ 
 			'gravityforms_preview_forms',
 		);
 
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
 		}
 
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
 
 		// Add the date back in.
-		$columns['date'] = $date;
+		$columns[ 'date' ] = $date;
 
 		return $columns;
 	}
@@ -429,12 +429,12 @@ 
 	 */
 	function save_postdata( $post_id ) {
 
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 			return;
 		}
 
 		// validate post_type
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
 			return;
 		}
 
@@ -449,90 +449,90 @@ 
 		$statii = array();
 
 		// check if this is a start fresh View
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
 
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
 			// save form id
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
 
 		}
 
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
 			return;
 		}
 
 		// Was this a start fresh?
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
 		} else {
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
 		}
 
 		// Check if we have a template id
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
 
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
 
 			// now save template id
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
 		}
 
 
 		// save View Configuration metabox
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
 
 			// template settings
-			if( empty( $_POST['template_settings'] ) ) {
-				$_POST['template_settings'] = array();
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
+				$_POST[ 'template_settings' ] = array();
 			}
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
 
 			$fields = array();
 
 			// Directory&single Visible Fields
-			if( !empty( $preset_fields ) ) {
+			if ( ! empty( $preset_fields ) ) {
 
 				$fields = $preset_fields;
 
-			} elseif( !empty( $_POST['fields'] ) ) {
+			} elseif ( ! empty( $_POST[ 'fields' ] ) ) {
 
-				if( !is_array( $_POST['fields'] ) ) {
+				if ( ! is_array( $_POST[ 'fields' ] ) ) {
 
 					// Fields are passed as a jQuery-serialized array, created in admin-views.js in the serializeForm method
 					// Not using parse_str due to max_input_vars limitation
 					$fields_holder = array();
-					GVCommon::gv_parse_str( $_POST['fields'], $fields_holder );
+					GVCommon::gv_parse_str( $_POST[ 'fields' ], $fields_holder );
 
-					if( isset( $fields_holder['fields'] ) ) {
+					if ( isset( $fields_holder[ 'fields' ] ) ) {
 
 						// When parsed, there's a m
-						$fields = $fields_holder['fields'];
+						$fields = $fields_holder[ 'fields' ];
 
 					} else {
 
-						do_action('gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
+						do_action( 'gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
 
 					}
 
 				} else {
 
-					$fields = $_POST['fields'];
+					$fields = $_POST[ 'fields' ];
 
 				}
 			}
 
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
 
 			// Directory Visible Widgets
-			if( empty( $_POST['widgets'] ) ) {
-				$_POST['widgets'] = array();
+			if ( empty( $_POST[ 'widgets' ] ) ) {
+				$_POST[ 'widgets' ] = array();
 			}
-			$statii['directory_widgets'] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST['widgets'] );
+			$statii[ 'directory_widgets' ] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST[ 'widgets' ] );
 
 		} // end save view configuration
 
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
 	}
 
 	/**
@@ -564,20 +564,20 @@ 
 
 		$output = '';
 
-		if( !empty( $fields ) ) {
+		if ( ! empty( $fields ) ) {
 
-			foreach( $fields as $id => $details ) {
+			foreach ( $fields as $id => $details ) {
 
-				if( in_array( $details['type'], $blacklist_field_types ) ) {
+				if ( in_array( $details[ 'type' ], $blacklist_field_types ) ) {
 					continue;
 				}
 
 				// Edit mode only allows editing the parent fields, not single inputs.
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
 					continue;
 				}
 
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
 
 			} // End foreach
 		}
@@ -585,7 +585,7 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ( $context === 'edit' ) {
 			return;
 		}
 
@@ -609,16 +609,16 @@ 
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
 			array(
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
 				'input_type' => NULL,
 				'field_options' => NULL,
 				'settings_html'	=> NULL,
 			)
-		));
+		) );
 
-		if( !empty( $additional_fields )) {
+		if ( ! empty( $additional_fields ) ) {
 			foreach ( (array)$additional_fields as $item ) {
 
 				// Prevent items from not having index set
@@ -629,16 +629,16 @@ 
 					'input_type' => NULL,
 					'field_options' => NULL,
 					'settings_html'	=> NULL,
-				));
+				) );
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if ( ! empty( $item[ 'field_options' ] ) ) {
 					// Use settings_html from now on.
-					$item['settings_html'] = $item['field_options'];
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
 				}
 
 				// Render a label for each of them
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
 
 			}
 		}
@@ -651,64 +651,64 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array
 	 */
-	function get_entry_default_fields($form, $zone) {
+	function get_entry_default_fields( $form, $zone ) {
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
 
 			$entry_default_fields = array(
 				'id' => array(
-					'label' => __('Entry ID', 'gravityview'),
+					'label' => __( 'Entry ID', 'gravityview' ),
 					'type' => 'id',
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
 				),
 				'date_created' => array(
-					'label' => __('Entry Date', 'gravityview'),
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
+					'label' => __( 'Entry Date', 'gravityview' ),
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
 					'type' => 'date_created',
 				),
 				'source_url' => array(
-					'label' => __('Source URL', 'gravityview'),
+					'label' => __( 'Source URL', 'gravityview' ),
 					'type' => 'source_url',
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
 				),
 				'ip' => array(
-					'label' => __('User IP', 'gravityview'),
+					'label' => __( 'User IP', 'gravityview' ),
 					'type' => 'ip',
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
 				),
 				'created_by' => array(
-					'label' => __('User', 'gravityview'),
+					'label' => __( 'User', 'gravityview' ),
 					'type' => 'created_by',
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
 				),
 
 				/**
 				 * @since  1.2
 				 */
 				'custom'	=> array(
-					'label'	=> __('Custom Content', 'gravityview'),
+					'label'	=> __( 'Custom Content', 'gravityview' ),
 					'type'	=> 'custom',
-					'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
+					'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
 				),
 
 				/**
 				 * @since 1.7.2
 				 */
 				'other_entries' => array(
-					'label'	=> __('Other Entries', 'gravityview'),
+					'label'	=> __( 'Other Entries', 'gravityview' ),
 					'type'	=> 'other_entries',
-					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
+					'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
 				),
 			);
 
 
-			if( 'single' !== $zone) {
+			if ( 'single' !== $zone ) {
 
-				$entry_default_fields['entry_link'] = array(
-					'label' => __('Link to Entry', 'gravityview'),
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
+				$entry_default_fields[ 'entry_link' ] = array(
+					'label' => __( 'Link to Entry', 'gravityview' ),
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
 					'type' => 'entry_link',
 				);
 			}
@@ -722,7 +722,7 @@ 
 		 * @param  string|array $form form_ID or form object
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 		 */
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
 	}
 
 	/**
@@ -733,7 +733,7 @@ 
 	 */
 	function get_available_fields( $form = '', $zone = NULL ) {
 
-		if( empty( $form ) ) {
+		if ( empty( $form ) ) {
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
 			return array();
 		}
@@ -742,7 +742,7 @@ 
 		$fields = gravityview_get_form_fields( $form, true );
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
+		if ( ! is_array( $form ) ) {
 			$meta_fields = gravityview_get_entry_meta( $form );
 		} else {
 			$meta_fields = array();
@@ -766,11 +766,11 @@ 
 
 		$widgets = $this->get_registered_widgets();
 
-		if( !empty( $widgets ) ) {
+		if ( ! empty( $widgets ) ) {
 
-			foreach( $widgets as $id => $details ) {
+			foreach ( $widgets as $id => $details ) {
 
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
 
 			}
 		}
@@ -804,7 +804,7 @@ 
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
 		global $post;
 
-		if( $type === 'widget' ) {
+		if ( $type === 'widget' ) {
 			$button_label = __( 'Add Widget', 'gravityview' );
 		} else {
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -813,15 +813,15 @@ 
 		$available_items = array();
 
 		// if saved values, get available fields to label everyone
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
 
-			if( !empty( $_POST['template_id'] ) ) {
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
 			} else {
 				$form = gravityview_get_form_id( $post->ID );
 			}
 
-			if( 'field' === $type ) {
+			if ( 'field' === $type ) {
 				$available_items = $this->get_available_fields( $form, $zone );
 			} else {
 				$available_items = $this->get_registered_widgets();
@@ -829,39 +829,39 @@ 
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
+		foreach ( $rows as $row ) :
+			foreach ( $row as $col => $areas ) :
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
 
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
 
-					<?php foreach( $areas as $area ) : 	?>
+					<?php foreach ( $areas as $area ) : 	?>
 
 						<div class="gv-droppable-area">
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
 
 								<?php // render saved fields
 
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
 
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
 
 										$input_type = NULL;
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
 
-										if( !$original_item ) {
+										if ( ! $original_item ) {
 
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
+											do_action( 'gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( 'available_items' => $available_items, 'field' => $field ) );
 
 											$original_item = $field;
 										} else {
 
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
 
 										}
 
 										// Field options dialog box
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
+										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
 
 										$item = array(
 											'input_type' => $input_type,
@@ -870,16 +870,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
+										if ( $original_item ) {
 											$item = wp_parse_args( $item, $original_item );
 										}
 
-										switch( $type ) {
+										switch ( $type ) {
 											case 'widget':
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
 												break;
 											default:
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
 										}
 
 
@@ -889,11 +889,11 @@ 
 
 								} // End if zone is not empty ?>
 
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
 							</div>
 							<div class="gv-droppable-area-action">
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
 							</div>
 						</div>
 
@@ -915,7 +915,7 @@ 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
+		if ( ! empty( $post_id ) ) {
 			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
 
 		}
@@ -946,19 +946,19 @@ 
 	 */
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
 
-		if( empty( $template_id ) ) {
+		if ( empty( $template_id ) ) {
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
 			return;
 		}
 
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
 
-		if( empty( $template_areas ) ) {
+		if ( empty( $template_areas ) ) {
 
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
 			$output = '<div>';
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
 			$output .= '</div>';
 		} else {
 
@@ -973,7 +973,7 @@ 
 
 		}
 
-		if( $echo ) {
+		if ( $echo ) {
 			echo $output;
 		}
 
@@ -993,25 +993,25 @@ 
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
 
 		// Add the GV font (with the Astronaut)
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
 
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
 
 		// Don't process any scripts below here if it's not a GravityView page.
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
+		if ( ! gravityview_is_admin_page( $hook ) && ! $is_widgets_page ) { return; }
 
 		// Only enqueue the following on single pages
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
+		if ( gravityview_is_admin_page( $hook, 'single' ) || $is_widgets_page ) {
 
 			wp_enqueue_script( 'jquery-ui-datepicker' );
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
 
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
 
 			//enqueue scripts
 			wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
 
-			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
+			wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
 				'cookiepath' => COOKIEPATH,
 				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
 				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
@@ -1024,9 +1024,9 @@ 
 				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
 				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
 				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
-			));
+			) );
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
 
 			self::enqueue_gravity_forms_scripts();
 
@@ -1045,10 +1045,10 @@ 
 		);
 
 		if ( wp_is_mobile() ) {
-				    $scripts[] = 'jquery-touch-punch';
+				    $scripts[ ] = 'jquery-touch-punch';
 		}
 
-		foreach ($scripts as $script) {
+		foreach ( $scripts as $script ) {
 			wp_enqueue_script( $script );
 		}
 	}
@@ -1057,11 +1057,11 @@ 
 
 		$filter = current_filter();
 
-		if( preg_match('/script/ism', $filter ) ) {
+		if ( preg_match( '/script/ism', $filter ) ) {
 			$allow_scripts = array( 'jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
 			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete' );
 			$registered = array_merge( $registered, $allow_scripts );
-		} elseif( preg_match('/style/ism', $filter ) ) {
+		} elseif ( preg_match( '/style/ism', $filter ) ) {
 			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
 			$registered = array_merge( $registered, $allow_styles );
 		}

includes/class-cache.php

Spacing +14 added lines, -14 removed lines

@@ -79,7 +79,7 @@ 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
+		foreach ( $this->lead_db_columns as $column ) {
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
 		}
 
@@ -112,9 +112,9 @@ 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add( $entry[ 'form_id' ] );
 	}
 
 	/**
@@ -127,9 +127,9 @@ 
 	 */
 	public function entry_updated( $form, $lead_id ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -144,9 +144,9 @@ 
 	 */
 	public function entry_created( $entry, $form ) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add( $form[ 'id' ] );
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -242,7 +242,7 @@ 
 
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
 
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@ 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			if ( in_array( $form_id, $blacklist ) ) {
 
@@ -347,7 +347,7 @@ 
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
 
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
 
@@ -383,7 +383,7 @@ 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ( (array)$form_ids as $form_id ) {
 
 			$key = $this->get_cache_key_prefix( $form_id );
 
@@ -497,7 +497,7 @@ 
 
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
 
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
 
@@ -526,7 +526,7 @@ 
 		 */
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }