gravityview / GravityView

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

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
 	}
 

includes/admin/field-types/type_number.php

Spacing +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@ 
  * number input type
  */
 
-if( !class_exists('GravityView_FieldType_text') ) {
-	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
+if (!class_exists('GravityView_FieldType_text')) {
+	include_once(GRAVITYVIEW_DIR.'includes/admin/field-types/type_text.php');
 }
 class GravityView_FieldType_number extends GravityView_FieldType_text {
 
-	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+	function render_input($override_input = null) {
+		if (isset($override_input)) {
 			echo $override_input;
 			return;
 		}
@@ -18,13 +18,13 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ($show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force') {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
-        $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="number" 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="number" value="<?php echo esc_attr($this->value); ?>" class="<?php echo esc_attr($class); ?>">
 		<?php
 	}
 

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
-        }
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
+		}
+		$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="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

includes/admin/field-types/type_radio.php

Spacing +4 added lines, -4 removed lines

@@ -18,15 +18,15 @@
 
 	}
 
-	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+	function render_input($override_input = null) {
+		if (isset($override_input)) {
 			echo $override_input;
 			return;
 		}
 
-		foreach( $this->field['options'] as $value => $label ) : ?>
+		foreach ($this->field['options'] as $value => $label) : ?>
 		<label class="<?php echo $this->get_label_class(); ?>">
-			<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>-<?php echo esc_attr( $value ); ?>" type="radio" value="<?php echo esc_attr( $value ); ?>" <?php checked( $value, $this->value, true ); ?> />&nbsp;<?php echo esc_html( $label ); ?>
+			<input name="<?php echo esc_attr($this->name); ?>" id="<?php echo $this->get_field_id(); ?>-<?php echo esc_attr($value); ?>" type="radio" value="<?php echo esc_attr($value); ?>" <?php checked($value, $this->value, true); ?> />&nbsp;<?php echo esc_html($label); ?>
 		</label>
 <?php
 		endforeach;

includes/admin/field-types/type_select.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
 
 			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
 
-			echo $this->get_tooltip() . $this->get_field_desc();
+			echo $this->get_tooltip().$this->get_field_desc();
 
 			$this->render_input();
 
@@ -19,15 +19,15 @@ 
 		<?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;
 		}
 		?>
-		<select name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>">
-			<?php foreach( $this->field['options'] as $value => $label ) : ?>
-				<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $this->value, true ); ?>><?php echo esc_html( $label ); ?></option>
+		<select name="<?php echo esc_attr($this->name); ?>" id="<?php echo $this->get_field_id(); ?>">
+			<?php foreach ($this->field['options'] as $value => $label) : ?>
+				<option value="<?php echo esc_attr($value); ?>" <?php selected($value, $this->value, true); ?>><?php echo esc_html($label); ?></option>
 			<?php endforeach; ?>
 		</select>
 		<?php

includes/admin/field-types/type_text.php

Indentation +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
-        }
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
+		}
+		$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="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
 			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
-			echo $this->get_tooltip() . $this->get_field_desc();
+			echo $this->get_tooltip().$this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
 			</div>
@@ -17,9 +17,9 @@ 
 		<?php
 	}
 
-	function render_input( $override_input = null ) {
+	function render_input($override_input = null) {
 
-		if( isset( $override_input ) ) {
+		if (isset($override_input)) {
 			echo $override_input;
 			return;
 		}
@@ -28,13 +28,13 @@ 
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ($show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force') {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
-        $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="text" 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="text" value="<?php echo esc_attr($this->value); ?>" class="<?php echo esc_attr($class); ?>">
 		<?php
 	}