From 0afcc575be36505a0086588518e0b9130890b75d Mon Sep 17 00:00:00 2001
From: tale-fau <lefaucheurtanguy@gmail.com>
Date: Wed, 13 Sep 2023 16:54:12 +0200
Subject: [PATCH] adapt language button (#48)

---
 app.php                         | 15 ++++++++++-----
 templates/metadata.html.php     |  6 ++++--
 templates/organization.html.php |  6 ++++--
 templates/signature.html.php    |  6 ++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app.php b/app.php
index f7f9112..171f9fc 100644
--- a/app.php
+++ b/app.php
@@ -39,16 +39,21 @@ if($f3->get('DISABLE_ORGANIZATION')) {
 
 if ($f3->get('GET.lang')) {
     $lang = $f3->get('GET.lang');
-    $_SESSION['LANGUAGE'] = $lang;
-    putenv("LANGUAGE=$lang");
-    $f3->set('LANGUAGE', $lang);
+    changeLanguage($lang, $f3);
 } elseif (isset($_SESSION['LANGUAGE'])) {
-    $lang = $_SESSION['LANGUAGE'];
-    putenv("LANGUAGE=$lang");
+    changeLanguage($_SESSION['LANGUAGE'], $f3);
+} elseif (isset($_COOKIE['LANGUAGE'])) {
+    changeLanguage($_COOKIE['LANGUAGE'], $f3);
 }
 bindtextdomain('application', $f3->get('ROOT')."/locale/");
 textdomain('application');
 
+function changeLanguage($lang, $f3) {
+    $_SESSION['LANGUAGE'] = $lang;
+    setcookie("LANGUAGE", $lang, strtotime('+1 year'));
+    putenv("LANGUAGE=$lang");
+    $f3->set('LANGUAGE', $lang);
+}
 
 $f3->route('GET /',
     function($f3) {
diff --git a/templates/metadata.html.php b/templates/metadata.html.php
index 3de77e2..02800e3 100644
--- a/templates/metadata.html.php
+++ b/templates/metadata.html.php
@@ -19,12 +19,14 @@
     </div>
 </noscript>
 <div id="page-upload">
-    <div class="dropdown float-end">
+    <div class="dropdown position-absolute top-0 end-0 mt-2 me-2">
         <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
             <?php echo _("Language"); ?>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-            <?php foreach ($LANGUAGES as $item => $key): echo '<li><a class="dropdown-item" href="?lang=' . htmlspecialchars($item) . '">' . htmlspecialchars($key) . '</a></li>'; endforeach; ?>
+            <?php foreach ($LANGUAGES as $key => $langue):?>
+                <li><a class="dropdown-item" href="?lang=<?php echo $key ?>"><?php echo $langue ?></a></li>
+            <?php endforeach; ?>
         </ul>
     </div>
     <ul class="nav justify-content-center nav-tabs mt-2">
diff --git a/templates/organization.html.php b/templates/organization.html.php
index d4ba52a..2d08e0a 100644
--- a/templates/organization.html.php
+++ b/templates/organization.html.php
@@ -19,12 +19,14 @@
         </div>
     </noscript>
     <div id="page-upload">
-        <div class="dropdown float-end">
+        <div class="dropdown position-absolute top-0 end-0 mt-2 me-2">
             <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
                 <?php echo _("Language"); ?>
             </button>
             <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-                <?php foreach ($LANGUAGES as $item => $key): echo '<li><a class="dropdown-item" href="?lang=' . htmlspecialchars($item) . '">' . htmlspecialchars($key) . '</a></li>'; endforeach; ?>
+                <?php foreach ($LANGUAGES as $key => $langue):?>
+                <li><a class="dropdown-item" href="?lang=<?php echo $key ?>"><?php echo $langue ?></a></li>
+                <?php endforeach; ?>
             </ul>
         </div>
         <ul class="nav justify-content-center nav-tabs mt-2">
diff --git a/templates/signature.html.php b/templates/signature.html.php
index ae6ecec..d1c0a6c 100644
--- a/templates/signature.html.php
+++ b/templates/signature.html.php
@@ -18,12 +18,14 @@
 </noscript>
 <div id="page-upload">
     <?php if(!$disableOrganization): ?>
-        <div class="dropdown float-end">
+        <div class="dropdown position-absolute top-0 end-0 mt-2 me-2">
             <button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
                 <?php echo _("Language"); ?>
             </button>
             <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-                <?php foreach ($LANGUAGES as $item => $key): echo '<li><a class="dropdown-item" href="?lang=' . htmlspecialchars($item) . '">' . htmlspecialchars($key) . '</a></li>'; endforeach; ?>
+                <?php foreach ($LANGUAGES as $key => $langue):?>
+                    <li><a class="dropdown-item" href="?lang=<?php echo $key ?>"><?php echo $langue ?></a></li>
+                <?php endforeach; ?>
             </ul>
         </div>
         <ul class="nav justify-content-center nav-tabs mt-2">