gravityview / GravityView

includes/admin/class-gravityview-support-port.php

Spacing +74 added lines, -74 removed lines

@@ -25,12 +25,12 @@ 
 	 * @since 1.15
 	 */
 	function add_hooks() {
-		add_action( 'personal_options', array( $this, 'user_field' ) );
-		add_action( 'personal_options_update', array( $this, 'update_user_meta_value' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'update_user_meta_value' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'maybe_enqueue_script' ), 1000 );
-		add_action( 'update_option_active_plugins', array( $this, 'flush_related_plugins_transient' ) );
-		add_action( 'update_option_active_sitewide_plugins', array( $this, 'flush_related_plugins_transient' ) );
+		add_action('personal_options', array($this, 'user_field'));
+		add_action('personal_options_update', array($this, 'update_user_meta_value'));
+		add_action('edit_user_profile_update', array($this, 'update_user_meta_value'));
+		add_action('admin_enqueue_scripts', array($this, 'maybe_enqueue_script'), 1000);
+		add_action('update_option_active_plugins', array($this, 'flush_related_plugins_transient'));
+		add_action('update_option_active_sitewide_plugins', array($this, 'flush_related_plugins_transient'));
 	}
 
 	/**
@@ -42,11 +42,11 @@ 
 	 *
 	 * @return void
 	 */
-	static function maybe_enqueue_script( $hook ) {
+	static function maybe_enqueue_script($hook) {
 		global $pagenow;
 
 		// Don't show if not GravityView page, or if we're on the Widgets page
-		if ( ! gravityview_is_admin_page( $hook ) || $pagenow === 'widgets.php' ) {
+		if (!gravityview_is_admin_page($hook) || $pagenow === 'widgets.php') {
 			return;
 		}
 
@@ -55,17 +55,17 @@ 
 		 * @since 1.15
 		 * @param boolean $display_beacon Default: `true`
 		 */
-		$display_support_port = apply_filters( 'gravityview/support_port/display', self::show_for_user() );
+		$display_support_port = apply_filters('gravityview/support_port/display', self::show_for_user());
 
-		if ( empty( $display_support_port ) ) {
-			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not showing Support Port' );
+		if (empty($display_support_port)) {
+			do_action('gravityview_log_debug', __METHOD__.' - Not showing Support Port');
 
 			return;
 		}
 
-		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-		wp_enqueue_script( 'gravityview-support', plugins_url( 'assets/js/support' . $script_debug . '.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version, true );
+		wp_enqueue_script('gravityview-support', plugins_url('assets/js/support'.$script_debug.'.js', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version, true);
 
 		self::_localize_script();
 	}
@@ -80,30 +80,30 @@ 
 	private static function _localize_script() {
 
 		$translation = array(
-			'agentLabel'                => __( 'GravityView Support', 'gravityview' ),
-			'searchLabel'               => __( 'Search GravityView Docs', 'gravityview' ),
-			'searchErrorLabel'          => __( 'Your search timed out. Please double-check your internet connection and try again.', 'gravityview' ),
-			'noResultsLabel'            => _x( 'No results found for', 'a support form search has returned empty for the following word', 'gravityview' ),
-			'contactLabel'              => __( 'Contact Support', 'gravityview' ),
-			'attachFileLabel'           => __( 'Attach a screenshot or file', 'gravityview' ),
-			'attachFileError'           => __( 'The maximum file size is 10 MB', 'gravityview' ),
-			'nameLabel'                 => __( 'Your Name', 'gravityview' ),
-			'nameError'                 => __( 'Please enter your name', 'gravityview' ),
-			'emailLabel'                => __( 'Email address', 'gravityview' ),
-			'emailError'                => __( 'Please enter a valid email address', 'gravityview' ),
-			'subjectLabel'              => __( 'Subject', 'gravityview' ),
-			'subjectError'              => _x( 'Please enter a subject', 'Error shown when submitting support request and there is no subject provided', 'gravityview' ),
-			'messageLabel'              => __( 'How can we help you?', 'gravityview' ),
-			'messageError'              => _x( 'Please enter a message', 'Error shown when submitting support request and there is no message provided', 'gravityview' ),
-			'contactSuccessLabel'       => __( 'Message sent!', 'gravityview' ),
-			'contactSuccessDescription' => __( 'Thanks for reaching out! Someone from the GravityView team will get back to you soon.', 'gravityview' ),
+			'agentLabel'                => __('GravityView Support', 'gravityview'),
+			'searchLabel'               => __('Search GravityView Docs', 'gravityview'),
+			'searchErrorLabel'          => __('Your search timed out. Please double-check your internet connection and try again.', 'gravityview'),
+			'noResultsLabel'            => _x('No results found for', 'a support form search has returned empty for the following word', 'gravityview'),
+			'contactLabel'              => __('Contact Support', 'gravityview'),
+			'attachFileLabel'           => __('Attach a screenshot or file', 'gravityview'),
+			'attachFileError'           => __('The maximum file size is 10 MB', 'gravityview'),
+			'nameLabel'                 => __('Your Name', 'gravityview'),
+			'nameError'                 => __('Please enter your name', 'gravityview'),
+			'emailLabel'                => __('Email address', 'gravityview'),
+			'emailError'                => __('Please enter a valid email address', 'gravityview'),
+			'subjectLabel'              => __('Subject', 'gravityview'),
+			'subjectError'              => _x('Please enter a subject', 'Error shown when submitting support request and there is no subject provided', 'gravityview'),
+			'messageLabel'              => __('How can we help you?', 'gravityview'),
+			'messageError'              => _x('Please enter a message', 'Error shown when submitting support request and there is no message provided', 'gravityview'),
+			'contactSuccessLabel'       => __('Message sent!', 'gravityview'),
+			'contactSuccessDescription' => __('Thanks for reaching out! Someone from the GravityView team will get back to you soon.', 'gravityview'),
 			#'topicLabel' => __('Select a topic', 'gravityview' ), // Not yet implemented
 			#'topicError' => __('Please select a topic from the list', 'gravityview' ), // Not yet implemented
 		);
 
-		$response = GravityView_Settings::getSetting( 'license_key_response' );
+		$response = GravityView_Settings::getSetting('license_key_response');
 
-		$response = wp_parse_args( $response, array(
+		$response = wp_parse_args($response, array(
 			'license'          => '',
 			'message'          => '',
 			'license_key'      => '',
@@ -114,12 +114,12 @@ 
 			'payment_id'       => '',
 			'customer_name'    => '',
 			'customer_email'   => '',
-		) );
+		));
 
 		// This is just HTML we don't need.
-		unset( $response['message'] );
+		unset($response['message']);
 
-		switch ( intval( $response['license_limit'] ) ) {
+		switch (intval($response['license_limit'])) {
 			case 1:
 				$package = 'Sol';
 				break;
@@ -130,17 +130,17 @@ 
 				$package = 'Interstellar';
 				break;
 			default:
-				$package = sprintf( '%d-Site License', $response['license_limit'] );
+				$package = sprintf('%d-Site License', $response['license_limit']);
 		}
 
 		$data = array(
-			'email'                 => GravityView_Settings::getSetting( 'support-email' ),
+			'email'                 => GravityView_Settings::getSetting('support-email'),
 			'name'                  => $response['customer_name'],
-			'Valid License?'        => ucwords( $response['license'] ),
+			'Valid License?'        => ucwords($response['license']),
 			'License Key'           => $response['license_key'],
 			'License Level'         => $package,
-			'Site Admin Email'      => get_bloginfo( 'admin_email' ),
-			'Support Email'         => GravityView_Settings::getSetting( 'support-email' ),
+			'Site Admin Email'      => get_bloginfo('admin_email'),
+			'Support Email'         => GravityView_Settings::getSetting('support-email'),
 			'License Limit'         => $response['license_limit'],
 			'Site Count'            => $response['site_count'],
 			'License Expires'       => $response['expires'],
@@ -148,7 +148,7 @@ 
 			'Payment ID'            => $response['payment_id'],
 			'Payment Name'          => $response['customer_name'],
 			'Payment Email'         => $response['customer_email'],
-			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
+			'WordPress Version'     => get_bloginfo('version', 'display'),
 			'PHP Version'           => phpversion(),
 			'GravityView Version'   => GravityView_Plugin::version,
 			'Gravity Forms Version' => GFForms::$version,
@@ -156,15 +156,15 @@ 
 		);
 
 		$localization_data = array(
-			'contactEnabled' => (int)current_user_can( 'gravityview_contact_support' ), // @todo use GVCommon::has_cap() after merge
-			'protocol' => ( is_ssl() ? 'https' : 'http' ),
+			'contactEnabled' => (int)current_user_can('gravityview_contact_support'), // @todo use GVCommon::has_cap() after merge
+			'protocol' => (is_ssl() ? 'https' : 'http'),
 			'data' => $data,
 			'translation' => $translation,
 		);
 
-		wp_localize_script( 'gravityview-support', 'gvSupport', $localization_data );
+		wp_localize_script('gravityview-support', 'gvSupport', $localization_data);
 
-		unset( $localization_data, $data, $translation, $response, $package );
+		unset($localization_data, $data, $translation, $response, $package);
 	}
 
 	/**
@@ -175,36 +175,36 @@ 
 	 */
 	static private function get_related_plugins_and_extensions() {
 
-		if ( ! function_exists( 'wp_get_active_and_valid_plugins' ) ) {
+		if (!function_exists('wp_get_active_and_valid_plugins')) {
 			return 'Running < WP 3.0';
 		}
 
-		$extensions = get_site_transient( self::related_plugins_key );
+		$extensions = get_site_transient(self::related_plugins_key);
 
-		if ( empty( $extensions ) ) {
+		if (empty($extensions)) {
 
 			$active_plugins = wp_get_active_and_valid_plugins();
 			$extensions = array();
-			foreach ( $active_plugins as $active_plugin ) {
+			foreach ($active_plugins as $active_plugin) {
 
 				// Match gravityview, gravity-forms, gravityforms, gravitate
-				if ( ! preg_match( '/(gravityview|gravity-?forms|gravitate)/ism', $active_plugin ) ) {
+				if (!preg_match('/(gravityview|gravity-?forms|gravitate)/ism', $active_plugin)) {
 					continue;
 				}
 
-				$plugin_data = get_plugin_data( $active_plugin );
+				$plugin_data = get_plugin_data($active_plugin);
 
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
+				$extensions[] = sprintf('%s %s', $plugin_data['Name'], $plugin_data['Version']);
 			}
 
-			if( $extensions ) {
-				set_site_transient( self::related_plugins_key, $extensions, HOUR_IN_SECONDS );
+			if ($extensions) {
+				set_site_transient(self::related_plugins_key, $extensions, HOUR_IN_SECONDS);
 			} else {
 				return 'There was an error fetching related plugins.';
 			}
 		}
 		
-		return implode( '<br />', $extensions );
+		return implode('<br />', $extensions);
 	}
 
 	/**
@@ -214,8 +214,8 @@ 
 	 * @since 1.15
 	 */
 	public function flush_related_plugins_transient() {
-		if ( function_exists( 'delete_site_transient' ) ) {
-			delete_site_transient( self::related_plugins_key );
+		if (function_exists('delete_site_transient')) {
+			delete_site_transient(self::related_plugins_key);
 		}
 	}
 
@@ -231,20 +231,20 @@ 
 	 *
 	 * @return bool Whether to show GravityView support
 	 */
-	static public function show_for_user( $user = 0 ) {
+	static public function show_for_user($user = 0) {
 
-		if ( ! GVCommon::has_cap( 'gravityview_support_port' ) ) {
+		if (!GVCommon::has_cap('gravityview_support_port')) {
 			return false;
 		}
 
-		$pref = get_user_option( self::user_pref_name, $user );
+		$pref = get_user_option(self::user_pref_name, $user);
 
 		// Not set; default to plugin setting
-		if ( false === $pref ) {
-			return GravityView_Settings::getSetting( 'support_port' );
+		if (false === $pref) {
+			return GravityView_Settings::getSetting('support_port');
 		}
 
-		return ! empty( $pref );
+		return !empty($pref);
 	}
 
 
@@ -257,9 +257,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function update_user_meta_value( $user_id ) {
-		if ( current_user_can( 'edit_user', $user_id ) && isset( $_POST[ self::user_pref_name ] ) ) {
-			update_user_meta( $user_id, self::user_pref_name, intval( $_POST[ self::user_pref_name ] ) );
+	public function update_user_meta_value($user_id) {
+		if (current_user_can('edit_user', $user_id) && isset($_POST[self::user_pref_name])) {
+			update_user_meta($user_id, self::user_pref_name, intval($_POST[self::user_pref_name]));
 		}
 	}
 
@@ -274,7 +274,7 @@ 
 	 *
 	 * @return void
 	 */
-	function user_field( $user ) {
+	function user_field($user) {
 
 		/**
 		 * @filter `gravityview/support_port/show_profile_setting` Should the "GravityView Support Port" setting be shown on user profiles?
@@ -284,21 +284,21 @@ 
 		 * @param boolean $allow_profile_setting Default: `true`, if the user has the `gravityview_support_port` capability, which defaults to true for Contributors and higher
 		 * @param WP_User $user Current user object
 		 */
-		$allow_profile_setting = apply_filters( 'gravityview/support_port/show_profile_setting', current_user_can( 'gravityview_support_port' ), $user );
+		$allow_profile_setting = apply_filters('gravityview/support_port/show_profile_setting', current_user_can('gravityview_support_port'), $user);
 
-		if ( $allow_profile_setting && current_user_can( 'edit_user', $user->ID ) ) {
+		if ($allow_profile_setting && current_user_can('edit_user', $user->ID)) {
 			?>
 			<table class="form-table">
 				<tbody>
 					<tr class="user-gravityview-support-button-wrap">
-						<th scope="row"><?php _e( 'GravityView Support Port', 'gravityview' ); ?></th>
+						<th scope="row"><?php _e('GravityView Support Port', 'gravityview'); ?></th>
 						<td>
 							<fieldset>
-								<legend class="screen-reader-text"><span><?php _e( 'GravityView Support Port', 'gravityview' ) ?></span></legend>
+								<legend class="screen-reader-text"><span><?php _e('GravityView Support Port', 'gravityview') ?></span></legend>
 								<label>
-									<input name="<?php echo esc_attr( self::user_pref_name ); ?>" type="hidden" value="0"/>
-									<input name="<?php echo esc_attr( self::user_pref_name ); ?>" type="checkbox" value="1" <?php checked( self::show_for_user( $user->ID ) ); ?> />
-									<?php esc_html_e( 'Show GravityView Support Port when on a GravityView-related page', 'gravityview' ); ?>
+									<input name="<?php echo esc_attr(self::user_pref_name); ?>" type="hidden" value="0"/>
+									<input name="<?php echo esc_attr(self::user_pref_name); ?>" type="checkbox" value="1" <?php checked(self::show_for_user($user->ID)); ?> />
+									<?php esc_html_e('Show GravityView Support Port when on a GravityView-related page', 'gravityview'); ?>
 								</label>
 							</fieldset>
 						</td>

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

Indentation +4 added lines, -4 removed lines

@@ -18,10 +18,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="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">

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
 	}
 

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
 	}