From 1a5e19523e624f87308478024b543da054f16acf Mon Sep 17 00:00:00 2001
From: Doeke Norg <doekenorg@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:49:24 +0100
Subject: [PATCH] Release 2.3.3 (#202)

* Fix plugin icon color
* Add force download hook
---------

Co-authored-by: Zack Katz <zack@katz.co>
Co-authored-by: Vlad <moi@mrcasual.com>
---
 gfexcel.php                      |  4 ++--
 readme.txt                       |  8 ++++++--
 src/Addon/GravityExportAddon.php |  2 +-
 src/Field/FileUploadField.php    | 26 +++++++++++++++++++++++---
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/gfexcel.php b/gfexcel.php
index 88f489fb..ccd270e1 100644
--- a/gfexcel.php
+++ b/gfexcel.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name:     GravityExport Lite
- * Version:         2.3.2
+ * Version:         2.3.3
  * Plugin URI:      https://gfexcel.com
  * Description:     Export all Gravity Forms entries to Excel (.xlsx) or CSV via a secret shareable URL.
  * Author:          GravityKit
@@ -28,7 +28,7 @@
 }
 
 if ( ! defined( 'GFEXCEL_PLUGIN_VERSION' ) ) {
-	define( 'GFEXCEL_PLUGIN_VERSION', '2.3.2' );
+	define( 'GFEXCEL_PLUGIN_VERSION', '2.3.3' );
 }
 
 if ( ! defined( 'GFEXCEL_MIN_PHP_VERSION' ) ) {
diff --git a/readme.txt b/readme.txt
index 4e9c08c1..fb32383b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,8 @@ Donate link: https://www.gravitykit.com/extensions/gravityexport/?utm_source=plu
 Tags: Gravity Forms, GravityForms, Excel, Export, Entries
 Requires at least: 4.0
 Requires PHP: 7.2
-Tested up to: 6.6.2
-Stable tag: 2.3.2
+Tested up to: 6.7
+Stable tag: 2.3.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -256,6 +256,10 @@ You can hide a row by adding a hook. Checkout this example:
 
 == Changelog ==
 
+= 2.3.3 on October 29, 2024 =
+
+* Enhancement: Added a `gfexcel_field_fileuploads_force_download` filter to control whether file upload links open in the browser or download directly.
+
 = 2.3.2 on October 14, 2024 =
 
 * Fixed: Added compatibility for servers that miss the `iconv` or `mbstring` PHP extension.
diff --git a/src/Addon/GravityExportAddon.php b/src/Addon/GravityExportAddon.php
index 47b2639e..3e7eddf5 100644
--- a/src/Addon/GravityExportAddon.php
+++ b/src/Addon/GravityExportAddon.php
@@ -438,7 +438,7 @@ public function feed_settings_fields(): array {
 	 * @since 2.0.0
 	 */
 	public function get_menu_icon(): string {
-		return '<svg style="height: 24px; width: 37px;" enable-background="new 0 0 226 148" height="148" viewBox="0 0 226 148" width="226" xmlns="http://www.w3.org/2000/svg"><path d="m176.8 118.8c-1.6 1.6-4.1 1.6-5.7 0l-5.7-5.7c-1.6-1.6-1.6-4.1 0-5.7l27.6-27.4h-49.2c-4.3 39.6-40 68.2-79.6 63.9s-68.2-40-63.9-79.6 40.1-68.2 79.7-63.9c25.9 2.8 48.3 19.5 58.5 43.5.6 1.5-.1 3.3-1.7 3.9-.4.1-.7.2-1.1.2h-9.9c-1.9 0-3.6-1.1-4.4-2.7-14.7-27.1-48.7-37.1-75.8-22.4s-37.2 48.8-22.4 75.9 48.8 37.2 75.9 22.4c15.5-8.4 26.1-23.7 28.6-41.2h-59.4c-2.2 0-4-1.8-4-4v-8c0-2.2 1.8-4 4-4h124.7l-27.5-27.5c-1.6-1.6-1.6-4.1 0-5.7l5.7-5.7c1.6-1.6 4.1-1.6 5.7 0l41.1 41.2c3.1 3.1 3.1 8.2 0 11.3z"/></svg>';
+		return '<svg style="height: 24px; width: 37px;" fill="currentColor" enable-background="new 0 0 226 148" height="148" viewBox="0 0 226 148" width="226" xmlns="http://www.w3.org/2000/svg"><path d="m176.8 118.8c-1.6 1.6-4.1 1.6-5.7 0l-5.7-5.7c-1.6-1.6-1.6-4.1 0-5.7l27.6-27.4h-49.2c-4.3 39.6-40 68.2-79.6 63.9s-68.2-40-63.9-79.6 40.1-68.2 79.7-63.9c25.9 2.8 48.3 19.5 58.5 43.5.6 1.5-.1 3.3-1.7 3.9-.4.1-.7.2-1.1.2h-9.9c-1.9 0-3.6-1.1-4.4-2.7-14.7-27.1-48.7-37.1-75.8-22.4s-37.2 48.8-22.4 75.9 48.8 37.2 75.9 22.4c15.5-8.4 26.1-23.7 28.6-41.2h-59.4c-2.2 0-4-1.8-4-4v-8c0-2.2 1.8-4 4-4h124.7l-27.5-27.5c-1.6-1.6-1.6-4.1 0-5.7l5.7-5.7c1.6-1.6 4.1-1.6 5.7 0l41.1 41.2c3.1 3.1 3.1 8.2 0 11.3z"/></svg>';
 	}
 
 	/**
diff --git a/src/Field/FileUploadField.php b/src/Field/FileUploadField.php
index 6b3b35aa..f2951326 100644
--- a/src/Field/FileUploadField.php
+++ b/src/Field/FileUploadField.php
@@ -7,6 +7,7 @@
 
 /**
  * Class FileUploadField
+ *
  * @since 1.1.0
  */
 class FileUploadField extends BaseField implements RowsInterface {
@@ -51,7 +52,6 @@ public function getColumns() {
 	 * @return bool Whether the uploads should be shown as a column.
 	 */
 	private function showFileUploadsAsColumn() {
-
 		// The default value of `true` will not be returned by get_plugin_setting(); it will return null by default.
 		// So we apply the ?? operator and return true as the default value.
 		$fileuploads_enabled = GravityExportAddon::get_instance()->get_plugin_setting( 'fileuploads_enabled' ) ?? true;
@@ -80,7 +80,9 @@ public function getRows( ?array $entry = null ): iterable {
 				}
 
 				foreach ( $files as $file ) {
-					yield $this->wrap( [ $this->field->get_download_url( $file, true ) ] );
+					yield $this->wrap( [
+						$this->field->get_download_url( $file, $this->should_force_download() ),
+					] );
 				}
 			}
 		} else {
@@ -98,6 +100,24 @@ protected function getFieldValue( $entry, $input_id = '' ) {
 			return $value;
 		}
 
-		return $this->field->get_download_url( $value, true );
+		return $this->field->get_download_url( $value, $this->should_force_download() );
+	}
+
+	/**
+	 * Returns whether to force a download URL.
+	 *
+	 * @since 2.3.3
+	 *
+	 * @return bool Whether to force a download URL.
+	 */
+	private function should_force_download(): bool {
+		return (bool) gf_apply_filters(
+			[
+				'gfexcel_field_fileuploads_force_download',
+				$this->field->formId,
+			],
+			true,
+			$this->field
+		);
 	}
 }