Merge.

[irc/quakenet/qwebirc.git] / js / auth.js

diff --git a/js/auth.js b/js/auth.js
index 8244b7e01e15b0441120b4d66b8c1eb0c6ae4fa3..c58b85ac8eccba604324b7f8fcbe09933475e9bb 100644 (file)
--- a/js/auth.js
+++ b/js/auth.js
@@ -1,6 +1,9 @@
 qwebirc.auth.loggedin = function() {
   var user = Cookie.read("user");
-  
+  var expiry = Cookie.read("ticketexpiry");
+  if(expiry && new Date().getTime() > expiry - (5 * 60 * 1000))
+    return;
+
   return user;
 }
 
@@ -9,9 +12,13 @@ qwebirc.auth.enabled = function() {
 }
 
 qwebirc.auth.quakeNetAuth = function() {
-  return false;
+  return true;
 }
 
 qwebirc.auth.passAuth = function() {
   return false;
 }
+
+qwebirc.auth.bouncerAuth = function() {
+  return false;
+}