From 93190f407148a8a5129365df685c8c661bd5bec5 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Tue, 15 Feb 2022 09:00:51 +0100 Subject: [PATCH] XHTML to HTML --- .../app/libraries/MailSo/Base/HtmlUtils.php | 5 +- .../app/libraries/MailSo/Mail/Message.php | 2 +- .../0.0.0/app/libraries/RainLoop/Service.php | 4 +- .../v/0.0.0/app/localization/cs-CZ/admin.json | 6 +-- .../v/0.0.0/app/localization/da-DK/admin.json | 6 +-- .../v/0.0.0/app/localization/de-DE/admin.json | 8 +-- .../v/0.0.0/app/localization/en/admin.json | 8 +-- .../v/0.0.0/app/localization/es-ES/admin.json | 8 +-- .../v/0.0.0/app/localization/fa-IR/admin.json | 8 +-- .../v/0.0.0/app/localization/fi-FI/admin.json | 8 +-- .../v/0.0.0/app/localization/fr-FR/admin.json | 6 +-- .../v/0.0.0/app/localization/hu-HU/admin.json | 8 +-- .../v/0.0.0/app/localization/id-ID/admin.json | 8 +-- .../v/0.0.0/app/localization/it-IT/admin.json | 8 +-- .../v/0.0.0/app/localization/ja-JP/admin.json | 6 +-- .../v/0.0.0/app/localization/lt-LT/admin.json | 6 +-- .../v/0.0.0/app/localization/nb-NO/admin.json | 8 +-- .../v/0.0.0/app/localization/nl-NL/admin.json | 8 +-- .../v/0.0.0/app/localization/pl-PL/admin.json | 8 +-- .../v/0.0.0/app/localization/pt-BR/admin.json | 8 +-- .../v/0.0.0/app/localization/ru-RU/admin.json | 8 +-- .../v/0.0.0/app/localization/sk-SK/admin.json | 8 +-- .../v/0.0.0/app/localization/sl-SI/admin.json | 8 +-- .../v/0.0.0/app/localization/sv-SE/admin.json | 8 +-- .../v/0.0.0/app/localization/zh-CN/admin.json | 8 +-- .../v/0.0.0/app/templates/BadBrowser.html | 6 +-- snappymail/v/0.0.0/app/templates/Error.html | 18 +++---- .../app/templates/Views/Admin/AdminLogin.html | 6 +-- .../Views/Admin/AdminSettingsAbout.html | 2 +- .../Views/Admin/AdminSettingsConfig.html | 4 +- .../Views/Admin/AdminSettingsContacts.html | 6 +-- .../Views/Admin/AdminSettingsDomains.html | 12 ++--- .../Views/Admin/AdminSettingsGeneral.html | 10 ++-- .../Views/Admin/AdminSettingsLogin.html | 4 +- .../Views/Admin/AdminSettingsPackages.html | 2 +- .../Admin/AdminSettingsPackagesTable.html | 6 +-- .../Admin/AdminSettingsPluginProperty.html | 8 +-- .../Views/Admin/AdminSettingsSecurity.html | 12 ++--- .../templates/Views/Admin/PopupsDomain.html | 50 +++++++++---------- .../app/templates/Views/Components/Input.html | 2 +- .../0.0.0/app/templates/Views/User/Login.html | 4 +- .../templates/Views/User/MailFolderList.html | 2 +- .../templates/Views/User/MailMessageList.html | 2 +- .../templates/Views/User/PopupsAccount.html | 6 +-- .../Views/User/PopupsAdvancedSearch.html | 8 +-- .../templates/Views/User/PopupsCompose.html | 10 ++-- .../templates/Views/User/PopupsContacts.html | 12 ++--- .../templates/Views/User/PopupsFilter.html | 3 +- .../Views/User/PopupsFolderClear.html | 6 +-- .../Views/User/PopupsFolderCreate.html | 2 +- .../templates/Views/User/PopupsIdentity.html | 10 ++-- .../User/PopupsKeyboardShortcutsHelp.html | 8 +-- .../Views/User/PopupsOpenPgpGenerate.html | 14 +++--- .../Views/User/PopupsOpenPgpImport.html | 2 +- .../Views/User/PopupsSieveScript.html | 13 +++-- .../Views/User/SettingsContacts.html | 6 +-- .../templates/Views/User/SettingsFilters.html | 8 +-- .../User/SettingsFiltersActionForward.html | 2 +- .../User/SettingsFiltersActionVacation.html | 4 +- .../User/SettingsFiltersConditionBody.html | 2 +- .../User/SettingsFiltersConditionDefault.html | 2 +- .../User/SettingsFiltersConditionMore.html | 4 +- .../User/SettingsFiltersConditionSize.html | 2 +- .../Views/User/SettingsFolderItem.html | 2 +- .../templates/Views/User/SettingsFolders.html | 2 +- .../templates/Views/User/SettingsGeneral.html | 4 +- .../templates/Views/User/SettingsOpenPGP.html | 6 +-- .../templates/Views/User/SettingsThemes.html | 6 +-- 68 files changed, 237 insertions(+), 240 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php index cd00413ae..b3ab1c431 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php @@ -368,7 +368,7 @@ abstract class HtmlUtils $sResult = static::GetTextFromDom($oDom, false); unset($oDom); - return '
'. + return ''. ''.$sResult.''; } @@ -446,12 +446,11 @@ abstract class HtmlUtils $sText = \preg_replace('/[\n]{3,}/', "\n\n", $sText); $sText = \strtr($sText, array( - "\n" => "