From 547360c66741e9925ebcdbd2bd2f65146b47bc47 Mon Sep 17 00:00:00 2001 From: Jean-Marc Pigeon Date: Wed, 10 Dec 2025 06:43:33 -0500 Subject: [PATCH] Adjusting translation --- www/gesdis.php | 2 +- www/lvlmai.php | 247 +++++++++++++++++++++++++++---------------------- www/unilng.php | 61 +++++------- 3 files changed, 160 insertions(+), 150 deletions(-) diff --git a/www/gesdis.php b/www/gesdis.php index 5d14a8b..2cc8da1 100644 --- a/www/gesdis.php +++ b/www/gesdis.php @@ -48,7 +48,7 @@ switch ($pageref) { $click3="$out"; break; case "lvlrmt" : - $entete=gettranslate($userlang,"Remote server Management"); + $entete=gettranslate($userlang,"Remote SMTP server Management"); $main=gettranslate($userlang,"Main screen"); $out=gettranslate($userlang,"Logout"); $click2="$main"; diff --git a/www/lvlmai.php b/www/lvlmai.php index 97856eb..19be2b7 100644 --- a/www/lvlmai.php +++ b/www/lvlmai.php @@ -1,5 +1,5 @@ @@ -63,9 +67,9 @@ function tblheader(string $dsearch,int $numrec,int $offset,int $limit, string $s $search: @@ -89,126 +93,142 @@ $search: EOT; - return $STR; +return $STR; } //============================================================== // Main screen body generation //============================================================== function body($logname) + { - global $isadmin; - global $myfilename; +global $userlang; +global $isadmin; +global $myfilename; - $limit=20; - $offset=0; - $dsearch=""; - $selectedField = 'rcptto'; +$limit=20; +$offset=0; +$dsearch=""; +$selectedField = 'rcptto'; - if (isset($_POST['limit'])) - $limit=intval($_POST['limit']); - if (isset($_POST['offset'])) - $offset=intval($_POST['offset']); - if (isset($_POST['filterfield'])) - $selectedField = $_POST['filterfield']; +if (isset($_POST['limit'])) + $limit=intval($_POST['limit']); +if (isset($_POST['offset'])) + $offset=intval($_POST['offset']); +if (isset($_POST['filterfield'])) + $selectedField = $_POST['filterfield']; - $rqst = new probe("actions",$limit,$offset); +$rqst = new probe("actions",$limit,$offset); - if (isset($_POST['dsearch'])) { - $dsearch=trim($_POST['dsearch']); - if (strlen($dsearch)>0) { - // sécuriser le champ sélectionné - $allowedFields = ['smtpfrom','rcptto','creation']; - if (!in_array($selectedField,$allowedFields)) - $selectedField = 'rcptto'; +if (isset($_POST['dsearch'])) { + $dsearch=trim($_POST['dsearch']); + if (strlen($dsearch)>0) { + // sécuriser le champ sélectionné + $allowedFields = ['smtpfrom','rcptto','creation']; + if (!in_array($selectedField,$allowedFields)) + $selectedField = 'rcptto'; - // filtrage selon le champ choisi - if ($selectedField === 'creation') { - // pour la date, on peut filtrer par LIKE - $rqst->where("$selectedField::text LIKE '%$dsearch%'"); - } else { - $rqst->where("$selectedField LIKE '%$dsearch%'"); - } - } + // filtrage selon le champ choisi + if ($selectedField === 'creation') { + // pour la date, on peut filtrer par LIKE + $rqst->where("$selectedField::text LIKE '%$dsearch%'"); } + else { + $rqst->where("$selectedField LIKE '%$dsearch%'"); + } + } +} - $numrec=$rqst->getnumrec(); +$numrec=$rqst->getnumrec(); - if (isset($_POST['scanner'])) { - $scanner=$_POST['scanner']; - switch ($scanner) { - case "golast" : - $offset=$rqst->goLast(); - break; - case "gonext" : - $offset=$rqst->goNext(); - break; - case "goprevious" : - $offset=$rqst->goPrevious(); - break; - case "gofirst" : - $offset=$rqst->goFirst(); - break; - default : - break; - } +if (isset($_POST['scanner'])) { + $scanner=$_POST['scanner']; + switch ($scanner) { + case "golast" : + $offset=$rqst->goLast(); + break; + case "gonext" : + $offset=$rqst->goNext(); + break; + case "goprevious" : + $offset=$rqst->goPrevious(); + break; + case "gofirst" : + $offset=$rqst->goFirst(); + break; + default : + break; } + } - $actions=$rqst->order("creation desc") - ->limit($limit) - ->GET(); - - $line=""; - $count=$offset+1; - foreach($actions as $action) { - $info=substr($action['info'],3,1); - $status=$action['status']; - $subject=htmlspecialchars($action['subject'],ENT_QUOTES); - if (($subject==NULL) || (strlen($subject)==0)) - $subject=htmlspecialchars($action['info'],ENT_QUOTES); +$actions=$rqst->order("creation desc") + ->limit($limit) + ->GET(); - switch ($status) { - case 250: $bgcolor="#90EE90"; break; // light green - case 460: $bgcolor="#ff6666"; $subject=htmlspecialchars($action['info'],ENT_QUOTES); break; // light red - case 551: $bgcolor="#FF7F50"; break; // coral - case 555: $bgcolor="#D3D3D3"; break; // light gray - default: $bgcolor="yellow"; break; - } +$line=""; +$count=$offset+1; +foreach($actions as $action) { + $info=substr($action['info'],3,1); + $status=$action['status']; + $subject=htmlspecialchars($action['subject'],ENT_QUOTES); + if (($subject==NULL) || (strlen($subject)==0)) + $subject=htmlspecialchars($action['info'],ENT_QUOTES); + switch ($status) { + case 250: + $bgcolor="#90EE90"; + break; // light green + case 460: + $bgcolor="#ff6666"; + $subject=htmlspecialchars($action['info'],ENT_QUOTES); + break; // light red + case 551: + $bgcolor="#FF7F50"; + break; // coral + case 555: + $bgcolor="#D3D3D3"; + break; // light gray + default: + $bgcolor="yellow"; + break; + } + $date=$action['creation']; + $reverse=$action['reverse']; + $remoteip=$action['remoteip']; + $smtpfrom=$action['smtpfrom']; + $recipient=$action['rcptto']; + $emailfrom=htmlspecialchars($action['emailfrom'],ENT_QUOTES); - $date=$action['creation']; - $reverse=$action['reverse']; - $remoteip=$action['remoteip']; - $smtpfrom=$action['smtpfrom']; - $recipient=$action['rcptto']; - $emailfrom=htmlspecialchars($action['emailfrom'],ENT_QUOTES); + // Generating the table contents + $line .= "\r\n"; + $line .= "$count\r\n"; + $line .= "$status\r\n"; + $line .= "$date\r\n"; + $line .= "$remoteip\r\n"; + $line .= "$reverse\r\n"; + $line .= "$smtpfrom
$emailfrom\r\n"; + $line .= "$recipient\r\n"; + $line .= "$subject\r\n"; + $line .= "\r\n"; - // Generating the table contents - $line .= "\r\n"; - $line .= "$count\r\n"; - $line .= "$status\r\n"; - $line .= "$date\r\n"; - $line .= "$remoteip\r\n"; - $line .= "$reverse\r\n"; - $line .= "$smtpfrom
$emailfrom\r\n"; - $line .= "$recipient\r\n"; - $line .= "$subject\r\n"; - $line .= "\r\n"; + $count++; + } - $count++; - } +$rqst->close(); - $rqst->close(); +$start=starthtml(NULL); +$stop=endhtml(); +$top=topper($isadmin,$logname,"$myfilename"); +$footer=footer("$myfilename"); +$tblheader=tblheader($dsearch,$numrec,$offset,$limit,$selectedField); +$tblfooter=""; +if ($limit>30) + $tblfooter=$tblheader; - $start=starthtml(NULL); - $stop=endhtml(); - $top=topper($isadmin,$logname,"$myfilename"); - $footer=footer("$myfilename"); - $tblheader=tblheader($dsearch,$numrec,$offset,$limit,$selectedField); - $tblfooter=""; - if ($limit>30) - $tblfooter=$tblheader; +$originator=gettranslate($userlang,"Originator"); +$recipient=gettranslate($userlang,"Recipient"); +$date=gettranslate($userlang,"Date"); - $STR = << Num Status -Date +$date IP Reverse Address -Originator -Recipient +$originator +$recipient Subject $line @@ -234,7 +254,7 @@ $footer $stop EOT; - return $STR; +return $STR; } //============================================================== @@ -248,9 +268,10 @@ sql_close($dbsql); rou_closelog(); if ($logname!=NULL) { - echo body($logname); -} else { - header('Location: lvllog.php'); -} + echo body($logname); + } +else { + header('Location: lvllog.php'); + } ?> diff --git a/www/unilng.php b/www/unilng.php index 4bae7cd..c02e9ec 100644 --- a/www/unilng.php +++ b/www/unilng.php @@ -15,47 +15,36 @@ enum lng { $userlang=lng::en; -$english =array ( - "Email", - "Logout", - "Main screen", - "Remote SMTP server", - "User Management", - "Remote SMTP server Management", - "Search", - "???" - ); - -$francais=array ( - "Courriel", - "Deconnexion", - "Ecran Principal", - "Serveur SMTP distant", - "Gestion des usagers", - "gestion des serveurs SMTP distants", - "Recherche", - "???" - ); - +$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 $english; -global $francais; - -$translate=$mot; -$num=array_search($mot,$english,true); -if ($num!='') { - switch ($lang) { - case lng::fr: //French - $translate=$francais[$num]; - break; - case lng::en: //English - default : //No break; - break; +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; } } -return $translate; +return $mot; } ?> -- 2.47.3