[TASK] security announcement

[jirafeau.git] / lib / lang.php

diff --git a/lib/lang.php b/lib/lang.php
index da28a81b1d70b911766190d2d7d318033cc8f9f9..cc0a9acb7f84a58bc621fefbb96ae185cbaa7516 100644 (file)
--- a/lib/lang.php
+++ b/lib/lang.php
@@ -1,102 +1,84 @@
-<?php\r
-/*\r
- *  Jirafeau, your web file repository\r
- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>\r
- *\r
- *  This program is free software: you can redistribute it and/or modify\r
- *  it under the terms of the GNU Affero General Public License as\r
- *  published by the Free Software Foundation, either version 3 of the\r
- *  License, or (at your option) any later version.\r
- *\r
- *  This program is distributed in the hope that it will be useful,\r
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- *  GNU Affero General Public License for more details.\r
- *\r
- *  You should have received a copy of the GNU Affero General Public License\r
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.\r
- */\r
-\r
-global $languages_list;\r
-$languages_list = array ('auto' => 'Automatic',\r
-                         'de'   => 'Deutsch',\r
-                         'en'   => 'English',\r
-                         'hu'   => 'Magyar',\r
-                         'fi'   => 'Suomi',\r
-                         'fr'   => 'Français',\r
-                         'it'   => 'Italiano',\r
-                         'nl'   => 'Nederlands',\r
-                         'ro'   => 'Limba română',\r
-                         'sk'   => 'Slovenčina');\r
-\r
-/* Translation */\r
-function t ($text)\r
-{\r
-    $cfg = $GLOBALS['cfg'];\r
-    $languages_list = $GLOBALS['languages_list'];\r
-\r
-    /* Detect user's langage if we are in automatic mode. */\r
-    if (strcmp ($cfg['lang'], 'auto') == 0)\r
-    {\r
-        if (isset ($_SERVER['HTTP_ACCEPT_LANGUAGE']))\r
-            $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
-        else\r
-            $l = "en";\r
-    }\r
-    else\r
-        $l = $cfg['lang'];\r
-\r
-    /* Is the langage in the list ? */\r
-    $found = false;\r
-    foreach ($languages_list as $key => $v)\r
-        if (strcmp ($l, $key) == 0)\r
-            $found = true;\r
-\r
-    /* Don't translate english. */\r
-    if (!($found && strcmp ($l, "en")))\r
-        return $text;\r
-\r
-    /* Open translation file. */\r
-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r
-    if ($trans_j === FALSE)\r
-        return $text;\r
-\r
-    /* Decode JSON. */\r
-    $trans = json_decode ($trans_j, true);\r
-    if ($trans === NULL)\r
-        return $text;\r
-\r
-    /* Try to find translation. */\r
-    if (!array_key_exists ($text, $trans))\r
-        return $text;\r
-\r
-    return $trans[$text];\r
-}\r
-\r
-function json_lang_generator ()\r
-{\r
-    $cfg = $GLOBALS['cfg'];\r
-    $languages_list = $GLOBALS['languages_list'];\r
-\r
-    /* Detect user's langage if we are in automatic mode. */\r
-    if (strcmp ($cfg['lang'], 'auto') == 0)\r
-        $l = substr ($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);\r
-    else\r
-        $l = $cfg['lang'];\r
-\r
-    /* Is the langage in the list ? */\r
-    $found = false;\r
-    foreach ($languages_list as $key => $v)\r
-        if (strcmp ($l, $key) == 0)\r
-            $found = true;\r
-\r
-    /* Don't translate english. */\r
-    if (!($found && strcmp ($l, "en")))\r
-        return "{}";\r
-\r
-    /* Open translation file. */\r
-    $trans_j = file_get_contents (JIRAFEAU_ROOT . "lib/locales/$l.json");\r
-    return $trans_j; \r
-}\r
-\r
-?>\r
+<?php
+/*
+ *  Jirafeau, your web file repository
+ *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+function t($string_id)
+{
+    $r = t_in($string_id, t_select_lang());
+    if ($r === false) {
+        $r = t_in($string_id, "en");
+        if ($r === false) {
+            return "FIX ME: " . $string_id;
+        }
+    }
+    return $r;
+}
+
+function t_select_lang() {
+    $cfg = $GLOBALS['cfg'];
+    if (strcmp($cfg['lang'], 'auto') != 0) {
+        return $cfg['lang'];
+    }
+    else if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+    } else {
+        return "en";
+    }
+}
+
+function t_in($string_id, $lang) {
+    $trans = t_get_json($lang);
+    if ($trans === false) {
+        return false;
+    }
+    if (!array_key_exists($string_id, $trans)) {
+        return false;
+    }
+    return $trans[$string_id];
+}
+
+function t_get_raw_json($lang) {
+    $p = JIRAFEAU_ROOT . "lib/locales/$lang.json";
+    if (!file_exists($p)) {
+        return false;
+    }
+    $json = file_get_contents($p);
+    if ($json === false) {
+        return false;
+    }
+    return $json;
+}
+
+function t_get_json($lang) {
+    $raw_j = t_get_raw_json($lang);
+    $array = json_decode($raw_j, true);
+    if ($array === null) {
+        return false;
+    }
+    return $array;
+}
+
+function json_lang_generator($lang) {
+    $r = "";
+    if ($lang === null) {
+        $r = t_get_raw_json(t_select_lang());
+    } else {
+        $r = t_get_raw_json($lang);
+    }
+    return $r === false ? "{}" : $r;
+}