Improving ;vlusr and lvlrmt translation

diff --git a/www/gesdis.php b/www/gesdis.php
index 8dc3cd08c25370f953cf578a1146bbd90ec992dd..14d53df91f04b3eabd3fddee6d631bb6f4004221 100644 (file)
--- a/www/gesdis.php
+++ b/www/gesdis.php
@@ -39,7 +39,7 @@ switch ($pageref) {
     $sellang="";
     break;
   case "lvlmai"        :
-    $entete="<span class=\"translatable\" trkey=\"Main screen\">Main screen</span>";
+    $entete="<span class=\"translatable\" trkey=\"Email management\">Email management</span>";
     $out="<span class=\"translatable\" trkey=\"Logout\">Logout</span>";
     if ($isadmin==true) {
       $remotes="<span class=\"translatable\" trkey=\"SMTP servers\">SMTP servers</span>";
@@ -52,15 +52,15 @@ switch ($pageref) {
   case "lvlusr"        :
     $entete="<span class=\"translatable\" trkey=\"Users management\">Users management</span>";
     //$entete=gettranslate($userlang,"User Management");
-    $main=gettranslate($userlang,"Main screen");
-    $out=gettranslate($userlang,"Logout");
+    $main="<span class=\"translatable\" trkey=\"Email management\">Email management</span>";
+    $out="<span class=\"translatable\" trkey=\"Logout\">Logout</span>";
     $click2="<a href='/lvlmai.php'>$main</a>";
     $click3="<a href='/lvllog.php'>$out</a>";
     break;
   case "lvlrmt"        :
-    $entete=gettranslate($userlang,"Remote SMTP server Management");
-    $main=gettranslate($userlang,"Main screen");
-    $out=gettranslate($userlang,"Logout");
+    $entete="<span class=\"translatable\" trkey=\"SMTP servers\">SMTP servers</span>";
+    $main="<span class=\"translatable\" trkey=\"Email management\">Email management</span>";
+    $out="<span class=\"translatable\" trkey=\"Logout\">Logout</span>";
     $click2="<a href='/lvlmai.php'>$main</a>";
     $click3="<a href='/lvllog.php'>$out</a>";
     break;

diff --git a/www/lvlmai.php b/www/lvlmai.php
index 5e3a499d602d06222fbb1759f6a542345ec50f70..7e7e59943f3f9d5678253dca9c29f0d17c52cf51 100644 (file)
--- a/www/lvlmai.php
+++ b/www/lvlmai.php
@@ -275,10 +275,11 @@ return $STR;
 //==============================================================
 global $logname;
 
+rou_openlog();
+
 $dbsql=sql_connect();
 sql_setlogname($dbsql);
 sql_close($dbsql);
-rou_closelog();
 
 if ($logname!=NULL) {
   echo body($logname);
@@ -286,5 +287,6 @@ if ($logname!=NULL) {
 else {
   header('Location: lvllog.php');
   }
+rou_closelog();
 ?>
 

diff --git a/www/lvlrmt.php b/www/lvlrmt.php
index 6b9cf99d1f1b03f09c19df5806b42b68747386f2..ea8c105deb09f30498637c6cd66189f558abfcdd 100644 (file)
--- a/www/lvlrmt.php
+++ b/www/lvlrmt.php
@@ -95,13 +95,16 @@ if (isset($_POST['limit']))
   $limit=intval($_POST['limit']);
 if (isset($_POST['offset']))
   $offset=intval($_POST['offset']);
+
 $rqst=NEW probe("remotes",$limit,$offset);
+
 if (isset($_POST['remoteip'])) {
   $remoteip=trim(($_POST['remoteip']));
   if (strlen($remoteip)>0)
     $rqst->where("remoteip like '%$remoteip%'");
   }
 $numrec=$rqst->getnumrec();
+
 if (isset($_POST['scanner'])) {
   $scanner=$_POST['scanner'];
   switch ($scanner) {
@@ -146,7 +149,11 @@ foreach($remotes as $remote) {
   $line=$line."<TD align=center>$credit</TD>\r\n";
   $line=$line."</TR>";
   }
-$rqst->close();
+//connection to database not needed anymore
+$rqst->release();
+unset($rqst);
+
+rou_closelog();
 
 $start=starthtml();
 $stop=endhtml();
@@ -196,11 +203,10 @@ EOT;
 return $STR;
 }
 
-
+rou_openlog();
 $dbsql=sql_connect();
 sql_setlogname($dbsql);
 sql_close($dbsql);
-rou_closelog();
 
 if ($logname!=NULL) {
   echo body($logname);
@@ -208,6 +214,7 @@ if ($logname!=NULL) {
 else {
   header('Location: lvllog.php');
   }
+rou_closelog();
 ?>
 
 

diff --git a/www/lvlusr.php b/www/lvlusr.php
index 6d8389466c938880fbfbbaea29403aba9bba2b80..be6a3a64616f9da7b3d55d49334b2c4941f1643a 100644 (file)
--- a/www/lvlusr.php
+++ b/www/lvlusr.php
@@ -16,7 +16,6 @@ function tblheader(string $username,int $numrec,int $offset,int $limit)
 global $userlang;
 
 $debut=$offset+1;
-$email=gettranslate($userlang,"Email");
 
 $STR  = <<<EOT
 <TABLE WIDTH="100%" BORDER="0" CellSpacing="0">
@@ -52,7 +51,7 @@ $STR  = <<<EOT
 <TD align=left>
 <FORM action="lvlusr.php" method="post">
 <FONT SIZE=+1>
-$email:
+<span class="translatable" trkey="Email">Email</span>
 <input type="text" value="$username" name="username" size=20 style="font-size: 100%;">
 <input type="submit" style="display:none"/>
 </FONT>
@@ -200,10 +199,10 @@ return $STR;
 }
 
 
+rou_openlog();
 $dbsql=sql_connect();
 sql_setlogname($dbsql);
 sql_close($dbsql);
-rou_closelog();
 
 if ($logname!=NULL) {
   echo body($logname);
@@ -211,6 +210,7 @@ if ($logname!=NULL) {
 else {
   header('Location: lvllog.php');
   }
+rou_closelog();
 ?>
 
 

diff --git a/www/translations.js b/www/translations.js
index b2d1ffe277b6b3e45335bfdda1aa4c5efb243fd7..68d772bb26fa246874ff6adc38271ef14d08ecbd 100644 (file)
--- a/www/translations.js
+++ b/www/translations.js
@@ -6,6 +6,7 @@ const TR =
     ["Authentication",  "Authentification"],
     ["Date",            "Date"],
     ["Email",           "Courriel"],
+    ["Email management","Gestion des courriers"],
     ["Login",           "Connexion"],
     ["Logout",          "Deconnexion"],
     ["Main screen",     "Ecran Principal"],