gravityview / GravityView

includes/fields/class-gravityview-field-consent.php

Indentation +110 added lines, -110 removed lines

@@ -10,116 +10,116 @@
  */
 class GravityView_Field_Consent extends GravityView_Field
 {
-    public $name = 'consent';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['is', 'isnot'];
-
-    public $_gf_field_class_name = 'GF_Field_Consent';
-
-    public $group = 'standard';
-
-    public $icon = 'dashicons-text-page';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Consent', 'gravityview');
-
-        parent::__construct();
-
-        add_filter('gravityview/template/field/consent/output', [$this, 'field_output'], 10, 2);
-    }
-
-    /**
-     * Returns the value of the consent field based on the field settings.
-     *
-     * @param string               $output  Existing default $display_value for the field
-     * @param \GV\Template_Context $context
-     *
-     * @return string
-     */
-    public function field_output($output, $context)
-    {
-        $configuration = $context->field->as_configuration();
-
-        /** @var GF_Field_Consent $consent_field */
-        $consent_field = $context->field->field;
-
-        switch (\GV\Utils::get($configuration, 'choice_display')) {
-            case 'tick':
-                return $consent_field->checked_indicator_markup;
-            case 'label':
-
-                $revision_id = absint(trim($context->value[$context->field->ID.'.3']));
-
-                // Gravity Forms performs a DB query for consent output. Let's reduce queries
-                // and cache each version we find.
-                static $_consent_field_cache = [];
-                $_cache_key = "{$consent_field->formId}_{$consent_field->ID}_{$revision_id}";
-
-                // We have a cache hit!
-                if (!empty($_consent_field_cache[$_cache_key])) {
-                    return $_consent_field_cache[$_cache_key];
-                }
-
-                $description = $consent_field->get_field_description_from_revision($revision_id);
-
-                // There was no "description" value set when submitted. Use the checkbox value instead.
-                if (!$description) {
-                    $description = $consent_field->checkboxLabel;
-                }
-
-                $_consent_field_cache[$_cache_key] = $description;
-
-                return $description;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Add `choice_display` setting to the field.
-     *
-     * @param array  $field_options
-     * @param string $template_id
-     * @param string $field_id
-     * @param string $context
-     * @param string $input_type
-     *
-     * @since 1.17
-     *
-     * @return array
-     */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-
-        // Set the $_field_id var
-        $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
-
-        if (floor($field_id) !== floatval($field_id)) {
-            $default = 'tick';
-        } else {
-            $default = 'both';
-        }
-
-        $field_options['choice_display'] = [
-            'type'    => 'radio',
-            'class'   => 'vertical',
-            'label'   => __('What should be displayed:', 'gravityview'),
-            'value'   => $default,
-            'desc'    => '',
-            'choices' => [
-                'both'  => __('Consent image with description', 'gravityview'),
-                'tick'  => __('Consent image', 'gravityview'),
-                'label' => __('Consent description', 'gravityview'),
-            ],
-            'priorty' => 100,
-            'group'   => 'display',
-        ];
-
-        return $field_options;
-    }
+	public $name = 'consent';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['is', 'isnot'];
+
+	public $_gf_field_class_name = 'GF_Field_Consent';
+
+	public $group = 'standard';
+
+	public $icon = 'dashicons-text-page';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Consent', 'gravityview');
+
+		parent::__construct();
+
+		add_filter('gravityview/template/field/consent/output', [$this, 'field_output'], 10, 2);
+	}
+
+	/**
+	 * Returns the value of the consent field based on the field settings.
+	 *
+	 * @param string               $output  Existing default $display_value for the field
+	 * @param \GV\Template_Context $context
+	 *
+	 * @return string
+	 */
+	public function field_output($output, $context)
+	{
+		$configuration = $context->field->as_configuration();
+
+		/** @var GF_Field_Consent $consent_field */
+		$consent_field = $context->field->field;
+
+		switch (\GV\Utils::get($configuration, 'choice_display')) {
+			case 'tick':
+				return $consent_field->checked_indicator_markup;
+			case 'label':
+
+				$revision_id = absint(trim($context->value[$context->field->ID.'.3']));
+
+				// Gravity Forms performs a DB query for consent output. Let's reduce queries
+				// and cache each version we find.
+				static $_consent_field_cache = [];
+				$_cache_key = "{$consent_field->formId}_{$consent_field->ID}_{$revision_id}";
+
+				// We have a cache hit!
+				if (!empty($_consent_field_cache[$_cache_key])) {
+					return $_consent_field_cache[$_cache_key];
+				}
+
+				$description = $consent_field->get_field_description_from_revision($revision_id);
+
+				// There was no "description" value set when submitted. Use the checkbox value instead.
+				if (!$description) {
+					$description = $consent_field->checkboxLabel;
+				}
+
+				$_consent_field_cache[$_cache_key] = $description;
+
+				return $description;
+		}
+
+		return $output;
+	}
+
+	/**
+	 * Add `choice_display` setting to the field.
+	 *
+	 * @param array  $field_options
+	 * @param string $template_id
+	 * @param string $field_id
+	 * @param string $context
+	 * @param string $input_type
+	 *
+	 * @since 1.17
+	 *
+	 * @return array
+	 */
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+
+		// Set the $_field_id var
+		$field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+
+		if (floor($field_id) !== floatval($field_id)) {
+			$default = 'tick';
+		} else {
+			$default = 'both';
+		}
+
+		$field_options['choice_display'] = [
+			'type'    => 'radio',
+			'class'   => 'vertical',
+			'label'   => __('What should be displayed:', 'gravityview'),
+			'value'   => $default,
+			'desc'    => '',
+			'choices' => [
+				'both'  => __('Consent image with description', 'gravityview'),
+				'tick'  => __('Consent image', 'gravityview'),
+				'label' => __('Consent description', 'gravityview'),
+			],
+			'priorty' => 100,
+			'group'   => 'display',
+		];
+
+		return $field_options;
+	}
 }
 
 new GravityView_Field_Consent();

Spacing +20 added lines, -20 removed lines

@@ -14,7 +14,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot'];
+    public $search_operators = [ 'is', 'isnot' ];
 
     public $_gf_field_class_name = 'GF_Field_Consent';
 
@@ -24,11 +24,11 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Consent', 'gravityview');
+        $this->label = esc_html__( 'Consent', 'gravityview' );
 
         parent::__construct();
 
-        add_filter('gravityview/template/field/consent/output', [$this, 'field_output'], 10, 2);
+        add_filter( 'gravityview/template/field/consent/output', [ $this, 'field_output' ], 10, 2 );
     }
 
     /**
@@ -39,38 +39,38 @@ 
      *
      * @return string
      */
-    public function field_output($output, $context)
+    public function field_output( $output, $context )
     {
         $configuration = $context->field->as_configuration();
 
         /** @var GF_Field_Consent $consent_field */
         $consent_field = $context->field->field;
 
-        switch (\GV\Utils::get($configuration, 'choice_display')) {
+        switch ( \GV\Utils::get( $configuration, 'choice_display' ) ) {
             case 'tick':
                 return $consent_field->checked_indicator_markup;
             case 'label':
 
-                $revision_id = absint(trim($context->value[$context->field->ID.'.3']));
+                $revision_id = absint( trim( $context->value[ $context->field->ID . '.3' ] ) );
 
                 // Gravity Forms performs a DB query for consent output. Let's reduce queries
                 // and cache each version we find.
-                static $_consent_field_cache = [];
+                static $_consent_field_cache = [ ];
                 $_cache_key = "{$consent_field->formId}_{$consent_field->ID}_{$revision_id}";
 
                 // We have a cache hit!
-                if (!empty($_consent_field_cache[$_cache_key])) {
-                    return $_consent_field_cache[$_cache_key];
+                if ( ! empty( $_consent_field_cache[ $_cache_key ] ) ) {
+                    return $_consent_field_cache[ $_cache_key ];
                 }
 
-                $description = $consent_field->get_field_description_from_revision($revision_id);
+                $description = $consent_field->get_field_description_from_revision( $revision_id );
 
                 // There was no "description" value set when submitted. Use the checkbox value instead.
-                if (!$description) {
+                if ( ! $description ) {
                     $description = $consent_field->checkboxLabel;
                 }
 
-                $_consent_field_cache[$_cache_key] = $description;
+                $_consent_field_cache[ $_cache_key ] = $description;
 
                 return $description;
         }
@@ -91,28 +91,28 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
 
         // Set the $_field_id var
-        $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+        $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-        if (floor($field_id) !== floatval($field_id)) {
+        if ( floor( $field_id ) !== floatval( $field_id ) ) {
             $default = 'tick';
         } else {
             $default = 'both';
         }
 
-        $field_options['choice_display'] = [
+        $field_options[ 'choice_display' ] = [
             'type'    => 'radio',
             'class'   => 'vertical',
-            'label'   => __('What should be displayed:', 'gravityview'),
+            'label'   => __( 'What should be displayed:', 'gravityview' ),
             'value'   => $default,
             'desc'    => '',
             'choices' => [
-                'both'  => __('Consent image with description', 'gravityview'),
-                'tick'  => __('Consent image', 'gravityview'),
-                'label' => __('Consent description', 'gravityview'),
+                'both'  => __( 'Consent image with description', 'gravityview' ),
+                'tick'  => __( 'Consent image', 'gravityview' ),
+                'label' => __( 'Consent description', 'gravityview' ),
             ],
             'priorty' => 100,
             'group'   => 'display',

Braces +4 added lines, -8 removed lines

@@ -8,8 +8,7 @@ 
 /**
  * @since 2.10
  */
-class GravityView_Field_Consent extends GravityView_Field
-{
+class GravityView_Field_Consent extends GravityView_Field {
     public $name = 'consent';
 
     public $is_searchable = true;
@@ -22,8 +21,7 @@ 
 
     public $icon = 'dashicons-text-page';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Consent', 'gravityview');
 
         parent::__construct();
@@ -39,8 +37,7 @@ 
      *
      * @return string
      */
-    public function field_output($output, $context)
-    {
+    public function field_output($output, $context) {
         $configuration = $context->field->as_configuration();
 
         /** @var GF_Field_Consent $consent_field */
@@ -91,8 +88,7 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
 
         // Set the $_field_id var
         $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);

includes/fields/class-gravityview-field-number.php

Indentation +40 added lines, -40 removed lines

@@ -12,46 +12,46 @@
  */
 class GravityView_Field_Number extends GravityView_Field
 {
-    public $name = 'number';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
-
-    /** @see GF_Field_Number */
-    public $_gf_field_class_name = 'GF_Field_Number';
-
-    public $group = 'standard';
-
-    public $icon = 'dashicons-editor-ol';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Number', 'gravityview');
-        parent::__construct();
-    }
-
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-        $field_options['number_format'] = [
-            'type'  => 'checkbox',
-            'label' => __('Format number?', 'gravityview'),
-            'desc'  => __('Display numbers with thousands separators.', 'gravityview'),
-            'value' => false,
-            'group' => 'field',
-        ];
-
-        $field_options['decimals'] = [
-            'type'       => 'number',
-            'label'      => __('Decimals', 'gravityview'),
-            'desc'       => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
-            'value'      => '',
-            'merge_tags' => false,
-            'group'      => 'field',
-        ];
-
-        return $field_options;
-    }
+	public $name = 'number';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
+
+	/** @see GF_Field_Number */
+	public $_gf_field_class_name = 'GF_Field_Number';
+
+	public $group = 'standard';
+
+	public $icon = 'dashicons-editor-ol';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Number', 'gravityview');
+		parent::__construct();
+	}
+
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+		$field_options['number_format'] = [
+			'type'  => 'checkbox',
+			'label' => __('Format number?', 'gravityview'),
+			'desc'  => __('Display numbers with thousands separators.', 'gravityview'),
+			'value' => false,
+			'group' => 'field',
+		];
+
+		$field_options['decimals'] = [
+			'type'       => 'number',
+			'label'      => __('Decimals', 'gravityview'),
+			'desc'       => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
+			'value'      => '',
+			'merge_tags' => false,
+			'group'      => 'field',
+		];
+
+		return $field_options;
+	}
 }
 
 new GravityView_Field_Number();

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
+    public $search_operators = [ 'is', 'isnot', 'greater_than', 'less_than' ];
 
     /** @see GF_Field_Number */
     public $_gf_field_class_name = 'GF_Field_Number';
@@ -27,24 +27,24 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Number', 'gravityview');
+        $this->label = esc_html__( 'Number', 'gravityview' );
         parent::__construct();
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
-        $field_options['number_format'] = [
+        $field_options[ 'number_format' ] = [
             'type'  => 'checkbox',
-            'label' => __('Format number?', 'gravityview'),
-            'desc'  => __('Display numbers with thousands separators.', 'gravityview'),
+            'label' => __( 'Format number?', 'gravityview' ),
+            'desc'  => __( 'Display numbers with thousands separators.', 'gravityview' ),
             'value' => false,
             'group' => 'field',
         ];
 
-        $field_options['decimals'] = [
+        $field_options[ 'decimals' ] = [
             'type'       => 'number',
-            'label'      => __('Decimals', 'gravityview'),
-            'desc'       => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
+            'label'      => __( 'Decimals', 'gravityview' ),
+            'desc'       => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ),
             'value'      => '',
             'merge_tags' => false,
             'group'      => 'field',

Braces +3 added lines, -6 removed lines

@@ -10,8 +10,7 @@ 
  *
  * @since 1.13
  */
-class GravityView_Field_Number extends GravityView_Field
-{
+class GravityView_Field_Number extends GravityView_Field {
     public $name = 'number';
 
     public $is_searchable = true;
@@ -25,14 +24,12 @@ 
 
     public $icon = 'dashicons-editor-ol';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Number', 'gravityview');
         parent::__construct();
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
         $field_options['number_format'] = [
             'type'  => 'checkbox',
             'label' => __('Format number?', 'gravityview'),

includes/fields/class-gravityview-field-phone.php

Indentation +49 added lines, -49 removed lines

@@ -4,55 +4,55 @@
  */
 class GravityView_Field_Phone extends GravityView_Field
 {
-    public $name = 'phone';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
-
-    /** @see GF_Field_Phone */
-    public $_gf_field_class_name = 'GF_Field_Phone';
-
-    public $group = 'advanced';
-
-    public $icon = 'dashicons-smartphone';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Phone', 'gravityview');
-        parent::__construct();
-    }
-
-    /**
-     * Add option to link phone number.
-     *
-     * @since 1.17
-     *
-     * @param array  $field_options
-     * @param string $template_id
-     * @param string $field_id
-     * @param string $context
-     * @param string $input_type
-     *
-     * @return array
-     */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-        if ('edit' === $context) {
-            return $field_options;
-        }
-
-        $field_options['link_phone'] = [
-            'type'     => 'checkbox',
-            'label'    => __('Make Phone Number Clickable', 'gravityview'),
-            'desc'     => __('Allow dialing a number by clicking it?', 'gravityview'),
-            'value'    => true,
-            'group'    => 'display',
-            'priority' => 100,
-        ];
-
-        return $field_options;
-    }
+	public $name = 'phone';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
+
+	/** @see GF_Field_Phone */
+	public $_gf_field_class_name = 'GF_Field_Phone';
+
+	public $group = 'advanced';
+
+	public $icon = 'dashicons-smartphone';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Phone', 'gravityview');
+		parent::__construct();
+	}
+
+	/**
+	 * Add option to link phone number.
+	 *
+	 * @since 1.17
+	 *
+	 * @param array  $field_options
+	 * @param string $template_id
+	 * @param string $field_id
+	 * @param string $context
+	 * @param string $input_type
+	 *
+	 * @return array
+	 */
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+		if ('edit' === $context) {
+			return $field_options;
+		}
+
+		$field_options['link_phone'] = [
+			'type'     => 'checkbox',
+			'label'    => __('Make Phone Number Clickable', 'gravityview'),
+			'desc'     => __('Allow dialing a number by clicking it?', 'gravityview'),
+			'value'    => true,
+			'group'    => 'display',
+			'priority' => 100,
+		];
+
+		return $field_options;
+	}
 }
 
 new GravityView_Field_Phone();

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
+    public $search_operators = [ 'is', 'isnot', 'contains', 'starts_with', 'ends_with' ];
 
     /** @see GF_Field_Phone */
     public $_gf_field_class_name = 'GF_Field_Phone';
@@ -19,7 +19,7 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Phone', 'gravityview');
+        $this->label = esc_html__( 'Phone', 'gravityview' );
         parent::__construct();
     }
 
@@ -36,16 +36,16 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
-        if ('edit' === $context) {
+        if ( 'edit' === $context ) {
             return $field_options;
         }
 
-        $field_options['link_phone'] = [
+        $field_options[ 'link_phone' ] = [
             'type'     => 'checkbox',
-            'label'    => __('Make Phone Number Clickable', 'gravityview'),
-            'desc'     => __('Allow dialing a number by clicking it?', 'gravityview'),
+            'label'    => __( 'Make Phone Number Clickable', 'gravityview' ),
+            'desc'     => __( 'Allow dialing a number by clicking it?', 'gravityview' ),
             'value'    => true,
             'group'    => 'display',
             'priority' => 100,

Braces +3 added lines, -6 removed lines

@@ -2,8 +2,7 @@ 
 /**
  * @file class-gravityview-field-phone.php
  */
-class GravityView_Field_Phone extends GravityView_Field
-{
+class GravityView_Field_Phone extends GravityView_Field {
     public $name = 'phone';
 
     public $is_searchable = true;
@@ -17,8 +16,7 @@ 
 
     public $icon = 'dashicons-smartphone';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Phone', 'gravityview');
         parent::__construct();
     }
@@ -36,8 +34,7 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
         if ('edit' === $context) {
             return $field_options;
         }

includes/fields/class-gravityview-field-is-approved.php

Indentation +188 added lines, -188 removed lines

@@ -4,194 +4,194 @@
  */
 class GravityView_Field_Is_Approved extends GravityView_Field
 {
-    public $name = 'is_approved';
-
-    public $search_operators = ['is', 'isnot'];
-
-    public $contexts = ['single', 'multiple'];
-
-    public $group = 'meta';
-
-    public $is_sortable = true;
-
-    public $is_numeric = true;
-
-    public $is_searchable = true;
-
-    /**
-     * @var string Approval status is stored in entry meta under this key
-     *
-     * @since 1.18
-     */
-    public $entry_meta_key = 'is_approved';
-
-    /**
-     * @var bool Don't add to the "columns to display" list; GravityView adds our own approval column
-     *
-     * @since 1.18
-     */
-    public $entry_meta_is_default_column = false;
-
-    public $_custom_merge_tag = 'approval_status';
-
-    public $icon = 'dashicons-yes-alt';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Approval Status', 'gravityview');
-        $this->description = esc_html__('Display the entry\'s current approval status.', 'gravityview');
-        $this->default_search_label = __('Approval:', 'gravityview');
-
-        $this->add_hooks();
-
-        parent::__construct();
-    }
-
-    private function add_hooks()
-    {
-        add_filter('gravityview_entry_default_fields', [$this, 'add_default_field'], 10, 3);
-    }
-
-    /**
-     * Convert entry approval status value to label in the field output. Uses labels from the field setting.
-     *
-     * @since 2.10
-     *
-     * @param string $approval_status Status to pass to {@see GravityView_Entry_Approval_Status::maybe_convert_status}
-     * @param bool   $html            Whether to return HTML or plaintext string value
-     *
-     * @return string The field setting label for the current status. Uses defaults, if not configured.
-     */
-    public static function get_output($approval_status = '', $field_settings = [], $html = false)
-    {
-        $status = GravityView_Entry_Approval_Status::maybe_convert_status($approval_status);
-        $status_key = GravityView_Entry_Approval_Status::get_key($status);
-
-        // "approved_label", "unapproved_label", "disapproved_label" setting keys
-        $field_setting_key = sprintf('%s_label', $status_key);
-
-        $default_label = GravityView_Entry_Approval_Status::get_label($status);
-
-        $value = \GV\Utils::get($field_settings, $field_setting_key, $default_label);
-        if (empty($value)) {
-            $value = $default_label;
-        }
-
-        if (!$html) {
-            return $value;
-        }
-
-        return sprintf('<span class="gv-approval-%s">%s</span>', esc_attr($status_key), $value);
-    }
-
-    /**
-     * @filter `gravityview_entry_default_fields`
-     *
-     * @param array        $entry_default_fields Array of fields shown by default
-     * @param string|array $form                 form_ID or form object
-     * @param string       $zone                 Either 'single', 'directory', 'header', 'footer'
-     *
-     * @return array
-     */
-    public function add_default_field($entry_default_fields, $form, $zone)
-    {
-        if ('edit' !== $zone) {
-            $entry_default_fields[$this->name] = [
-                'label' => $this->label,
-                'desc'  => $this->description,
-                'type'  => $this->name,
-            ];
-        }
-
-        return $entry_default_fields;
-    }
-
-    /**
-     * Add custom merge tags to merge tag options.
-     *
-     * @since 1.16
-     *
-     * @param array      $form   GF Form array
-     * @param GF_Field[] $fields Array of fields in the form
-     *
-     * @return array Modified merge tags
-     */
-    protected function custom_merge_tags($form = [], $fields = [])
-    {
-        $merge_tags = [
-            [
-                'label' => __('Approval Status', 'gravityview'),
-                'tag'   => '{approval_status}',
-            ],
-        ];
-
-        return $merge_tags;
-    }
-
-    /**
-     * Display the approval status of an entry.
-     *
-     * @see https://docs.gravityview.co/article/389-approvalstatus-merge-tag Read how to use the `{approval_status}` merge tag
-     * @since 1.18
-     *
-     * @param array  $matches    Array of Merge Tag matches found in text by preg_match_all
-     * @param string $text       Text to replace
-     * @param array  $form       Gravity Forms form array
-     * @param array  $entry      Entry array
-     * @param bool   $url_encode Whether to URL-encode output
-     * @param bool   $esc_html   Whether to apply `esc_html()` to output
-     *
-     * @return string Text, with user variables replaced, if they existed
-     */
-    public function replace_merge_tag($matches = [], $text = '', $form = [], $entry = [], $url_encode = false, $esc_html = false)
-    {
-        $return = $text;
-
-        /**
-         * @var array $match {
-         * @var string $match[0] Full matched merge tag ("{gv_approval}")
-         * @var string $match[1] Modifier ("value", "label", or empty string)
-         *            }
-         */
-        foreach ($matches as $match) {
-            if (empty($entry)) {
-                gravityview()->log->error('No entry data available. Returning empty string.');
-                $replacement = '';
-            } else {
-                $replacement = GravityView_Entry_Approval::get_entry_status($entry, $match[1]);
-            }
-
-            $return = str_replace($match[0], $replacement, $return);
-        }
-
-        return $return;
-    }
-
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-        $field_options['approved_label'] = [
-            'type'        => 'text',
-            'label'       => __('Approved Label', 'gravityview'),
-            'desc'        => __('If the entry is approved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
-        ];
-
-        $field_options['disapproved_label'] = [
-            'type'        => 'text',
-            'label'       => __('Disapproved Label', 'gravityview'),
-            'desc'        => __('If the entry is not approved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
-        ];
-
-        $field_options['unapproved_label'] = [
-            'type'        => 'text',
-            'label'       => __('Unapproved Label', 'gravityview'),
-            'desc'        => __('If the entry has not yet been approved or disapproved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
-        ];
-
-        return $field_options;
-    }
+	public $name = 'is_approved';
+
+	public $search_operators = ['is', 'isnot'];
+
+	public $contexts = ['single', 'multiple'];
+
+	public $group = 'meta';
+
+	public $is_sortable = true;
+
+	public $is_numeric = true;
+
+	public $is_searchable = true;
+
+	/**
+	 * @var string Approval status is stored in entry meta under this key
+	 *
+	 * @since 1.18
+	 */
+	public $entry_meta_key = 'is_approved';
+
+	/**
+	 * @var bool Don't add to the "columns to display" list; GravityView adds our own approval column
+	 *
+	 * @since 1.18
+	 */
+	public $entry_meta_is_default_column = false;
+
+	public $_custom_merge_tag = 'approval_status';
+
+	public $icon = 'dashicons-yes-alt';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Approval Status', 'gravityview');
+		$this->description = esc_html__('Display the entry\'s current approval status.', 'gravityview');
+		$this->default_search_label = __('Approval:', 'gravityview');
+
+		$this->add_hooks();
+
+		parent::__construct();
+	}
+
+	private function add_hooks()
+	{
+		add_filter('gravityview_entry_default_fields', [$this, 'add_default_field'], 10, 3);
+	}
+
+	/**
+	 * Convert entry approval status value to label in the field output. Uses labels from the field setting.
+	 *
+	 * @since 2.10
+	 *
+	 * @param string $approval_status Status to pass to {@see GravityView_Entry_Approval_Status::maybe_convert_status}
+	 * @param bool   $html            Whether to return HTML or plaintext string value
+	 *
+	 * @return string The field setting label for the current status. Uses defaults, if not configured.
+	 */
+	public static function get_output($approval_status = '', $field_settings = [], $html = false)
+	{
+		$status = GravityView_Entry_Approval_Status::maybe_convert_status($approval_status);
+		$status_key = GravityView_Entry_Approval_Status::get_key($status);
+
+		// "approved_label", "unapproved_label", "disapproved_label" setting keys
+		$field_setting_key = sprintf('%s_label', $status_key);
+
+		$default_label = GravityView_Entry_Approval_Status::get_label($status);
+
+		$value = \GV\Utils::get($field_settings, $field_setting_key, $default_label);
+		if (empty($value)) {
+			$value = $default_label;
+		}
+
+		if (!$html) {
+			return $value;
+		}
+
+		return sprintf('<span class="gv-approval-%s">%s</span>', esc_attr($status_key), $value);
+	}
+
+	/**
+	 * @filter `gravityview_entry_default_fields`
+	 *
+	 * @param array        $entry_default_fields Array of fields shown by default
+	 * @param string|array $form                 form_ID or form object
+	 * @param string       $zone                 Either 'single', 'directory', 'header', 'footer'
+	 *
+	 * @return array
+	 */
+	public function add_default_field($entry_default_fields, $form, $zone)
+	{
+		if ('edit' !== $zone) {
+			$entry_default_fields[$this->name] = [
+				'label' => $this->label,
+				'desc'  => $this->description,
+				'type'  => $this->name,
+			];
+		}
+
+		return $entry_default_fields;
+	}
+
+	/**
+	 * Add custom merge tags to merge tag options.
+	 *
+	 * @since 1.16
+	 *
+	 * @param array      $form   GF Form array
+	 * @param GF_Field[] $fields Array of fields in the form
+	 *
+	 * @return array Modified merge tags
+	 */
+	protected function custom_merge_tags($form = [], $fields = [])
+	{
+		$merge_tags = [
+			[
+				'label' => __('Approval Status', 'gravityview'),
+				'tag'   => '{approval_status}',
+			],
+		];
+
+		return $merge_tags;
+	}
+
+	/**
+	 * Display the approval status of an entry.
+	 *
+	 * @see https://docs.gravityview.co/article/389-approvalstatus-merge-tag Read how to use the `{approval_status}` merge tag
+	 * @since 1.18
+	 *
+	 * @param array  $matches    Array of Merge Tag matches found in text by preg_match_all
+	 * @param string $text       Text to replace
+	 * @param array  $form       Gravity Forms form array
+	 * @param array  $entry      Entry array
+	 * @param bool   $url_encode Whether to URL-encode output
+	 * @param bool   $esc_html   Whether to apply `esc_html()` to output
+	 *
+	 * @return string Text, with user variables replaced, if they existed
+	 */
+	public function replace_merge_tag($matches = [], $text = '', $form = [], $entry = [], $url_encode = false, $esc_html = false)
+	{
+		$return = $text;
+
+		/**
+		 * @var array $match {
+		 * @var string $match[0] Full matched merge tag ("{gv_approval}")
+		 * @var string $match[1] Modifier ("value", "label", or empty string)
+		 *            }
+		 */
+		foreach ($matches as $match) {
+			if (empty($entry)) {
+				gravityview()->log->error('No entry data available. Returning empty string.');
+				$replacement = '';
+			} else {
+				$replacement = GravityView_Entry_Approval::get_entry_status($entry, $match[1]);
+			}
+
+			$return = str_replace($match[0], $replacement, $return);
+		}
+
+		return $return;
+	}
+
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+		$field_options['approved_label'] = [
+			'type'        => 'text',
+			'label'       => __('Approved Label', 'gravityview'),
+			'desc'        => __('If the entry is approved, display this value', 'gravityview'),
+			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
+		];
+
+		$field_options['disapproved_label'] = [
+			'type'        => 'text',
+			'label'       => __('Disapproved Label', 'gravityview'),
+			'desc'        => __('If the entry is not approved, display this value', 'gravityview'),
+			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
+		];
+
+		$field_options['unapproved_label'] = [
+			'type'        => 'text',
+			'label'       => __('Unapproved Label', 'gravityview'),
+			'desc'        => __('If the entry has not yet been approved or disapproved, display this value', 'gravityview'),
+			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
+		];
+
+		return $field_options;
+	}
 }
 
 new GravityView_Field_Is_Approved();

Spacing +39 added lines, -39 removed lines

@@ -6,9 +6,9 @@ 
 {
     public $name = 'is_approved';
 
-    public $search_operators = ['is', 'isnot'];
+    public $search_operators = [ 'is', 'isnot' ];
 
-    public $contexts = ['single', 'multiple'];
+    public $contexts = [ 'single', 'multiple' ];
 
     public $group = 'meta';
 
@@ -38,9 +38,9 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Approval Status', 'gravityview');
-        $this->description = esc_html__('Display the entry\'s current approval status.', 'gravityview');
-        $this->default_search_label = __('Approval:', 'gravityview');
+        $this->label = esc_html__( 'Approval Status', 'gravityview' );
+        $this->description = esc_html__( 'Display the entry\'s current approval status.', 'gravityview' );
+        $this->default_search_label = __( 'Approval:', 'gravityview' );
 
         $this->add_hooks();
 
@@ -49,7 +49,7 @@ 
 
     private function add_hooks()
     {
-        add_filter('gravityview_entry_default_fields', [$this, 'add_default_field'], 10, 3);
+        add_filter( 'gravityview_entry_default_fields', [ $this, 'add_default_field' ], 10, 3 );
     }
 
     /**
@@ -62,26 +62,26 @@ 
      *
      * @return string The field setting label for the current status. Uses defaults, if not configured.
      */
-    public static function get_output($approval_status = '', $field_settings = [], $html = false)
+    public static function get_output( $approval_status = '', $field_settings = [ ], $html = false )
     {
-        $status = GravityView_Entry_Approval_Status::maybe_convert_status($approval_status);
-        $status_key = GravityView_Entry_Approval_Status::get_key($status);
+        $status = GravityView_Entry_Approval_Status::maybe_convert_status( $approval_status );
+        $status_key = GravityView_Entry_Approval_Status::get_key( $status );
 
         // "approved_label", "unapproved_label", "disapproved_label" setting keys
-        $field_setting_key = sprintf('%s_label', $status_key);
+        $field_setting_key = sprintf( '%s_label', $status_key );
 
-        $default_label = GravityView_Entry_Approval_Status::get_label($status);
+        $default_label = GravityView_Entry_Approval_Status::get_label( $status );
 
-        $value = \GV\Utils::get($field_settings, $field_setting_key, $default_label);
-        if (empty($value)) {
+        $value = \GV\Utils::get( $field_settings, $field_setting_key, $default_label );
+        if ( empty( $value ) ) {
             $value = $default_label;
         }
 
-        if (!$html) {
+        if ( ! $html ) {
             return $value;
         }
 
-        return sprintf('<span class="gv-approval-%s">%s</span>', esc_attr($status_key), $value);
+        return sprintf( '<span class="gv-approval-%s">%s</span>', esc_attr( $status_key ), $value );
     }
 
     /**
@@ -93,10 +93,10 @@ 
      *
      * @return array
      */
-    public function add_default_field($entry_default_fields, $form, $zone)
+    public function add_default_field( $entry_default_fields, $form, $zone )
     {
-        if ('edit' !== $zone) {
-            $entry_default_fields[$this->name] = [
+        if ( 'edit' !== $zone ) {
+            $entry_default_fields[ $this->name ] = [
                 'label' => $this->label,
                 'desc'  => $this->description,
                 'type'  => $this->name,
@@ -116,11 +116,11 @@ 
      *
      * @return array Modified merge tags
      */
-    protected function custom_merge_tags($form = [], $fields = [])
+    protected function custom_merge_tags( $form = [ ], $fields = [ ] )
     {
         $merge_tags = [
             [
-                'label' => __('Approval Status', 'gravityview'),
+                'label' => __( 'Approval Status', 'gravityview' ),
                 'tag'   => '{approval_status}',
             ],
         ];
@@ -143,7 +143,7 @@ 
      *
      * @return string Text, with user variables replaced, if they existed
      */
-    public function replace_merge_tag($matches = [], $text = '', $form = [], $entry = [], $url_encode = false, $esc_html = false)
+    public function replace_merge_tag( $matches = [ ], $text = '', $form = [ ], $entry = [ ], $url_encode = false, $esc_html = false )
     {
         $return = $text;
 
@@ -153,41 +153,41 @@ 
          * @var string $match[1] Modifier ("value", "label", or empty string)
          *            }
          */
-        foreach ($matches as $match) {
-            if (empty($entry)) {
-                gravityview()->log->error('No entry data available. Returning empty string.');
+        foreach ( $matches as $match ) {
+            if ( empty( $entry ) ) {
+                gravityview()->log->error( 'No entry data available. Returning empty string.' );
                 $replacement = '';
             } else {
-                $replacement = GravityView_Entry_Approval::get_entry_status($entry, $match[1]);
+                $replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
             }
 
-            $return = str_replace($match[0], $replacement, $return);
+            $return = str_replace( $match[ 0 ], $replacement, $return );
         }
 
         return $return;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
-        $field_options['approved_label'] = [
+        $field_options[ 'approved_label' ] = [
             'type'        => 'text',
-            'label'       => __('Approved Label', 'gravityview'),
-            'desc'        => __('If the entry is approved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
+            'label'       => __( 'Approved Label', 'gravityview' ),
+            'desc'        => __( 'If the entry is approved, display this value', 'gravityview' ),
+            'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
         ];
 
-        $field_options['disapproved_label'] = [
+        $field_options[ 'disapproved_label' ] = [
             'type'        => 'text',
-            'label'       => __('Disapproved Label', 'gravityview'),
-            'desc'        => __('If the entry is not approved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
+            'label'       => __( 'Disapproved Label', 'gravityview' ),
+            'desc'        => __( 'If the entry is not approved, display this value', 'gravityview' ),
+            'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
         ];
 
-        $field_options['unapproved_label'] = [
+        $field_options[ 'unapproved_label' ] = [
             'type'        => 'text',
-            'label'       => __('Unapproved Label', 'gravityview'),
-            'desc'        => __('If the entry has not yet been approved or disapproved, display this value', 'gravityview'),
-            'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
+            'label'       => __( 'Unapproved Label', 'gravityview' ),
+            'desc'        => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
+            'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
         ];
 
         return $field_options;

Braces +8 added lines, -16 removed lines

@@ -2,8 +2,7 @@ 
 /**
  * @file class-gravityview-field-is-approved.php
  */
-class GravityView_Field_Is_Approved extends GravityView_Field
-{
+class GravityView_Field_Is_Approved extends GravityView_Field {
     public $name = 'is_approved';
 
     public $search_operators = ['is', 'isnot'];
@@ -36,8 +35,7 @@ 
 
     public $icon = 'dashicons-yes-alt';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Approval Status', 'gravityview');
         $this->description = esc_html__('Display the entry\'s current approval status.', 'gravityview');
         $this->default_search_label = __('Approval:', 'gravityview');
@@ -47,8 +45,7 @@ 
         parent::__construct();
     }
 
-    private function add_hooks()
-    {
+    private function add_hooks() {
         add_filter('gravityview_entry_default_fields', [$this, 'add_default_field'], 10, 3);
     }
 
@@ -62,8 +59,7 @@ 
      *
      * @return string The field setting label for the current status. Uses defaults, if not configured.
      */
-    public static function get_output($approval_status = '', $field_settings = [], $html = false)
-    {
+    public static function get_output($approval_status = '', $field_settings = [], $html = false) {
         $status = GravityView_Entry_Approval_Status::maybe_convert_status($approval_status);
         $status_key = GravityView_Entry_Approval_Status::get_key($status);
 
@@ -93,8 +89,7 @@ 
      *
      * @return array
      */
-    public function add_default_field($entry_default_fields, $form, $zone)
-    {
+    public function add_default_field($entry_default_fields, $form, $zone) {
         if ('edit' !== $zone) {
             $entry_default_fields[$this->name] = [
                 'label' => $this->label,
@@ -116,8 +111,7 @@ 
      *
      * @return array Modified merge tags
      */
-    protected function custom_merge_tags($form = [], $fields = [])
-    {
+    protected function custom_merge_tags($form = [], $fields = []) {
         $merge_tags = [
             [
                 'label' => __('Approval Status', 'gravityview'),
@@ -143,8 +137,7 @@ 
      *
      * @return string Text, with user variables replaced, if they existed
      */
-    public function replace_merge_tag($matches = [], $text = '', $form = [], $entry = [], $url_encode = false, $esc_html = false)
-    {
+    public function replace_merge_tag($matches = [], $text = '', $form = [], $entry = [], $url_encode = false, $esc_html = false) {
         $return = $text;
 
         /**
@@ -167,8 +160,7 @@ 
         return $return;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
         $field_options['approved_label'] = [
             'type'        => 'text',
             'label'       => __('Approved Label', 'gravityview'),

includes/fields/class-gravityview-field-radio.php

Indentation +53 added lines, -53 removed lines

@@ -4,59 +4,59 @@
  */
 class GravityView_Field_Radio extends GravityView_Field
 {
-    public $name = 'radio';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['is', 'in', 'not in', 'isnot', 'contains'];
-
-    public $_gf_field_class_name = 'GF_Field_Radio';
-
-    public $group = 'standard';
-
-    public $icon = 'dashicons-marker';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Radio Buttons', 'gravityview');
-        parent::__construct();
-    }
-
-    /**
-     * Add `choice_display` setting to the field.
-     *
-     * @param array  $field_options
-     * @param string $template_id
-     * @param string $field_id
-     * @param string $context
-     * @param string $input_type
-     *
-     * @since 1.17
-     *
-     * @return array
-     */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-
-        // Set the $_field_id var
-        $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
-
-        if ($this->is_choice_value_enabled()) {
-            $field_options['choice_display'] = [
-                'type'    => 'radio',
-                'value'   => 'value',
-                'label'   => __('What should be displayed:', 'gravityview'),
-                'desc'    => __('This input has a label and a value. What should be displayed?', 'gravityview'),
-                'choices' => [
-                    'value' => __('Value of the input', 'gravityview'),
-                    'label' => __('Label of the input', 'gravityview'),
-                ],
-                'group'   => 'display',
-            ];
-        }
-
-        return $field_options;
-    }
+	public $name = 'radio';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['is', 'in', 'not in', 'isnot', 'contains'];
+
+	public $_gf_field_class_name = 'GF_Field_Radio';
+
+	public $group = 'standard';
+
+	public $icon = 'dashicons-marker';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Radio Buttons', 'gravityview');
+		parent::__construct();
+	}
+
+	/**
+	 * Add `choice_display` setting to the field.
+	 *
+	 * @param array  $field_options
+	 * @param string $template_id
+	 * @param string $field_id
+	 * @param string $context
+	 * @param string $input_type
+	 *
+	 * @since 1.17
+	 *
+	 * @return array
+	 */
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+
+		// Set the $_field_id var
+		$field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+
+		if ($this->is_choice_value_enabled()) {
+			$field_options['choice_display'] = [
+				'type'    => 'radio',
+				'value'   => 'value',
+				'label'   => __('What should be displayed:', 'gravityview'),
+				'desc'    => __('This input has a label and a value. What should be displayed?', 'gravityview'),
+				'choices' => [
+					'value' => __('Value of the input', 'gravityview'),
+					'label' => __('Label of the input', 'gravityview'),
+				],
+				'group'   => 'display',
+			];
+		}
+
+		return $field_options;
+	}
 }
 
 new GravityView_Field_Radio();

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'in', 'not in', 'isnot', 'contains'];
+    public $search_operators = [ 'is', 'in', 'not in', 'isnot', 'contains' ];
 
     public $_gf_field_class_name = 'GF_Field_Radio';
 
@@ -18,7 +18,7 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Radio Buttons', 'gravityview');
+        $this->label = esc_html__( 'Radio Buttons', 'gravityview' );
         parent::__construct();
     }
 
@@ -35,21 +35,21 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
 
         // Set the $_field_id var
-        $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+        $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-        if ($this->is_choice_value_enabled()) {
-            $field_options['choice_display'] = [
+        if ( $this->is_choice_value_enabled() ) {
+            $field_options[ 'choice_display' ] = [
                 'type'    => 'radio',
                 'value'   => 'value',
-                'label'   => __('What should be displayed:', 'gravityview'),
-                'desc'    => __('This input has a label and a value. What should be displayed?', 'gravityview'),
+                'label'   => __( 'What should be displayed:', 'gravityview' ),
+                'desc'    => __( 'This input has a label and a value. What should be displayed?', 'gravityview' ),
                 'choices' => [
-                    'value' => __('Value of the input', 'gravityview'),
-                    'label' => __('Label of the input', 'gravityview'),
+                    'value' => __( 'Value of the input', 'gravityview' ),
+                    'label' => __( 'Label of the input', 'gravityview' ),
                 ],
                 'group'   => 'display',
             ];

Braces +3 added lines, -6 removed lines

@@ -2,8 +2,7 @@ 
 /**
  * @file class-gravityview-field-radio.php
  */
-class GravityView_Field_Radio extends GravityView_Field
-{
+class GravityView_Field_Radio extends GravityView_Field {
     public $name = 'radio';
 
     public $is_searchable = true;
@@ -16,8 +15,7 @@ 
 
     public $icon = 'dashicons-marker';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Radio Buttons', 'gravityview');
         parent::__construct();
     }
@@ -35,8 +33,7 @@ 
      *
      * @return array
      */
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
 
         // Set the $_field_id var
         $field_options = parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);

includes/fields/class-gravityview-field-entry-link.php

Indentation +79 added lines, -79 removed lines

@@ -8,85 +8,85 @@
  */
 class GravityView_Field_Entry_Link extends GravityView_Field
 {
-    public $name = 'entry_link';
-
-    public $contexts = ['multiple'];
-
-    /**
-     * @var bool
-     *
-     * @since 1.15.3
-     */
-    public $is_sortable = false;
-
-    /**
-     * @var bool
-     *
-     * @since 1.15.3
-     */
-    public $is_searchable = false;
-
-    public $group = 'gravityview';
-
-    public $icon = 'dashicons-media-default';
-
-    public function __construct()
-    {
-        $this->label = esc_html__('Link to Single Entry', 'gravityview');
-        $this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
-        parent::__construct();
-    }
-
-    /**
-     * Add as a default field, outside those set in the Gravity Form form.
-     *
-     * @since 2.10 Moved here from GravityView_Admin_Views::get_entry_default_fields
-     *
-     * @param array        $entry_default_fields Existing fields
-     * @param string|array $form                 form_ID or form object
-     * @param string       $zone                 Either 'single', 'directory', 'edit', 'header', 'footer'
-     *
-     * @return array
-     */
-    public function add_default_field($entry_default_fields, $form = [], $zone = '')
-    {
-        if ('directory' !== $zone) {
-            return $entry_default_fields;
-        }
-
-        $entry_default_fields[$this->name] = [
-            'label' => $this->label,
-            'type'  => $this->name,
-            'desc'  => $this->description,
-            'icon'  => $this->icon,
-        ];
-
-        return $entry_default_fields;
-    }
-
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-
-        // Always a link!
-        unset($field_options['show_as_link'], $field_options['search_filter']);
-
-        if ('edit' === $context) {
-            return $field_options;
-        }
-
-        $add_options = [];
-        $add_options['entry_link_text'] = [
-            'type'       => 'text',
-            'label'      => __('Link Text:', 'gravityview'),
-            'desc'       => null,
-            'value'      => __('View Details', 'gravityview'),
-            'merge_tags' => true,
-        ];
-
-        $this->add_field_support('new_window', $field_options);
-
-        return $add_options + $field_options;
-    }
+	public $name = 'entry_link';
+
+	public $contexts = ['multiple'];
+
+	/**
+	 * @var bool
+	 *
+	 * @since 1.15.3
+	 */
+	public $is_sortable = false;
+
+	/**
+	 * @var bool
+	 *
+	 * @since 1.15.3
+	 */
+	public $is_searchable = false;
+
+	public $group = 'gravityview';
+
+	public $icon = 'dashicons-media-default';
+
+	public function __construct()
+	{
+		$this->label = esc_html__('Link to Single Entry', 'gravityview');
+		$this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
+		parent::__construct();
+	}
+
+	/**
+	 * Add as a default field, outside those set in the Gravity Form form.
+	 *
+	 * @since 2.10 Moved here from GravityView_Admin_Views::get_entry_default_fields
+	 *
+	 * @param array        $entry_default_fields Existing fields
+	 * @param string|array $form                 form_ID or form object
+	 * @param string       $zone                 Either 'single', 'directory', 'edit', 'header', 'footer'
+	 *
+	 * @return array
+	 */
+	public function add_default_field($entry_default_fields, $form = [], $zone = '')
+	{
+		if ('directory' !== $zone) {
+			return $entry_default_fields;
+		}
+
+		$entry_default_fields[$this->name] = [
+			'label' => $this->label,
+			'type'  => $this->name,
+			'desc'  => $this->description,
+			'icon'  => $this->icon,
+		];
+
+		return $entry_default_fields;
+	}
+
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+
+		// Always a link!
+		unset($field_options['show_as_link'], $field_options['search_filter']);
+
+		if ('edit' === $context) {
+			return $field_options;
+		}
+
+		$add_options = [];
+		$add_options['entry_link_text'] = [
+			'type'       => 'text',
+			'label'      => __('Link Text:', 'gravityview'),
+			'desc'       => null,
+			'value'      => __('View Details', 'gravityview'),
+			'merge_tags' => true,
+		];
+
+		$this->add_field_support('new_window', $field_options);
+
+		return $add_options + $field_options;
+	}
 }
 
 new GravityView_Field_Entry_Link();

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
 {
     public $name = 'entry_link';
 
-    public $contexts = ['multiple'];
+    public $contexts = [ 'multiple' ];
 
     /**
      * @var bool
@@ -32,8 +32,8 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Link to Single Entry', 'gravityview');
-        $this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
+        $this->label = esc_html__( 'Link to Single Entry', 'gravityview' );
+        $this->description = esc_html__( 'A dedicated link to the single entry with customizable text.', 'gravityview' );
         parent::__construct();
     }
 
@@ -48,13 +48,13 @@ 
      *
      * @return array
      */
-    public function add_default_field($entry_default_fields, $form = [], $zone = '')
+    public function add_default_field( $entry_default_fields, $form = [ ], $zone = '' )
     {
-        if ('directory' !== $zone) {
+        if ( 'directory' !== $zone ) {
             return $entry_default_fields;
         }
 
-        $entry_default_fields[$this->name] = [
+        $entry_default_fields[ $this->name ] = [
             'label' => $this->label,
             'type'  => $this->name,
             'desc'  => $this->description,
@@ -64,26 +64,26 @@ 
         return $entry_default_fields;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
 
         // Always a link!
-        unset($field_options['show_as_link'], $field_options['search_filter']);
+        unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
 
-        if ('edit' === $context) {
+        if ( 'edit' === $context ) {
             return $field_options;
         }
 
-        $add_options = [];
-        $add_options['entry_link_text'] = [
+        $add_options = [ ];
+        $add_options[ 'entry_link_text' ] = [
             'type'       => 'text',
-            'label'      => __('Link Text:', 'gravityview'),
+            'label'      => __( 'Link Text:', 'gravityview' ),
             'desc'       => null,
-            'value'      => __('View Details', 'gravityview'),
+            'value'      => __( 'View Details', 'gravityview' ),
             'merge_tags' => true,
         ];
 
-        $this->add_field_support('new_window', $field_options);
+        $this->add_field_support( 'new_window', $field_options );
 
         return $add_options + $field_options;
     }

Braces +4 added lines, -8 removed lines

@@ -6,8 +6,7 @@ 
 /**
  * Add custom options for entry_link fields.
  */
-class GravityView_Field_Entry_Link extends GravityView_Field
-{
+class GravityView_Field_Entry_Link extends GravityView_Field {
     public $name = 'entry_link';
 
     public $contexts = ['multiple'];
@@ -30,8 +29,7 @@ 
 
     public $icon = 'dashicons-media-default';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Link to Single Entry', 'gravityview');
         $this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
         parent::__construct();
@@ -48,8 +46,7 @@ 
      *
      * @return array
      */
-    public function add_default_field($entry_default_fields, $form = [], $zone = '')
-    {
+    public function add_default_field($entry_default_fields, $form = [], $zone = '') {
         if ('directory' !== $zone) {
             return $entry_default_fields;
         }
@@ -64,8 +61,7 @@ 
         return $entry_default_fields;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
 
         // Always a link!
         unset($field_options['show_as_link'], $field_options['search_filter']);

includes/fields/class-gravityview-field-time.php

Indentation +318 added lines, -318 removed lines

@@ -8,324 +8,324 @@
  */
 class GravityView_Field_Time extends GravityView_Field
 {
-    public $name = 'time';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
-
-    /** @see GF_Field_Time */
-    public $_gf_field_class_name = 'GF_Field_Time';
-
-    public $group = 'advanced';
-
-    public $icon = 'dashicons-clock';
-
-    /**
-     * @internal Do not define. This is overridden by the class using a filter.
-     *
-     * @todo Fix using variable for time field
-     */
-    public $is_numeric;
-
-    /**
-     * @var string The part of the Gravity Forms query that's modified to enable sorting by time. `value` gets replaced.
-     *
-     * @since 1.14
-     */
-    const GF_SORTING_SQL = 'SELECT 0 as query, lead_id as id, value';
-
-    /**
-     * @var string Used to implode and explode the custom sort key for query modification.
-     *
-     * @since 1.14
-     */
-    private $_sort_divider = '|:time:|';
-
-    /**
-     * @var string Used to store the time format for the field ("12" or "24") so it can be used in the query filter
-     *
-     * @since 1.14
-     */
-    private $_time_format = null;
-
-    /**
-     * @var string Used to store the date format for the field, based on the input being displayed, so it can be used in the query filter
-     *
-     * @since 1.14
-     */
-    private $_date_format = null;
-
-    /**
-     * GravityView_Field_Time constructor.
-     */
-    public function __construct()
-    {
-        $this->label = esc_html__('Time', 'gravityview');
-
-        parent::__construct();
-
-        add_filter('gravityview/sorting/time', [$this, 'modify_sort_id'], 10, 2);
-
-        add_filter('gravityview_search_criteria', [$this, '_maybe_filter_gravity_forms_query'], 10, 4);
-    }
-
-    /**
-     * Modify the sort key for the time field so it can be parsed by the query filter.
-     *
-     * @see _modify_query_sort_by_time_hack
-     * @since 1.14
-     *
-     * @param string $sort_field_id Existing sort field ID (like "5")
-     * @param int    $form_id       Gravity Forms Form ID being sorted
-     *
-     * @return string Modified sort key imploded with $_sort_divider, like `5|:time:|12|:time:|h:i A`
-     */
-    public function modify_sort_id($sort_field_id, $form_id)
-    {
-        $time_format = self::_get_time_format_for_field($sort_field_id, $form_id);
-
-        $date_format = self::date_format($time_format, $sort_field_id);
-
-        // Should look something like `5|:time:|12|:time:|h:i A`
-        $new_sort_field_id = implode($this->_sort_divider, [$sort_field_id, $time_format, $date_format]);
-
-        return $new_sort_field_id;
-    }
-
-    /**
-     * If the sorting key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL.
-     *
-     * @since 1.14
-     * @see modify_sort_id()
-     *
-     * @param array $criteria Search criteria used by GravityView
-     * @param array $form_ids Forms to search
-     * @param int   $view_id  ID of the view being used to search
-     *
-     * @return array $criteria If a match, the sorting will be updated to set `is_numeric` to true and make sure the field ID is an int
-     */
-    public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id)
-    {
-
-        // If the search is not being sorted, return early
-        if (empty($criteria['sorting']['key'])) {
-            return $criteria;
-        }
-
-        $pieces = explode($this->_sort_divider, $criteria['sorting']['key']);
-
-        /**
-         * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL.
-         *
-         * @see modify_sort_id()
-         */
-        if (empty($pieces[1])) {
-            return $criteria;
-        }
-
-        // Pass these to the _modify_query_sort_by_time_hack() method
-        $this->_time_format = $pieces[1];
-        $this->_date_format = $pieces[2];
-
-        // Remove fake input IDs (5.1 doesn't exist. Use 5)
-        $criteria['sorting']['key'] = floor($pieces[0]);
-
-        /**
-         * Make sure sorting is numeric (# of seconds). IMPORTANT.
-         *
-         * @see GVCommon::is_field_numeric() is_numeric should also be set here
-         */
-        $criteria['sorting']['is_numeric'] = true;
-
-        // Modify the Gravity Forms WP Query
-        add_filter('query', [$this, '_modify_query_sort_by_time_hack']);
-
-        return $criteria;
-    }
-
-    /**
-     * Modify Gravity Forms query SQL to convert times to numbers
-     * Gravity Forms couldn't sort by time...until NOW.
-     *
-     * @since 1.14
-     *
-     * @param string $query MySQL query
-     *
-     * @return string Modified query, if the query matches the expected Gravity Forms SQL string used for sorting time fields. Otherwise, original query.
-     */
-    public function _modify_query_sort_by_time_hack($query)
-    {
-
-        /**
-         * If this is a Gravity Forms entry selection sorting query, generated by sort_by_field_query(),
-         * then we want to modify the query.
-         *
-         * @see GFFormsModel::sort_by_field_query()
-         */
-        if (strpos($query, self::GF_SORTING_SQL) > 0) {
-            if ($this->_time_format === '24') {
-                $sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
-            } else {
-                $sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
-            }
-
-            switch ($this->_date_format) {
-                case 'h':
-                case 'H':
-                    $modification = "TIME_FORMAT( {$sql_str_to_date}, '%H' )";
-                    break;
-                case 'i':
-                    $modification = "TIME_FORMAT( {$sql_str_to_date}, '%i' )";
-                    break;
-                case 'H:i':
-                case 'h:i A':
-                default:
-                    $modification = "TIME_TO_SEC( {$sql_str_to_date} )";
-            }
-
-            /**
-             * Convert the time (12:30 pm) to the MySQL `TIME_TO_SEC()` value for that time (45000)
-             * This way, Gravity Forms is able to sort numerically.
-             */
-            $replacement_query = str_replace('value', "{$modification} as value", self::GF_SORTING_SQL);
-
-            /**
-             * Replace it in the main query.
-             */
-            $query = str_replace(self::GF_SORTING_SQL, $replacement_query, $query);
-
-            /**
-             * REMOVE the Gravity Forms WP Query modifications!
-             */
-            remove_filter('query', [$this, '_modify_query_sort_by_time_hack']);
-        }
-
-        return $query;
-    }
-
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
-
-        // Set variables
-        parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
-
-        if ('edit' === $context) {
-            return $field_options;
-        }
-
-        /**
-         * Set default date format based on field ID and Form ID.
-         */
-        add_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
-
-        $this->add_field_support('date_display', $field_options);
-
-        remove_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
-
-        return $field_options;
-    }
-
-    /**
-     * Return the field's time format by fetching the form ID and checking the field settings.
-     *
-     * @since 1.14
-     *
-     * @return string Either "12" or "24". "12" is default.
-     */
-    private function _get_time_format()
-    {
-        global $post;
-
-        $current_form = isset($_POST['form_id']) ? intval($_POST['form_id']) : gravityview_get_form_id($post->ID);
-
-        return self::_get_time_format_for_field($this->_field_id, $current_form);
-    }
-
-    /**
-     * Return the field's time format by fetching the form ID and checking the field settings.
-     *
-     * @since 1.14
-     *
-     * @param string $field_id ID for Gravity Forms time field
-     * @param int    $form_id  ID for Gravity Forms form
-     *
-     * @return string Either "12" or "24". "12" is default.
-     */
-    public static function _get_time_format_for_field($field_id, $form_id = 0)
-    {
-
-        // GF defaults to 12, so should we.
-        $time_format = '12';
-
-        if ($form_id) {
-            $form = GFAPI::get_form($form_id);
-
-            if ($form) {
-                $field = GFFormsModel::get_field($form, floor($field_id));
-                if ($field && $field instanceof GF_Field_Time) {
-                    $field->sanitize_settings(); // Make sure time is set
-                    $time_format = $field->timeFormat;
-                }
-            }
-        }
-
-        return $time_format;
-    }
-
-    /**
-     * Modify the default PHP date formats used by the time field based on the field IDs and the field settings.
-     *
-     * @since 1.14
-     *
-     * @return string PHP date() format text to to display the correctly formatted time value for the newly created field
-     */
-    public function _filter_date_display_date_format()
-    {
-        $time_format = $this->_get_time_format();
-        $field_id = $this->_field_id;
-
-        return self::date_format($time_format, $field_id);
-    }
-
-    /**
-     * Get the default date format for a field based on the field ID and the time format setting.
-     *
-     * @since 1.14
-     *
-     * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
-     * @param int    $field_id    The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
-     *
-     * @return string PHP date format for the time
-     */
-    public static function date_format($time_format = '12', $field_id = 0)
-    {
-        $field_input_id = gravityview_get_input_id_from_id($field_id);
-
-        $default = 'h:i A';
-
-        // This doesn't take into account 24-hour
-        switch ($field_input_id) {
-            // Hours
-            case 1:
-                return ($time_format === '12') ? 'h' : 'H';
-                break;
-            // Minutes
-            case 2:
-                return 'i';
-                break;
-            // AM/PM
-            case 3:
-                return 'A';
-                break;
-            // Full time field
-            case 0:
-                return ($time_format === '12') ? $default : 'H:i';
-                break;
-        }
-
-        return $default;
-    }
+	public $name = 'time';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
+
+	/** @see GF_Field_Time */
+	public $_gf_field_class_name = 'GF_Field_Time';
+
+	public $group = 'advanced';
+
+	public $icon = 'dashicons-clock';
+
+	/**
+	 * @internal Do not define. This is overridden by the class using a filter.
+	 *
+	 * @todo Fix using variable for time field
+	 */
+	public $is_numeric;
+
+	/**
+	 * @var string The part of the Gravity Forms query that's modified to enable sorting by time. `value` gets replaced.
+	 *
+	 * @since 1.14
+	 */
+	const GF_SORTING_SQL = 'SELECT 0 as query, lead_id as id, value';
+
+	/**
+	 * @var string Used to implode and explode the custom sort key for query modification.
+	 *
+	 * @since 1.14
+	 */
+	private $_sort_divider = '|:time:|';
+
+	/**
+	 * @var string Used to store the time format for the field ("12" or "24") so it can be used in the query filter
+	 *
+	 * @since 1.14
+	 */
+	private $_time_format = null;
+
+	/**
+	 * @var string Used to store the date format for the field, based on the input being displayed, so it can be used in the query filter
+	 *
+	 * @since 1.14
+	 */
+	private $_date_format = null;
+
+	/**
+	 * GravityView_Field_Time constructor.
+	 */
+	public function __construct()
+	{
+		$this->label = esc_html__('Time', 'gravityview');
+
+		parent::__construct();
+
+		add_filter('gravityview/sorting/time', [$this, 'modify_sort_id'], 10, 2);
+
+		add_filter('gravityview_search_criteria', [$this, '_maybe_filter_gravity_forms_query'], 10, 4);
+	}
+
+	/**
+	 * Modify the sort key for the time field so it can be parsed by the query filter.
+	 *
+	 * @see _modify_query_sort_by_time_hack
+	 * @since 1.14
+	 *
+	 * @param string $sort_field_id Existing sort field ID (like "5")
+	 * @param int    $form_id       Gravity Forms Form ID being sorted
+	 *
+	 * @return string Modified sort key imploded with $_sort_divider, like `5|:time:|12|:time:|h:i A`
+	 */
+	public function modify_sort_id($sort_field_id, $form_id)
+	{
+		$time_format = self::_get_time_format_for_field($sort_field_id, $form_id);
+
+		$date_format = self::date_format($time_format, $sort_field_id);
+
+		// Should look something like `5|:time:|12|:time:|h:i A`
+		$new_sort_field_id = implode($this->_sort_divider, [$sort_field_id, $time_format, $date_format]);
+
+		return $new_sort_field_id;
+	}
+
+	/**
+	 * If the sorting key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL.
+	 *
+	 * @since 1.14
+	 * @see modify_sort_id()
+	 *
+	 * @param array $criteria Search criteria used by GravityView
+	 * @param array $form_ids Forms to search
+	 * @param int   $view_id  ID of the view being used to search
+	 *
+	 * @return array $criteria If a match, the sorting will be updated to set `is_numeric` to true and make sure the field ID is an int
+	 */
+	public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id)
+	{
+
+		// If the search is not being sorted, return early
+		if (empty($criteria['sorting']['key'])) {
+			return $criteria;
+		}
+
+		$pieces = explode($this->_sort_divider, $criteria['sorting']['key']);
+
+		/**
+		 * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL.
+		 *
+		 * @see modify_sort_id()
+		 */
+		if (empty($pieces[1])) {
+			return $criteria;
+		}
+
+		// Pass these to the _modify_query_sort_by_time_hack() method
+		$this->_time_format = $pieces[1];
+		$this->_date_format = $pieces[2];
+
+		// Remove fake input IDs (5.1 doesn't exist. Use 5)
+		$criteria['sorting']['key'] = floor($pieces[0]);
+
+		/**
+		 * Make sure sorting is numeric (# of seconds). IMPORTANT.
+		 *
+		 * @see GVCommon::is_field_numeric() is_numeric should also be set here
+		 */
+		$criteria['sorting']['is_numeric'] = true;
+
+		// Modify the Gravity Forms WP Query
+		add_filter('query', [$this, '_modify_query_sort_by_time_hack']);
+
+		return $criteria;
+	}
+
+	/**
+	 * Modify Gravity Forms query SQL to convert times to numbers
+	 * Gravity Forms couldn't sort by time...until NOW.
+	 *
+	 * @since 1.14
+	 *
+	 * @param string $query MySQL query
+	 *
+	 * @return string Modified query, if the query matches the expected Gravity Forms SQL string used for sorting time fields. Otherwise, original query.
+	 */
+	public function _modify_query_sort_by_time_hack($query)
+	{
+
+		/**
+		 * If this is a Gravity Forms entry selection sorting query, generated by sort_by_field_query(),
+		 * then we want to modify the query.
+		 *
+		 * @see GFFormsModel::sort_by_field_query()
+		 */
+		if (strpos($query, self::GF_SORTING_SQL) > 0) {
+			if ($this->_time_format === '24') {
+				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
+			} else {
+				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
+			}
+
+			switch ($this->_date_format) {
+				case 'h':
+				case 'H':
+					$modification = "TIME_FORMAT( {$sql_str_to_date}, '%H' )";
+					break;
+				case 'i':
+					$modification = "TIME_FORMAT( {$sql_str_to_date}, '%i' )";
+					break;
+				case 'H:i':
+				case 'h:i A':
+				default:
+					$modification = "TIME_TO_SEC( {$sql_str_to_date} )";
+			}
+
+			/**
+			 * Convert the time (12:30 pm) to the MySQL `TIME_TO_SEC()` value for that time (45000)
+			 * This way, Gravity Forms is able to sort numerically.
+			 */
+			$replacement_query = str_replace('value', "{$modification} as value", self::GF_SORTING_SQL);
+
+			/**
+			 * Replace it in the main query.
+			 */
+			$query = str_replace(self::GF_SORTING_SQL, $replacement_query, $query);
+
+			/**
+			 * REMOVE the Gravity Forms WP Query modifications!
+			 */
+			remove_filter('query', [$this, '_modify_query_sort_by_time_hack']);
+		}
+
+		return $query;
+	}
+
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
+
+		// Set variables
+		parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+
+		if ('edit' === $context) {
+			return $field_options;
+		}
+
+		/**
+		 * Set default date format based on field ID and Form ID.
+		 */
+		add_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
+
+		$this->add_field_support('date_display', $field_options);
+
+		remove_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
+
+		return $field_options;
+	}
+
+	/**
+	 * Return the field's time format by fetching the form ID and checking the field settings.
+	 *
+	 * @since 1.14
+	 *
+	 * @return string Either "12" or "24". "12" is default.
+	 */
+	private function _get_time_format()
+	{
+		global $post;
+
+		$current_form = isset($_POST['form_id']) ? intval($_POST['form_id']) : gravityview_get_form_id($post->ID);
+
+		return self::_get_time_format_for_field($this->_field_id, $current_form);
+	}
+
+	/**
+	 * Return the field's time format by fetching the form ID and checking the field settings.
+	 *
+	 * @since 1.14
+	 *
+	 * @param string $field_id ID for Gravity Forms time field
+	 * @param int    $form_id  ID for Gravity Forms form
+	 *
+	 * @return string Either "12" or "24". "12" is default.
+	 */
+	public static function _get_time_format_for_field($field_id, $form_id = 0)
+	{
+
+		// GF defaults to 12, so should we.
+		$time_format = '12';
+
+		if ($form_id) {
+			$form = GFAPI::get_form($form_id);
+
+			if ($form) {
+				$field = GFFormsModel::get_field($form, floor($field_id));
+				if ($field && $field instanceof GF_Field_Time) {
+					$field->sanitize_settings(); // Make sure time is set
+					$time_format = $field->timeFormat;
+				}
+			}
+		}
+
+		return $time_format;
+	}
+
+	/**
+	 * Modify the default PHP date formats used by the time field based on the field IDs and the field settings.
+	 *
+	 * @since 1.14
+	 *
+	 * @return string PHP date() format text to to display the correctly formatted time value for the newly created field
+	 */
+	public function _filter_date_display_date_format()
+	{
+		$time_format = $this->_get_time_format();
+		$field_id = $this->_field_id;
+
+		return self::date_format($time_format, $field_id);
+	}
+
+	/**
+	 * Get the default date format for a field based on the field ID and the time format setting.
+	 *
+	 * @since 1.14
+	 *
+	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
+	 * @param int    $field_id    The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
+	 *
+	 * @return string PHP date format for the time
+	 */
+	public static function date_format($time_format = '12', $field_id = 0)
+	{
+		$field_input_id = gravityview_get_input_id_from_id($field_id);
+
+		$default = 'h:i A';
+
+		// This doesn't take into account 24-hour
+		switch ($field_input_id) {
+			// Hours
+			case 1:
+				return ($time_format === '12') ? 'h' : 'H';
+				break;
+			// Minutes
+			case 2:
+				return 'i';
+				break;
+			// AM/PM
+			case 3:
+				return 'A';
+				break;
+			// Full time field
+			case 0:
+				return ($time_format === '12') ? $default : 'H:i';
+				break;
+		}
+
+		return $default;
+	}
 }
 
 new GravityView_Field_Time();

Spacing +44 added lines, -44 removed lines

@@ -12,7 +12,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot', 'greater_than', 'less_than'];
+    public $search_operators = [ 'is', 'isnot', 'greater_than', 'less_than' ];
 
     /** @see GF_Field_Time */
     public $_gf_field_class_name = 'GF_Field_Time';
@@ -61,13 +61,13 @@ 
      */
     public function __construct()
     {
-        $this->label = esc_html__('Time', 'gravityview');
+        $this->label = esc_html__( 'Time', 'gravityview' );
 
         parent::__construct();
 
-        add_filter('gravityview/sorting/time', [$this, 'modify_sort_id'], 10, 2);
+        add_filter( 'gravityview/sorting/time', [ $this, 'modify_sort_id' ], 10, 2 );
 
-        add_filter('gravityview_search_criteria', [$this, '_maybe_filter_gravity_forms_query'], 10, 4);
+        add_filter( 'gravityview_search_criteria', [ $this, '_maybe_filter_gravity_forms_query' ], 10, 4 );
     }
 
     /**
@@ -81,14 +81,14 @@ 
      *
      * @return string Modified sort key imploded with $_sort_divider, like `5|:time:|12|:time:|h:i A`
      */
-    public function modify_sort_id($sort_field_id, $form_id)
+    public function modify_sort_id( $sort_field_id, $form_id )
     {
-        $time_format = self::_get_time_format_for_field($sort_field_id, $form_id);
+        $time_format = self::_get_time_format_for_field( $sort_field_id, $form_id );
 
-        $date_format = self::date_format($time_format, $sort_field_id);
+        $date_format = self::date_format( $time_format, $sort_field_id );
 
         // Should look something like `5|:time:|12|:time:|h:i A`
-        $new_sort_field_id = implode($this->_sort_divider, [$sort_field_id, $time_format, $date_format]);
+        $new_sort_field_id = implode( $this->_sort_divider, [ $sort_field_id, $time_format, $date_format ] );
 
         return $new_sort_field_id;
     }
@@ -105,41 +105,41 @@ 
      *
      * @return array $criteria If a match, the sorting will be updated to set `is_numeric` to true and make sure the field ID is an int
      */
-    public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id)
+    public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id )
     {
 
         // If the search is not being sorted, return early
-        if (empty($criteria['sorting']['key'])) {
+        if ( empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
             return $criteria;
         }
 
-        $pieces = explode($this->_sort_divider, $criteria['sorting']['key']);
+        $pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
 
         /**
          * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL.
          *
          * @see modify_sort_id()
          */
-        if (empty($pieces[1])) {
+        if ( empty( $pieces[ 1 ] ) ) {
             return $criteria;
         }
 
         // Pass these to the _modify_query_sort_by_time_hack() method
-        $this->_time_format = $pieces[1];
-        $this->_date_format = $pieces[2];
+        $this->_time_format = $pieces[ 1 ];
+        $this->_date_format = $pieces[ 2 ];
 
         // Remove fake input IDs (5.1 doesn't exist. Use 5)
-        $criteria['sorting']['key'] = floor($pieces[0]);
+        $criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
 
         /**
          * Make sure sorting is numeric (# of seconds). IMPORTANT.
          *
          * @see GVCommon::is_field_numeric() is_numeric should also be set here
          */
-        $criteria['sorting']['is_numeric'] = true;
+        $criteria[ 'sorting' ][ 'is_numeric' ] = true;
 
         // Modify the Gravity Forms WP Query
-        add_filter('query', [$this, '_modify_query_sort_by_time_hack']);
+        add_filter( 'query', [ $this, '_modify_query_sort_by_time_hack' ] );
 
         return $criteria;
     }
@@ -154,7 +154,7 @@ 
      *
      * @return string Modified query, if the query matches the expected Gravity Forms SQL string used for sorting time fields. Otherwise, original query.
      */
-    public function _modify_query_sort_by_time_hack($query)
+    public function _modify_query_sort_by_time_hack( $query )
     {
 
         /**
@@ -163,14 +163,14 @@ 
          *
          * @see GFFormsModel::sort_by_field_query()
          */
-        if (strpos($query, self::GF_SORTING_SQL) > 0) {
-            if ($this->_time_format === '24') {
+        if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
+            if ( $this->_time_format === '24' ) {
                 $sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
             } else {
                 $sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
             }
 
-            switch ($this->_date_format) {
+            switch ( $this->_date_format ) {
                 case 'h':
                 case 'H':
                     $modification = "TIME_FORMAT( {$sql_str_to_date}, '%H' )";
@@ -188,40 +188,40 @@ 
              * Convert the time (12:30 pm) to the MySQL `TIME_TO_SEC()` value for that time (45000)
              * This way, Gravity Forms is able to sort numerically.
              */
-            $replacement_query = str_replace('value', "{$modification} as value", self::GF_SORTING_SQL);
+            $replacement_query = str_replace( 'value', "{$modification} as value", self::GF_SORTING_SQL );
 
             /**
              * Replace it in the main query.
              */
-            $query = str_replace(self::GF_SORTING_SQL, $replacement_query, $query);
+            $query = str_replace( self::GF_SORTING_SQL, $replacement_query, $query );
 
             /**
              * REMOVE the Gravity Forms WP Query modifications!
              */
-            remove_filter('query', [$this, '_modify_query_sort_by_time_hack']);
+            remove_filter( 'query', [ $this, '_modify_query_sort_by_time_hack' ] );
         }
 
         return $query;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
 
         // Set variables
-        parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
+        parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
 
-        if ('edit' === $context) {
+        if ( 'edit' === $context ) {
             return $field_options;
         }
 
         /**
          * Set default date format based on field ID and Form ID.
          */
-        add_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
+        add_filter( 'gravityview_date_format', [ $this, '_filter_date_display_date_format' ] );
 
-        $this->add_field_support('date_display', $field_options);
+        $this->add_field_support( 'date_display', $field_options );
 
-        remove_filter('gravityview_date_format', [$this, '_filter_date_display_date_format']);
+        remove_filter( 'gravityview_date_format', [ $this, '_filter_date_display_date_format' ] );
 
         return $field_options;
     }
@@ -237,9 +237,9 @@ 
     {
         global $post;
 
-        $current_form = isset($_POST['form_id']) ? intval($_POST['form_id']) : gravityview_get_form_id($post->ID);
+        $current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
 
-        return self::_get_time_format_for_field($this->_field_id, $current_form);
+        return self::_get_time_format_for_field( $this->_field_id, $current_form );
     }
 
     /**
@@ -252,18 +252,18 @@ 
      *
      * @return string Either "12" or "24". "12" is default.
      */
-    public static function _get_time_format_for_field($field_id, $form_id = 0)
+    public static function _get_time_format_for_field( $field_id, $form_id = 0 )
     {
 
         // GF defaults to 12, so should we.
         $time_format = '12';
 
-        if ($form_id) {
-            $form = GFAPI::get_form($form_id);
+        if ( $form_id ) {
+            $form = GFAPI::get_form( $form_id );
 
-            if ($form) {
-                $field = GFFormsModel::get_field($form, floor($field_id));
-                if ($field && $field instanceof GF_Field_Time) {
+            if ( $form ) {
+                $field = GFFormsModel::get_field( $form, floor( $field_id ) );
+                if ( $field && $field instanceof GF_Field_Time ) {
                     $field->sanitize_settings(); // Make sure time is set
                     $time_format = $field->timeFormat;
                 }
@@ -285,7 +285,7 @@ 
         $time_format = $this->_get_time_format();
         $field_id = $this->_field_id;
 
-        return self::date_format($time_format, $field_id);
+        return self::date_format( $time_format, $field_id );
     }
 
     /**
@@ -298,17 +298,17 @@ 
      *
      * @return string PHP date format for the time
      */
-    public static function date_format($time_format = '12', $field_id = 0)
+    public static function date_format( $time_format = '12', $field_id = 0 )
     {
-        $field_input_id = gravityview_get_input_id_from_id($field_id);
+        $field_input_id = gravityview_get_input_id_from_id( $field_id );
 
         $default = 'h:i A';
 
         // This doesn't take into account 24-hour
-        switch ($field_input_id) {
+        switch ( $field_input_id ) {
             // Hours
             case 1:
-                return ($time_format === '12') ? 'h' : 'H';
+                return ( $time_format === '12' ) ? 'h' : 'H';
                 break;
             // Minutes
             case 2:
@@ -320,7 +320,7 @@ 
                 break;
             // Full time field
             case 0:
-                return ($time_format === '12') ? $default : 'H:i';
+                return ( $time_format === '12' ) ? $default : 'H:i';
                 break;
         }
 

Braces +10 added lines, -20 removed lines

@@ -6,8 +6,7 @@ 
 /**
  * Add custom options for date fields.
  */
-class GravityView_Field_Time extends GravityView_Field
-{
+class GravityView_Field_Time extends GravityView_Field {
     public $name = 'time';
 
     public $is_searchable = true;
@@ -59,8 +58,7 @@ 
     /**
      * GravityView_Field_Time constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Time', 'gravityview');
 
         parent::__construct();
@@ -81,8 +79,7 @@ 
      *
      * @return string Modified sort key imploded with $_sort_divider, like `5|:time:|12|:time:|h:i A`
      */
-    public function modify_sort_id($sort_field_id, $form_id)
-    {
+    public function modify_sort_id($sort_field_id, $form_id) {
         $time_format = self::_get_time_format_for_field($sort_field_id, $form_id);
 
         $date_format = self::date_format($time_format, $sort_field_id);
@@ -105,8 +102,7 @@ 
      *
      * @return array $criteria If a match, the sorting will be updated to set `is_numeric` to true and make sure the field ID is an int
      */
-    public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id)
-    {
+    public function _maybe_filter_gravity_forms_query($criteria, $form_ids, $view_id) {
 
         // If the search is not being sorted, return early
         if (empty($criteria['sorting']['key'])) {
@@ -154,8 +150,7 @@ 
      *
      * @return string Modified query, if the query matches the expected Gravity Forms SQL string used for sorting time fields. Otherwise, original query.
      */
-    public function _modify_query_sort_by_time_hack($query)
-    {
+    public function _modify_query_sort_by_time_hack($query) {
 
         /**
          * If this is a Gravity Forms entry selection sorting query, generated by sort_by_field_query(),
@@ -204,8 +199,7 @@ 
         return $query;
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
 
         // Set variables
         parent::field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id);
@@ -233,8 +227,7 @@ 
      *
      * @return string Either "12" or "24". "12" is default.
      */
-    private function _get_time_format()
-    {
+    private function _get_time_format() {
         global $post;
 
         $current_form = isset($_POST['form_id']) ? intval($_POST['form_id']) : gravityview_get_form_id($post->ID);
@@ -252,8 +245,7 @@ 
      *
      * @return string Either "12" or "24". "12" is default.
      */
-    public static function _get_time_format_for_field($field_id, $form_id = 0)
-    {
+    public static function _get_time_format_for_field($field_id, $form_id = 0) {
 
         // GF defaults to 12, so should we.
         $time_format = '12';
@@ -280,8 +272,7 @@ 
      *
      * @return string PHP date() format text to to display the correctly formatted time value for the newly created field
      */
-    public function _filter_date_display_date_format()
-    {
+    public function _filter_date_display_date_format() {
         $time_format = $this->_get_time_format();
         $field_id = $this->_field_id;
 
@@ -298,8 +289,7 @@ 
      *
      * @return string PHP date format for the time
      */
-    public static function date_format($time_format = '12', $field_id = 0)
-    {
+    public static function date_format($time_format = '12', $field_id = 0) {
         $field_input_id = gravityview_get_input_id_from_id($field_id);
 
         $default = 'h:i A';

includes/fields/class-gravityview-field-email.php

Indentation +56 added lines, -56 removed lines

@@ -8,73 +8,73 @@
  */
 class GravityView_Field_Email extends GravityView_Field
 {
-    public $name = 'email';
+	public $name = 'email';
 
-    public $is_searchable = true;
+	public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
+	public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
 
-    public $_gf_field_class_name = 'GF_Field_Email';
+	public $_gf_field_class_name = 'GF_Field_Email';
 
-    public $group = 'advanced';
+	public $group = 'advanced';
 
-    public $icon = 'dashicons-email';
+	public $icon = 'dashicons-email';
 
-    public function __construct()
-    {
-        $this->label = esc_html__('Email', 'gravityview');
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->label = esc_html__('Email', 'gravityview');
+		parent::__construct();
+	}
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+	public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+	{
 
-        // It makes no sense to use this as the link.
-        unset($field_options['show_as_link']);
+		// It makes no sense to use this as the link.
+		unset($field_options['show_as_link']);
 
-        if ('edit' === $context) {
-            return $field_options;
-        }
+		if ('edit' === $context) {
+			return $field_options;
+		}
 
-        $email_options = [
-            'emailmailto' => [
-                'type'  => 'checkbox',
-                'value' => true,
-                'label' => __('Link the Email Address', 'gravityview'),
-                'desc'  => __('Clicking the link will generate a new email.', 'gravityview'),
-                'group' => 'field',
-            ],
-            'emailsubject' => [
-                'type'       => 'text',
-                'label'      => __('Email Subject', 'gravityview'),
-                'value'      => '',
-                'desc'       => __('Set the default email subject line.', 'gravityview'),
-                'merge_tags' => 'force',
-                'requires'   => 'emailmailto',
-                'group'      => 'field',
-            ],
-            'emailbody' => [
-                'type'       => 'textarea',
-                'label'      => __('Email Body', 'gravityview'),
-                'value'      => '',
-                'desc'       => __('Set the default email content.', 'gravityview'),
-                'merge_tags' => 'force',
-                'class'      => 'widefat code',
-                'requires'   => 'emailmailto',
-                'group'      => 'field',
-            ],
-            'emailencrypt' => [
-                'type'     => 'checkbox',
-                'value'    => true,
-                'label'    => __('Encrypt Email Address', 'gravityview'),
-                'desc'     => __('Make it harder for spammers to get email addresses from your entries. Email addresses will not be visible with Javascript disabled.', 'gravityview'),
-                'group'    => 'advanced',
-                'priority' => 100,
-            ],
-        ];
+		$email_options = [
+			'emailmailto' => [
+				'type'  => 'checkbox',
+				'value' => true,
+				'label' => __('Link the Email Address', 'gravityview'),
+				'desc'  => __('Clicking the link will generate a new email.', 'gravityview'),
+				'group' => 'field',
+			],
+			'emailsubject' => [
+				'type'       => 'text',
+				'label'      => __('Email Subject', 'gravityview'),
+				'value'      => '',
+				'desc'       => __('Set the default email subject line.', 'gravityview'),
+				'merge_tags' => 'force',
+				'requires'   => 'emailmailto',
+				'group'      => 'field',
+			],
+			'emailbody' => [
+				'type'       => 'textarea',
+				'label'      => __('Email Body', 'gravityview'),
+				'value'      => '',
+				'desc'       => __('Set the default email content.', 'gravityview'),
+				'merge_tags' => 'force',
+				'class'      => 'widefat code',
+				'requires'   => 'emailmailto',
+				'group'      => 'field',
+			],
+			'emailencrypt' => [
+				'type'     => 'checkbox',
+				'value'    => true,
+				'label'    => __('Encrypt Email Address', 'gravityview'),
+				'desc'     => __('Make it harder for spammers to get email addresses from your entries. Email addresses will not be visible with Javascript disabled.', 'gravityview'),
+				'group'    => 'advanced',
+				'priority' => 100,
+			],
+		];
 
-        return $email_options + $field_options;
-    }
+		return $email_options + $field_options;
+	}
 }
 
 new GravityView_Field_Email();

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['is', 'isnot', 'contains', 'starts_with', 'ends_with'];
+    public $search_operators = [ 'is', 'isnot', 'contains', 'starts_with', 'ends_with' ];
 
     public $_gf_field_class_name = 'GF_Field_Email';
 
@@ -22,17 +22,17 @@ 
 
     public function __construct()
     {
-        $this->label = esc_html__('Email', 'gravityview');
+        $this->label = esc_html__( 'Email', 'gravityview' );
         parent::__construct();
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
+    public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id )
     {
 
         // It makes no sense to use this as the link.
-        unset($field_options['show_as_link']);
+        unset( $field_options[ 'show_as_link' ] );
 
-        if ('edit' === $context) {
+        if ( 'edit' === $context ) {
             return $field_options;
         }
 
@@ -40,24 +40,24 @@ 
             'emailmailto' => [
                 'type'  => 'checkbox',
                 'value' => true,
-                'label' => __('Link the Email Address', 'gravityview'),
-                'desc'  => __('Clicking the link will generate a new email.', 'gravityview'),
+                'label' => __( 'Link the Email Address', 'gravityview' ),
+                'desc'  => __( 'Clicking the link will generate a new email.', 'gravityview' ),
                 'group' => 'field',
             ],
             'emailsubject' => [
                 'type'       => 'text',
-                'label'      => __('Email Subject', 'gravityview'),
+                'label'      => __( 'Email Subject', 'gravityview' ),
                 'value'      => '',
-                'desc'       => __('Set the default email subject line.', 'gravityview'),
+                'desc'       => __( 'Set the default email subject line.', 'gravityview' ),
                 'merge_tags' => 'force',
                 'requires'   => 'emailmailto',
                 'group'      => 'field',
             ],
             'emailbody' => [
                 'type'       => 'textarea',
-                'label'      => __('Email Body', 'gravityview'),
+                'label'      => __( 'Email Body', 'gravityview' ),
                 'value'      => '',
-                'desc'       => __('Set the default email content.', 'gravityview'),
+                'desc'       => __( 'Set the default email content.', 'gravityview' ),
                 'merge_tags' => 'force',
                 'class'      => 'widefat code',
                 'requires'   => 'emailmailto',
@@ -66,8 +66,8 @@ 
             'emailencrypt' => [
                 'type'     => 'checkbox',
                 'value'    => true,
-                'label'    => __('Encrypt Email Address', 'gravityview'),
-                'desc'     => __('Make it harder for spammers to get email addresses from your entries. Email addresses will not be visible with Javascript disabled.', 'gravityview'),
+                'label'    => __( 'Encrypt Email Address', 'gravityview' ),
+                'desc'     => __( 'Make it harder for spammers to get email addresses from your entries. Email addresses will not be visible with Javascript disabled.', 'gravityview' ),
                 'group'    => 'advanced',
                 'priority' => 100,
             ],

Braces +3 added lines, -6 removed lines

@@ -6,8 +6,7 @@ 
 /**
  * Add custom options for email fields.
  */
-class GravityView_Field_Email extends GravityView_Field
-{
+class GravityView_Field_Email extends GravityView_Field {
     public $name = 'email';
 
     public $is_searchable = true;
@@ -20,14 +19,12 @@ 
 
     public $icon = 'dashicons-email';
 
-    public function __construct()
-    {
+    public function __construct() {
         $this->label = esc_html__('Email', 'gravityview');
         parent::__construct();
     }
 
-    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id)
-    {
+    public function field_options($field_options, $template_id, $field_id, $context, $input_type, $form_id) {
 
         // It makes no sense to use this as the link.
         unset($field_options['show_as_link']);

includes/fields/class-gravityview-field-payment-date.php

Indentation +48 added lines, -48 removed lines

@@ -6,54 +6,54 @@
  */
 class GravityView_Field_Payment_Date extends GravityView_Field_Date_Created
 {
-    public $name = 'payment_date';
-
-    public $is_searchable = true;
-
-    public $search_operators = ['less_than', 'greater_than', 'is', 'isnot'];
-
-    public $group = 'pricing';
-
-    public $_custom_merge_tag = 'payment_date';
-
-    public $icon = 'dashicons-cart';
-
-    /**
-     * GravityView_Field_Date_Created constructor.
-     */
-    public function __construct()
-    {
-
-        // Constructor before the variables because the class extends Date_Created
-        parent::__construct();
-
-        $this->label = esc_html__('Payment Date', 'gravityview');
-        $this->description = esc_html__('The date the payment was received.', 'gravityview');
-
-        add_filter('gravityview/field/payment_date/value', [$this, 'get_value'], 10, 6);
-    }
-
-    /**
-     * Filter the value of the field, future.
-     *
-     * @since 2.0
-     *
-     * @param mixed       $value   The value of the field.
-     * @param \GV\Field   $field   The field as seen by future.
-     * @param \GV\View    $view    The view requested in.
-     * @param \GV\Source  $source  The data source (form).
-     * @param \GV\Entry   $entry   The entry.
-     * @param \GV\Request $request The request context.
-     *
-     * @return mixed $value The filtered value.
-     */
-    public function get_value($value, $field, $view, $source, $entry, $request)
-    {
-        /** Supply the raw value instead whatever may have been filtered before. */
-        $raw_value = empty($entry[$this->name]) ? null : $entry[$this->name];
-
-        return $this->get_content($value, $entry->as_entry(), $field->as_configuration(), ['value' => $raw_value]);
-    }
+	public $name = 'payment_date';
+
+	public $is_searchable = true;
+
+	public $search_operators = ['less_than', 'greater_than', 'is', 'isnot'];
+
+	public $group = 'pricing';
+
+	public $_custom_merge_tag = 'payment_date';
+
+	public $icon = 'dashicons-cart';
+
+	/**
+	 * GravityView_Field_Date_Created constructor.
+	 */
+	public function __construct()
+	{
+
+		// Constructor before the variables because the class extends Date_Created
+		parent::__construct();
+
+		$this->label = esc_html__('Payment Date', 'gravityview');
+		$this->description = esc_html__('The date the payment was received.', 'gravityview');
+
+		add_filter('gravityview/field/payment_date/value', [$this, 'get_value'], 10, 6);
+	}
+
+	/**
+	 * Filter the value of the field, future.
+	 *
+	 * @since 2.0
+	 *
+	 * @param mixed       $value   The value of the field.
+	 * @param \GV\Field   $field   The field as seen by future.
+	 * @param \GV\View    $view    The view requested in.
+	 * @param \GV\Source  $source  The data source (form).
+	 * @param \GV\Entry   $entry   The entry.
+	 * @param \GV\Request $request The request context.
+	 *
+	 * @return mixed $value The filtered value.
+	 */
+	public function get_value($value, $field, $view, $source, $entry, $request)
+	{
+		/** Supply the raw value instead whatever may have been filtered before. */
+		$raw_value = empty($entry[$this->name]) ? null : $entry[$this->name];
+
+		return $this->get_content($value, $entry->as_entry(), $field->as_configuration(), ['value' => $raw_value]);
+	}
 }
 
 new GravityView_Field_Payment_Date();

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 
     public $is_searchable = true;
 
-    public $search_operators = ['less_than', 'greater_than', 'is', 'isnot'];
+    public $search_operators = [ 'less_than', 'greater_than', 'is', 'isnot' ];
 
     public $group = 'pricing';
 
@@ -27,10 +27,10 @@ 
         // Constructor before the variables because the class extends Date_Created
         parent::__construct();
 
-        $this->label = esc_html__('Payment Date', 'gravityview');
-        $this->description = esc_html__('The date the payment was received.', 'gravityview');
+        $this->label = esc_html__( 'Payment Date', 'gravityview' );
+        $this->description = esc_html__( 'The date the payment was received.', 'gravityview' );
 
-        add_filter('gravityview/field/payment_date/value', [$this, 'get_value'], 10, 6);
+        add_filter( 'gravityview/field/payment_date/value', [ $this, 'get_value' ], 10, 6 );
     }
 
     /**
@@ -47,12 +47,12 @@ 
      *
      * @return mixed $value The filtered value.
      */
-    public function get_value($value, $field, $view, $source, $entry, $request)
+    public function get_value( $value, $field, $view, $source, $entry, $request )
     {
         /** Supply the raw value instead whatever may have been filtered before. */
-        $raw_value = empty($entry[$this->name]) ? null : $entry[$this->name];
+        $raw_value = empty( $entry[ $this->name ] ) ? null : $entry[ $this->name ];
 
-        return $this->get_content($value, $entry->as_entry(), $field->as_configuration(), ['value' => $raw_value]);
+        return $this->get_content( $value, $entry->as_entry(), $field->as_configuration(), [ 'value' => $raw_value ] );
     }
 }
 

Braces +3 added lines, -6 removed lines

@@ -4,8 +4,7 @@ 
  *
  * @since 1.16
  */
-class GravityView_Field_Payment_Date extends GravityView_Field_Date_Created
-{
+class GravityView_Field_Payment_Date extends GravityView_Field_Date_Created {
     public $name = 'payment_date';
 
     public $is_searchable = true;
@@ -21,8 +20,7 @@ 
     /**
      * GravityView_Field_Date_Created constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
 
         // Constructor before the variables because the class extends Date_Created
         parent::__construct();
@@ -47,8 +45,7 @@ 
      *
      * @return mixed $value The filtered value.
      */
-    public function get_value($value, $field, $view, $source, $entry, $request)
-    {
+    public function get_value($value, $field, $view, $source, $entry, $request) {
         /** Supply the raw value instead whatever may have been filtered before. */
         $raw_value = empty($entry[$this->name]) ? null : $entry[$this->name];