Fix bug in session handler

[qtadmin.git] / js / timer.js

diff --git a/js/timer.js b/js/timer.js
index d166ffd1abf26a11fbd4ce29d2e8903a7ba24c31..f68f0841f11d279fd19defce6ff5ccd026569796 100644 (file)
--- a/js/timer.js
+++ b/js/timer.js
@@ -8,21 +8,21 @@ function myTimer() {
     var expire = timeStart - elapsed;
     var timeLeft = Math.round(((expire % 86400000) % 3600000) / 60000);
 
     var expire = timeStart - elapsed;
     var timeLeft = Math.round(((expire % 86400000) % 3600000) / 60000);
 

-    if (timeLeft < 1) {
+    if (timeLeft < 0) {

         clearInterval(timerRef);
         console.log('Session expired, reload page');
         last = -1;
         location.reload();
         clearInterval(timerRef);
         console.log('Session expired, reload page');
         last = -1;
         location.reload();

-    } else if (timeLeft < 2) {
+    } else if (timeLeft == 1) {

         if (timeLeft < last || last == -1) {
             last = timeLeft;
         if (timeLeft < last || last == -1) {
             last = timeLeft;

-            timeLeft = 'Expired';
+            timeLeft = '< ' + timeLeft + ' min';

             console.log('Session soon to expire');
             document.getElementById("time").style.background = "red";
             document.getElementById("timer").innerHTML = timeLeft;
         }
     } else {
             console.log('Session soon to expire');
             document.getElementById("time").style.background = "red";
             document.getElementById("timer").innerHTML = timeLeft;
         }
     } else {

-        if (timeLeft < last || last == -1) {
+        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';