Improve login page (for #6495)

Benjamin Renard
1 parent f437123a
Showing 4 changed files with 81 additions and 5 deletions Show diff stats
desktop.php
index.html
js/resources/css/login.css
php/classes/UserMgr.php
@@ -9,10 +9,19 @@
   require_once('php/config.php');
  
   // error_reporting(E_ALL);
+  if (!isset($_POST['username'])) {
+    header('Location: index.html');
+    exit(1);
+  }
+
   if (!isset($_POST['username'])) die('<a href="index.html">LOGIN SVP</a>');
  
   $usrMgr = new UserMgr();
   $sessionID = $usrMgr->init();
+  if ($sessionID === FALSE) {
+    header('Location: index.html?error=1');
+    exit(1);
+  }
 ?>
  
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
@@ -13,6 +13,7 @@
 <body>
 <div id="centrage">
  
+
 <div id="trou">
  
 <div id="couvercle"></div>
@@ -20,11 +21,56 @@
 <div id="TousLesBoutons">
 <div id="Btn_FirstVisit" onclick="location.href='help.html';"></div>
 <div id="Btn_Rules" onclick="location.href='help/policy.html';"></div>
-<form method="POST" action="desktop.php">  
+<form id="Form_Login" method="POST" action="desktop.php" onsubmit="return checkForm(this);">  
+            <div id="loader" class="loader"></div>
 	    <input type="text" name="username" placeholder="LOGIN" id="Btn_EnterLogin" class="PlaceHolder" />   
 	    <input type="password" name="password" placeholder="PASSWORD" id="Btn_EnterPassword" class="PlaceHolder"/>
-     <div><input id="Btn_Login" type="submit" value=""/></div>
-</form> 
+     <div><input id="Btn_Login" name="login" type="submit" value=""/></div>
+</form>
+<script type="text/javascript">
+  function setLoginLoader(value) {
+    var form = document.getElementById('Form_Login');
+    form.elements['username'].readOnly = value;
+    form.elements['password'].readOnly = value;
+    form.elements['login'].disabled = value;
+    document.getElementById("loader").style.display = value ? 'block' : 'none';
+  }
+
+  
+  function checkForm(form)
+  {
+    if (form.elements['username'].value == "" || form.elements['password'].value == "") {
+       alert('Please type your username and password');
+       return false;
+    }
+    setLoginLoader(true);
+    return true;
+  }
+
+  window.onpageshow = function(event) {
+    var qs = (function(a) {
+      if (a == "") return {};
+      var b = {};
+      for (var i = 0; i < a.length; ++i)
+      {
+        var p=a[i].split('=', 2);
+        if (p.length == 1)
+            b[p[0]] = "";
+        else
+            b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
+      }
+      return b;
+     })(window.location.search.substr(1).split('&'));
+
+     if (qs["error"] && qs["error"] == "1") {
+       alert('Cannot connect to AMDA');
+       return false;
+     }
+
+     setLoginLoader(false);
+     
+  };
+</script>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA registration" id="Btn_Register"></a>
 <a href="mailto:amda@irap.omp.eu?subject=AMDA contact" id="Btn_Contact"></a>
 <div id="Btn_About" onclick="location.href='help/info.html';"></div><div id="textAbout">AMDA Info</div>
@@ -22,3 +22,23 @@ input, textarea { font-family:verdana,tahoma,arial,verdana,sans-serif; font-size
 #field2 { left:540px; top:333px; width:200px; }
 .qo-submit { background:transparent url(../images/login/login.gif) no-repeat 0 0; height:22px; left:705px; top:373px; width:43px; }
 .qo-submit-over { background:transparent url(../images/login/login.gif) no-repeat 0 -38px; height:22px; left:705px; top:373px; width:43px; }
+
+.loader {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  z-index: 999;
+  margin: -75px 0 0 -75px;
+  border: 16px solid #f3f3f3;
+  border-radius: 50%;
+  border-top: 16px solid #3498db;
+  width: 50px;
+  height: 50px;
+  animation: spin 2s linear infinite;
+  display: none;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
@@ -535,8 +535,9 @@ class UserMgr
  
 	public function init() 
 	{ 
-		if ($this->ddLogin() != 0) 
-			die('<h2>You are trying to log in as '.$this->user.'<br/> Please check that you entered a valid password</h2>');
+		if ($this->ddLogin() != 0) {
+			return FALSE;
+		} 
  
 		$this->userdir = USERPATH."/".$this->user."/";