gravityview / GravityView

includes/admin/metaboxes/views/single-entry.php

Spacing +3 added lines, -3 removed lines

@@ -7,15 +7,15 @@
 global $post;
 
 // View template settings
-$current_settings = gravityview_get_template_settings( $post->ID );
+$current_settings = gravityview_get_template_settings($post->ID);
 
 ?>
 
 <table class="form-table striped"><?php
 
-	GravityView_Render_Settings::render_setting_row( 'single_title', $current_settings );
+	GravityView_Render_Settings::render_setting_row('single_title', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'back_link_label', $current_settings );
+	GravityView_Render_Settings::render_setting_row('back_link_label', $current_settings);
 
 	?>
 </table>
\ No newline at end of file

includes/admin/metaboxes/views/sort-filter.php

Spacing +14 added lines, -14 removed lines

@@ -6,47 +6,47 @@
  */
 global $post;
 
-$curr_form = gravityview_get_form_id( $post->ID );
+$curr_form = gravityview_get_form_id($post->ID);
 
 // View template settings
-$current_settings = gravityview_get_template_settings( $post->ID );
+$current_settings = gravityview_get_template_settings($post->ID);
 
 ?>
 <table class="form-table striped">
 
 	<?php
 
-	do_action( 'gravityview_metabox_sort_filter_before', $current_settings );
+	do_action('gravityview_metabox_sort_filter_before', $current_settings);
 
 	// Begin Sort fields
-	do_action( 'gravityview_metabox_sort_before', $current_settings );
+	do_action('gravityview_metabox_sort_before', $current_settings);
 
 	/**
 	 * @since 1.7
 	 */
-	GravityView_Render_Settings::render_setting_row( 'sort_columns', $current_settings );
+	GravityView_Render_Settings::render_setting_row('sort_columns', $current_settings);
 
-	$sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">'.gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] ).'</select>';
+	$sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">'.gravityview_get_sortable_fields($curr_form, $current_settings['sort_field']).'</select>';
 
-	GravityView_Render_Settings::render_setting_row( 'sort_field', $current_settings, $sort_fields_input );
+	GravityView_Render_Settings::render_setting_row('sort_field', $current_settings, $sort_fields_input);
 
-	GravityView_Render_Settings::render_setting_row( 'sort_direction', $current_settings );
+	GravityView_Render_Settings::render_setting_row('sort_direction', $current_settings);
 
 
 	// End Sort fields
-	do_action( 'gravityview_metabox_sort_after', $current_settings );
+	do_action('gravityview_metabox_sort_after', $current_settings);
 
 	// Begin Filter fields
-	do_action( 'gravityview_metabox_filter_before', $current_settings );
+	do_action('gravityview_metabox_filter_before', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'start_date', $current_settings );
+	GravityView_Render_Settings::render_setting_row('start_date', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'end_date', $current_settings );
+	GravityView_Render_Settings::render_setting_row('end_date', $current_settings);
 
 	// End Filter fields
-	do_action( 'gravityview_metabox_filter_after', $current_settings );
+	do_action('gravityview_metabox_filter_after', $current_settings);
 
-	do_action( 'gravityview_metabox_sort_filter_after', $current_settings );
+	do_action('gravityview_metabox_sort_filter_after', $current_settings);
 
 	?>
 

includes/admin/metaboxes/views/view-configuration.php

Spacing +19 added lines, -19 removed lines

@@ -1,42 +1,42 @@ 
 <div id="gv-view-configuration-tabs">
 
 	<ul class="nav-tab-wrapper">
-		<li><a href="#directory-view" class="nav-tab"><i class="dashicons dashicons-admin-page"></i> <?php esc_html_e( 'Multiple Entries', 'gravityview' ); ?></a></li>
-		<li><a href="#single-view" class="nav-tab"><i class="dashicons dashicons-media-default"></i> <?php esc_html_e( 'Single Entry', 'gravityview' ); ?></a></li>
-		<li><a href="#edit-view" class="nav-tab"><i class="dashicons dashicons-welcome-write-blog"></i> <?php esc_html_e( 'Edit Entry', 'gravityview' ); ?></a></li>
+		<li><a href="#directory-view" class="nav-tab"><i class="dashicons dashicons-admin-page"></i> <?php esc_html_e('Multiple Entries', 'gravityview'); ?></a></li>
+		<li><a href="#single-view" class="nav-tab"><i class="dashicons dashicons-media-default"></i> <?php esc_html_e('Single Entry', 'gravityview'); ?></a></li>
+		<li><a href="#edit-view" class="nav-tab"><i class="dashicons dashicons-welcome-write-blog"></i> <?php esc_html_e('Edit Entry', 'gravityview'); ?></a></li>
 	</ul>
 
 	<div id="directory-view">
 
 		<div id="directory-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e('Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e('These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
 
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
+			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID); ?>
 
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e('Entries Fields', 'gravityview'); ?> <span><?php esc_html_e('These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
 
 			<div id="directory-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
-				<?php if(!empty( $curr_template ) ) {
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
+				<?php if (!empty($curr_template)) {
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true);
 				} ?>
 			</div>
 
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e('Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e('These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
 
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); ?>
+			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID); ?>
 
 
 			<?php // list of available fields to be shown in the popup ?>
 			<div id="directory-available-fields" class="hide-if-js gv-tooltip">
 				<span class="close"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_fields', $curr_form, 'directory' ); ?>
+				<?php do_action('gravityview_render_available_fields', $curr_form, 'directory'); ?>
 			</div>
 
 			<?php // list of available widgets to be shown in the popup ?>
 			<div id="directory-available-widgets" class="hide-if-js gv-tooltip">
 				<span class="close"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_widgets' ); ?>
+				<?php do_action('gravityview_render_available_widgets'); ?>
 			</div>
 
 		</div>
@@ -52,17 +52,17 @@ 
 
 		<div id="single-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
+			<h4><?php esc_html_e('These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
 
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
-				<?php if(!empty( $curr_template ) ) {
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
+				<?php if (!empty($curr_template)) {
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true);
 				} ?>
 			</div>
 
 			<div id="single-available-fields" class="hide-if-js gv-tooltip">
 				<span class="close"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_fields', $curr_form, 'single' ); ?>
+				<?php do_action('gravityview_render_available_fields', $curr_form, 'single'); ?>
 			</div>
 
 		</div>
@@ -73,17 +73,17 @@ 
 
 		<div id="edit-fields" class="gv-section">
 
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
+			<h4><?php esc_html_e('Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
 
 			<div id="edit-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
 				<?php
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
+				do_action('gravityview_render_directory_active_areas', apply_filters('gravityview/template/edit', 'default_table_edit'), 'edit', $post->ID, true);
 				?>
 			</div>
 
 			<div id="edit-available-fields" class="hide-if-js gv-tooltip">
 				<span class="close"><i class="dashicons dashicons-dismiss"></i></span>
-				<?php do_action('gravityview_render_available_fields', $curr_form, 'edit' ); ?>
+				<?php do_action('gravityview_render_available_fields', $curr_form, 'edit'); ?>
 			</div>
 
 		</div>

includes/admin/metaboxes/views/view-settings.php

Spacing +11 added lines, -11 removed lines

@@ -6,10 +6,10 @@ 
  */
 global $post;
 
-$curr_form = gravityview_get_form_id( $post->ID );
+$curr_form = gravityview_get_form_id($post->ID);
 
 // View template settings
-$current_settings = gravityview_get_template_settings( $post->ID );
+$current_settings = gravityview_get_template_settings($post->ID);
 
 ?>
 
@@ -17,32 +17,32 @@ 
 
 	<?php
 
-	GravityView_Render_Settings::render_setting_row( 'page_size', $current_settings );
+	GravityView_Render_Settings::render_setting_row('page_size', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'lightbox', $current_settings );
+	GravityView_Render_Settings::render_setting_row('lightbox', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'show_only_approved', $current_settings );
+	GravityView_Render_Settings::render_setting_row('show_only_approved', $current_settings);
 
 	/**
 	 * @since 1.5.4
 	 */
-	GravityView_Render_Settings::render_setting_row( 'hide_until_searched', $current_settings );
+	GravityView_Render_Settings::render_setting_row('hide_until_searched', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'hide_empty', $current_settings );
+	GravityView_Render_Settings::render_setting_row('hide_empty', $current_settings);
 
-	GravityView_Render_Settings::render_setting_row( 'user_edit', $current_settings );
+	GravityView_Render_Settings::render_setting_row('user_edit', $current_settings);
 
 	/**
 	 * @since  1.5.1
 	 */
-	GravityView_Render_Settings::render_setting_row( 'user_delete', $current_settings );
+	GravityView_Render_Settings::render_setting_row('user_delete', $current_settings);
 
 	/**
 	 * @since 1.15.2
 	 */
-	GravityView_Render_Settings::render_setting_row( 'embed_only', $current_settings );
+	GravityView_Render_Settings::render_setting_row('embed_only', $current_settings);
 
-	do_action( 'gravityview_admin_directory_settings', $current_settings );
+	do_action('gravityview_admin_directory_settings', $current_settings);
 
 	?>
 

includes/class-admin-add-shortcode.php

Spacing +44 added lines, -44 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -20,15 +20,15 @@ 
 
 	function __construct() {
 
-			add_action( 'media_buttons', array( $this, 'add_shortcode_button'), 30);
+			add_action('media_buttons', array($this, 'add_shortcode_button'), 30);
 
-			add_action( 'admin_footer',	array( $this, 'add_shortcode_popup') );
+			add_action('admin_footer', array($this, 'add_shortcode_popup'));
 
 			// adding styles and scripts
-			add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+			add_action('admin_enqueue_scripts', array($this, 'add_scripts_and_styles'));
 
 			// ajax - populate sort fields based on the selected view
-			add_action( 'wp_ajax_gv_sortable_fields', array( $this, 'get_sortable_fields' ) );
+			add_action('wp_ajax_gv_sortable_fields', array($this, 'get_sortable_fields'));
 	}
 
 
@@ -40,7 +40,7 @@ 
 	 */
 	function is_post_editor_screen() {
 		global $current_screen, $pagenow;
-		return !empty( $current_screen->post_type ) && 'gravityview' != $current_screen->post_type && in_array( $pagenow , array( 'post.php' , 'post-new.php' ) );
+		return !empty($current_screen->post_type) && 'gravityview' != $current_screen->post_type && in_array($pagenow, array('post.php', 'post-new.php'));
 	}
 
 
@@ -51,11 +51,11 @@ 
 	 * @return void
 	 */
 	function add_shortcode_button() {
-		if( !$this->is_post_editor_screen() ) {
+		if (!$this->is_post_editor_screen()) {
 			return;
 		}
 		?>
-		<a href="#TB_inline?width=480&amp;inlineId=select_gravityview_view&amp;width=600&amp;height=800" class="thickbox button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e( 'Add View', 'gravityview' ); ?></a>
+		<a href="#TB_inline?width=480&amp;inlineId=select_gravityview_view&amp;width=600&amp;height=800" class="thickbox button gform_media_link" id="add_gravityview" title="<?php esc_attr_e("Insert View", 'gravityview'); ?>"><span class="icon gv-icon-astronaut-head"></span><?php esc_html_e('Add View', 'gravityview'); ?></a>
 		<?php
 
 	}
@@ -71,17 +71,17 @@ 
 	function add_shortcode_popup() {
 		global $post;
 
-		if( !$this->is_post_editor_screen() ) {
+		if (!$this->is_post_editor_screen()) {
 			return;
 		}
 
 		$post_type = get_post_type_object($post->post_type);
 
-		$views = get_posts( array('post_type' => 'gravityview', 'posts_per_page' => -1 ) );
+		$views = get_posts(array('post_type' => 'gravityview', 'posts_per_page' => -1));
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
-			echo '<div id="select_gravityview_view"><div class="wrap">'. GravityView_Post_Types::no_views_text() .'</div></div>';
+		if (empty($views)) {
+			echo '<div id="select_gravityview_view"><div class="wrap">'.GravityView_Post_Types::no_views_text().'</div></div>';
 			return;
 		}
 
@@ -90,18 +90,18 @@ 
 			<form action="#" method="get" id="select_gravityview_view_form">
 				<div class="wrap">
 
-					<h2 class=""><?php esc_html_e( 'Embed a View', 'gravityview' ); ?></h2>
-					<p class="subtitle"><?php printf( esc_attr ( __( 'Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview') ), $post_type->labels->singular_name, '<a href="http://gravityview.co/support/documentation/202934188/" target="_blank">', '</a>' ); ?></p>
+					<h2 class=""><?php esc_html_e('Embed a View', 'gravityview'); ?></h2>
+					<p class="subtitle"><?php printf(esc_attr(__('Use this form to embed a View into this %s. %sLearn more about using shortcodes.%s', 'gravityview')), $post_type->labels->singular_name, '<a href="http://gravityview.co/support/documentation/202934188/" target="_blank">', '</a>'); ?></p>
 
 					<div>
-						<h3><label for="gravityview_id"><?php esc_html_e( 'Select a View', 'gravityview' ); ?></label></h3>
+						<h3><label for="gravityview_id"><?php esc_html_e('Select a View', 'gravityview'); ?></label></h3>
 
 						<select name="gravityview_id" id="gravityview_id">
-							<option value=""><?php esc_html_e( '&mdash; Select a View to Insert &mdash;', 'gravityview' ); ?></option>
+							<option value=""><?php esc_html_e('&mdash; Select a View to Insert &mdash;', 'gravityview'); ?></option>
 							<?php
-							foreach( $views as $view ) {
-								$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-								echo '<option value="'. $view->ID .'">'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+							foreach ($views as $view) {
+								$title = empty($view->post_title) ? __('(no title)', 'gravityview') : $view->post_title;
+								echo '<option value="'.$view->ID.'">'.esc_html(sprintf('%s #%d', $title, $view->ID)).'</option>';
 							}
 							?>
 						</select>
@@ -109,24 +109,24 @@ 
 
 					<table class="form-table hide-if-js">
 
-						<caption><?php esc_html_e( 'View Settings', 'gravityview' ); ?></caption>
+						<caption><?php esc_html_e('View Settings', 'gravityview'); ?></caption>
 
 						<?php
 
-						$settings = GravityView_View_Data::get_default_args( true );
+						$settings = GravityView_View_Data::get_default_args(true);
 
-						foreach ( $settings as $key => $setting ) {
+						foreach ($settings as $key => $setting) {
 
-							if( empty( $setting['show_in_shortcode'] ) ) { continue; }
+							if (empty($setting['show_in_shortcode'])) { continue; }
 
-							GravityView_Render_Settings::render_setting_row( $key, array(), NULL, 'gravityview_%s', 'gravityview_%s' );
+							GravityView_Render_Settings::render_setting_row($key, array(), NULL, 'gravityview_%s', 'gravityview_%s');
 						}
 						?>
 
 					</table>
 
 					<div class="submit">
-						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview' ); ?>" id="insert_gravityview_view" />
+						<input type="submit" class="button button-primary button-large alignleft hide-if-js" value="<?php esc_attr_e('Insert View', 'gravityview'); ?>" id="insert_gravityview_view" />
 						<input class="button button-secondary alignright" type="submit" onclick="tb_remove(); return false;" value="<?php esc_attr_e("Cancel", 'gravityview'); ?>" />
 					</div>
 
@@ -149,32 +149,32 @@ 
 	 */
 	function add_scripts_and_styles() {
 
-		if( ! $this->is_post_editor_screen() ) {
+		if (!$this->is_post_editor_screen()) {
 			return;
 		}
 
-		wp_enqueue_style( 'dashicons' );
+		wp_enqueue_style('dashicons');
 
 		// date picker
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_enqueue_script('jquery-ui-datepicker');
 
 		$protocol = is_ssl() ? 'https://' : 'http://';
 
-		wp_enqueue_style( 'jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version );
+		wp_enqueue_style('jquery-ui-datepicker', $protocol.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css', array(), GravityView_Plugin::version);
 
 		//enqueue styles
-		wp_register_style( 'gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
-		wp_enqueue_style( 'gravityview_postedit_styles' );
+		wp_register_style('gravityview_postedit_styles', plugins_url('assets/css/admin-post-edit.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version);
+		wp_enqueue_style('gravityview_postedit_styles');
 
 		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 		// custom js
-		wp_register_script( 'gravityview_postedit_scripts',  plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'jquery-ui-datepicker' ), GravityView_Plugin::version );
-		wp_enqueue_script( 'gravityview_postedit_scripts' );
+		wp_register_script('gravityview_postedit_scripts', plugins_url('assets/js/admin-post-edit'.$script_debug.'.js', GRAVITYVIEW_FILE), array('jquery', 'jquery-ui-datepicker'), GravityView_Plugin::version);
+		wp_enqueue_script('gravityview_postedit_scripts');
 		wp_localize_script('gravityview_postedit_scripts', 'gvGlobals', array(
-			'nonce' => wp_create_nonce( 'gravityview_ajaxaddshortcode'),
-			'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-			'alert_1' => esc_html__( 'Please select a View', 'gravityview'),
+			'nonce' => wp_create_nonce('gravityview_ajaxaddshortcode'),
+			'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
+			'alert_1' => esc_html__('Please select a View', 'gravityview'),
 		));
 
 	}
@@ -191,27 +191,27 @@ 
 	function get_sortable_fields() {
 
 		// Not properly formatted request
-		if ( empty( $_POST['viewid'] ) || !is_numeric( $_POST['viewid'] ) ) {
-			exit( false );
+		if (empty($_POST['viewid']) || !is_numeric($_POST['viewid'])) {
+			exit(false);
 		}
 
 		// Not valid request
-		if( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxaddshortcode' ) ) {
-			exit( false );
+		if (empty($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxaddshortcode')) {
+			exit(false);
 		}
 
 		$viewid = (int)$_POST['viewid'];
 
 		// fetch form id assigned to the view
-		$formid = gravityview_get_form_id( $viewid );
+		$formid = gravityview_get_form_id($viewid);
 
 		// Get the default sort field for the view
-		$sort_field = gravityview_get_template_setting( $viewid, 'sort_field' );
+		$sort_field = gravityview_get_template_setting($viewid, 'sort_field');
 
 		// Generate the output `<option>`s
-		$response = gravityview_get_sortable_fields( $formid, $sort_field );
+		$response = gravityview_get_sortable_fields($formid, $sort_field);
 
-		exit( $response );
+		exit($response);
 	}
 
 }

includes/class-admin-approve-entries.php

Spacing +138 added lines, -138 removed lines

@@ -27,29 +27,29 @@ 
 		/** Edit Gravity Form page */
 
 		// Add button to left menu
-		add_filter( 'gform_add_field_buttons', array( $this, 'add_field_buttons' ) );
+		add_filter('gform_add_field_buttons', array($this, 'add_field_buttons'));
 		// Set defaults
-		add_action( 'gform_editor_js_set_default_values', array( $this, 'set_defaults' ) );
+		add_action('gform_editor_js_set_default_values', array($this, 'set_defaults'));
 
 		/** gf_entries page - entries table screen */
 
 		// capture bulk actions
-		add_action( 'init', array( $this, 'process_bulk_action') );
+		add_action('init', array($this, 'process_bulk_action'));
 		// add hidden field with approve status
-		add_action( 'gform_entries_first_column', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
+		add_action('gform_entries_first_column', array($this, 'add_entry_approved_hidden_input'), 1, 5);
 		// process ajax approve entry requests
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
+		add_action('wp_ajax_gv_update_approved', array($this, 'ajax_update_approved'));
 
 		// in case entry is edited (on admin or frontend)
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
+		add_action('gform_after_update_entry', array($this, 'after_update_entry_update_approved_meta'), 10, 2);
 
-		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
+		add_filter('gravityview_tooltips', array($this, 'tooltips'));
 
 		// adding styles and scripts
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts_and_styles'));
 		// bypass Gravity Forms no-conflict mode
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
+		add_filter('gform_noconflict_scripts', array($this, 'register_gform_noconflict_script'));
+		add_filter('gform_noconflict_styles', array($this, 'register_gform_noconflict_style'));
 	}
 
 	/**
@@ -59,11 +59,11 @@ 
 	 *
 	 * @return array Tooltips array with GravityView fields tooltip
 	 */
-	function tooltips( $tooltips ) {
+	function tooltips($tooltips) {
 
 		$tooltips['form_gravityview_fields'] = array(
 			'title' => __('GravityView Fields', 'gravityview'),
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
+			'value' => __('Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
 		);
 
 		return $tooltips;
@@ -77,7 +77,7 @@ 
 	 * @param mixed $field_groups
 	 * @return array Array of fields
 	 */
-	function add_field_buttons( $field_groups ) {
+	function add_field_buttons($field_groups) {
 
 		$gravityview_fields = array(
 			'name' => 'gravityview_fields',
@@ -85,20 +85,20 @@ 
 			'fields' => array(
 				array(
 					'class' => 'button',
-					'value' => __( 'Approve/Reject', 'gravityview' ),
+					'value' => __('Approve/Reject', 'gravityview'),
 					'onclick' => "StartAddField('gravityviewapproved_admin');",
 					'data-type' => 'gravityviewapproved_admin'
 				),
 				array(
 					'class' => 'button',
-					'value' => __( 'User Opt-In', 'gravityview' ),
+					'value' => __('User Opt-In', 'gravityview'),
 					'onclick' => "StartAddField('gravityviewapproved');",
 					'data-type' => 'gravityviewapproved'
 				),
 			)
 		);
 
-		array_push( $field_groups, $gravityview_fields );
+		array_push($field_groups, $gravityview_fields);
 
 		return $field_groups;
 	}
@@ -115,16 +115,16 @@ 
 	function set_defaults() {
 		?>
 		case 'gravityviewapproved_admin':
-			field.label = "<?php _e( 'Approved? (Admin-only)', 'gravityview' ); ?>";
+			field.label = "<?php _e('Approved? (Admin-only)', 'gravityview'); ?>";
 
-			field.adminLabel = "<?php _e( 'Approved?', 'gravityview' ); ?>";
+			field.adminLabel = "<?php _e('Approved?', 'gravityview'); ?>";
 			field.adminOnly = true;
 
 			field.choices = null;
 			field.inputs = null;
 
 			if( !field.choices ) {
-				field.choices = new Array( new Choice("<?php _e( 'Approved', 'gravityview' ); ?>") );
+				field.choices = new Array( new Choice("<?php _e('Approved', 'gravityview'); ?>") );
 			}
 
 			field.inputs = new Array();
@@ -137,9 +137,9 @@ 
 
 			break;
 		case 'gravityviewapproved':
-			field.label = "<?php _e( 'Show Entry on Website', 'gravityview' ); ?>";
+			field.label = "<?php _e('Show Entry on Website', 'gravityview'); ?>";
 
-			field.adminLabel = "<?php _e( 'Opt-In', 'gravityview' ); ?>";
+			field.adminLabel = "<?php _e('Opt-In', 'gravityview'); ?>";
 			field.adminOnly = false;
 
 			field.choices = null;
@@ -147,7 +147,7 @@ 
 
 			if( !field.choices ) {
 				field.choices = new Array(
-					new Choice("<?php _e( 'Yes, display my entry on the website', 'gravityview' ); ?>")
+					new Choice("<?php _e('Yes, display my entry on the website', 'gravityview'); ?>")
 				);
 			}
 
@@ -173,17 +173,17 @@ 
 	 * @return void|boolean
 	 */
 	public function process_bulk_action() {
-		if ( ! class_exists( 'RGForms' ) ) {
+		if (!class_exists('RGForms')) {
 			return;
 		}
 
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
-		if ( 'bulk' === RGForms::post( 'action' ) && empty( $_POST['gforms_update_note'] ) ) {
+		if ('bulk' === RGForms::post('action') && empty($_POST['gforms_update_note'])) {
 
-			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
+			check_admin_referer('gforms_entry_list', 'gforms_entry_list');
 
 			// The action is formatted like: approve-16 or disapprove-16, where the first word is the name of the action and the second is the ID of the form. Bulk action 2 is the bottom bulk action select form.
-			$bulk_action = ! empty( $_POST['bulk_action'] ) ? $_POST['bulk_action'] : $_POST['bulk_action2'];
+			$bulk_action = !empty($_POST['bulk_action']) ? $_POST['bulk_action'] : $_POST['bulk_action2'];
 
 			/**
 			 * The extra '-' is to make sure that there are at *least* two items in array.
@@ -191,27 +191,27 @@ 
 			 */
 			$bulk_action .= '-';
 
-			list( $approved_status, $form_id ) = explode( '-', $bulk_action );
+			list($approved_status, $form_id) = explode('-', $bulk_action);
 
-			if ( empty( $form_id ) ) {
-				do_action( 'gravityview_log_error', '[process_bulk_action] Form ID is empty from parsing bulk action.', $bulk_action );
+			if (empty($form_id)) {
+				do_action('gravityview_log_error', '[process_bulk_action] Form ID is empty from parsing bulk action.', $bulk_action);
 				return false;
 			}
 
 			// All entries are set to be updated, not just the visible ones
-			if ( ! empty( $_POST['all_entries'] ) ) {
+			if (!empty($_POST['all_entries'])) {
 
 				// Convert the current entry search into GF-formatted search criteria
 				$search = array(
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
+					'search_field' => isset($_POST['f']) ? $_POST['f'][0] : 0,
+					'search_value' => isset($_POST['v'][0]) ? $_POST['v'][0] : '',
+					'search_operator' => isset($_POST['o'][0]) ? $_POST['o'][0] : 'contains',
 				);
 
-				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
+				$search_criteria = GravityView_frontend::get_search_criteria($search, $form_id);
 
 				// Get all the entry IDs for the form
-				$entries = gravityview_get_entry_ids( $form_id, $search_criteria );
+				$entries = gravityview_get_entry_ids($form_id, $search_criteria);
 
 			} else {
 
@@ -219,22 +219,22 @@ 
 
 			}
 
-			if ( empty( $entries ) ) {
-				do_action( 'gravityview_log_error', '[process_bulk_action] Entries are empty' );
+			if (empty($entries)) {
+				do_action('gravityview_log_error', '[process_bulk_action] Entries are empty');
 				return false;
 			}
 
-			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
+			$entry_count = count($entries) > 1 ? sprintf(__('%d entries', 'gravityview'), count($entries)) : __('1 entry', 'gravityview');
 
-			switch ( $approved_status ) {
+			switch ($approved_status) {
 				case 'approve':
-					self::update_bulk( $entries, 1, $form_id );
-					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
+					self::update_bulk($entries, 1, $form_id);
+					$this->bulk_update_message = sprintf(__('%s approved.', 'gravityview'), $entry_count);
 					break;
 
 				case 'unapprove':
-					self::update_bulk( $entries, 0, $form_id );
-					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
+					self::update_bulk($entries, 0, $form_id);
+					$this->bulk_update_message = sprintf(__('%s disapproved.', 'gravityview'), $entry_count);
 					break;
 			}
 		}
@@ -254,25 +254,25 @@ 
 	 * @param int $form_id The Gravity Forms Form ID
 	 * @return boolean|void
 	 */
-	private static function update_bulk( $entries, $approved, $form_id ) {
+	private static function update_bulk($entries, $approved, $form_id) {
 
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
+		if (empty($entries) || ($entries !== true && !is_array($entries))) {
+			do_action('gravityview_log_error', __METHOD__.' Entries were empty or malformed.', $entries);
 			return false;
 		}
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
+		if (!GVCommon::has_cap('gravityview_moderate_entries')) {
+			do_action('gravityview_log_error', __METHOD__.' User does not have the `gravityview_moderate_entries` capability.');
 			return false;
 		}
 
-		$approved = empty( $approved ) ? 0 : 'Approved';
+		$approved = empty($approved) ? 0 : 'Approved';
 
 		// calculate approved field id
-		$approved_column_id = self::get_approved_column( $form_id );
+		$approved_column_id = self::get_approved_column($form_id);
 
-		foreach( $entries as $entry_id ) {
-			self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
+		foreach ($entries as $entry_id) {
+			self::update_approved((int)$entry_id, $approved, $form_id, $approved_column_id);
 		}
 	}
 
@@ -290,39 +290,39 @@ 
 	 * @param int $approvedcolumn (default: 0)
 	 * @return boolean True: It worked; False: it failed
 	 */
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
+	public static function update_approved($entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
 
-		if( !class_exists( 'GFAPI' ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
+		if (!class_exists('GFAPI')) {
+			do_action('gravityview_log_error', __METHOD__.'GFAPI does not exist');
 			return false;
 		}
 
-		if( empty( $approvedcolumn ) ) {
-			$approvedcolumn = self::get_approved_column( $form_id );
+		if (empty($approvedcolumn)) {
+			$approvedcolumn = self::get_approved_column($form_id);
 		}
 
 		//get the entry
-		$entry = GFAPI::get_entry( $entry_id );
+		$entry = GFAPI::get_entry($entry_id);
 
 		//update entry
-		$entry[ (string)$approvedcolumn ] = $approved;
+		$entry[(string)$approvedcolumn] = $approved;
 
 		/** @var bool|WP_Error $result */
-		$result = GFAPI::update_entry( $entry );
+		$result = GFAPI::update_entry($entry);
 
 		/**
 		 * GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves.
 		 */
-		self::update_approved_meta( $entry_id, $approved );
+		self::update_approved_meta($entry_id, $approved);
 
 		// add note to entry
-		if( $result === true ) {
-			$note = empty( $approved ) ? __( 'Disapproved the Entry for GravityView', 'gravityview' ) : __( 'Approved the Entry for GravityView', 'gravityview' );
+		if ($result === true) {
+			$note = empty($approved) ? __('Disapproved the Entry for GravityView', 'gravityview') : __('Approved the Entry for GravityView', 'gravityview');
 
-			if( class_exists( 'GravityView_Entry_Notes' ) ){
+			if (class_exists('GravityView_Entry_Notes')) {
 				global $current_user;
       			get_currentuserinfo();
-				GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note );
+				GravityView_Entry_Notes::add_note($entry_id, $current_user->ID, $current_user->display_name, $note);
 			}
 
 			/**
@@ -330,11 +330,11 @@ 
 			 * @see class-cache.php
 			 * @since 1.5.1
 			 */
-			do_action( 'gravityview_clear_form_cache', $form_id );
+			do_action('gravityview_clear_form_cache', $form_id);
 
-		} else if( is_wp_error( $result ) ) {
+		} else if (is_wp_error($result)) {
 
-			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
+			do_action('gravityview_log_error', __METHOD__.sprintf(' - Entry approval not updated: %s', $result->get_error_message()));
 
 			$result = false;
 		}
@@ -352,20 +352,20 @@ 
 	 * @param  int $entry_id ID of the Gravity Forms entry
 	 * @return void
 	 */
-	public static function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
+	public static function after_update_entry_update_approved_meta($form, $entry_id = NULL) {
 
-		$approvedcolumn = self::get_approved_column( $form['id'] );
+		$approvedcolumn = self::get_approved_column($form['id']);
 
         /**
          * If the form doesn't contain the approve field, don't assume anything.
          */
-        if( empty( $approvedcolumn ) ) {
+        if (empty($approvedcolumn)) {
             return;
         }
 
-		$entry = GFAPI::get_entry( $entry_id );
+		$entry = GFAPI::get_entry($entry_id);
 
-		self::update_approved_meta( $entry_id, $entry[ (string)$approvedcolumn ] );
+		self::update_approved_meta($entry_id, $entry[(string)$approvedcolumn]);
 
 	}
 
@@ -378,12 +378,12 @@ 
 	 *
 	 * @return void
 	 */
-	private static function update_approved_meta( $entry_id, $is_approved ) {
+	private static function update_approved_meta($entry_id, $is_approved) {
 
 		// update entry meta
-		if( function_exists('gform_update_meta') ) {
+		if (function_exists('gform_update_meta')) {
 
-			gform_update_meta( $entry_id, 'is_approved', $is_approved );
+			gform_update_meta($entry_id, 'is_approved', $is_approved);
 
 			/**
 			 * @action `gravityview/approve_entries/updated` Triggered when an entry approval is updated
@@ -391,16 +391,16 @@ 
 			 * @param  int $entry_id ID of the Gravity Forms entry
 			 * @param  string $is_approved String whether entry is approved or not. `0` for not approved, `Approved` for approved.
 			 */
-			do_action( 'gravityview/approve_entries/updated', $entry_id, $is_approved );
+			do_action('gravityview/approve_entries/updated', $entry_id, $is_approved);
 
-			if( empty( $is_approved ) ) {
+			if (empty($is_approved)) {
 
 				/**
 				 * @action `gravityview/approve_entries/disapproved` Triggered when an entry is rejected
 				 * @since 1.7.6.1
 				 * @param  int $entry_id ID of the Gravity Forms entry
 				 */
-				do_action( 'gravityview/approve_entries/disapproved', $entry_id );
+				do_action('gravityview/approve_entries/disapproved', $entry_id);
 
 			} else {
 
@@ -409,13 +409,13 @@ 
 				 * @since 1.7.6.1
 				 * @param  int $entry_id ID of the Gravity Forms entry
 				 */
-				do_action( 'gravityview/approve_entries/approved', $entry_id );
+				do_action('gravityview/approve_entries/approved', $entry_id);
 
 			}
 
 		} else {
 
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
+			do_action('gravityview_log_error', __METHOD__.' - `gform_update_meta` does not exist.');
 
 		}
 	}
@@ -427,40 +427,40 @@ 
 	 */
 	public function ajax_update_approved() {
 
-		if( empty( $_POST['entry_id'] ) || empty( $_POST['form_id'] ) ) {
+		if (empty($_POST['entry_id']) || empty($_POST['form_id'])) {
 
-			do_action( 'gravityview_log_error', __METHOD__ . ' entry_id or form_id are empty.', $_POST );
+			do_action('gravityview_log_error', __METHOD__.' entry_id or form_id are empty.', $_POST);
 
 			$result = false;
 		}
 
-		else if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxgfentries' ) ) {
+		else if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxgfentries')) {
 
-			do_action( 'gravityview_log_error', __METHOD__ . ' Security check failed.', $_POST );
+			do_action('gravityview_log_error', __METHOD__.' Security check failed.', $_POST);
 
 			$result = false;
 		}
 
-		else if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $_POST['entry_id'] ) ) {
+		else if (!GVCommon::has_cap('gravityview_moderate_entries', $_POST['entry_id'])) {
 
-			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
+			do_action('gravityview_log_error', __METHOD__.' User does not have the `gravityview_moderate_entries` capability.');
 
 			$result = false;
 		}
 
 		else {
 
-			$result = self::update_approved( $_POST['entry_id'], $_POST['approved'], $_POST['form_id'] );
+			$result = self::update_approved($_POST['entry_id'], $_POST['approved'], $_POST['form_id']);
 
-			if( is_wp_error( $result ) ) {
+			if (is_wp_error($result)) {
 				/** @var WP_Error $result */
-				do_action( 'gravityview_log_error', __METHOD__ .' Error updating approval: ' . $result->get_error_message() );
+				do_action('gravityview_log_error', __METHOD__.' Error updating approval: '.$result->get_error_message());
 				$result = false;
 			}
 
 		}
 
-		exit( $result );
+		exit($result);
 	}
 
 
@@ -472,30 +472,30 @@ 
 	 * @param mixed $form GF Form or Form ID
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
 	 */
-	static public function get_approved_column( $form ) {
+	static public function get_approved_column($form) {
 
-        if( empty( $form ) ) {
+        if (empty($form)) {
             return null;
         }
 
-        if( !is_array( $form ) ) {
-            $form = GVCommon::get_form( $form );
+        if (!is_array($form)) {
+            $form = GVCommon::get_form($form);
         }
 
-		foreach( $form['fields'] as $key => $field ) {
+		foreach ($form['fields'] as $key => $field) {
 
-            $field = (array) $field;
+            $field = (array)$field;
 
-			if( !empty( $field['gravityview_approved'] ) ) {
-				if( !empty($field['inputs'][0]['id']) ) {
+			if (!empty($field['gravityview_approved'])) {
+				if (!empty($field['inputs'][0]['id'])) {
 					return $field['inputs'][0]['id'];
 				}
 			}
 
             // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
-            if( 'checkbox' == $field['type'] && isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                foreach ( $field['inputs'] as $key2 => $input ) {
-                    if ( strtolower( $input['label'] ) == 'approved' ) {
+            if ('checkbox' == $field['type'] && isset($field['inputs']) && is_array($field['inputs'])) {
+                foreach ($field['inputs'] as $key2 => $input) {
+                    if (strtolower($input['label']) == 'approved') {
                         return $input['id'];
                     }
                 }
@@ -507,70 +507,70 @@ 
 
 
 
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
+	static public function add_entry_approved_hidden_input($form_id, $field_id, $value, $entry, $query_string) {
 
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
+		if (!GVCommon::has_cap('gravityview_moderate_entries', $entry['id'])) {
 			return;
 		}
 
-		if( empty( $entry['id'] ) ) {
+		if (empty($entry['id'])) {
 			return;
 		}
 
-		if( gform_get_meta( $entry['id'], 'is_approved' ) ) {
-			echo '<input type="hidden" class="entry_approved" id="entry_approved_'. $entry['id'] .'" value="true" />';
+		if (gform_get_meta($entry['id'], 'is_approved')) {
+			echo '<input type="hidden" class="entry_approved" id="entry_approved_'.$entry['id'].'" value="true" />';
 		}
 	}
 
 
 
 
-	function add_scripts_and_styles( $hook ) {
+	function add_scripts_and_styles($hook) {
 
-		if( !class_exists( 'RGForms' ) ) {
+		if (!class_exists('RGForms')) {
 
-			do_action( 'gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] RGForms does not exist.' );
+			do_action('gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] RGForms does not exist.');
 
 			return;
 		}
 
 		// enqueue styles & scripts gf_entries
 		// But only if we're on the main Entries page, not on reports pages
-		if( RGForms::get_page() === 'entry_list' ) {
+		if (RGForms::get_page() === 'entry_list') {
 
 			$form_id = RGForms::get('id');
 
 			// If there are no forms identified, use the first form. That's how GF does it.
-			if( empty( $form_id ) && class_exists('RGFormsModel') ) {
+			if (empty($form_id) && class_exists('RGFormsModel')) {
 				$forms = gravityview_get_forms();
-				if( !empty( $forms ) ) {
+				if (!empty($forms)) {
 					$form_id = $forms[0]['id'];
 				}
 			}
 
-			$approvedcolumn = self::get_approved_column( $form_id );
+			$approvedcolumn = self::get_approved_column($form_id);
 
-			wp_register_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
-			wp_enqueue_style( 'gravityview_entries_list' );
+			wp_register_style('gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version);
+			wp_enqueue_style('gravityview_entries_list');
 
 			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-			wp_register_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
-			wp_enqueue_script( 'gravityview_gf_entries_scripts' );
+			wp_register_script('gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array('jquery'), GravityView_Plugin::version);
+			wp_enqueue_script('gravityview_gf_entries_scripts');
 
-			wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
-				'nonce' => wp_create_nonce( 'gravityview_ajaxgfentries'),
+			wp_localize_script('gravityview_gf_entries_scripts', 'gvGlobals', array(
+				'nonce' => wp_create_nonce('gravityview_ajaxgfentries'),
 				'form_id' => $form_id,
-				'show_column' => (int)$this->show_approve_entry_column( $form_id ),
-				'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
-				'label_approve' => __( 'Approve', 'gravityview' ) ,
-				'label_disapprove' => __( 'Disapprove', 'gravityview' ),
+				'show_column' => (int)$this->show_approve_entry_column($form_id),
+				'add_bulk_action' => (int)GVCommon::has_cap('gravityview_moderate_entries'),
+				'label_approve' => __('Approve', 'gravityview'),
+				'label_disapprove' => __('Disapprove', 'gravityview'),
 				'bulk_message' => $this->bulk_update_message,
-				'approve_title' => __( 'Entry not approved for directory viewing. Click to approve this entry.', 'gravityview'),
-				'unapprove_title' => __( 'Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview'),
-				'column_title' => __( 'Show entry in directory view?', 'gravityview'),
-				'column_link' => esc_url( add_query_arg( array('sort' => $approvedcolumn) ) ),
-			) );
+				'approve_title' => __('Entry not approved for directory viewing. Click to approve this entry.', 'gravityview'),
+				'unapprove_title' => __('Entry approved for directory viewing. Click to disapprove this entry.', 'gravityview'),
+				'column_title' => __('Show entry in directory view?', 'gravityview'),
+				'column_link' => esc_url(add_query_arg(array('sort' => $approvedcolumn))),
+			));
 
 		}
 
@@ -585,22 +585,22 @@ 
 	 *
 	 * @return bool True: Show column; False: hide column
 	 */
-	private function show_approve_entry_column( $form_id ) {
+	private function show_approve_entry_column($form_id) {
 
-		$show_approve_column = GVCommon::has_cap( 'gravityview_moderate_entries' );
+		$show_approve_column = GVCommon::has_cap('gravityview_moderate_entries');
 
 		/**
 		 * @filter `gravityview/approve_entries/hide-if-no-connections` Return true to hide reject/approve if there are no connected Views
 		 * @since 1.7.2
 		 * @param boolean $hide_if_no_connections
 		 */
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
+		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false);
 
-		if( $hide_if_no_connections ) {
+		if ($hide_if_no_connections) {
 
-			$connected_views = gravityview_get_connected_views( $form_id );
+			$connected_views = gravityview_get_connected_views($form_id);
 
-			if( empty( $connected_views ) ) {
+			if (empty($connected_views)) {
 				$show_approve_column = false;
 			}
 		}
@@ -610,17 +610,17 @@ 
 		 * @param boolean $show_approve_column Whether the column will be shown
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
 		 */
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
+		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id);
 
 		return $show_approve_column;
 	}
 
-	function register_gform_noconflict_script( $scripts ) {
+	function register_gform_noconflict_script($scripts) {
 		$scripts[] = 'gravityview_gf_entries_scripts';
 		return $scripts;
 	}
 
-	function register_gform_noconflict_style( $styles ) {
+	function register_gform_noconflict_style($styles) {
 		$styles[] = 'gravityview_entries_list';
 		return $styles;
 	}

includes/class-admin-label.php

Spacing +36 added lines, -36 removed lines

@@ -11,29 +11,29 @@ 
 		$field_info_items = array();
 
 		// Fields with IDs, not like Source URL or Entry ID
-		if( is_numeric( $this->id ) ) {
+		if (is_numeric($this->id)) {
 
-			$field_type_title = GFCommon::get_field_type_title( $this->item['input_type'] );
+			$field_type_title = GFCommon::get_field_type_title($this->item['input_type']);
 
 			$field_info_items[] = array(
-				'value' => sprintf( __('Type: %s', 'gravityview'), $field_type_title )
+				'value' => sprintf(__('Type: %s', 'gravityview'), $field_type_title)
 			);
 
 			$field_info_items[] = array(
-				'value' => sprintf( __('Field ID: %s', 'gravityview'), $this->id ),
+				'value' => sprintf(__('Field ID: %s', 'gravityview'), $this->id),
 			);
 
 		}
 
-		if( !empty( $this->item['desc'] ) ) {
+		if (!empty($this->item['desc'])) {
 			$field_info_items[] = array(
 				'value' => $this->item['desc']
 			);
 		}
 
-		if( !empty( $this->item['adminLabel'] ) ) {
+		if (!empty($this->item['adminLabel'])) {
 			$field_info_items[] = array(
-				'value' => sprintf( __('Admin Label: %s', 'gravityview' ), $this->item['adminLabel'] ),
+				'value' => sprintf(__('Admin Label: %s', 'gravityview'), $this->item['adminLabel']),
 				'class'	=> 'gv-sublabel'
 			);
 		}
@@ -52,7 +52,7 @@ 
 		$field_info = '';
 		$field_info_items = array();
 
-		if( !empty( $this->item['description'] ) ) {
+		if (!empty($this->item['description'])) {
 
 			$field_info_items[] = array(
 				'value' => $this->item['description']
@@ -77,16 +77,16 @@ 
 	private   $label_type;
 	protected $item;
 
-	function __construct( $title = '', $field_id, $item = array(), $settings = array() ) {
+	function __construct($title = '', $field_id, $item = array(), $settings = array()) {
 
 		// Backward compat
-		if( !empty( $item['type'] ) ) {
+		if (!empty($item['type'])) {
 			$item['input_type'] = $item['type'];
-			unset( $item['type'] );
+			unset($item['type']);
 		}
 
 		// Prevent items from not having index set
-		$item = wp_parse_args( $item, array(
+		$item = wp_parse_args($item, array(
 			'label_text' => $title,
 			'field_id' => NULL,
 			'parent_label' => NULL,
@@ -129,7 +129,7 @@ 
 	 * @param  boolean $html Display HTML output? If yes, output is wrapped in spans. If no, plaintext.
 	 * @return string|null        If empty, return null. Otherwise, return output HTML/text.
 	 */
-	protected function get_item_info( $html = true ) {
+	protected function get_item_info($html = true) {
 
 		$output = NULL;
 		$field_info_items = $this->additional_info();
@@ -139,27 +139,27 @@ 
 		 * @param array $field_info_items Additional information to display in a field
 		 * @param GravityView_Admin_View_Field $this Field shown in the admin
 		 */
-		$field_info_items = apply_filters( 'gravityview_admin_label_item_info', $field_info_items, $this );
+		$field_info_items = apply_filters('gravityview_admin_label_item_info', $field_info_items, $this);
 
-		if( $html ) {
+		if ($html) {
 
-			foreach ( $field_info_items as $item ) {
-				$class = isset($item['class']) ? sanitize_html_class( $item['class'] ).' description' : 'description';
+			foreach ($field_info_items as $item) {
+				$class = isset($item['class']) ? sanitize_html_class($item['class']).' description' : 'description';
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
 				$output .= '<span class="'.$class.'">';
-				$output .= esc_html( $item['value'] );
+				$output .= esc_html($item['value']);
 				$output .= '</span>';
 			}
 
 		} else {
 
-			$values = wp_list_pluck( $field_info_items, 'value' );
+			$values = wp_list_pluck($field_info_items, 'value');
 
-			$output = esc_html( implode(', ', $values) );
+			$output = esc_html(implode(', ', $values));
 
 		}
 
-		return empty( $output ) ? NULL : $output;
+		return empty($output) ? NULL : $output;
 
 	}
 
@@ -176,47 +176,47 @@ 
 
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
 		// TODO: Un-hack this
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->') > 0 ) ? 'hide-if-js' : '';
-		$settings_link = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
+		$hide_settings_link = (empty($this->item['settings_html']) || strpos($this->item['settings_html'], '<!-- No Options -->') > 0) ? 'hide-if-js' : '';
+		$settings_link = sprintf('<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr($settings_title));
 
 		// Should we show the icon that the field is being used as a link to single entry?
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
-		$show_as_link = '<span class="dashicons dashicons-admin-links '.$hide_show_as_link_class.'" title="'.esc_attr( $single_link_title ).'"></span>';
+		$hide_show_as_link_class = empty($this->settings['show_as_link']) ? 'hide-if-js' : '';
+		$show_as_link = '<span class="dashicons dashicons-admin-links '.$hide_show_as_link_class.'" title="'.esc_attr($single_link_title).'"></span>';
 
 		// When a field label is empty, use the Field ID
-		$label = empty( $this->title ) ? sprintf( _x('Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview'), $this->id ) : $this->title;
+		$label = empty($this->title) ? sprintf(_x('Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview'), $this->id) : $this->title;
 
 		// If there's a custom label, and show label is checked, use that as the field heading
-		if( !empty( $this->settings['custom_label'] ) && !empty( $this->settings['show_label'] ) ) {
+		if (!empty($this->settings['custom_label']) && !empty($this->settings['show_label'])) {
 			$label = $this->settings['custom_label'];
-		} else if( !empty( $this->item['customLabel'] ) ) {
+		} else if (!empty($this->item['customLabel'])) {
 			$label = $this->item['customLabel'];
 		}
 
 		$output = '<h5 class="selectable gfield field-id-'.esc_attr($this->id).'">';
 
-		$label = esc_attr( $label );
+		$label = esc_attr($label);
 
-		if( !empty( $this->item['parent'] ) ) {
-			$label .= ' <small>('.esc_attr( $this->item['parent']['label'] ) .')</small>';
+		if (!empty($this->item['parent'])) {
+			$label .= ' <small>('.esc_attr($this->item['parent']['label']).')</small>';
 		}
 
 		// Name of field / widget
-		$output .= '<span class="gv-field-label" data-original-title="'.esc_attr( $label ).'" title="'. $this->get_item_info( false ) .'">'. $label . '</span>';
+		$output .= '<span class="gv-field-label" data-original-title="'.esc_attr($label).'" title="'.$this->get_item_info(false).'">'.$label.'</span>';
 
 
-		$output .= '<span class="gv-field-controls">'.$settings_link.$show_as_link.'<a href="#remove" class="dashicons-dismiss dashicons" title="'.esc_attr( $delete_title ) .'"></a></span>';
+		$output .= '<span class="gv-field-controls">'.$settings_link.$show_as_link.'<a href="#remove" class="dashicons-dismiss dashicons" title="'.esc_attr($delete_title).'"></a></span>';
 
 		// Displays only in the field/widget picker.
-		if( $field_info = $this->get_item_info() ) {
+		if ($field_info = $this->get_item_info()) {
 			$output .= '<span class="gv-field-info">'.$field_info.'</span>';
 		}
 
 		$output .= '</h5>';
 
-		$container_class = !empty( $this->item['parent'] ) ? ' gv-child-field' : '';
+		$container_class = !empty($this->item['parent']) ? ' gv-child-field' : '';
 
-		$output = '<div data-fieldid="'.esc_attr($this->id).'" data-inputtype="'.esc_attr( $this->item['input_type'] ).'" class="gv-fields'.$container_class.'">'.$output.$this->item['settings_html'].'</div>';
+		$output = '<div data-fieldid="'.esc_attr($this->id).'" data-inputtype="'.esc_attr($this->item['input_type']).'" class="gv-fields'.$container_class.'">'.$output.$this->item['settings_html'].'</div>';
 
 		return $output;
 	}

includes/class-admin-views.php

Spacing +250 added lines, -250 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -22,40 +22,40 @@ 
 
 	function __construct() {
 
-		add_action( 'save_post', array( $this, 'save_postdata' ) );
+		add_action('save_post', array($this, 'save_postdata'));
 
 		// set the blacklist field types across the entire plugin
-		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
+		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_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' ) );
+		add_action('restrict_manage_posts', array($this, 'add_view_dropdown'));
 
-		add_action( 'pre_get_posts', array( $this, 'filter_pre_get_posts_by_gravityview_form_id' ) );
+		add_action('pre_get_posts', array($this, 'filter_pre_get_posts_by_gravityview_form_id'));
 
 	}
 
@@ -63,42 +63,42 @@ 
 	 * @since 1.15
 	 * @param WP_Query $query
 	 */
-	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
+	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;
 		}
 
-		if ( $query->query_vars[ 'post_type' ] == 'gravityview' ) {
-			$query->set( 'meta_query', array(
+		if ($query->query_vars['post_type'] == 'gravityview') {
+			$query->set('meta_query', array(
 				array(
 					'key' => '_gravityview_form_id',
-					'value' => rgget( 'gravityview_form_id' ),
+					'value' => rgget('gravityview_form_id'),
 				)
-			) );
+			));
 		}
 	}
 
 	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' );
+		$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>
+				<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 } ?>
 			</select>
 		<?php }
@@ -109,18 +109,18 @@ 
 	 * @deprecated since 1.2
 	 * Start using GravityView_Render_Settings::render_setting_row
 	 */
-	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 );
+	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);
 	}
 
 	/**
 	 * @deprecated since 1.2
 	 * Start using GravityView_Render_Settings::render_field_option
 	 */
-	public static function render_field_option( $name = '', $option, $curr_value = NULL ) {
-		_deprecated_function( 'GravityView_Admin_Views::render_field_option', '1.1.7', 'GravityView_Render_Settings::render_field_option' );
-		return GravityView_Render_Settings::render_field_option( $name, $option, $curr_value );
+	public static function render_field_option($name = '', $option, $curr_value = NULL) {
+		_deprecated_function('GravityView_Admin_Views::render_field_option', '1.1.7', 'GravityView_Render_Settings::render_field_option');
+		return GravityView_Render_Settings::render_field_option($name, $option, $curr_value);
 	}
 
 
@@ -130,31 +130,31 @@ 
 	 * @param  int $id         ID of the current Gravity form
 	 * @return array            Modified array
 	 */
-	static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
+	static function gform_toolbar_menu($menu_items = array(), $id = NULL) {
 
-		$connected_views = gravityview_get_connected_views( $id );
+		$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 ) {
+		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(
-				'label' => esc_attr( $label ),
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
+				'label' => esc_attr($label),
+				'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(
@@ -165,16 +165,16 @@ 
 			);
 
 			$menu_items['gravityview'] = array(
-				'label'          => __( 'Connected Views', 'gravityview' ),
+				'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' ),
+				'title'          => __('GravityView Views using this form as a data source', 'gravityview'),
 				'url'            => '#',
 				'onclick'        => 'return false;',
 				'menu_class'     => 'gv_connected_forms gf_form_toolbar_settings',
-				'link_class'     => ( 1 === 1 ? '' : 'gf_toolbar_disabled' ),
+				'link_class'     => (1 === 1 ? '' : 'gf_toolbar_disabled'),
 				'sub_menu_items' => $sub_menu_items,
 				'priority'       => 0,
-				'capabilities'   => array( 'edit_gravityviews' ),
+				'capabilities'   => array('edit_gravityviews'),
 			);
 		}
 
@@ -189,16 +189,16 @@ 
 	 * @access public
 	 * @return array Default blacklist fields merged with existing blacklist fields
 	 */
-	function default_field_blacklist( $array = array(), $context = NULL ) {
+	function default_field_blacklist($array = array(), $context = NULL) {
 
-		$add = array( 'captcha', 'page' );
+		$add = array('captcha', 'page');
 
 		// Don't allowing editing the following values:
-		if( $context === 'edit' ) {
+		if ($context === 'edit') {
 			$add[] = 'post_id';
 		}
 
-		$return = array_merge( $array, $add );
+		$return = array_merge($array, $add);
 
 		return $return;
 	}
@@ -208,33 +208,33 @@ 
 	 * @param  array       $tooltips Array of Gravity Forms tooltips
 	 * @return array                Modified tooltips array
 	 */
-	public function tooltips( $tooltips = array() ) {
+	public function tooltips($tooltips = array()) {
 
 		$gv_tooltips = array();
 
 		// Generate tooltips for View settings
-		$default_args = GravityView_View_Data::get_default_args( true );
+		$default_args = GravityView_View_Data::get_default_args(true);
 
-		foreach ( $default_args as $key => $arg ) {
+		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'] ) ) {
+			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(
+			$gv_tooltips['gv_'.$key] = array(
 				'title'	=> $arg['label'],
 				'value'	=> $tooltip,
 			);
@@ -243,20 +243,20 @@ 
 
 		$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>' )
+			'value' => sprintf(__('Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>')
 		);
 
 		/**
 		 * @filter `gravityview_tooltips` The tooltips GravityView adds to the Gravity Forms tooltip array
 		 * @param array $gv_tooltips Associative array with unique keys containing array of `title` and `value` keys, as expected by `gform_tooltips` filter
 		 */
-		$gv_tooltips = apply_filters( 'gravityview_tooltips', $gv_tooltips );
+		$gv_tooltips = apply_filters('gravityview_tooltips', $gv_tooltips);
 
-		foreach ( $gv_tooltips as $key => $tooltip ) {
+		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,27 +270,27 @@ 
 	 *
 	 * @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 = '';
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'gv_template':
 
-				$template_id = gravityview_get_template_id( $post_id );
+				$template_id = gravityview_get_template_id($post_id);
 
 				// All Views should have a connected form. If it doesn't, that's not right.
-				if ( empty( $template_id ) ) {
-					do_action( 'gravityview_log_error', sprintf( __METHOD__ . ' View ID %s does not have a connected template.', $post_id ) );
+				if (empty($template_id)) {
+					do_action('gravityview_log_error', sprintf(__METHOD__.' View ID %s does not have a connected template.', $post_id));
 					break;
 				}
 
 				$templates = gravityview_get_registered_templates();
 
-				$template = isset( $templates[ $template_id ] ) ? $templates[ $template_id ] : false;
+				$template = isset($templates[$template_id]) ? $templates[$template_id] : false;
 
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
-				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
+				$template_id_pretty = ucwords(implode(' ', explode('_', $template_id)));
 
 				$output = $template ? $template['label'] : $template_id_pretty;
 
@@ -298,24 +298,24 @@ 
 
 			case 'gv_connected_form':
 
-				$form_id = gravityview_get_form_id( $post_id );
+				$form_id = gravityview_get_form_id($post_id);
 
 				// All Views should have a connected form. If it doesn't, that's not right.
-				if ( empty( $form_id ) ) {
-					do_action( 'gravityview_log_error', sprintf( '[add_data_source_column_content] View ID %s does not have a connected GF form.', $post_id ) );
-					$output = __( 'Not connected.', 'gravityview' );
+				if (empty($form_id)) {
+					do_action('gravityview_log_error', sprintf('[add_data_source_column_content] View ID %s does not have a connected GF form.', $post_id));
+					$output = __('Not connected.', 'gravityview');
 					break;
 				}
 
-				$form = gravityview_get_form( $form_id );
+				$form = gravityview_get_form($form_id);
 
-				if ( ! $form ) {
-					do_action( 'gravityview_log_error', sprintf( '[add_data_source_column_content] Connected form not found: Form #%d', $form_id ) );
+				if (!$form) {
+					do_action('gravityview_log_error', sprintf('[add_data_source_column_content] Connected form not found: Form #%d', $form_id));
 
-					$output = __( 'The connected form can not be found; it may no longer exist.', 'gravityview' );
+					$output = __('The connected form can not be found; it may no longer exist.', 'gravityview');
 				}
 
-				$output = self::get_connected_form_links( $form );
+				$output = self::get_connected_form_links($form);
 
 				break;
 		}
@@ -330,47 +330,47 @@ 
 	 * @param  boolean $include_form_link Whether to include the bold name of the form in the output
 	 * @return string          HTML links
 	 */
-	static public function get_connected_form_links( $form, $include_form_link = true ) {
+	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 ) ) {
-			$form = gravityview_get_form( $form );
+		if (!is_array($form)) {
+			$form = gravityview_get_form($form);
 		}
 
 		$form_id = $form['id'];
 		$links = array();
 
-		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>';
+		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>';
 		} 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' ) ) {
-			$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>';
+		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>';
 		}
 
-		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>';
+		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>';
 		}
 
-		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>';
+		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>';
 		}
 
 		$output = '';
 
-		if( !empty( $include_form_link ) ) {
+		if (!empty($include_form_link)) {
 			$output .= $form_link;
 		}
 
@@ -380,9 +380,9 @@ 
 		 * @param array $links Links to show
 		 * @param array $form Gravity Forms form array
 		 */
-		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
+		$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;
 	}
@@ -391,13 +391,13 @@ 
 	 * Add the Data Source column to the Views page
 	 * @param  array      $columns Columns array
 	 */
-	public function add_post_type_columns( $columns ) {
+	public function add_post_type_columns($columns) {
 
 		// 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'] );
+		unset($columns['date']);
 
 		$data_source_required_caps = array(
 			'gravityforms_edit_forms',
@@ -408,11 +408,11 @@ 
 			'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;
@@ -427,91 +427,91 @@ 
 	 * @param int $post_id Currently saved Post ID
 	 * @return void
 	 */
-	function save_postdata( $post_id ) {
+	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;
 		}
 
 		// validate user can edit and save View
-		if ( ! GVCommon::has_cap( 'edit_gravityview', $post_id ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to edit View #' . $post_id, wp_get_current_user() );
+		if (!GVCommon::has_cap('edit_gravityview', $post_id)) {
+			do_action('gravityview_log_error', __METHOD__.' - Current user does not have the capability to edit View #'.$post_id, wp_get_current_user());
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', '[save_postdata] Saving View post type.', $_POST );
+		do_action('gravityview_log_debug', '[save_postdata] Saving View post type.', $_POST);
 
 		$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'] ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
+		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'] ) ) {
+			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'];
 
 					} 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);
 
 					}
 
@@ -522,24 +522,24 @@ 
 				}
 			}
 
-			$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'] ) ) {
+			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));
 	}
 
 	/**
 	 * @deprecated 1.1.6
 	 */
 	function render_label() {
-		_deprecated_function( 'GravityView_Admin_Views::render_label()', '1.1.6', 'Use the GravityView_Admin_View_Field class instead.' );
+		_deprecated_function('GravityView_Admin_Views::render_label()', '1.1.6', 'Use the GravityView_Admin_View_Field class instead.');
 	}
 
 	/**
@@ -551,33 +551,33 @@ 
 	 * @param string $context (default: 'single')
 	 * @return void
 	 */
-	function render_available_fields( $form = '', $context = 'single' ) {
+	function render_available_fields($form = '', $context = 'single') {
 
 		/**
 		 * @filter  `gravityview_blacklist_field_types` Modify the types of fields that shouldn't be shown in a View.
 		 * @param[in,out] array $blacklist_field_types Array of field types to block for this context.
 		 * @param[in] string $context View context ('single', 'directory', or 'edit')
 		 */
-		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array(), $context );
+		$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array(), $context);
 
-		$fields = $this->get_available_fields( $form, $context );
+		$fields = $this->get_available_fields($form, $context);
 
 		$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,22 +585,22 @@ 
 		echo $output;
 
 		// For the EDIT view we only want to allow the form fields.
-		if( $context === 'edit' ) {
+		if ($context === 'edit') {
 			return;
 		}
 
-		$this->render_additional_fields( $form, $context );
+		$this->render_additional_fields($form, $context);
 	}
 
-	function render_additional_fields( $form, $context ) {
+	function render_additional_fields($form, $context) {
 
 		/**
 		 * @filter `gravityview_additional_fields` non-standard Fields to show at the bottom of the field picker
 		 * @param array $additional_fields Associative array of field arrays, with `label_text`, `desc`, `field_id`, `label_type`, `input_type`, `field_options`, and `settings_html` keys
 		 */
-		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
+		$additional_fields = apply_filters('gravityview_additional_fields', array(
 			array(
-				'label_text' => __( '+ Add All Fields', 'gravityview' ),
+				'label_text' => __('+ Add All Fields', 'gravityview'),
 				'desc' => __('Add all the available fields at once.', 'gravityview'),
 				'field_id' => 'all-fields',
 				'label_type' => 'field',
@@ -610,11 +610,11 @@ 
 			)
 		));
 
-		if( !empty( $additional_fields )) {
-			foreach ( (array)$additional_fields as $item ) {
+		if (!empty($additional_fields)) {
+			foreach ((array)$additional_fields as $item) {
 
 				// Prevent items from not having index set
-				$item = wp_parse_args( $item, array(
+				$item = wp_parse_args($item, array(
 					'label_text' => NULL,
 					'field_id' => NULL,
 					'label_type' => NULL,
@@ -624,13 +624,13 @@ 
 				));
 
 				// Backward compat.
-				if( !empty( $item['field_options'] ) ) {
+				if (!empty($item['field_options'])) {
 					// Use settings_html from now on.
 					$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);
 
 			}
 		}
@@ -647,7 +647,7 @@ 
 
 		$entry_default_fields = array();
 
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
+		if (in_array($zone, array('directory', 'single'))) {
 
 			$entry_default_fields = array(
 				'id' => array(
@@ -696,7 +696,7 @@ 
 	        );
 
 
-			if( 'single' !== $zone) {
+			if ('single' !== $zone) {
 
 	        	$entry_default_fields['entry_link'] = array(
 	        		'label' => __('Link to Entry', 'gravityview'),
@@ -714,7 +714,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);
 	}
 
 	/**
@@ -723,25 +723,25 @@ 
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
 	 * @return array         fields
 	 */
-	function get_available_fields( $form = '', $zone = NULL ) {
+	function get_available_fields($form = '', $zone = NULL) {
 
-		if( empty( $form ) ) {
-			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
+		if (empty($form)) {
+			do_action('gravityview_log_error', '[get_available_fields] $form is empty');
 			return array();
 		}
 
 		// get form fields
-		$fields = gravityview_get_form_fields( $form, true );
+		$fields = gravityview_get_form_fields($form, true);
 
 		// get meta fields ( only if form was already created )
-		if( !is_array( $form ) ) {
-			$meta_fields = gravityview_get_entry_meta( $form );
+		if (!is_array($form)) {
+			$meta_fields = gravityview_get_entry_meta($form);
 		} else {
 			$meta_fields = array();
 		}
 
 		// get default fields
-		$default_fields = $this->get_entry_default_fields( $form, $zone );
+		$default_fields = $this->get_entry_default_fields($form, $zone);
 
 		//merge without loosing the keys
 		$fields = $fields + $meta_fields + $default_fields;
@@ -758,11 +758,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);
 
 			}
 		}
@@ -779,7 +779,7 @@ 
 		 * @filter `gravityview_register_directory_widgets` Get the list of registered widgets. Each item is used to instantiate a GravityView_Admin_View_Widget object
 		 * @param array $registered_widgets Empty array
 		 */
-		$registered_widgets = apply_filters( 'gravityview_register_directory_widgets', array() );
+		$registered_widgets = apply_filters('gravityview_register_directory_widgets', array());
 
 		return $registered_widgets;
 	}
@@ -792,67 +792,67 @@ 
 	 * @param  array $values  Saved objects
 	 * @return void
 	 */
-	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
+	function render_active_areas($template_id, $type, $zone, $rows, $values) {
 		global $post;
 
-		if( $type === 'widget' ) {
-			$button_label = __( 'Add Widget', 'gravityview' );
+		if ($type === 'widget') {
+			$button_label = __('Add Widget', 'gravityview');
 		} else {
-			$button_label = __( 'Add Field', 'gravityview' );
+			$button_label = __('Add Field', 'gravityview');
 		}
 
 		$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 );
+				$form = gravityview_get_form_id($post->ID);
 			}
 
-			if( 'field' === $type ) {
-				$available_items = $this->get_available_fields( $form, $zone );
+			if ('field' === $type) {
+				$available_items = $this->get_available_fields($form, $zone);
 			} else {
 				$available_items = $this->get_registered_widgets();
 			}
 
 		}
 
-		foreach( $rows as $row ) :
-			foreach( $row as $col => $areas ) :
+		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 ); ?>">
+				<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,
@@ -861,16 +861,16 @@ 
 										);
 
 										// Merge the values with the current item to pass things like widget descriptions and original field names
-										if( $original_item ) {
-											$item = wp_parse_args( $item, $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);
 										}
 
 
@@ -880,11 +880,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>
 
@@ -901,13 +901,13 @@ 
 	 * @param  string $post_id Current Post ID (view)
 	 * @return string          html
 	 */
-	function render_widgets_active_areas( $template_id = '', $zone, $post_id = '' ) {
+	function render_widgets_active_areas($template_id = '', $zone, $post_id = '') {
 
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
 
 		$widgets = array();
-		if( !empty( $post_id ) ) {
-			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
+		if (!empty($post_id)) {
+			$widgets = get_post_meta($post_id, '_gravityview_directory_widgets', true);
 
 		}
 
@@ -915,7 +915,7 @@ 
 		?>
 
 		<div class="gv-grid gv-grid-pad gv-grid-border" id="directory-<?php echo $zone; ?>-widgets">
-			<?php $this->render_active_areas( $template_id, 'widget', $zone, $default_widget_areas, $widgets ); ?>
+			<?php $this->render_active_areas($template_id, 'widget', $zone, $default_widget_areas, $widgets); ?>
 		</div>
 
 		<?php
@@ -935,36 +935,36 @@ 
 	 * @param string $context (default: 'single')
 	 * @return string HTML of the active areas
 	 */
-	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
+	function render_directory_active_areas($template_id = '', $context = 'single', $post_id = '', $echo = false) {
 
-		if( empty( $template_id ) ) {
-			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
+		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 );
+		$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 );
+			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 .= '<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 {
 
 			$fields = '';
-			if ( ! empty( $post_id ) ) {
-				$fields = gravityview_get_directory_fields( $post_id );
+			if (!empty($post_id)) {
+				$fields = gravityview_get_directory_fields($post_id);
 			}
 
 			ob_start();
-			$this->render_active_areas( $template_id, 'field', $context, $template_areas, $fields );
+			$this->render_active_areas($template_id, 'field', $context, $template_areas, $fields);
 			$output = ob_get_clean();
 
 		}
 
-		if( $echo ) {
+		if ($echo) {
 			echo $output;
 		}
 
@@ -978,46 +978,46 @@ 
 	 * @param mixed $hook
 	 * @return void
 	 */
-	static function add_scripts_and_styles( $hook ) {
+	static function add_scripts_and_styles($hook) {
 		global $plugin_page, $pagenow;
 
-		$is_widgets_page = ( $pagenow === 'widgets.php' );
+		$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_script('jquery-ui-datepicker');
+			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';
 
 			//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_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(
 				'cookiepath' => COOKIEPATH,
-				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
-				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
-				'label_close' => __( 'Close', 'gravityview' ),
-				'label_cancel' => __( 'Cancel', 'gravityview' ),
-				'label_continue' => __( 'Continue', 'gravityview' ),
-				'label_ok' => __( 'Ok', 'gravityview' ),
-				'label_publisherror' => __( 'Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview' ),
-				'loading_text' => esc_html__( 'Loading&hellip;', 'gravityview' ),
-				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
-				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
-				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
+				'nonce' => wp_create_nonce('gravityview_ajaxviews'),
+				'label_viewname' => __('Enter View name here', 'gravityview'),
+				'label_close' => __('Close', 'gravityview'),
+				'label_cancel' => __('Cancel', 'gravityview'),
+				'label_continue' => __('Continue', 'gravityview'),
+				'label_ok' => __('Ok', 'gravityview'),
+				'label_publisherror' => __('Error while creating the View for you. Check the settings or contact GravityView support.', 'gravityview'),
+				'loading_text' => esc_html__('Loading&hellip;', 'gravityview'),
+				'loading_error' => esc_html__('There was an error loading dynamic content.', 'gravityview'),
+				'field_loaderror' => __('Error while adding the field. Please try again or contact GravityView support.', 'gravityview'),
+				'remove_all_fields' => __('Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview'),
 			));
 
-			wp_enqueue_style( 'gravityview_views_styles', 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();
 
@@ -1035,25 +1035,25 @@ 
 		    'jquery-ui-autocomplete'
 		);
 
-		if ( wp_is_mobile() )
+		if (wp_is_mobile())
 		    $scripts[] = 'jquery-touch-punch';
 
 		foreach ($scripts as $script) {
-			wp_enqueue_script( $script );
+			wp_enqueue_script($script);
 		}
 	}
 
-	function register_no_conflict( $registered ) {
+	function register_no_conflict($registered) {
 
 		$filter = current_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 ) ) {
-			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
-			$registered = array_merge( $registered, $allow_styles );
+		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)) {
+			$allow_styles = array('dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker');
+			$registered = array_merge($registered, $allow_styles);
 		}
 
 		return $registered;

includes/class-admin-welcome.php

Spacing +50 added lines, -50 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * GravityView_Welcome Class
@@ -34,10 +34,10 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		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_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);
 	}
 
 	/**
@@ -57,27 +57,27 @@ 
 			__('Getting Started', 'gravityview'),
 			$this->minimum_capability,
 			'gv-getting-started',
-			array( $this, 'getting_started_screen' )
+			array($this, 'getting_started_screen')
 		);
 
 		// Changelog Page
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__( 'Changelog', 'gravityview' ),
-			__( 'Changelog', 'gravityview' ),
+			__('Changelog', 'gravityview'),
+			__('Changelog', 'gravityview'),
 			$this->minimum_capability,
 			'gv-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Credits Page
 		add_submenu_page(
 			'edit.php?post_type=gravityview',
-			__( 'Credits', 'gravityview' ),
-			__( 'Credits', 'gravityview' ),
+			__('Credits', 'gravityview'),
+			__('Credits', 'gravityview'),
 			$this->minimum_capability,
 			'gv-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 
 	}
@@ -90,9 +90,9 @@ 
 	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' ) );
+		return in_array($plugin_page, array('gv-about', 'gv-credits', 'gv-getting-started'));
 	}
 
 	/**
@@ -105,10 +105,10 @@ 
 	public function admin_head() {
 		global $plugin_page;
 
-		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
-		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
+		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">
@@ -139,23 +139,23 @@ 
 		global $plugin_page;
 
 		// Don't fetch -beta, etc.
-		list( $display_version ) = explode( '-', GravityView_Plugin::version );
+		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>
+		<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' ) ) ); ?>">
-				<?php _e( "Getting Started", 'gravityview' ); ?>
+			<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' ) ) ); ?>">
-				<?php _e( "List of Changes", 'gravityview' ); ?>
+			<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' ) ) ); ?>">
-				<?php _e( 'Credits', 'gravityview' ); ?>
+			<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>
 		<?php
@@ -205,14 +205,14 @@ 
 
 				<div class="last-feature">
 				<h2>Embed Views in Posts &amp; Pages</h2>
-					<p><img src="<?php echo plugins_url( 'assets/images/screenshots/add-view-button.png', GRAVITYVIEW_FILE ); ?>" class="gv-welcome-screenshots" height="35" width="97" />Views don&rsquo;t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.</p>
+					<p><img src="<?php echo plugins_url('assets/images/screenshots/add-view-button.png', GRAVITYVIEW_FILE); ?>" class="gv-welcome-screenshots" height="35" width="97" />Views don&rsquo;t need to be embedded in a post or page, but you can if you want. Embed Views using the "Add View" button above your content editor.</p>
 				</div>
 
 			</div>
 
 			<div class="feature-section clear">
 				<h2>Configure Multiple Entry, Single Entry, and Edit Entry Layouts</h2>
-				<p><img src="<?php echo plugins_url( 'assets/images/screenshots/add-field.png', GRAVITYVIEW_FILE ); ?>" alt="Add a field dialog box" class="gv-welcome-screenshots" />You can configure what fields are displayed in <strong>Multiple Entry</strong>, <strong>Single Entry</strong>, and <strong>Edit Entry</strong> modes. These can be configured by clicking on the tabs in "View Configuration."</p>
+				<p><img src="<?php echo plugins_url('assets/images/screenshots/add-field.png', GRAVITYVIEW_FILE); ?>" alt="Add a field dialog box" class="gv-welcome-screenshots" />You can configure what fields are displayed in <strong>Multiple Entry</strong>, <strong>Single Entry</strong>, and <strong>Edit Entry</strong> modes. These can be configured by clicking on the tabs in "View Configuration."</p>
 
 				<ul class="ul-disc">
 					<li>Click "+ Add Field" to add a field to a zone</li>
@@ -254,23 +254,23 @@ 
 
 			<div class="changelog point-releases">
 
-				<h2 class="subtitle" style="text-align: center;"><?php esc_html_e('What&rsquo;s New', 'gravityview' ); ?></h2>
+				<h2 class="subtitle" style="text-align: center;"><?php esc_html_e('What&rsquo;s New', 'gravityview'); ?></h2>
 
 				<div class="feature-section col two-col" style="margin-top:0">
 					<div class="col col-1">
-						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url( 'assets/images/screenshots/caps.png', GRAVITYVIEW_FILE ); ?>" alt="Icons representing capabilities"></div>
+						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url('assets/images/screenshots/caps.png', GRAVITYVIEW_FILE); ?>" alt="Icons representing capabilities"></div>
 						<h4 class="higher">Capability Management</h4>
 						<p>Manage what users and roles have access to GravityView functionality. <a href="http://docs.gravityview.co/article/311-gravityview-capabilities">See what capabilities are available</a>.</p>
 
-						<div class="media-container" style="margin-top: 2em; min-height:80px;"><img src="<?php echo plugins_url( 'assets/images/screenshots/get.png', GRAVITYVIEW_FILE ); ?>" alt=""></div>
+						<div class="media-container" style="margin-top: 2em; min-height:80px;"><img src="<?php echo plugins_url('assets/images/screenshots/get.png', GRAVITYVIEW_FILE); ?>" alt=""></div>
 						<h4 class="higher">The <code>{get}</code> Merge Tag</h4>
 						<p>Pass data using URLs and create even more powerful integrations with GravityView. <a href="http://docs.gravityview.co/article/314-the-get-merge-tag">Learn how to use <code>{get}</code></a>.</p>
 					</div>
 
 					<div class="col col-2 last-feature">
-						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url( 'assets/images/screenshots/support-port.png', GRAVITYVIEW_FILE ); ?>" alt="The Support Port"></div>
+						<div class="media-container" style="min-height:81px; border: none;"><img src="<?php echo plugins_url('assets/images/screenshots/support-port.png', GRAVITYVIEW_FILE); ?>" alt="The Support Port"></div>
 						<h4 class="higher">Support Port</h4>
-						<p>Users can easily search GravityView help docs. Administrators can use it to contact support. Just click the <img src="<?php echo plugins_url( 'assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE ); ?>" width="16" alt="The Support Port icon looks like a question mark"> icon on GravityView screens to activate.</p>
+						<p>Users can easily search GravityView help docs. Administrators can use it to contact support. Just click the <img src="<?php echo plugins_url('assets/images/screenshots/beacon.png', GRAVITYVIEW_FILE); ?>" width="16" alt="The Support Port icon looks like a question mark"> icon on GravityView screens to activate.</p>
 					</div>
 				</div>
 
@@ -619,7 +619,7 @@ 
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-description"><?php _e( 'GravityView is brought to you by:', 'gravityview' ); ?></p>
+			<p class="about-description"><?php _e('GravityView is brought to you by:', 'gravityview'); ?></p>
 
 			<div class="feature-section col two-col">
 
@@ -627,14 +627,14 @@ 
 					<h2>Zack Katz</h2>
 					<h4 style="font-weight:0; margin-top:0">Project Lead &amp; Developer</h4>
 					<p></p>
-					<p><img style="float:left; margin: 0 15px 10px 0;" src="<?php echo plugins_url( 'assets/images/zack.jpg', GRAVITYVIEW_FILE ); ?>" width="94" height="94" />Zack has been developing integrations with Gravity Forms since 2009. He is the President of Katz Web Services and lives with his wife (and cat) in Denver, Colorado.</p>
+					<p><img style="float:left; margin: 0 15px 10px 0;" src="<?php echo plugins_url('assets/images/zack.jpg', GRAVITYVIEW_FILE); ?>" width="94" height="94" />Zack has been developing integrations with Gravity Forms since 2009. He is the President of Katz Web Services and lives with his wife (and cat) in Denver, Colorado.</p>
 					<p><a href="https://katz.co">View Zack&rsquo;s website</a></p>
 				</div>
 
 				<div class="col last-feature">
 					<h2>Luis Godinho</h2>
 					<h4 style="font-weight:0; margin-top:0">Developer &amp; Support</h4>
-					<p><img style="margin: 0 15px 10px 0;"  class="alignleft avatar" src="<?php echo plugins_url( 'assets/images/luis.jpg', GRAVITYVIEW_FILE ); ?>" width="94" height="94" />Luis is a WordPress developer passionate about WordPress. He is a co-founder and partner of GOMO, a digital agency located in Lisbon, Portugal.</p>
+					<p><img style="margin: 0 15px 10px 0;"  class="alignleft avatar" src="<?php echo plugins_url('assets/images/luis.jpg', GRAVITYVIEW_FILE); ?>" width="94" height="94" />Luis is a WordPress developer passionate about WordPress. He is a co-founder and partner of GOMO, a digital agency located in Lisbon, Portugal.</p>
 					<p><a href="http://tinygod.pt">View Luis&rsquo;s website</a></p>
 				</div>
 
@@ -644,7 +644,7 @@ 
 
 			<div class="feature-section">
 				<div>
-					<h2><?php esc_attr_e( 'Contributors', 'gravityview' ); ?></h2>
+					<h2><?php esc_attr_e('Contributors', 'gravityview'); ?></h2>
 
 					<ul class="wp-people-group">
 						<li class="wp-person">Bengali translation by <a href="https://www.transifex.com/accounts/profile/tareqhi/">@tareqhi</a></li>
@@ -665,8 +665,8 @@ 
 						<li class="wp-person">Code contributions by <a href="https://github.com/ryanduff">@ryanduff</a> and <a href="https://github.com/dmlinn">@dmlinn</a></li>
 					</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>
+					<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>
 				</div>
 			</div>
 
@@ -705,34 +705,34 @@ 
 		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; }
+		if (!get_transient('_gv_activation_redirect')) { return; }
 
 		// Delete the redirect transient
-		delete_transient( '_gv_activation_redirect' );
+		delete_transient('_gv_activation_redirect');
 
-		$upgrade = get_option( 'gv_version_upgraded_from' );
+		$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;
 		}
 
 		// Add "Upgraded From" Option
-		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
+		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 ) {
-			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
+		if (!$upgrade) {
+			wp_safe_redirect(admin_url('edit.php?post_type=gravityview&page=gv-getting-started')); exit;
 		}
 		// Update
 		else {
-			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-changelog' ) ); exit;
+			wp_safe_redirect(admin_url('edit.php?post_type=gravityview&page=gv-changelog')); exit;
 		}
 	}
 }