Merge pull request #200 from paynl/feature/PLUG-5137

PLUG-5137 - Load logo's via static and cache

Author: woutse

includes/classes/PPMFWC/Gateway/Abstract.php

@@ -59,23 +59,92 @@ public function __construct()
     /**
      * @return string
      */
-    public function getIcon()
+    public function getIcon(): string
     {
         if (!empty($this->get_option('external_logo')) && wc_is_valid_url($this->get_option('external_logo'))) {
             return $this->get_option('external_logo');
         }
-        if (!empty($this->get_option('payment_image'))) {
-            return $this->get_option('payment_image');
+
+        $paymentImage = $this->get_option('payment_image_cached');
+
+        if (empty($paymentImage)) {
+            PPMFWC_Helper_Data::ppmfwc_payLogger('paymentImage empty: ' . print_r($paymentImage, true));
+            return '';
+        }
+
+        if ($this->saveLogo($paymentImage)) {
+            return PPMFWC_PLUGIN_URL . 'assets/cache' . $paymentImage;
+        }
+
+        return 'https://static.pay.nl' . $paymentImage;
+    }
+
+    /**
+     * Save logo
+     *
+     * @param string $imagePath
+     * @return bool
+     */
+    public function saveLogo(string $imagePath): bool
+    {
+        $imagePath = ltrim($imagePath, '/');
+        $path = rtrim(PPMFWC_PLUGIN_PATH . 'assets/cache', '/');
+
+        if (file_exists($path . '/' . $imagePath) && (time() - filemtime($path . '/' . $imagePath) < 86400)) {
+            return true;
+        }
+
+        $imageUrl = 'https://static.pay.nl/' . $imagePath;
+        return $this->downloadImage($imageUrl, $path, $imagePath);
+    }
+
+    /**
+     * Download image from url
+     *
+     * @param string $url
+     * @param string $basePath
+     * @param string $image
+     * @return bool
+     */
+    public function downloadImage(string $url, string $basePath, string $image): bool
+    {
+        $image = ltrim($image, '/');
+
+        if (str_contains($image, '..')) {
+            return false;
+        }
+        if (!preg_match('~^[a-zA-Z0-9/_\.\-]+$~', $image)) {
+            return false;
         }
 
-        if (!empty($this->getImagePathName())) {
-            return PPMFWC_PLUGIN_URL . 'assets/logos/payment_method_groups/' . $this->getImagePathName();
+        // Alleen bekende image-extensies toestaan
+        if (!preg_match('~\.(svg|png|jpe?g|webp)$~i', $image)) {
+            return false;
+        }
+
+        // Download (404 e.d. geeft geen warning)
+        $data = @file_get_contents($url);
+        if ($data === false) {
+            return false;
         }
 
-        // if any of the above settings are not set use static.pay for checkout images
-        return 'https://static.pay.nl/payment_profiles/100x100/' . $this->getOptionId() . '.png';
+
+        $fullPath = rtrim($basePath, '/') . '/' . $image;
+
+        $dir = dirname($fullPath);
+        if (!is_dir($dir) && !mkdir($dir, 0755, true) && !is_dir($dir)) {
+            return false;
+        }
+
+        $writeResult = false;
+        if (is_writable(dirname($fullPath))) {
+            $writeResult = file_put_contents($fullPath, $data) !== false;
+        }
+
+        return $writeResult;
     }
 
+
     /**
      * @param string $key
      * @param mixed $value
@@ -319,7 +388,7 @@ public function init_form_fields()
             }
 
             if (
-                (!$this->get_option('payment_image')) || (strlen($this->get_option('payment_image')) == 0) ||
+                (!$this->get_option('payment_image_cached')) || (strlen($this->get_option('payment_image_cached')) == 0) ||
                 (!$this->get_option('min_amount')) || (strlen($this->get_option('min_amount')) == 0) ||
                 (!$this->get_option('max_amount')) || (strlen($this->get_option('max_amount')) == 0) ||
                 $this->get_option('description') == 'pay_init'
@@ -342,12 +411,10 @@ public function init_form_fields()
                 if ((isset($payDefaults))) {
                     $minAmount = $payDefaults->getMinAmount();
                     $maxAmount = $payDefaults->getMaxAmount();
-
-                    $im = str_replace(['/payment_methods/', '.svg'], ['', '.png'], $payDefaults->getImage());
-                    $image = PPMFWC_PLUGIN_URL . 'assets/logos/' . $im;
+                    $icon = $payDefaults->getImage();
                 }
 
-                $this->set_option_default('payment_image', (isset($image)) ? $image : '', true);
+                $this->set_option_default('payment_image_cached', (isset($icon)) ? $icon : '', true);
                 $this->set_option_default('min_amount', (isset($minAmount)) ? floatval($minAmount / 100) : '', false);
                 $this->set_option_default('max_amount', (isset($maxAmount)) ? floatval($maxAmount / 100) : '', false);
 

includes/classes/PPMFWC/Helper/Data.php

@@ -156,8 +156,11 @@ public static function loadPaymentMethods()
 
         foreach ($paymentOptions as $method)
         {
-            $im = str_replace(['/payment_methods/', '.svg'], ['', '.png'], $method->getImage());
-            $image = PPMFWC_PLUGIN_URL . 'assets/logos/' . $im;
+            if (file_exists(PPMFWC_PLUGIN_PATH . 'assets/cache' . $method->getImage())) {
+                $image = PPMFWC_PLUGIN_URL . 'assets/cache' . $method->getImage();
+            } else {
+                $image = 'https://static.pay.nl/' . $method->getImage();
+            }
 
             $sql = 'INSERT INTO `' . $table_name_options . '` (id,name,image,update_date) VALUES (%d,%s,%s,%s) ON DUPLICATE KEY UPDATE name = %s, image = %s, update_date = %s';
             $sql = $wpdb->prepare($sql, $method->getId(), $method->getName(), $image, current_time('mysql'), $method->getName(), $image, current_time('mysql'));

woocommerce-payment-paynl.php

@@ -21,6 +21,13 @@
 # Load plugin functionality.
 require_once(ABSPATH . '/wp-admin/includes/plugin.php');
 
+$apilogFile = '/src/public/apilog_functions.php';
+if (file_exists($apilogFile)) {
+    include_once($apilogFile);
+}
+
+
+
 define('PPMFWC_WOOCOMMERCE_TEXTDOMAIN', 'woocommerce-paynl-payment-methods');
 define('PPMFWC_PLUGIN_URL', plugins_url('/', __FILE__));
 define('PPMFWC_PLUGIN_PATH', plugin_dir_path(__FILE__));