gravityview / GravityView

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

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

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

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

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

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

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

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

Braces +3 added lines, -1 removed lines

@@ -4,7 +4,9 @@
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Allows plugins to use their own update API.

includes/class-api.php

Indentation +32 added lines, -32 removed lines

@@ -146,20 +146,20 @@ 
 
 		if( !empty( $field['custom_class'] ) ) {
 
-            $custom_class = $field['custom_class'];
+			$custom_class = $field['custom_class'];
 
-            if( !empty( $entry ) ) {
+			if( !empty( $entry ) ) {
 
-                // We want the merge tag to be formatted as a class. The merge tag may be
-                // replaced by a multiple-word value that should be output as a single class.
-                // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
+				// We want the merge tag to be formatted as a class. The merge tag may be
+				// replaced by a multiple-word value that should be output as a single class.
+				// "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
+				add_filter('gform_merge_tag_filter', 'sanitize_html_class');
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+				$custom_class = self::replace_variables( $custom_class, $form, $entry);
 
-                // And then we want life to return to normal
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
-            }
+				// And then we want life to return to normal
+				remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
+			}
 
 			// And now we want the spaces to be handled nicely.
 			$classes[] = gravityview_sanitize_html_class( $custom_class );
@@ -591,29 +591,29 @@ 
 		return sanitize_title( $slug );
 	}
 
-    /**
-     * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
-     *
-     * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
-     *
-     * @param $entry array Gravity Forms entry object
-     * @param $form array Gravity Forms form object
-     */
-    public static function entry_create_custom_slug( $entry, $form ) {
-        /**
-         * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
-         * @param boolean $custom Should we process the custom entry slug?
-         */
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
-            // create the gravityview_unique_id and save it
+	/**
+	 * If using the entry custom slug feature, make sure the new entries have the custom slug created and saved as meta
+	 *
+	 * Triggered by add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+	 *
+	 * @param $entry array Gravity Forms entry object
+	 * @param $form array Gravity Forms form object
+	 */
+	public static function entry_create_custom_slug( $entry, $form ) {
+		/**
+		 * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
+		 * @param boolean $custom Should we process the custom entry slug?
+		 */
+		$custom = apply_filters( 'gravityview_custom_entry_slug', false );
+		if( $custom ) {
+			// create the gravityview_unique_id and save it
 
-            // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash );
+			// Get the entry hash
+			$hash = self::get_custom_entry_slug( $entry['id'], $entry );
+			gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash );
 
-        }
-    }
+		}
+	}
 
 
 
@@ -851,7 +851,7 @@ 
 
 			// If there was an error, continue to the next term.
 			if ( is_wp_error( $term_link ) ) {
-			    continue;
+				continue;
 			}
 
 			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );

Doc Comments +1 added lines, -2 removed lines

@@ -214,7 +214,6 @@ 
 	 *
 	 * @access public
 	 * @param array $entry
-	 * @param integer $field
 	 * @return null|string
 	 */
 	public static function field_value( $entry, $field_settings, $format = 'html' ) {
@@ -967,7 +966,7 @@ 
  * Get the current View ID being rendered
  *
  * @global GravityView_View $gravityview_view
- * @return string View context "directory" or "single"
+ * @return integer View context "directory" or "single"
  */
 function gravityview_get_view_id() {
 	return GravityView_View::getInstance()->getViewId();

Spacing +224 added lines, -224 removed lines

@@ -23,36 +23,36 @@ 
 	 * @param boolean $force_show_label Whether to always show the label, regardless of field settings
 	 * @return string
 	 */
-	public static function field_label( $field, $entry = array(), $force_show_label = false ) {
+	public static function field_label($field, $entry = array(), $force_show_label = false) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$form = $gravityview_view->getForm();
 
 		$label = '';
 
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
+		if (!empty($field['show_label']) || $force_show_label) {
 
 			$label = $field['label'];
 
 			// Support Gravity Forms 1.9+
-			if( class_exists( 'GF_Field' ) ) {
+			if (class_exists('GF_Field')) {
 
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
+				$field_object = RGFormsModel::get_field($form, $field['id']);
 
-				if( $field_object ) {
+				if ($field_object) {
 
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
+					$input = GFFormsModel::get_input($field_object, $field['id']);
 
 					// This is a complex field, with labels on a per-input basis
-					if( $input ) {
+					if ($input) {
 
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
+						$label = !empty($input['customLabel']) ? $input['customLabel'] : $input['label'];
 
 					} else {
 
 						// This is a field with one label
-						$label = $field_object->get_field_label( true, $field['label'] );
+						$label = $field_object->get_field_label(true, $field['label']);
 
 					}
 
@@ -61,9 +61,9 @@ 
 			}
 
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
-			if ( !empty( $field['custom_label'] ) ) {
+			if (!empty($field['custom_label'])) {
 
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
+				$label = self::replace_variables($field['custom_label'], $form, $entry);
 
 			}
 
@@ -72,7 +72,7 @@ 
 			 * @param[in,out] string $appended_content Content you can add after a label. Empty by default.
 			 * @param[in] array $field GravityView field array
 			 */
-			$label .= apply_filters( 'gravityview_render_after_label', '', $field );
+			$label .= apply_filters('gravityview_render_after_label', '', $field);
 
 		} // End $field['show_label']
 
@@ -84,7 +84,7 @@ 
 		 * @param[in] array $form Gravity Forms form array
 		 * @param[in] array $entry Gravity Forms entry array
 		 */
-		$label = apply_filters( 'gravityview/template/field_label', $label, $field, $form, $entry );
+		$label = apply_filters('gravityview/template/field_label', $label, $field, $form, $entry);
 
 		return $label;
 	}
@@ -99,8 +99,8 @@ 
 	 * @param  array      $entry        GF Entry array
 	 * @return string                  Text with variables maybe replaced
 	 */
-	public static function replace_variables($text, $form, $entry ) {
-		return GravityView_Merge_Tags::replace_variables( $text, $form, $entry );
+	public static function replace_variables($text, $form, $entry) {
+		return GravityView_Merge_Tags::replace_variables($text, $form, $entry);
 	}
 
 	/**
@@ -113,19 +113,19 @@ 
 	 *
 	 * @return string|null If not empty, string in $format format. Otherwise, null.
 	 */
-	public static function field_width( $field, $format = '%d%%' ) {
+	public static function field_width($field, $format = '%d%%') {
 
 		$width = NULL;
 
-		if( !empty( $field['width'] ) ) {
-			$width = absint( $field['width'] );
+		if (!empty($field['width'])) {
+			$width = absint($field['width']);
 
 			// If using percentages, limit to 100%
-			if( '%d%%' === $format && $width > 100 ) {
+			if ('%d%%' === $format && $width > 100) {
 				$width = 100;
 			}
 
-			$width = sprintf( $format, $width );
+			$width = sprintf($format, $width);
 		}
 
 		return $width;
@@ -139,38 +139,38 @@ 
 	 * @param mixed $field
 	 * @return string
 	 */
-	public static function field_class( $field, $form = NULL, $entry = NULL ) {
+	public static function field_class($field, $form = NULL, $entry = NULL) {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$classes = array();
 
-		if( !empty( $field['custom_class'] ) ) {
+		if (!empty($field['custom_class'])) {
 
             $custom_class = $field['custom_class'];
 
-            if( !empty( $entry ) ) {
+            if (!empty($entry)) {
 
                 // We want the merge tag to be formatted as a class. The merge tag may be
                 // replaced by a multiple-word value that should be output as a single class.
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
                 add_filter('gform_merge_tag_filter', 'sanitize_html_class');
 
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
+                $custom_class = self::replace_variables($custom_class, $form, $entry);
 
                 // And then we want life to return to normal
                 remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
             }
 
 			// And now we want the spaces to be handled nicely.
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
+			$classes[] = gravityview_sanitize_html_class($custom_class);
 
 		}
 
-		if(!empty($field['id'])) {
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
+		if (!empty($field['id'])) {
+			if (!empty($form) && !empty($form['id'])) {
 				$form_id = '-'.$form['id'];
 			} else {
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-'.$gravityview_view->getFormId() : '';
 			}
 
 			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
@@ -191,21 +191,21 @@ 
 	 * @param array $entry Gravity Forms entry array
 	 * @return string Sanitized unique HTML `id` attribute for the field
 	 */
-	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
+	public static function field_html_attr_id($field, $form = array(), $entry = array()) {
 		$gravityview_view = GravityView_View::getInstance();
 		$id = $field['id'];
 
-		if ( ! empty( $id ) ) {
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
-				$form_id = '-' . $form['id'];
+		if (!empty($id)) {
+			if (!empty($form) && !empty($form['id'])) {
+				$form_id = '-'.$form['id'];
 			} else {
-				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
+				$form_id = $gravityview_view->getFormId() ? '-'.$gravityview_view->getFormId() : '';
 			}
 
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
+			$id = 'gv-field'.$form_id.'-'.$field['id'];
 		}
 
-		return esc_attr( $id );
+		return esc_attr($id);
 	}
 
 
@@ -217,15 +217,15 @@ 
 	 * @param integer $field
 	 * @return null|string
 	 */
-	public static function field_value( $entry, $field_settings, $format = 'html' ) {
+	public static function field_value($entry, $field_settings, $format = 'html') {
 
-		if( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
+		if (empty($entry['form_id']) || empty($field_settings['id'])) {
 			return NULL;
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( class_exists( 'GFCache' ) ) {
+		if (class_exists('GFCache')) {
 			/**
 			 * Gravity Forms' GFCache function was thrashing the database, causing double the amount of time for the field_value() method to run.
 			 *
@@ -240,18 +240,18 @@ 
 			 * @param boolean false Tell Gravity Forms not to store this as a transient
 			 * @param  int 0 Time to store the value. 0 is maximum amount of time possible.
 			 */
-			GFCache::set( "GFFormsModel::get_lead_field_value_" . $entry["id"] . "_" . $field_settings["id"], false, false, 0 );
+			GFCache::set("GFFormsModel::get_lead_field_value_".$entry["id"]."_".$field_settings["id"], false, false, 0);
 		}
 
 		$field_id = $field_settings['id'];
 
 		$form = $gravityview_view->getForm();
 
-		$field = gravityview_get_field( $form, $field_id );
+		$field = gravityview_get_field($form, $field_id);
 
 		$field_type = RGFormsModel::get_input_type($field);
 
-		if( $field_type ) {
+		if ($field_type) {
 			$field_type = $field['type'];
 			$value = RGFormsModel::get_lead_field_value($entry, $field);
 		} else {
@@ -266,15 +266,15 @@ 
 
 		$display_value = GFCommon::get_lead_field_display($field, $value, $entry["currency"], false, $format);
 
-		if( $errors = ob_get_clean() ) {
-			do_action( 'gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors );
+		if ($errors = ob_get_clean()) {
+			do_action('gravityview_log_error', 'GravityView_API[field_value] Errors when calling GFCommon::get_lead_field_display()', $errors);
 		}
 
 		$display_value = apply_filters("gform_entry_field_value", $display_value, $field, $entry, $form);
 
 		// prevent the use of merge_tags for non-admin fields
-		if( !empty( $field['adminOnly'] ) ) {
-			$display_value = self::replace_variables( $display_value, $form, $entry );
+		if (!empty($field['adminOnly'])) {
+			$display_value = self::replace_variables($display_value, $form, $entry);
 		}
 
 		// Check whether the field exists in /includes/fields/{$field_type}.php
@@ -282,7 +282,7 @@ 
 		$field_path = $gravityview_view->locate_template("fields/{$field_type}.php");
 
 		// Set the field data to be available in the templates
-		$gravityview_view->setCurrentField( array(
+		$gravityview_view->setCurrentField(array(
 			'form' => $form,
 			'field_id' => $field_id,
 			'field' => $field,
@@ -294,13 +294,13 @@ 
 			'field_type' => $field_type, /** {@since 1.6} **/
 		));
 
-		if( ! empty( $field_path ) ) {
+		if (!empty($field_path)) {
 
-			do_action( 'gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_path ) );
+			do_action('gravityview_log_debug', sprintf('[field_value] Rendering %s', $field_path));
 
 			ob_start();
 
-			load_template( $field_path, false );
+			load_template($field_path, false);
 
 			$output = ob_get_clean();
 
@@ -319,11 +319,11 @@ 
 		 * Fields can override this by modifying the field data variable inside the field. See /templates/fields/post_image.php for an example.
 		 *
 		 */
-		if( !empty( $field_settings['show_as_link'] ) ) {
+		if (!empty($field_settings['show_as_link'])) {
 
-			$link_atts = empty( $field_settings['new_window'] ) ? array() : array( 'target' => '_blank' );
+			$link_atts = empty($field_settings['new_window']) ? array() : array('target' => '_blank');
 
-			$output = self::entry_link_html( $entry, $output, $link_atts, $field_settings );
+			$output = self::entry_link_html($entry, $output, $link_atts, $field_settings);
 
 		}
 
@@ -334,7 +334,7 @@ 
 		 * @param array  $entry The GF entry array
 		 * @param  array $field_settings Settings for the particular GV field
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters('gravityview_field_entry_value_'.$field_type, $output, $entry, $field_settings, $gravityview_view->getCurrentField());
 
 		/**
 		 * @filter `gravityview_field_entry_value` Modify the field value output for all field types
@@ -343,7 +343,7 @@ 
 		 * @param  array $field_settings Settings for the particular GV field
 		 * @param array $field_data  {@since 1.6}
 		 */
-		$output = apply_filters( 'gravityview_field_entry_value', $output, $entry, $field_settings, $gravityview_view->getCurrentField() );
+		$output = apply_filters('gravityview_field_entry_value', $output, $entry, $field_settings, $gravityview_view->getCurrentField());
 
 		return $output;
 	}
@@ -357,18 +357,18 @@ 
 	 * @param array $entry Gravity Forms entry array
 	 * @param array $field_settings Array of field settings. Optional, but passed to the `gravityview_field_entry_link` filter
 	 */
-	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array() ) {
+	public static function entry_link_html($entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array()) {
 
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
+		if (empty($entry) || !is_array($entry) || !isset($entry['id'])) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry );
+			do_action('gravityview_log_debug', 'GravityView_API[entry_link_tag] Entry not defined; returning null', $entry);
 
 			return NULL;
 		}
 
-		$href = self::entry_link( $entry );
+		$href = self::entry_link($entry);
 
-		$link = gravityview_get_link( $href, $anchor_text, $passed_tag_atts );
+		$link = gravityview_get_link($href, $anchor_text, $passed_tag_atts);
 
 		/**
 		 * @filter `gravityview_field_entry_link` Modify the link HTML
@@ -377,7 +377,7 @@ 
 		 * @param array  $entry The GF entry array
 		 * @param  array $field_settings Settings for the particular GV field
 		 */
-		$output = apply_filters( 'gravityview_field_entry_link', $link, $href, $entry, $field_settings );
+		$output = apply_filters('gravityview_field_entry_link', $link, $href, $entry, $field_settings);
 
 		return $output;
 	}
@@ -392,11 +392,11 @@ 
 
 		$is_search = false;
 
-		if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
+		if ($gravityview_view && ($gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search)) {
 			$is_search = true;
 		}
 
-		if($is_search) {
+		if ($is_search) {
 			$output = __('This search returned no results.', 'gravityview');
 		} else {
 			$output = __('No entries match your request.', 'gravityview');
@@ -407,7 +407,7 @@ 
 		 * @param string $output The existing "No Entries" text
 		 * @param boolean $is_search Is the current page a search result, or just a multiple entries screen?
 		 */
-		$output = apply_filters( 'gravitview_no_entries_text', $output, $is_search);
+		$output = apply_filters('gravitview_no_entries_text', $output, $is_search);
 
 		return $wpautop ? wpautop($output) : $output;
 	}
@@ -421,42 +421,42 @@ 
 	 * @param boolean $add_query_args Add pagination and sorting arguments
 	 * @return string      Permalink to multiple entries view
 	 */
-	public static function directory_link( $post_id = NULL, $add_query_args = true ) {
+	public static function directory_link($post_id = NULL, $add_query_args = true) {
 		global $post;
 
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 
 			$post_id = false;
 
 			// DataTables passes the Post ID
-			if( defined('DOING_AJAX') && DOING_AJAX ) {
+			if (defined('DOING_AJAX') && DOING_AJAX) {
 
-				$post_id = isset( $_POST['post_id'] ) ? (int)$_POST['post_id'] : false;
+				$post_id = isset($_POST['post_id']) ? (int)$_POST['post_id'] : false;
 
 			} else {
 
 				// The Post ID has been passed via the shortcode
-				if( !empty( $gravityview_view ) && $gravityview_view->getPostId() ) {
+				if (!empty($gravityview_view) && $gravityview_view->getPostId()) {
 
 					$post_id = $gravityview_view->getPostId();
 
 				} else {
 
 					// This is a GravityView post type
-					if( GravityView_frontend::getInstance()->isGravityviewPostType() ) {
+					if (GravityView_frontend::getInstance()->isGravityviewPostType()) {
 
-						$post_id = isset( $gravityview_view ) ? $gravityview_view->getViewId() : $post->ID;
+						$post_id = isset($gravityview_view) ? $gravityview_view->getViewId() : $post->ID;
 
 					} else {
 
 						// This is an embedded GravityView; use the embedded post's ID as the base.
-						if( GravityView_frontend::getInstance()->isPostHasShortcode() && is_a( $post, 'WP_Post' ) ) {
+						if (GravityView_frontend::getInstance()->isPostHasShortcode() && is_a($post, 'WP_Post')) {
 
 							$post_id = $post->ID;
 
-						} elseif( $gravityview_view->getViewId() ) {
+						} elseif ($gravityview_view->getViewId()) {
 
 							// The GravityView has been embedded in a widget or in a template, and
 							// is not in the current content. Thus, we defer to the View's own ID.
@@ -471,39 +471,39 @@ 
 		}
 
 		// No post ID, get outta here.
-		if( empty( $post_id ) ) {
+		if (empty($post_id)) {
 			return NULL;
 		}
 
 		// If we've saved the permalink in memory, use it
 		// @since 1.3
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
+		$link = wp_cache_get('gv_directory_link_'.$post_id);
 
-		if( empty( $link ) ) {
+		if (empty($link)) {
 
-			$link = get_permalink( $post_id );
+			$link = get_permalink($post_id);
 
 			// If not yet saved, cache the permalink.
 			// @since 1.3
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
+			wp_cache_set('gv_directory_link_'.$post_id, $link);
 
 		}
 
 		// Deal with returning to proper pagination for embedded views
-		if( $link && $add_query_args ) {
+		if ($link && $add_query_args) {
 
 			$args = array();
 
-			if( $pagenum = rgget('pagenum') ) {
-				$args['pagenum'] = intval( $pagenum );
+			if ($pagenum = rgget('pagenum')) {
+				$args['pagenum'] = intval($pagenum);
 			}
 
-			if( $sort = rgget('sort') ) {
+			if ($sort = rgget('sort')) {
 				$args['sort'] = $sort;
 				$args['dir'] = rgget('dir');
 			}
 
-			$link = add_query_arg( $args, $link );
+			$link = add_query_arg($args, $link);
 		}
 
 		return $link;
@@ -520,10 +520,10 @@ 
 	 * @param  array  $entry        Entry data passed to provide additional information when generating the hash. Optional - don't rely on it being available.
 	 * @return string               Hashed unique value for entry
 	 */
-	private static function get_custom_entry_slug( $id, $entry = array() ) {
+	private static function get_custom_entry_slug($id, $entry = array()) {
 
 		// Generate an unique hash to use as the default value
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
+		$slug = substr(wp_hash($id, 'gravityview'.$id), 0, 8);
 
 		/**
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -531,14 +531,14 @@ 
 		 * @param  string $id The entry ID
 		 * @param  array $entry Entry data array. May be empty.
 		 */
-		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
+		$slug = apply_filters('gravityview_entry_slug', $slug, $id, $entry);
 
 		// Make sure we have something - use the original ID as backup.
-		if( empty( $slug ) ) {
+		if (empty($slug)) {
 			$slug = $id;
 		}
 
-		return sanitize_title( $slug );
+		return sanitize_title($slug);
 	}
 
 	/**
@@ -552,7 +552,7 @@ 
 	 * @param  array  $entry        Gravity Forms Entry array, optional. Used only to provide data to customize the `gravityview_entry_slug` filter
 	 * @return string               Unique slug ID, passed through `sanitize_title()`
 	 */
-	public static function get_entry_slug( $id_or_string, $entry = array() ) {
+	public static function get_entry_slug($id_or_string, $entry = array()) {
 
 		/**
 		 * Default: use the entry ID as the unique identifier
@@ -563,32 +563,32 @@ 
 		 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 		 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 		 */
-		$custom = apply_filters('gravityview_custom_entry_slug', false );
+		$custom = apply_filters('gravityview_custom_entry_slug', false);
 
 		// If we're using custom slug...
-		if ( $custom ) {
+		if ($custom) {
 
 			// Get the entry hash
-			$hash = self::get_custom_entry_slug( $id_or_string, $entry );
+			$hash = self::get_custom_entry_slug($id_or_string, $entry);
 
 			// See if the entry already has a hash set
-			$value = gform_get_meta( $id_or_string, 'gravityview_unique_id' );
+			$value = gform_get_meta($id_or_string, 'gravityview_unique_id');
 
 			// If it does have a hash set, and the hash is expected, use it.
 			// This check allows users to change the hash structure using the
 			// gravityview_entry_hash filter and have the old hashes expire.
-			if( empty( $value ) || $value !== $hash ) {
+			if (empty($value) || $value !== $hash) {
 
-				gform_update_meta( $id_or_string, 'gravityview_unique_id', $hash );
+				gform_update_meta($id_or_string, 'gravityview_unique_id', $hash);
 
 			}
 
 			$slug = $hash;
 
-			unset( $value, $hash );
+			unset($value, $hash);
 		}
 
-		return sanitize_title( $slug );
+		return sanitize_title($slug);
 	}
 
     /**
@@ -599,18 +599,18 @@ 
      * @param $entry array Gravity Forms entry object
      * @param $form array Gravity Forms form object
      */
-    public static function entry_create_custom_slug( $entry, $form ) {
+    public static function entry_create_custom_slug($entry, $form) {
         /**
          * @filter `gravityview_custom_entry_slug` On entry creation, check if we are using the custom entry slug feature and update the meta
          * @param boolean $custom Should we process the custom entry slug?
          */
-        $custom = apply_filters( 'gravityview_custom_entry_slug', false );
-        if( $custom ) {
+        $custom = apply_filters('gravityview_custom_entry_slug', false);
+        if ($custom) {
             // create the gravityview_unique_id and save it
 
             // Get the entry hash
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash );
+            $hash = self::get_custom_entry_slug($entry['id'], $entry);
+            gform_update_meta($entry['id'], 'gravityview_unique_id', $hash);
 
         }
     }
@@ -625,55 +625,55 @@ 
 	 * @param boolean $add_directory_args True: Add args to help return to directory; False: only include args required to get to entry {@since 1.7.3}
 	 * @return string          Link to the entry with the directory parent slug
 	 */
-	public static function entry_link( $entry, $post_id = NULL, $add_directory_args = true ) {
+	public static function entry_link($entry, $post_id = NULL, $add_directory_args = true) {
 
-		if( ! empty( $entry ) && ! is_array( $entry ) ) {
-			$entry = GVCommon::get_entry( $entry );
-		} else if( empty( $entry ) ) {
+		if (!empty($entry) && !is_array($entry)) {
+			$entry = GVCommon::get_entry($entry);
+		} else if (empty($entry)) {
 			$entry = GravityView_frontend::getInstance()->getEntry();
 		}
 
 		// Second parameter used to be passed as $field; this makes sure it's not an array
-		if( !is_numeric( $post_id ) ) {
+		if (!is_numeric($post_id)) {
 			$post_id = NULL;
 		}
 
 		// Get the permalink to the View
-		$directory_link = self::directory_link( $post_id, false );
+		$directory_link = self::directory_link($post_id, false);
 
 		// No post ID? Get outta here.
-		if( empty( $directory_link ) ) {
+		if (empty($directory_link)) {
 			return '';
 		}
 
 		$query_arg_name = GravityView_Post_Types::get_entry_var_name();
 
-		$entry_slug = self::get_entry_slug( $entry['id'], $entry );
+		$entry_slug = self::get_entry_slug($entry['id'], $entry);
 
-		if( get_option('permalink_structure') && !is_preview() ) {
+		if (get_option('permalink_structure') && !is_preview()) {
 
 			$args = array();
 
-			$directory_link = trailingslashit( $directory_link ) . $query_arg_name . '/'. $entry_slug .'/';
+			$directory_link = trailingslashit($directory_link).$query_arg_name.'/'.$entry_slug.'/';
 
 		} else {
 
-			$args = array( $query_arg_name => $entry_slug );
+			$args = array($query_arg_name => $entry_slug);
 		}
 
 		/**
 		 * @since 1.7.3
 		 */
-		if( $add_directory_args ) {
+		if ($add_directory_args) {
 
-			if( !empty( $_GET['pagenum'] ) ) {
-				$args['pagenum'] = intval( $_GET['pagenum'] );
+			if (!empty($_GET['pagenum'])) {
+				$args['pagenum'] = intval($_GET['pagenum']);
 			}
 
 			/**
 			 * @since 1.7
 			 */
-			if( $sort = rgget('sort') ) {
+			if ($sort = rgget('sort')) {
 				$args['sort'] = $sort;
 				$args['dir'] = rgget('dir');
 			}
@@ -685,11 +685,11 @@ 
 		 * has the view id so that Advanced Filters can be applied correctly when rendering the single view
 		 * @see GravityView_frontend::get_context_view_id()
 		 */
-		if( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() ) {
+		if (class_exists('GravityView_View_Data') && GravityView_View_Data::getInstance()->has_multiple_views()) {
 			$args['gvid'] = gravityview_get_view_id();
 		}
 
-		return add_query_arg( $args, $directory_link );
+		return add_query_arg($args, $directory_link);
 
 	}
 
@@ -699,54 +699,54 @@ 
 
 // inside loop functions
 
-function gv_label( $field, $entry = NULL ) {
-	return GravityView_API::field_label( $field, $entry );
+function gv_label($field, $entry = NULL) {
+	return GravityView_API::field_label($field, $entry);
 }
 
-function gv_class( $field, $form = NULL, $entry = array() ) {
-	return GravityView_API::field_class( $field, $form, $entry  );
+function gv_class($field, $form = NULL, $entry = array()) {
+	return GravityView_API::field_class($field, $form, $entry);
 }
 
-function gv_container_class( $class = '' ) {
+function gv_container_class($class = '') {
 
 	$default = ' gv-container';
 
-	if( GravityView_View::getInstance()->isHideUntilSearched() ) {
+	if (GravityView_View::getInstance()->isHideUntilSearched()) {
 		$default .= ' hidden';
 	}
 
-	$class = apply_filters( 'gravityview/render/container/class', $class . $default );
+	$class = apply_filters('gravityview/render/container/class', $class.$default);
 
-	$class = gravityview_sanitize_html_class( $class );
+	$class = gravityview_sanitize_html_class($class);
 
 	echo $class;
 }
 
-function gv_value( $entry, $field ) {
+function gv_value($entry, $field) {
 
-	$value = GravityView_API::field_value( $entry, $field );
+	$value = GravityView_API::field_value($entry, $field);
 
-	if( $value === '') {
+	if ($value === '') {
 		/**
 		 * @filter `gravityview_empty_value` What to display when a field is empty
 		 * @param string $value (empty string)
 		 */
-		$value = apply_filters( 'gravityview_empty_value', '' );
+		$value = apply_filters('gravityview_empty_value', '');
 	}
 
 	return $value;
 }
 
-function gv_directory_link( $post = NULL, $add_pagination = true ) {
-	return GravityView_API::directory_link( $post, $add_pagination );
+function gv_directory_link($post = NULL, $add_pagination = true) {
+	return GravityView_API::directory_link($post, $add_pagination);
 }
 
-function gv_entry_link( $entry, $post_id = NULL ) {
-	return GravityView_API::entry_link( $entry, $post_id );
+function gv_entry_link($entry, $post_id = NULL) {
+	return GravityView_API::entry_link($entry, $post_id);
 }
 
 function gv_no_results($wpautop = true) {
-	return GravityView_API::no_results( $wpautop );
+	return GravityView_API::no_results($wpautop);
 }
 
 /**
@@ -758,21 +758,21 @@ 
 
 	$href = gv_directory_link();
 
-	if( empty( $href ) ) { return NULL; }
+	if (empty($href)) { return NULL; }
 
 	// calculate link label
 	$gravityview_view = GravityView_View::getInstance();
 
-	$label = $gravityview_view->getBackLinkLabel() ? $gravityview_view->getBackLinkLabel() : __( '← Go back', 'gravityview' );
+	$label = $gravityview_view->getBackLinkLabel() ? $gravityview_view->getBackLinkLabel() : __('← Go back', 'gravityview');
 
 	/**
 	 * @filter `gravityview_go_back_label` Modify the back link text
 	 * @since 1.0.9
 	 * @param string $label Existing label text
 	 */
-	$label = apply_filters( 'gravityview_go_back_label', $label );
+	$label = apply_filters('gravityview_go_back_label', $label);
 
-	$link = gravityview_get_link( $href, esc_html( $label ), array(
+	$link = gravityview_get_link($href, esc_html($label), array(
 		'data-viewid' => $gravityview_view->getViewId()
 	));
 
@@ -791,9 +791,9 @@ 
  * @param  string 	$display_value The value generated by Gravity Forms
  * @return string                Value
  */
-function gravityview_get_field_value( $entry, $field_id, $display_value ) {
+function gravityview_get_field_value($entry, $field_id, $display_value) {
 
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
+	if (floatval($field_id) === floor(floatval($field_id))) {
 
 		// For the complete field value as generated by Gravity Forms
 		return $display_value;
@@ -801,7 +801,7 @@ 
 	} else {
 
 		// For one part of the address (City, ZIP, etc.)
-		return isset( $entry[ $field_id ] ) ? $entry[ $field_id ] : '';
+		return isset($entry[$field_id]) ? $entry[$field_id] : '';
 
 	}
 
@@ -817,48 +817,48 @@ 
  * @param  string      $taxonomy Type of term (`post_tag` or `category`)
  * @return string                CSV of linked terms
  */
-function gravityview_convert_value_to_term_list( $value, $taxonomy = 'post_tag' ) {
+function gravityview_convert_value_to_term_list($value, $taxonomy = 'post_tag') {
 
 	$output = array();
 
-	$terms = explode( ', ', $value );
+	$terms = explode(', ', $value);
 
-	foreach ($terms as $term_name ) {
+	foreach ($terms as $term_name) {
 
 		// If we're processing a category,
-		if( $taxonomy === 'category' ) {
+		if ($taxonomy === 'category') {
 
 			// Use rgexplode to prevent errors if : doesn't exist
-			list( $term_name, $term_id ) = rgexplode( ':', $value, 2 );
+			list($term_name, $term_id) = rgexplode(':', $value, 2);
 
 			// The explode was succesful; we have the category ID
-			if( !empty( $term_id )) {
-				$term = get_term_by( 'id', $term_id, $taxonomy );
+			if (!empty($term_id)) {
+				$term = get_term_by('id', $term_id, $taxonomy);
 			} else {
 			// We have to fall back to the name
-				$term = get_term_by( 'name', $term_name, $taxonomy );
+				$term = get_term_by('name', $term_name, $taxonomy);
 			}
 
 		} else {
 			// Use the name of the tag to get the full term information
-			$term = get_term_by( 'name', $term_name, $taxonomy );
+			$term = get_term_by('name', $term_name, $taxonomy);
 		}
 
 		// There's still a tag/category here.
-		if( $term ) {
+		if ($term) {
 
-			$term_link = get_term_link( $term, $taxonomy );
+			$term_link = get_term_link($term, $taxonomy);
 
 			// If there was an error, continue to the next term.
-			if ( is_wp_error( $term_link ) ) {
+			if (is_wp_error($term_link)) {
 			    continue;
 			}
 
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
+			$output[] = gravityview_get_link($term_link, esc_html($term->name));
 		}
 	}
 
-	return implode(', ', $output );
+	return implode(', ', $output);
 }
 
 /**
@@ -868,12 +868,12 @@ 
  * @param  string      $taxonomy Taxonomy of term to fetch.
  * @return string                String with terms
  */
-function gravityview_get_the_term_list( $post_id, $link = true, $taxonomy = 'post_tag' ) {
+function gravityview_get_the_term_list($post_id, $link = true, $taxonomy = 'post_tag') {
 
-	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
+	$output = get_the_term_list($post_id, $taxonomy, NULL, ', ');
 
-	if( empty( $link ) ) {
-		return strip_tags( $output);
+	if (empty($link)) {
+		return strip_tags($output);
 	}
 
 	return $output;
@@ -892,17 +892,17 @@ 
 	$fe = GravityView_frontend::getInstance();
 
 	// Solve problem when loading content via admin-ajax.php
-	if( ! $fe->getGvOutputData() ) {
+	if (!$fe->getGvOutputData()) {
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.' );
+		do_action('gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not defined; parsing content.');
 
 		$fe->parse_content();
 	}
 
 	// Make 100% sure that we're dealing with a properly called situation
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
+	if (!is_a($fe->getGvOutputData(), 'GravityView_View_Data')) {
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData() );
+		do_action('gravityview_log_debug', '[gravityview_get_current_views] gv_output_data not an object or get_view not callable.', $fe->getGvOutputData());
 
 		return array();
 	}
@@ -916,18 +916,18 @@ 
  * @see  GravityView_View_Data::get_view()
  * @return array View data with `id`, `view_id`, `form_id`, `template_id`, `atts`, `fields`, `widgets`, `form` keys.
  */
-function gravityview_get_current_view_data( $view_id = 0 ) {
+function gravityview_get_current_view_data($view_id = 0) {
 
 	$fe = GravityView_frontend::getInstance();
 
-	if( ! $fe->getGvOutputData() ) { return array(); }
+	if (!$fe->getGvOutputData()) { return array(); }
 
 	// If not set, grab the current view ID
-	if( empty( $view_id ) ) {
+	if (empty($view_id)) {
 		$view_id = $fe->get_context_view_id();
 	}
 
-	return $fe->getGvOutputData()->get_view( $view_id );
+	return $fe->getGvOutputData()->get_view($view_id);
 }
 
 // Templates' hooks
@@ -936,7 +936,7 @@ 
 	 * @action `gravityview_before` Display content before a View. Used to render widget areas. Rendered outside the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_before', gravityview_get_view_id() );
+	do_action('gravityview_before', gravityview_get_view_id());
 }
 
 function gravityview_header() {
@@ -944,7 +944,7 @@ 
 	 * @action `gravityview_header` Prepend content to the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_header', gravityview_get_view_id() );
+	do_action('gravityview_header', gravityview_get_view_id());
 }
 
 function gravityview_footer() {
@@ -952,7 +952,7 @@ 
 	 * @action `gravityview_after` Display content after a View. Used to render footer widget areas. Rendered outside the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_footer', gravityview_get_view_id() );
+	do_action('gravityview_footer', gravityview_get_view_id());
 }
 
 function gravityview_after() {
@@ -960,7 +960,7 @@ 
 	 * @action `gravityview_after` Append content to the View container `<div>`
 	 * @param int $view_id The ID of the View being displayed
 	 */
-	do_action( 'gravityview_after', gravityview_get_view_id() );
+	do_action('gravityview_after', gravityview_get_view_id());
 }
 
 /**
@@ -986,13 +986,13 @@ 
 	 * The Edit Entry functionality overrides this value.
 	 * @param boolean $is_edit_entry
 	 */
-	$is_edit_entry = apply_filters( 'gravityview_is_edit_entry', false );
+	$is_edit_entry = apply_filters('gravityview_is_edit_entry', false);
 
-	if( $is_edit_entry ) {
+	if ($is_edit_entry) {
 		$context = 'edit';
-	} else if( class_exists( 'GravityView_frontend' ) && $single = GravityView_frontend::is_single_entry() ) {
+	} else if (class_exists('GravityView_frontend') && $single = GravityView_frontend::is_single_entry()) {
 		$context = 'single';
-	} else if( class_exists( 'GravityView_View' ) ) {
+	} else if (class_exists('GravityView_View')) {
 		$context = GravityView_View::getInstance()->getContext();
 	}
 
@@ -1017,18 +1017,18 @@ 
  * @param  string $gv_class Field class to add to the output HTML
  * @return array           Array of file output, with `file_path` and `html` keys (see comments above)
  */
-function gravityview_get_files_array( $value, $gv_class = '' ) {
+function gravityview_get_files_array($value, $gv_class = '') {
 	/** @define "GRAVITYVIEW_DIR" "../" */
 
-	if( !class_exists( 'GravityView_Field' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
+	if (!class_exists('GravityView_Field')) {
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field.php');
 	}
 
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
-		include_once( GRAVITYVIEW_DIR .'includes/fields/fileupload.php' );
+	if (!class_exists('GravityView_Field_FileUpload')) {
+		include_once(GRAVITYVIEW_DIR.'includes/fields/fileupload.php');
 	}
 
-	return GravityView_Field_FileUpload::get_files_array( $value, $gv_class );
+	return GravityView_Field_FileUpload::get_files_array($value, $gv_class);
 }
 
 /**
@@ -1042,16 +1042,16 @@ 
  * @param  string $address Address
  * @return string          URL of link to map of address
  */
-function gravityview_get_map_link( $address ) {
+function gravityview_get_map_link($address) {
 
-	$address_qs = str_replace( array( '<br />', "\n" ), ' ', $address ); // Replace \n with spaces
-	$address_qs = urlencode( $address_qs );
+	$address_qs = str_replace(array('<br />', "\n"), ' ', $address); // Replace \n with spaces
+	$address_qs = urlencode($address_qs);
 
 	$url = "https://maps.google.com/maps?q={$address_qs}";
 
-	$link_text = esc_html__( 'Map It', 'gravityview' );
+	$link_text = esc_html__('Map It', 'gravityview');
 
-	$link = gravityview_get_link( $url, $link_text, 'class=map-it-link' );
+	$link = gravityview_get_link($url, $link_text, 'class=map-it-link');
 
 	/**
 	 * @filter `gravityview_map_link` Modify the map link generated. You can use a different mapping service, for example.
@@ -1059,7 +1059,7 @@ 
 	 * @param[in] string $address Address to generate link for
 	 * @param[in] string $url URL generated by the function
 	 */
-	$link = apply_filters( 'gravityview_map_link', $link, $address, $url );
+	$link = apply_filters('gravityview_map_link', $link, $address, $url);
 
 	return $link;
 }
@@ -1080,7 +1080,7 @@ 
  * @param  array $passed_args Associative array with field data. `field` and `form` are required.
  * @return string Field output. If empty value and hide empty is true, return empty.
  */
-function gravityview_field_output( $passed_args ) {
+function gravityview_field_output($passed_args) {
 	$defaults = array(
 		'entry' => null,
 		'field' => null,
@@ -1092,7 +1092,7 @@ 
 		'zone_id' => null,
 	);
 
-	$args = wp_parse_args( $passed_args, $defaults );
+	$args = wp_parse_args($passed_args, $defaults);
 
 	/**
 	 * @filter `gravityview/field_output/args` Modify the args before generation begins
@@ -1100,15 +1100,15 @@ 
 	 * @param array $args Associative array; `field` and `form` is required.
 	 * @param array $passed_args Original associative array with field data. `field` and `form` are required.
 	 */
-	$args = apply_filters( 'gravityview/field_output/args', $args, $passed_args );
+	$args = apply_filters('gravityview/field_output/args', $args, $passed_args);
 
 	// Required fields.
-	if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
-		do_action( 'gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args );
+	if (empty($args['field']) || empty($args['form'])) {
+		do_action('gravityview_log_error', '[gravityview_field_output] Field or form are empty.', $args);
 		return '';
 	}
 
-	$entry = empty( $args['entry'] ) ? array() : $args['entry'];
+	$entry = empty($args['entry']) ? array() : $args['entry'];
 
 	/**
 	 * Create the content variables for replacing.
@@ -1124,36 +1124,36 @@ 
 		'field_id' => '',
 	);
 
-	$context['value'] = gv_value( $entry, $args['field'] );
+	$context['value'] = gv_value($entry, $args['field']);
 
 	// If the value is empty and we're hiding empty, return empty.
-	if ( $context['value'] === '' && ! empty( $args['hide_empty'] ) ) {
+	if ($context['value'] === '' && !empty($args['hide_empty'])) {
 		return '';
 	}
 
-	if ( $context['value'] !== '' && ! empty( $args['wpautop'] ) ) {
-		$context['value'] = wpautop( $context['value'] );
+	if ($context['value'] !== '' && !empty($args['wpautop'])) {
+		$context['value'] = wpautop($context['value']);
 	}
 
 	// Get width setting, if exists
-	$context['width'] = GravityView_API::field_width( $args['field'] );
+	$context['width'] = GravityView_API::field_width($args['field']);
 
 	// If replacing with CSS inline formatting, let's do it.
-	$context['width:style'] = GravityView_API::field_width( $args['field'], 'width:' . $context['width'] . '%;' );
+	$context['width:style'] = GravityView_API::field_width($args['field'], 'width:'.$context['width'].'%;');
 
 	// Grab the Class using `gv_class`
-	$context['class'] = gv_class( $args['field'], $args['form'], $entry );
-	$context['field_id'] = GravityView_API::field_html_attr_id( $args['field'], $args['form'], $entry );
+	$context['class'] = gv_class($args['field'], $args['form'], $entry);
+	$context['field_id'] = GravityView_API::field_html_attr_id($args['field'], $args['form'], $entry);
 
 	// Get field label if needed
-	if ( ! empty( $args['label_markup'] ) ) {
-		$context['label'] = str_replace( array( '{{label}}', '{{ label }}' ), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup'] );
+	if (!empty($args['label_markup'])) {
+		$context['label'] = str_replace(array('{{label}}', '{{ label }}'), '<span class="gv-field-label">{{ label_value }}</span>', $args['label_markup']);
 	}
 
 	// Default Label value
-	$context['label_value'] = gv_label( $args['field'], $entry );
+	$context['label_value'] = gv_label($args['field'], $entry);
 
-	if ( empty( $context['label'] ) && ! empty( $context['label_value'] ) ){
+	if (empty($context['label']) && !empty($context['label_value'])) {
 		$context['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
 	}
 
@@ -1163,37 +1163,37 @@ 
 	 * @param string $markup The HTML for the markup
 	 * @param array $args All args for the field output
 	 */
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args );
+	$html = apply_filters('gravityview/field_output/pre_html', $args['markup'], $args);
 
 	/**
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
 	 * @since 1.11
 	 * @param string $open_tag Open tag for template content placeholders. Default: `{{`
 	 */
-	$open_tag = apply_filters( 'gravityview/field_output/open_tag', '{{', $args );
+	$open_tag = apply_filters('gravityview/field_output/open_tag', '{{', $args);
 
 	/**
 	 * @filter `gravityview/field_output/close_tag` Modify the closing tags for the template content placeholders
 	 * @since 1.11
 	 * @param string $close_tag Close tag for template content placeholders. Default: `}}`
 	 */
-	$close_tag = apply_filters( 'gravityview/field_output/close_tag', '}}', $args );
+	$close_tag = apply_filters('gravityview/field_output/close_tag', '}}', $args);
 
 	/**
 	 * Loop through each of the tags to replace and replace both `{{tag}}` and `{{ tag }}` with the values
 	 * @since 1.11
 	 */
-	foreach ( $context as $tag => $value ) {
+	foreach ($context as $tag => $value) {
 
 		// If the tag doesn't exist just skip it
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
+		if (false === strpos($html, $open_tag.$tag.$close_tag) && false === strpos($html, $open_tag.' '.$tag.' '.$close_tag)) {
 			continue;
 		}
 
 		// Array to search
 		$search = array(
-			$open_tag . $tag . $close_tag,
-			$open_tag . ' ' . $tag . ' ' . $close_tag,
+			$open_tag.$tag.$close_tag,
+			$open_tag.' '.$tag.' '.$close_tag,
 		);
 
 		/**
@@ -1202,26 +1202,26 @@ 
 		 * @param string $value The content to be shown instead of the {{tag}} placeholder
 		 * @param array $args Arguments passed to the function
 		 */
-		$value = apply_filters( 'gravityview/field_output/context/' . $tag, $value, $args );
+		$value = apply_filters('gravityview/field_output/context/'.$tag, $value, $args);
 
 		// Finally do the replace
-		$html = str_replace( $search, $value, $html );
+		$html = str_replace($search, $value, $html);
 	}
 
 	/**
 	 * @todo  Depricate `gravityview_field_output`
 	 */
-	$html = apply_filters( 'gravityview_field_output', $html, $args );
+	$html = apply_filters('gravityview_field_output', $html, $args);
 
 	/**
 	 * @filter `gravityview/field_output/html` Modify field HTML output
 	 * @param string $html Existing HTML output
 	 * @param array $args Arguments passed to the function
 	 */
-	$html = apply_filters( 'gravityview/field_output/html', $html, $args );
+	$html = apply_filters('gravityview/field_output/html', $html, $args);
 
 	// Just free up a tiny amount of memory
-	unset( $value, $args, $passed_args, $entry, $context, $search, $open_tag, $tag, $close_tag );
+	unset($value, $args, $passed_args, $entry, $context, $search, $open_tag, $tag, $close_tag);
 
 	return $html;
 }
@@ -1239,18 +1239,18 @@ 
  *
  * @return string html attribute or empty string
  */
-function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
+function gv_selected($value, $current, $echo = true, $type = 'selected') {
 
 	$output = '';
-	if( is_array( $current ) ) {
-		if( in_array( $value, $current ) ) {
-			$output = __checked_selected_helper( true, true, false, $type );
+	if (is_array($current)) {
+		if (in_array($value, $current)) {
+			$output = __checked_selected_helper(true, true, false, $type);
 		}
 	} else {
-		$output = __checked_selected_helper( $value, $current, false, $type );
+		$output = __checked_selected_helper($value, $current, false, $type);
 	}
 
-	if( $echo ) {
+	if ($echo) {
 		echo $output;
 	}
 

includes/class-cache.php

Spacing +101 added lines, -101 removed lines

@@ -32,18 +32,18 @@ 
 	 * @since 1.13.1
 	 * @var array Columns in the database for leads
 	 */
-	private $lead_db_columns = array( 'id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status' );
+	private $lead_db_columns = array('id', 'form_id', 'post_id', 'date_created', 'is_starred', 'is_read', 'ip', 'source_url', 'user_agent', 'currency', 'payment_status', 'payment_date', 'payment_amount', 'transaction_id', 'is_fulfilled', 'created_by', 'transaction_type', 'status');
 
 	/**
 	 *
 	 * @param array|int $form_ids Form ID or array of form IDs used in a request
 	 * @param array $args Extra request parameters used to generate the query. This is used to generate the unique transient key.
 	 */
-	function __construct( $form_ids = NULL, $args = array() ) {
+	function __construct($form_ids = NULL, $args = array()) {
 
 		$this->add_hooks();
 
-		if ( ! is_null( $form_ids ) ) {
+		if (!is_null($form_ids)) {
 
 			$this->form_ids = $form_ids;
 
@@ -59,31 +59,31 @@ 
 	function add_hooks() {
 
 		// Schedule cleanup of expired transients
-		add_action( 'wp', array( $this, 'schedule_transient_cleanup' ) );
+		add_action('wp', array($this, 'schedule_transient_cleanup'));
 
 		// Hook in to the scheduled cleanup, if scheduled
-		add_action( 'gravityview-expired-transients', array( $this, 'delete_expired_transients' ) );
+		add_action('gravityview-expired-transients', array($this, 'delete_expired_transients'));
 
 		// Trigger this when you need to prevent any results from being cached with forms that have been modified
-		add_action( 'gravityview_clear_form_cache', array( $this, 'blacklist_add' ) );
+		add_action('gravityview_clear_form_cache', array($this, 'blacklist_add'));
 
 		/**
 		 * @since 1.14
 		 */
-		add_action( 'gravityview_clear_entry_cache', array( $this, 'entry_status_changed' ) );
+		add_action('gravityview_clear_entry_cache', array($this, 'entry_status_changed'));
 
-		add_action( 'gform_after_update_entry', array( $this, 'entry_updated' ), 10, 2 );
+		add_action('gform_after_update_entry', array($this, 'entry_updated'), 10, 2);
 
-		add_action( 'gform_entry_created', array( $this, 'entry_created' ), 10, 2 );
+		add_action('gform_entry_created', array($this, 'entry_created'), 10, 2);
 
 		/**
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
 		 */
-		foreach( $this->lead_db_columns as $column ) {
-			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
+		foreach ($this->lead_db_columns as $column) {
+			add_action('gform_update_'.$column, array($this, 'entry_status_changed'), 10, 3);
 		}
 
-		add_action( 'gform_delete_lead', array( $this, 'entry_status_changed' ), 10 );
+		add_action('gform_delete_lead', array($this, 'entry_status_changed'), 10);
 	}
 
 	/**
@@ -99,22 +99,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_status_changed( $lead_id, $property_value = '', $previous_value = '' ) {
+	public function entry_status_changed($lead_id, $property_value = '', $previous_value = '') {
 
 		/** @var array $entry */
-		$entry = GFAPI::get_entry( $lead_id );
+		$entry = GFAPI::get_entry($lead_id);
 
-		if ( is_wp_error( $entry ) ) {
+		if (is_wp_error($entry)) {
 
 			/** @var WP_Error $entry */
-			do_action( 'gravityview_log_error', __METHOD__ . ' Could not retrieve entry ' . $lead_id . ' to delete it: ' . $entry->get_error_message() );
+			do_action('gravityview_log_error', __METHOD__.' Could not retrieve entry '.$lead_id.' to delete it: '.$entry->get_error_message());
 
 			return;
 		}
 
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
+		do_action('gravityview_log_debug', __METHOD__.' adding form '.$entry['form_id'].' to blacklist because entry #'.$lead_id.' was deleted', array('value' => $property_value, 'previous' => $previous_value));
 		
-		$this->blacklist_add( $entry['form_id'] );
+		$this->blacklist_add($entry['form_id']);
 	}
 
 	/**
@@ -125,11 +125,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_updated( $form, $lead_id ) {
+	public function entry_updated($form, $lead_id) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form '.$form['id'].' to blacklist because entry #'.$lead_id.' was updated');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -142,11 +142,11 @@ 
 	 *
 	 * @return void
 	 */
-	public function entry_created( $entry, $form ) {
+	public function entry_created($entry, $form) {
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[entry_created] adding form '.$form['id'].' to blacklist because entry #'.$entry['id'].' was created');
 
-		$this->blacklist_add( $form['id'] );
+		$this->blacklist_add($form['id']);
 	}
 
 	/**
@@ -156,20 +156,20 @@ 
 	 *
 	 * @return string           Prefix for the cache string used in set_key()
 	 */
-	protected function get_cache_key_prefix( $form_ids = NULL ) {
+	protected function get_cache_key_prefix($form_ids = NULL) {
 
-		if ( is_null( $form_ids ) ) {
+		if (is_null($form_ids)) {
 			$form_ids = $this->form_ids;
 		}
 
 		// Normally just one form, but supports multiple forms
 		//
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		$forms = 'f:'.implode('&f:', (array)$form_ids);
 
 		// Prefix for transient keys
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
-		return 'gv-cache-' . $forms . '-';
+		return 'gv-cache-'.$forms.'-';
 
 	}
 
@@ -179,17 +179,17 @@ 
 	protected function set_key() {
 
 		// Don't set key if no forms have been set.
-		if ( empty( $this->form_ids ) ) {
+		if (empty($this->form_ids)) {
 			return;
 		}
 
-		$key = $this->get_cache_key_prefix() . sha1( serialize( $this->args ) );
+		$key = $this->get_cache_key_prefix().sha1(serialize($this->args));
 
 		// The transient name column can handle up to 64 characters.
 		// The `_transient_timeout_` prefix that is prepended to the string is 11 characters.
 		// 64 - 19 = 45
 		// We make sure the key isn't too long or else WP doesn't store data.
-		$this->key = substr( $key, 0, 45 );
+		$this->key = substr($key, 0, 45);
 	}
 
 	/**
@@ -210,24 +210,24 @@ 
 	 *
 	 * @return boolean           False if value was not updated and true if value was updated.
 	 */
-	public function blacklist_add( $form_ids ) {
+	public function blacklist_add($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$form_ids = is_array( $form_ids ) ? $form_ids : array( $form_ids );
+		$form_ids = is_array($form_ids) ? $form_ids : array($form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_add] Adding form IDs to cache blacklist', array(
 			'$form_ids'  => $form_ids,
 			'$blacklist' => $blacklist
-		) );
+		));
 
 		// Add the passed form IDs
-		$blacklist = array_merge( $blacklist, $form_ids );
+		$blacklist = array_merge($blacklist, $form_ids);
 
 		// Don't duplicate
-		$blacklist = array_unique( $blacklist );
+		$blacklist = array_unique($blacklist);
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $blacklist );
+		return update_option(self::BLACKLIST_OPTION_NAME, $blacklist);
 
 	}
 
@@ -238,19 +238,19 @@ 
 	 *
 	 * @return boolean           Whether the removal was successful
 	 */
-	public function blacklist_remove( $form_ids ) {
+	public function blacklist_remove($form_ids) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
+		$updated_list = array_diff($blacklist, (array)$form_ids);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
+		do_action('gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
 			'$form_ids'     => $form_ids,
 			'$blacklist'    => $blacklist,
 			'$updated_list' => $updated_list
-		) );
+		));
 
-		return update_option( self::BLACKLIST_OPTION_NAME, $updated_list );
+		return update_option(self::BLACKLIST_OPTION_NAME, $updated_list);
 	}
 
 
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return [type] [description]
 	 */
-	function in_blacklist( $form_ids = NULL ) {
+	function in_blacklist($form_ids = NULL) {
 
-		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
+		$blacklist = get_option(self::BLACKLIST_OPTION_NAME, array());
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
+		if (empty($form_ids)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids );
+			do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Did not add form to blacklist; empty form ID', $form_ids);
 
 			return false;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			if ( in_array( $form_id, $blacklist ) ) {
+			if (in_array($form_id, $blacklist)) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #' . esc_attr( $form_id ) . ' is in the cache blacklist' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[in_blacklist] Form #'.esc_attr($form_id).' is in the cache blacklist');
 
 				return true;
 			}
@@ -296,35 +296,35 @@ 
 	 *
 	 * @return mixed      False: Not using cache or cache was a WP_Error object; NULL: no results found; Mixed: cache value
 	 */
-	public function get( $key = NULL ) {
+	public function get($key = NULL) {
 
-		$key = is_null( $key ) ? $this->key : $key;
+		$key = is_null($key) ? $this->key : $key;
 
-		if ( ! $this->use_cache() ) {
+		if (!$this->use_cache()) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Not using cached results because of GravityView_Cache->use_cache() results');
 
 			return false;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request with transient key '.$key);
 
-		$result = get_transient( $key );
+		$result = get_transient($key);
 
-		if ( is_wp_error( $result ) ) {
+		if (is_wp_error($result)) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Fetching request resulted in error:', $result);
 
 			return false;
 
-		} elseif ( $result ) {
+		} elseif ($result) {
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key ' . $key );
+			do_action('gravityview_log_debug', 'GravityView_Cache[get] Cached results found for  transient key '.$key);
 
 			return $result;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key ' . $key );
+		do_action('gravityview_log_debug', 'GravityView_Cache[get] No cached results found for  transient key '.$key);
 
 		return NULL;
 
@@ -338,24 +338,24 @@ 
 	 * @param [type] $content     [description]
 	 * @param [type] $filter_name Name used to modify the cache time. Will be set to `gravityview_cache_time_{$filter_name}`.
 	 */
-	public function set( $content, $filter_name = '' ) {
+	public function set($content, $filter_name = '') {
 
 		// Don't cache empty results
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 
 			/**
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
 			 */
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
+			$cache_time = (int)apply_filters('gravityview_cache_time_'.$filter_name, DAY_IN_SECONDS);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
+			do_action('gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key '.$this->key.' for '.$cache_time.' seconds');
 
-			return set_transient( $this->key, $content, $cache_time );
+			return set_transient($this->key, $content, $cache_time);
 
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[set] Cache not set; content is empty');
 
 		return false;
 
@@ -371,39 +371,39 @@ 
 	 *
 	 * @return [type]           [description]
 	 */
-	public function delete( $form_ids = NULL ) {
+	public function delete($form_ids = NULL) {
 		global $wpdb;
 
 		// Use object var if exists
-		$form_ids = is_null( $form_ids ) ? $this->form_ids : $form_ids;
+		$form_ids = is_null($form_ids) ? $this->form_ids : $form_ids;
 
-		if ( empty( $form_ids ) ) {
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs' );
+		if (empty($form_ids)) {
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Did not delete cache; empty form IDs');
 
 			return;
 		}
 
-		foreach ( (array) $form_ids as $form_id ) {
+		foreach ((array)$form_ids as $form_id) {
 
-			$key = $this->get_cache_key_prefix( $form_id );
+			$key = $this->get_cache_key_prefix($form_id);
 
 			// WordPress 4.0+
-			if ( is_callable( array( $wpdb, 'esc_like' ) ) ) {
-				$key = $wpdb->esc_like( $key );
+			if (is_callable(array($wpdb, 'esc_like'))) {
+				$key = $wpdb->esc_like($key);
 			} else {
-				$key = like_escape( $key );
+				$key = like_escape($key);
 			}
 
-			$key = "%" . $key . "%";
+			$key = "%".$key."%";
 
-			$sql = $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
+			$sql = $wpdb->prepare("DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key);
 
-			$result = $wpdb->query( $sql );
+			$result = $wpdb->query($sql);
 
-			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #' . $form_id, array(
+			do_action('gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #'.$form_id, array(
 				$sql,
-				sprintf( 'Deleted results: %d', $result )
-			) );
+				sprintf('Deleted results: %d', $result)
+			));
 		}
 
 	}
@@ -421,14 +421,14 @@ 
 		 * @filter `gravityview_cleanup_transients` Override GravityView cleanup of transients by setting this to false
 		 * @param boolean $cleanup Whether to run the GravityView auto-cleanup of transients. Default: `true`
 		 */
-		$cleanup = apply_filters( 'gravityview_cleanup_transients', true );
+		$cleanup = apply_filters('gravityview_cleanup_transients', true);
 
-		if ( ! $cleanup ) {
+		if (!$cleanup) {
 			return;
 		}
 
-		if ( ! wp_next_scheduled( 'gravityview-expired-transients' ) ) {
-			wp_schedule_event( time(), 'daily', 'gravityview-expired-transients' );
+		if (!wp_next_scheduled('gravityview-expired-transients')) {
+			wp_schedule_event(time(), 'daily', 'gravityview-expired-transients');
 		}
 	}
 
@@ -453,7 +453,7 @@ 
 		$threshold = time() - 60;
 
 		// get table name for options on specified blog
-		$table = $wpdb->get_blog_prefix( $blog_id ) . 'options';
+		$table = $wpdb->get_blog_prefix($blog_id).'options';
 
 		// delete expired transients, using the paired timeout record to find them
 		$sql = "
@@ -464,7 +464,7 @@ 
 			and t1.option_value < '$threshold'
 		";
 
-		$num_results = $wpdb->query( $sql );
+		$num_results = $wpdb->query($sql);
 
 		// delete orphaned transient expirations
 		// also delete NextGEN Gallery 2.x display cache timeout aliases
@@ -479,9 +479,9 @@ 
 			and option_value < '$threshold'
 		";
 
-		$num_results += $wpdb->query( $sql );
+		$num_results += $wpdb->query($sql);
 
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted ' . $num_results . ' expired transient records from the database' );
+		do_action('gravityview_log_debug', 'GravityView_Cache[delete_expired_transients] Deleted '.$num_results.' expired transient records from the database');
 	}
 
 	/**
@@ -495,11 +495,11 @@ 
 
 		$use_cache = true;
 
-		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
+			if (isset($_GET['cache']) || isset($_GET['nocache'])) {
 
-				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
+				do_action('gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL');
 
 				$use_cache = false;
 			}
@@ -507,13 +507,13 @@ 
 		}
 
 		// Has the form been flagged as having changed items in it?
-		if ( $this->in_blacklist() ) {
+		if ($this->in_blacklist()) {
 
 			// Delete caches for all items with form IDs XYZ
-			$this->delete( $this->form_ids );
+			$this->delete($this->form_ids);
 
 			// Remove the form from
-			$this->blacklist_remove( $this->form_ids );
+			$this->blacklist_remove($this->form_ids);
 
 		}
 
@@ -524,9 +524,9 @@ 
 		 * @param[out,in]  boolean $use_cache Previous setting
 		 * @param[out] GravityView_Cache $this The GravityView_Cache object
 		 */
-		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
+		$use_cache = apply_filters('gravityview_use_cache', $use_cache, $this);
 
-		return (boolean) $use_cache;
+		return (boolean)$use_cache;
 	}
 
 }