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

Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types

Browse source 
Allow for a setting so you can stop unknown file types from being imported
This commit is contained in:
John McLear 2014-11-15 15:41:08 +00:00
commit 3bf108f3b4
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/node/handler/ImportHandler.js
View file

@ -92,9 +92,14 @@ exports.doImport = function(req, res, padId)
}
//we need to rename this file with a .txt ending
else {
var oldSrcFile = srcFile;
srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
fs.rename(oldSrcFile, srcFile, callback);
if(settings.allowUnknownFileEnds === true){
var oldSrcFile = srcFile;
srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
fs.rename(oldSrcFile, srcFile, callback);
}else{
console.warn("Not allowing unknown file type to be imported", fileEnding);
callback("uploadFailed");
}
}
},
function(callback){