From 37223387082f66af0f4e08708d64af051ff25afc Mon Sep 17 00:00:00 2001
From: Frey Mansikkaniemi <me@frey.hk>
Date: Wed, 14 Oct 2020 20:30:50 +0800
Subject: [PATCH] Removed dynamic QRCode generation

---
 README.md                                     |  2 +-
 hong-kong-fps-woo-payment.php                 | 33 -------------------
 readme.txt                                    |  2 +-
 ...teway-invite-fps-payment-gateway-class.php | 16 +--------
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 90e8bdd..ffeb96c 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ $ git clone https://github.com/invite-frey/is-woo-payment-fps.git
 * Bugfix
 
 ### 1.42
-* Cache QRCodes by default due to better compatibility with most systems
+* QRCodes always cached to disk due to browser incompatibility issues with dynamic generation.
 * Fixed bug preventing headers to be output on some systems
 
 ## Donations
diff --git a/hong-kong-fps-woo-payment.php b/hong-kong-fps-woo-payment.php
index 6ad22ed..e4cf423 100644
--- a/hong-kong-fps-woo-payment.php
+++ b/hong-kong-fps-woo-payment.php
@@ -52,39 +52,6 @@ function its_wpf_add_class( $methods ){
     return $methods;
 }
 
-/**
- * Reqister query var for qrcode image generation
- */
-
-add_filter( 'query_vars', 'its_wpf_qrcode_add_var' );
-function its_wpf_qrcode_add_var( $vars )
-{
-    $vars[] = 'generate_fps_qrcode';
-    $vars[] = '_wpnonce';
-    return $vars;
-}
-
-/**
- * Print out qr code when the right query var is found
- */
-
-add_action( 'init', 'its_wpf_qrcode_catch', 0 );
-function its_wpf_qrcode_catch()
-{   
-    if(isset($_REQUEST['generate_fps_qrcode']) && isset($_REQUEST['_wpnonce']))
-    {
-        $qrcode_string = $_REQUEST['generate_fps_qrcode'];
-        $nonce = $_REQUEST['_wpnonce'];
-        if( $qrcode_string && $nonce && wp_verify_nonce( $nonce, ITS_WPF_PLUGIN_ID ) )
-        {
-            require_once('libs/phpqrcode.php');
-            ob_clean(); //Clean the output buffer before printing out image
-            header('Content-Type: image/png');        
-            QRcode::png($qrcode_string,false,QR_ECLEVEL_H);
-            exit();
-        }
-    }
-}
 
 /**
  * Change text on the Pay order button.
diff --git a/readme.txt b/readme.txt
index 79f6d69..1a4f7ba 100644
--- a/readme.txt
+++ b/readme.txt
@@ -69,5 +69,5 @@ Enables [FPS](https://www.hkma.gov.hk/eng/key-functions/international-financial-
 * Bugfix
 
 = 1.42 =
-* Cache QRCodes by default due to better compatibility with most systems
+* QRCodes always cached to disk due to browser incompatibility issues with dynamic generation.
 * Fixed bug preventing headers to be output on some systems
diff --git a/wc-gateway-invite-fps-payment-gateway-class.php b/wc-gateway-invite-fps-payment-gateway-class.php
index 22dcc9e..bf2d295 100644
--- a/wc-gateway-invite-fps-payment-gateway-class.php
+++ b/wc-gateway-invite-fps-payment-gateway-class.php
@@ -84,13 +84,6 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
                     'description' => __('The ask to pay function must be enabled by your bank in order to use payment reference numbers.',ITS_WPF_PLUGIN_ID),
                     'default'     => 'no'
                 ),
-                'write_qr_code_to_file' => array(
-                    'title'       => __('Cache QRCode to file',ITS_WPF_PLUGIN_ID),
-                    'label'       => __('Cache QRCode to file',ITS_WPF_PLUGIN_ID),
-                    'type'        => 'checkbox',
-                    'description' => __('Disabling this option will cause the QRCode to be dynamically generated. This may not work on all server configurations.',ITS_WPF_PLUGIN_ID),
-                    'default'     => 'yes'
-                ),
             );
         }
 
@@ -269,14 +262,7 @@ if( !class_exists('WC_Gateway_Invite_FPS_Payment_Gateway') ){
             $fps_data['currency'] = $fps_data['curr'];
             $qrcode = new ITS_FPS_QRCodeData($fps_data);
     
-            $qr_code_url = 
-                $this->write_qr_code_to_file === 'yes' ? 
-                $this->qrcode_file_url($qrcode->getDataString()) :
-                add_query_arg(
-                    '_wpnonce',
-                    wp_create_nonce(ITS_WPF_PLUGIN_ID),
-                    get_site_url() . '/?generate_fps_qrcode=' . urlencode($qrcode->getDataString())                
-                );
+            $qr_code_url = $this->qrcode_file_url($qrcode->getDataString()); 
 
             if ( $this->description ) {
                 echo wpautop( wp_kses_post( $this->description ) );