diff --git a/database.js b/database.js index e10d5f95..67f6f16a 100644 --- a/database.js +++ b/database.js @@ -97,14 +97,14 @@ exports.checkGlobalBan = function(ip) { if(new Date().getTime() > gbanTime + 300000) { var db = exports.getConnection(); if(!db) { - return []; + return false; } // Check if channel exists var query = "SELECT * FROM global_bans WHERE 1"; var results = db.querySync(query); if(!results) { Logger.errlog.log("loadGlobalBans: query failed"); - return []; + return false; } var rows = results.fetchAllSync(); gbans = {}; diff --git a/www/assets/css/darkstrap.css b/www/assets/css/darkstrap.css index 79916444..9cf01ca0 100644 --- a/www/assets/css/darkstrap.css +++ b/www/assets/css/darkstrap.css @@ -987,3 +987,7 @@ li.alert-info { .nick-highlight { background-color: #0000aa; } + +#footer { + background-color: #111111; +} diff --git a/www/assets/css/ytsync.css b/www/assets/css/ytsync.css index 6a32f9b8..536c101d 100644 --- a/www/assets/css/ytsync.css +++ b/www/assets/css/ytsync.css @@ -10,8 +10,8 @@ html, body { } #footer, .push { + margin: 90px 0 0 0; height: 30px; - margin: 0; clear: both; } diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 12f99f1b..c17b9d54 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -136,7 +136,7 @@ function initCallbacks() { }); socket.on("login", function(data) { - if(!data.success) + if(!data.success && data.error != "Invalid session") alert(data.error); else { $("#welcome")[0].innerHTML = "Welcome, " + uname; diff --git a/www/index.html b/www/index.html index 05b8b31d..fda42a38 100644 --- a/www/index.html +++ b/www/index.html @@ -250,6 +250,7 @@ +