Minor fixes

This commit is contained in:
calzoneman 2013-04-28 12:14:52 -05:00
parent 3730ae0066
commit 89f7e26450
5 changed files with 9 additions and 4 deletions

View File

@ -97,14 +97,14 @@ exports.checkGlobalBan = function(ip) {
if(new Date().getTime() > gbanTime + 300000) { if(new Date().getTime() > gbanTime + 300000) {
var db = exports.getConnection(); var db = exports.getConnection();
if(!db) { if(!db) {
return []; return false;
} }
// Check if channel exists // Check if channel exists
var query = "SELECT * FROM global_bans WHERE 1"; var query = "SELECT * FROM global_bans WHERE 1";
var results = db.querySync(query); var results = db.querySync(query);
if(!results) { if(!results) {
Logger.errlog.log("loadGlobalBans: query failed"); Logger.errlog.log("loadGlobalBans: query failed");
return []; return false;
} }
var rows = results.fetchAllSync(); var rows = results.fetchAllSync();
gbans = {}; gbans = {};

View File

@ -987,3 +987,7 @@ li.alert-info {
.nick-highlight { .nick-highlight {
background-color: #0000aa; background-color: #0000aa;
} }
#footer {
background-color: #111111;
}

View File

@ -10,8 +10,8 @@ html, body {
} }
#footer, .push { #footer, .push {
margin: 90px 0 0 0;
height: 30px; height: 30px;
margin: 0;
clear: both; clear: both;
} }

View File

@ -136,7 +136,7 @@ function initCallbacks() {
}); });
socket.on("login", function(data) { socket.on("login", function(data) {
if(!data.success) if(!data.success && data.error != "Invalid session")
alert(data.error); alert(data.error);
else { else {
$("#welcome")[0].innerHTML = "Welcome, " + uname; $("#welcome")[0].innerHTML = "Welcome, " + uname;

View File

@ -250,6 +250,7 @@
</div> </div>
</div> </div>
</div> <!-- /container --> </div> <!-- /container -->
<div class="push"></div>
</div> </div>
<div id="footer"> <div id="footer">
<p class="muted"> <p class="muted">