Merge refactoring into 3.0

lib/database/accounts.js

@@ -295,12 +295,17 @@ module.exports = {
             return;
         }
 
+        if (!name) {
+            callback(null, -1);
+            return;
+        }
+
         db.query("SELECT global_rank FROM `users` WHERE name=?", [name],
         function (err, rows) {
             if (err) {
                 callback(err, null);
             } else if (rows.length === 0) {
-                callback("User does not exist", null);
+                callback(null, 0);
             } else {
                 callback(null, rows[0].global_rank);
             }
@@ -344,6 +349,10 @@ module.exports = {
             return;
         }
 
+        if (names.length === 0) {
+            return callback(null, []);
+        }
+
         var list = "(" + names.map(function () { return "?";}).join(",") + ")";
 
         db.query("SELECT global_rank FROM `users` WHERE name IN " + list, names,

lib/database/channels.js

@@ -4,6 +4,8 @@ var fs = require("fs");
 var path = require("path");
 var Logger = require("../logger");
 var tables = require("./tables");
+var Flags = require("../flags");
+var util = require("../utilities");
 
 var blackHole = function () { };
 
@@ -292,7 +294,7 @@ module.exports = {
             // than the database has stored.  Update accordingly.
             chan.name = res[0].name;
             chan.uniqueName = chan.name.toLowerCase();
-            chan.registered = true;
+            chan.setFlag(Flags.C_REGISTERED);
             chan.logger.log("[init] Loaded channel from database");
             callback(null, true);
         });
@@ -315,7 +317,7 @@ module.exports = {
                  [name],
         function (err, rows) {
             if (err) {
-                callback(err, 1);
+                callback(err, -1);
                 return;
             }
 
@@ -529,9 +531,11 @@ module.exports = {
             return;
         }
 
-        var range = ip.replace(/^(\d+\.\d+\.\d+)\.\d+$/, "$1");
+        var range = util.getIPRange(ip);
+        var wrange = util.getWideIPRange(ip);
 
-        db.query("SELECT * FROM `chan_" + chan + "_bans` WHERE ip=? OR ip=?", [ip, range],
+        db.query("SELECT * FROM `chan_" + chan + "_bans` WHERE ip IN (?, ?, ?)",
+        [ip, range, wrange],
         function (err, rows) {
             callback(err, err ? false : rows.length > 0);
         });