gravityview / GravityView

includes/plugin-and-theme-hooks/abstract-gravityview-plugin-and-theme-hooks.php

Doc Comments -1 removed lines

@@ -169,7 +169,6 @@
 	 *
 	 * @since 1.15.2
 	 *
-	 * @param array $handles Array of meta keys to check for existence of shortcodes
 	 * @param int $post_id The ID being checked by GravityView
 	 *
 	 * @return array Meta key array, merged with existing meta keys

Spacing +20 added lines, -20 removed lines

@@ -89,11 +89,11 @@ 
 	 * @return void
 	 */
 	private function maybe_add_hooks() {
-		$class_exists = ! $this->class_name || ( $this->class_name && class_exists( $this->class_name ) );
-		$function_exists = ! $this->function_name || ( $this->function_name && function_exists( $this->function_name ) );
-		$constant_defined = ! $this->constant_name || ( $this->constant_name && defined( $this->constant_name ) );
+		$class_exists = !$this->class_name || ($this->class_name && class_exists($this->class_name));
+		$function_exists = !$this->function_name || ($this->function_name && function_exists($this->function_name));
+		$constant_defined = !$this->constant_name || ($this->constant_name && defined($this->constant_name));
 
-		if( $class_exists || $function_exists || $constant_defined ) {
+		if ($class_exists || $function_exists || $constant_defined) {
 			$this->add_hooks();
 		}
 	}
@@ -104,20 +104,20 @@ 
 	 * @return void
 	 */
 	protected function add_hooks() {
-		if( $this->content_meta_keys ) {
-			add_filter( 'gravityview/data/parse/meta_keys', array( $this, 'merge_content_meta_keys' ), 10, 2 );
+		if ($this->content_meta_keys) {
+			add_filter('gravityview/data/parse/meta_keys', array($this, 'merge_content_meta_keys'), 10, 2);
 		}
 
-		if( $this->script_handles ) {
-			add_filter( 'gravityview_noconflict_scripts', array( $this, 'merge_noconflict_scripts' ) );
+		if ($this->script_handles) {
+			add_filter('gravityview_noconflict_scripts', array($this, 'merge_noconflict_scripts'));
 		}
 
-		if( $this->style_handles ) {
-			add_filter( 'gravityview_noconflict_styles', array( $this, 'merge_noconflict_styles' ) );
+		if ($this->style_handles) {
+			add_filter('gravityview_noconflict_styles', array($this, 'merge_noconflict_styles'));
 		}
 
-		if( $this->post_type_support ) {
-			add_filter( 'gravityview_post_type_support', array( $this, 'merge_post_type_support' ), 10, 2 );
+		if ($this->post_type_support) {
+			add_filter('gravityview_post_type_support', array($this, 'merge_post_type_support'), 10, 2);
 		}
 	}
 
@@ -131,8 +131,8 @@ 
 	 *
 	 * @return array Array of features associated with a functional area of the edit screen, merged with existing values
 	 */
-	public function merge_post_type_support( $supports = array(), $is_hierarchical = false ) {
-		$supports = array_merge( $this->post_type_support, $supports );
+	public function merge_post_type_support($supports = array(), $is_hierarchical = false) {
+		$supports = array_merge($this->post_type_support, $supports);
 		return $supports;
 	}
 
@@ -145,8 +145,8 @@ 
 	 *
 	 * @return array Handles, merged with existing styles
 	 */
-	public function merge_noconflict_styles( $handles ) {
-		$handles = array_merge( $this->style_handles, $handles );
+	public function merge_noconflict_styles($handles) {
+		$handles = array_merge($this->style_handles, $handles);
 		return $handles;
 	}
 
@@ -159,8 +159,8 @@ 
 	 *
 	 * @return array Handles, merged with existing scripts
 	 */
-	public function merge_noconflict_scripts( $handles ) {
-		$handles = array_merge( $this->script_handles, $handles );
+	public function merge_noconflict_scripts($handles) {
+		$handles = array_merge($this->script_handles, $handles);
 		return $handles;
 	}
 
@@ -174,8 +174,8 @@ 
 	 *
 	 * @return array Meta key array, merged with existing meta keys
 	 */
-	public function merge_content_meta_keys( $meta_keys = array(), $post_id = 0 ) {
-		return array_merge( $this->content_meta_keys, $meta_keys );
+	public function merge_content_meta_keys($meta_keys = array(), $post_id = 0) {
+		return array_merge($this->content_meta_keys, $meta_keys);
 	}
 
 }
\ No newline at end of file

includes/widgets/class-gravityview-widget.php

Doc Comments +3 added lines

@@ -51,6 +51,9 @@
 	// hold widget View options
 	private $widget_options;
 
+	/**
+	 * @param string $widget_id
+	 */
 	function __construct( $widget_label , $widget_id , $defaults = array(), $settings = array() ) {
 
 

Indentation +6 added lines, -6 removed lines

@@ -116,12 +116,12 @@
 		return $settings;
 	}
 
-    /**
-     * @return string
-     */
-    public function get_widget_id() {
-        return $this->widget_id;
-    }
+	/**
+	 * @return string
+	 */
+	public function get_widget_id() {
+		return $this->widget_id;
+	}
 
 	/**
 	 * Get the widget settings

Spacing +45 added lines, -45 removed lines

@@ -51,37 +51,37 @@ 
 	// hold widget View options
 	private $widget_options;
 
-	function __construct( $widget_label , $widget_id , $defaults = array(), $settings = array() ) {
+	function __construct($widget_label, $widget_id, $defaults = array(), $settings = array()) {
 
 
 		/**
 		 * The shortcode name is set to the lowercase name of the widget class, unless overridden by the class specifying a different value for $shortcode_name
 		 * @var string
 		 */
-		$this->shortcode_name = !isset( $this->shortcode_name ) ? strtolower( get_class($this) ) : $this->shortcode_name;
+		$this->shortcode_name = !isset($this->shortcode_name) ? strtolower(get_class($this)) : $this->shortcode_name;
 
 		$this->widget_label = $widget_label;
 		$this->widget_id = $widget_id;
-		$this->defaults = array_merge( array( 'header' => 0, 'footer' => 0 ), $defaults );
+		$this->defaults = array_merge(array('header' => 0, 'footer' => 0), $defaults);
 
 		// Make sure every widget has a title, even if empty
 		$this->settings = $this->get_default_settings();
-		$this->settings = wp_parse_args( $settings, $this->settings );
+		$this->settings = wp_parse_args($settings, $this->settings);
 
 		// register widgets to be listed in the View Configuration
-		add_filter( 'gravityview_register_directory_widgets', array( $this, 'register_widget') );
+		add_filter('gravityview_register_directory_widgets', array($this, 'register_widget'));
 
 		// widget options
-		add_filter( 'gravityview_template_widget_options', array( $this, 'assign_widget_options' ), 10, 3 );
+		add_filter('gravityview_template_widget_options', array($this, 'assign_widget_options'), 10, 3);
 
 		// frontend logic
-		add_action( "gravityview_render_widget_{$widget_id}", array( $this, 'render_frontend' ), 10, 1 );
+		add_action("gravityview_render_widget_{$widget_id}", array($this, 'render_frontend'), 10, 1);
 
 		// register shortcodes
-		add_action( 'wp', array( $this, 'add_shortcode') );
+		add_action('wp', array($this, 'add_shortcode'));
 
 		// Use shortcodes in text widgets.
-		add_filter('widget_text', array( $this, 'maybe_do_shortcode' ) );
+		add_filter('widget_text', array($this, 'maybe_do_shortcode'));
 	}
 
 
@@ -99,14 +99,14 @@ 
 		 * @param boolean $enable_custom_class False by default. Return true if you want to enable.
 		 * @param GravityView_Widget $this Current instance of GravityView_Widget
 		 */
-		$enable_custom_class = apply_filters('gravityview/widget/enable_custom_class', false, $this );
+		$enable_custom_class = apply_filters('gravityview/widget/enable_custom_class', false, $this);
 
-		if( $enable_custom_class ) {
+		if ($enable_custom_class) {
 
 			$settings['custom_class'] = array(
 				'type' => 'text',
-				'label' => __( 'Custom CSS Class:', 'gravityview' ),
-				'desc' => __( 'This class will be added to the widget container', 'gravityview'),
+				'label' => __('Custom CSS Class:', 'gravityview'),
+				'desc' => __('This class will be added to the widget container', 'gravityview'),
 				'value' => '',
 				'merge_tags' => true,
 			);
@@ -128,7 +128,7 @@ 
 	 * @return array|null   Settings array; NULL if not set
 	 */
 	public function get_settings() {
-		return !empty( $this->settings ) ? $this->settings : NULL;
+		return !empty($this->settings) ? $this->settings : NULL;
 	}
 
 	/**
@@ -136,11 +136,11 @@ 
 	 * @param  string $key Key for the setting
 	 * @return mixed|null      Value of the setting; NULL if not set
 	 */
-	public function get_setting( $key ) {
+	public function get_setting($key) {
 		$setting = NULL;
 
-		if( isset( $this->settings ) && is_array( $this->settings ) ) {
-			$setting = isset( $this->settings[ $key ] ) ? $this->settings[ $key ] : NULL;
+		if (isset($this->settings) && is_array($this->settings)) {
+			$setting = isset($this->settings[$key]) ? $this->settings[$key] : NULL;
 		}
 
 		return $setting;
@@ -152,20 +152,20 @@ 
 	 * @param  null|WP_Widget Empty if not called by WP_Widget, or a WP_Widget instance
 	 * @return string         Widget text
 	 */
-	function maybe_do_shortcode( $text, $widget = NULL ) {
+	function maybe_do_shortcode($text, $widget = NULL) {
 
-		if( !empty( $this->shortcode_name ) && has_shortcode( $text, $this->shortcode_name ) ) {
-			return do_shortcode( $text );
+		if (!empty($this->shortcode_name) && has_shortcode($text, $this->shortcode_name)) {
+			return do_shortcode($text);
 		}
 
 		return $text;
 	}
 
-	function render_shortcode( $atts, $content = '', $context = '' ) {
+	function render_shortcode($atts, $content = '', $context = '') {
 
 		ob_start();
 
-		$this->render_frontend( $atts, $content, $context );
+		$this->render_frontend($atts, $content, $context);
 
 		return ob_get_clean();
 	}
@@ -173,31 +173,31 @@ 
 	/**
 	 * Add $this->shortcode_name shortcode to output self::render_frontend()
 	 */
-	function add_shortcode( $run_on_singular = true ) {
+	function add_shortcode($run_on_singular = true) {
 		global $post;
 
-		if( GravityView_Plugin::is_admin() ) { return; }
+		if (GravityView_Plugin::is_admin()) { return; }
 
-		if( empty( $this->shortcode_name ) ) { return; }
+		if (empty($this->shortcode_name)) { return; }
 
 		// If the widget shouldn't output on single entries, don't show it
-		if( empty( $this->show_on_single ) && class_exists('GravityView_frontend') && GravityView_frontend::is_single_entry() ) {
-			do_action('gravityview_log_debug', sprintf( '%s[add_shortcode]: Skipping; set to not run on single entry.', get_class($this)) );
+		if (empty($this->show_on_single) && class_exists('GravityView_frontend') && GravityView_frontend::is_single_entry()) {
+			do_action('gravityview_log_debug', sprintf('%s[add_shortcode]: Skipping; set to not run on single entry.', get_class($this)));
 
-			add_shortcode( $this->shortcode_name, '__return_null' );
+			add_shortcode($this->shortcode_name, '__return_null');
 			return;
 		}
 
 
-		if( !has_gravityview_shortcode( $post ) ) {
+		if (!has_gravityview_shortcode($post)) {
 
-			do_action('gravityview_log_debug', sprintf( '%s[add_shortcode]: No shortcode present; not adding render_frontend shortcode.', get_class($this)) );
+			do_action('gravityview_log_debug', sprintf('%s[add_shortcode]: No shortcode present; not adding render_frontend shortcode.', get_class($this)));
 
-			add_shortcode( $this->shortcode_name, '__return_null' );
+			add_shortcode($this->shortcode_name, '__return_null');
 			return;
 		}
 
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
+		add_shortcode($this->shortcode_name, array($this, 'render_shortcode'));
 	}
 
 	/**
@@ -205,9 +205,9 @@ 
 	 * @param  array $widgets
 	 * @return array $widgets
 	 */
-	function register_widget( $widgets ) {
-		$widgets[ $this->widget_id ] = array(
-			'label' => $this->widget_label ,
+	function register_widget($widgets) {
+		$widgets[$this->widget_id] = array(
+			'label' => $this->widget_label,
 			'description' => $this->widget_description,
 			'subtitle' => $this->widget_subtitle,
 		);
@@ -222,10 +222,10 @@ 
 	 * @param string $template (default: '')
 	 * @return array
 	 */
-	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
+	public function assign_widget_options($options = array(), $template = '', $widget = '') {
 
-		if( $this->widget_id === $widget ) {
-			$options = array_merge( $options, $this->settings );
+		if ($this->widget_id === $widget) {
+			$options = array_merge($options, $this->settings);
 		}
 
 		return $options;
@@ -237,9 +237,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend($widget_args, $content = '', $context = '') {
 		// to be defined by child class
-		if( !$this->pre_render_frontend() ) {
+		if (!$this->pre_render_frontend()) {
 			return;
 		}
 	}
@@ -251,8 +251,8 @@ 
 	public function pre_render_frontend() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( empty( $gravityview_view ) ) {
-			do_action('gravityview_log_debug', sprintf( '%s[render_frontend]: $gravityview_view not instantiated yet.', get_class($this)) );
+		if (empty($gravityview_view)) {
+			do_action('gravityview_log_debug', sprintf('%s[render_frontend]: $gravityview_view not instantiated yet.', get_class($this)));
 			return false;
 		}
 
@@ -261,10 +261,10 @@ 
 		 * @param boolean $hide_until_searched Hide until search?
 		 * @param GravityView_Widget $this Widget instance
 		 */
-		$hide_until_search = apply_filters( 'gravityview/widget/hide_until_searched', $gravityview_view->hide_until_searched, $this );
+		$hide_until_search = apply_filters('gravityview/widget/hide_until_searched', $gravityview_view->hide_until_searched, $this);
 
-		if( $hide_until_search ) {
-			do_action('gravityview_log_debug', sprintf( '%s[render_frontend]: Hide View data until search is performed', get_class($this)) );
+		if ($hide_until_search) {
+			do_action('gravityview_log_debug', sprintf('%s[render_frontend]: Hide View data until search is performed', get_class($this)));
 			return false;
 		}
 

includes/widgets/search-widget/class-search-widget.php

Doc Comments +1 added lines, -1 removed lines

@@ -993,7 +993,7 @@
 	/**
 	 * Modify the array passed to wp_localize_script()
 	 *
-	 * @param array $js_localization The data padded to the Javascript file
+	 * @param array $localizations The data padded to the Javascript file
 	 * @param array $view_data View data array with View settings
 	 *
 	 * @return array

Indentation +10 added lines, -10 removed lines

@@ -384,16 +384,16 @@
 		$curr_start = esc_attr( rgget( 'gv_start' ) );
 		$curr_end = esc_attr( rgget( 'gv_end' ) );
 
-        /**
-         * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
-         * date_created is stored in UTC format. Convert search date into UTC (also used on templates/fields/date_created.php)
-         * @since 1.12
-         * @param[out,in] boolean $adjust_tz  Use timezone-adjusted datetime? If true, adjusts date based on blog's timezone setting. If false, uses UTC setting. Default: true
-         * @param[in] string $context Where the filter is being called from. `search` in this case.
-         */
-        $adjust_tz = apply_filters( 'gravityview_date_created_adjust_timezone', true, 'search' );
-        $search_criteria['start_date'] = ( $adjust_tz && !empty( $curr_start ) ) ? get_gmt_from_date( $curr_start ) : $curr_start;
-        $search_criteria['end_date'] = ( $adjust_tz  && !empty( $curr_end ) ) ? get_gmt_from_date( $curr_end ) : $curr_end;
+		/**
+		 * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
+		 * date_created is stored in UTC format. Convert search date into UTC (also used on templates/fields/date_created.php)
+		 * @since 1.12
+		 * @param[out,in] boolean $adjust_tz  Use timezone-adjusted datetime? If true, adjusts date based on blog's timezone setting. If false, uses UTC setting. Default: true
+		 * @param[in] string $context Where the filter is being called from. `search` in this case.
+		 */
+		$adjust_tz = apply_filters( 'gravityview_date_created_adjust_timezone', true, 'search' );
+		$search_criteria['start_date'] = ( $adjust_tz && !empty( $curr_start ) ) ? get_gmt_from_date( $curr_start ) : $curr_start;
+		$search_criteria['end_date'] = ( $adjust_tz  && !empty( $curr_end ) ) ? get_gmt_from_date( $curr_end ) : $curr_end;
 
 
 		// search for a specific entry ID

Spacing +234 added lines, -234 removed lines

@@ -9,7 +9,7 @@ 
  * @copyright Copyright 2014, Katz Web Services, Inc.
  */
 
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -22,28 +22,28 @@ 
 
 	public function __construct() {
 
-		$this->widget_description = esc_html__( 'Search form for searching entries.', 'gravityview' );
+		$this->widget_description = esc_html__('Search form for searching entries.', 'gravityview');
 
 		self::$instance = &$this;
 
-		self::$file = plugin_dir_path( __FILE__ );
+		self::$file = plugin_dir_path(__FILE__);
 
-		$default_values = array( 'header' => 0, 'footer' => 0 );
+		$default_values = array('header' => 0, 'footer' => 0);
 
 		$settings = array(
 			'search_layout' => array(
 				'type' => 'radio',
 				'full_width' => true,
-				'label' => esc_html__( 'Search Layout', 'gravityview' ),
+				'label' => esc_html__('Search Layout', 'gravityview'),
 				'value' => 'horizontal',
 				'options' => array(
-					'horizontal' => esc_html__( 'Horizontal', 'gravityview' ),
-					'vertical' => esc_html__( 'Vertical', 'gravityview' ),
+					'horizontal' => esc_html__('Horizontal', 'gravityview'),
+					'vertical' => esc_html__('Vertical', 'gravityview'),
 				),
 			),
 			'search_clear' => array(
 				'type' => 'checkbox',
-				'label' => __( 'Show Clear button', 'gravityview' ),
+				'label' => __('Show Clear button', 'gravityview'),
 				'value' => false,
 			),
 			'search_fields' => array(
@@ -55,33 +55,33 @@ 
 			'search_mode' => array(
 				'type' => 'radio',
 				'full_width' => true,
-				'label' => esc_html__( 'Search Mode', 'gravityview' ),
+				'label' => esc_html__('Search Mode', 'gravityview'),
 				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
 				'value' => 'any',
 				'class' => 'hide-if-js',
 				'options' => array(
-					'any' => esc_html__( 'Match Any Fields', 'gravityview' ),
-					'all' => esc_html__( 'Match All Fields', 'gravityview' ),
+					'any' => esc_html__('Match Any Fields', 'gravityview'),
+					'all' => esc_html__('Match All Fields', 'gravityview'),
 				),
 			),
 		);
-		parent::__construct( esc_html__( 'Search Bar', 'gravityview' ), 'search_bar', $default_values, $settings );
+		parent::__construct(esc_html__('Search Bar', 'gravityview'), 'search_bar', $default_values, $settings);
 
 		// frontend - filter entries
-		add_filter( 'gravityview_fe_search_criteria', array( $this, 'filter_entries' ), 10, 1 );
+		add_filter('gravityview_fe_search_criteria', array($this, 'filter_entries'), 10, 1);
 
 		// frontend - add template path
-		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
+		add_filter('gravityview_template_paths', array($this, 'add_template_path'));
 
 		// Add hidden fields for "Default" permalink structure
-		add_filter( 'gravityview_widget_search_filters', array( $this, 'add_no_permalink_fields' ), 10, 3 );
+		add_filter('gravityview_widget_search_filters', array($this, 'add_no_permalink_fields'), 10, 3);
 
 		// admin - add scripts - run at 1100 to make sure GravityView_Admin_Views::add_scripts_and_styles() runs first at 999
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 1100 );
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_scripts_and_styles'), 1100);
+		add_filter('gravityview_noconflict_scripts', array($this, 'register_no_conflict'));
 
 		// ajax - get the searchable fields
-		add_action( 'wp_ajax_gv_searchable_fields', array( 'GravityView_Widget_Search', 'get_searchable_fields' ) );
+		add_action('wp_ajax_gv_searchable_fields', array('GravityView_Widget_Search', 'get_searchable_fields'));
 
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return GravityView_Widget_Search
 	 */
 	public static function getInstance() {
-		if ( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new GravityView_Widget_Search;
 		}
 		return self::$instance;
@@ -100,18 +100,18 @@ 
 	 * Add script to Views edit screen (admin)
 	 * @param  mixed $hook
 	 */
-	public function add_scripts_and_styles( $hook ) {
+	public function add_scripts_and_styles($hook) {
 		global $pagenow;
 
 		// Don't process any scripts below here if it's not a GravityView page or the widgets screen
-		if ( ! gravityview_is_admin_page( $hook ) && ( 'widgets.php' !== $pagenow ) ) {
+		if (!gravityview_is_admin_page($hook) && ('widgets.php' !== $pagenow)) {
 			return;
 		}
 
-		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-		$script_source = empty( $script_min ) ? '/source' : '';
+		$script_min = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		$script_source = empty($script_min) ? '/source' : '';
 
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
+		wp_enqueue_script('gravityview_searchwidget_admin', plugins_url('assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__), array('jquery', 'gravityview_views_scripts'), GravityView_Plugin::version);
 
 
 		/**
@@ -120,15 +120,15 @@ 
 		 * @var array
 		 */
 		$input_labels = array(
-			'input_text' => esc_html__( 'Text', 'gravityview' ),
-			'date' => esc_html__( 'Date', 'gravityview' ),
-			'select' => esc_html__( 'Select', 'gravityview' ),
-			'multiselect' => esc_html__( 'Select (multiple values)', 'gravityview' ),
-			'radio' => esc_html__( 'Radio', 'gravityview' ),
-			'checkbox' => esc_html__( 'Checkbox', 'gravityview' ),
-			'single_checkbox' => esc_html__( 'Checkbox', 'gravityview' ),
-			'link' => esc_html__( 'Links', 'gravityview' ),
-			'date_range' => esc_html__( 'Date range', 'gravityview' ),
+			'input_text' => esc_html__('Text', 'gravityview'),
+			'date' => esc_html__('Date', 'gravityview'),
+			'select' => esc_html__('Select', 'gravityview'),
+			'multiselect' => esc_html__('Select (multiple values)', 'gravityview'),
+			'radio' => esc_html__('Radio', 'gravityview'),
+			'checkbox' => esc_html__('Checkbox', 'gravityview'),
+			'single_checkbox' => esc_html__('Checkbox', 'gravityview'),
+			'link' => esc_html__('Links', 'gravityview'),
+			'date_range' => esc_html__('Date range', 'gravityview'),
 		);
 
 		/**
@@ -137,32 +137,32 @@ 
 		 * @var array
 		 */
 		$input_types = array(
-			'text' => array( 'input_text' ),
-			'address' => array( 'input_text' ),
-			'date' => array( 'date', 'date_range' ),
-			'boolean' => array( 'single_checkbox' ),
-			'select' => array( 'select', 'radio', 'link' ),
-			'multi' => array( 'select', 'multiselect', 'radio', 'checkbox', 'link' ),
+			'text' => array('input_text'),
+			'address' => array('input_text'),
+			'date' => array('date', 'date_range'),
+			'boolean' => array('single_checkbox'),
+			'select' => array('select', 'radio', 'link'),
+			'multi' => array('select', 'multiselect', 'radio', 'checkbox', 'link'),
 		);
 
-		wp_localize_script( 'gravityview_searchwidget_admin', 'gvSearchVar', array(
-			'nonce' => wp_create_nonce( 'gravityview_ajaxsearchwidget' ),
-			'label_nofields' => esc_html__( 'No search fields configured yet.', 'gravityview' ),
-			'label_addfield' => esc_html__( 'Add Search Field', 'gravityview' ),
-			'label_label' => esc_html__( 'Label', 'gravityview' ),
-			'label_searchfield' => esc_html__( 'Search Field', 'gravityview' ),
-			'label_inputtype' => esc_html__( 'Input Type', 'gravityview' ),
-			'label_ajaxerror' => esc_html__( 'There was an error loading searchable fields. Save the View or refresh the page to fix this issue.', 'gravityview' ),
-			'input_labels' => json_encode( $input_labels ),
-			'input_types' => json_encode( $input_types ),
-		) );
+		wp_localize_script('gravityview_searchwidget_admin', 'gvSearchVar', array(
+			'nonce' => wp_create_nonce('gravityview_ajaxsearchwidget'),
+			'label_nofields' => esc_html__('No search fields configured yet.', 'gravityview'),
+			'label_addfield' => esc_html__('Add Search Field', 'gravityview'),
+			'label_label' => esc_html__('Label', 'gravityview'),
+			'label_searchfield' => esc_html__('Search Field', 'gravityview'),
+			'label_inputtype' => esc_html__('Input Type', 'gravityview'),
+			'label_ajaxerror' => esc_html__('There was an error loading searchable fields. Save the View or refresh the page to fix this issue.', 'gravityview'),
+			'input_labels' => json_encode($input_labels),
+			'input_types' => json_encode($input_types),
+		));
 
 	}
 
 	/**
 	 * Add admin script to the whitelist
 	 */
-	public function register_no_conflict( $required ) {
+	public function register_no_conflict($required) {
 		$required[] = 'gravityview_searchwidget_admin';
 		return $required;
 	}
@@ -176,31 +176,31 @@ 
 	 */
 	public static function get_searchable_fields() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
-			exit( '0' );
+		if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajaxsearchwidget')) {
+			exit('0');
 		}
 
 		$form = '';
 
 		// Fetch the form for the current View
-		if ( ! empty( $_POST['view_id'] ) ) {
+		if (!empty($_POST['view_id'])) {
 
-			$form = gravityview_get_form_id( $_POST['view_id'] );
+			$form = gravityview_get_form_id($_POST['view_id']);
 
-		} elseif ( ! empty( $_POST['formid'] ) ) {
+		} elseif (!empty($_POST['formid'])) {
 
-			$form = (int) $_POST['formid'];
+			$form = (int)$_POST['formid'];
 
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
+		} elseif (!empty($_POST['template_id']) && class_exists('GravityView_Ajax')) {
 
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
+			$form = GravityView_Ajax::pre_get_form_fields($_POST['template_id']);
 
 		}
 
 		// fetch form id assigned to the view
-		$response = self::render_searchable_fields( $form );
+		$response = self::render_searchable_fields($form);
 
-		exit( $response );
+		exit($response);
 	}
 
 	/**
@@ -209,14 +209,14 @@ 
 	 * @param  string $current (for future use)
 	 * @return string
 	 */
-	public static function render_searchable_fields( $form_id = null, $current = '' ) {
+	public static function render_searchable_fields($form_id = null, $current = '') {
 
-		if ( is_null( $form_id ) ) {
+		if (is_null($form_id)) {
 			return '';
 		}
 
 		// Get fields with sub-inputs and no parent
-		$fields = gravityview_get_form_fields( $form_id, true, true );
+		$fields = gravityview_get_form_fields($form_id, true, true);
 
 		// start building output
 
@@ -224,40 +224,40 @@ 
 
 		$custom_fields = array(
 			'search_all' => array(
-				'text' => esc_html__( 'Search Everything', 'gravityview' ),
+				'text' => esc_html__('Search Everything', 'gravityview'),
 				'type' => 'text',
 			),
 			'entry_date' => array(
-				'text' => esc_html__( 'Entry Date', 'gravityview' ),
+				'text' => esc_html__('Entry Date', 'gravityview'),
 				'type' => 'date',
 			),
 			'entry_id' => array(
-				'text' => esc_html__( 'Entry ID', 'gravityview' ),
+				'text' => esc_html__('Entry ID', 'gravityview'),
 				'type' => 'text',
 			),
 			'created_by' => array(
-				'text' => esc_html__( 'Entry Creator', 'gravityview' ),
+				'text' => esc_html__('Entry Creator', 'gravityview'),
 				'type' => 'select',
 			)
 		);
 
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
+		foreach ($custom_fields as $custom_field_key => $custom_field) {
+			$output .= sprintf('<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected($custom_field_key, $current, false), $custom_field['type'], self::get_field_label(array('field' => $custom_field_key)), $custom_field['text']);
 		}
 
-		if ( ! empty( $fields ) ) {
+		if (!empty($fields)) {
 
-			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'fileupload', 'post_image', 'post_id' ), null );
+			$blacklist_field_types = apply_filters('gravityview_blacklist_field_types', array('fileupload', 'post_image', 'post_id'), null);
 
-			foreach ( $fields as $id => $field ) {
+			foreach ($fields as $id => $field) {
 
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
+				if (in_array($field['type'], $blacklist_field_types)) {
 					continue;
 				}
 
-				$types = self::get_search_input_types( $id, $field['type'] );
+				$types = self::get_search_input_types($id, $field['type']);
 
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
+				$output .= '<option value="'.$id.'" '.selected($id, $current, false).'data-inputtypes="'.esc_attr($types).'">'.esc_html($field['label']).'</option>';
 			}
 		}
 
@@ -276,21 +276,21 @@ 
 	 *
 	 * @return string GV field search input type ('multi', 'boolean', 'select', 'date', 'text')
 	 */
-	public static function get_search_input_types( $id = '', $field_type = null ) {
+	public static function get_search_input_types($id = '', $field_type = null) {
 
 		// @todo - This needs to be improved - many fields have . including products and addresses
-		if ( false !== strpos( (string) $id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
+		if (false !== strpos((string)$id, '.') && in_array($field_type, array('checkbox')) || in_array($id, array('is_fulfilled'))) {
 			// on/off checkbox
 			$input_type = 'boolean';
-		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
+		} elseif (in_array($field_type, array('checkbox', 'post_category', 'multiselect'))) {
 			//multiselect
 			$input_type = 'multi';
 
-		} elseif ( in_array( $field_type, array( 'select', 'radio' ) ) ) {
+		} elseif (in_array($field_type, array('select', 'radio'))) {
 			//single select
 			$input_type = 'select';
 
-		} elseif ( in_array( $field_type, array( 'date' ) ) || in_array( $id, array( 'payment_date' ) ) ) {
+		} elseif (in_array($field_type, array('date')) || in_array($id, array('payment_date'))) {
 			// date
 			$input_type = 'date';
 		} else {
@@ -304,7 +304,7 @@ 
 		 * @param string $field_type Gravity Forms field type
 		 * @since 1.2
 		 */
-		$input_type = apply_filters( 'gravityview/extension/search/input_type', $input_type, $field_type );
+		$input_type = apply_filters('gravityview/extension/search/input_type', $input_type, $field_type);
 
 		return $input_type;
 	}
@@ -315,29 +315,29 @@ 
 	 * @since 1.8
 	 * @return array Search fields, modified if not using permalinks
 	 */
-	public function add_no_permalink_fields( $search_fields, $object, $widget_args = array() ) {
+	public function add_no_permalink_fields($search_fields, $object, $widget_args = array()) {
 		/** @global WP_Rewrite $wp_rewrite */
 		global $wp_rewrite;
 
 		// Support default permalink structure
-		if ( false === $wp_rewrite->using_permalinks() ) {
+		if (false === $wp_rewrite->using_permalinks()) {
 
 			// By default, use current post.
 			$post_id = 0;
 
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
-			if ( ! empty( $widget_args['post_id'] ) ) {
-				$post_id = absint( $widget_args['post_id'] );
+			if (!empty($widget_args['post_id'])) {
+				$post_id = absint($widget_args['post_id']);
 			}
 			// We're in the WordPress Widget context, and the base View ID should be used
-			else if ( ! empty( $widget_args['view_id'] ) ) {
-				$post_id = absint( $widget_args['view_id'] );
+			else if (!empty($widget_args['view_id'])) {
+				$post_id = absint($widget_args['view_id']);
 			}
 
-			$args = gravityview_get_permalink_query_args( $post_id );
+			$args = gravityview_get_permalink_query_args($post_id);
 
 			// Add hidden fields to the search form
-			foreach ( $args as $key => $value ) {
+			foreach ($args as $key => $value) {
 				$search_fields[] = array(
 					'name'  => $key,
 					'input' => 'hidden',
@@ -357,23 +357,23 @@ 
 	 * @param  array $search_criteria
 	 * @return array
 	 */
-	public function filter_entries( $search_criteria ) {
+	public function filter_entries($search_criteria) {
 
-		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Requested $_GET: ', get_class( $this ) ), $_GET );
+		do_action('gravityview_log_debug', sprintf('%s[filter_entries] Requested $_GET: ', get_class($this)), $_GET);
 
-		if ( empty( $_GET ) || ! is_array( $_GET ) ) {
+		if (empty($_GET) || !is_array($_GET)) {
 			return $search_criteria;
 		}
 
 		// add free search
-		if ( ! empty( $_GET['gv_search'] ) ) {
+		if (!empty($_GET['gv_search'])) {
 
 			// Search for a piece
-			$words = explode( ' ', stripslashes_deep( urldecode( $_GET['gv_search'] ) ) );
+			$words = explode(' ', stripslashes_deep(urldecode($_GET['gv_search'])));
 
-			$words = array_filter( $words );
+			$words = array_filter($words);
 
-			foreach ( $words as $word ) {
+			foreach ($words as $word) {
 				$search_criteria['field_filters'][] = array(
 					'key' => null, // The field ID to search
 					'value' => $word, // The value to search
@@ -383,8 +383,8 @@ 
 		}
 
 		//start date & end date
-		$curr_start = esc_attr( rgget( 'gv_start' ) );
-		$curr_end = esc_attr( rgget( 'gv_end' ) );
+		$curr_start = esc_attr(rgget('gv_start'));
+		$curr_end = esc_attr(rgget('gv_end'));
 
         /**
          * @filter `gravityview_date_created_adjust_timezone` Whether to adjust the timezone for entries. \n
@@ -393,51 +393,51 @@ 
          * @param[out,in] boolean $adjust_tz  Use timezone-adjusted datetime? If true, adjusts date based on blog's timezone setting. If false, uses UTC setting. Default: true
          * @param[in] string $context Where the filter is being called from. `search` in this case.
          */
-        $adjust_tz = apply_filters( 'gravityview_date_created_adjust_timezone', true, 'search' );
-        $search_criteria['start_date'] = ( $adjust_tz && !empty( $curr_start ) ) ? get_gmt_from_date( $curr_start ) : $curr_start;
-        $search_criteria['end_date'] = ( $adjust_tz  && !empty( $curr_end ) ) ? get_gmt_from_date( $curr_end ) : $curr_end;
+        $adjust_tz = apply_filters('gravityview_date_created_adjust_timezone', true, 'search');
+        $search_criteria['start_date'] = ($adjust_tz && !empty($curr_start)) ? get_gmt_from_date($curr_start) : $curr_start;
+        $search_criteria['end_date'] = ($adjust_tz && !empty($curr_end)) ? get_gmt_from_date($curr_end) : $curr_end;
 
 
 		// search for a specific entry ID
-		if ( ! empty( $_GET[ 'gv_id' ] ) ) {
+		if (!empty($_GET['gv_id'])) {
 			$search_criteria['field_filters'][] = array(
 				'key' => 'id',
-				'value' => absint( $_GET[ 'gv_id' ] ),
+				'value' => absint($_GET['gv_id']),
 				'operator' => '=',
 			);
 		}
 
 		// search for a specific Created_by ID
-		if ( ! empty( $_GET[ 'gv_by' ] ) ) {
+		if (!empty($_GET['gv_by'])) {
 			$search_criteria['field_filters'][] = array(
 				'key' => 'created_by',
-				'value' => absint( $_GET['gv_by'] ),
+				'value' => absint($_GET['gv_by']),
 				'operator' => '=',
 			);
 		}
 
 
 		// Get search mode passed in URL
-		$mode = in_array( rgget( 'mode' ), array( 'any', 'all' ) ) ? esc_attr( rgget( 'mode' ) ) : 'any';
+		$mode = in_array(rgget('mode'), array('any', 'all')) ? esc_attr(rgget('mode')) : 'any';
 
 		// get the other search filters
-		foreach ( $_GET as $key => $value ) {
+		foreach ($_GET as $key => $value) {
 
-			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[0] ) ) ) {
+			if (0 !== strpos($key, 'filter_') || empty($value) || (is_array($value) && count($value) === 1 && empty($value[0]))) {
 				continue;
 			}
 
 			// could return simple filter or multiple filters
-			$filter = $this->prepare_field_filter( $key, $value );
+			$filter = $this->prepare_field_filter($key, $value);
 
-			if ( isset( $filter[0]['value'] ) ) {
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
+			if (isset($filter[0]['value'])) {
+				$search_criteria['field_filters'] = array_merge($search_criteria['field_filters'], $filter);
 
 				// if date range type, set search mode to ALL
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>', '<' ) ) ) {
+				if (!empty($filter[0]['operator']) && in_array($filter[0]['operator'], array('>', '<'))) {
 					$mode = 'all';
 				}
-			} elseif( !empty( $filter ) ) {
+			} elseif (!empty($filter)) {
 				$search_criteria['field_filters'][] = $filter;
 			}
 		}
@@ -447,9 +447,9 @@ 
 		 * @since 1.5.1
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
 		 */
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
+		$search_criteria['field_filters']['mode'] = apply_filters('gravityview/search/mode', $mode);
 
-		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
+		do_action('gravityview_log_debug', sprintf('%s[filter_entries] Returned Search Criteria: ', get_class($this)), $search_criteria);
 
 		return $search_criteria;
 	}
@@ -464,16 +464,16 @@ 
 	 * @param  string $value $_GET search value
 	 * @return array        1 or 2 deph levels
 	 */
-	public function prepare_field_filter( $key, $value ) {
+	public function prepare_field_filter($key, $value) {
 
 		$gravityview_view = GravityView_View::getInstance();
 
 		// calculates field_id, removing 'filter_' and for '_' for advanced fields ( like name or checkbox )
-		$field_id = str_replace( '_', '.', str_replace( 'filter_', '', $key ) );
+		$field_id = str_replace('_', '.', str_replace('filter_', '', $key));
 
 		// get form field array
 		$form = $gravityview_view->getForm();
-		$form_field = gravityview_get_field( $form, $field_id );
+		$form_field = gravityview_get_field($form, $field_id);
 
 		// default filter array
 		$filter = array(
@@ -481,7 +481,7 @@ 
 			'value' => $value,
 		);
 
-		switch ( $form_field['type'] ) {
+		switch ($form_field['type']) {
 
 			case 'select':
 			case 'radio':
@@ -490,18 +490,18 @@ 
 
 			case 'post_category':
 
-				if ( ! is_array( $value ) ) {
-					$value = array( $value );
+				if (!is_array($value)) {
+					$value = array($value);
 				}
 
 				// Reset filter variable
 				$filter = array();
 
-				foreach ( $value as $val ) {
-					$cat = get_term( $val, 'category' );
+				foreach ($value as $val) {
+					$cat = get_term($val, 'category');
 					$filter[] = array(
 						'key' => $field_id,
-						'value' => esc_attr( $cat->name ) . ':' . $val,
+						'value' => esc_attr($cat->name).':'.$val,
 						'operator' => 'is',
 					);
 				}
@@ -510,35 +510,35 @@ 
 
 			case 'multiselect':
 
-				if ( ! is_array( $value ) ) {
+				if (!is_array($value)) {
 					break;
 				}
 
 				// Reset filter variable
 				$filter = array();
 
-				foreach ( $value as $val ) {
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
+				foreach ($value as $val) {
+					$filter[] = array('key' => $field_id, 'value' => $val);
 				}
 
 				break;
 
 			case 'checkbox':
 				// convert checkbox on/off into the correct search filter
-				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) {
-					foreach ( $form_field['inputs'] as $k => $input ) {
-						if ( $input['id'] == $field_id ) {
-							$filter['value'] = $form_field['choices'][ $k ]['value'];
+				if (false !== strpos($field_id, '.') && !empty($form_field['inputs']) && !empty($form_field['choices'])) {
+					foreach ($form_field['inputs'] as $k => $input) {
+						if ($input['id'] == $field_id) {
+							$filter['value'] = $form_field['choices'][$k]['value'];
 							$filter['operator'] = 'is';
 							break;
 						}
 					}
-				} elseif ( is_array( $value ) ) {
+				} elseif (is_array($value)) {
 
 					// Reset filter variable
 					$filter = array();
 
-					foreach ( $value as $val ) {
+					foreach ($value as $val) {
 						$filter[] = array(
 								'key'   => $field_id,
 								'value' => $val,
@@ -552,13 +552,13 @@ 
 			case 'name':
 			case 'address':
 
-				if ( false === strpos( $field_id, '.' ) ) {
+				if (false === strpos($field_id, '.')) {
 
-					$words = explode( ' ', $value );
+					$words = explode(' ', $value);
 
 					$filters = array();
-					foreach ( $words as $word ) {
-						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
+					foreach ($words as $word) {
+						if (!empty($word) && strlen($word) > 1) {
 							// Keep the same key for each filter
 							$filter['value'] = $word;
 							// Add a search for the value
@@ -573,25 +573,25 @@ 
 
 			case 'date':
 
-				if ( is_array( $value ) ) {
+				if (is_array($value)) {
 
 					// Reset filter variable
 					$filter = array();
 
-					foreach ( $value as $k => $date ) {
-						if ( empty( $date ) ) {
+					foreach ($value as $k => $date) {
+						if (empty($date)) {
 							continue;
 						}
 						$operator = 'start' === $k ? '>' : '<';
 
 						$filter[] = array(
 							'key' => $field_id,
-							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
+							'value' => self::get_formatted_date($date, 'Y-m-d'),
 							'operator' => $operator,
 						);
 					}
 				} else {
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
+					$filter['value'] = self::get_formatted_date($value, 'Y-m-d');
 				}
 
 				break;
@@ -610,7 +610,7 @@ 
 	 *
 	 * @return string Format of the date in the database
 	 */
-	public static function get_date_field_format( GF_Field_Date $field ) {
+	public static function get_date_field_format(GF_Field_Date $field) {
 		$format = 'm/d/Y';
 		$datepicker = array(
 			'mdy' => 'm/d/Y',
@@ -622,8 +622,8 @@ 
 			'ymd_dot' => 'Y.m.d',
 		);
 
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
-			$format = $datepicker[ $field->dateFormat ];
+		if (!empty($field->dateFormat) && isset($datepicker[$field->dateFormat])) {
+			$format = $datepicker[$field->dateFormat];
 		}
 
 		return $format;
@@ -636,13 +636,13 @@ 
 	 * @param string $format Wanted formatted date
 	 * @return string
 	 */
-	public static function get_formatted_date( $value = '', $format = 'Y-m-d' ) {
-		$date = date_create( $value );
-		if ( empty( $date ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s[get_formatted_date] Date format not valid: ', get_class( self::$instance ) ), $value );
+	public static function get_formatted_date($value = '', $format = 'Y-m-d') {
+		$date = date_create($value);
+		if (empty($date)) {
+			do_action('gravityview_log_debug', sprintf('%s[get_formatted_date] Date format not valid: ', get_class(self::$instance)), $value);
 			return '';
 		}
-		return $date->format( $format );
+		return $date->format($format);
 	}
 
 
@@ -650,10 +650,10 @@ 
 	 * Include this extension templates path
 	 * @param array $file_paths List of template paths ordered
 	 */
-	public function add_template_path( $file_paths ) {
+	public function add_template_path($file_paths) {
 
 		// Index 100 is the default GravityView template path.
-		$file_paths[102] = self::$file . 'templates/';
+		$file_paths[102] = self::$file.'templates/';
 
 		return $file_paths;
 	}
@@ -665,50 +665,50 @@ 
 	 * @param type $context
 	 * @return type
 	 */
-	public function render_frontend( $widget_args, $content = '', $context = '' ) {
+	public function render_frontend($widget_args, $content = '', $context = '') {
 		/** @var GravityView_View $gravityview_view */
 		$gravityview_view = GravityView_View::getInstance();
 
-		if ( empty( $gravityview_view ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend]: $gravityview_view not instantiated yet.', get_class( $this ) ) );
+		if (empty($gravityview_view)) {
+			do_action('gravityview_log_debug', sprintf('%s[render_frontend]: $gravityview_view not instantiated yet.', get_class($this)));
 			return;
 		}
 
 		// get configured search fields
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
+		$search_fields = !empty($widget_args['search_fields']) ? json_decode($widget_args['search_fields'], true) : '';
 
-		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
-			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
+		if (empty($search_fields) || !is_array($search_fields)) {
+			do_action('gravityview_log_debug', sprintf('%s[render_frontend] No search fields configured for widget:', get_class($this)), $widget_args);
 			return;
 		}
 
 		$has_date = false;
 
 		// prepare fields
-		foreach ( $search_fields as $k => $field ) {
+		foreach ($search_fields as $k => $field) {
 
 			$updated_field = $field;
 
-			if ( in_array( $field['input'], array( 'date', 'date_range' ) ) ) {
+			if (in_array($field['input'], array('date', 'date_range'))) {
 				$has_date = true;
 			}
 
-			$updated_field = $this->get_search_filter_details( $updated_field );
+			$updated_field = $this->get_search_filter_details($updated_field);
 
-			switch ( $field['field'] ) {
+			switch ($field['field']) {
 
 				case 'search_all':
 					$updated_field['key'] = 'search_all';
 					$updated_field['input'] = 'search_all';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
+					$updated_field['value'] = esc_attr(stripslashes_deep(rgget('gv_search')));
 					break;
 
 				case 'entry_date':
 					$updated_field['key'] = 'entry_date';
 					$updated_field['input'] = 'entry_date';
 					$updated_field['value'] = array(
-						'start' => esc_attr( stripslashes_deep( rgget( 'gv_start' ) ) ),
-						'end' => esc_attr( stripslashes_deep( rgget( 'gv_end' ) ) ),
+						'start' => esc_attr(stripslashes_deep(rgget('gv_start'))),
+						'end' => esc_attr(stripslashes_deep(rgget('gv_end'))),
 					);
 					$has_date = true;
 					break;
@@ -716,21 +716,21 @@ 
 				case 'entry_id':
 					$updated_field['key'] = 'entry_id';
 					$updated_field['input'] = 'entry_id';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
+					$updated_field['value'] = esc_attr(stripslashes_deep(rgget('gv_id')));
 					break;
 
 				case 'created_by':
 					$updated_field['key'] = 'created_by';
 					$updated_field['name'] = 'gv_by';
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
+					$updated_field['value'] = esc_attr(stripslashes_deep(rgget('gv_by')));
 					$updated_field['choices'] = self::get_created_by_choices();
 					break;
 			}
 
-			$search_fields[ $k ] = $updated_field;
+			$search_fields[$k] = $updated_field;
 		}
 
-		do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] Calculated Search Fields: ', get_class( $this ) ), $search_fields );
+		do_action('gravityview_log_debug', sprintf('%s[render_frontend] Calculated Search Fields: ', get_class($this)), $search_fields);
 
 		/**
 		 * @filter `gravityview_widget_search_filters` Modify what fields are shown. The order of the fields in the $search_filters array controls the order as displayed in the search bar widget.
@@ -739,25 +739,25 @@ 
 		 * @param array $widget_args Args passed to this method. {@since 1.8}
 		 * @var array
 		 */
-		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args );
+		$gravityview_view->search_fields = apply_filters('gravityview_widget_search_filters', $search_fields, $this, $widget_args);
 
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
+		$gravityview_view->search_layout = !empty($widget_args['search_layout']) ? $widget_args['search_layout'] : 'horizontal';
 
 		/** @since 1.14 */
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
+		$gravityview_view->search_mode = !empty($widget_args['search_mode']) ? $widget_args['search_mode'] : 'any';
 
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$custom_class = !empty($widget_args['custom_class']) ? $widget_args['custom_class'] : '';
 
-		$gravityview_view->search_class = self::get_search_class( $custom_class );
+		$gravityview_view->search_class = self::get_search_class($custom_class);
 
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
+		$gravityview_view->search_clear = !empty($widget_args['search_clear']) ? $widget_args['search_clear'] : false;
 
-		if ( $has_date ) {
+		if ($has_date) {
 			// enqueue datepicker stuff only if needed!
 			$this->enqueue_datepicker();
 		}
 
-		$gravityview_view->render( 'widget', 'search', false );
+		$gravityview_view->render('widget', 'search', false);
 	}
 
 	/**
@@ -767,12 +767,12 @@ 
 	 *
 	 * @return string Sanitized CSS class for the search form
 	 */
-	public static function get_search_class( $custom_class = '' ) {
+	public static function get_search_class($custom_class = '') {
 		$gravityview_view = GravityView_View::getInstance();
 
 		$search_class = 'gv-search-'.$gravityview_view->search_layout;
 
-		if ( ! empty( $custom_class )  ) {
+		if (!empty($custom_class)) {
 			$search_class .= ' '.$custom_class;
 		}
 
@@ -781,12 +781,12 @@ 
 		 *
 		 * @param string $search_class The CSS class for the search form
 		 */
-		$search_class = apply_filters( 'gravityview_search_class', $search_class );
+		$search_class = apply_filters('gravityview_search_class', $search_class);
 
 		// Is there an active search being performed? Used by fe-views.js
 		$search_class .= GravityView_frontend::getInstance()->isSearch() ? ' gv-is-search' : '';
 
-		return gravityview_sanitize_html_class( $search_class );
+		return gravityview_sanitize_html_class($search_class);
 	}
 
 
@@ -801,9 +801,9 @@ 
 
 		$post_id = $gravityview_view->getPostId() ? $gravityview_view->getPostId() : $gravityview_view->getViewId();
 
-		$url = add_query_arg( array(), get_permalink( $post_id ) );
+		$url = add_query_arg(array(), get_permalink($post_id));
 
-		return esc_url( $url );
+		return esc_url($url);
 	}
 
 	/**
@@ -812,42 +812,42 @@ 
 	 * @param  array $form_field Form field data, as fetched by `gravityview_get_field()`
 	 * @return string             Label for the search form
 	 */
-	private static function get_field_label( $field, $form_field = array() ) {
+	private static function get_field_label($field, $form_field = array()) {
 
-		$label = rgget( 'label', $field );
+		$label = rgget('label', $field);
 
-		if( '' === $label ) {
+		if ('' === $label) {
 
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
+			$label = isset($form_field['label']) ? $form_field['label'] : '';
 
-			switch( $field['field'] ) {
+			switch ($field['field']) {
 				case 'search_all':
-					$label = __( 'Search Entries:', 'gravityview' );
+					$label = __('Search Entries:', 'gravityview');
 					break;
 				case 'entry_date':
-					$label = __( 'Filter by date:', 'gravityview' );
+					$label = __('Filter by date:', 'gravityview');
 					break;
 				case 'entry_id':
-					$label = __( 'Entry ID:', 'gravityview' );
+					$label = __('Entry ID:', 'gravityview');
 					break;
 				case 'created_by':
-					$label = __( 'Submitted by:', 'gravityview' );
+					$label = __('Submitted by:', 'gravityview');
 					break;
 				case 'is_fulfilled':
-					$label = __( 'Is Fulfilled', 'gravityview' );
+					$label = __('Is Fulfilled', 'gravityview');
 					break;
 				default:
 					// If this is a field input, not a field
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
+					if (strpos($field['field'], '.') > 0 && !empty($form_field['inputs'])) {
 
 						// Get the label for the field in question, which returns an array
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
+						$items = wp_list_filter($form_field['inputs'], array('id' => $field['field']));
 
 						// Get the item with the `label` key
-						$values = wp_list_pluck( $items, 'label' );
+						$values = wp_list_pluck($items, 'label');
 
 						// There will only one item in the array, but this is easier
-						foreach ( $values as $value ) {
+						foreach ($values as $value) {
 							$label = $value;
 							break;
 						}
@@ -860,7 +860,7 @@ 
 		 * @param[in,out] string $label Existing label text, sanitized.
 		 * @param[in] array $form_field Gravity Forms field array, as returned by `GFFormsModel::get_field()`
 		 */
-		$label = apply_filters( 'gravityview_search_field_label', esc_attr( $label ), $form_field );
+		$label = apply_filters('gravityview_search_field_label', esc_attr($label), $form_field);
 
 		return $label;
 	}
@@ -871,39 +871,39 @@ 
 	 * @param array $field
 	 * @return array
 	 */
-	private function get_search_filter_details( $field ) {
+	private function get_search_filter_details($field) {
 
 		$gravityview_view = GravityView_View::getInstance();
 
 		$form = $gravityview_view->getForm();
 
 		// for advanced field ids (eg, first name / last name )
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
+		$name = 'filter_'.str_replace('.', '_', $field['field']);
 
 		// get searched value from $_GET (string or array)
-		$value = rgget( $name );
+		$value = rgget($name);
 
 		// get form field details
-		$form_field = gravityview_get_field( $form, $field['field'] );
+		$form_field = gravityview_get_field($form, $field['field']);
 
 		$filter = array(
 			'key' => $field['field'],
 			'name' => $name,
-			'label' => self::get_field_label( $field, $form_field ),
+			'label' => self::get_field_label($field, $form_field),
 			'input' => $field['input'],
 			'value' => $value,
 			'type' => $form_field['type'],
 		);
 
 		// collect choices
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
+		if ('post_category' === $form_field['type'] && !empty($form_field['displayAllCategories']) && empty($form_field['choices'])) {
 			$filter['choices'] = gravityview_get_terms_choices();
-		} elseif ( ! empty( $form_field['choices'] ) ) {
+		} elseif (!empty($form_field['choices'])) {
 			$filter['choices'] = $form_field['choices'];
 		}
 
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
-			$filter['value'] = array( 'start' => '', 'end' => '' );
+		if ('date_range' === $field['input'] && empty($value)) {
+			$filter['value'] = array('start' => '', 'end' => '');
 		}
 
 		return $filter;
@@ -923,10 +923,10 @@ 
 		 * filter gravityview/get_users/search_widget
 		 * @see \GVCommon::get_users
 		 */
-		$users = GVCommon::get_users( 'search_widget', array( 'fields' => array( 'ID', 'display_name' ) ) );
+		$users = GVCommon::get_users('search_widget', array('fields' => array('ID', 'display_name')));
 
 		$choices = array();
-		foreach ( $users as $user ) {
+		foreach ($users as $user) {
 			$choices[] = array(
 				'value' => $user->ID,
 				'text' => $user->display_name,
@@ -944,11 +944,11 @@ 
 	public static function the_clear_search_button() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		if ( $gravityview_view->search_clear ) {
+		if ($gravityview_view->search_clear) {
 
-			$url = strtok( add_query_arg( array() ), '?' );
+			$url = strtok(add_query_arg(array()), '?');
 
-			echo gravityview_get_link( $url, esc_html__( 'Clear', 'gravityview' ), 'class=button gv-search-clear' );
+			echo gravityview_get_link($url, esc_html__('Clear', 'gravityview'), 'class=button gv-search-clear');
 
 		}
 	}
@@ -959,7 +959,7 @@ 
 	 * Require the datepicker script for the frontend GV script
 	 * @param array $js_dependencies Array of existing required scripts for the fe-views.js script
 	 */
-	public function add_datepicker_js_dependency( $js_dependencies ) {
+	public function add_datepicker_js_dependency($js_dependencies) {
 
 		$js_dependencies[] = 'jquery-ui-datepicker';
 
@@ -974,7 +974,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_datepicker_localization( $localizations = array(), $view_data = array() ) {
+	public function add_datepicker_localization($localizations = array(), $view_data = array()) {
 		global $wp_locale;
 
 		/**
@@ -984,26 +984,26 @@ 
 		 * @param array $js_localization The data padded to the Javascript file
 		 * @param array $view_data View data array with View settings
 		 */
-		$datepicker_settings = apply_filters( 'gravityview_datepicker_settings', array(
+		$datepicker_settings = apply_filters('gravityview_datepicker_settings', array(
 			'yearRange' => '-5:+5',
 			'changeMonth' => true,
 			'changeYear' => true,
-			'closeText' => esc_attr_x( 'Close', 'Close calendar', 'gravityview' ),
-			'prevText' => esc_attr_x( 'Prev', 'Previous month in calendar', 'gravityview' ),
-			'nextText' => esc_attr_x( 'Next', 'Next month in calendar', 'gravityview' ),
-			'currentText' => esc_attr_x( 'Today', 'Today in calendar', 'gravityview' ),
-			'weekHeader' => esc_attr_x( 'Week', 'Week in calendar', 'gravityview' ),
-			'monthStatus'       => __( 'Show a different month', 'gravityview' ),
-			'monthNames'        => array_values( $wp_locale->month ),
-			'monthNamesShort'   => array_values( $wp_locale->month_abbrev ),
-			'dayNames'          => array_values( $wp_locale->weekday ),
-			'dayNamesShort'     => array_values( $wp_locale->weekday_abbrev ),
-			'dayNamesMin'       => array_values( $wp_locale->weekday_initial ),
+			'closeText' => esc_attr_x('Close', 'Close calendar', 'gravityview'),
+			'prevText' => esc_attr_x('Prev', 'Previous month in calendar', 'gravityview'),
+			'nextText' => esc_attr_x('Next', 'Next month in calendar', 'gravityview'),
+			'currentText' => esc_attr_x('Today', 'Today in calendar', 'gravityview'),
+			'weekHeader' => esc_attr_x('Week', 'Week in calendar', 'gravityview'),
+			'monthStatus'       => __('Show a different month', 'gravityview'),
+			'monthNames'        => array_values($wp_locale->month),
+			'monthNamesShort'   => array_values($wp_locale->month_abbrev),
+			'dayNames'          => array_values($wp_locale->weekday),
+			'dayNamesShort'     => array_values($wp_locale->weekday_abbrev),
+			'dayNamesMin'       => array_values($wp_locale->weekday_initial),
 			// get the start of week from WP general setting
-			'firstDay'          => get_option( 'start_of_week' ),
+			'firstDay'          => get_option('start_of_week'),
 			// is Right to left language? default is false
 			'isRTL'             => is_rtl(),
-		), $view_data );
+		), $view_data);
 
 		$localizations['datepicker'] = $datepicker_settings;
 
@@ -1022,13 +1022,13 @@ 
 	public function enqueue_datepicker() {
 		$gravityview_view = GravityView_View::getInstance();
 
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_enqueue_script('jquery-ui-datepicker');
 
-		add_filter( 'gravityview_js_dependencies', array( $this, 'add_datepicker_js_dependency' ) );
-		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
+		add_filter('gravityview_js_dependencies', array($this, 'add_datepicker_js_dependency'));
+		add_filter('gravityview_js_localization', array($this, 'add_datepicker_localization'), 10, 2);
 
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
+		wp_enqueue_style('jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css');
 
 		/**
 		 * @filter `gravityview_search_datepicker_class`
@@ -1043,7 +1043,7 @@ 
 		 * - `ymd_dash` (yyyy-mm-dd)
 		 * - `ymp_dot` (yyyy.mm.dd)
 		 */
-		$datepicker_class = apply_filters( 'gravityview_search_datepicker_class', 'gv-datepicker datepicker mdy' );
+		$datepicker_class = apply_filters('gravityview_search_datepicker_class', 'gv-datepicker datepicker mdy');
 
 		$gravityview_view->datepicker_class = $datepicker_class;
 

includes/wordpress-widgets/class-gravityview-recent-entries-widget.php

Doc Comments +1 added lines

@@ -176,6 +176,7 @@
 	 * Get the entries that will be shown in the current widget
 	 *
 	 * @param  array $instance Settings for the current widget
+	 * @param string $form_id
 	 *
 	 * @return array $entries Multidimensional array of Gravity Forms entries
 	 */

Spacing +82 added lines, -82 removed lines

@@ -15,19 +15,19 @@ 
 		$name = __('GravityView Recent Entries', 'gravityview');
 
 		$widget_options = array(
-			'description' => __( 'Display the most recent entries for a View', 'gravityview' ),
+			'description' => __('Display the most recent entries for a View', 'gravityview'),
 		);
 
-		parent::__construct( 'gv_recent_entries', $name, $widget_options );
+		parent::__construct('gv_recent_entries', $name, $widget_options);
 
 		$this->initialize();
 	}
 
 	private function initialize() {
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
+		add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 
-		add_action( 'wp_ajax_gv_get_view_merge_tag_data', array( $this, 'ajax_get_view_merge_tag_data' ) );
+		add_action('wp_ajax_gv_get_view_merge_tag_data', array($this, 'ajax_get_view_merge_tag_data'));
 
 	}
 
@@ -38,13 +38,13 @@ 
 	 */
 	function ajax_get_view_merge_tag_data() {
 
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajax_widget' ) ) {
-			exit( false );
+		if (!isset($_POST['nonce']) || !wp_verify_nonce($_POST['nonce'], 'gravityview_ajax_widget')) {
+			exit(false);
 		}
 
-		$form_id  = gravityview_get_form_id( $_POST['view_id'] );
+		$form_id = gravityview_get_form_id($_POST['view_id']);
 
-		$form = RGFormsModel::get_form_meta( $form_id );
+		$form = RGFormsModel::get_form_meta($form_id);
 
 		$output = array(
 			'form' => array(
@@ -52,10 +52,10 @@ 
 				'title' => $form['title'],
 				'fields' => $form['fields'],
 			),
-			'mergeTags' => GFCommon::get_merge_tags( $form['fields'], '', false ),
+			'mergeTags' => GFCommon::get_merge_tags($form['fields'], '', false),
 		);
 
-		echo json_encode( $output );
+		echo json_encode($output);
 
 		exit;
 	}
@@ -68,19 +68,19 @@ 
 	function admin_enqueue_scripts() {
 		global $pagenow;
 
-		if( $pagenow === 'widgets.php' ) {
+		if ($pagenow === 'widgets.php') {
 
 			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 			GravityView_Admin_Views::enqueue_gravity_forms_scripts();
 
-			wp_enqueue_script( 'gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery', 'gform_gravityforms' ), GravityView_Plugin::version );
+			wp_enqueue_script('gravityview_widgets', plugins_url('assets/js/admin-widgets'.$script_debug.'.js', GRAVITYVIEW_FILE), array('jquery', 'gform_gravityforms'), GravityView_Plugin::version);
 
-			wp_localize_script( 'gravityview_widgets', 'GVWidgets', array(
-				'nonce' => wp_create_nonce( 'gravityview_ajax_widget' )
+			wp_localize_script('gravityview_widgets', 'GVWidgets', array(
+				'nonce' => wp_create_nonce('gravityview_ajax_widget')
 			));
 
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons' ), GravityView_Plugin::version );
+			wp_enqueue_style('gravityview_views_styles', plugins_url('assets/css/admin-views.css', GRAVITYVIEW_FILE), array('dashicons'), GravityView_Plugin::version);
 		}
 
 	}
@@ -92,22 +92,22 @@ 
 	 * @param array $args     Display arguments including before_title, after_title, before_widget, and after_widget.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	function widget( $args, $instance ) {
+	function widget($args, $instance) {
 
 		// Don't have the Customizer render too soon.
-		if( empty( $instance['view_id'] ) ) {
+		if (empty($instance['view_id'])) {
 			return;
 		}
 
-		$args['id']        = ( isset( $args['id'] ) ) ? $args['id'] : 'gv_recent_entries';
-		$instance['title'] = ( isset( $instance['title'] ) ) ? $instance['title'] : '';
+		$args['id']        = (isset($args['id'])) ? $args['id'] : 'gv_recent_entries';
+		$instance['title'] = (isset($instance['title'])) ? $instance['title'] : '';
 
-		$title = apply_filters( 'widget_title', $instance[ 'title' ], $instance, $args['id'] );
+		$title = apply_filters('widget_title', $instance['title'], $instance, $args['id']);
 
 		echo $args['before_widget'];
 
-		if ( !empty( $title ) ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if (!empty($title)) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		/**
@@ -115,17 +115,17 @@ 
 		 * @param array $args     Display arguments including before_title, after_title, before_widget, and after_widget.
 		 * @param array $instance The settings for the particular instance of the widget.
 		 */
-		do_action( 'gravityview/widget/recent-entries/before_widget', $args, $instance );
+		do_action('gravityview/widget/recent-entries/before_widget', $args, $instance);
 
 		// Print the entry list
-		echo $this->get_output( $instance );
+		echo $this->get_output($instance);
 
 		/**
 		 * @action `gravityview/widget/recent-entries/after_widget` After recent entries are displayed in the WordPress widget
 		 * @param array $args     Display arguments including before_title, after_title, before_widget, and after_widget.
 		 * @param array $instance The settings for the particular instance of the widget.
 		 */
-		do_action( 'gravityview/widget/recent-entries/after_widget', $args, $instance );
+		do_action('gravityview/widget/recent-entries/after_widget', $args, $instance);
 
 		echo $args['after_widget'];
 	}
@@ -139,25 +139,25 @@ 
 	 *
 	 * @return string
 	 */
-	private function get_output( $instance ) {
+	private function get_output($instance) {
 
-		$form_id = gravityview_get_form_id( $instance['view_id'] );
+		$form_id = gravityview_get_form_id($instance['view_id']);
 
-		$form = gravityview_get_form( $form_id );
+		$form = gravityview_get_form($form_id);
 
-		$entries = $this->get_entries( $instance, $form_id );
+		$entries = $this->get_entries($instance, $form_id);
 
 		/**
 		 * @since 1.6.1
 		 * @var int $entry_link_post_id The ID to use as the parent post for the entry
 		 */
-		$entry_link_post_id = ( empty( $instance['error_post_id'] ) && !empty( $instance['post_id'] ) ) ? $instance['post_id'] : $instance['view_id'];
+		$entry_link_post_id = (empty($instance['error_post_id']) && !empty($instance['post_id'])) ? $instance['post_id'] : $instance['view_id'];
 
 		/**
 		 * Generate list output
 		 * @since 1.7.2
 		 */
-		$List = new GravityView_Entry_List( $entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget' );
+		$List = new GravityView_Entry_List($entries, $entry_link_post_id, $form, $instance['link_format'], $instance['after_link'], 'recent-entries-widget');
 
 		$output = $List->get_output();
 
@@ -166,7 +166,7 @@ 
 		 * @param string $output HTML to be displayed
 		 * @param array $instance Widget settings
 		 */
-		$output = apply_filters( 'gravityview/widget/recent-entries/output', $output, $instance );
+		$output = apply_filters('gravityview/widget/recent-entries/output', $output, $instance);
 
 		return $output;
 	}
@@ -179,15 +179,15 @@ 
 	 *
 	 * @return array $entries Multidimensional array of Gravity Forms entries
 	 */
-	private function get_entries( $instance, $form_id ) {
+	private function get_entries($instance, $form_id) {
 
 		// Get the settings for the View ID
-		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
+		$view_settings = gravityview_get_template_settings($instance['view_id']);
 
         // Set the context view ID to avoid conflicts with the Advanced Filter extension.
         $criteria['context_view_id'] = $instance['view_id'];
 
-		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
+		$instance['limit'] = isset($instance['limit']) ? $instance['limit'] : 10;
 		$view_settings['id'] = $instance['view_id'];
 		$view_settings['page_size'] = $instance['limit'];
 
@@ -198,16 +198,16 @@ 
 		);
 
 		// Prepare Search Criteria
-		$criteria['search_criteria'] = array( 'field_filters' => array() );
-		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved( $view_settings, $criteria['search_criteria']);
-		$criteria['search_criteria']['status'] = apply_filters( 'gravityview_status', 'active', $view_settings );
+		$criteria['search_criteria'] = array('field_filters' => array());
+		$criteria['search_criteria'] = GravityView_frontend::process_search_only_approved($view_settings, $criteria['search_criteria']);
+		$criteria['search_criteria']['status'] = apply_filters('gravityview_status', 'active', $view_settings);
 
 		/**
 		 * Modify the search parameters before the entries are fetched
 		 */
-		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id );
+		$criteria = apply_filters('gravityview/widget/recent-entries/criteria', $criteria, $instance, $form_id);
 
-		$results = GVCommon::get_entries( $form_id, $criteria );
+		$results = GVCommon::get_entries($form_id, $criteria);
 
 		return $results;
 	}
@@ -221,28 +221,28 @@ 
 	 *
 	 * @return array Calculated widget settings after processing
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = $new_instance;
 
 		// Force positive number
-		$instance['limit'] = empty( $instance['limit'] ) ? 10 : absint( $instance['limit'] );
+		$instance['limit'] = empty($instance['limit']) ? 10 : absint($instance['limit']);
 
-		$instance['view_id'] = intval( $instance['view_id'] );
+		$instance['view_id'] = intval($instance['view_id']);
 
-		$instance['link_format'] = trim( rtrim( $instance['link_format'] ) );
+		$instance['link_format'] = trim(rtrim($instance['link_format']));
 
-		$instance['link_format'] = empty( $instance['link_format'] ) ? $old_instance['link_format'] : $instance['link_format'];
+		$instance['link_format'] = empty($instance['link_format']) ? $old_instance['link_format'] : $instance['link_format'];
 
-		$instance['post_id'] = empty( $instance['post_id'] ) ? '' : intval( $instance['post_id'] );
+		$instance['post_id'] = empty($instance['post_id']) ? '' : intval($instance['post_id']);
 
-		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id( $instance['post_id'], $instance['view_id'] );
+		$is_valid_embed_id = GravityView_View_Data::is_valid_embed_id($instance['post_id'], $instance['view_id']);
 
 		//check if post_id is a valid post with embedded View
-		$instance['error_post_id'] = is_wp_error( $is_valid_embed_id ) ? $is_valid_embed_id->get_error_message() : NULL;
+		$instance['error_post_id'] = is_wp_error($is_valid_embed_id) ? $is_valid_embed_id->get_error_message() : NULL;
 
 		// Share that the widget isn't brand new
-		$instance['updated']  = 1;
+		$instance['updated'] = 1;
 
 		/**
 		 * Modify the updated instance. This will allow for validating any added instance settings externally.
@@ -251,7 +251,7 @@ 
 		 * @param array $new_instance Widget form settings after update
 		 * @param array $old_instance Widget form settings before update
 		 */
-		$instance = apply_filters( 'gravityview/widget/update', $instance, $new_instance, $old_instance );
+		$instance = apply_filters('gravityview/widget/update', $instance, $new_instance, $old_instance);
 
 		return $instance;
 	}
@@ -260,7 +260,7 @@ 
 	 * @since 1.6
 	 * @see WP_Widget::form()
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
 		// Set up some default widget settings.
 		$defaults = array(
@@ -272,14 +272,14 @@ 
 			'after_link'        => ''
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array)$instance, $defaults);
 
 		?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'gravityview' ) ?></label>
-			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $instance['title'] ); ?>" />
+			<label for="<?php echo esc_attr($this->get_field_id('title')); ?>"><?php _e('Title:', 'gravityview') ?></label>
+			<input class="widefat" id="<?php echo esc_attr($this->get_field_id('title')); ?>" name="<?php echo esc_attr($this->get_field_name('title')); ?>" type="text" value="<?php echo esc_attr($instance['title']); ?>" />
 		</p>
 
 		<!-- Download -->
@@ -289,11 +289,11 @@ 
 			'posts_per_page' => -1,
 			'post_status'    => 'publish',
 		);
-		$views = get_posts( $args );
+		$views = get_posts($args);
 
 		// If there are no views set up yet, we get outta here.
-		if( empty( $views ) ) {
-			echo '<div id="select_gravityview_view"><div class="wrap">'. GravityView_Post_Types::no_views_text() .'</div></div>';
+		if (empty($views)) {
+			echo '<div id="select_gravityview_view"><div class="wrap">'.GravityView_Post_Types::no_views_text().'</div></div>';
 			return;
 		}
 
@@ -304,25 +304,25 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( isset( $instance['updated'] ) && empty( $instance['view_id'] ) ) {
+		if (isset($instance['updated']) && empty($instance['view_id'])) {
 			?>
 			<div class="error inline hide-on-view-change">
 				<p><?php esc_html_e('Please select a View to search.', 'gravityview'); ?></p>
 			</div>
 			<?php
-			unset ( $error );
+			unset ($error);
 		}
 		?>
 
 		<p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
-			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr( $this->get_field_name( 'view_id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'view_id' ) ); ?>">
-				<option value=""><?php esc_html_e( '&mdash; Select a View as Entries Source &mdash;', 'gravityview' ); ?></option>
+			<label for="<?php echo esc_attr($this->get_field_id('view_id')); ?>"><?php esc_html_e('Select a View', 'gravityview'); ?></label>
+			<select class="widefat gv-recent-entries-select-view" name="<?php echo esc_attr($this->get_field_name('view_id')); ?>" id="<?php echo esc_attr($this->get_field_id('view_id')); ?>">
+				<option value=""><?php esc_html_e('&mdash; Select a View as Entries Source &mdash;', 'gravityview'); ?></option>
 				<?php
 
-				foreach( $views as $view ) {
-					$title = empty( $view->post_title ) ? __('(no title)', 'gravityview') : $view->post_title;
-					echo '<option value="'. $view->ID .'"'.selected( absint( $instance['view_id'] ), $view->ID ).'>'. esc_html( sprintf('%s #%d', $title, $view->ID ) ) .'</option>';
+				foreach ($views as $view) {
+					$title = empty($view->post_title) ? __('(no title)', 'gravityview') : $view->post_title;
+					echo '<option value="'.$view->ID.'"'.selected(absint($instance['view_id']), $view->ID).'>'.esc_html(sprintf('%s #%d', $title, $view->ID)).'</option>';
 				}
 
 				?>
@@ -334,44 +334,44 @@ 
 		 * Display errors generated for invalid embed IDs
 		 * @see GravityView_View_Data::is_valid_embed_id
 		 */
-		if( !empty( $instance['error_post_id'] ) ) {
+		if (!empty($instance['error_post_id'])) {
 			?>
 			<div class="error inline">
 				<p><?php echo $instance['error_post_id']; ?></p>
 			</div>
 			<?php
-			unset ( $error );
+			unset ($error);
 		}
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e( 'If Embedded, Page ID:', 'gravityview' ); ?></label>
-			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr( $instance['post_id'] ); ?>" />
+			<label for="<?php echo $this->get_field_id('post_id'); ?>"><?php esc_html_e('If Embedded, Page ID:', 'gravityview'); ?></label>
+			<input class="code" size="3" id="<?php echo $this->get_field_id('post_id'); ?>" name="<?php echo $this->get_field_name('post_id'); ?>" type="text" value="<?php echo esc_attr($instance['post_id']); ?>" />
 			<span class="howto"><?php
-				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview' );
-				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview' ), 'target=_blank' );
+				esc_html_e('To have a search performed on an embedded View, enter the ID of the post or page where the View is embedded.', 'gravityview');
+				echo ' '.gravityview_get_link('http://docs.gravityview.co/article/222-the-search-widget', __('Learn more&hellip;', 'gravityview'), 'target=_blank');
 				?></span>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id( 'limit' ); ?>">
-				<span><?php _e( 'Number of entries to show:', 'gravityview' ); ?></span>
+			<label for="<?php echo $this->get_field_id('limit'); ?>">
+				<span><?php _e('Number of entries to show:', 'gravityview'); ?></span>
 			</label>
-			<input class="code" id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="number" value="<?php echo intval( $instance['limit'] ); ?>" size="3" />
+			<input class="code" id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="number" value="<?php echo intval($instance['limit']); ?>" size="3" />
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id( 'link_format' ); ?>">
-				<span><?php _e( 'Entry link text (required)', 'gravityview' ); ?></span>
+			<label for="<?php echo $this->get_field_id('link_format'); ?>">
+				<span><?php _e('Entry link text (required)', 'gravityview'); ?></span>
 			</label>
-			<input id="<?php echo $this->get_field_id( 'link_format' ); ?>" name="<?php echo $this->get_field_name( 'link_format' ); ?>" type="text" value="<?php echo esc_attr( $instance['link_format'] ); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
+			<input id="<?php echo $this->get_field_id('link_format'); ?>" name="<?php echo $this->get_field_name('link_format'); ?>" type="text" value="<?php echo esc_attr($instance['link_format']); ?>" class="widefat merge-tag-support mt-position-right mt-hide_all_fields" />
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id( 'after_link' ); ?>">
-				<span><?php _e( 'Text or HTML to display after the link (optional)', 'gravityview' ); ?></span>
+			<label for="<?php echo $this->get_field_id('after_link'); ?>">
+				<span><?php _e('Text or HTML to display after the link (optional)', 'gravityview'); ?></span>
 			</label>
-			<textarea id="<?php echo $this->get_field_id( 'after_link' ); ?>" name="<?php echo $this->get_field_name( 'after_link' ); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea( $instance['after_link'] ); ?></textarea>
+			<textarea id="<?php echo $this->get_field_id('after_link'); ?>" name="<?php echo $this->get_field_name('after_link'); ?>" rows="5" class="widefat code merge-tag-support mt-position-right mt-hide_all_fields"><?php echo esc_textarea($instance['after_link']); ?></textarea>
 		</p>
 
 		<?php
@@ -381,14 +381,14 @@ 
 		 * @param GravityView_Recent_Entries_Widget $this WP_Widget object
 		 * @param array $instance Current widget instance
 		 */
-		do_action( 'gravityview_recent_entries_widget_form' , $this, $instance );
+		do_action('gravityview_recent_entries_widget_form', $this, $instance);
 
 		?>
 
 		<script>
 			// When the widget is saved or added, refresh the Merge Tags (here for backward compatibility)
 			// WordPress 3.9 added widget-added and widget-updated actions
-			jQuery('#<?php echo $this->get_field_id( 'view_id' ); ?>').trigger( 'change' );
+			jQuery('#<?php echo $this->get_field_id('view_id'); ?>').trigger( 'change' );
 		</script>
 	<?php }
 

Indentation +2 added lines, -2 removed lines

@@ -184,8 +184,8 @@
 		// Get the settings for the View ID
 		$view_settings = gravityview_get_template_settings( $instance['view_id'] );
 
-        // Set the context view ID to avoid conflicts with the Advanced Filter extension.
-        $criteria['context_view_id'] = $instance['view_id'];
+		// Set the context view ID to avoid conflicts with the Advanced Filter extension.
+		$criteria['context_view_id'] = $instance['view_id'];
 
 		$instance['limit'] = isset( $instance['limit'] ) ? $instance['limit'] : 10;
 		$view_settings['id'] = $instance['view_id'];

gravityview.php

Indentation +33 added lines, -33 removed lines

@@ -312,11 +312,11 @@ 
 		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
 
 
-        /**
-         * When an entry is created, check if we need to update the custom slug meta
-         * todo: move this to its own class..
-         */
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+		/**
+		 * When an entry is created, check if we need to update the custom slug meta
+		 * todo: move this to its own class..
+		 */
+		add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
 
 		/**
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
@@ -347,34 +347,34 @@ 
 
 	/** DEBUG */
 
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @param mixed $data Additional data to display
-     * @return void
-     */
-    public static function log_debug( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_debug', $message, $data );
-    }
-
-    /**
-     * Logs messages using Gravity Forms logging add-on
-     * @param  string $message log message
-     * @return void
-     */
-    public static function log_error( $message, $data = null ){
-	    /**
-	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
-	     * @param string $message Error message to display
-	     * @param mixed $data Supporting data to print alongside it
-	     */
-    	do_action( 'gravityview_log_error', $message, $data );
-    }
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @param mixed $data Additional data to display
+	 * @return void
+	 */
+	public static function log_debug( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_debug', $message, $data );
+	}
+
+	/**
+	 * Logs messages using Gravity Forms logging add-on
+	 * @param  string $message log message
+	 * @return void
+	 */
+	public static function log_error( $message, $data = null ){
+		/**
+		 * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
+		 * @param string $message Error message to display
+		 * @param mixed $data Supporting data to print alongside it
+		 */
+		do_action( 'gravityview_log_error', $message, $data );
+	}
 
 } // end class GravityView_Plugin
 

Spacing +80 added lines, -80 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 /** If this file is called directly, abort. */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
@@ -36,52 +36,52 @@ 
  * Full path to the GravityView file
  * @define "GRAVITYVIEW_FILE" "./gravityview.php"
  */
-define( 'GRAVITYVIEW_FILE', __FILE__ );
+define('GRAVITYVIEW_FILE', __FILE__);
 
 /**
  * The URL to this file
  */
-define( 'GRAVITYVIEW_URL', plugin_dir_url( __FILE__ ) );
+define('GRAVITYVIEW_URL', plugin_dir_url(__FILE__));
 
 
 /** @define "GRAVITYVIEW_DIR" "./" The absolute path to the plugin directory */
-define( 'GRAVITYVIEW_DIR', plugin_dir_path( __FILE__ ) );
+define('GRAVITYVIEW_DIR', plugin_dir_path(__FILE__));
 
 /**
  * GravityView requires at least this version of Gravity Forms to function properly.
  */
-define( 'GV_MIN_GF_VERSION', '1.9.9.10' );
+define('GV_MIN_GF_VERSION', '1.9.9.10');
 
 /**
  * GravityView requires at least this version of WordPress to function properly.
  * @since 1.12
  */
-define( 'GV_MIN_WP_VERSION', '3.3' );
+define('GV_MIN_WP_VERSION', '3.3');
 
 /**
  * GravityView requires at least this version of PHP to function properly.
  * @since 1.12
  */
-define( 'GV_MIN_PHP_VERSION', '5.2.4' );
+define('GV_MIN_PHP_VERSION', '5.2.4');
 
 /** Load common & connector functions */
-require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-common.php');
-require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php');
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' );
-require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' );
+require_once(GRAVITYVIEW_DIR.'includes/helper-functions.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-common.php');
+require_once(GRAVITYVIEW_DIR.'includes/connector-functions.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-compatibility.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-roles-capabilities.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-notices.php');
 
 /** Register Post Types and Rewrite Rules */
-require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-post-types.php');
 
 /** Add Cache Class */
-require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php');
+require_once(GRAVITYVIEW_DIR.'includes/class-cache.php');
 
 /** Register hooks that are fired when the plugin is activated and deactivated. */
-if( is_admin() ) {
-	register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) );
-	register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) );
+if (is_admin()) {
+	register_activation_hook(__FILE__, array('GravityView_Plugin', 'activate'));
+	register_deactivation_hook(__FILE__, array('GravityView_Plugin', 'deactivate'));
 }
 
 /**
@@ -100,7 +100,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if( empty( self::$instance ) ) {
+		if (empty(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -110,7 +110,7 @@ 
 	private function __construct() {
 
 
-		if( ! GravityView_Compatibility::is_valid() ) {
+		if (!GravityView_Compatibility::is_valid()) {
 			return;
 		}
 
@@ -126,10 +126,10 @@ 
 	 */
 	private function add_hooks() {
 		// Load plugin text domain
-		add_action( 'init', array( $this, 'load_plugin_textdomain' ), 1 );
+		add_action('init', array($this, 'load_plugin_textdomain'), 1);
 
 		// Load frontend files
-		add_action( 'init', array( $this, 'frontend_actions' ), 20 );
+		add_action('init', array($this, 'frontend_actions'), 20);
 	}
 
 	/**
@@ -139,48 +139,48 @@ 
 	 */
 	public function include_files() {
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-admin.php');
 
 		// Load fields
-		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-fields.php');
+		include_once(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field.php');
 
 		// Load all field files automatically
-		foreach ( glob( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field*.php' ) as $gv_field_filename ) {
-			include_once( $gv_field_filename );
+		foreach (glob(GRAVITYVIEW_DIR.'includes/fields/class-gravityview-field*.php') as $gv_field_filename) {
+			include_once($gv_field_filename);
 		}
 
-		include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-notes.php');
+		include_once(GRAVITYVIEW_DIR.'includes/load-plugin-and-theme-hooks.php');
 
 		// Load Extensions
 		// @todo: Convert to a scan of the directory or a method where this all lives
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/extensions/edit-entry/class-edit-entry.php');
+		include_once(GRAVITYVIEW_DIR.'includes/extensions/delete-entry/class-delete-entry.php');
 
 		// Load WordPress Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/wordpress-widgets/register-wordpress-widgets.php');
 
 		// Load GravityView Widgets
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/widgets/register-gravityview-widgets.php');
 
 		// Add oEmbed
-		include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-oembed.php');
 
 		// Add logging
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-logging.php' );
-
-		include_once( GRAVITYVIEW_DIR . 'includes/class-ajax.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-settings.php');
-		include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
-		include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gvlogic-shortcode.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/presets/register-default-templates.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-logging.php');
+
+		include_once(GRAVITYVIEW_DIR.'includes/class-ajax.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-settings.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-frontend-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-admin-bar.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-list.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
+		include_once(GRAVITYVIEW_DIR.'includes/class-data.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-entry-link-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gvlogic-shortcode.php');
+		include_once(GRAVITYVIEW_DIR.'includes/presets/register-default-templates.php');
 
 	}
 
@@ -190,7 +190,7 @@ 
 	 * @return bool
 	 */
 	public static function is_network_activated() {
-		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) );
+		return is_multisite() && (function_exists('is_plugin_active_for_network') && is_plugin_active_for_network('gravityview/gravityview.php'));
 	}
 
 
@@ -212,13 +212,13 @@ 
 		flush_rewrite_rules();
 
 		// Update the current GV version
-		update_option( 'gv_version', self::version );
+		update_option('gv_version', self::version);
 
 		// Add the transient to redirect to configuration page
-		set_transient( '_gv_activation_redirect', true, 60 );
+		set_transient('_gv_activation_redirect', true, 60);
 
 		// Clear settings transient
-		delete_transient( 'redux_edd_license_license_valid' );
+		delete_transient('redux_edd_license_license_valid');
 
 		GravityView_Roles_Capabilities::get_instance()->add_caps();
 	}
@@ -244,8 +244,8 @@ 
 	 * @return void
 	 */
 	public static function include_extension_framework() {
-		if ( ! class_exists( 'GravityView_Extension' ) ) {
-			require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-extension.php' );
+		if (!class_exists('GravityView_Extension')) {
+			require_once(GRAVITYVIEW_DIR.'includes/class-gravityview-extension.php');
 		}
 	}
 
@@ -255,7 +255,7 @@ 
 	 * @since 1.7.5.1
 	 */
 	public static function include_widget_class() {
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php');
 	}
 
 
@@ -267,17 +267,17 @@ 
 	 */
 	public function load_plugin_textdomain() {
 
-		$loaded = load_plugin_textdomain( 'gravityview', false, '/languages/' );
-		if ( ! $loaded ) {
-			$loaded = load_muplugin_textdomain( 'gravityview', '/languages/' );
+		$loaded = load_plugin_textdomain('gravityview', false, '/languages/');
+		if (!$loaded) {
+			$loaded = load_muplugin_textdomain('gravityview', '/languages/');
 		}
-		if ( ! $loaded ) {
-			$loaded = load_theme_textdomain( 'gravityview', '/languages/' );
+		if (!$loaded) {
+			$loaded = load_theme_textdomain('gravityview', '/languages/');
 		}
-		if ( ! $loaded ) {
-			$locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' );
-			$mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo';
-			load_textdomain( 'gravityview', $mofile );
+		if (!$loaded) {
+			$locale = apply_filters('plugin_locale', get_locale(), 'gravityview');
+			$mofile = dirname(__FILE__).'/languages/gravityview-'.$locale.'.mo';
+			load_textdomain('gravityview', $mofile);
 		}
 
 	}
@@ -289,9 +289,9 @@ 
 	 */
 	public static function is_admin() {
 
-		$doing_ajax = defined( 'DOING_AJAX' ) ? DOING_AJAX : false;
+		$doing_ajax = defined('DOING_AJAX') ? DOING_AJAX : false;
 
-		return is_admin() && ! $doing_ajax;
+		return is_admin() && !$doing_ajax;
 	}
 
 	/**
@@ -302,27 +302,27 @@ 
 	 */
 	public function frontend_actions() {
 
-		if( self::is_admin() ) { return; }
+		if (self::is_admin()) { return; }
 
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-template.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-api.php' );
-		include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' );
-		include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' );
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-image.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-template.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-api.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-frontend-views.php');
+		include_once(GRAVITYVIEW_DIR.'includes/class-gravityview-change-entry-creator.php');
 
 
         /**
          * When an entry is created, check if we need to update the custom slug meta
          * todo: move this to its own class..
          */
-        add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 );
+        add_action('gform_entry_created', array('GravityView_API', 'entry_create_custom_slug'), 10, 2);
 
 		/**
 		 * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded
 		 *
 		 * Nice place to insert extensions' frontend stuff
 		 */
-		do_action( 'gravityview_include_frontend_actions' );
+		do_action('gravityview_include_frontend_actions');
 	}
 
 	/**
@@ -332,15 +332,15 @@ 
 	 */
 	public static function get_default_widget_areas() {
 		$default_areas = array(
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ),
+			array('1-1' => array(array('areaid' => 'top', 'title' => __('Top', 'gravityview'), 'subtitle' => ''))),
+			array('1-2' => array(array('areaid' => 'left', 'title' => __('Left', 'gravityview'), 'subtitle' => '')), '2-2' => array(array('areaid' => 'right', 'title' => __('Right', 'gravityview'), 'subtitle' => ''))),
 		);
 
 		/**
 		 * @filter `gravityview_widget_active_areas` Array of zones available for widgets to be dropped into
 		 * @param array $default_areas Definition for default widget areas
 		 */
-		return apply_filters( 'gravityview_widget_active_areas', $default_areas );
+		return apply_filters('gravityview_widget_active_areas', $default_areas);
 	}
 
 	/** DEBUG */
@@ -351,13 +351,13 @@ 
      * @param mixed $data Additional data to display
      * @return void
      */
-    public static function log_debug( $message, $data = null ){
+    public static function log_debug($message, $data = null) {
 	    /**
 	     * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Message to display
 	     * @param mixed $data Supporting data to print alongside it
 	     */
-    	do_action( 'gravityview_log_debug', $message, $data );
+    	do_action('gravityview_log_debug', $message, $data);
     }
 
     /**
@@ -365,13 +365,13 @@ 
      * @param  string $message log message
      * @return void
      */
-    public static function log_error( $message, $data = null ){
+    public static function log_error($message, $data = null) {
 	    /**
 	     * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output
 	     * @param string $message Error message to display
 	     * @param mixed $data Supporting data to print alongside it
 	     */
-    	do_action( 'gravityview_log_error', $message, $data );
+    	do_action('gravityview_log_error', $message, $data);
     }
 
 } // end class GravityView_Plugin

includes/admin/class.field.type.php

Indentation +139 added lines, -139 removed lines

@@ -10,158 +10,158 @@ 
 	 *
 	 * @var string
 	 */
-    protected $name;
+	protected $name;
 
 	/**
 	 * Field settings
 	 *
 	 * @var array
 	 */
-    protected $field;
+	protected $field;
 
 	/**
 	 * Field current value
 	 *
 	 * @var mixed
 	 */
-    protected $value;
-
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
-
-        $this->name = $name;
-
-        $defaults = self::get_field_defaults();
-
-        // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
-        	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
-        }
-
-        $this->field =  wp_parse_args( $field, $defaults );
-
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
-
-    }
-
-    /**
-     * Returns the default details for a field option
-     *
-     * - default    // default option value, in case nothing is defined (@deprecated)
-     * - desc       // option description
-     * - value      // the option default value
-     * - label      // the option label
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
-     * - id         // the field id
-     * - type       // the option type ( text, checkbox, select, ... )
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
-     * - merge_tags // if the option supports merge tags feature
-     * - class      // (new) define extra classes for the field
-     * - tooltip    //
-     *
-     * @return array
-     */
-    public static function get_field_defaults() {
-        return array(
-            'desc' => '',
-            'value' => NULL,
-            'label' => '',
-            'id' => NULL,
-            'type'  => 'text',
-            'options' => NULL,
-            'merge_tags' => true,
-            'class' => '',
-            'tooltip' => NULL
-        );
-    }
-
-
-    function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
-            return NULL;
-        }
-
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
-    }
-
-    /**
-     * Build input id based on the name
-     * @return string
-     */
-    function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
-        }
-        return esc_attr( sanitize_html_class( $this->name ) );
-    }
-
-    /**
-     * Retrieve field label
-     * @return string
-     */
-    function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
-    }
+	protected $value;
+
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
+
+		$this->name = $name;
+
+		$defaults = self::get_field_defaults();
+
+		// Backward compatibility
+		if( !empty( $field['choices'] ) ) {
+			$field['options'] = $field['choices'];
+			unset( $field['choices'] );
+		}
+
+		$this->field =  wp_parse_args( $field, $defaults );
+
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+
+	}
+
+	/**
+	 * Returns the default details for a field option
+	 *
+	 * - default    // default option value, in case nothing is defined (@deprecated)
+	 * - desc       // option description
+	 * - value      // the option default value
+	 * - label      // the option label
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
+	 * - id         // the field id
+	 * - type       // the option type ( text, checkbox, select, ... )
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
+	 * - merge_tags // if the option supports merge tags feature
+	 * - class      // (new) define extra classes for the field
+	 * - tooltip    //
+	 *
+	 * @return array
+	 */
+	public static function get_field_defaults() {
+		return array(
+			'desc' => '',
+			'value' => NULL,
+			'label' => '',
+			'id' => NULL,
+			'type'  => 'text',
+			'options' => NULL,
+			'merge_tags' => true,
+			'class' => '',
+			'tooltip' => NULL
+		);
+	}
+
+
+	function get_tooltip() {
+		if( !function_exists('gform_tooltip') ) {
+			return NULL;
+		}
+
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+	}
+
+	/**
+	 * Build input id based on the name
+	 * @return string
+	 */
+	function get_field_id() {
+		if( isset( $this->field['id'] ) ) {
+			return esc_attr( $this->field['id'] );
+		}
+		return esc_attr( sanitize_html_class( $this->name ) );
+	}
+
+	/**
+	 * Retrieve field label
+	 * @return string
+	 */
+	function get_field_label() {
+		return esc_html( trim( $this->field['label'] ) );
+	}
 
 	/**
 	 * Retrieve field left label
-     *
-     * @since 1.7
-     *
+	 *
+	 * @since 1.7
+	 *
 	 * @return string
 	 */
 	function get_field_left_label() {
 		return isset( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
 	}
 
-    /**
-     * Retrieve field label class
-     * @return string
-     */
-    function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
-    }
-
-
-    /**
-     * Retrieve field description
-     * @return string
-     */
-    function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
-    }
-
-
-    /**
-     * Verify if field should have merge tags
-     * @return boolean
-     */
-    function show_merge_tags() {
-        // Show the merge tags if the field is a list view
-        $is_list = preg_match( '/_list-/ism', $this->name );
-        // Or is a single entry view
-        $is_single = preg_match( '/single_/ism', $this->name );
-
-        return ( $is_single || $is_list );
-    }
-
-
-
-    /**
-     * important! Override this class
-     * outputs the field option html
-     */
-    function render_option() {
-        // to replace on each field
-    }
-
-    /**
-     * important! Override this class if needed
-     * outputs the field setting html
-     */
-    function render_setting( $override_input = NULL ) {
-
-        if( !empty( $this->field['full_width'] ) ) { ?>
+	/**
+	 * Retrieve field label class
+	 * @return string
+	 */
+	function get_label_class() {
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+	}
+
+
+	/**
+	 * Retrieve field description
+	 * @return string
+	 */
+	function get_field_desc() {
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+	}
+
+
+	/**
+	 * Verify if field should have merge tags
+	 * @return boolean
+	 */
+	function show_merge_tags() {
+		// Show the merge tags if the field is a list view
+		$is_list = preg_match( '/_list-/ism', $this->name );
+		// Or is a single entry view
+		$is_single = preg_match( '/single_/ism', $this->name );
+
+		return ( $is_single || $is_list );
+	}
+
+
+
+	/**
+	 * important! Override this class
+	 * outputs the field option html
+	 */
+	function render_option() {
+		// to replace on each field
+	}
+
+	/**
+	 * important! Override this class if needed
+	 * outputs the field setting html
+	 */
+	function render_setting( $override_input = NULL ) {
+
+		if( !empty( $this->field['full_width'] ) ) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -181,14 +181,14 @@ 
             </td>
         <?php }
 
-    }
+	}
 
-    /**
-     * important! Override this class
-     * outputs the input html part
-     */
-    function render_input( $override_input ) {
-        echo '';
-    }
+	/**
+	 * important! Override this class
+	 * outputs the input html part
+	 */
+	function render_input( $override_input ) {
+		echo '';
+	}
 
 }

Spacing +24 added lines, -24 removed lines

@@ -26,21 +26,21 @@ 
 	 */
     protected $value;
 
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
+    function __construct($name = '', $field = array(), $curr_value = NULL) {
 
         $this->name = $name;
 
         $defaults = self::get_field_defaults();
 
         // Backward compatibility
-        if( !empty( $field['choices'] ) ) {
+        if (!empty($field['choices'])) {
         	$field['options'] = $field['choices'];
-        	unset( $field['choices'] );
+        	unset($field['choices']);
         }
 
-        $this->field =  wp_parse_args( $field, $defaults );
+        $this->field = wp_parse_args($field, $defaults);
 
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
+        $this->value = is_null($curr_value) ? $this->field['value'] : $curr_value;
 
     }
 
@@ -77,11 +77,11 @@ 
 
 
     function get_tooltip() {
-        if( !function_exists('gform_tooltip') ) {
+        if (!function_exists('gform_tooltip')) {
             return NULL;
         }
 
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
+        return !empty($this->field['tooltip']) ? ' '.gform_tooltip($this->field['tooltip'], false, true) : NULL;
     }
 
     /**
@@ -89,10 +89,10 @@ 
      * @return string
      */
     function get_field_id() {
-        if( isset( $this->field['id'] ) ) {
-            return esc_attr( $this->field['id'] );
+        if (isset($this->field['id'])) {
+            return esc_attr($this->field['id']);
         }
-        return esc_attr( sanitize_html_class( $this->name ) );
+        return esc_attr(sanitize_html_class($this->name));
     }
 
     /**
@@ -100,7 +100,7 @@ 
      * @return string
      */
     function get_field_label() {
-        return esc_html( trim( $this->field['label'] ) );
+        return esc_html(trim($this->field['label']));
     }
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return string
 	 */
 	function get_field_left_label() {
-		return isset( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
+		return isset($this->field['left_label']) ? esc_html(trim($this->field['left_label'])) : NULL;
 	}
 
     /**
@@ -119,7 +119,7 @@ 
      * @return string
      */
     function get_label_class() {
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
+        return 'gv-label-'.sanitize_html_class($this->field['type']);
     }
 
 
@@ -128,7 +128,7 @@ 
      * @return string
      */
     function get_field_desc() {
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
+        return !empty($this->field['desc']) ? '<span class="howto">'.$this->field['desc'].'</span>' : '';
     }
 
 
@@ -138,11 +138,11 @@ 
      */
     function show_merge_tags() {
         // Show the merge tags if the field is a list view
-        $is_list = preg_match( '/_list-/ism', $this->name );
+        $is_list = preg_match('/_list-/ism', $this->name);
         // Or is a single entry view
-        $is_single = preg_match( '/single_/ism', $this->name );
+        $is_single = preg_match('/single_/ism', $this->name);
 
-        return ( $is_single || $is_list );
+        return ($is_single || $is_list);
     }
 
 
@@ -159,25 +159,25 @@ 
      * important! Override this class if needed
      * outputs the field setting html
      */
-    function render_setting( $override_input = NULL ) {
+    function render_setting($override_input = NULL) {
 
-        if( !empty( $this->field['full_width'] ) ) { ?>
+        if (!empty($this->field['full_width'])) { ?>
             <th scope="row" colspan="2">
                 <div>
                     <label for="<?php echo $this->get_field_id(); ?>">
-                        <?php echo $this->get_field_label() . $this->get_tooltip(); ?>
+                        <?php echo $this->get_field_label().$this->get_tooltip(); ?>
                     </label>
                 </div>
-                <?php $this->render_input( $override_input ); ?>
+                <?php $this->render_input($override_input); ?>
             </th>
         <?php } else { ?>
             <th scope="row">
                 <label for="<?php echo $this->get_field_id(); ?>">
-                    <?php echo $this->get_field_label() . $this->get_tooltip(); ?>
+                    <?php echo $this->get_field_label().$this->get_tooltip(); ?>
                 </label>
             </th>
             <td>
-                <?php $this->render_input( $override_input ); ?>
+                <?php $this->render_input($override_input); ?>
             </td>
         <?php }
 
@@ -187,7 +187,7 @@ 
      * important! Override this class
      * outputs the input html part
      */
-    function render_input( $override_input ) {
+    function render_input($override_input) {
         echo '';
     }
 

Doc Comments +1 added lines

@@ -158,6 +158,7 @@
     /**
      * important! Override this class if needed
      * outputs the field setting html
+     * @param string $override_input
      */
     function render_setting( $override_input = NULL ) {
 

includes/admin/entry-list.php

Spacing +5 added lines, -5 removed lines

@@ -8,10 +8,10 @@ 
 	function __construct() {
 
 		// Add Edit link to the entry actions
-		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_link' ), 10, 5 );
+		add_action('gform_entries_first_column_actions', array($this, 'add_edit_link'), 10, 5);
 
 		// Add script to enable edit link
-		add_action( 'admin_head-forms_page_gf_entries', array( $this, 'add_edit_script') );
+		add_action('admin_head-forms_page_gf_entries', array($this, 'add_edit_script'));
 
 	}
 
@@ -26,7 +26,7 @@ 
 	public function add_edit_script() {
 
 		// We're on a single entry page, or at least not the Entries page.
-		if( !empty( $_GET['view'] ) && $_GET['view'] !== 'entries' ) { return; }
+		if (!empty($_GET['view']) && $_GET['view'] !== 'entries') { return; }
 	?>
 		<script>
 		jQuery( document ).ready( function( $ ) {
@@ -50,7 +50,7 @@ 
 	 * @param array  $lead         The current entry data
 	 * @param string $query_string URL query string for a link to the current entry. Missing the `?page=` part, which is strange. Example: `gf_entries&view=entry&id=35&lid=5212&filter=&paged=1`
 	 */
-	function add_edit_link( $form_id = NULL, $field_id = NULL, $value = NULL, $lead = array(), $query_string = NULL ) {
+	function add_edit_link($form_id = NULL, $field_id = NULL, $value = NULL, $lead = array(), $query_string = NULL) {
 
 		$params = array(
 			'page' => 'gf_entries',
@@ -63,7 +63,7 @@ 
 
 		<span class="edit edit_entry">
 			|
-		    <a title="<?php esc_attr_e( 'Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url( add_query_arg( $params, admin_url( 'admin.php?page='.$query_string ) ) ); ?>"><?php esc_html_e( 'Edit', 'gravityview' ); ?></a>
+		    <a title="<?php esc_attr_e('Edit this entry', 'gravityview'); ?>" href="<?php echo esc_url(add_query_arg($params, admin_url('admin.php?page='.$query_string))); ?>"><?php esc_html_e('Edit', 'gravityview'); ?></a>
 		</span>
 		<?php
 	}

includes/admin/field-types/type_checkbox.php

Spacing +12 added lines, -12 removed lines

@@ -8,24 +8,24 @@ 
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>">
 			<?php $this->render_input(); ?>
-			&nbsp;<?php echo $this->get_field_label() . $this->get_tooltip() . $this->get_field_desc(); ?>
+			&nbsp;<?php echo $this->get_field_label().$this->get_tooltip().$this->get_field_desc(); ?>
 		</label>
 		<?php
 	}
 
-	function render_setting( $override_input = NULL ) {
+	function render_setting($override_input = NULL) {
 
-		if( $this->get_field_left_label() ) { ?>
+		if ($this->get_field_left_label()) { ?>
 
 			<td scope="row">
 				<label for="<?php echo $this->get_field_id(); ?>">
-					<?php echo $this->get_field_left_label() . $this->get_tooltip(); ?>
+					<?php echo $this->get_field_left_label().$this->get_tooltip(); ?>
 				</label>
 			</td>
 			<td>
 				<label>
-				<?php $this->render_input( $override_input ); ?>
-				&nbsp;<?php echo $this->get_field_label() . $this->get_tooltip() . $this->get_field_desc(); ?>
+				<?php $this->render_input($override_input); ?>
+				&nbsp;<?php echo $this->get_field_label().$this->get_tooltip().$this->get_field_desc(); ?>
 				</label>
 			</td>
 
@@ -33,23 +33,23 @@ 
 
 			<td scope="row" colspan="2">
 				<label for="<?php echo $this->get_field_id(); ?>">
-					<?php $this->render_input( $override_input ); ?>
-					&nbsp;<?php echo $this->get_field_label() . $this->get_tooltip() . $this->get_field_desc(); ?>
+					<?php $this->render_input($override_input); ?>
+					&nbsp;<?php echo $this->get_field_label().$this->get_tooltip().$this->get_field_desc(); ?>
 				</label>
 			</td>
 
 		<?php }
 	}
 
-	function render_input( $override_input = NULL ) {
-		if( isset( $override_input ) ) {
+	function render_input($override_input = NULL) {
+		if (isset($override_input)) {
 			echo $override_input;
 			return;
 		}
 
 		?>
-		<input name="<?php echo esc_attr( $this->name ); ?>" type="hidden" value="0" />
-       	<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="checkbox" value="1" <?php checked( $this->value, '1', true ); ?> />
+		<input name="<?php echo esc_attr($this->name); ?>" type="hidden" value="0" />
+       	<input name="<?php echo esc_attr($this->name); ?>" id="<?php echo $this->get_field_id(); ?>" type="checkbox" value="1" <?php checked($this->value, '1', true); ?> />
        	<?php
 	}
 

includes/admin/field-types/type_hidden.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		$class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
 
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />

Spacing +4 added lines, -4 removed lines

@@ -8,17 +8,17 @@
 		$this->render_input();
 	}
 
-	function render_input( $override_input = null ) {
+	function render_input($override_input = null) {
 
-		if( isset( $override_input ) ) {
+		if (isset($override_input)) {
 			echo $override_input;
 			return;
 		}
 
-        $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+        $class = !empty($this->field['class']) ? $this->field['class'] : 'widefat';
 
 		?>
-		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" />
+		<input name="<?php echo esc_attr($this->name); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr($this->value); ?>" class="<?php echo esc_attr($class); ?>" />
 		<?php
 	}