Commutation en<->fr for lvlmai.php display is working

diff --git a/www/lvlmai.php b/www/lvlmai.php
index 6eb3053142fdc1dc4d9b059960089a7ef45e1b2e..5e3a499d602d06222fbb1759f6a542345ec50f70 100644 (file)
--- a/www/lvlmai.php
+++ b/www/lvlmai.php
@@ -24,11 +24,29 @@ function tblheader(string $dsearch,int $numrec,int $offset,int $limit, string $s
 global $userlang;
 global $myfilename;
 
-$debut=$offset+1;
-$originator=gettranslate($userlang,"Originator");
-$recipient=gettranslate($userlang,"Recipient");
 $date=gettranslate($userlang,"Date");
+$filterOptions = [
+    'smtpfrom' => 'Originator',
+    'rcptto'   => 'Recipient',
+    'creation' => 'Date',
+    ];
+
+$optionsHtml = '';
+
+foreach ($filterOptions as $value => $trkey) {
+    $selected = ($selectedField === $value) ? ' selected' : '';
 
+    $optionsHtml .=
+        '<option value="' . htmlspecialchars($value, ENT_QUOTES) . '"'
+      . ' class="translatable"'
+      . ' trkey="' . htmlspecialchars($trkey, ENT_QUOTES) . '"'
+      . $selected
+      . '>'
+      . htmlspecialchars($trkey)
+      . '</option>';
+}
+error_log($optionsHtml);
+$debut=$offset+1;
 $STR  = <<<EOT
 <TABLE WIDTH="100%" BORDER="0" CellSpacing="0">
 <TR>
@@ -66,9 +84,7 @@ $STR  = <<<EOT
 <span class="translatable" trkey="Search">Search</span>
 <input type="text" value="$dsearch" name="dsearch" size=20 style="font-size: 100%;">
 <select name="filterfield" style="font-size:100%;">
-    <option value="smtpfrom"   EOT . (($selectedField==='smtpfrom')?'selected':'') . EOT>$originator</option>
-    <option value="rcptto"     EOT . (($selectedField==='rcptto')?'selected':'') . EOT>$recipient</option>
-    <option value="creation"   EOT . (($selectedField==='creation')?'selected':'') . EOT>$date</option>
+$optionsHtml
 </select>
 <input type="submit" style="display:none"/>
 </FONT>
@@ -105,14 +121,10 @@ global $userlang;
 global $isadmin;
 global $myfilename;
 
-$horiginator=gettranslate($userlang,"Originator");
-$hrecipient=gettranslate($userlang,"Recipient");
-$hdate=gettranslate($userlang,"Date");
-
 $limit=20;
 $offset=0;
 $dsearch="";
-$selectedField = $hrecipient;
+$selectedField = 'rcptto';
 
 if (isset($_POST['limit']))
   $limit=intval($_POST['limit']);
@@ -127,7 +139,7 @@ if (isset($_POST['dsearch'])) {
   $dsearch=trim($_POST['dsearch']);
   if (strlen($dsearch)>0) {
     // sécuriser le champ sélectionné
-    $allowedFields = [$horiginator,$hrecipient,$hdate];
+    $allowedFields = ['smtpfrom','rcptto','creation'];
   if (!in_array($selectedField,$allowedFields))
     $selectedField = 'rcptto';
 
@@ -238,13 +250,13 @@ $tblheader
 <table class="table-userlist" WIDTH="100%" BORDER="1" CellSpacing="0">
 <TR>
 <TH align=center>Num</TH>
-<TH align=center>Status</TH>
-<TH align=center>$hdate</TH>
+<TH align=center><span class="translatable" trkey="Status">Status</span></TH>
+<TH align=center><span class="translatable" trkey="Date">Date</span></TH>
 <TH align=center>IP</TH>
-<TH align=center>Reverse Address</TH>
+<TH align=center><span class="translatable" trkey="Reverse IP">Reverse IP</span></TH>
 <TH align=center><span class="translatable" trkey="Originator">Originator</span></TH>
 <TH align=center><span class="translatable" trkey="Recipient">Recipient</span></TH>
-<TH align=center>Subject</TH>
+<TH align=center><span class="translatable" trkey="Subject">Subject</span></TH>
 </TR>
 $line
 </Table>

diff --git a/www/translations.js b/www/translations.js
index 6f3ac80ecb15cac53310102c78cc2b914d7c6f84..b2d1ffe277b6b3e45335bfdda1aa4c5efb243fd7 100644 (file)
--- a/www/translations.js
+++ b/www/translations.js
@@ -4,6 +4,7 @@
 const TR =
   [
     ["Authentication",  "Authentification"],
+    ["Date",            "Date"],
     ["Email",           "Courriel"],
     ["Login",           "Connexion"],
     ["Logout",          "Deconnexion"],
@@ -11,9 +12,12 @@ const TR =
     ["Originator",      "Expediteur"],
     ["Password",        "Mot de passe"],
     ["Recipient",       "Destinataire"],
+    ["Reverse IP",      "IP inversée"],
     ["SMTP servers",    "Serveurs SMTP"],
     ["Search",          "Recherche"],
+    ["Subject",         "Sujet"],
     ["Show",            "Afficher"],
+    ["Status",          "Statut"],
     ["Users management","Gestion des usagers"],
     [null,              null]
   ];

diff --git a/www/unilng.php b/www/unilng.php
index 41b2b19ccda0d944f11075c76933ccfe07b0a7de..6029e83051e28e32500d828b6e4f81b6c4d56ee8 100644 (file)
--- a/www/unilng.php
+++ b/www/unilng.php
@@ -17,36 +17,11 @@ enum lng {
 
 $userlang=lng::en;
 
-$TR=   [
-       ["Email","Courriel"],
-       ["Logout","Deconnexion"],
-       ["Main screen","Ecran Principal"],
-       ["Remote SMTP server","Serveur SMTP distant"],
-       ["Originator","Expediteur"],
-       ["Recipient","Destinataire"],
-       ["User Management","Gestion Usagers"],
-       ["Remote SMTP server Management","Gestion des serveurs SMTP distants"],
-       ["Search","Recherche"],
-       ];
-
 function gettranslate(lng $lang,$mot)
 
 {
-global $TR;
 
-foreach ($TR as $row) {
-  if ($row[0]===$mot) {
-    switch ($lang) {
-      case lng::fr  :  //French
-        $mot=$row[1];
-        break;
-      case lng::en  :  //English
-      default      :
-        break;
-      }
-    break;
-    }
-  }
+$mot=$mot."_X";
 return $mot;
 }
 ?>