Better way to change display language

diff --git a/www/gesdis.php b/www/gesdis.php
index b4a39827856013ab9b0cd2112907d33cea3e9b23..3bf19e88a4a4f65c3a48dd79a9cd8f8641f76d8d 100644 (file)
--- a/www/gesdis.php
+++ b/www/gesdis.php
@@ -18,8 +18,16 @@ function topper($isadmin,$logname,$pageref)
 
 {
 global $userlang;
+global  $dislang;
 
 $entete=getenv("APPNAME");
+$sellang = <<<EOT
+<select id="first-choice" onchange="updateTranslations()">
+<option selected="selected">$dislang</option>
+<option value="en">en</option>
+<option value="fr">fr</option>
+</select>
+EOT;
 $click1="";
 $click2="";
 $click3="";
@@ -28,6 +36,7 @@ if ($isadmin==true)
   $admcolor="red";
 switch ($pageref) {
   case "lvllog"        :
+    $sellang="";
     break;
   case "lvlmai"        :
     $entete=gettranslate($userlang,"Main screen");
@@ -78,10 +87,7 @@ $entete
 <table cellpadding="0" cellspacing="0" width="100%" border="0">
 <tr>
   <td width="50%">
-  <select id="first-choice" onchange="updateTranslations()">
-    <option value="en">en</option>
-    <option value="fr">fr</option>
-  </select>
+  $sellang
   <FONT COLOR=$admcolor>$logname</FONT>
   </td>
   <td width="50%">

diff --git a/www/gessql.php b/www/gessql.php
index 272201e04b3ce59ff68d3d0fb8f30324090ec835..bad49ca5227c6abe348e851fb59fcbbed19b8440 100644 (file)
--- a/www/gessql.php
+++ b/www/gessql.php
@@ -241,6 +241,7 @@ function sql_setlogname($dbsql)
 global $isadmin;
 global $logname;
 global $userlang;
+global $dislang;
 
 $OPEP="gessql.php:sql_setlogname";
 
@@ -291,6 +292,7 @@ while ($proceed==true) {
         }
       break;
     case 5      :       //getting user working language
+      $dislang="en";
       $userlang=lng::en;
       $language=$stmt->fetch(PDO::FETCH_ASSOC)['lang'];
       rou_alert(0,"$OPEP, JMPDBG langage=$language");
@@ -298,10 +300,10 @@ while ($proceed==true) {
         switch ($language) {
           case "FRA"  :
             $userlang=lng::fr;
+            $dislang="fr";
             break;
           case "ENG"  :
           default     :       //NO BREAK
-            $userlang=lng::en;
             break;
           }
         }

diff --git a/www/index.php b/www/index.php
deleted file mode 120000 (symlink)
index 336b4849320600a8e6e116b7133186d755b76c8e..0000000000000000000000000000000000000000
--- a/www/index.php
+++ /dev/null
@@ -1 +0,0 @@
-lvllog.php
\ No newline at end of file

diff --git a/www/index.php b/www/index.php
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..d0f465ab9397e7a5a4a993268f4baa9aeb90ef60
--- /dev/null
+++ b/www/index.php
@@ -0,0 +1,142 @@
+<?php
+// vim: smarttab tabstop=8 shiftwidth=2 expandtab
+//==============================================================
+//
+//     login screen management
+//
+//==============================================================
+include_once "subrou.php";
+include_once "unienv.php";
+include_once "unilng.php";
+include_once "gesdis.php";
+include_once "gessql.php";
+
+//==============================================================
+//
+//     To display the login screen
+//
+//==============================================================
+function login()
+
+{
+$STR  = <<<EOT
+
+<table border="0" align="center" width="60%" cellpadding="0" cellspacing="0">
+    <tr>
+      <td align="center">
+      <FONT SIZE=+2><STRONG>
+      <span class="translatable" trkey="Authentication">Authentication</span>
+      </STRONG></FONT>
+      </td>
+    </tr>
+    <tr>
+      <td align="center" bgcolor="#000000">
+        <table width="100%" cellpadding="0" cellspacing="1" border="0">
+          <tr>
+            <td bgcolor="#FFFFFF" align="right">
+           <form method="post"
+                 action="lvllog.php"
+                 enctype="application/x-www-form-urlencoded"
+                 name="login">
+              <table align="center" border="0" cellspacing="5" cellpadding="0">
+                <tr>
+                  <td align="left" nowrap="nowrap"><span class="translatable" trkey="Email">Email</span><span>:</span></td>
+                  <td>
+                  <input  tabindex="1" type="text" name="email" size="40" onchange="" />
+                  <select id="first-choice" onchange="updateTranslations()">
+                    <option value="en">English</option>
+                    <option value="fr">Francais</option>
+                  </select>
+                  </td>
+                </tr>
+
+                <tr>
+                  <td align="left" nowrap="nowrap"><span class="translatable" trkey="Password">Password</span><span>:</span></td>
+                  <td>
+                 <input  tabindex="2" type="password" name="passwd" size="40" id="myInput" />
+                  <input type="checkbox" onclick="showpass()">
+                    <span class="translatable" trkey="Show" >Show</span>
+                 </td>
+                </tr>
+              </table>
+
+              <table width="100%" cellpadding="0" cellspacing="1" border="0">
+                <tr>
+                  <td align="center" colspan="2">
+                    <input  type="hidden" name="action" value="login" />
+                    <table>
+                      <tr>
+                        <td align="center">
+                        <input  tabindex="3" type="submit" name="loginbutton" value="Login" 
+                        class="translatable" trkey="Login" />
+                       </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+           </form>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+<br>
+<br>
+
+EOT;
+
+return $STR;
+}
+
+//==============================================================
+//
+//      To display login screen body
+//
+//==============================================================
+function body()
+
+{
+global $isadmin;
+
+$start=starthtml("translations");
+$stop=endhtml();
+$top=topper($isadmin,NULL,"lvllog");
+$footer=footer("lvllog");
+$login=login();
+
+$STR  = <<<EOT
+$start
+$top
+$login
+$footer
+$stop
+EOT;
+
+return $STR;
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+  $pass=$_POST["passwd"];
+  $logname=$_POST["email"];
+  $dbsql=sql_connect();
+  $isok=sql_checkpassword($dbsql,$logname,$pass);
+  sql_close($dbsql);
+  switch ($isok) {
+    case false  :       //trouble report
+      echo "<script>";
+      echo "alert('wrong username or password. Please try again.');";
+      echo "</script>";
+      break;
+    default     :
+      header('Location: lvlmai.php');
+      break;
+    }
+  }
+
+//display main screen
+echo body();
+?>
+
+
+

diff --git a/www/lvllog.php b/www/lvllog.php
index fd0b774ae1e49360edbd6eb421dc46e124348d4e..d0f465ab9397e7a5a4a993268f4baa9aeb90ef60 100644 (file)
--- a/www/lvllog.php
+++ b/www/lvllog.php
@@ -43,6 +43,10 @@ $STR  = <<<EOT
                   <td align="left" nowrap="nowrap"><span class="translatable" trkey="Email">Email</span><span>:</span></td>
                   <td>
                   <input  tabindex="1" type="text" name="email" size="40" onchange="" />
+                  <select id="first-choice" onchange="updateTranslations()">
+                    <option value="en">English</option>
+                    <option value="fr">Francais</option>
+                  </select>
                   </td>
                 </tr>
 

diff --git a/www/unilng.php b/www/unilng.php
index c02e9ecd77f7d67b5a8d40f46e4bedc779a0d03b..439b715e60a0607469d16b76db4a11afc0b48f25 100644 (file)
--- a/www/unilng.php
+++ b/www/unilng.php
@@ -4,6 +4,8 @@
 //     To manage language
 //
 //==============================================================
+include_once "subrou.php";
+
 
 //list of available word
 
@@ -32,6 +34,7 @@ function gettranslate(lng $lang,$mot)
 {
 global $TR;
 
+rou_alert(0,"JMPDBG lang=<XXX>");
 foreach ($TR as $row) {
   if ($row[0]===$mot) {
     switch ($lang) {