feat!: replace Abiword with LibreOffice and add DOCX export

.gitignore

@@ -18,7 +18,6 @@ out/
 .nyc_output
 .idea
 /package-lock.json
-/src/bin/abiword.exe
 /src/bin/convertSettings.json
 /src/bin/etherpad-1.deb
 /src/bin/node.exe

Dockerfile

@@ -62,15 +62,7 @@ ARG ETHERPAD_LOCAL_PLUGINS=
 #   ETHERPAD_GITHUB_PLUGINS="ether/ep_plugin"
 ARG ETHERPAD_GITHUB_PLUGINS=
 
-# Control whether abiword will be installed, enabling exports to DOC/PDF/ODT formats.
-# By default, it is not installed.
-# If given any value, abiword will be installed.
-#
-# EXAMPLE:
-#   INSTALL_ABIWORD=true
-ARG INSTALL_ABIWORD=
-
-# Control whether libreoffice will be installed, enabling exports to DOC/PDF/ODT formats.
+# Control whether libreoffice will be installed, enabling exports to DOC/DOCX/PDF/ODT formats.
 # By default, it is not installed.
 # If given any value, libreoffice will be installed.
 #
@@ -110,7 +102,6 @@ RUN  \
         ca-certificates \
         curl \
         git \
-        ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \
         ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common} && \
     rm -rf /var/cache/apk/*
 

doc/docker.adoc

@@ -62,24 +62,11 @@ The variable value has to be a space separated, double quoted list of plugin nam
 
 Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`.
 
-==== Rebuilding including export functionality for DOC/PDF/ODT
+==== Rebuilding including export functionality for DOC/DOCX/PDF/ODT
 
-If you want to be able to export your pads to DOC/PDF/ODT files, you can install
-either Abiword or Libreoffice via setting a build variable.
-
-===== Via Abiword
-
-For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value.
-
-Also, you will need to configure the path to the abiword executable
-via setting the `abiword` property in `<BASEDIR>/settings.json.docker` to
-`/usr/bin/abiword` or via setting the environment variable  `ABIWORD` to
-`/usr/bin/abiword`.
-
-===== Via Libreoffice
-
-For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable
-to any value.
+If you want to be able to export your pads to DOC/DOCX/PDF/ODT files, you can
+install Libreoffice via setting the `INSTALL_SOFFICE` build variable to any
+value.
 
 Also, you will need to configure the path to the libreoffice executable
 via setting the `soffice` property in `<BASEDIR>/settings.json.docker` to
@@ -464,12 +451,8 @@ For the editor container, you can also make it full width by adding `full-width-
 | How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching.
 | `21600` (6 hours)
 
-| `ABIWORD`
-| Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports.
-| `null`
-
 | `SOFFICE`
-| This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.
+| Absolute path to the soffice (LibreOffice) executable. Needed for advanced import/export of pads (docx, pdf, odt). Setting it to null disables LibreOffice and will only allow plain text and HTML import/exports.
 | `null`
 
 | `ALLOW_UNKNOWN_FILE_ENDS`

doc/docker.md

@@ -29,24 +29,11 @@ The variable value has to be a space separated, double quoted list of plugin nam
 
 Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`.
 
-### Rebuilding including export functionality for DOC/PDF/ODT
+### Rebuilding including export functionality for DOC/DOCX/PDF/ODT
 
-If you want to be able to export your pads to DOC/PDF/ODT files, you can install
-either Abiword or Libreoffice via setting a build variable.
-
-#### Via Abiword
-
-For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value.
-
-Also, you will need to configure the path to the abiword executable
-via setting the `abiword` property in `<BASEDIR>/settings.json.docker` to
-`/usr/bin/abiword` or via setting the environment variable  `ABIWORD` to
-`/usr/bin/abiword`.
-
-#### Via Libreoffice
-
-For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable
-to any value.
+If you want to be able to export your pads to DOC/DOCX/PDF/ODT files, you can
+install Libreoffice via setting the `INSTALL_SOFFICE` build variable to any
+value.
 
 Also, you will need to configure the path to the libreoffice executable
 via setting the `soffice` property in `<BASEDIR>/settings.json.docker` to
@@ -202,8 +189,7 @@ For the editor container, you can also make it full width by adding `full-width-
 | `EDIT_ONLY`                       | Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads.                                                                       | `false`               |
 | `MINIFY`                          | If true, all css & js will be minified before sending to the client. This will improve the loading performance massively, but makes it difficult to debug the javascript/css                           | `true`                |
 | `MAX_AGE`                         | How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching.                                                      | `21600` (6 hours)     |
-| `ABIWORD`                         | Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports. | `null`                |
-| `SOFFICE`                         | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.                                     | `null`                |
+| `SOFFICE`                         | Absolute path to the soffice (LibreOffice) executable. Needed for advanced import/export of pads (docx, pdf, odt). Setting it to null disables LibreOffice and will only allow plain text and HTML import/exports. | `null`                |
 | `ALLOW_UNKNOWN_FILE_ENDS`         | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm                                                                                                         | `true`                |
 | `REQUIRE_AUTHENTICATION`          | This setting is used if you require authentication of all users. Note: "/admin" always requires authentication.                                                                                        | `false`               |
 | `REQUIRE_AUTHORIZATION`           | Require authorization by a module, or a user with is_admin set, see below.                                                                                                                             | `false`               |

settings.json.docker

@@ -91,7 +91,7 @@
  *    "password": "${PASSW:}" // if PASSW is not defined would result in password === ''
  *
  *    If you want to use an empty value (null) as default value for a variable,
- *    simply do not set it, without putting any colons: "${ABIWORD}".
+ *    simply do not set it, without putting any colons: "${SOFFICE}".
  *
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
@@ -349,24 +349,22 @@
   "maxAge": "${MAX_AGE:21600}", // 60 * 60 * 6 = 6 hours
 
   /*
-   * Absolute path to the Abiword executable.
+   * This is the absolute path to the soffice executable.
    *
-   * Abiword is needed to get advanced import/export features of pads. Setting
-   * it to null disables Abiword and will only allow plain text and HTML
-   * import/exports.
+   * LibreOffice is used for advanced import/export of pads (docx, pdf, odt).
+   * Setting it to null disables LibreOffice and will only allow plain text
+   * and HTML import/exports.
    */
-  "abiword": "${ABIWORD:null}",
+  "soffice": "${SOFFICE:null}",
 
   /*
-   * This is the absolute path to the soffice executable.
-   *
-   * LibreOffice can be used in lieu of Abiword to export pads.
-   * Setting it to null disables LibreOffice exporting.
+   * When true (the default), the "Microsoft Word" export button downloads a .docx file via
+   * LibreOffice (requires "soffice" to be set). Set to false to revert to legacy .doc output
+   * (which also requires "soffice").
    */
-  "soffice": "${SOFFICE:null}",
+  "docxExport": "${DOCX_EXPORT:true}",
 
   /*
-   * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm
    */
   "allowUnknownFileEnds": "${ALLOW_UNKNOWN_FILE_ENDS:true}",

settings.json.template

@@ -82,7 +82,7 @@
  *    "password": "${PASSW:}" // if PASSW is not defined would result in password === ''
  *
  *    If you want to use an empty value (null) as default value for a variable,
- *    simply do not set it, without putting any colons: "${ABIWORD}".
+ *    simply do not set it, without putting any colons: "${SOFFICE}".
  *
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
@@ -336,24 +336,22 @@
   "maxAge": 21600, // 60 * 60 * 6 = 6 hours
 
   /*
-   * Absolute path to the Abiword executable.
+   * This is the absolute path to the soffice executable.
    *
-   * Abiword is needed to get advanced import/export features of pads. Setting
-   * it to null disables Abiword and will only allow plain text and HTML
-   * import/exports.
+   * LibreOffice is used for advanced import/export of pads (docx, pdf, odt).
+   * Setting it to null disables LibreOffice and will only allow plain text
+   * and HTML import/exports.
    */
-  "abiword": null,
+  "soffice": null,
 
   /*
-   * This is the absolute path to the soffice executable.
-   *
-   * LibreOffice can be used in lieu of Abiword to export pads.
-   * Setting it to null disables LibreOffice exporting.
+   * When true (the default), the "Microsoft Word" export button downloads a .docx file via
+   * LibreOffice (requires "soffice" to be set). Set to false to revert to legacy .doc output
+   * (which also requires "soffice").
    */
-  "soffice": null,
+  "docxExport": true,
 
   /*
-   * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm
    */
   "allowUnknownFileEnds": true,

src/locales/ar.json

@@ -117,7 +117,6 @@
 	"pad.importExport.exportword": "مايكروسوفت وورد",
 	"pad.importExport.exportpdf": "صيغة المستندات المحمولة",
 	"pad.importExport.exportopen": "ODF (نسق المستند المفتوح)",
-	"pad.importExport.abiword.innerHTML": "لا يمكنك الاستيراد إلا من نص عادي أو من تنسيقات HTML. للحصول على المزيد من ميزات الاستيراد المتقدمة، يرجى <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">تثبيت AbiWord أو LibreOffice</a>.",
 	"pad.modals.connected": "متصل.",
 	"pad.modals.reconnecting": "إعادة الاتصال ببادك..",
 	"pad.modals.forcereconnect": "فرض إعادة الاتصال",

src/locales/ast.json

@@ -52,7 +52,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instala Abiword o LibreOffice</a>.",
 	"pad.modals.connected": "Coneutáu.",
 	"pad.modals.reconnecting": "Reconeutando col to bloc...",
 	"pad.modals.forcereconnect": "Forzar la reconexón",

src/locales/az.json

@@ -66,7 +66,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (açıq sənəd formatı)",
-	"pad.importExport.abiword.innerHTML": "Siz yalnız adi mətndən və ya HTML-dən idxal edə bilərsiniz. İdxalın daha mürəkkəb funksiyaları üçün, zəhmət olmasa, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord və ya LibreOffice quraşdırın</a>.",
 	"pad.modals.connected": "Bağlandı.",
 	"pad.modals.reconnecting": "Sizin lövhə yenidən qoşulur…",
 	"pad.modals.forcereconnect": "Məcbur təkrarən bağlan",

src/locales/bcc.json

@@ -62,7 +62,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (قالب سند باز)",
-	"pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord</a> را نصب کنید.",
 	"pad.modals.connected": "متصل شد.",
 	"pad.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..",
 	"pad.modals.forcereconnect": "واداشتن به اتصال دوباره",

src/locales/be-tarask.json

@@ -97,7 +97,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Вы можаце імпартаваць толькі з звычайнага тэксту або HTML. Дзеля больш пашыраных магчымасьцяў імпарту, калі ласка, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">усталюйце AbiWord альбо LibreOffice</a>.",
 	"pad.modals.connected": "Падлучыліся.",
 	"pad.modals.reconnecting": "Перападлучэньне да вашага дакумэнта…",
 	"pad.modals.forcereconnect": "Прымусовае перападлучэньне",

src/locales/bgn.json

@@ -38,7 +38,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (پاچین سندئ قالب)",
-	"pad.importExport.abiword.innerHTML": "شما تا توانیت که شه ساده گین متنی ئین قالب یا اچ‌تی‌ام‌ال بی تئ کنیت . په گیشتیرین کارا ئییان پیشرفته ئین بی تئ کورتینا  <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord</a> نصب کنیت.",
 	"pad.modals.connected": "وصل بوت.",
 	"pad.modals.userdup": "نوکین دروازه گئ پاچ کورتین",
 	"pad.modals.unauth": "مجاز نه اینت",

src/locales/br.json

@@ -52,7 +52,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Ne c'hallit enporzhiañ nemet furmadoù testennoù plaen pe HTML. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">Abiword pe LibreOffice</a>.",
 	"pad.modals.connected": "Kevreet.",
 	"pad.modals.reconnecting": "Adkevreañ war-zu ho pad...",
 	"pad.modals.forcereconnect": "Adkevreañ dre heg",

src/locales/ca.json

@@ -93,7 +93,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Només podeu importar de text sense format o HTML. Per a opcions d'importació més avançades <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instal·leu l'Abiword</a>.",
 	"pad.modals.connected": "Connectat.",
 	"pad.modals.reconnecting": "S'està tornant a connectar al vostre pad…",
 	"pad.modals.forcereconnect": "Força tornar a connectar",

src/locales/cs.json

@@ -117,7 +117,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Importovat lze pouze z formátů prostého textu nebo HTML. Pokročilejší funkce pro import naleznete v <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalaci AbiWord nebo LibreOffice</a>.",
 	"pad.modals.connected": "Připojeno.",
 	"pad.modals.reconnecting": "Opětovné připojení k Padu...",
 	"pad.modals.forcereconnect": "Vynutit znovupřipojení",

src/locales/da.json

@@ -74,7 +74,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Du kan kun importere fra almindelig tekst eller HTML-formater. For mere avancerede importfunktioner skal du <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installere AbiWord eller LibreOffice</a> .",
 	"pad.modals.connected": "Forbundet.",
 	"pad.modals.reconnecting": "Genopretter forbindelsen til din pad...",
 	"pad.modals.forcereconnect": "Gennemtving genoprettelse af forbindelsen",

src/locales/de.json

@@ -122,7 +122,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Du kannst nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">muss AbiWord oder LibreOffice auf dem Server installiert werden</a>.",
 	"pad.modals.connected": "Verbunden.",
 	"pad.modals.reconnecting": "Dein Pad wird neu verbunden...",
 	"pad.modals.forcereconnect": "Erneutes Verbinden erzwingen",

src/locales/diq.json

@@ -93,7 +93,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Şıma şenê tenya metınanê zelalan ya zi formatanê HTML-i biyarê. Seba vêşi xısusiyetanê arezekerdışi ra gırey <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWordi ya zi LibreOfficeyi bar kerên</a>.",
 	"pad.modals.connected": "Gıre diya.",
 	"pad.modals.reconnecting": "Pada şıma rê fına irtibat kewê no",
 	"pad.modals.forcereconnect": "Mecbur anciya gırê de",

src/locales/dsb.json

@@ -106,7 +106,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Móžoš jano z fprmatow lutnego teksta abo z HTML-formata importěrowaś. Za wěcej rozšyrjone importěrowańske funkcije <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalěruj pšosym Abiword abo LibreOffice</a>.",
 	"pad.modals.connected": "Zwězany.",
 	"pad.modals.reconnecting": "Zwězujo se znowego z twójim zapisnikom...",
 	"pad.modals.forcereconnect": "Znowego zwězaś",