Changeset 3281053

Timestamp:

04/24/2025 02:18:40 PM (10 months ago)

Author:

wpwham

Message:

Version 2.2.1 update

Location:

checkout-files-upload-woocommerce/trunk

Files:

• checkout-files-upload-woocommerce.php (modified) (7 diffs)
• includes/class-alg-wc-checkout-files-upload.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)

checkout-files-upload-woocommerce/trunk/checkout-files-upload-woocommerce.php

@@ -4 +4 @@
 Plugin URI: https://wpwham.com/products/checkout-files-upload-for-woocommerce/
 Description: Let your customers upload files on (or after) WooCommerce checkout.
-Version: 2.2.0
+Version: 2.2.1
 Author: WP Wham
-Author URI: https://wpwham.com
+Author URI: https://wpwham.com/
 Text Domain: checkout-files-upload-woocommerce
 Domain Path: /langs
-Copyright: © 2018-2024 WP Wham
-WC tested up to: 9.2
+Copyright: © 2018-2025 WP Wham
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -39 +38 @@
 
 if ( ! defined( 'WPWHAM_CHECKOUT_FILES_UPLOAD_VERSION' ) ) {
-    define( 'WPWHAM_CHECKOUT_FILES_UPLOAD_VERSION', '2.2.0' );
+    define( 'WPWHAM_CHECKOUT_FILES_UPLOAD_VERSION', '2.2.1' );
 }
 if ( ! defined( 'WPWHAM_CHECKOUT_FILES_UPLOAD_DBVERSION' ) ) {
@@ -68 +67 @@
  *
  * @class   Alg_WC_Checkout_Files_Upload
- * @version 2.2.0
+ * @version 2.2.1
  * @since   1.0.0
  */
@@ -82 +81 @@
      * @since 1.0.0
      */
-    public $version = '2.2.0';
+    public $version = '2.2.1';
 
     /**
@@ -110 +109 @@
      * Alg_WC_Checkout_Files_Upload Constructor.
      *
-     * @version 2.1.0
+     * @version 2.2.1
      * @since   1.0.0
      * @access  public
@@ -117 +116 @@
 
         // Set up localisation
-        load_plugin_textdomain( 'checkout-files-upload-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/langs/' );
+        add_action( 'init', array( $this, 'load_localization' ) );
 
         // Include required files
@@ -146 +145 @@
         }
 
+    }
+
+    /**
+     * @since   2.2.1
+     */
+    public function load_localization() {
+        load_plugin_textdomain( 'checkout-files-upload-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/langs/' );
     }
     

checkout-files-upload-woocommerce/trunk/includes/class-alg-wc-checkout-files-upload.php

@@ -3 +3 @@
  * Checkout Files Upload
  *
- * @version 2.2.0
+ * @version 2.2.1
  * @since   1.0.0
  * @author  Algoritmika Ltd.
@@ -58 +58 @@
      * language_shortcode.
      *
-     * @version 1.4.5
+     * @version 2.2.1
      * @since   1.4.5
      */
@@ -65 +65 @@
         if ( isset( $atts['lang_text'] ) && isset( $atts['not_lang_text'] ) && ! empty( $atts['lang'] ) ) {
             return ( ! defined( 'ICL_LANGUAGE_CODE' ) || ! in_array( strtolower( ICL_LANGUAGE_CODE ), array_map( 'trim', explode( ',', strtolower( $atts['lang'] ) ) ) ) ) ?
-                $atts['not_lang_text'] : $atts['lang_text'];
+                esc_html( $atts['not_lang_text'] ) : esc_html( $atts['lang_text'] );
         }
         // E.g.: `[alg_wc_cfu_translate lang="EN,DE"]Translation for EN and DE[/alg_wc_cfu_translate][alg_wc_cfu_translate not_lang="EN,DE"]Translation for other languages[/alg_wc_cfu_translate]`
@@ -71 +71 @@
             ( ! empty( $atts['lang'] )     && ( ! defined( 'ICL_LANGUAGE_CODE' ) || ! in_array( strtolower( ICL_LANGUAGE_CODE ), array_map( 'trim', explode( ',', strtolower( $atts['lang'] ) ) ) ) ) ) ||
             ( ! empty( $atts['not_lang'] ) &&     defined( 'ICL_LANGUAGE_CODE' ) &&   in_array( strtolower( ICL_LANGUAGE_CODE ), array_map( 'trim', explode( ',', strtolower( $atts['not_lang'] ) ) ) ) )
-        ) ? '' : $content;
+        ) ? '' : esc_html( $content );
     }
     
@@ -680 +680 @@
      * validate_on_checkout.
      *
-     * @version 2.1.0
+     * @version 2.2.1
      * @since   1.0.0
      */
@@ -691 +691 @@
             $local_session_started = true;
         }
-        
+
+        $checkout_content = get_post_field( 'post_content', get_option( 'woocommerce_checkout_page_id' ) );
+        $has_shortcode = has_shortcode( $checkout_content, 'wpwham_checkout_files_uploader' );
+
         $total_number = apply_filters( 'alg_wc_checkout_files_upload_option', 1, 'total_number' );
         for ( $i = 1; $i <= $total_number; $i++ ) {
@@ -697 +700 @@
                 'yes' === get_option( 'alg_checkout_files_upload_enabled_' . $i, 'yes' ) &&
                 $this->is_visible( $i ) &&
-                'disable' != get_option( 'alg_checkout_files_upload_hook_' . $i, 'woocommerce_before_checkout_form' )
+                (
+                    get_option( 'alg_checkout_files_upload_hook_' . $i, 'woocommerce_before_checkout_form' ) !== 'disable' ||
+                    $has_shortcode 
+                )
             ) {
             

checkout-files-upload-woocommerce/trunk/readme.txt

@@ -3 +3 @@
 Tags: woocommerce, checkout files upload, checkout, woo commerce
 Requires at least: 4.4
-Tested up to: 6.6
-Stable tag: 2.2.0
+Tested up to: 6.8
+Stable tag: 2.2.1
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -76 +76 @@
 
 == Changelog ==
+
+= 2.2.1 - 2025-04-24 =
+* FIX: "file required" not working if uploader placed outside of main checkout form via shortcode (#89416).
+* FIX: PHP notice.
+* FIX: escape text in translation shortcodes.
 
 = 2.2.0 - 2024-08-28 =