Browse Source

Allow upgrading opensearch plugin from LibreQR 1.1.0 + use standardised opensearch parameters

tags/1.2.0
Miraty 6 months ago
parent
commit
92846965f4
3 changed files with 25 additions and 4 deletions
  1. +1
    -0
      .gitignore
  2. +23
    -3
      opensearch.php
  3. +1
    -1
      themes/resize.php

+ 1
- 0
.gitignore View File

@@ -1 +1,2 @@
.directory
temp/*

+ 23
- 3
opensearch.php View File

@@ -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>

+ 1
- 1
themes/resize.php View File

@@ -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>'";
}

Loading…
Cancel
Save