From 92846965f471777932342edb0a3c9dd31cd3efbe Mon Sep 17 00:00:00 2001
From: Miraty <miraty@antopie.org>
Date: Tue, 17 Mar 2020 14:02:31 +0100
Subject: [PATCH] Allow upgrading opensearch plugin from LibreQR 1.1.0 + use
 standardised opensearch parameters

---
 .gitignore        |  1 +
 opensearch.php    | 26 +++++++++++++++++++++++---
 themes/resize.php |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 727bc05..01fc22b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .directory
+temp/*
diff --git a/opensearch.php b/opensearch.php
index 4cd122b..26f93c0 100755
--- a/opensearch.php
+++ b/opensearch.php
@@ -7,8 +7,28 @@
   foreach($themeDimensionsIcons as $dimIcon) {
     echo '  <Image height="' . $dimIcon . '" width="' . $dimIcon . '" type="image/png">' . $instPath . 'themes/' . $theme . '/icons/' . $dimIcon . '.png</Image>' . "\n";
   } ?>
-  <Language>fr</Language>
+  <Language>*</Language>
   <InputEncoding>UTF-8</InputEncoding>
-  <Url type="text/html" template="<?php echo $instPath; ?>&#63;txt={searchTerms}&amp;redondancy=<?php if (isset($_GET['redondancy'])) { echo $_GET['redondancy']; } ?>&amp;margin=<?= $_GET['margin'] ?>&amp;size=<?= $_GET['size'] ?>&amp;bgColor=<?= urlencode($_GET['bgColor']) ?>&amp;mainColor=<?= urlencode($_GET['mainColor']) ?>"/>
-  <Url type="application/opensearchdescription+xml" rel="self" template="<?php echo $instPath; ?>opensearch.php" />
+<?php
+  $redondancy = htmlspecialchars((isset($_GET['redondancy'])) ? $_GET['redondancy'] : 'H');
+  $margin = htmlspecialchars((isset($_GET['margin'])) ? $_GET['margin'] : '2');
+  $size = htmlspecialchars((isset($_GET['size'])) ? $_GET['size'] : '4');
+  $bgColor = htmlspecialchars(urlencode((isset($_GET['bgColor'])) ? $_GET['bgColor'] : '%23FFFFFF'));
+  $mainColor = htmlspecialchars(urlencode((isset($_GET['mainColor'])) ? $_GET['mainColor'] : '%23000000'));
+?>
+  <Url type="text/html" template="<?= $instPath; ?>">
+    <Param name="txt" value="{searchTerms}"/>
+    <Param name="redondancy" value="<?= $redondancy ?>"/>
+    <Param name="margin" value="<?= $margin ?>"/>
+    <Param name="size" value="<?= $size ?>"/>
+    <Param name="bgColor" value="<?= $bgColor ?>"/>
+    <Param name="mainColor" value="<?= $mainColor ?>"/>
+  </Url>
+  <Url type="application/opensearchdescription+xml" rel="self" template="<?= $instPath; ?>opensearch.php">
+    <Param name="redondancy" value="<?= $redondancy ?>"/>
+    <Param name="margin" value="<?= $margin ?>"/>
+    <Param name="size" value="<?= $size ?>"/>
+    <Param name="bgColor" value="<?= $bgColor ?>"/>
+    <Param name="mainColor" value="<?= $mainColor ?>"/>
+  </Url>
 </OpenSearchDescription>
diff --git a/themes/resize.php b/themes/resize.php
index 89a72ba..c93ade1 100755
--- a/themes/resize.php
+++ b/themes/resize.php
@@ -27,5 +27,5 @@ if (php_sapi_name() == "cli") {
   }
 
 } else {
-  echo "Available only via CLI for security reasons. Use 'php themes/resize.php'";
+  echo "Available only via CLI for security reasons. Use 'php themes/resize.php <theme name>'";
 }