gravityview / GravityView

includes/class-admin.php

Indentation +59 added lines, -60 removed lines

@@ -215,39 +215,39 @@ 
 		}
 
 		$wp_allowed_scripts = array(
-            'common',
-            'admin-bar',
-            'autosave',
-            'post',
+			'common',
+			'admin-bar',
+			'autosave',
+			'post',
 			'inline-edit-post',
-            'utils',
-            'svg-painter',
-            'wp-auth-check',
-            'heartbeat',
+			'utils',
+			'svg-painter',
+			'wp-auth-check',
+			'heartbeat',
 			'media-editor',
 			'media-upload',
-            'thickbox',
+			'thickbox',
 			'wp-color-picker',
 
-            // Settings
+			// Settings
 			'gv-admin-edd-license',
 
-            // Common
-            'select2-js',
-            'qtip-js',
+			// Common
+			'select2-js',
+			'qtip-js',
 
-            // jQuery
+			// jQuery
 			'jquery',
-            'jquery-ui-core',
-            'jquery-ui-sortable',
-            'jquery-ui-datepicker',
-            'jquery-ui-dialog',
-            'jquery-ui-slider',
+			'jquery-ui-core',
+			'jquery-ui-sortable',
+			'jquery-ui-datepicker',
+			'jquery-ui-dialog',
+			'jquery-ui-slider',
 			'jquery-ui-dialog',
 			'jquery-ui-tabs',
 			'jquery-ui-draggable',
 			'jquery-ui-droppable',
-            'jquery-ui-accordion',
+			'jquery-ui-accordion',
 		);
 
 		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
@@ -281,23 +281,23 @@ 
 			return;
 		}
 
-        $wp_allowed_styles = array(
-	        'admin-bar',
-        	'colors',
-	        'ie',
-	        'wp-auth-check',
-	        'media-views',
+		$wp_allowed_styles = array(
+			'admin-bar',
+			'colors',
+			'ie',
+			'wp-auth-check',
+			'media-views',
 			'thickbox',
 			'dashicons',
-	        'wp-jquery-ui-dialog',
-	        'jquery-ui-sortable',
+			'wp-jquery-ui-dialog',
+			'jquery-ui-sortable',
 
-            // Settings
-	        'gravityview_settings',
+			// Settings
+			'gravityview_settings',
 
-	        // @todo qTip styles not loading for some reason!
-	        'jquery-qtip.js',
-	    );
+			// @todo qTip styles not loading for some reason!
+			'jquery-qtip.js',
+		);
 
 		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
 
@@ -317,32 +317,32 @@ 
 	 */
 	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
 
-        /**
-         * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
-         * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
-         * @param array $required_objects
-         */
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
-
-        //reset queue
-        $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
-                $queue[] = $object;
-            }
-        }
-        $wp_objects->queue = $queue;
-
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
-
-        //unregistering scripts
-        $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
-                $registered[ $handle ] = $script_registration;
-            }
-        }
-        $wp_objects->registered = $registered;
+		/**
+		 * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
+		 * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
+		 * @param array $required_objects
+		 */
+		$required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
+
+		//reset queue
+		$queue = array();
+		foreach( $wp_objects->queue as $object ) {
+			if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
+				$queue[] = $object;
+			}
+		}
+		$wp_objects->queue = $queue;
+
+		$required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
+
+		//unregistering scripts
+		$registered = array();
+		foreach( $wp_objects->registered as $handle => $script_registration ){
+			if( in_array( $handle, $required_objects ) ){
+				$registered[ $handle ] = $script_registration;
+			}
+		}
+		$wp_objects->registered = $registered;
 	}
 
 	/**
@@ -405,7 +405,6 @@ 
 	 *
 	 * @deprecated since 1.12
 	 * @see GravityView_Compatibility::get_plugin_status()
-
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
 	static function get_plugin_status( $location = '' ) {

Spacing +102 added lines, -102 removed lines

@@ -4,10 +4,10 @@ 
 
 	function __construct() {
 
-		if( ! is_admin() ) { return; }
+		if (!is_admin()) { return; }
 
 		// If Gravity Forms isn't active or compatibile, stop loading
-		if( false === GravityView_Compatibility::is_valid() ) {
+		if (false === GravityView_Compatibility::is_valid()) {
 			return;
 		}
 
@@ -22,22 +22,22 @@ 
 	private function include_required_files() {
 
 		// Migrate Class
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-migrate.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-migrate.php');
 
 		// Don't load tooltips if on Gravity Forms, otherwise it overrides translations
-		if( class_exists( 'GFCommon' ) && class_exists( 'GFForms' ) && !GFForms::is_gravity_page() ) {
-			require_once( GFCommon::get_base_path() . '/tooltips.php' );
+		if (class_exists('GFCommon') && class_exists('GFForms') && !GFForms::is_gravity_page()) {
+			require_once(GFCommon::get_base_path().'/tooltips.php');
 		}
 
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/entry-list.php' );
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/metaboxes/class-gravityview-admin-metaboxes.php');
+		require_once(GRAVITYVIEW_DIR.'includes/admin/entry-list.php');
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-change-entry-creator.php');
 
 		/** @since 1.15 **/
-		require_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-support-port.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/admin/class-gravityview-support-port.php');
 
 		/** @since 1.6 */
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-duplicate-view.php' );
+		require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-duplicate-view.php');
 	}
 
 	/**
@@ -47,21 +47,21 @@ 
 	private function add_hooks() {
 
 		// Filter Admin messages
-		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
-		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
+		add_filter('post_updated_messages', array($this, 'post_updated_messages'));
+		add_filter('bulk_post_updated_messages', array($this, 'post_updated_messages'));
 
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
+		add_filter('plugin_action_links_'.plugin_basename(GRAVITYVIEW_FILE), array($this, 'plugin_action_links'));
 
-		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
+		add_action('plugins_loaded', array($this, 'backend_actions'), 100);
 
 		//Hooks for no-conflict functionality
-		add_action( 'wp_print_scripts', array( $this, 'no_conflict_scripts' ), 1000);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_scripts' ), 9);
+		add_action('wp_print_scripts', array($this, 'no_conflict_scripts'), 1000);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_scripts'), 9);
 
-		add_action( 'wp_print_styles', array( $this, 'no_conflict_styles' ), 1000);
-		add_action( 'admin_print_styles', array( $this, 'no_conflict_styles' ), 11);
-		add_action( 'admin_print_footer_scripts', array( $this, 'no_conflict_styles' ), 1);
-		add_action( 'admin_footer', array( $this, 'no_conflict_styles' ), 1);
+		add_action('wp_print_styles', array($this, 'no_conflict_styles'), 1000);
+		add_action('admin_print_styles', array($this, 'no_conflict_styles'), 11);
+		add_action('admin_print_footer_scripts', array($this, 'no_conflict_styles'), 1);
+		add_action('admin_footer', array($this, 'no_conflict_styles'), 1);
 
 	}
 
@@ -74,13 +74,13 @@ 
 	public function backend_actions() {
 
 		/** @define "GRAVITYVIEW_DIR" "../" */
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-label.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.field.type.php');
+		include_once(GRAVITYVIEW_DIR.'includes/admin/class.render.settings.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-label.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-welcome.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-add-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin-approve-entries.php');
 
 		/**
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
@@ -99,19 +99,19 @@ 
 	 * @param array $links Array of action links under GravityView on the plugin page
 	 * @return array Action links with Settings and Support included, if the user has the appropriate caps
 	 */
-	public static function plugin_action_links( $links ) {
+	public static function plugin_action_links($links) {
 
 		$actions = array();
 
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
+		if (GVCommon::has_cap('gravityview_view_settings')) {
+			$actions[] = sprintf('<a href="%s">%s</a>', admin_url('edit.php?post_type=gravityview&page=gravityview_settings'), esc_html__('Settings', 'gravityview'));
 		}
 
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
-			$actions[] = '<a href="http://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
+		if (GVCommon::has_cap('gravityview_support_port')) {
+			$actions[] = '<a href="http://docs.gravityview.co">'.esc_html__('Support', 'gravityview').'</a>';
 		}
 
-		return array_merge( $actions, $links );
+		return array_merge($actions, $links);
 	}
 
 	/**
@@ -128,70 +128,70 @@ 
 	 * @param  array      $messages Existing messages
 	 * @return array                Messages with GravityView views!
 	 */
-	function post_updated_messages( $messages, $bulk_counts = NULL ) {
+	function post_updated_messages($messages, $bulk_counts = NULL) {
 		global $post;
 
-		$post_id = isset($_GET['post']) ? intval($_GET['post']) : ( is_object( $post ) && isset( $post->ID ) ? $post->ID : NULL );
+		$post_id = isset($_GET['post']) ? intval($_GET['post']) : (is_object($post) && isset($post->ID) ? $post->ID : NULL);
 
 		// By default, there will only be one item being modified.
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
 		// of modified items that will override this array.
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
+		$bulk_counts = is_null($bulk_counts) ? array('updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1) : $bulk_counts;
 
 
 		// If we're starting fresh, a new form was created.
 		// We should let the user know this is the case.
-		$start_fresh = get_post_meta( $post_id, '_gravityview_start_fresh', true );
+		$start_fresh = get_post_meta($post_id, '_gravityview_start_fresh', true);
 
 		$new_form_text = '';
 
-		if( !empty( $start_fresh ) ) {
+		if (!empty($start_fresh)) {
 
 			// Get the form that was created
-			$connected_form = gravityview_get_form_id( $post_id );
+			$connected_form = gravityview_get_form_id($post_id);
 
-			if( !empty( $connected_form ) ) {
-				$form = gravityview_get_form( $connected_form );
-				$form_name = esc_attr( $form['title'] );
+			if (!empty($connected_form)) {
+				$form = gravityview_get_form($connected_form);
+				$form_name = esc_attr($form['title']);
 				$image = self::get_floaty();
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
+				$new_form_text .= '<h3>'.$image.sprintf(__('A new form was created for this View: "%s"', 'gravityview'), $form_name).'</h3>';
+				$new_form_text .= sprintf(__('%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
 
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
-				$new_form_text = wpautop( $new_form_text );
+					', 'gravityview'), '<strong>', '</strong>', '<a href="'.site_url('?gf_page=preview&amp;id='.$connected_form).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;id='.$connected_form).'">', '</a>', '<a href="'.admin_url('admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form).'">', '</a>');
+				$new_form_text = wpautop($new_form_text);
 
-				delete_post_meta( $post_id, '_gravityview_start_fresh' );
+				delete_post_meta($post_id, '_gravityview_start_fresh');
 			}
 		}
 
 		$messages['gravityview'] = array(
 			0  => '', // Unused. Messages start at index 1.
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
-			3  => __( 'View deleted.', 'gravityview' ),
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+			1  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			2  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
+			3  => __('View deleted.', 'gravityview'),
+			4  => sprintf(__('View updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
-			8  => __( 'View submitted.', 'gravityview' ),
+			5  => isset($_GET['revision']) ? sprintf(__('View restored to revision from %s', 'gravityview'), wp_post_revision_title((int)$_GET['revision'], false)) : false,
+			6  => sprintf(__('View published. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			7  => sprintf(__('View saved. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>').$new_form_text,
+			8  => __('View submitted.', 'gravityview'),
 			9  => sprintf(
-				__( 'View scheduled for: %1$s.', 'gravityview' ),
+				__('View scheduled for: %1$s.', 'gravityview'),
 				// translators: Publish box date format, see http://php.net/date
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
-			) . $new_form_text,
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
+				date_i18n(__('M j, Y @ G:i', 'gravityview'), strtotime((isset($post->post_date) ? $post->post_date : NULL)))
+			).$new_form_text,
+			10  => sprintf(__('View draft updated. %sView on website.%s', 'gravityview'), '<a href="'.get_permalink($post_id).'">', '</a>'),
 
 			/**
 			 * These apply to `bulk_post_updated_messages`
 			 * @file wp-admin/edit.php
 			 */
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
+			'updated'   => _n('%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview'),
+			'locked'    => _n('%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview'),
+			'deleted'   => _n('%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview'),
+			'trashed'   => _n('%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview'),
+			'untrashed' => _n('%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview'),
 		);
 
 		return $messages;
@@ -204,13 +204,13 @@ 
 	function no_conflict_scripts() {
 		global $wp_scripts;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -250,7 +250,7 @@ 
             'jquery-ui-accordion',
 		);
 
-		$this->remove_conflicts( $wp_scripts, $wp_allowed_scripts, 'scripts' );
+		$this->remove_conflicts($wp_scripts, $wp_allowed_scripts, 'scripts');
 	}
 
 	/**
@@ -260,16 +260,16 @@ 
 	function no_conflict_styles() {
 		global $wp_styles;
 
-		if( ! gravityview_is_admin_page() ) {
+		if (!gravityview_is_admin_page()) {
 			return;
 		}
 
 		// Dequeue other jQuery styles even if no-conflict is off.
 		// Terrible-looking tabs help no one.
-		if( !empty( $wp_styles->registered ) )  {
+		if (!empty($wp_styles->registered)) {
 			foreach ($wp_styles->registered as $key => $style) {
-				if( preg_match( '/^(?:wp\-)?jquery/ism', $key ) ) {
-					wp_dequeue_style( $key );
+				if (preg_match('/^(?:wp\-)?jquery/ism', $key)) {
+					wp_dequeue_style($key);
 				}
 			}
 		}
@@ -277,7 +277,7 @@ 
 		$no_conflict_mode = GravityView_Settings::getSetting('no-conflict-mode');
 
 		// If no conflict is off, jQuery will suffice.
-		if( empty( $no_conflict_mode ) ) {
+		if (empty($no_conflict_mode)) {
 			return;
 		}
 
@@ -299,7 +299,7 @@ 
 	        'jquery-qtip.js',
 	    );
 
-		$this->remove_conflicts( $wp_styles, $wp_allowed_styles, 'styles' );
+		$this->remove_conflicts($wp_styles, $wp_allowed_styles, 'styles');
 
 		/**
 		 * @action `gravityview_remove_conflicts_after` Runs after no-conflict styles are removed. You can re-add styles here.
@@ -315,31 +315,31 @@ 
 	 * @param  string $type              Either 'styles' or 'scripts'
 	 * @return void
 	 */
-	private function remove_conflicts( &$wp_objects, $required_objects, $type = 'scripts' ) {
+	private function remove_conflicts(&$wp_objects, $required_objects, $type = 'scripts') {
 
         /**
          * @filter `gravityview_noconflict_{$type}` Modify the list of no conflict scripts or styles\n
          * Filter is `gravityview_noconflict_scripts` or `gravityview_noconflict_styles`
          * @param array $required_objects
          */
-        $required_objects = apply_filters( "gravityview_noconflict_{$type}", $required_objects );
+        $required_objects = apply_filters("gravityview_noconflict_{$type}", $required_objects);
 
         //reset queue
         $queue = array();
-        foreach( $wp_objects->queue as $object ) {
-	        if( in_array( $object, $required_objects ) || preg_match('/gravityview|gf_|gravityforms/ism', $object ) ) {
+        foreach ($wp_objects->queue as $object) {
+	        if (in_array($object, $required_objects) || preg_match('/gravityview|gf_|gravityforms/ism', $object)) {
                 $queue[] = $object;
             }
         }
         $wp_objects->queue = $queue;
 
-        $required_objects = $this->add_script_dependencies( $wp_objects->registered, $required_objects );
+        $required_objects = $this->add_script_dependencies($wp_objects->registered, $required_objects);
 
         //unregistering scripts
         $registered = array();
-        foreach( $wp_objects->registered as $handle => $script_registration ){
-            if( in_array( $handle, $required_objects ) ){
-                $registered[ $handle ] = $script_registration;
+        foreach ($wp_objects->registered as $handle => $script_registration) {
+            if (in_array($handle, $required_objects)) {
+                $registered[$handle] = $script_registration;
             }
         }
         $wp_objects->registered = $registered;
@@ -356,16 +356,16 @@ 
 		//gets all dependent scripts linked to the $scripts array passed
 		do {
 			$dependents = array();
-			foreach ( $scripts as $script ) {
-				$deps = isset( $registered[ $script ] ) && is_array( $registered[ $script ]->deps ) ? $registered[ $script ]->deps : array();
-				foreach ( $deps as $dep ) {
-					if ( ! in_array( $dep, $scripts ) && ! in_array( $dep, $dependents ) ) {
+			foreach ($scripts as $script) {
+				$deps = isset($registered[$script]) && is_array($registered[$script]->deps) ? $registered[$script]->deps : array();
+				foreach ($deps as $dep) {
+					if (!in_array($dep, $scripts) && !in_array($dep, $dependents)) {
 						$dependents[] = $dep;
 					}
 				}
 			}
-			$scripts = array_merge( $scripts, $dependents );
-		} while ( ! empty( $dependents ) );
+			$scripts = array_merge($scripts, $dependents);
+		} while (!empty($dependents));
 
 		return $scripts;
 	}
@@ -385,8 +385,8 @@ 
 	 * @deprecated since 1.12
 	 * @param array $notice Array with `class` and `message` keys. The message is not escaped.
 	 */
-	public static function add_notice( $notice = array() ) {
-		GravityView_Admin_Notices::add_notice( $notice );
+	public static function add_notice($notice = array()) {
+		GravityView_Admin_Notices::add_notice($notice);
 	}
 
 	/**
@@ -408,8 +408,8 @@ 
 
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
 	 */
-	static function get_plugin_status( $location = '' ) {
-		return GravityView_Compatibility::get_plugin_status( $location );
+	static function get_plugin_status($location = '') {
+		return GravityView_Compatibility::get_plugin_status($location);
 	}
 
 	/**
@@ -421,10 +421,10 @@ 
 	 *
 	 * @return bool|string|void If `false`, not a GravityView page. `true` if $page is passed and is the same as current page. Otherwise, the name of the page (`single`, `settings`, or `views`)
 	 */
-	static function is_admin_page( $hook = '', $page = NULL ) {
+	static function is_admin_page($hook = '', $page = NULL) {
 		global $current_screen, $plugin_page, $pagenow, $post;
 
-		if( ! is_admin() ) { return false; }
+		if (!is_admin()) { return false; }
 
 		$is_page = false;
 
@@ -432,21 +432,21 @@ 
 
 		$is_gv_post_type_get = (isset($_GET['post_type']) && $_GET['post_type'] === 'gravityview');
 
-		$is_gv_settings_get = isset( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings';
+		$is_gv_settings_get = isset($_GET['page']) && $_GET['page'] === 'gravityview_settings';
 
-		if( empty( $post ) && $pagenow === 'post.php' && !empty( $_GET['post'] ) ) {
-			$gv_post = get_post( intval( $_GET['post'] ) );
+		if (empty($post) && $pagenow === 'post.php' && !empty($_GET['post'])) {
+			$gv_post = get_post(intval($_GET['post']));
 			$is_gv_post_type = (!empty($gv_post) && !empty($gv_post->post_type) && $gv_post->post_type === 'gravityview');
 		} else {
 			$is_gv_post_type = (!empty($post) && !empty($post->post_type) && $post->post_type === 'gravityview');
 		}
 
-		if( $is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get ) {
+		if ($is_gv_screen || $is_gv_post_type || $is_gv_post_type || $is_gv_post_type_get || $is_gv_settings_get) {
 
 			// $_GET `post_type` variable
-			if(in_array($pagenow, array( 'post.php' , 'post-new.php' )) ) {
+			if (in_array($pagenow, array('post.php', 'post-new.php'))) {
 				$is_page = 'single';
-			} else if ( in_array( $plugin_page, array( 'gravityview_settings', 'gravityview_page_gravityview_settings' ) ) || ( !empty( $_GET['page'] ) && $_GET['page'] === 'gravityview_settings' ) ) {
+			} else if (in_array($plugin_page, array('gravityview_settings', 'gravityview_page_gravityview_settings')) || (!empty($_GET['page']) && $_GET['page'] === 'gravityview_settings')) {
 				$is_page = 'settings';
 			} else {
 				$is_page = 'views';
@@ -458,10 +458,10 @@ 
 		 * @param[in,out] string|bool $is_page If false, no. If string, the name of the page (`single`, `settings`, or `views`)
 		 * @param[in] string $hook The name of the page to check against. Is passed to the method.
 		 */
-		$is_page = apply_filters( 'gravityview_is_admin_page', $is_page, $hook );
+		$is_page = apply_filters('gravityview_is_admin_page', $is_page, $hook);
 
 		// If the current page is the same as the compared page
-		if( !empty( $page ) ) {
+		if (!empty($page)) {
 			return $is_page === $page;
 		}
 
@@ -473,5 +473,5 @@ 
 new GravityView_Admin;
 
 function gravityview_is_admin_page($hook = '', $page = NULL) {
-	return GravityView_Admin::is_admin_page( $hook, $page );
+	return GravityView_Admin::is_admin_page($hook, $page);
 }

Doc Comments +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
 	 * Remove any style or script non-registered in the no conflict mode
 	 * @todo  Move this to GravityView_Admin_Views
 	 * @param  WP_Dependencies $wp_objects        Object of WP_Styles or WP_Scripts
-	 * @param  array $required_objects   List of registered script/style handles
+	 * @param  string[] $required_objects   List of registered script/style handles
 	 * @param  string $type              Either 'styles' or 'scripts'
 	 * @return void
 	 */

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-common.php

Indentation +27 added lines, -27 removed lines

@@ -213,13 +213,13 @@ 
 
 				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
 					foreach ( $field['inputs'] as $input ) {
-                        /**
-                         * @hack
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
-                         */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
-                            continue;
-                        }
+						/**
+						 * @hack
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
+						 */
+						if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+							continue;
+						}
 						$fields[ (string)$input['id'] ] = array(
 							'label' => rgar( $input, 'label' ),
 							'customLabel' => rgar( $input, 'customLabel' ),
@@ -466,7 +466,7 @@ 
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
 			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
 		} elseif( !isset( $criteria['context_view_id'] ) ) {
-            // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
+			// Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
 
@@ -1082,7 +1082,7 @@ 
 			),
 		);
 
-        $fields = $date_created + $fields;
+		$fields = $date_created + $fields;
 
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
 
@@ -1094,13 +1094,13 @@ 
 			}
 		}
 
-        /**
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
-         * @since 1.12
-         * @param array $fields Sub-set of GF form fields that are sortable
-         * @param int $formid The Gravity Forms form ID that the fields are from
-         */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+		/**
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
+		 * @since 1.12
+		 * @param array $fields Sub-set of GF form fields that are sortable
+		 * @param int $formid The Gravity Forms form ID that the fields are from
+		 */
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
 
 		return $fields;
 	}
@@ -1365,17 +1365,17 @@ 
 	}
 
 
-    /**
-     * Display updated/error notice
-     *
-     * @param string $notice text/HTML of notice
-     * @param string $class CSS class for notice (`updated` or `error`)
-     *
-     * @return string
-     */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
-    }
+	/**
+	 * Display updated/error notice
+	 *
+	 * @param string $notice text/HTML of notice
+	 * @param string $class CSS class for notice (`updated` or `error`)
+	 *
+	 * @return string
+	 */
+	public static function generate_notice( $notice, $class = '' ) {
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+	}
 
 
 

Doc Comments +1 added lines, -2 removed lines

@@ -167,7 +167,6 @@ 
 	 * Returns the list of available forms
 	 *
 	 * @access public
-	 * @param mixed $form_id
 	 * @return array Empty array if GFAPI isn't available or no forms. Otherwise, associative array with id, title keys
 	 */
 	public static function get_forms() {
@@ -188,7 +187,7 @@ 
 	 * Return array of fields' id and label, for a given Form ID
 	 *
 	 * @access public
-	 * @param string|array $form_id (default: '') or $form object
+	 * @param string|array $form (default: '') or $form object
 	 * @return array
 	 */
 	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {

Spacing +316 added lines, -316 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -25,18 +25,18 @@ 
 	 * @param mixed $form_id
 	 * @return mixed False: no form ID specified or Gravity Forms isn't active. Array: Form returned from Gravity Forms
 	 */
-	public static function get_form( $form_id ) {
-		if ( empty( $form_id ) ) {
+	public static function get_form($form_id) {
+		if (empty($form_id)) {
 			return false;
 		}
 
 		// Only get_form_meta is cached. ::facepalm::
-		if ( class_exists( 'RGFormsModel' ) ) {
-			return GFFormsModel::get_form_meta( $form_id );
+		if (class_exists('RGFormsModel')) {
+			return GFFormsModel::get_form_meta($form_id);
 		}
 
-		if ( class_exists( 'GFAPI' ) ) {
-			return GFAPI::get_form( $form_id );
+		if (class_exists('GFAPI')) {
+			return GFAPI::get_form($form_id);
 		}
 
 		return false;
@@ -55,8 +55,8 @@ 
 	 *
 	 * @return bool True: user has at least one passed capability; False: user does not have any defined capabilities
 	 */
-	public static function has_cap( $caps = '', $object_id = null, $user_id = null ) {
-		return GravityView_Roles_Capabilities::has_cap( $caps, $object_id, $user_id );
+	public static function has_cap($caps = '', $object_id = null, $user_id = null) {
+		return GravityView_Roles_Capabilities::has_cap($caps, $object_id, $user_id);
 	}
 
 	/**
@@ -67,14 +67,14 @@ 
 	 * @param array|GF_Fields $field Gravity Forms field or array
 	 * @return array Array version of $field
 	 */
-	public static function get_field_array( $field ) {
+	public static function get_field_array($field) {
 
-		if ( class_exists( 'GF_Fields' ) ) {
+		if (class_exists('GF_Fields')) {
 
-			$field_object = GF_Fields::create( $field );
+			$field_object = GF_Fields::create($field);
 
 			// Convert the field object in 1.9 to an array for backward compatibility
-			$field_array = get_object_vars( $field_object );
+			$field_array = get_object_vars($field_object);
 
 		} else {
 			$field_array = $field;
@@ -93,7 +93,7 @@ 
 	 *
 	 * @return array Array of Views as `WP_Post`. Empty array if none found.
 	 */
-	public static function get_all_views( $args = array() ) {
+	public static function get_all_views($args = array()) {
 
 		$default_params = array(
 			'post_type' => 'gravityview',
@@ -101,15 +101,15 @@ 
 			'post_status' => 'publish',
 		);
 
-		$params = wp_parse_args( $args, $default_params );
+		$params = wp_parse_args($args, $default_params);
 
 		/**
 		 * @filter `gravityview/get_all_views/params` Modify the parameters sent to get all views.
 		 * @param[in,out]  array $params Array of parameters to pass to `get_posts()`
 		 */
-		$views_params = apply_filters( 'gravityview/get_all_views/params', $params );
+		$views_params = apply_filters('gravityview/get_all_views/params', $params);
 
-		$views = get_posts( $views_params );
+		$views = get_posts($views_params);
 
 		return $views;
 	}
@@ -120,11 +120,11 @@ 
 	 * @param  int|string $entry_slug Entry slug
 	 * @return array           Gravity Forms form array
 	 */
-	public static function get_form_from_entry_id( $entry_slug ) {
+	public static function get_form_from_entry_id($entry_slug) {
 
-		$entry = self::get_entry( $entry_slug, true );
+		$entry = self::get_entry($entry_slug, true);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
 		return $form;
 	}
@@ -138,13 +138,13 @@ 
 	 *
 	 * @return bool|GF_Field[]
 	 */
-	public static function has_product_field( $form = array() ) {
+	public static function has_product_field($form = array()) {
 
-		$product_fields = apply_filters( 'gform_product_field_types', array( 'option', 'quantity', 'product', 'total', 'shipping', 'calculation', 'price' ) );
+		$product_fields = apply_filters('gform_product_field_types', array('option', 'quantity', 'product', 'total', 'shipping', 'calculation', 'price'));
 
-		$fields = GFAPI::get_fields_by_type( $form, $product_fields );
+		$fields = GFAPI::get_fields_by_type($form, $product_fields);
 
-		return empty( $fields ) ? false : $fields;
+		return empty($fields) ? false : $fields;
 	}
 
 	/**
@@ -154,7 +154,7 @@ 
 	 * @param  string $slug The entry slug, as returned by GravityView_API::get_entry_slug()
 	 * @return int|null       The entry ID, if exists; `NULL` if not
 	 */
-	public static function get_entry_id_from_slug( $slug ) {
+	public static function get_entry_id_from_slug($slug) {
 		global $wpdb;
 
 		$search_criteria = array(
@@ -173,9 +173,9 @@ 
 			'page_size' => 1,
 		);
 
-		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
+		$results = GFAPI::get_entries(0, $search_criteria, null, $paging);
 
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
+		$result = (!empty($results) && !empty($results[0]['id'])) ? $results[0]['id'] : null;
 
 		return $result;
 	}
@@ -190,9 +190,9 @@ 
 	 */
 	public static function get_forms() {
 		$forms = array();
-		if ( class_exists( 'GFAPI' ) ) {
+		if (class_exists('GFAPI')) {
 			$gf_forms = GFAPI::get_forms();
-			foreach ( $gf_forms as $form ) {
+			foreach ($gf_forms as $form) {
 				$forms[] = array(
 					'id' => $form['id'],
 					'title' => $form['title'],
@@ -209,10 +209,10 @@ 
 	 * @param string|array $form_id (default: '') or $form object
 	 * @return array
 	 */
-	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
+	public static function get_form_fields($form = '', $add_default_properties = false, $include_parent_field = true) {
 
-		if ( ! is_array( $form ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form)) {
+			$form = self::get_form($form);
 		}
 
 		$fields = array();
@@ -222,56 +222,56 @@ 
 		$has_poll_fields = false;
 
 		// If GF_Field exists, we're using GF 1.9+, where add_default_properties has been deprecated.
-		if ( false === class_exists( 'GF_Field' ) && $add_default_properties ) {
-			$form = RGFormsModel::add_default_properties( $form );
+		if (false === class_exists('GF_Field') && $add_default_properties) {
+			$form = RGFormsModel::add_default_properties($form);
 		}
 
-		if ( $form ) {
-			foreach ( $form['fields'] as $field ) {
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
-					$fields[ $field['id'] ] = array(
-						'label' => rgar( $field, 'label' ),
+		if ($form) {
+			foreach ($form['fields'] as $field) {
+				if ($include_parent_field || empty($field['inputs'])) {
+					$fields[$field['id']] = array(
+						'label' => rgar($field, 'label'),
 						'parent' => null,
-						'type' => rgar( $field, 'type' ),
-						'adminLabel' => rgar( $field, 'adminLabel' ),
-						'adminOnly' => rgar( $field, 'adminOnly' ),
+						'type' => rgar($field, 'type'),
+						'adminLabel' => rgar($field, 'adminLabel'),
+						'adminOnly' => rgar($field, 'adminOnly'),
 					);
 				}
 
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
-					foreach ( $field['inputs'] as $input ) {
+				if ($add_default_properties && !empty($field['inputs'])) {
+					foreach ($field['inputs'] as $input) {
                         /**
                          * @hack
                          * In case of email/email confirmation, the input for email has the same id as the parent field
                          */
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
+                        if ('email' == rgar($field, 'type') && false === strpos($input['id'], '.')) {
                             continue;
                         }
-						$fields[ (string)$input['id'] ] = array(
-							'label' => rgar( $input, 'label' ),
-							'customLabel' => rgar( $input, 'customLabel' ),
+						$fields[(string)$input['id']] = array(
+							'label' => rgar($input, 'label'),
+							'customLabel' => rgar($input, 'customLabel'),
 							'parent' => $field,
-							'type' => rgar( $field, 'type' ),
-							'adminLabel' => rgar( $field, 'adminLabel' ),
-							'adminOnly' => rgar( $field, 'adminOnly' ),
+							'type' => rgar($field, 'type'),
+							'adminLabel' => rgar($field, 'adminLabel'),
+							'adminOnly' => rgar($field, 'adminOnly'),
 						);
 					}
 				}
 
 				/** @since 1.14 */
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
+				if ('list' === $field['type'] && !empty($field['enableColumns'])) {
 
-					foreach ( (array)$field['choices'] as $key => $input ) {
+					foreach ((array)$field['choices'] as $key => $input) {
 
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
+						$input_id = sprintf('%d.%d', $field['id'], $key); // {field_id}.{column_key}
 
-						$fields[ $input_id ] = array(
-							'label'       => rgar( $input, 'text' ),
+						$fields[$input_id] = array(
+							'label'       => rgar($input, 'text'),
 							'customLabel' => '',
 							'parent'      => $field,
-							'type'        => rgar( $field, 'type' ),
-							'adminLabel'  => rgar( $field, 'adminLabel' ),
-							'adminOnly'   => rgar( $field, 'adminOnly' ),
+							'type'        => rgar($field, 'type'),
+							'adminLabel'  => rgar($field, 'adminLabel'),
+							'adminOnly'   => rgar($field, 'adminOnly'),
 						);
 					}
 				}
@@ -279,27 +279,27 @@ 
 				/**
 				 * @since 1.8
 				 */
-				if( 'quiz' === $field['type'] ) {
+				if ('quiz' === $field['type']) {
 					$has_quiz_fields = true;
 				}
 
 				/**
 				 * @since 1.8
 				 */
-				if( 'poll' === $field['type'] ) {
+				if ('poll' === $field['type']) {
 					$has_poll_fields = true;
 				}
 
-				if( GFCommon::is_product_field( $field['type'] ) ){
+				if (GFCommon::is_product_field($field['type'])) {
 					$has_product_fields = true;
 				}
 
 				/**
 				 * @hack Version 1.9
 				 */
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
+				$field_for_is_post_field = class_exists('GF_Fields') ? (object)$field : (array)$field;
 
-				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
+				if (GFCommon::is_post_field($field_for_is_post_field)) {
 					$has_post_fields = true;
 				}
 			}
@@ -308,19 +308,19 @@ 
 		/**
 		 * @since 1.7
 		 */
-		if ( $has_post_fields ) {
+		if ($has_post_fields) {
 			$fields['post_id'] = array(
-				'label' => __( 'Post ID', 'gravityview' ),
+				'label' => __('Post ID', 'gravityview'),
 				'type' => 'post_id',
 			);
 		}
 
-		if ( $has_product_fields ) {
+		if ($has_product_fields) {
 
-			$payment_fields = GravityView_Fields::get_all( 'pricing' );
+			$payment_fields = GravityView_Fields::get_all('pricing');
 
-			foreach ( $payment_fields as $payment_field ) {
-				if( isset( $fields["{$payment_field->name}"] ) ) {
+			foreach ($payment_fields as $payment_field) {
+				if (isset($fields["{$payment_field->name}"])) {
 					continue;
 				}
 				$fields["{$payment_field->name}"] = array(
@@ -334,27 +334,27 @@ 
 		/**
 		 * @since 1.8
 		 */
-		if( $has_quiz_fields ) {
+		if ($has_quiz_fields) {
 
-			$fields['gquiz_score']   = array(
-				'label' => __( 'Quiz Score Total', 'gravityview' ),
+			$fields['gquiz_score'] = array(
+				'label' => __('Quiz Score Total', 'gravityview'),
 				'type'  => 'quiz_score',
-				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the number of correct Quiz answers the user submitted.', 'gravityview'),
 			);
 			$fields['gquiz_percent'] = array(
-				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
+				'label' => __('Quiz Percentage Grade', 'gravityview'),
 				'type'  => 'quiz_percent',
-				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
+				'desc'  => __('Displays the percentage of correct Quiz answers the user submitted.', 'gravityview'),
 			);
-			$fields['gquiz_grade']   = array(
-				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
+			$fields['gquiz_grade'] = array(
+				'label' => __('Quiz Letter Grade', 'gravityview'),
 				'type'  => 'quiz_grade',
-				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview'),
 			);
 			$fields['gquiz_is_pass'] = array(
-				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
+				'label' => __('Quiz Pass/Fail', 'gravityview'),
 				'type'  => 'quiz_is_pass',
-				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
+				'desc'  => __('Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview'),
 			);
 		}
 
@@ -367,15 +367,15 @@ 
 	 * @param  string $form_id (default: '')
 	 * @return array
 	 */
-	public static function get_entry_meta( $form_id, $only_default_column = true ) {
+	public static function get_entry_meta($form_id, $only_default_column = true) {
 
-		$extra_fields = GFFormsModel::get_entry_meta( $form_id );
+		$extra_fields = GFFormsModel::get_entry_meta($form_id);
 
 		$fields = array();
 
-		foreach ( $extra_fields as $key => $field ){
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
+		foreach ($extra_fields as $key => $field) {
+			if (!empty($only_default_column) && !empty($field['is_default_column'])) {
+				$fields[$key] = array('label' => $field['label'], 'type' => 'entry_meta');
 			}
 		}
 
@@ -391,13 +391,13 @@ 
 	 * @since  1.1.6
 	 * @return array|void          Array of entry IDs. Void if Gravity Forms isn't active.
 	 */
-	public static function get_entry_ids( $form_id, $search_criteria = array() ) {
+	public static function get_entry_ids($form_id, $search_criteria = array()) {
 
-		if ( ! class_exists( 'GFFormsModel' ) ) {
+		if (!class_exists('GFFormsModel')) {
 			return;
 		}
 
-		return GFFormsModel::search_lead_ids( $form_id, $search_criteria );
+		return GFFormsModel::search_lead_ids($form_id, $search_criteria);
 	}
 
 	/**
@@ -409,33 +409,33 @@ 
 	 * @param array $form_ids array Gravity Forms form IDs
 	 * @return array
 	 */
-	public static function calculate_get_entries_criteria( $passed_criteria = array(), $form_ids = array() ) {
+	public static function calculate_get_entries_criteria($passed_criteria = array(), $form_ids = array()) {
 
 		$search_criteria_defaults = array(
 			'search_criteria' => null,
 			'sorting' => null,
 			'paging' => null,
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
+			'cache' => (isset($passed_criteria['cache']) ? $passed_criteria['cache'] : true),
 		);
 
-		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
+		$criteria = wp_parse_args($passed_criteria, $search_criteria_defaults);
 
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
+		if (!empty($criteria['search_criteria']['field_filters'])) {
+			foreach ($criteria['search_criteria']['field_filters'] as &$filter) {
 
-				if ( ! is_array( $filter ) ) {
+				if (!is_array($filter)) {
 					continue;
 				}
 
 				// By default, we want searches to be wildcard for each field.
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
+				$filter['operator'] = empty($filter['operator']) ? 'contains' : $filter['operator'];
 
 				/**
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
 				 * @param string $operator Existing search operator
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
 				 */
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
+				$filter['operator'] = apply_filters('gravityview_search_operator', $filter['operator'], $filter);
 			}
 		}
 
@@ -443,32 +443,32 @@ 
 		 * Prepare date formats to be in Gravity Forms DB format;
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
 		 */
-		foreach ( array('start_date', 'end_date' ) as $key ) {
+		foreach (array('start_date', 'end_date') as $key) {
 
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
+			if (!empty($criteria['search_criteria'][$key])) {
 
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
-				$date = date_create( $criteria['search_criteria'][ $key ] );
+				$date = date_create($criteria['search_criteria'][$key]);
 
-				if ( $date ) {
+				if ($date) {
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
+					$criteria['search_criteria'][$key] = $date->format('Y-m-d H:i:s');
 				} else {
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
-					unset( $criteria['search_criteria'][ $key ] );
+					unset($criteria['search_criteria'][$key]);
 
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
+					do_action('gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][$key]);
 				}
 			}
 		}
 
 
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
-		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
+		if (class_exists('GravityView_View_Data') && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry()) {
 			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
-		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
+		} elseif ('delete' === RGForms::get('action')) {
+			$criteria['context_view_id'] = isset($_GET['view_id']) ? $_GET['view_id'] : null;
+		} elseif (!isset($criteria['context_view_id'])) {
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
 			$criteria['context_view_id'] = null;
 		}
@@ -479,7 +479,7 @@ 
 		 * @param array $form_ids Forms to search
 		 * @param int $view_id ID of the view being used to search
 		 */
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
+		$criteria = apply_filters('gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id']);
 
 		return (array)$criteria;
 
@@ -497,35 +497,35 @@ 
 	 * @param mixed &$total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate the total count. (default: null)
 	 * @return mixed False: Error fetching entries. Array: Multi-dimensional array of Gravity Forms entry arrays
 	 */
-	public static function get_entries( $form_ids = null, $passed_criteria = null, &$total = null ) {
+	public static function get_entries($form_ids = null, $passed_criteria = null, &$total = null) {
 
 		// Filter the criteria before query (includes Adv Filter)
-		$criteria = self::calculate_get_entries_criteria( $passed_criteria, $form_ids );
+		$criteria = self::calculate_get_entries_criteria($passed_criteria, $form_ids);
 
-		do_action( 'gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria );
+		do_action('gravityview_log_debug', '[gravityview_get_entries] Final Parameters', $criteria);
 
 		// Return value
 		$return = null;
 
 		/** Reduce # of database calls */
-		add_filter( 'gform_is_encrypted_field', '__return_false' );
+		add_filter('gform_is_encrypted_field', '__return_false');
 
-		if ( ! empty( $criteria['cache'] ) ) {
+		if (!empty($criteria['cache'])) {
 
-			$Cache = new GravityView_Cache( $form_ids, $criteria );
+			$Cache = new GravityView_Cache($form_ids, $criteria);
 
-			if ( $entries = $Cache->get() ) {
+			if ($entries = $Cache->get()) {
 
 				// Still update the total count when using cached results
-				if ( ! is_null( $total ) ) {
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
+				if (!is_null($total)) {
+					$total = GFAPI::count_entries($form_ids, $criteria['search_criteria']);
 				}
 
 				$return = $entries;
 			}
 		}
 
-		if ( is_null( $return ) && class_exists( 'GFAPI' ) && ( is_numeric( $form_ids ) || is_array( $form_ids ) ) ) {
+		if (is_null($return) && class_exists('GFAPI') && (is_numeric($form_ids) || is_array($form_ids))) {
 
 			/**
 			 * @filter `gravityview_pre_get_entries` Define entries to be used before GFAPI::get_entries() is called
@@ -535,24 +535,24 @@ 
 			 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 			 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 			 */
-			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
+			$entries = apply_filters('gravityview_before_get_entries', null, $criteria, $passed_criteria, $total);
 
 			// No entries returned from gravityview_before_get_entries
-			if( is_null( $entries ) ) {
+			if (is_null($entries)) {
 
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
+				$entries = GFAPI::get_entries($form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total);
 
-				if ( is_wp_error( $entries ) ) {
-					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
+				if (is_wp_error($entries)) {
+					do_action('gravityview_log_error', $entries->get_error_message(), $entries);
 
 					return false;
 				}
 			}
 
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
+			if (!empty($criteria['cache']) && isset($Cache)) {
 
 				// Cache results
-				$Cache->set( $entries, 'entries' );
+				$Cache->set($entries, 'entries');
 
 			}
 
@@ -560,7 +560,7 @@ 
 		}
 
 		/** Remove filter added above */
-		remove_filter( 'gform_is_encrypted_field', '__return_false' );
+		remove_filter('gform_is_encrypted_field', '__return_false');
 
 		/**
 		 * @filter `gravityview_entries` Modify the array of entries returned to GravityView after it has been fetched from the cache or from `GFAPI::get_entries()`.
@@ -569,7 +569,7 @@ 
 		 * @param array $passed_criteria The original search criteria passed to `GVCommon::get_entries()`
 		 * @param  int|null $total Optional. An output parameter containing the total number of entries. Pass a non-null value to generate
 		 */
-		$return = apply_filters( 'gravityview_entries', $return, $criteria, $passed_criteria, $total );
+		$return = apply_filters('gravityview_entries', $return, $criteria, $passed_criteria, $total);
 
 		return $return;
 	}
@@ -586,15 +586,15 @@ 
 	 * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true. {@since 1.14}
 	 * @return array|boolean
 	 */
-	public static function get_entry( $entry_slug, $force_allow_ids = false, $check_entry_display = true ) {
+	public static function get_entry($entry_slug, $force_allow_ids = false, $check_entry_display = true) {
 
-		if ( class_exists( 'GFAPI' ) && ! empty( $entry_slug ) ) {
+		if (class_exists('GFAPI') && !empty($entry_slug)) {
 
 			/**
 			 * @filter `gravityview_custom_entry_slug` Whether to enable and use custom entry slugs.
 			 * @param boolean True: Allow for slugs based on entry values. False: always use entry IDs (default)
 			 */
-			$custom_slug = apply_filters( 'gravityview_custom_entry_slug', false );
+			$custom_slug = apply_filters('gravityview_custom_entry_slug', false);
 
 			/**
 			 * @filter `gravityview_custom_entry_slug_allow_id` When using a custom slug, allow access to the entry using the original slug (the Entry ID).
@@ -602,38 +602,38 @@ 
 			 * - If enabled, you could access using the custom slug OR the entry id (example: `/entry/custom-slug/` OR `/entry/123/`)
 			 * @param boolean $custom_slug_id_access True: allow accessing the slug by ID; False: only use the slug passed to the method.
 			 */
-			$custom_slug_id_access = $force_allow_ids || apply_filters( 'gravityview_custom_entry_slug_allow_id', false );
+			$custom_slug_id_access = $force_allow_ids || apply_filters('gravityview_custom_entry_slug_allow_id', false);
 
 			/**
 			 * If we're using custom entry slugs, we do a meta value search
 			 * instead of doing a straightup ID search.
 			 */
-			if ( $custom_slug ) {
+			if ($custom_slug) {
 
-				$entry_id = self::get_entry_id_from_slug( $entry_slug );
+				$entry_id = self::get_entry_id_from_slug($entry_slug);
 
 			}
 
 			// If custom slug is off, search using the entry ID
 			// ID allow ID access is on, also use entry ID as a backup
-			if ( empty( $custom_slug ) || ! empty( $custom_slug_id_access ) ) {
+			if (empty($custom_slug) || !empty($custom_slug_id_access)) {
 				// Search for IDs matching $entry_slug
 				$entry_id = $entry_slug;
 			}
 
-			if ( empty( $entry_id ) ) {
+			if (empty($entry_id)) {
 				return false;
 			}
 
 			// fetch the entry
-			$entry = GFAPI::get_entry( $entry_id );
+			$entry = GFAPI::get_entry($entry_id);
 
-			if( $check_entry_display ) {
+			if ($check_entry_display) {
 				// Is the entry allowed
-				$entry = self::check_entry_display( $entry );
+				$entry = self::check_entry_display($entry);
 			}
 
-			return is_wp_error( $entry ) ? false : $entry;
+			return is_wp_error($entry) ? false : $entry;
 
 		}
 
@@ -657,51 +657,51 @@ 
 	 *
 	 * @return bool True: matches, false: not matches
 	 */
-	public static function matches_operation( $val1, $val2, $operation ) {
+	public static function matches_operation($val1, $val2, $operation) {
 
 		$value = false;
 
-		if( 'context' === $val1 ) {
+		if ('context' === $val1) {
 
-			$matching_contexts = array( $val2 );
+			$matching_contexts = array($val2);
 
 			// We allow for non-standard contexts.
-			switch( $val2 ) {
+			switch ($val2) {
 				// Check for either single or edit
 				case 'singular':
-					$matching_contexts = array( 'single', 'edit' );
+					$matching_contexts = array('single', 'edit');
 					break;
 				// Use multiple as alias for directory for consistency
 				case 'multiple':
-					$matching_contexts = array( 'directory' );
+					$matching_contexts = array('directory');
 					break;
 			}
 
-			$val1 = in_array( gravityview_get_context(), $matching_contexts ) ? $val2 : false;
+			$val1 = in_array(gravityview_get_context(), $matching_contexts) ? $val2 : false;
 		}
 
-		switch ( $operation ) {
+		switch ($operation) {
 			case 'equals':
-				$value = GFFormsModel::matches_operation( $val1, $val2, 'is' );
+				$value = GFFormsModel::matches_operation($val1, $val2, 'is');
 				break;
 			case 'greater_than_or_is':
 			case 'greater_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'greater_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'greater_than');
+				$value = ($is || $gt);
 				break;
 			case 'less_than_or_is':
 			case 'less_than_or_equals':
-				$is    = GFFormsModel::matches_operation( $val1, $val2, 'is' );
-				$gt    = GFFormsModel::matches_operation( $val1, $val2, 'less_than' );
-				$value = ( $is || $gt );
+				$is    = GFFormsModel::matches_operation($val1, $val2, 'is');
+				$gt    = GFFormsModel::matches_operation($val1, $val2, 'less_than');
+				$value = ($is || $gt);
 				break;
 			case 'not_contains':
-				$contains = GFFormsModel::matches_operation( $val1, $val2, 'contains' );
-				$value    = ! $contains;
+				$contains = GFFormsModel::matches_operation($val1, $val2, 'contains');
+				$value    = !$contains;
 				break;
 			default:
-				$value = GFFormsModel::matches_operation( $val1, $val2, $operation );
+				$value = GFFormsModel::matches_operation($val1, $val2, $operation);
 		}
 
 		return $value;
@@ -719,41 +719,41 @@ 
 	 * @param array $entry Gravity Forms Entry object
 	 * @return bool|array Returns 'false' if entry is not valid according to the view search filters (Adv Filter)
 	 */
-	public static function check_entry_display( $entry ) {
+	public static function check_entry_display($entry) {
 
-		if ( ! $entry || is_wp_error( $entry ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Entry was not found.', $entry );
+		if (!$entry || is_wp_error($entry)) {
+			do_action('gravityview_log_debug', __METHOD__.' Entry was not found.', $entry);
 			return false;
 		}
 
-		if ( empty( $entry['form_id'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
+		if (empty($entry['form_id'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry);
 			return false;
 		}
 
 		$criteria = self::calculate_get_entries_criteria();
 
 		// Make sure the current View is connected to the same form as the Entry
-		if( ! empty( $criteria['context_view_id'] ) ) {
-			$context_view_id = intval( $criteria['context_view_id'] );
-			$context_form_id = gravityview_get_form_id( $context_view_id );
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
+		if (!empty($criteria['context_view_id'])) {
+			$context_view_id = intval($criteria['context_view_id']);
+			$context_form_id = gravityview_get_form_id($context_view_id);
+			if (intval($context_form_id) !== intval($entry['form_id'])) {
+				do_action('gravityview_log_debug', sprintf('[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id']), $criteria['context_view_id']);
 				return false;
 			}
 		}
 
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
+		if (empty($criteria['search_criteria']) || !is_array($criteria['search_criteria'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria);
 			return $entry;
 		}
 
 		$search_criteria = $criteria['search_criteria'];
-		unset( $criteria );
+		unset($criteria);
 
 		// check entry status
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
+		if (array_key_exists('status', $search_criteria) && $search_criteria['status'] != $entry['status']) {
+			do_action('gravityview_log_debug', sprintf('[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status']), $search_criteria);
 			return false;
 		}
 
@@ -761,53 +761,53 @@ 
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
 
 		// field_filters
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
+		if (empty($search_criteria['field_filters']) || !is_array($search_criteria['field_filters'])) {
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria);
 			return $entry;
 		}
 
 		$filters = $search_criteria['field_filters'];
-		unset( $search_criteria );
+		unset($search_criteria);
 
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
-		unset( $filters['mode'] );
+		$mode = array_key_exists('mode', $filters) ? strtolower($filters['mode']) : 'all';
+		unset($filters['mode']);
 
-		$form = self::get_form( $entry['form_id'] );
+		$form = self::get_form($entry['form_id']);
 
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 
-			if ( ! isset( $filter['key'] ) ) {
+			if (!isset($filter['key'])) {
 				continue;
 			}
 
 			$k = $filter['key'];
 
-			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
-				$field_value = $entry[ $k ];
+			if (in_array($k, array('created_by', 'payment_status'))) {
+				$field_value = $entry[$k];
 				$field = null;
 			} else {
-				$field = self::get_field( $form, $k );
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
+				$field = self::get_field($form, $k);
+				$field_value = GFFormsModel::get_lead_field_value($entry, $field);
 			}
 
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
+			$operator = isset($filter['operator']) ? strtolower($filter['operator']) : 'is';
+			$is_value_match = GFFormsModel::is_value_match($field_value, $filter['value'], $operator, $field);
 
 			// verify if we are already free to go!
-			if ( ! $is_value_match && 'all' === $mode ) {
-				do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter );
+			if (!$is_value_match && 'all' === $mode) {
+				do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed one criteria for ALL mode', $filter);
 				return false;
-			} elseif ( $is_value_match && 'any' === $mode ) {
+			} elseif ($is_value_match && 'any' === $mode) {
 				return $entry;
 			}
 		}
 
 		// at this point, if in ALL mode, then entry is approved - all conditions were met.
 		// Or, for ANY mode, means none of the conditions were satisfied, so entry is not approved
-		if ( 'all' === $mode ) {
+		if ('all' === $mode) {
 			return $entry;
 		} else {
-			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters );
+			do_action('gravityview_log_debug', '[apply_filters_to_entry] Entry cannot be displayed. Failed all the criteria for ANY mode', $filters);
 			return false;
 		}
 
@@ -832,7 +832,7 @@ 
 	 *
 	 * @return int|null|string Formatted date based on the original date
 	 */
-	public static function format_date( $date_string = '', $args = array() ) {
+	public static function format_date($date_string = '', $args = array()) {
 
 		$default_atts = array(
 			'raw' => false,
@@ -843,39 +843,39 @@ 
 			'time' => false,
 		);
 
-		$atts = wp_parse_args( $args, $default_atts );
+		$atts = wp_parse_args($args, $default_atts);
 
 		/**
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
 		 * @see GFCommon::format_date() for original code
 		 */
-		$date_gmt_time   = mysql2date( 'G', $date_string );
-		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
+		$date_gmt_time = mysql2date('G', $date_string);
+		$date_local_timestamp = GFCommon::get_local_timestamp($date_gmt_time);
 
-		$format  = rgar( $atts, 'format' );
-		$is_human  = ! empty( $atts['human'] );
-		$is_diff  = ! empty( $atts['diff'] );
-		$is_raw = ! empty( $atts['raw'] );
-		$is_timestamp = ! empty( $atts['timestamp'] );
-		$include_time = ! empty( $atts['time'] );
+		$format = rgar($atts, 'format');
+		$is_human = !empty($atts['human']);
+		$is_diff = !empty($atts['diff']);
+		$is_raw = !empty($atts['raw']);
+		$is_timestamp = !empty($atts['timestamp']);
+		$include_time = !empty($atts['time']);
 
 		// If we're using time diff, we want to have a different default format
-		if( empty( $format ) ) {
-			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
+		if (empty($format)) {
+			$format = $is_diff ? esc_html__('%s ago', 'gravityview') : get_option('date_format');
 		}
 
 		// If raw was specified, don't modify the stored value
-		if ( $is_raw ) {
+		if ($is_raw) {
 			$formatted_date = $date_string;
-		} elseif( $is_timestamp ) {
+		} elseif ($is_timestamp) {
 			$formatted_date = $date_local_timestamp;
-		} elseif ( $is_diff ) {
-			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
+		} elseif ($is_diff) {
+			$formatted_date = sprintf($format, human_time_diff($date_gmt_time));
 		} else {
-			$formatted_date = GFCommon::format_date( $date_string, $is_human, $format, $include_time );
+			$formatted_date = GFCommon::format_date($date_string, $is_human, $format, $include_time);
 		}
 
-		unset( $format, $is_diff, $is_human, $is_timestamp, $is_raw, $date_gmt_time, $date_local_timestamp, $default_atts );
+		unset($format, $is_diff, $is_human, $is_timestamp, $is_raw, $date_gmt_time, $date_local_timestamp, $default_atts);
 
 		return $formatted_date;
 	}
@@ -888,14 +888,14 @@ 
 	 * @param string $field_id
 	 * @return string
 	 */
-	public static function get_field_label( $form = array(), $field_id = '' ) {
+	public static function get_field_label($form = array(), $field_id = '') {
 
-		if ( empty( $form ) || empty( $field_id ) ) {
+		if (empty($form) || empty($field_id)) {
 			return '';
 		}
 
-		$field = self::get_field( $form, $field_id );
-		return isset( $field['label'] ) ?  $field['label'] : '';
+		$field = self::get_field($form, $field_id);
+		return isset($field['label']) ? $field['label'] : '';
 
 	}
 
@@ -912,9 +912,9 @@ 
 	 * @param string|int $field_id
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
 	 */
-	public static function get_field( $form, $field_id ) {
-		if ( class_exists( 'GFFormsModel' ) ){
-			return GFFormsModel::get_field( $form, $field_id );
+	public static function get_field($form, $field_id) {
+		if (class_exists('GFFormsModel')) {
+			return GFFormsModel::get_field($form, $field_id);
 		} else {
 			return null;
 		}
@@ -930,16 +930,16 @@ 
 	 * @param  WP_Post      $post WordPress post object
 	 * @return boolean           True: yep, GravityView; No: not!
 	 */
-	public static function has_gravityview_shortcode( $post = null ) {
-		if ( ! is_a( $post, 'WP_Post' ) ) {
+	public static function has_gravityview_shortcode($post = null) {
+		if (!is_a($post, 'WP_Post')) {
 			return false;
 		}
 
-		if ( 'gravityview' === get_post_type( $post ) ) {
+		if ('gravityview' === get_post_type($post)) {
 			return true;
 		}
 
-		return self::has_shortcode_r( $post->post_content, 'gravityview' ) ? true : false;
+		return self::has_shortcode_r($post->post_content, 'gravityview') ? true : false;
 
 	}
 
@@ -950,27 +950,27 @@ 
 	 * @param string $content Content to check whether there's a shortcode
 	 * @param string $tag Current shortcode tag
 	 */
-	public static function has_shortcode_r( $content, $tag = 'gravityview' ) {
-		if ( false === strpos( $content, '[' ) ) {
+	public static function has_shortcode_r($content, $tag = 'gravityview') {
+		if (false === strpos($content, '[')) {
 			return false;
 		}
 
-		if ( shortcode_exists( $tag ) ) {
+		if (shortcode_exists($tag)) {
 
 			$shortcodes = array();
 
-			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-			if ( empty( $matches ) ){
+			preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER);
+			if (empty($matches)) {
 				return false;
 			}
 
-			foreach ( $matches as $shortcode ) {
-				if ( $tag === $shortcode[2] ) {
+			foreach ($matches as $shortcode) {
+				if ($tag === $shortcode[2]) {
 
 					// Changed this to $shortcode instead of true so we get the parsed atts.
 					$shortcodes[] = $shortcode;
 
-				} else if ( isset( $shortcode[5] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
+				} else if (isset($shortcode[5]) && $result = self::has_shortcode_r($shortcode[5], $tag)) {
 					$shortcodes = $result;
 				}
 			}
@@ -994,7 +994,7 @@ 
 	 *
 	 * @return array          Array with view details, as returned by get_posts()
 	 */
-	public static function get_connected_views( $form_id, $args = array() ) {
+	public static function get_connected_views($form_id, $args = array()) {
 
 		$defaults = array(
 			'post_type' => 'gravityview',
@@ -1003,9 +1003,9 @@ 
 			'meta_value' => (int)$form_id,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$views = get_posts( $args );
+		$views = get_posts($args);
 
 		return $views;
 	}
@@ -1017,8 +1017,8 @@ 
 	 *
 	 * @return string ID of the connected Form, if exists. Empty string if not.
 	 */
-	public static function get_meta_form_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_form_id', true );
+	public static function get_meta_form_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_form_id', true);
 	}
 
 	/**
@@ -1030,8 +1030,8 @@ 
 	 *
 	 * @return string GravityView_Template::template_id value. Empty string if not.
 	 */
-	public static function get_meta_template_id( $view_id ) {
-		return get_post_meta( $view_id, '_gravityview_directory_template', true );
+	public static function get_meta_template_id($view_id) {
+		return get_post_meta($view_id, '_gravityview_directory_template', true);
 	}
 
 
@@ -1042,15 +1042,15 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Associative array of settings with plugin defaults used if not set by the View
 	 */
-	public static function get_template_settings( $post_id ) {
+	public static function get_template_settings($post_id) {
 
-		$settings = get_post_meta( $post_id, '_gravityview_template_settings', true );
+		$settings = get_post_meta($post_id, '_gravityview_template_settings', true);
 
-		if ( class_exists( 'GravityView_View_Data' ) ) {
+		if (class_exists('GravityView_View_Data')) {
 
 			$defaults = GravityView_View_Data::get_default_args();
 
-			return wp_parse_args( (array)$settings, $defaults );
+			return wp_parse_args((array)$settings, $defaults);
 
 		}
 
@@ -1067,12 +1067,12 @@ 
 	 * @param  string $key     Key for the setting
 	 * @return mixed|null          Setting value, or NULL if not set.
 	 */
-	public static function get_template_setting( $post_id, $key ) {
+	public static function get_template_setting($post_id, $key) {
 
-		$settings = self::get_template_settings( $post_id );
+		$settings = self::get_template_settings($post_id);
 
-		if ( isset( $settings[ $key ] ) ) {
-			return $settings[ $key ];
+		if (isset($settings[$key])) {
+			return $settings[$key];
 		}
 
 		return null;
@@ -1108,8 +1108,8 @@ 
 	 * @param  int $post_id View ID
 	 * @return array          Multi-array of fields with first level being the field zones. See code comment.
 	 */
-	public static function get_directory_fields( $post_id ) {
-		return get_post_meta( $post_id, '_gravityview_directory_fields', true );
+	public static function get_directory_fields($post_id) {
+		return get_post_meta($post_id, '_gravityview_directory_fields', true);
 	}
 
 
@@ -1120,25 +1120,25 @@ 
 	 * @param  int $formid Form ID
 	 * @return string         html
 	 */
-	public static function get_sortable_fields( $formid, $current = '' ) {
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
+	public static function get_sortable_fields($formid, $current = '') {
+		$output = '<option value="" '.selected('', $current, false).'>'.esc_html__('Default', 'gravityview').'</option>';
 
-		if ( empty( $formid ) ) {
+		if (empty($formid)) {
 			return $output;
 		}
 
-		$fields = self::get_sortable_fields_array( $formid );
+		$fields = self::get_sortable_fields_array($formid);
 
-		if ( ! empty( $fields ) ) {
+		if (!empty($fields)) {
 
-			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
+			$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array('list', 'textarea'), null);
 
-			foreach ( $fields as $id => $field ) {
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+			foreach ($fields as $id => $field) {
+				if (in_array($field['type'], $blacklist_field_types)) {
 					continue;
 				}
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
+				$output .= '<option value="'.$id.'" '.selected($id, $current, false).'>'.esc_attr($field['label']).'</option>';
 			}
 		}
 
@@ -1156,27 +1156,27 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_sortable_fields_array( $formid, $blacklist = array( 'list', 'textarea' ) ) {
+	public static function get_sortable_fields_array($formid, $blacklist = array('list', 'textarea')) {
 
 		// Get fields with sub-inputs and no parent
-		$fields = self::get_form_fields( $formid, true, false );
+		$fields = self::get_form_fields($formid, true, false);
 
 		$date_created = array(
 			'date_created' => array(
 				'type' => 'date_created',
-				'label' => __( 'Date Created', 'gravityview' ),
+				'label' => __('Date Created', 'gravityview'),
 			),
 		);
 
         $fields = $date_created + $fields;
 
-		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
+		$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', $blacklist, NULL);
 
 		// TODO: Convert to using array_filter
-		foreach( $fields as $id => $field ) {
+		foreach ($fields as $id => $field) {
 
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
-				unset( $fields[ $id ] );
+			if (in_array($field['type'], $blacklist_field_types)) {
+				unset($fields[$id]);
 			}
 		}
 
@@ -1186,7 +1186,7 @@ 
          * @param array $fields Sub-set of GF form fields that are sortable
          * @param int $formid The Gravity Forms form ID that the fields are from
          */
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
+        $fields = apply_filters('gravityview/common/sortable_fields', $fields, $formid);
 
 		return $fields;
 	}
@@ -1197,15 +1197,15 @@ 
 	 * @param  mixed $field_id Field ID or Field array
 	 * @return string field type
 	 */
-	public static function get_field_type( $form = null, $field_id = '' ) {
+	public static function get_field_type($form = null, $field_id = '') {
 
-		if ( ! empty( $field_id ) && ! is_array( $field_id ) ) {
-			$field = self::get_field( $form, $field_id );
+		if (!empty($field_id) && !is_array($field_id)) {
+			$field = self::get_field($form, $field_id);
 		} else {
 			$field = $field_id;
 		}
 
-		return class_exists( 'RGFormsModel' ) ? RGFormsModel::get_input_type( $field ) : '';
+		return class_exists('RGFormsModel') ? RGFormsModel::get_input_type($field) : '';
 
 	}
 
@@ -1216,17 +1216,17 @@ 
 	 * @param  int|array  $field field key or field array
 	 * @return boolean
 	 */
-	public static function is_field_numeric(  $form = null, $field = '' ) {
+	public static function is_field_numeric($form = null, $field = '') {
 
-		if ( ! is_array( $form ) && ! is_array( $field ) ) {
-			$form = self::get_form( $form );
+		if (!is_array($form) && !is_array($field)) {
+			$form = self::get_form($form);
 		}
 
 		// If entry meta, it's a string. Otherwise, numeric
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
+		if (!is_numeric($field) && is_string($field)) {
 			$type = $field;
 		} else {
-			$type = self::get_field_type( $form, $field );
+			$type = self::get_field_type($form, $field);
 		}
 
 		/**
@@ -1234,16 +1234,16 @@ 
 		 * @since 1.5.2
 		 * @param array $numeric_types Fields that are numeric. Default: `[ number, time ]`
 		 */
-		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
+		$numeric_types = apply_filters('gravityview/common/numeric_types', array('number', 'time'));
 
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
-			if( true === $gv_field->is_numeric ) {
+		if ($gv_field = GravityView_Fields::get($type)) {
+			if (true === $gv_field->is_numeric) {
 				$numeric_types[] = $gv_field->is_numeric;
 			}
 		}
 
-		$return = in_array( $type, $numeric_types );
+		$return = in_array($type, $numeric_types);
 
 		return $return;
 	}
@@ -1262,19 +1262,19 @@ 
 	 *
 	 * @return string Content, encrypted
 	 */
-	public static function js_encrypt( $content, $message = '' ) {
+	public static function js_encrypt($content, $message = '') {
 
 		$output = $content;
 
-		if ( ! class_exists( 'StandalonePHPEnkoder' ) ) {
-			include_once( GRAVITYVIEW_DIR . 'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php' );
+		if (!class_exists('StandalonePHPEnkoder')) {
+			include_once(GRAVITYVIEW_DIR.'includes/lib/standalone-phpenkoder/StandalonePHPEnkoder.php');
 		}
 
-		if ( class_exists( 'StandalonePHPEnkoder' ) ) {
+		if (class_exists('StandalonePHPEnkoder')) {
 
 			$enkoder = new StandalonePHPEnkoder;
 
-			$message = empty( $message ) ? __( 'Email hidden; Javascript is required.', 'gravityview' ) : $message;
+			$message = empty($message) ? __('Email hidden; Javascript is required.', 'gravityview') : $message;
 
 			/**
 			 * @filter `gravityview/phpenkoder/msg` Modify the message shown when Javascript is disabled and an encrypted email field is displayed
@@ -1282,9 +1282,9 @@ 
 			 * @param string $message Existing message
 			 * @param string $content Content to encrypt
 			 */
-			$enkoder->enkode_msg = apply_filters( 'gravityview/phpenkoder/msg', $message, $content );
+			$enkoder->enkode_msg = apply_filters('gravityview/phpenkoder/msg', $message, $content);
 
-			$output = $enkoder->enkode( $content );
+			$output = $enkoder->enkode($content);
 		}
 
 		return $output;
@@ -1301,25 +1301,25 @@ 
 	 *
 	 * @author rubo77 at https://gist.github.com/rubo77/6821632
 	 **/
-	public static function gv_parse_str( $string, &$result ) {
-		if ( empty( $string ) ) {
+	public static function gv_parse_str($string, &$result) {
+		if (empty($string)) {
 			return false;
 		}
 
 		$result = array();
 
 		// find the pairs "name=value"
-		$pairs = explode( '&', $string );
+		$pairs = explode('&', $string);
 
-		foreach ( $pairs as $pair ) {
+		foreach ($pairs as $pair) {
 			// use the original parse_str() on each element
-			parse_str( $pair, $params );
+			parse_str($pair, $params);
 
-			$k = key( $params );
-			if ( ! isset( $result[ $k ] ) ) {
+			$k = key($params);
+			if (!isset($result[$k])) {
 				$result += $params;
-			} elseif ( array_key_exists( $k, $params ) && is_array( $params[ $k ] ) ) {
-				$result[ $k ] = self::array_merge_recursive_distinct( $result[ $k ], $params[ $k ] );
+			} elseif (array_key_exists($k, $params) && is_array($params[$k])) {
+				$result[$k] = self::array_merge_recursive_distinct($result[$k], $params[$k]);
 			}
 		}
 		return true;
@@ -1341,7 +1341,7 @@ 
 	 *
 	 * @return string HTML output of anchor link. If empty $href, returns NULL
 	 */
-	public static function get_link_html( $href = '', $anchor_text = '', $atts = array() ) {
+	public static function get_link_html($href = '', $anchor_text = '', $atts = array()) {
 
 		// Supported attributes for anchor tags. HREF left out intentionally.
 		$allowed_atts = array(
@@ -1377,31 +1377,31 @@ 
 		 * @filter `gravityview/get_link/allowed_atts` Modify the attributes that are allowed to be used in generating links
 		 * @param array $allowed_atts Array of attributes allowed
 		 */
-		$allowed_atts = apply_filters( 'gravityview/get_link/allowed_atts', $allowed_atts );
+		$allowed_atts = apply_filters('gravityview/get_link/allowed_atts', $allowed_atts);
 
 		// Make sure the attributes are formatted as array
-		$passed_atts = wp_parse_args( $atts );
+		$passed_atts = wp_parse_args($atts);
 
 		// Make sure the allowed attributes are only the ones in the $allowed_atts list
-		$final_atts = shortcode_atts( $allowed_atts, $passed_atts );
+		$final_atts = shortcode_atts($allowed_atts, $passed_atts);
 
 		// Remove attributes with empty values
-		$final_atts = array_filter( $final_atts );
+		$final_atts = array_filter($final_atts);
 
 		// If the href wasn't passed as an attribute, use the value passed to the function
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
+		if (empty($final_atts['href']) && !empty($href)) {
 			$final_atts['href'] = $href;
 		}
 
-		$final_atts['href'] = esc_url_raw( $href );
+		$final_atts['href'] = esc_url_raw($href);
 
 		// For each attribute, generate the code
 		$output = '';
-		foreach ( $final_atts as $attr => $value ) {
-			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
+		foreach ($final_atts as $attr => $value) {
+			$output .= sprintf(' %s="%s"', $attr, esc_attr($value));
 		}
 
-		$output = '<a'. $output .'>'. $anchor_text .'</a>';
+		$output = '<a'.$output.'>'.$anchor_text.'</a>';
 
 		return $output;
 	}
@@ -1420,14 +1420,14 @@ 
 	 * @author Daniel <daniel (at) danielsmedegaardbuus (dot) dk>
 	 * @author Gabriel Sobrinho <gabriel (dot) sobrinho (at) gmail (dot) com>
 	 */
-	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
+	public static function array_merge_recursive_distinct(array &$array1, array &$array2) {
 		$merged = $array1;
 
-		foreach ( $array2 as $key => &$value )  {
-			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
-				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
+		foreach ($array2 as $key => &$value) {
+			if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+				$merged[$key] = self::array_merge_recursive_distinct($merged[$key], $value);
 			} else {
-				$merged[ $key ] = $value;
+				$merged[$key] = $value;
 			}
 		}
 
@@ -1441,26 +1441,26 @@ 
 	 * @param array $args Arguments to modify the user query. See get_users() {@since 1.14}
 	 * @return array Array of WP_User objects.
 	 */
-	public static function get_users( $context = 'change_entry_creator', $args = array() ) {
+	public static function get_users($context = 'change_entry_creator', $args = array()) {
 
 		$default_args = array(
 			'number' => 2000,
 			'orderby' => 'display_name',
 			'order' => 'ASC',
-			'fields' => array( 'ID', 'display_name', 'user_login', 'user_nicename' )
+			'fields' => array('ID', 'display_name', 'user_login', 'user_nicename')
 		);
 
 		// Merge in the passed arg
-		$get_users_settings = wp_parse_args( $args, $default_args );
+		$get_users_settings = wp_parse_args($args, $default_args);
 
 		/**
 		 * @filter `gravityview/get_users/{$context}` There are issues with too many users using [get_users()](http://codex.wordpress.org/Function_Reference/get_users) where it breaks the select. We try to keep it at a reasonable number. \n
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
 		 */
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
+		$get_users_settings = apply_filters('gravityview/get_users/'.$context, apply_filters('gravityview_change_entry_creator_user_parameters', $get_users_settings));
 
-		return get_users( $get_users_settings );
+		return get_users($get_users_settings);
 	}
 
 
@@ -1472,8 +1472,8 @@ 
      *
      * @return string
      */
-    public static function generate_notice( $notice, $class = '' ) {
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
+    public static function generate_notice($notice, $class = '') {
+        return '<div class="gv-notice '.gravityview_sanitize_html_class($class).'">'.$notice.'</div>';
     }
 
 
@@ -1495,6 +1495,6 @@ 
  *
  * @return string HTML output of anchor link. If empty $href, returns NULL
  */
-function gravityview_get_link( $href = '', $anchor_text = '', $atts = array() ) {
-	return GVCommon::get_link_html( $href, $anchor_text, $atts );
+function gravityview_get_link($href = '', $anchor_text = '', $atts = array()) {
+	return GVCommon::get_link_html($href, $anchor_text, $atts);
 }

includes/class-data.php

Spacing +164 added lines, -164 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -15,14 +15,14 @@ 
 	 *
 	 * @param null $passed_post
 	 */
-	private function __construct( $passed_post = NULL ) {
+	private function __construct($passed_post = NULL) {
 
-		if( !empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
+			$id_or_id_array = $this->maybe_get_view_id($passed_post);
 
-			if( !empty( $id_or_id_array ) ) {
-				$this->add_view( $id_or_id_array );
+			if (!empty($id_or_id_array)) {
+				$this->add_view($id_or_id_array);
 			}
 		}
 
@@ -34,7 +34,7 @@ 
 	public function has_multiple_views() {
 
 		//multiple views
-		return count( $this->get_views() ) > 1 ? true : false;
+		return count($this->get_views()) > 1 ? true : false;
 	}
 
 
@@ -52,37 +52,37 @@ 
 	 *
 	 * @return int|null|array ID of the View. If there are multiple views in the content, array of IDs parsed.
 	 */
-	public function maybe_get_view_id( $passed_post ) {
+	public function maybe_get_view_id($passed_post) {
 
 		$ids = array();
 
-		if( ! empty( $passed_post ) ) {
+		if (!empty($passed_post)) {
 
-			if( is_numeric( $passed_post ) ) {
-				$passed_post = get_post( $passed_post );
+			if (is_numeric($passed_post)) {
+				$passed_post = get_post($passed_post);
 			}
 
 			// Convert WP_Posts into WP_Posts[] array
-			if( $passed_post instanceof WP_Post ) {
-				$passed_post = array( $passed_post );
+			if ($passed_post instanceof WP_Post) {
+				$passed_post = array($passed_post);
 			}
 
-			if( is_array( $passed_post ) ) {
+			if (is_array($passed_post)) {
 
-				foreach ( $passed_post as &$post) {
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
+				foreach ($passed_post as &$post) {
+					if ((get_post_type($post) === 'gravityview')) {
 						$ids[] = $post->ID;
-					} else{
+					} else {
 						// Parse the Post Content
-						$id = $this->parse_post_content( $post->post_content );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_content($post->post_content);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 
 						// Parse the Post Meta
-						$id = $this->parse_post_meta( $post->ID );
-						if( $id ) {
-							$ids = array_merge( $ids, (array) $id );
+						$id = $this->parse_post_meta($post->ID);
+						if ($id) {
+							$ids = array_merge($ids, (array)$id);
 						}
 					}
 
@@ -90,33 +90,33 @@ 
 
 			} else {
 
-				if ( is_string( $passed_post ) ) {
+				if (is_string($passed_post)) {
 
-					$id = $this->parse_post_content( $passed_post );
-					if( $id ) {
-						$ids = array_merge( $ids, (array) $id );
+					$id = $this->parse_post_content($passed_post);
+					if ($id) {
+						$ids = array_merge($ids, (array)$id);
 					}
 
 				} else {
-					$id = $this->get_id_from_atts( $passed_post );
-					$ids[] = intval( $id );
+					$id = $this->get_id_from_atts($passed_post);
+					$ids[] = intval($id);
 				}
 			}
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 	}
 
-	public static function getInstance( $passed_post = NULL ) {
+	public static function getInstance($passed_post = NULL) {
 
-		if( empty( self::$instance ) ) {
-			self::$instance = new GravityView_View_Data( $passed_post );
+		if (empty(self::$instance)) {
+			self::$instance = new GravityView_View_Data($passed_post);
 		}
 
 		return self::$instance;
@@ -126,25 +126,25 @@ 
 		return $this->views;
 	}
 
-	function get_view( $view_id, $atts = NULL ) {
+	function get_view($view_id, $atts = NULL) {
 
-		if( ! is_numeric( $view_id) ) {
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
+		if (!is_numeric($view_id)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id));
 			return false;
 		}
 
 		// Backup: the view hasn't been fetched yet. Doing it now.
-		if ( ! isset( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
-			return $this->add_view( $view_id, $atts );
+		if (!isset($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id));
+			return $this->add_view($view_id, $atts);
 		}
 
-		if ( empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
+		if (empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id));
 			return false;
 		}
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -156,8 +156,8 @@ 
 	 * @return   bool          True if the post exists; otherwise, false.
 	 * @since    1.0.0
 	 */
-	function view_exists( $view_id ) {
-		return is_string( get_post_status( $view_id ) );
+	function view_exists($view_id) {
+		return is_string(get_post_status($view_id));
 	}
 
 	/**
@@ -168,56 +168,56 @@ 
 	 * @param array|string $atts Combine other attributes (eg. from shortcode) with the view settings (optional)
 	 * @return type
 	 */
-	function add_view( $view_id, $atts = NULL ) {
+	function add_view($view_id, $atts = NULL) {
 
 		// Handle array of IDs
-		if( is_array( $view_id ) ) {
-			foreach( $view_id as $id ) {
+		if (is_array($view_id)) {
+			foreach ($view_id as $id) {
 
-				$this->add_view( $id, $atts );
+				$this->add_view($id, $atts);
 			}
 
 			return $this->views;
 		}
 
 		// The view has been set already; returning stored view.
-		if ( !empty( $this->views[ $view_id ] ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
-			return $this->views[ $view_id ];
+		if (!empty($this->views[$view_id])) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id));
+			return $this->views[$view_id];
 		}
 
-		if( ! $this->view_exists( $view_id ) ) {
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
+		if (!$this->view_exists($view_id)) {
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id));
 			return false;
 		}
 
-		$form_id = gravityview_get_form_id( $view_id );
+		$form_id = gravityview_get_form_id($view_id);
 
-		if( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id));
 
 			return false;
 		}
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $view_id );
+		$view_settings = gravityview_get_template_settings($view_id);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings);
 
 		// Merge the view settings with the defaults
-		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
+		$view_defaults = wp_parse_args($view_settings, self::get_default_args());
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults);
 
-		if( ! empty( $atts ) && is_array( $atts ) ) {
+		if (!empty($atts) && is_array($atts)) {
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts);
 
 			// Get the settings from the shortcode and merge them with defaults.
-			$atts = shortcode_atts( $view_defaults, $atts );
+			$atts = shortcode_atts($view_defaults, $atts);
 
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
+			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts);
 
 		} else {
 
@@ -226,24 +226,24 @@ 
 
 		}
 
-		unset( $atts['id'], $view_defaults, $view_settings );
+		unset($atts['id'], $view_defaults, $view_settings);
 
 		$data = array(
 			'id' => $view_id,
 			'view_id' => $view_id,
 			'form_id' => $form_id,
-			'template_id' => gravityview_get_template_id( $view_id ),
+			'template_id' => gravityview_get_template_id($view_id),
 			'atts' => $atts,
-			'fields' => $this->get_fields( $view_id ),
-			'widgets' => get_post_meta( $view_id, '_gravityview_directory_widgets', true ),
-			'form' => gravityview_get_form( $form_id ),
+			'fields' => $this->get_fields($view_id),
+			'widgets' => get_post_meta($view_id, '_gravityview_directory_widgets', true),
+			'form' => gravityview_get_form($form_id),
 		);
 
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
+		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data);
 
-		$this->views[ $view_id ] = $data;
+		$this->views[$view_id] = $data;
 
-		return $this->views[ $view_id ];
+		return $this->views[$view_id];
 	}
 
 	/**
@@ -253,14 +253,14 @@ 
 	 * @param  int $view_id View ID
 	 * @return array          Array of fields as passed by `gravityview_get_directory_fields()`
 	 */
-	function get_fields( $view_id ) {
+	function get_fields($view_id) {
 
-		$dir_fields = gravityview_get_directory_fields( $view_id );
-		do_action( 'gravityview_log_debug', '[render_view] Fields: ', $dir_fields );
+		$dir_fields = gravityview_get_directory_fields($view_id);
+		do_action('gravityview_log_debug', '[render_view] Fields: ', $dir_fields);
 
 		// remove fields according to visitor visibility permissions (if logged-in)
-		$dir_fields = $this->filter_fields( $dir_fields );
-		do_action( 'gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields );
+		$dir_fields = $this->filter_fields($dir_fields);
+		do_action('gravityview_log_debug', '[render_view] Fields after visibility filter: ', $dir_fields);
 
 		return $dir_fields;
 	}
@@ -272,18 +272,18 @@ 
 	 * @param array $dir_fields
 	 * @return array
 	 */
-	private function filter_fields( $dir_fields ) {
+	private function filter_fields($dir_fields) {
 
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
+		if (empty($dir_fields) || !is_array($dir_fields)) {
 			return $dir_fields;
 		}
 
-		foreach( $dir_fields as $area => $fields ) {
+		foreach ($dir_fields as $area => $fields) {
 
-			foreach( (array)$fields as $uniqid => $properties ) {
+			foreach ((array)$fields as $uniqid => $properties) {
 
-				if( $this->hide_field_check_conditions( $properties ) ) {
-					unset( $dir_fields[ $area ][ $uniqid ] );
+				if ($this->hide_field_check_conditions($properties)) {
+					unset($dir_fields[$area][$uniqid]);
 				}
 
 			}
@@ -301,31 +301,31 @@ 
 	 * @param array $properties
 	 * @return void|boolean (field should be hidden) or false (field should be presented)
 	 */
-	private function hide_field_check_conditions( $properties ) {
+	private function hide_field_check_conditions($properties) {
 
 		// logged-in visibility
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
+		if (!empty($properties['only_loggedin']) && !GVCommon::has_cap($properties['only_loggedin_cap'])) {
 			return true;
 		}
 
 		return false;
 	}
 
-	function get_id_from_atts( $atts ) {
+	function get_id_from_atts($atts) {
 
-		$atts = is_array( $atts ) ? $atts : shortcode_parse_atts( $atts );
+		$atts = is_array($atts) ? $atts : shortcode_parse_atts($atts);
 
 		// Get the settings from the shortcode and merge them with defaults.
-		$atts = wp_parse_args( $atts, self::get_default_args() );
+		$atts = wp_parse_args($atts, self::get_default_args());
 
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
+		$view_id = !empty($atts['view_id']) ? (int)$atts['view_id'] : NULL;
 
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
+		if (empty($view_id) && !empty($atts['id'])) {
 			$view_id = (int)$atts['id'];
 		}
 
-		if( empty( $view_id ) ) {
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
+		if (empty($view_id)) {
+			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts);
 			return;
 		}
 
@@ -341,50 +341,50 @@ 
 	 * @param  string $content $post->post_content content
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, NULL
 	 */
-	function parse_post_content( $content ) {
+	function parse_post_content($content) {
 
 		/**
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
 		 * @since 1.6
 		 */
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
+		if (!shortcode_exists('gravityview') && class_exists('GravityView_Shortcode')) {
 			new GravityView_Shortcode;
 		}
 
-		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
+		$shortcodes = gravityview_has_shortcode_r($content, 'gravityview');
 
-		if( empty( $shortcodes ) ) {
+		if (empty($shortcodes)) {
 			return NULL;
 		}
 
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes);
 
 		$ids = array();
 
 		foreach ($shortcodes as $key => $shortcode) {
 
-			$args = shortcode_parse_atts( $shortcode[3] );
+			$args = shortcode_parse_atts($shortcode[3]);
 
-			if( empty( $args['id'] ) ) {
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
+			if (empty($args['id'])) {
+				do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID), $shortcode);
 				continue;
 			}
 
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
+			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args);
 
 			// Store the View to the object for later fetching.
-			$this->add_view( $args['id'], $args );
+			$this->add_view($args['id'], $args);
 
 			$ids[] = $args['id'];
 		}
 
-		if( empty($ids) ) {
+		if (empty($ids)) {
 			return NULL;
 		}
 
 		// If it's just one ID, return that.
 		// Otherwise, return array of IDs
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
+		return (sizeof($ids) === 1) ? $ids[0] : $ids;
 
 	}
 
@@ -395,7 +395,7 @@ 
 	 * @param int $post_id WP_Post ID
 	 * @return int|null|array If a single View is found, the ID of the View. If there are multiple views in the content, array of IDs parsed. If not found, or meta not parsed, NULL
 	 */
-	private function parse_post_meta( $post_id ) {
+	private function parse_post_meta($post_id) {
 
 		/**
 		 * @filter `gravityview/data/parse/meta_keys` Define meta keys to parse to check for GravityView shortcode content
@@ -403,32 +403,32 @@ 
 		 * @param[in,out] array $meta_keys Array of key values to check. If empty, do not check. Default: empty array
 		 * @param[in] int $post_id ID of the post being checked
 		 */
-		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
+		$meta_keys = (array)apply_filters('gravityview/data/parse/meta_keys', array(), $post_id);
 
-		if( empty( $meta_keys ) ) {
+		if (empty($meta_keys)) {
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Search for GravityView shortcodes on the following custom fields keys:', $meta_keys);
 
 		$meta_content = '';
 
-		foreach( $meta_keys as $key ) {
-			$meta = get_post_meta( $post_id, $key , true );
-			if( ! is_string( $meta ) ) {
+		foreach ($meta_keys as $key) {
+			$meta = get_post_meta($post_id, $key, true);
+			if (!is_string($meta)) {
 				continue;
 			}
-			$meta_content .= $meta . ' ';
+			$meta_content .= $meta.' ';
 		}
 
-		if( empty( $meta_content ) ) {
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
+		if (empty($meta_content)) {
+			do_action('gravityview_log_error', sprintf('GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id), $meta_keys);
 			return NULL;
 		}
 
-		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content );
+		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_meta] Combined content retrieved from custom fields:', $meta_content);
 
-		return $this->parse_post_content( $meta_content );
+		return $this->parse_post_content($meta_content);
 
 	}
 
@@ -444,61 +444,61 @@ 
 	 *
 	 * @return bool|WP_Error If valid, returns true. If invalid, returns WP_Error containing error message.
 	 */
-	public static function is_valid_embed_id( $post_id = '', $view_id = '', $empty_is_valid = true ) {
+	public static function is_valid_embed_id($post_id = '', $view_id = '', $empty_is_valid = true) {
 
 		$message = NULL;
 
 		// Not invalid if not set!
-		if( empty( $post_id ) || empty( $view_id ) ) {
+		if (empty($post_id) || empty($view_id)) {
 
-			if( $empty_is_valid ) {
+			if ($empty_is_valid) {
 				return true;
 			}
 
-			$message = esc_html__( 'The ID is required.', 'gravityview' );
+			$message = esc_html__('The ID is required.', 'gravityview');
 		}
 
-		if( ! $message ) {
-			$status = get_post_status( $post_id );
+		if (!$message) {
+			$status = get_post_status($post_id);
 
 			// Nothing exists with that post ID.
-			if ( ! is_numeric( $post_id ) ) {
-				$message = esc_html__( 'You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview' );
+			if (!is_numeric($post_id)) {
+				$message = esc_html__('You did not enter a number. The value entered should be a number, representing the ID of the post or page the View is embedded on.', 'gravityview');
 
 				// @todo Convert to generic article about Embed IDs
-				$message .= ' ' . gravityview_get_link( 'http://docs.gravityview.co/article/222-the-search-widget', __( 'Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				$message .= ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// Nothing exists with that post ID.
-			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
-				$message = esc_html__( 'There is no post or page with that ID.', 'gravityview' );
+			if (empty($status) || in_array($status, array('revision', 'attachment'))) {
+				$message = esc_html__('There is no post or page with that ID.', 'gravityview');
 			}
 
 		}
 
-		if( ! $message ) {
-			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
+		if (!$message) {
+			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id($post_id);
 
 			// The post or page specified does not contain the shortcode.
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
-				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
+			if (false === in_array($view_id, (array)$view_ids_in_post)) {
+				$message = sprintf(esc_html__('The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview'), '<br /><code>[gravityview id="'.intval($view_id).'"]</code>');
 			}
 		}
 
-		if( ! $message ) {
+		if (!$message) {
 
 			// It's a View
-			if( 'gravityview' === get_post_type( $post_id ) ) {
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
+			if ('gravityview' === get_post_type($post_id)) {
+				$message = esc_html__('The ID is already a View.', 'gravityview'); ;
 			}
 
 		}
 
-		if( $message ) {
-			return new WP_Error( 'invalid_embed_id', $message );
+		if ($message) {
+			return new WP_Error('invalid_embed_id', $message);
 		}
 
 		return true;
@@ -510,13 +510,13 @@ 
 	 * @param  boolean $with_details Include details
 	 * @return mixed|array                If using $with_details, return array. Otherwise, mixed.
 	 */
-	public static function get_default_arg( $key, $with_details = false ) {
+	public static function get_default_arg($key, $with_details = false) {
 
-		$args = self::get_default_args( $with_details );
+		$args = self::get_default_args($with_details);
 
-		if( !isset( $args[ $key ] ) ) { return NULL; }
+		if (!isset($args[$key])) { return NULL; }
 
-		return $args[ $key ];
+		return $args[$key];
 	}
 
 	/**
@@ -535,13 +535,13 @@ 
 	 *      @param[out] array  $options Array of values to use when generating select, multiselect, radio, or checkboxes fields
 	 *      @param[out] boolean $full_width True: Display the input and label together when rendering. False: Display label and input in separate columns when rendering.
 	 */
-	public static function get_default_args( $with_details = false, $group = NULL ) {
+	public static function get_default_args($with_details = false, $group = NULL) {
 
 		/**
 		 * @filter `gravityview_default_args` Modify the default settings for new Views
 		 * @param[in,out] array $default_args Array of default args.
 		 */
-		$default_settings = apply_filters( 'gravityview_default_args', array(
+		$default_settings = apply_filters('gravityview_default_args', array(
 			'id' => array(
 				'label' => __('View ID', 'gravityview'),
 				'type' => 'number',
@@ -559,7 +559,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'lightbox' => array(
-				'label' => __( 'Enable lightbox for images', 'gravityview' ),
+				'label' => __('Enable lightbox for images', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 1,
@@ -567,29 +567,29 @@ 
 				'show_in_shortcode' => true,
 			),
 			'show_only_approved' => array(
-				'label' => __( 'Show only approved entries', 'gravityview' ),
+				'label' => __('Show only approved entries', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_until_searched' => array(
-				'label' => __( 'Hide View data until search is performed', 'gravityview' ),
+				'label' => __('Hide View data until search is performed', 'gravityview'),
 				'type' => 'checkbox',
 				'group'	=> 'default',
-				'tooltip' => __( 'When enabled it will only show any View entries after a search is performed.', 'gravityview' ),
+				'tooltip' => __('When enabled it will only show any View entries after a search is performed.', 'gravityview'),
 				'value' => 0,
 				'show_in_shortcode' => false,
 			),
 			'hide_empty' => array(
-				'label' 	=> __( 'Hide empty fields', 'gravityview' ),
+				'label' 	=> __('Hide empty fields', 'gravityview'),
 				'group'	=> 'default',
 				'type'	=> 'checkbox',
 				'value' => 1,
 				'show_in_shortcode' => false,
 			),
 			'user_edit' => array(
-				'label'	=> __( 'Allow User Edit', 'gravityview' ),
+				'label'	=> __('Allow User Edit', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -598,7 +598,7 @@ 
 				'show_in_shortcode' => true,
 			),
 			'user_delete' => array(
-				'label'	=> __( 'Allow User Delete', 'gravityview' ),
+				'label'	=> __('Allow User Delete', 'gravityview'),
 				'group'	=> 'default',
 				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
 				'value'	=> 0,
@@ -612,8 +612,8 @@ 
 				'value' => '',
 				'group'	=> 'sort',
 				'options' => array(
-					'' => __( 'Default', 'gravityview'),
-					'date_created' => __( 'Date Created', 'gravityview'),
+					'' => __('Default', 'gravityview'),
+					'date_created' => __('Date Created', 'gravityview'),
 				),
 				'show_in_shortcode' => true,
 			),
@@ -630,19 +630,19 @@ 
 				'show_in_shortcode' => true,
 			),
 			'sort_columns' => array(
-				'label' 	=> __( 'Enable sorting by column', 'gravityview' ),
-				'left_label' => __( 'Column Sorting', 'gravityview' ),
+				'label' 	=> __('Enable sorting by column', 'gravityview'),
+				'left_label' => __('Column Sorting', 'gravityview'),
 				'type' => 'checkbox',
 				'value' => false,
 				'group'	=> 'sort',
 				'tooltip' => NULL,
 				'show_in_shortcode' => true,
-				'show_in_template' => array( 'default_table' ),
+				'show_in_template' => array('default_table'),
 			),
 			'start_date' => array(
 				'label' 	=> __('Filter by Start Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -651,7 +651,7 @@ 
 			'end_date' => array(
 				'label' 	=> __('Filter by End Date', 'gravityview'),
 				'class'	=> 'gv-datepicker',
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
+				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview'),
 				'type' => 'text',
 				'value' => '',
 				'group'	=> 'filter',
@@ -711,12 +711,12 @@ 
 		));
 
 		// By default, we only want the key => value pairing, not the whole array.
-		if( empty( $with_details ) ) {
+		if (empty($with_details)) {
 
 			$defaults = array();
 
-			foreach( $default_settings as $key => $value ) {
-				$defaults[ $key ] = $value['value'];
+			foreach ($default_settings as $key => $value) {
+				$defaults[$key] = $value['value'];
 			}
 
 			return $defaults;
@@ -729,9 +729,9 @@ 
 
 				// If the $group argument is set for the method,
 				// ignore any settings that aren't in that group.
-				if( !empty( $group ) && is_string( $group ) ) {
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
-						unset( $default_settings[ $key ] );
+				if (!empty($group) && is_string($group)) {
+					if (empty($value['group']) || $value['group'] !== $group) {
+						unset($default_settings[$key]);
 					}
 				}
 

Doc Comments +3 added lines

@@ -113,6 +113,9 @@
 		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
 	}
 
+	/**
+	 * @return GravityView_View_Data
+	 */
 	public static function getInstance( $passed_post = NULL ) {
 
 		if( empty( self::$instance ) ) {

includes/class-debug-bar.php

Braces +1 added lines, -2 removed lines

@@ -173,8 +173,7 @@
 			if( !is_null( $notice['data'] ) ) {
 				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
 			}
-		}
-		else {
+		} else {
 			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
 		}
 

Spacing +31 added lines, -31 removed lines

@@ -21,12 +21,12 @@ 
 	function init() {
 
 		$icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i>&nbsp;' : NULL;
-		$this->title( $icon . __('GravityView', 'gravityview') );
+		$this->title($icon.__('GravityView', 'gravityview'));
 	}
 
 	function get_warnings() {
 
-		if( is_null( $this->warnings ) ) {
+		if (is_null($this->warnings)) {
 			$this->warnings = GravityView_Logging::get_errors();
 		}
 
@@ -35,7 +35,7 @@ 
 
 	function get_notices() {
 
-		if( is_null( $this->notices ) ) {
+		if (is_null($this->notices)) {
 			$this->notices = GravityView_Logging::get_notices();
 		}
 
@@ -51,8 +51,8 @@ 
 	 * @param boolean $visible {@internal Leave here for compatibility with the Debug_Bar_Panel parent class}
 	 * @return void
 	 */
-	function set_visible( $visible = false ) {
-		$this->_visible = ( count( $this->get_notices() ) || count( $this->get_warnings() ) );
+	function set_visible($visible = false) {
+		$this->_visible = (count($this->get_notices()) || count($this->get_warnings()));
 	}
 
 	/**
@@ -84,42 +84,42 @@ 
 		</style>
 		<div id='debug-bar-gravityview'>";
 
-		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />';
+		$output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE).'" class="alignright" alt="" width="100" height="132" />';
 
 
 		$warnings = $this->get_warnings();
 		$notices = $this->get_notices();
 
-		if(count($warnings)) {
+		if (count($warnings)) {
 			$output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $warnings as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($warnings as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-warning-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
-		if(count($notices)) {
+		if (count($notices)) {
 			$output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>';
 			$output .= '<ol>';
-			foreach ( $notices as $key => $notice) {
-				if(empty($notice['message'])) { continue; }
-				$output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>';
+			foreach ($notices as $key => $notice) {
+				if (empty($notice['message'])) { continue; }
+				$output .= '<li><a href="#'.sanitize_html_class('gv-notice-'.$key).'">'.strip_tags($notice['message']).'</a></li>';
 			}
 			$output .= '</ol><hr />';
 		}
 
-		if ( count( $warnings ) ) {
+		if (count($warnings)) {
 			$output .= '<h3>Warnings</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-'  . $key ); }
+			foreach ($warnings as $key => $notice) { $output .= $this->render_item($notice, 'gv-warning-'.$key); }
 			$output .= '</ol>';
 		}
 
-		if ( count( $notices ) ) {
+		if (count($notices)) {
 			$output .= '<h3>Notices</h3>';
 			$output .= '<ol class="debug-bar-php-list">';
-			foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); }
+			foreach ($notices as $key => $notice) { $output .= $this->render_item($notice, 'gv-notice-'.$key); }
 			$output .= '</ol>';
 		}
 
@@ -134,12 +134,12 @@ 
 	 * @return string       Escaped HTML
 	 */
 	function esc_html_recursive($item) {
-		if(is_object($item)) {
-			foreach($item as $key => $value) {
+		if (is_object($item)) {
+			foreach ($item as $key => $value) {
 				$item->{$key} = $this->esc_html_recursive($value);
 			}
-		} else if(is_array($item)) {
-			foreach($item as $key => $value) {
+		} else if (is_array($item)) {
+			foreach ($item as $key => $value) {
 				$item[$key] = $this->esc_html_recursive($value);
 			}
 		} else {
@@ -155,31 +155,31 @@ 
 	 * @param  string $anchor The anchor ID for the item
 	 * @return string         HTML output
 	 */
-	function render_item( $notice, $anchor = '' ) {
+	function render_item($notice, $anchor = '') {
 
 		$output = '';
 
-		if(!empty($notice['message'])) {
-			$output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>';
+		if (!empty($notice['message'])) {
+			$output .= '<a id="'.sanitize_html_class($anchor).'"></a>';
 			$output .= "<li class='debug-bar-php-notice'>";
 		}
 
 		$output .= '<div class="clear"></div>';
 
 		// Title
-		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>';
+		$output .= '<div class="gravityview-debug-bar-title">'.esc_attr($notice['message']).'</div>';
 
 		// Debugging Output
-		if( empty( $notice['data'] ) ) {
-			if( !is_null( $notice['data'] ) ) {
-				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>';
+		if (empty($notice['data'])) {
+			if (!is_null($notice['data'])) {
+				$output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview').'</em>';
 			}
 		}
 		else {
-			$output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) );
+			$output .= sprintf('<pre>%s</pre>', print_r($this->esc_html_recursive($notice['data']), true));
 		}
 
-		if(!empty($notice['message'])) {
+		if (!empty($notice['message'])) {
 			$output .= '</li>';
 		}
 

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