1 files changed, 19 insertions, 16 deletions
diff --git a/lib/response.js b/lib/response.js
index 8191e74f..6450bdf5 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -18,12 +18,12 @@ var utils = require('./utils')
 // public
 var response = {
   errorForbidden: function (res) {
-    const {req} = res
+    const { req } = res
     if (req.user) {
       responseError(res, '403', 'Forbidden', 'oh no.')
     } else {
       req.flash('error', 'You are not allowed to access this page. Maybe try logging in?')
-      res.redirect(config.serverURL)
+      res.redirect(config.serverURL + '/')
     }
   },
   errorNotFound: function (res) {
@@ -70,6 +70,7 @@ function showIndex (req, res, next) {
     signin: authStatus,
     infoMessage: req.flash('info'),
     errorMessage: req.flash('error'),
+    imprint: fs.existsSync(path.join(config.docsPath, 'imprint.md')),
     privacyStatement: fs.existsSync(path.join(config.docsPath, 'privacy.md')),
     termsOfUse: fs.existsSync(path.join(config.docsPath, 'terms-of-use.md')),
     deleteToken: deleteToken
@@ -226,7 +227,8 @@ function showPublishNote (req, res, next) {
         robots: meta.robots || false, // default allow robots
         GA: meta.GA,
         disqus: meta.disqus,
-        cspNonce: res.locals.nonce
+        cspNonce: res.locals.nonce,
+        dnt: req.headers.dnt
       }
       return renderPublish(data, res)
     }).catch(function (err) {
@@ -427,7 +429,7 @@ function publishNoteActions (req, res, next) {
         actionDownload(req, res, note)
         break
       case 'edit':
-        res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)))
+        res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)) + '?both')
         break
       default:
         res.redirect(config.serverURL + '/s/' + note.shortid)
@@ -441,7 +443,7 @@ function publishSlideActions (req, res, next) {
     var action = req.params.action
     switch (action) {
       case 'edit':
-        res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)))
+        res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)) + '?both')
         break
       default:
         res.redirect(config.serverURL + '/p/' + note.shortid)
@@ -549,16 +551,16 @@ function gitlabActionProjects (req, res, note) {
       ret.accesstoken = user.accessToken
       ret.profileid = user.profileid
       request(
-                config.gitlab.baseURL + '/api/' + config.gitlab.version + '/projects?membership=yes&per_page=100&access_token=' + user.accessToken,
-                function (error, httpResponse, body) {
-                  if (!error && httpResponse.statusCode === 200) {
-                    ret.projects = JSON.parse(body)
-                    return res.send(ret)
-                  } else {
-                    return res.send(ret)
-                  }
-                }
-            )
+        config.gitlab.baseURL + '/api/' + config.gitlab.version + '/projects?membership=yes&per_page=100&access_token=' + user.accessToken,
+        function (error, httpResponse, body) {
+          if (!error && httpResponse.statusCode === 200) {
+            ret.projects = JSON.parse(body)
+            return res.send(ret)
+          } else {
+            return res.send(ret)
+          }
+        }
+      )
     }).catch(function (err) {
       logger.error('gitlab action projects failed: ' + err)
       return response.errorInternalError(res)
@@ -608,7 +610,8 @@ function showPublishSlide (req, res, next) {
         robots: meta.robots || false, // default allow robots
         GA: meta.GA,
         disqus: meta.disqus,
-        cspNonce: res.locals.nonce
+        cspNonce: res.locals.nonce,
+        dnt: req.headers.dnt
       }
       return renderPublishSlide(data, res)
     }).catch(function (err) {