From 77933a9abc6a803bbd6e42a62fd996d0b339cc9d Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 9 Jun 2016 18:29:27 +0100 Subject: [PATCH] move left_footer and co to bottom of settings file --- settings.coffee | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/settings.coffee b/settings.coffee index 1f782a68c6..0b0242e7fb 100644 --- a/settings.coffee +++ b/settings.coffee @@ -134,17 +134,9 @@ settings = # If you are running ShareLaTeX behind a proxy (like Apache, Nginx, etc) # then set this to true to allow it to correctly detect the forwarded IP # address and http/https protocol information. + behindProxy: process.env["SHARELATEX_BEHIND_PROXY"] or false - if process.env["SHARELATEX_LEFT_FOOTER"] - left_footer: process.env["SHARELATEX_LEFT_FOOTER"] - - if process.env["SHARELATEX_RIGHT_FOOTER"] - right_footer: process.env["SHARELATEX_RIGHT_FOOTER"] - - if process.env["SHARELATEX_HEADER"] - header: process.env["SHARELATEX_HEADER"] - # Spell Check Languages # --------------------- # @@ -419,6 +411,16 @@ settings = #### OPTIONAL CONFIGERABLE SETTINGS +if process.env["SHARELATEX_LEFT_FOOTER"]? + settings.left_footer = process.env["SHARELATEX_LEFT_FOOTER"] + +if process.env["SHARELATEX_RIGHT_FOOTER"]? + settings.right_footer = process.env["SHARELATEX_RIGHT_FOOTER"] + +if process.env["SHARELATEX_HEADER"]? + settingsheader = process.env["SHARELATEX_HEADER"] + + # Sending Email # ------------- #