From 6a42b681e3ab59a2659d3cc94ab62b19701d26c0 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 12 Oct 2012 07:11:06 -0400
Subject: [PATCH] a bunch of small fixes

---
 lib/app/index.js               | 2 +-
 lib/server/index.js            | 2 +-
 lib/server/serverRoutes.js     | 6 ++----
 src/app/index.coffee           | 2 +-
 src/server/index.coffee        | 2 +-
 src/server/serverRoutes.coffee | 4 ++--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index d4c505888b..3963138de1 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -26,7 +26,7 @@ _ = require('lodash');
 get('/:uidParam?', function(page, model, _arg, next) {
   var sess, uidParam;
   uidParam = _arg.uidParam;
-  if (uidParam === 'privacy' || uidParam === 'terms' || uidParam === 'auth') {
+  if ((uidParam === 'privacy' || uidParam === 'terms' || uidParam === 'auth')) {
     return next();
   }
   sess = model.session;
diff --git a/lib/server/index.js b/lib/server/index.js
index bbb684f2ab..1b89694341 100644
--- a/lib/server/index.js
+++ b/lib/server/index.js
@@ -36,7 +36,7 @@ server = http.createServer(expressApp);
 
 module.exports = server;
 
-if (process.env.NODE_ENV !== 'production') {
+if (process.env.NODE_ENV === 'production') {
   expressApp.all('*', function(req, res, next) {
     if (req.headers['x-forwarded-proto'] !== 'https') {
       return res.redirect('https://' + req.headers.host + req.url);
diff --git a/lib/server/serverRoutes.js b/lib/server/serverRoutes.js
index a12cc58bb0..440b27ad01 100644
--- a/lib/server/serverRoutes.js
+++ b/lib/server/serverRoutes.js
@@ -4,6 +4,8 @@ var scoring;
 scoring = require('../app/scoring');
 
 module.exports = function(expressApp, root, derby) {
+  var staticPages;
+  staticPages = derby.createStatic(root);
   expressApp.get('/:uid/up/:score?', function(req, res) {
     var model, score;
     score = parseInt(req.params.score) || 1;
@@ -35,13 +37,9 @@ module.exports = function(expressApp, root, derby) {
     return res.send(200);
   });
   expressApp.get('/privacy', function(req, res) {
-    var staticPages;
-    staticPages = derby.createStatic(root);
     return staticPages.render('privacy', res);
   });
   expressApp.get('/terms', function(req, res) {
-    var staticPages;
-    staticPages = derby.createStatic(root);
     return staticPages.render('terms', res);
   });
   expressApp.post('/', function(req) {
diff --git a/src/app/index.coffee b/src/app/index.coffee
index 606b10f653..a2afd85135 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -17,7 +17,7 @@ _ = require 'lodash'
 
 get '/:uidParam?', (page, model, {uidParam}, next) ->
   #FIXME figure out a better way to do this
-  return next() if (uidParam == 'privacy' or uidParam == 'terms' or uidParam == 'auth')
+  return next() if (uidParam in ['privacy','terms','auth'])
 
   sess = model.session
   if sess.habitRpgAuth && sess.habitRpgAuth.facebook
diff --git a/src/server/index.coffee b/src/server/index.coffee
index 01c53ad6ea..4b7b97dc58 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -25,7 +25,7 @@ module.exports = server
 
 # Force SSL 
 # Set before other routes, as early as possible
-if process.env.NODE_ENV!='production'
+if process.env.NODE_ENV=='production'
   expressApp.all '*', (req, res, next) ->
     if req.headers['x-forwarded-proto']!='https'
       res.redirect('https://'+req.headers.host+req.url)
diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index 6e78f497ee..ee99101ff3 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -1,6 +1,8 @@
 scoring = require('../app/scoring')
 
 module.exports = (expressApp, root, derby) ->
+
+  staticPages = derby.createStatic root
   
   expressApp.get '/:uid/up/:score?', (req, res) ->
     score = parseInt(req.params.score) || 1
@@ -21,11 +23,9 @@ module.exports = (expressApp, root, derby) ->
     res.send(200)
     
   expressApp.get '/privacy', (req, res) ->
-    staticPages = derby.createStatic root
     staticPages.render 'privacy', res
   
   expressApp.get '/terms', (req, res) ->
-    staticPages = derby.createStatic root
     staticPages.render 'terms', res
 
   expressApp.post '/', (req) ->