merge

2 files changed, 22 insertions, 5 deletions

diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js
index 0c46105..79f1e34 100644
--- a/server/lib/auth/index.js
+++ b/server/lib/auth/index.js
@@ -86,9 +86,9 @@ var auth = {
 					return res.redirect('/auth/usernameTaken');
 				}
 				if (! user.created_ip) {
-					user.created_ip = util.ip2num( req.ip )
+					user.created_ip = util.ip2num( req.ips[0] )
 				}
-				user.last_ip = util.ip2num( req.ip )
+				user.last_ip = util.ip2num( req.ips[0] )
 				user.save(function(err, data){ if (err) console.err('error setting ip for user') })
 				
 				req.logIn(user, function(err) {
@@ -111,7 +111,7 @@ var auth = {
 			}
 			
 			user.last_seen = new Date ()
-			user.last_ip = util.ip2num( req.ip )
+			user.last_ip = util.ip2num( req.ips[0] )
 			user.save(function(err, data){ if (err) console.err('error setting ip for user') })
 
 			req.logIn(user, function(err) {
@@ -171,8 +171,8 @@ var auth = {
 					displayName: username,
 					password: password,
 					email: email,
-					created_ip: util.ip2num( req.ip ),
-					last_ip: util.ip2num( req.ip ),
+					created_ip: util.ip2num( req.ips[0] ),
+					last_ip: util.ip2num( req.ips[0] ),
 					created_at: new Date (),
 			    last_seen: new Date (),
 				}
diff --git a/server/repl.js b/server/repl.js
new file mode 100644
index 0000000..ba94d45
--- /dev/null
+++ b/server/repl.js
@@ -0,0 +1,17 @@
+var DB_HOST = 'localhost'
+var mongoose = require('mongoose')
+mongoose.connect('mongodb://' + DB_HOST + '/vvalls', {}, function(){
+  console.log("vvalls: connected to", DB_HOST)
+  var repl = require("repl").start({});
+  [ "./lib/schemas/User",
+    "./lib/schemas/Collaborator",
+    "./lib/schemas/Documentation",
+    "./lib/schemas/Layout",
+    "./lib/schemas/Media",
+    "./lib/schemas/Project",
+  ].forEach(function(modName){
+    // console.log(name, modName)
+    var namez = modName.split("/"), name = namez[namez.length-1];
+    repl.context[name] = require(modName); 
+  });
+});