From b38d88e454b83aeef0705c25972faf14b57c4b34 Mon Sep 17 00:00:00 2001
From: Montana Scott Rowe <calcnerd256@gmail.com>
Date: Thu, 19 Jan 2012 14:07:19 -0600
Subject: [PATCH] factored out pad export POST combinator in the least
 interesting way

---
 node/server.js | 59 ++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/node/server.js b/node/server.js
index 1c0fa1c17..452149d3f 100644
--- a/node/server.js
+++ b/node/server.js
@@ -306,6 +306,35 @@ function sendStaticIfPad(goToPad, padManager, path, filename){
     );
   };
 }
+function getExportPadCombinator(goToPad, settings, hasPadAccess, exportHandler){
+  return function(req, res, next){
+    goToPad(req, res, function() {
+      var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
+      //send a 404 if we don't support this filetype
+      if(types.indexOf(req.params.type) == -1)
+      {
+        next();
+        return;
+      }
+      
+      //if abiword is disabled, and this is a format we only support with abiword, output a message
+      if(settings.abiword == null &&
+         ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1)
+      {
+        res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature");
+        return;
+      }
+        
+      res.header("Access-Control-Allow-Origin", "*");
+      res.header("Server", serverName);
+      
+      hasPadAccess(req, res, function()
+      {
+        exportHandler.doExport(req, res, req.params.pad, req.params.type);
+      });
+    });
+  }
+}
 async.waterfall([
   //initalize the database
   setupDb,
@@ -417,34 +446,8 @@ async.waterfall([
 
     
     //serve timeslider.html under /p/$padname/timeslider
-    app.get('/p/:pad/:rev?/export/:type', function(req, res, next)
-    {
-      goToPad(req, res, function() {
-        var types = ["pdf", "doc", "txt", "html", "odt", "dokuwiki"];
-        //send a 404 if we don't support this filetype
-        if(types.indexOf(req.params.type) == -1)
-        {
-          next();
-          return;
-        }
-        
-        //if abiword is disabled, and this is a format we only support with abiword, output a message
-        if(settings.abiword == null &&
-           ["odt", "pdf", "doc"].indexOf(req.params.type) !== -1)
-        {
-          res.send("Abiword is not enabled at this Etherpad Lite instance. Set the path to Abiword in settings.json to enable this feature");
-          return;
-        }
-        
-        res.header("Access-Control-Allow-Origin", "*");
-        res.header("Server", serverName);
-        
-        hasPadAccess(req, res, function()
-        {
-          exportHandler.doExport(req, res, req.params.pad, req.params.type);
-        });
-      });
-    });
+    //the above comment is wrong
+    app.get('/p/:pad/:rev?/export/:type', getExportPadCombinator(goToPad, settings, hasPadAccess, exportHandler));
     
     //handle import requests
     app.post('/p/:pad/import', function(req, res, next)