Fix old download filtering urls (#170)

gfexcel.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name:     GravityExport Lite
- * Version:         2.0.2
+ * Version:         2.0.3
  * Plugin URI:      https://gfexcel.com
  * Description:     Export all Gravity Forms entries to Excel (.xlsx) or CSV via a secret shareable URL.
  * Author:          GravityKit
@@ -29,7 +29,7 @@
 }
 
 if ( ! defined( 'GFEXCEL_PLUGIN_VERSION' ) ) {
-	define( 'GFEXCEL_PLUGIN_VERSION', '2.0.2' );
+	define( 'GFEXCEL_PLUGIN_VERSION', '2.0.3' );
 }
 
 if ( ! defined( 'GFEXCEL_MIN_PHP_VERSION' ) ) {

readme.txt

@@ -5,7 +5,7 @@ Tags: Gravity Forms, GravityForms, Excel, Export, Download, Entries, CSV
 Requires at least: 4.0
 Requires PHP: 7.2
 Tested up to: 6.2
-Stable tag: 2.0.2
+Stable tag: 2.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -256,7 +256,11 @@ You can hide a row by adding a hook. Checkout this example:
 
 == Changelog ==
 
-= 2.0.2 on June 5,2023  =
+= 2.0.3 on June 7, 2023 =
+
+* Bugfix: Filtering on URL's didn't work on the old download URL structure anymore.
+
+= 2.0.2 on June 5, 2023  =
 
 * Bugfix: Attachments could have the wrong fields.
 

src/Action/FilterRequest.php

@@ -85,19 +85,18 @@ public function getQueryVars($vars)
      * @param array $query_vars the query vars.
      * @return array the query vars.
      */
-    public function request($query_vars)
-    {
-        // only respond to a GFexcel URL.
-        if (!isset($query_vars[GFExcel::KEY_ACTION]) || $query_vars[GFExcel::KEY_ACTION] !== GFExcel::$slug) {
-            return $query_vars;
-        }
-
-        $this->parseDates($query_vars);
-        $this->parseFilters(\rgar($query_vars, self::FILTER, ''));
-        $this->parseEntry(\rgar($query_vars, self::ENTRY));
-
-        return $query_vars;
-    }
+	public function request( $query_vars ) {
+		// only respond to a GFexcel URL.
+		if ( ! in_array( $query_vars[ GFExcel::KEY_ACTION ] ?? null, GFExcel::$endpoints, true ) ) {
+			return $query_vars;
+		}
+
+		$this->parseDates( $query_vars );
+		$this->parseFilters( \rgar( $query_vars, self::FILTER, '' ) );
+		$this->parseEntry( \rgar( $query_vars, self::ENTRY ) );
+
+		return $query_vars;
+	}
 
     /**
      * Sets the search criteria on the hook for filtering.

src/GFExcel.php

@@ -47,11 +47,11 @@ class GFExcel
 	 * @since 1.0.0
 	 * @var string
 	 */
-	private $endpoints = array(
+	public static $endpoints = [
 		'gf-entries-in-excel',
 		'gravityexport-lite',
 		'gravityexport',
-	);
+	];
 
     public const KEY_HASH = 'gfexcel_hash';
 
@@ -246,7 +246,7 @@ public function addPermalinkRules() {
 	    $rewrite_rules = get_option( 'rewrite_rules' );
 	    $flush_rules   = false;
 
-	    foreach ( $this->endpoints as $endpoint ) {
+	    foreach ( self::$endpoints as $endpoint ) {
 
 		    $endpoint_regex = '^' . $endpoint . '/(.+)/?$';
 
@@ -281,7 +281,7 @@ public function request($query_vars)
 		    return $query_vars;
 	    }
 
-	    if ( ! in_array( $query_vars[ self::KEY_ACTION ], $this->endpoints, true ) ) {
+	    if ( ! in_array( $query_vars[ self::KEY_ACTION ], self::$endpoints, true ) ) {
 		    return $query_vars;
 	    }
 
@@ -403,7 +403,7 @@ public function robotsTxt($output)
         $path = (!empty($site_url['path'])) ? $site_url['path'] : '';
 
         $lines = '';
-        foreach( $this->endpoints as $endpoint ) {
+        foreach( self::$endpoints as $endpoint ) {
 	        $lines .= sprintf( 'Disallow: %s/%s/', esc_attr( $path ), $endpoint ) . "\n";
         }