Improved http status code in error case.

config.inc.php

@@ -11,7 +11,7 @@ $timeBeforeDeletion = 60 * 60 * 24 * 2;
 
 // EN: Theme's name (must be in the themes directory)
 // FR : Nom du thème (doit être dans le dossier themes)
-$theme = "libreqr";
+$theme = "libre-service.eu";
 
 // EN: Language used if those requested by the user are not available
 // FR : Langue utilisée si celles demandées par l'utilisateurice ne sont pas disponibles
@@ -27,5 +27,5 @@ $fileNameLenght = 32;
 
 // EN: Will be printed at the bottom of the interface
 // FR : Sera affiché en bas de l'interface
-$customTextEnabled = false;
-$customText = "This LibreQR instance is hosted by <a href='https://foo.example/'>foo</a>.";
+$customTextEnabled = true;
+$customText = "Cette instance de LibreQR est hébergée  par <a href='https://www.libre-service.eu/'>https://www.libre-service.eu/</a>.";

inc.php

@@ -8,7 +8,7 @@ define("DEFAULT_SIZE", 4);
 define("DEFAULT_BGCOLOR", "FFFFFF");
 define("DEFAULT_MAINCOLOR", "000000");
 
-$libreqrVersion = "1.4.0dev";
+$libreqrVersion = "libre-service.eu-1.3.0";
 
 // Defines the locale to be used
 if ($forceLocale == false AND isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

index.php

@@ -41,33 +41,50 @@ if (
   if (strlen($_POST['txt']) >= 1 AND strlen($_POST['txt']) <= 4096)
     $params['txt'] = $_POST['txt'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for txt");
+  }
 
   if ($_POST['redondancy'] === "L" OR $_POST['redondancy'] === "M" OR $_POST['redondancy'] === "Q" OR $_POST['redondancy'] === "H")
     $params['redondancy'] = $_POST['redondancy'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for redondancy");
+  }
 
   if (is_numeric($_POST['margin']) AND $_POST['margin'] >= 0 AND $_POST['margin'] <= 128)
     $params['margin'] = $_POST['margin'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for margin");
+  }
 
   if (is_numeric($_POST['size']) AND $_POST['size'] >= 1 AND $_POST['size'] <= 128)
     $params['size'] = $_POST['size'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for size");
+  }
 
   if (preg_match("/^#[abcdefABCDEF0-9]{6}$/", $_POST['bgColor']))
     $params['bgColor'] = $_POST['bgColor'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for bgColor");
+  }
 
   if (preg_match("/^#[abcdefABCDEF0-9]{6}$/", $_POST['mainColor']))
     $params['mainColor'] = $_POST['mainColor'];
   else
+  {
+    http_response_code(400);
     exit("Wrong value for mainColor");
-
+  }
 }
 
 ?>
@@ -110,7 +127,7 @@ if (
         <a id="linkTitles" href="./">
           <img alt="" id="logo" src="themes/<?php echo $theme; ?>/icons/128.png">
           <div id="titles">
-            <h1>LibreQR</h1>
+            <h1>QRCode.libre-service.eu</h1>
             <h2><?= $loc['subtitle'] ?></h2>
           </div>
         </a>

locales/en.php

@@ -41,7 +41,7 @@ $loc = array(
     A QR code is a 2 dimensional barcode in which text is written in binary. It can be decoded with a device equipped with a photo sensor and an adequate software.
     <a href='https://en.wikipedia.org/wiki/QR_code'>QR code on Wikipedia</a>.
   ",
-  'metaText_legal' => "LibreQR " . $libreqrVersion . " is a free software whose <a href='https://code.antopie.org/miraty/libreqr/'>source code</a> is available under the terms of the <abbr title='GNU Affero General Public License version 3 or any later version'><a href='LICENSE.html'>AGPLv3</a>+</abbr>.",
+  'metaText_legal' => "<a href='https://code.antopie.org/miraty/libreqr/'>LibreQR</a> version " . $libreqrVersion . " is a free software whose <a href='https://forge.devinsy.fr/libre-service.eu/qrcode.libre-service.eu-libreqr/'>source code</a> is available under the terms of the <abbr title='GNU Affero General Public License version 3 or any later version'><a href='LICENSE.html'>AGPLv3</a>+</abbr>.",
 
   'opensearch_description' => "Generate QR codes from your search or address bar",
 );

locales/fr.php

@@ -41,7 +41,7 @@ $loc = array(
     Un code QR est un code-barres en 2 dimensions dans lequel du texte est inscrit en binaire. Il peut être décodé avec un appareil muni d'un capteur photo et d'un logiciel adéquat.
     <a href='https://fr.wikipedia.org/wiki/Code_QR'>Code QR sur Wikipédia</a>.
   ",
-  'metaText_legal' => "LibreQR " . $libreqrVersion . " est un logiciel libre dont le <a href='https://code.antopie.org/miraty/libreqr/'>code source</a> est disponible selon les termes de l'<abbr title='GNU Affero General Public License version 3 ou toute version ultérieure'><a href='LICENSE.html'>AGPLv3</a>+</abbr>.",
+  'metaText_legal' => "<a href='https://code.antopie.org/miraty/libreqr/'>LibreQR</a> version " . $libreqrVersion . " est un logiciel libre dont le <a href='https://forge.devinsy.fr/libre-service.eu/qrcode.libre-service.eu-libreqr'>code source</a> est disponible selon les termes de l'<abbr title='GNU Affero General Public License version 3 ou toute version ultérieure'><a href='LICENSE.html'>AGPLv3</a>+</abbr>.",
 
   'opensearch_description' => "Générez des codes QR depuis votre barre de recherche ou d'adresse",
 );

themes/libre-service.eu/theme.php

@@ -0,0 +1,30 @@
+<?php
+
+// List icons dimensions
+$themeDimensionsIcons = array(16, 32, 48, 64, 96, 128, 192, 256, 384, 512);
+
+$colorScheme = array(
+  // Light theme
+  "text-light" => "#2a2a2a",
+  "bg-light" => "#ff766c",
+  "bgField-light" => "#65c6e8",
+  "bgHelp-light" => "#ececec",
+  "bgTextarea-light" => "#e5e5e5",
+  "textareaText-light" => "#2a2a2a",
+  "textareaPlaceholder-light" => "#868686",
+  "border-light" => "#65666b",
+  "borderHover-light" => "#46484e",
+  "borderFocus-light" => "#2a2a2a",
+  
+  // Dark theme
+  "text-dark" => "white",
+  "bg-dark" => "#2a2a2a",
+  "bgField-dark" => "#31363B",
+  "bgHelp-dark" => "#151616",
+  "bgTextarea-dark" => "#232629",
+  "textareaText-dark" => "white",
+  "textareaPlaceholder-dark" => "#bababa",
+  "border-dark" => "#5f5f5f",
+  "borderHover-dark" => "#808080",
+  "borderFocus-dark" => "white"
+);

themes/parinux/theme.php

@@ -1,27 +0,0 @@
-<?php
-
-// List icons dimensions
-$themeDimensionsIcons = array(16, 32, 48, 64, 96, 128, 192, 256, 384, 512);
-
-$colorScheme = array(
-  // Light theme
-  "bg-light" => "#14678b",
-  "bgField-light" => "#2186b1",
-  "bgTextField-light" => "#2186b1",
-  "bgHelp-light" => "#118abe",
-  "border-light" => "#42a0c8",
-  "borderHover-light" => "#87d1f1",
-  "borderFocus-light" => "#e2f6ff",
-  "text-light" => "#ffffff",
-  "secondaryText-light" => "#bbe1f1",
-  // Dark theme
-  "bg-dark" => "#14678b",
-  "bgField-dark" => "#2186b1",
-  "bgTextField-dark" => "#2186b1",
-  "bgHelp-dark" => "#118abe",
-  "border-dark" => "#42a0c8",
-  "borderHover-dark" => "#87d1f1",
-  "borderFocus-dark" => "#e2f6ff",
-  "text-dark" => "#ffffff",
-  "secondaryText-dark" => "#bbe1f1"
-);