gravityview / GravityView

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

@@ -12,7 +12,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * GravityView_Welcome Class

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

includes/class-gravityview-admin-bar.php

Spacing +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 	 * @since 1.13
 	 */
 	private function add_hooks() {
-		add_action( 'add_admin_bar_menus', array( $this, 'remove_links' ), 80 );
-		add_action( 'admin_bar_menu', array( $this, 'add_links' ), 85 );
+		add_action('add_admin_bar_menus', array($this, 'remove_links'), 80);
+		add_action('admin_bar_menu', array($this, 'add_links'), 85);
 	}
 
 	/**
@@ -55,15 +55,15 @@ 
 
 		$entry_id = $this->gravityview_view->getSingleEntry();
 
-		if ( $entry_id && GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ), $entry_id ) ) {
+		if ($entry_id && GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'), $entry_id)) {
 
 			$entry = $this->gravityview_view->getEntry();
 
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_menu(array(
 				'id' => 'edit-entry',
-				'title' => __( 'Edit Entry', 'gravityview' ),
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
-			) );
+				'title' => __('Edit Entry', 'gravityview'),
+				'href' => esc_url_raw(admin_url(sprintf('admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id']))),
+			));
 
 		}
 	}
@@ -78,7 +78,7 @@ 
 		/** @var WP_Admin_Bar $wp_admin_bar */
 		global $wp_admin_bar;
 
-		if( GVCommon::has_cap('edit_gravityviews') ) {
+		if (GVCommon::has_cap('edit_gravityviews')) {
 
 			$view_data = GravityView_View_Data::getInstance();
 
@@ -86,15 +86,15 @@ 
 
 			// If there is a View embed, shor Edit View link.
 			// todo: Support multiple View embeds with a drop-down menu
-			if ( ! $this->gravityview_view->isGravityviewPostType() && ! empty( $views ) && ! $view_data->has_multiple_views() ) {
-				$view = reset( $views );
+			if (!$this->gravityview_view->isGravityviewPostType() && !empty($views) && !$view_data->has_multiple_views()) {
+				$view = reset($views);
 
-				if( GVCommon::has_cap( 'edit_gravityview', $view['id'] ) ) {
-					$wp_admin_bar->add_menu( array(
+				if (GVCommon::has_cap('edit_gravityview', $view['id'])) {
+					$wp_admin_bar->add_menu(array(
 						'id'    => 'edit-view',
-						'title' => __( 'Edit View', 'gravityview' ),
-						'href'  => esc_url_raw( admin_url( sprintf( 'post.php?post=%d&action=edit', $view['id'] ) ) ),
-					) );
+						'title' => __('Edit View', 'gravityview'),
+						'href'  => esc_url_raw(admin_url(sprintf('post.php?post=%d&action=edit', $view['id']))),
+					));
 				}
 			}
 		}
@@ -108,8 +108,8 @@ 
 	function remove_links() {
 
 		// If we're on the single entry page, we don't want to cause confusion.
-		if ( is_admin() || ( $this->gravityview_view->getSingleEntry() && ! $this->gravityview_view->isGravityviewPostType() ) ) {
-			remove_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
+		if (is_admin() || ($this->gravityview_view->getSingleEntry() && !$this->gravityview_view->isGravityviewPostType())) {
+			remove_action('admin_bar_menu', 'wp_admin_bar_edit_menu', 80);
 		}
 	}
 }

includes/class-gravityview-admin-notices.php

Spacing +39 added lines, -39 removed lines

@@ -15,7 +15,7 @@ 
  * When the plugin is activated, flush dismissed notices
  * @since 1.15.1
  */
-register_activation_hook( GRAVITYVIEW_FILE, array( 'GravityView_Admin_Notices', 'flush_dismissed_notices' ) );
+register_activation_hook(GRAVITYVIEW_FILE, array('GravityView_Admin_Notices', 'flush_dismissed_notices'));
 
 /**
  * Handle displaying and storing of admin notices for GravityView
@@ -33,10 +33,10 @@ 
 	}
 
 	function add_hooks() {
-		add_action( 'network_admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'dismiss_notice' ), 50 );
-		add_action( 'admin_notices', array( $this, 'admin_notice' ), 100 );
-		add_action( 'network_admin_notices', array( $this, 'admin_notice' ), 100 );
+		add_action('network_admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'dismiss_notice'), 50);
+		add_action('admin_notices', array($this, 'admin_notice'), 100);
+		add_action('network_admin_notices', array($this, 'admin_notice'), 100);
 	}
 
 	/**
@@ -46,7 +46,7 @@ 
 	 * @return void
 	 */
 	static public function flush_dismissed_notices() {
-		delete_transient( 'gravityview_dismissed_notices' );
+		delete_transient('gravityview_dismissed_notices');
 	}
 
 	/**
@@ -57,26 +57,26 @@ 
 	public function dismiss_notice() {
 
 		// No dismiss sent
-		if( empty( $_GET['gv-dismiss'] ) ) {
+		if (empty($_GET['gv-dismiss'])) {
 			return;
 		}
 
 		// Invalid nonce
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
+		if (!wp_verify_nonce($_GET['gv-dismiss'], 'dismiss')) {
 			return;
 		}
 
-		$notice_id = esc_attr( $_GET['notice'] );
+		$notice_id = esc_attr($_GET['notice']);
 
 		//don't display a message if use has dismissed the message for this version
-		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
+		$dismissed_notices = (array)get_transient('gravityview_dismissed_notices');
 
 		$dismissed_notices[] = $notice_id;
 
-		$dismissed_notices = array_unique( $dismissed_notices );
+		$dismissed_notices = array_unique($dismissed_notices);
 
 		// Remind users every 16 weeks
-		set_transient( 'gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16 );
+		set_transient('gravityview_dismissed_notices', $dismissed_notices, WEEK_IN_SECONDS * 16);
 
 	}
 
@@ -91,15 +91,15 @@ 
 	 * @param  string $notice            Notice array, set using `add_notice()`.
 	 * @return boolean                   True: show notice; False: hide notice
 	 */
-	private function is_notice_dismissed( $notice ) {
+	private function is_notice_dismissed($notice) {
 
 		// There are no dismissed notices.
-		if( empty( self::$dismissed_notices ) ) {
+		if (empty(self::$dismissed_notices)) {
 			return false;
 		}
 
 		// Has the
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
+		$is_dismissed = !empty($notice['dismiss']) && in_array($notice['dismiss'], self::$dismissed_notices);
 
 		return $is_dismissed ? true : false;
 	}
@@ -124,17 +124,17 @@ 
 	 */
 	private function check_show_multisite_notices() {
 
-		if( ! is_multisite() ) {
+		if (!is_multisite()) {
 			return true;
 		}
 
 		// It's network activated but the user can't manage network plugins; they can't do anything about it.
-		if( GravityView_Plugin::is_network_activated() && ! is_main_site() ) {
+		if (GravityView_Plugin::is_network_activated() && !is_main_site()) {
 			return false;
 		}
 
 		// or they don't have admin capabilities
-		if( ! is_super_admin() ) {
+		if (!is_super_admin()) {
 			return false;
 		}
 
@@ -155,53 +155,53 @@ 
 		 * @filter `gravityview/admin/notices` Modify the notices displayed in the admin
 		 * @since 1.12
 		 */
-		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
+		$notices = apply_filters('gravityview/admin/notices', self::$admin_notices);
 
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
+		if (empty($notices) || !$this->check_show_multisite_notices()) {
 			return;
 		}
 
 		//don't display a message if use has dismissed the message for this version
 		// TODO: Use get_user_meta instead of get_transient
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
+		self::$dismissed_notices = isset($_GET['show-dismissed-notices']) ? array() : (array)get_transient('gravityview_dismissed_notices');
 
 		$output = '';
 
-		foreach( $notices as $notice ) {
+		foreach ($notices as $notice) {
 
 			// If the user doesn't have the capability to see the warning
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice );
+			if (isset($notice['cap']) && false === GVCommon::has_cap($notice['cap'])) {
+				do_action('gravityview_log_debug', 'Notice not shown because user does not have the capability to view it.', $notice);
 				continue;
 			}
 
-			if( true === $this->is_notice_dismissed( $notice ) ) {
-				do_action( 'gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice );
+			if (true === $this->is_notice_dismissed($notice)) {
+				do_action('gravityview_log_debug', 'Notice not shown because the notice has already been dismissed.', $notice);
 				continue;
 			}
 
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
+			$output .= '<div id="message" style="position:relative" class="notice '.gravityview_sanitize_html_class($notice['class']).'">';
 
 			// Too cute to leave out.
 			$output .= gravityview_get_floaty();
 
-			if( !empty( $notice['title'] ) ) {
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
+			if (!empty($notice['title'])) {
+				$output .= '<h3>'.esc_html($notice['title']).'</h3>';
 			}
 
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
+			$message = isset($notice['message']) ? $notice['message'] : '';
 
-			if( !empty( $notice['dismiss'] ) ) {
+			if (!empty($notice['dismiss'])) {
 
 				$dismiss = esc_attr($notice['dismiss']);
 
-				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
+				$url = esc_url(add_query_arg(array('gv-dismiss' => wp_create_nonce('dismiss'), 'notice' => $dismiss)));
 
 				$align = is_rtl() ? 'alignleft' : 'alignright';
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
+				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="'.$align.' button button-link">'.esc_html__('Dismiss', 'gravityview').'</a></p>';
 			}
 
-			$output .= wpautop( $message );
+			$output .= wpautop($message);
 
 			$output .= '<div class="clear"></div>';
 			$output .= '</div>';
@@ -210,7 +210,7 @@ 
 
 		echo $output;
 
-		unset( $output, $align, $message, $notices );
+		unset($output, $align, $message, $notices);
 
 		//reset the notices handler
 		self::$admin_notices = array();
@@ -223,14 +223,14 @@ 
 	 * @param array $notice Array with `class`, `message`, `dismiss` and `cap` keys. The message is not escaped.
 	 * @return void
 	 */
-	public static function add_notice( $notice = array() ) {
+	public static function add_notice($notice = array()) {
 
-		if( !isset( $notice['message'] ) ) {
-			do_action( 'gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice );
+		if (!isset($notice['message'])) {
+			do_action('gravityview_log_error', 'GravityView_Admin[add_notice] Notice not set', $notice);
 			return;
 		}
 
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
+		$notice['class'] = empty($notice['class']) ? 'error' : $notice['class'];
 
 		self::$admin_notices[] = $notice;
 	}

includes/class-gravityview-change-entry-creator.php

Indentation +169 added lines, -169 removed lines

@@ -5,220 +5,220 @@
  */
 class GravityView_Change_Entry_Creator {
 
-    function __construct() {
-
-    	/**
-    	 * @since  1.5.1
-    	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
-
-    	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
-
-	    /**
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
-	     * @since 1.7.4
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
-	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
-		    return;
-	    }
-
-        /**
-         * Use `init` to fix bbPress warning
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
-         */
-    	add_action('init', array( $this, 'load'), 100 );
-
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+	function __construct() {
+
+		/**
+		 * @since  1.5.1
+		 */
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+
+		// ONLY ADMIN FROM HERE ON.
+		if( !is_admin() ) { return; }
+
+		/**
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
+		 * @since 1.7.4
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
+		 */
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+			return;
+		}
+
+		/**
+		 * Use `init` to fix bbPress warning
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
+		 */
+		add_action('init', array( $this, 'load'), 100 );
+
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
 
-    }
+	}
 
-    /**
-     * When an user is created using the User Registration add-on, assign the entry to them
-     *
-     * @since  1.5.1
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
-     * @param  int $user_id  WordPress User ID
-     * @param  array $config   User registration feed configuration
-     * @param  array  $entry     GF Entry array
-     * @param  string $password User password
-     * @return void
-     */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+	/**
+	 * When an user is created using the User Registration add-on, assign the entry to them
+	 *
+	 * @since  1.5.1
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
+	 * @param  int $user_id  WordPress User ID
+	 * @param  array $config   User registration feed configuration
+	 * @param  array  $entry     GF Entry array
+	 * @param  string $password User password
+	 * @return void
+	 */
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
 
-    	/**
-    	 * Disable assigning the new user to the entry by returning false.
-    	 * @param  int $user_id  WordPress User ID
-	     * @param  array $config   User registration feed configuration
-	     * @param  array  $entry     GF Entry array
-    	 */
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
-
-    	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
-    		return;
-    	}
+		/**
+		 * Disable assigning the new user to the entry by returning false.
+		 * @param  int $user_id  WordPress User ID
+		 * @param  array $config   User registration feed configuration
+		 * @param  array  $entry     GF Entry array
+		 */
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
+
+		// If filter returns false, do not process
+		if( empty( $assign_to_lead ) ) {
+			return;
+		}
 
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
+		$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
 
-    	if( empty( $result ) ) {
-    		$status = __('Error', 'gravityview');
-    	} else {
-    		$status = __('Success', 'gravityview');
-    	}
-
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+		if( empty( $result ) ) {
+			$status = __('Error', 'gravityview');
+		} else {
+			$status = __('Success', 'gravityview');
+		}
+
+		$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
 
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
+		do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
 
-    }
+	}
 
-    /**
-     * Disable previous functionality; use this one as the canonical.
-     * @return void
-     */
-    function prevent_conflicts() {
+	/**
+	 * Disable previous functionality; use this one as the canonical.
+	 * @return void
+	 */
+	function prevent_conflicts() {
 
-    	// Plugin that was provided here:
-    	// @link https://gravityview.co/support/documentation/201991205/
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
+		// Plugin that was provided here:
+		// @link https://gravityview.co/support/documentation/201991205/
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10, 2);
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
 
-    	// Disable for Gravity Forms Add-ons 3.6.2 and lower
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
+		// Disable for Gravity Forms Add-ons 3.6.2 and lower
+		if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
 
-    		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
+			$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
-    		// Now, no validation is required in the methods; let's hook in.
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
+			// Now, no validation is required in the methods; let's hook in.
+			remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
 
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
+			remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
 
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
-    	}
+			remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
+		}
 
-    }
+	}
 
-    /**
-     * @since  3.6.3
-     * @return void
-     */
-    function load() {
+	/**
+	 * @since  3.6.3
+	 * @return void
+	 */
+	function load() {
 
-    	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
-            return;
-        }
+		// Does GF exist?
+		if( !class_exists('GFCommon') ) {
+			return;
+		}
 
-        // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
-            return;
-        }
+		// Can the user edit entries?
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+			return;
+		}
 
-        // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
-            return;
-        }
+		// If screen mode isn't set, then we're in the wrong place.
+		if( empty( $_REQUEST['screen_mode'] ) ) {
+			return;
+		}
 
-        // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+		// Now, no validation is required in the methods; let's hook in.
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
 
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
 
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
 
-    }
+	}
 
-    /**
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
-     * @return void
-     */
-    function set_screen_mode() {
+	/**
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
+	 * @return void
+	 */
+	function set_screen_mode() {
 
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
-            $_POST["screen_mode"] = 'edit';
-        }
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
+		if( rgget('screen_mode') === 'edit' ) {
+			$_POST["screen_mode"] = 'edit';
+		}
 
-    }
+	}
 
-    /**
-     * When the entry creator is changed, add a note to the entry
-     * @param  array $form   GF entry array
-     * @param  int $entry_id Entry ID
-     * @return void
-     */
-    function update_entry_creator($form, $entry_id) {
-            global $current_user;
+	/**
+	 * When the entry creator is changed, add a note to the entry
+	 * @param  array $form   GF entry array
+	 * @param  int $entry_id Entry ID
+	 * @return void
+	 */
+	function update_entry_creator($form, $entry_id) {
+			global $current_user;
 
-        // Update the entry
-        $created_by = absint( rgpost('created_by') );
+		// Update the entry
+		$created_by = absint( rgpost('created_by') );
 
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
 
-        // If the creator has changed, let's add a note about who it used to be.
-        $originally_created_by = rgpost('originally_created_by');
+		// If the creator has changed, let's add a note about who it used to be.
+		$originally_created_by = rgpost('originally_created_by');
 
-        // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
-            return;
-        }
+		// If there's no owner and there didn't used to be, keep going
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
+			return;
+		}
 
-        // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+		// If the values have changed
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
 
-            $user_data = get_userdata($current_user->ID);
+			$user_data = get_userdata($current_user->ID);
 
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
 
-            if( !empty( $originally_created_by ) ) {
-                $originally_created_by_user_data = get_userdata($originally_created_by);
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
-            }
+			if( !empty( $originally_created_by ) ) {
+				$originally_created_by_user_data = get_userdata($originally_created_by);
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
+			}
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
-            }
+			if( !empty( $created_by ) ) {
+				$created_by_user_data =  get_userdata($created_by);
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
+			}
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
-        }
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+		}
 
-    }
+	}
 
-    /**
-     * Output the select to change the entry creator
-     * @param int $form_id GF Form ID
-     * @param array $entry    GF entry array
-     * @return void
-     */
-    function add_select($form_id, $entry ) {
+	/**
+	 * Output the select to change the entry creator
+	 * @param int $form_id GF Form ID
+	 * @param array $entry    GF entry array
+	 * @return void
+	 */
+	function add_select($form_id, $entry ) {
 
-        if( rgpost('screen_mode') !== 'edit' ) {
-            return;
-        }
+		if( rgpost('screen_mode') !== 'edit' ) {
+			return;
+		}
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+		$users = GVCommon::get_users( 'change_entry_creator' );
 
-        $output = '<label for="change_created_by">';
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
-        $output .= '</label>
+		$output = '<label for="change_created_by">';
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
+		$output .= '</label>
         <select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
-        }
-        $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
-        echo $output;
-
-    }
+		$output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
+		foreach($users as $user) {
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+		}
+		$output .= '</select>';
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+		echo $output;
+
+	}
 
 }
 

Spacing +42 added lines, -42 removed lines

@@ -10,17 +10,17 @@ 
     	/**
     	 * @since  1.5.1
     	 */
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
+    	add_action('gform_user_registered', array($this, 'assign_new_user_to_lead'), 10, 4);
 
     	// ONLY ADMIN FROM HERE ON.
-    	if( !is_admin() ) { return; }
+    	if (!is_admin()) { return; }
 
 	    /**
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
 	     * @since 1.7.4
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
 	     */
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
+	    if (apply_filters('gravityview_disable_change_entry_creator', false)) {
 		    return;
 	    }
 
@@ -28,9 +28,9 @@ 
          * Use `init` to fix bbPress warning
          * @see https://bbpress.trac.wordpress.org/ticket/2309
          */
-    	add_action('init', array( $this, 'load'), 100 );
+    	add_action('init', array($this, 'load'), 100);
 
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
+    	add_action('plugins_loaded', array($this, 'prevent_conflicts'));
 
     }
 
@@ -45,7 +45,7 @@ 
      * @param  string $password User password
      * @return void
      */
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
+    function assign_new_user_to_lead($user_id, $config, $entry = array(), $password = '') {
 
     	/**
     	 * Disable assigning the new user to the entry by returning false.
@@ -53,27 +53,27 @@ 
 	     * @param  array $config   User registration feed configuration
 	     * @param  array  $entry     GF Entry array
     	 */
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
+    	$assign_to_lead = apply_filters('gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry);
 
     	// If filter returns false, do not process
-    	if( empty( $assign_to_lead ) ) {
+    	if (empty($assign_to_lead)) {
     		return;
     	}
 
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
-    	$result = RGFormsModel::update_lead_property( $entry['id'], 'created_by', $user_id, false, true );
+    	$result = RGFormsModel::update_lead_property($entry['id'], 'created_by', $user_id, false, true);
 
-    	if( empty( $result ) ) {
+    	if (empty($result)) {
     		$status = __('Error', 'gravityview');
     	} else {
     		$status = __('Success', 'gravityview');
     	}
 
-    	$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
+    	$note = sprintf(_x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id);
 
-    	do_action( 'gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note );
+    	do_action('gravityview_log_debug', 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - '.$note);
 
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
+        GravityView_Entry_Notes::add_note($entry['id'], -1, 'GravityView', $note, 'gravityview');
 
     }
 
@@ -89,16 +89,16 @@ 
     	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10, 2);
 
     	// Disable for Gravity Forms Add-ons 3.6.2 and lower
-    	if( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
+    	if (class_exists('KWS_GF_Change_Lead_Creator')) {
 
     		$Old_Lead_Creator = new KWS_GF_Change_Lead_Creator;
 
     		// Now, no validation is required in the methods; let's hook in.
-    		remove_action('admin_init', array( $Old_Lead_Creator, 'set_screen_mode' ) );
+    		remove_action('admin_init', array($Old_Lead_Creator, 'set_screen_mode'));
 
-    		remove_action("gform_entry_info", array( $Old_Lead_Creator, 'add_select' ), 10, 2);
+    		remove_action("gform_entry_info", array($Old_Lead_Creator, 'add_select'), 10, 2);
 
-    		remove_action("gform_after_update_entry", array( $Old_Lead_Creator, 'update_entry_creator' ), 10, 2);
+    		remove_action("gform_after_update_entry", array($Old_Lead_Creator, 'update_entry_creator'), 10, 2);
     	}
 
     }
@@ -110,26 +110,26 @@ 
     function load() {
 
     	// Does GF exist?
-        if( !class_exists('GFCommon') ) {
+        if (!class_exists('GFCommon')) {
             return;
         }
 
         // Can the user edit entries?
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
+        if (!GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_entries'))) {
             return;
         }
 
         // If screen mode isn't set, then we're in the wrong place.
-        if( empty( $_REQUEST['screen_mode'] ) ) {
+        if (empty($_REQUEST['screen_mode'])) {
             return;
         }
 
         // Now, no validation is required in the methods; let's hook in.
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
+        add_action('admin_init', array(&$this, 'set_screen_mode'));
 
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
+        add_action("gform_entry_info", array(&$this, 'add_select'), 10, 2);
 
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
+        add_action("gform_after_update_entry", array(&$this, 'update_entry_creator'), 10, 2);
 
     }
 
@@ -140,7 +140,7 @@ 
     function set_screen_mode() {
 
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
-        if( rgget('screen_mode') === 'edit' ) {
+        if (rgget('screen_mode') === 'edit') {
             $_POST["screen_mode"] = 'edit';
         }
 
@@ -156,38 +156,38 @@ 
             global $current_user;
 
         // Update the entry
-        $created_by = absint( rgpost('created_by') );
+        $created_by = absint(rgpost('created_by'));
 
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
+        RGFormsModel::update_lead_property($entry_id, 'created_by', $created_by);
 
         // If the creator has changed, let's add a note about who it used to be.
         $originally_created_by = rgpost('originally_created_by');
 
         // If there's no owner and there didn't used to be, keep going
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
+        if (empty($originally_created_by) && empty($created_by)) {
             return;
         }
 
         // If the values have changed
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
+        if (absint($originally_created_by) !== absint($created_by)) {
 
             $user_data = get_userdata($current_user->ID);
 
             $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
 
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
+            $original_name = $created_by_name = esc_attr_x('No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
 
-            if( !empty( $originally_created_by ) ) {
+            if (!empty($originally_created_by)) {
                 $originally_created_by_user_data = get_userdata($originally_created_by);
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
+                $original_name = sprintf($user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID);
             }
 
-            if( !empty( $created_by ) ) {
-                $created_by_user_data =  get_userdata($created_by);
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
+            if (!empty($created_by)) {
+                $created_by_user_data = get_userdata($created_by);
+                $created_by_name = sprintf($user_format, $created_by_user_data->display_name, $created_by_user_data->ID);
             }
 
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
+            GravityView_Entry_Notes::add_note($entry_id, $current_user->ID, $user_data->display_name, sprintf(__('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name), 'note');
         }
 
     }
@@ -198,24 +198,24 @@ 
      * @param array $entry    GF entry array
      * @return void
      */
-    function add_select($form_id, $entry ) {
+    function add_select($form_id, $entry) {
 
-        if( rgpost('screen_mode') !== 'edit' ) {
+        if (rgpost('screen_mode') !== 'edit') {
             return;
         }
 
-        $users = GVCommon::get_users( 'change_entry_creator' );
+        $users = GVCommon::get_users('change_entry_creator');
 
         $output = '<label for="change_created_by">';
         $output .= esc_html__('Change Entry Creator:', 'gravityview');
         $output .= '</label>
         <select name="created_by" id="change_created_by" class="widefat">';
-        $output .= '<option value=""> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
-        foreach($users as $user) {
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
+        $output .= '<option value=""> &mdash; '.esc_attr_x('No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
+        foreach ($users as $user) {
+            $output .= '<option value="'.$user->ID.'"'.selected($entry['created_by'], $user->ID, false).'>'.esc_attr($user->display_name.' ('.$user->user_nicename.')').'</option>';
         }
         $output .= '</select>';
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
+        $output .= '<input name="originally_created_by" value="'.esc_attr($entry['created_by']).'" type="hidden" />';
         echo $output;
 
     }

includes/class-gravityview-entry-list.php

Spacing +31 added lines, -31 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -75,7 +75,7 @@ 
 	 * @param string $link_format
 	 * @param string $after_link
 	 */
-	function __construct( $entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '' ) {
+	function __construct($entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '') {
 
 		$this->entries = $entries;
 		$this->post_id = $post_id;
@@ -90,28 +90,28 @@ 
 	/**
 	 * @param int $post_id
 	 */
-	public function set_post_id( $post_id ) {
+	public function set_post_id($post_id) {
 		$this->post_id = $post_id;
 	}
 
 	/**
 	 * @param string $link_format
 	 */
-	public function set_link_format( $link_format ) {
+	public function set_link_format($link_format) {
 		$this->link_format = $link_format;
 	}
 
 	/**
 	 * @param boolean $skip_current_entry
 	 */
-	public function set_skip_current_entry( $skip_current_entry ) {
+	public function set_skip_current_entry($skip_current_entry) {
 		$this->skip_current_entry = (bool)$skip_current_entry;
 	}
 
 	/**
 	 * @param string $after_link
 	 */
-	public function set_after_link( $after_link ) {
+	public function set_after_link($after_link) {
 		$this->after_link = $after_link;
 	}
 
@@ -119,7 +119,7 @@ 
 	 * Set the message when there are no entries to display
 	 * @param string $empty_message
 	 */
-	public function set_empty_message( $empty_message ) {
+	public function set_empty_message($empty_message) {
 		$this->empty_message = $empty_message;
 	}
 
@@ -127,23 +127,23 @@ 
 	 * Set the context in which this entry list is being displayed.
 	 * @param string $context
 	 */
-	public function set_context( $context ) {
+	public function set_context($context) {
 		$this->context = $context;
 	}
 
 	/**
 	 * @param string $wrapper_tag
 	 */
-	public function set_wrapper_tag( $wrapper_tag ) {
-		$this->wrapper_tag = esc_attr( $wrapper_tag );
+	public function set_wrapper_tag($wrapper_tag) {
+		$this->wrapper_tag = esc_attr($wrapper_tag);
 	}
 
 	/**
 	 *
 	 * @param string $item_tag
 	 */
-	public function set_item_tag( $item_tag ) {
-		$this->item_tag = esc_attr( $item_tag );
+	public function set_item_tag($item_tag) {
+		$this->item_tag = esc_attr($item_tag);
 	}
 
 	/**
@@ -170,32 +170,32 @@ 
 	public function get_output() {
 
 		// No Entries
-		if( empty( $this->entries ) ) {
+		if (empty($this->entries)) {
 			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
 		}
 
 		$output = '';
 		$current_entry = GravityView_View::getInstance()->getCurrentEntry();
 
-		$output .= '<'. $this->wrapper_tag .'>';
+		$output .= '<'.$this->wrapper_tag.'>';
 
-		foreach( $this->entries as $entry ) {
+		foreach ($this->entries as $entry) {
 
-			if( $this->skip_entry( $entry, $current_entry ) ) {
+			if ($this->skip_entry($entry, $current_entry)) {
 				continue;
 			}
 
-			$output .= $this->get_item_output( $entry );
+			$output .= $this->get_item_output($entry);
 		}
 
-		$output .= '</'. $this->wrapper_tag .'>';
+		$output .= '</'.$this->wrapper_tag.'>';
 
 		/**
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
 		 * @param string $output HTML to be displayed
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$output = apply_filters( 'gravityview/widget/recent-entries/output', $output, $this );
+		$output = apply_filters('gravityview/widget/recent-entries/output', $output, $this);
 
 		return $output;
 	}
@@ -208,18 +208,18 @@ 
 	 *
 	 * @return bool True: Skip entry; False: don't skip entry
 	 */
-	private function skip_entry( $entry, $current_entry ) {
+	private function skip_entry($entry, $current_entry) {
 
 		// If skip entry is off, or there's no current entry, return false
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
+		if (empty($this->skip_current_entry) || empty($current_entry)) {
 			return false;
 		}
 
 		// If in Single or Edit mode, $current_entry will be an array.
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
+		$current_entry_id = is_array($current_entry) ? $current_entry['id'] : $current_entry;
 
 		// If the entry ID matches the current entry, yes: skip
-		if( $entry['id'] === $current_entry_id ) {
+		if ($entry['id'] === $current_entry_id) {
 			return true;
 		}
 
@@ -240,13 +240,13 @@ 
 	 *
 	 * @return string HTML output for the entry
 	 */
-	private function get_item_output( $entry ) {
+	private function get_item_output($entry) {
 
-		$link = GravityView_API::entry_link( $entry, $this->post_id );
+		$link = GravityView_API::entry_link($entry, $this->post_id);
 
-		$item_output = gravityview_get_link( $link, $this->link_format );
+		$item_output = gravityview_get_link($link, $this->link_format);
 
-		if( !empty( $this->after_link ) ) {
+		if (!empty($this->after_link)) {
 
 			/**
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -255,14 +255,14 @@ 
 			 * @param array $entry Gravity Forms entry array
 			 * @param GravityView_Entry_List $this The current class instance
 			 */
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
+			$after_link = apply_filters('gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this);
 
 			$item_output .= $after_link;
 		}
 
-		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
+		$item_output = GravityView_API::replace_variables($item_output, $this->form, $entry);
 
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
+		$item_output = '<'.$this->item_tag.'>'.$item_output.'</'.$this->item_tag.'>';
 
 		/**
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
@@ -271,7 +271,7 @@ 
 		 * @param array $entry Gravity Forms entry array
 		 * @param GravityView_Entry_List $this The current class instance
 		 */
-		$item_output = apply_filters( 'gravityview/entry-list/item', $item_output, $entry, $this );
+		$item_output = apply_filters('gravityview/entry-list/item', $item_output, $entry, $this);
 
 		return $item_output;
 	}

includes/class-gravityview-entry-notes.php

Spacing +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
 	 * @since 1.15
 	 */
 	private function add_hooks() {
-		add_filter( 'gform_notes_avatar', array( 'GravityView_Entry_Notes', 'filter_avatar' ), 10, 2 );
+		add_filter('gform_notes_avatar', array('GravityView_Entry_Notes', 'filter_avatar'), 10, 2);
 	}
 
 
@@ -31,7 +31,7 @@ 
 	 * @param string $note Note content.
 	 * @param string $note_type Type of note. Default: `gravityview`
 	 */
-	public static function add_note( $lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview' ) {
+	public static function add_note($lead_id, $user_id, $user_name, $note = '', $note_type = 'gravityview') {
 
 		$default_note = array(
 			'lead_id' => 0,
@@ -47,12 +47,12 @@ 
 		 * @since 1.15.2
 		 * @param array $note Array with `lead_id`, `user_id`, `user_name`, `note`, and `note_type` key value pairs
 		 */
-		$note = apply_filters( 'gravityview/entry_notes/add_note', compact( 'lead_id', 'user_id', 'user_name', 'note', 'note_type' ) );
+		$note = apply_filters('gravityview/entry_notes/add_note', compact('lead_id', 'user_id', 'user_name', 'note', 'note_type'));
 
 		// Make sure the keys are all set
-		$note = wp_parse_args( $note, $default_note );
+		$note = wp_parse_args($note, $default_note);
 
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
+		GFFormsModel::add_note(intval($note['lead_id']), intval($note['user_id']), esc_attr($note['user_name']), $note['note'], esc_attr($note['note_type']));
 	}
 
 	/**
@@ -60,8 +60,8 @@ 
 	 * @see GFFormsModel::delete_note()
 	 * @param int $note_id Entry note ID
 	 */
-	public static function delete_note( $note_id ) {
-		GFFormsModel::delete_note( $note_id );
+	public static function delete_note($note_id) {
+		GFFormsModel::delete_note($note_id);
 	}
 
 	/**
@@ -70,13 +70,13 @@ 
 	 * @todo Write more efficient delete note method using SQL
 	 * @param int[] $note_ids Array of entry note ids
 	 */
-	public static function delete_notes( $note_ids = array() ) {
+	public static function delete_notes($note_ids = array()) {
 
-		if( !is_array( $note_ids ) ) {
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array', $note_ids );
+		if (!is_array($note_ids)) {
+			do_action('gravityview_log_error', __METHOD__.' - Note IDs not an array', $note_ids);
 		}
 
-		GFFormsModel::delete_notes( $note_ids );
+		GFFormsModel::delete_notes($note_ids);
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 *
 	 * @return stdClass[] Integer-keyed array of note objects
 	 */
-	public static function get_notes( $entry_id ) {
-		$notes = GFFormsModel::get_lead_notes( $entry_id );
+	public static function get_notes($entry_id) {
+		$notes = GFFormsModel::get_lead_notes($entry_id);
 
 		/**
 		 * @filter `gravityview/entry_notes/get_notes` Modify the notes array for an entry
@@ -96,7 +96,7 @@ 
 		 * @param stdClass[] $notes Integer-keyed array of note objects
 		 * @param int $entry_id Entry to get notes for
 		 */
-		$notes = apply_filters( 'gravityview/entry_notes/get_notes', $notes, $entry_id );
+		$notes = apply_filters('gravityview/entry_notes/get_notes', $notes, $entry_id);
 
 		return $notes;
 	}
@@ -109,10 +109,10 @@ 
 	 * @param object $note Note object with id, user_id, date_created, value, note_type, user_name, user_email vars
 	 * @return string Possibly-modified avatar
 	 */
-	public static function filter_avatar( $avatar = '', $note ) {
+	public static function filter_avatar($avatar = '', $note) {
 
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
+		if ('gravityview' === $note->note_type && -1 === (int)$note->user_id) {
+			$avatar = sprintf('<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw(plugins_url('assets/images/floaty-avatar.png', GRAVITYVIEW_FILE)));
 		}
 
 		return $avatar;

includes/class-gravityview-image.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	var $style = NULL;
 
 	/**
- 	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
+	 * String representing size of image - Choose from "full", "medium", "thumb", "tiny"
 	 * @var string
 	 */
 	var $size = NULL;

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 	}
 
 
-	function __construct( $atts = array() ) {
+	function __construct($atts = array()) {
 
 		$defaults = array(
 			'width' => $this->width,
@@ -63,13 +63,13 @@ 
 			'validate_src' => true
 		);
 
-		$atts = wp_parse_args( $atts, $defaults );
+		$atts = wp_parse_args($atts, $defaults);
 
-		foreach( $atts as $key => $val ) {
+		foreach ($atts as $key => $val) {
 			$this->{$key} = $val;
 		}
 
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
+		$this->class = !empty($this->class) ? esc_attr(implode(' ', (array)$this->class)) : $this->class;
 
 		$this->set_image_size();
 
@@ -85,17 +85,17 @@ 
 	 */
 	function validate_image_src() {
 
-		if ( !$this->validate_src ) { return true; }
+		if (!$this->validate_src) { return true; }
 
-		$info = pathinfo( $this->src );
+		$info = pathinfo($this->src);
 
 		/**
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
 		 */
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
+		$image_exts = apply_filters('gravityview_image_extensions', array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'));
 
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
+		return isset($info['extension']) && in_array(strtolower($info['extension']), $image_exts);
 	}
 
 	/**
@@ -103,20 +103,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_image_size( $string = NULL, $width = NULL, $height = NULL ) {
+	public function set_image_size($string = NULL, $width = NULL, $height = NULL) {
 
 
 		// If there is no width or height passed
-		if ( empty( $width ) || empty( $height ) ) {
+		if (empty($width) || empty($height)) {
 
 			// And there is no string size passed
 			// 		And we want to get the image size using PHP
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
+			if (empty($string) && !empty($this->getimagesize)) {
 
-				$image_size = getimagesize( $this->src );
+				$image_size = getimagesize($this->src);
 
-				if ( !empty( $image_size ) ) {
-					list( $width, $height ) = $image_size;
+				if (!empty($image_size)) {
+					list($width, $height) = $image_size;
 				}
 
 			}
@@ -127,14 +127,14 @@ 
 				 * @filter `gravityview_image_sizes` Modify the image size presets used by GravityView_Image class
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
 				 */
-				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
+				$image_sizes = apply_filters('gravityview_image_sizes', array(
 					'tiny' => array('width' => 40, 'height' => 30),
 					'small' => array('width' => 100, 'height' => 75),
 					'medium' => array('width' => 250, 'height' => 188),
 					'large' => array('width' => 448, 'height' => 336),
-				) );
+				));
 
-				switch( $this->size ) {
+				switch ($this->size) {
 					case 'tiny':
 						extract($image_sizes['tiny']);
 						break;
@@ -153,8 +153,8 @@ 
 						break;
 					default:
 						// Verify that the passed sizes are integers.
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
+						$width = !empty($width) ? intval($width) : intval($this->width);
+						$height = !empty($height) ? intval($height) : intval($this->height);
 				}
 
 			}
@@ -171,18 +171,18 @@ 
 	 */
 	public function html() {
 
-		if ( ! $this->validate_image_src() ) {
+		if (!$this->validate_image_src()) {
 			$html = '';
 		} else {
 			$atts = '';
-			foreach ( array( 'width', 'height', 'alt', 'title', 'class' ) as $attr ) {
+			foreach (array('width', 'height', 'alt', 'title', 'class') as $attr) {
 
-				if ( empty( $this->{$attr} ) ) { continue; }
+				if (empty($this->{$attr} )) { continue; }
 
-				$atts .= sprintf( ' %s="%s"', $attr, esc_attr( $this->{$attr} ) );
+				$atts .= sprintf(' %s="%s"', $attr, esc_attr($this->{$attr} ));
 			}
 
-			$html = sprintf( '<img src="%s" %s />', esc_url_raw( $this->src ), $atts );
+			$html = sprintf('<img src="%s" %s />', esc_url_raw($this->src), $atts);
 		}
 
 		/**
@@ -190,6 +190,6 @@ 
 		 * @param string $html the generated image html
 		 * @param GravityView_Image $this The current image object
 		 */
-		return apply_filters( 'gravityview_image_html', $html, $this );
+		return apply_filters('gravityview_image_html', $html, $this);
 	}
 }