Fix bug in session handler

[qtadmin.git] / js / timer.js

diff --git a/js/timer.js b/js/timer.js
index b087e53f5d49f6c936a1261571373083b5978725..f68f0841f11d279fd19defce6ff5ccd026569796 100644 (file)
--- a/js/timer.js
+++ b/js/timer.js
@@ -1,28 +1,32 @@
 /* vim: set ts=4 tw=4 sw=4 noet: */
 var timerRef=setInterval(function(){myTimer()}, 1000);
 var timeStart = new Date().getTime() + timeout;
 /* vim: set ts=4 tw=4 sw=4 noet: */
 var timerRef=setInterval(function(){myTimer()}, 1000);
 var timeStart = new Date().getTime() + timeout;

+var last = -1;

 
 function myTimer() {
     var elapsed = new Date().getTime();
     var expire = timeStart - elapsed;
     var timeLeft = Math.round(((expire % 86400000) % 3600000) / 60000);
 
 function myTimer() {
     var elapsed = new Date().getTime();
     var expire = timeStart - elapsed;
     var timeLeft = Math.round(((expire % 86400000) % 3600000) / 60000);

-    var last = 0;

 
     if (timeLeft < 0) {
         clearInterval(timerRef);
         console.log('Session expired, reload page');
 
     if (timeLeft < 0) {
         clearInterval(timerRef);
         console.log('Session expired, reload page');

+        last = -1;

         location.reload();
         location.reload();

-    } else if (timeLeft < 1) {
-        timeLeft = 'Expired';
-        console.log('Session valid < 1');
-        document.getElementById("time").style.background = "red";
+    } else if (timeLeft == 1) {
+        if (timeLeft < last || last == -1) {
+            last = timeLeft;
+            timeLeft = '< ' + timeLeft + ' min';
+            console.log('Session soon to expire');
+            document.getElementById("time").style.background = "red";
+            document.getElementById("timer").innerHTML = timeLeft;
+        }

     } else {
     } else {

-        if (timeLeft > last) {
+        if ((timeLeft < last && timeLeft > 0) || last == -1) {

             last = timeLeft;
             console.log('Session valid < ' + timeLeft);
             timeLeft = '< ' + timeLeft + ' min';
             last = timeLeft;
             console.log('Session valid < ' + timeLeft);
             timeLeft = '< ' + timeLeft + ' min';

+            document.getElementById("timer").innerHTML = timeLeft;

         }
     }
         }
     }

-
-    document.getElementById("timer").innerHTML = timeLeft;

 }
 }