Fix bug in session handler

[qtadmin.git] / js / timer.js

diff --git a/js/timer.js b/js/timer.js
index 45883c686366cd4105b429de6b0433531905d052..f68f0841f11d279fd19defce6ff5ccd026569796 100644 (file)
--- a/js/timer.js
+++ b/js/timer.js
@@ -13,16 +13,16 @@ function myTimer() {
         console.log('Session expired, reload page');
         last = -1;
         location.reload();
-    } else if (timeLeft < 1) {
+    } else if (timeLeft == 1) {
         if (timeLeft < last || last == -1) {
             last = timeLeft;
-            timeLeft = 'Expired';
-            console.log('Session valid < 1');
+            timeLeft = '< ' + timeLeft + ' min';
+            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';