Improving main screen and translation

diff --git a/www/gesdis.php b/www/gesdis.php
index b62bbe3ea4ef82bf2c8b79434f226e125585a94d..a30e6b61689c6185978f63bfee62da01dc3dc7f3 100644 (file)
--- a/www/gesdis.php
+++ b/www/gesdis.php
@@ -29,16 +29,22 @@ switch ($pageref) {
   case "lvllog"        :
     break;
   case "lvlmai"        :
+    $entete=gettranslate($userlang,"Main screen");
+    $out=gettranslate($userlang,"Logout");
     if ($isadmin==true) {
-      $click1="<a href='/lvlusr.php'>Remotes</a>";
-      $click2="<a href='/lvlusr.php'>Users</a>";
+      $remotes=gettranslate($userlang,"SMTP server");
+      $users=gettranslate($userlang,"User Management");
+      $click1="<a href='/lvlusr.php'>$remotes</a>";
+      $click2="<a href='/lvlusr.php'>$users</a>";
       }
-    $click3="<a href='/lvllog.php'>logout</a>";
+    $click3="<a href='/lvllog.php'>$out</a>";
     break;
   case "lvlusr"        :
-    $entete=gettranslate(lng::fr,"User Management");
-    $click2="<a href='/lvlmai.php'>Main screen</a>";
-    $click3="<a href='/lvllog.php'>logout</a>";
+    $entete=gettranslate($userlang,"User Management");
+    $main=gettranslate($userlang,"Main screen");
+    $out=gettranslate($userlang,"Logout");
+    $click2="<a href='/lvlmai.php'>$main</a>";
+    $click3="<a href='/lvllog.php'>$out</a>";
     break;
   default      :
     $color="red";
@@ -52,24 +58,24 @@ $entete
 </FONT></STRONG></CENTER>
 <table cellpadding="0" cellspacing="0" width="100%" border="0">
 <tr>
-  <td width="70%">
+  <td width="50%">
   <FONT COLOR=$admcolor>$logname</FONT>
   </td>
-  <td width="30%">
+  <td width="50%">
   <table cellpadding="0" cellspacing="0" width="100%" border="0">
     <tr>
     <td width="33%">
-    <p align="right"><strong>
+    <p align="center"><strong>
     $click1
     </strong></p>
     </td>
     <td width="33%">
-    <p align="right"><strong>
+    <p align="center"><strong>
     $click2
     </strong></p>
     </td>
     <td width="33%">
-    <p align="right"><strong>
+    <p align="center"><strong>
     $click3
     </strong></p>
     </td>

diff --git a/www/gessql.php b/www/gessql.php
index daa745f8334999fafcdc19b2a559ab30ca69b75a..b20c5d70dafe981fa6ddd0bd808699571bd0a47f 100644 (file)
--- a/www/gessql.php
+++ b/www/gessql.php
@@ -74,12 +74,14 @@ return $isgood;
 //      Function to get a log name if a cookie is available
 //
 //==============================================================
-function sql_getlogname($dbsql)
+function sql_setlogname($dbsql)
 
 {
 global $isadmin;
+global $logname;
+global $userlang;
 
-$OPEP="gessql.php:sql_getlogname";
+$OPEP="gessql.php:sql_setlogname";
 
 $isadmin=0;
 $logname=NULL;
@@ -119,7 +121,31 @@ while ($proceed==true) {
         $phase=999;
         }
       break;
-    case 4      :       //checking if logname is an admin
+    case 4      :       //getting user information
+      $stmt=$dbsql->Select("Select * from emails where email='$logname'");
+      if ($stmt==NULL) { //is user really known?
+        rou_alert(0,"$OPEP, cookie but user <$logname> missing from DB?");
+        $logname=NULL;
+        $phase=999;
+        }
+      else {
+        $userlang=lng::en;
+        $language=$stmt->fetch(PDO::FETCH_ASSOC)['lang'];
+        rou_alert(0,"$OPEP, JMPDBG langage=$language");
+        if ($language!=NULL) {
+          switch ($language) {
+            case "FRA"  :
+              $userlang=lng::fr;
+              break;
+            case "ENG"  :
+            default     :       //NO BREAK
+              $userlang=lng::en;
+              break;
+            }
+          }
+        }
+      break;
+    case 5      :       //checking if logname is an admin
       $stmt=$dbsql->Select("Select * from admins where email='$logname'");
       $id=$stmt->fetch(PDO::FETCH_ASSOC)['email'];
       if ($id!=NULL)
@@ -132,7 +158,6 @@ while ($proceed==true) {
   $phase++;
   }
 rou_alert(0,"$OPEP, now logname=<$logname>");
-return $logname;
 }
 
 //==============================================================

diff --git a/www/lvllog.php b/www/lvllog.php
index 1ad364eb48ff039070eceb15592c2e93da3f7e1a..0d6749887e46c00c9f2bceb1218a26b3c69d7bca 100644 (file)
--- a/www/lvllog.php
+++ b/www/lvllog.php
@@ -22,9 +22,6 @@ function login()
 $STR  = <<<EOT
 
 <table border="0" align="center" width="500" cellpadding="0" cellspacing="0">
-    <tr>
-      <td><img src="/reg-icons/login.gif" alt="" border="0" /></td>
-    </tr>
     <tr>
       <td align="center">
       <FONT SIZE=+2><STRONG>

diff --git a/www/lvlmai.php b/www/lvlmai.php
index 0b7bdd035f0381bb1f4beb3afcdca3a7697387a2..1c01adc54cb983706bb5fbf218b67865923c87f9 100644 (file)
--- a/www/lvlmai.php
+++ b/www/lvlmai.php
@@ -46,9 +46,10 @@ EOT;
 return $STR;
 }
 
+global $logname;
 
 $dbsql=sql_connect();
-$logname=sql_getlogname($dbsql);
+sql_setlogname($dbsql);
 sql_close($dbsql);
 rou_closelog();
 

diff --git a/www/lvlusr.php b/www/lvlusr.php
index 16d00af79f5e1952fe54719330cdc58aff41c160..f41b45e3150f88cc1839cb4c7b36f7adf3e16130 100644 (file)
--- a/www/lvlusr.php
+++ b/www/lvlusr.php
@@ -15,6 +15,7 @@ function body($logname)
 
 {
 global $isadmin;
+global $logname;
 
 $line="";
 $count=0;
@@ -85,7 +86,7 @@ return $STR;
 
 
 $dbsql=sql_connect();
-$logname=sql_getlogname($dbsql);
+sql_setlogname($dbsql);
 sql_close($dbsql);
 rou_closelog();
 

diff --git a/www/subrou.php b/www/subrou.php
index fe625584547c081e942bd98758134cb0393b8249..139d14842a9ff12ea7f719a864cb3ee524d5b4d6 100644 (file)
--- a/www/subrou.php
+++ b/www/subrou.php
@@ -6,6 +6,7 @@
 //==============================================================
 //gobal variables.
 $debug=0;              //default debug level
+$logname=NULL;         //authenticated user name
 $isadmin=0;            //authenticated user with admin level
 
 //==============================================================

diff --git a/www/unilng.php b/www/unilng.php
index 466247a3de14218d64f181dd86ef81b9c497a292..08bae4d0f06e4341955f063373e9517d2ae565f5 100644 (file)
--- a/www/unilng.php
+++ b/www/unilng.php
@@ -16,19 +16,21 @@ enum lng {
 $userlang=lng::en;
 
 $english =array        (
-               "User Management",
-               "Show",
-               "Password",
                "Email",
-               "Authentication"
+               "Logout",
+               "Main screen",
+               "SMTP server",
+               "User Management",
+               "???"
                );
 
 $francais=array        (
-               "Gestion des Utilisateurs",
-               "Afficher",
-               "Mot de Passe",
                "Courriel",
-               "Authentification"
+               "Deconnexion",
+               "Ecran Principal",
+               "Serveur SMTP",
+               "Gestion des usagers",
+               "???"
                );