libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

check for soffice before removing export paths

Browse source
This commit is contained in:
Chris Birk 2015-12-17 21:54:04 -06:00
parent e98821cef7
commit 7f517eca0b
3 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/handler/PadMessageHandler.js
View file

@ -1234,6 +1234,8 @@ function handleClientReady(client, message)
"serverTimestamp": new Date().getTime(),
"userId": author,
"abiwordAvailable": settings.abiwordAvailable(),
"sofficeAvailable": settings.sofficeAvailable(),
"exportAvailable": settings.exportAvailable(),
"plugins": {
"plugins": plugins.plugins,
"parts": plugins.parts,

35
src/node/utils/Settings.js
View file

@ -222,6 +222,27 @@ exports.abiwordAvailable = function()
}
};
exports.sofficeAvailable = function () {
if(exports.soffice != null) {
return os.type().indexOf("Windows") != -1 ? "withoutPDF": "yes";
} else {
return "no";
}
};
exports.exportAvailable = function () {
var abiword = exports.abiwordAvailable();
var soffice = exports.sofficeAvailable();
if(abiword == "no" && soffice == "no") {
return "no";
} else if ((abiword == "withoutPDF" && soffice == "no") || (abiword == "no" && soffice == "withoutPDF")) {
return "withoutPDF";
} else {
return "yes";
}
};
// Provide git version if available
exports.getGitCommit = function() {
var version = "";
@ -375,6 +396,20 @@ exports.reloadSettings = function reloadSettings() {
}
}
if(exports.soffice) {
fs.exists(exports.soffice, function (exists) {
if(!exists) {
var sofficeError = "SOffice does not exist at this path, check your settings file";
if(!exports.suppressErrorsInPadText) {
exports.defaultPadText = exports.defaultPadText + "\nError: " + sofficeError + suppressDisableMsg;
}
console.error(sofficeError);
exports.soffice = null;
}
});
}
if (!exports.sessionKey) {
try {
exports.sessionKey = fs.readFileSync("./SESSIONKEY.txt","utf8");

8
src/static/js/pad_impexp.js
View file

@ -207,8 +207,10 @@ var padimpexp = (function()
// activate action to import in the form
$("#importform").attr('action', pad_root_url + "/import");
//hide stuff thats not avaible if abiword is disabled
if(clientVars.abiwordAvailable == "no")
console.log(clientVars);
//hide stuff thats not avaible if abiword/soffice is disabled
if(clientVars.exportAvailable == "no")
{
$("#exportworda").remove();
$("#exportpdfa").remove();
@ -216,7 +218,7 @@ var padimpexp = (function()
$("#importmessageabiword").show();
}
else if(clientVars.abiwordAvailable == "withoutPDF")
else if(clientVars.exportAvailable == "withoutPDF")
{
$("#exportpdfa").remove();