summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-10 00:24:05 -0400
committerJulie Lala <jules@okfoc.us>2014-06-10 00:24:05 -0400
commita70194c0a4540f7e68305d57c2fc34d864e3b009 (patch)
treebef2643c1a14ab48ed16a6452f1fa109e672da4c /server
parenteefb3f7b7e2622a4f84ca274ccc765568231f17b (diff)
bugfixes
Diffstat (limited to 'server')
-rw-r--r--server/lib/auth.js4
-rw-r--r--server/lib/schemas/User.js1
-rw-r--r--server/lib/util.js2
3 files changed, 4 insertions, 3 deletions
diff --git a/server/lib/auth.js b/server/lib/auth.js
index 47c1c7c..b710a22 100644
--- a/server/lib/auth.js
+++ b/server/lib/auth.js
@@ -122,8 +122,8 @@ var auth = {
displayName: username,
password: password,
email: email,
- created_ip: util.ipToNum(req.connection.remoteAddress),
- last_ip: util.ipToNum(req.connection.remoteAddress),
+ created_ip: util.ip2num(req.connection.remoteAddress),
+ last_ip: util.ip2num(req.connection.remoteAddress),
created_at: new Date ()
}
new User(data).save(function(err, user){
diff --git a/server/lib/schemas/User.js b/server/lib/schemas/User.js
index 9aa2add..77e2e02 100644
--- a/server/lib/schemas/User.js
+++ b/server/lib/schemas/User.js
@@ -3,6 +3,7 @@
var mongoose = require('mongoose'),
uniqueValidator = require('mongoose-unique-validator'),
_ = require('lodash'),
+ util = require('../util'),
crypto = require('crypto'),
config = require('../../../config.json');
diff --git a/server/lib/util.js b/server/lib/util.js
index 228563a..c8771dc 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -1,7 +1,7 @@
var _ = require('lodash');
-var whitespace = new RegExp('\s', 'g')
+var whitespace = new RegExp('\\s', 'g')
var whitespaceHead = /^\s+/
var whitespaceTail = /\s+$/
var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g')