From 98459aa268fde21eb64dacf0e2350727b30f5e38 Mon Sep 17 00:00:00 2001
From: Pascal Christoph <christoph@hbz-nrw.de>
Date: Fri, 11 Oct 2024 17:42:05 +0200
Subject: [PATCH 1/2] Encode URL properly (lobid-gnd#408)

Question marks weren't encoded. It's better to use a library.
---
 gatsby/lobid/static/imagesproxy.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gatsby/lobid/static/imagesproxy.php b/gatsby/lobid/static/imagesproxy.php
index a6154e3..3d4e1e3 100644
--- a/gatsby/lobid/static/imagesproxy.php
+++ b/gatsby/lobid/static/imagesproxy.php
@@ -1,10 +1,13 @@
 <?php
-        $url = $_GET['url'];
-        $url=str_replace(" ", "%20", $url);
+        $url = implode("/", array_map("rawurlencode", explode("/", $_GET['url'])));
+        // restore the colon of the protocol
+        $positionOfColon = strpos($url,"%");
+        $url= substr_replace($url,":",$positionOfColon,3);
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_HTTPHEADER, array("Content-Type: text/xml","User-Agent: imagesproxy/0.2 (https://lobid.org/)"));
+
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         $filename = basename($url);
 
@@ -27,6 +30,6 @@
 
         header('Content-type: ' . $ctype);
         echo $output = curl_exec($ch);
-        curl_close($ch); 
+        curl_close($ch);
 ?>
 

From 6f891a35de71263b6e3409228f7d09416385fd80 Mon Sep 17 00:00:00 2001
From: Pascal Christoph <christoph@hbz-nrw.de>
Date: Mon, 14 Oct 2024 14:18:03 +0200
Subject: [PATCH 2/2] Preserve the query parameter (lobid-gnd#408)

The PHP parse-url function cannot be used to separate "URL path" and "URL
query" because if an "?" is part of the path it would be nontheless
identified as a query parameter. Explicitly stick to the last "?" seems
to be safe in the context of wikimedia commmons at least.
---
 gatsby/lobid/static/imagesproxy.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gatsby/lobid/static/imagesproxy.php b/gatsby/lobid/static/imagesproxy.php
index 3d4e1e3..8412386 100644
--- a/gatsby/lobid/static/imagesproxy.php
+++ b/gatsby/lobid/static/imagesproxy.php
@@ -1,8 +1,18 @@
 <?php
-        $url = implode("/", array_map("rawurlencode", explode("/", $_GET['url'])));
+
+        $url = $_GET['url'];
+        // encode the URL
+        $url = implode("/", array_map("rawurlencode", explode("/", $url)));
         // restore the colon of the protocol
         $positionOfColon = strpos($url,"%");
         $url= substr_replace($url,":",$positionOfColon,3);
+        // restore the query Parameter
+        $positionOfQueryParameter = strrpos($url,"%3F");
+        $url= substr_replace($url,"?",$positionOfQueryParameter,3);
+        // restore the
+        $positionOfEqual = strrpos($url,"%3D", $positionOfQueryParameter);
+        $url= substr_replace($url,"=",$positionOfEqual,3);
+
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -29,7 +39,7 @@
         }
 
         header('Content-type: ' . $ctype);
-        echo $output = curl_exec($ch);
+        echo curl_exec($ch);
         curl_close($ch);
 ?>