Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

server.js

@@ -39,7 +39,11 @@ app.use(session({
 app.use(function (req, res, next) {
     var url = req.originalUrl;
     if (!/^\/login/.test(req.originalUrl) && !req.session.userAccount) {
-        return res.redirect("/login" + '?referer=' + req.originalUrl);
+        if (req.headers.referer) {
+            return res.redirect('/login' + '?referer=' + req.headers.referer);
+        } else {
+            return res.redirect("/login" + '?referer=' + req.originalUrl);
+        }
     }
     next();
 });