gravityview / GravityView

includes/admin/metaboxes/views/gravityview-navigation.php

Spacing +4 added lines, -4 removed lines

@@ -14,13 +14,13 @@
 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
 	<?php
 
-	foreach( $metaboxes as $metabox ) {
-		$class = !isset( $class ) ? 'nav-tab-active' : '';
+	foreach ($metaboxes as $metabox) {
+		$class = !isset($class) ? 'nav-tab-active' : '';
 	?>
 	<li class="ui-state-default">
-		<a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr( $metabox->id ); ?>">
+		<a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr($metabox->id); ?>">
 			<span class="<?php echo $metabox->icon_class_name; ?>"></span>&nbsp;
-			<?php echo esc_html( $metabox->title ); ?>
+			<?php echo esc_html($metabox->title); ?>
 		</a>
 	</li>
 	<?php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Display the tab navigation for the Settings metabox
- *
- * @package GravityView
- * @subpackage Gravityview/admin/metaboxes/views
- * @since 1.8
- *
- * @global GravityView_Metabox_Tab[] $metaboxes
- * @global WP_Post $post
- */
+				 * Display the tab navigation for the Settings metabox
+				 *
+				 * @package GravityView
+				 * @subpackage Gravityview/admin/metaboxes/views
+				 * @since 1.8
+				 *
+				 * @global GravityView_Metabox_Tab[] $metaboxes
+				 * @global WP_Post $post
+				 */
 
 ?>
 <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">

includes/admin/metaboxes/views/select-template.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * @file select-template.php
- * @package GravityView
- * @subpackage Gravityview/admin/metaboxes/partials
- * @global WP_Post $post
- */
+	 * @file select-template.php
+	 * @package GravityView
+	 * @subpackage Gravityview/admin/metaboxes/partials
+	 * @global WP_Post $post
+	 */
 
 global $post;
 

Spacing +14 added lines, -14 removed lines

@@ -9,40 +9,40 @@
 global $post;
 
 // Use nonce for verification
-wp_nonce_field( 'gravityview_select_template', 'gravityview_select_template_nonce' );
+wp_nonce_field('gravityview_select_template', 'gravityview_select_template_nonce');
 
 //current value
-$current_template = gravityview_get_template_id( $post->ID );
+$current_template = gravityview_get_template_id($post->ID);
 
 $templates = gravityview_get_registered_templates();
 
 // current input
 ?>
-<input type="hidden" id="gravityview_directory_template" name="gravityview_directory_template" value="<?php echo esc_attr( $current_template ); ?>" />
+<input type="hidden" id="gravityview_directory_template" name="gravityview_directory_template" value="<?php echo esc_attr($current_template); ?>" />
 
 <?php // list all the available templates (type= fresh or custom ) ?>
 <div class="gv-grid">
-	<?php foreach( $templates as $id => $template ) {
-		$selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?>
+	<?php foreach ($templates as $id => $template) {
+		$selected = ($id == $current_template) ? ' gv-selected' : ''; ?>
 
 		<div class="gv-grid-col-1-3">
-			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>">
+			<div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr($template['type']); ?>">
 				<div class="gv-view-types-hover">
 					<div>
-						<?php if( !empty( $template['buy_source'] ) ) { ?>
-							<p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p>
+						<?php if (!empty($template['buy_source'])) { ?>
+							<p><a href="<?php echo esc_url($template['buy_source']); ?>" class="button-primary button-buy-now"><?php esc_html_e('Buy Now', 'gravityview'); ?></a></p>
 						<?php } else { ?>
-							<p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p>
-							<?php if( !empty( $template['preview'] ) ) { ?>
-								<a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a>
+							<p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr($id); ?>"><?php esc_html_e('Select', 'gravityview'); ?></a></p>
+							<?php if (!empty($template['preview'])) { ?>
+								<a href="<?php echo esc_url($template['preview']); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e('View a live demo of this preset', 'gravityview'); ?>"></i></a>
 							<?php } ?>
 						<?php } ?>
 					</div>
 				</div>
 				<div class="gv-view-types-normal">
-					<img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>">
-					<h5><?php echo esc_attr( $template['label'] ); ?></h5>
-					<p class="description"><?php echo esc_attr( $template['description'] ); ?></p>
+					<img src="<?php echo esc_url($template['logo']); ?>" alt="<?php echo esc_attr($template['label']); ?>">
+					<h5><?php echo esc_attr($template['label']); ?></h5>
+					<p class="description"><?php echo esc_attr($template['description']); ?></p>
 				</div>
 			</div>
 		</div>

includes/admin/metaboxes/views/shortcode-hint.php

Spacing +2 added lines, -2 removed lines

@@ -9,9 +9,9 @@
 ?>
 <div class="misc-pub-section gv-shortcode misc-pub-section-last">
 	<i class="dashicons dashicons-editor-code"></i>
-	<span><?php esc_html_e( 'Embed Shortcode', 'gravityview' ); ?></span>
+	<span><?php esc_html_e('Embed Shortcode', 'gravityview'); ?></span>
 	<div>
 		<input type="text" readonly="readonly" value="[gravityview id='<?php echo $post->ID; ?>']" class="code widefat" />
-		<span class="howto"><?php esc_html_e( 'Add this shortcode to a post or page to embed this view.', 'gravityview' ); ?></span>
+		<span class="howto"><?php esc_html_e('Add this shortcode to a post or page to embed this view.', 'gravityview'); ?></span>
 	</div>
 </div>
\ No newline at end of file

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @package GravityView
- * @subpackage Gravityview/admin/metaboxes/partials
- * @global $post
- */
+	 * @package GravityView
+	 * @subpackage Gravityview/admin/metaboxes/partials
+	 * @global $post
+	 */
 
 global $post;
 ?>

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

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @package GravityView
- * @subpackage Gravityview/admin/metaboxes/views
- * @global $post
- */
+	 * @package GravityView
+	 * @subpackage Gravityview/admin/metaboxes/views
+	 * @global $post
+	 */
 global $post;
 
 $curr_form = gravityview_get_form_id( $post->ID );

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);
 
 	?>
 

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * @package GravityView
- * @subpackage Gravityview/admin/metaboxes/partials
- * @global WP_Post $post
- */
+		 * @package GravityView
+		 * @subpackage Gravityview/admin/metaboxes/partials
+		 * @global WP_Post $post
+		 */
 global $post;
 
 $curr_form = gravityview_get_form_id( $post->ID );

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-approve-entries.php

Indentation +22 added lines, -22 removed lines

@@ -321,7 +321,7 @@ 
 
 			if( class_exists( 'GravityView_Entry_Notes' ) ){
 				global $current_user;
-      			get_currentuserinfo();
+	  			get_currentuserinfo();
 				GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $current_user->display_name, $note );
 			}
 
@@ -356,12 +356,12 @@ 
 
 		$approvedcolumn = self::get_approved_column( $form['id'] );
 
-        /**
-         * If the form doesn't contain the approve field, don't assume anything.
-         */
-        if( empty( $approvedcolumn ) ) {
-            return;
-        }
+		/**
+		 * If the form doesn't contain the approve field, don't assume anything.
+		 */
+		if( empty( $approvedcolumn ) ) {
+			return;
+		}
 
 		$entry = GFAPI::get_entry( $entry_id );
 
@@ -474,17 +474,17 @@ 
 	 */
 	static public function get_approved_column( $form ) {
 
-        if( empty( $form ) ) {
-            return null;
-        }
+		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 ) {
 
-            $field = (array) $field;
+			$field = (array) $field;
 
 			if( !empty( $field['gravityview_approved'] ) ) {
 				if( !empty($field['inputs'][0]['id']) ) {
@@ -492,14 +492,14 @@ 
 				}
 			}
 
-            // 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' ) {
-                        return $input['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' ) {
+						return $input['id'];
+					}
+				}
+			}
 		}
 
 		return null;

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

Braces +3 added lines, -9 removed lines

@@ -432,23 +432,17 @@
 			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 );
 
 			$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.' );
 
 			$result = false;
-		}
-
-		else {
+		} else {
 
 			$result = self::update_approved( $_POST['entry_id'], $_POST['approved'], $_POST['form_id'] );
 

Doc Comments +3 added lines, -3 removed lines

@@ -170,7 +170,7 @@ 
 	 *
 	 * @uses  GravityView_frontend::get_search_criteria() Convert the $_POST search request into a properly formatted request.
 	 * @access public
-	 * @return void|boolean
+	 * @return null|false
 	 */
 	public function process_bulk_action() {
 		if ( ! class_exists( 'RGForms' ) ) {
@@ -252,7 +252,7 @@ 
 	 * @param array|boolean $entries If array, array of entry IDs that are to be updated. If true: update all entries.
 	 * @param int $approved Approved status. If `0`: unapproved, if not empty, `Approved`
 	 * @param int $form_id The Gravity Forms Form ID
-	 * @return boolean|void
+	 * @return false|null
 	 */
 	private static function update_bulk( $entries, $approved, $form_id ) {
 
@@ -470,7 +470,7 @@ 
 	 * @access public
 	 * @static
 	 * @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.
+	 * @return integer 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 ) {
 

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