mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Import works now on the server side

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-21 20:13:58 +01:00
parent 4b268f9579
commit b13fbbfd73
7 changed files with 235 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

18
node/server.js
View file

@ -32,6 +32,7 @@ var express = require('express');
var path = require('path');
var minify = require('./minify');
var exportHandler;
var importHandler;
var exporthtml;
var readOnlyManager;
@ -51,7 +52,7 @@ catch(e)
var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
//cache a week
//cache 6 hours
exports.maxAge = 1000*60*60*6;
async.waterfall([
@ -70,6 +71,7 @@ async.waterfall([
readOnlyManager = require("./ReadOnlyManager");
exporthtml = require("./exporters/exporthtml");
exportHandler = require('./ExportHandler');
importHandler = require('./ImportHandler');
//set logging
if(settings.logHTTP)
@ -215,6 +217,20 @@ async.waterfall([
exportHandler.doExport(req, res, req.params.pad, req.params.type);
});
//handle import requests
app.post('/p/:pad/import', function(req, res, next)
{
//if abiword is disabled, skip handling this request
if(settings.abiword == null)
{
next();
return;
}
res.header("Server", serverName);
importHandler.doImport(req, res, req.params.pad);
});
//serve index.html under /
app.get('/', function(req, res)
{