Merge branch 'master' into fix/test-php-8.2

Signed-off-by: Côme Chilliet <[email protected]>

.github/CODEOWNERS

@@ -16,4 +16,4 @@
 /lib/public/Profiler               @CarlSchwan
 
 # Security team
-resources/config/ca-bundle.crt    @ChristophWurst @eneiluj @miaulalala @nickvergessen
+resources/config/ca-bundle.crt    @ChristophWurst @julien-nc @miaulalala @nickvergessen

apps/comments/src/services/GetComments.js

@@ -22,6 +22,7 @@
 
 import { parseXML, prepareFileFromProps } from 'webdav/dist/node/tools/dav'
 import { processResponsePayload } from 'webdav/dist/node/response'
+import { decodeHtmlEntities } from '../utils/decodeHtmlEntities'
 import client from './DavClient'
 
 export const DEFAULT_LIMIT = 20
@@ -89,16 +90,3 @@ function processMultistatus(result, isDetailed = false) {
 		return prepareFileFromProps(decodedProps, decodedProps.id.toString(), isDetailed)
 	})
 }
-
-/**
- * @param {any} value -
- * @param {any} passes -
- */
-function decodeHtmlEntities(value, passes = 1) {
-	const parser = new DOMParser()
-	let decoded = value
-	for (let i = 0; i < passes; i++) {
-		decoded = parser.parseFromString(decoded, 'text/html').documentElement.textContent
-	}
-	return decoded
-}

apps/comments/src/services/NewComment.js

@@ -22,6 +22,7 @@
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { getRootPath } from '../utils/davUtils'
+import { decodeHtmlEntities } from '../utils/decodeHtmlEntities'
 import axios from '@nextcloud/axios'
 import client from './DavClient'
 
@@ -55,5 +56,12 @@ export default async function(commentsType, ressourceId, message) {
 		details: true,
 	})
 
+	const props = comment.data.props
+	// Decode twice to handle potentially double-encoded entities
+	// FIXME Remove this once https://github.com/nextcloud/server/issues/29306
+	// is resolved
+	props.actorDisplayName = decodeHtmlEntities(props.actorDisplayName, 2)
+	props.message = decodeHtmlEntities(props.message, 2)
+
 	return comment.data
 }

apps/comments/src/utils/decodeHtmlEntities.js

@@ -0,0 +1,34 @@
+/**
+ * @copyright Copyright (c) 2021 Christopher Ng <[email protected]>
+ *
+ * @author Christopher Ng <[email protected]>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @param {any} value -
+ * @param {any} passes -
+ */
+export function decodeHtmlEntities(value, passes = 1) {
+	const parser = new DOMParser()
+	let decoded = value
+	for (let i = 0; i < passes; i++) {
+		decoded = parser.parseFromString(decoded, 'text/html').documentElement.textContent
+	}
+	return decoded
+}

apps/dav/l10n/el.js

@@ -31,6 +31,7 @@ OC.L10N.register(
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
     "Busy" : "Απασχολημένος",
+    "Calendar, contacts and tasks" : "Ημερολόγιο, επαφές και εργασίες",
     "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
     "Contact birthdays" : "Γενέθλια επαφών",

apps/dav/l10n/el.json

@@ -29,6 +29,7 @@
     "{actor} updated event {event} in calendar {calendar}" : "Ο {actor} ενημέρωσε το γεγονός {event} στο ημερολόγιο {calendar}",
     "You updated event {event} in calendar {calendar}" : "Ενημερώσατε το συμβάν {event} στο ημερολόγιο {calendar}",
     "Busy" : "Απασχολημένος",
+    "Calendar, contacts and tasks" : "Ημερολόγιο, επαφές και εργασίες",
     "A <strong>calendar</strong> was modified" : "Τροποποιήθηκε ένα <strong>ημερολόγιο</strong> ",
     "A calendar <strong>event</strong> was modified" : "Τροποποιήθηκε ένα <strong>γεγονός</strong> του ημερολογίου",
     "Contact birthdays" : "Γενέθλια επαφών",

apps/encryption/l10n/lv.js

@@ -1,8 +1,38 @@
 OC.L10N.register(
     "encryption",
     {
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
-    "Enabled" : "Pievienots"
+    "Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
+    "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
+    "Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
+    "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+    "Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
+    "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+    "Missing parameters" : "Trūkstošos parametrs",
+    "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
+    "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
+    "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+    "Password successfully changed." : "Parole veiksmīgi nomainīta.",
+    "Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
+    "Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
+    "Recovery Key enabled" : "Atkopšanas atslēga aktivizēta",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēga, lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru",
+    "Could not update the private key password." : "Nevarēja atjaunināt privātās atslēgas paroli.",
+    "The old password was not correct, please try again." : "Vecā parole nav pareiza, lūdzu, mēģiniet vēlreiz.",
+    "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūdzu, mēģiniet vēlreiz.",
+    "Private key password successfully updated." : "Privātās atslēgas parole ir veiksmīgi atjaunināta.",
+    "Encryption app is enabled and ready" : "Šifrēšanas lietotne ir iespējota un gatava",
+    "Bad Signature" : "Nederīgs paraksts",
+    "Missing Signature" : "Trūkst paraksta",
+    "The share will expire on %s." : "Koplietošana beigsies %s.",
+    "Cheers!" : "Priekā!",
+    "Change Password" : "Mainīt paroli",
+    "Your private key password no longer matches your log-in password." : "Jūsu privātās atslēgas parole vairs nesakrīt ar jūsu pieteikšanās paroli.",
+    "Set your old private key password to your current log-in password:" : "Iestatiet savu veco privātās atslēgas paroli uz pašreizējo pieteikšanās paroli:",
+    "Old log-in password" : "Vecā pieteikšanās parole",
+    "Current log-in password" : "Pašreizējā pieteikšanās parole",
+    "Enable password recovery:" : "Iespējot paroles atjaunošanu:",
+    "Enabled" : "Pievienots",
+    "Disabled" : "Atspējots"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");

apps/encryption/l10n/lv.json

@@ -1,6 +1,36 @@
 { "translations": {
-    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Šifrēšanas lietotnei nepareiza privātā atslēga. Lūdzu atjaunojiet savu privāto atslēgu personīgo uzstādījumu sadaļā, lai atjaunot pieeju šifrētajiem failiem.",
-    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifrēšanas lietotnes ir pieslēgta, bet šifrēšanas atslēgas nav uzstādītas. Lūdzu izejiet no sistēmas un ieejiet sistēmā atpakaļ.",
-    "Enabled" : "Pievienots"
+    "Missing recovery key password" : "Pazudusi atkopšanas atslēgas parole",
+    "Please repeat the recovery key password" : "Lūdzu atkārtot atgūšanas atslēgas paroli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Atkārtota atkopšanas atslēgas parole nesakrīt ar izsniegto atkopšanas atslēgu paroli",
+    "Recovery key successfully enabled" : "Atkopšanas atslēga ir veiksmīgi iespējota",
+    "Could not enable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja iespējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+    "Recovery key successfully disabled" : "Atkopšanas atslēga ir veiksmīgi deaktivizēta",
+    "Could not disable recovery key. Please check your recovery key password!" : "Atkopšanas atslēgu nevarēja atspējot. Lūdzu, pārbaudiet atkopšanas atslēgas paroli!",
+    "Missing parameters" : "Trūkstošos parametrs",
+    "Please provide the old recovery password" : "Lūdzu, norādiet iepriekšējo atkopšanas paroli",
+    "Please provide a new recovery password" : "Lūdzu, ievadiet jaunu paroli",
+    "Please repeat the new recovery password" : "Lūdzu, atkārtojiet jauno atkopšanas paroli",
+    "Password successfully changed." : "Parole veiksmīgi nomainīta.",
+    "Could not change the password. Maybe the old password was not correct." : "Nevarēja mainīt paroli. Varbūt vecā parole nav pareiza.",
+    "Recovery Key disabled" : "Atkopšanas atslēga deaktivizēta",
+    "Recovery Key enabled" : "Atkopšanas atslēga aktivizēta",
+    "Could not enable the recovery key, please try again or contact your administrator" : "Nevarēja iespējot atkopšanas atslēga, lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru",
+    "Could not update the private key password." : "Nevarēja atjaunināt privātās atslēgas paroli.",
+    "The old password was not correct, please try again." : "Vecā parole nav pareiza, lūdzu, mēģiniet vēlreiz.",
+    "The current log-in password was not correct, please try again." : "Pašreizējā pieteikšanās parole nebija pareiza, lūdzu, mēģiniet vēlreiz.",
+    "Private key password successfully updated." : "Privātās atslēgas parole ir veiksmīgi atjaunināta.",
+    "Encryption app is enabled and ready" : "Šifrēšanas lietotne ir iespējota un gatava",
+    "Bad Signature" : "Nederīgs paraksts",
+    "Missing Signature" : "Trūkst paraksta",
+    "The share will expire on %s." : "Koplietošana beigsies %s.",
+    "Cheers!" : "Priekā!",
+    "Change Password" : "Mainīt paroli",
+    "Your private key password no longer matches your log-in password." : "Jūsu privātās atslēgas parole vairs nesakrīt ar jūsu pieteikšanās paroli.",
+    "Set your old private key password to your current log-in password:" : "Iestatiet savu veco privātās atslēgas paroli uz pašreizējo pieteikšanās paroli:",
+    "Old log-in password" : "Vecā pieteikšanās parole",
+    "Current log-in password" : "Pašreizējā pieteikšanās parole",
+    "Enable password recovery:" : "Iespējot paroles atjaunošanu:",
+    "Enabled" : "Pievienots",
+    "Disabled" : "Atspējots"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }

apps/federatedfilesharing/l10n/lt_LT.js

@@ -34,9 +34,11 @@ OC.L10N.register(
     "Federated Cloud" : "Federacinė debesija",
     "Your Federated Cloud ID:" : "Jūsų federacinės debesijos ID:",
     "Share it so your friends can share files with you:" : "Pasidalinkite juo, kad jūsų draugai galėtų bendrinti failus kartu su jumis:",
+    "Facebook" : "„Facebook“",
     "Twitter" : "Twitter",
     "HTML Code:" : "HTML kodas:",
     "Copy to clipboard" : "Kopijuoti į iškarpinę",
+    "Clipboard is not available" : "Iškarpinė neprieinama",
     "Copy" : "Kopijuoti",
     "Copied!" : "Nukopijuota!",
     "Not supported!" : "Nepalaikoma!",

apps/federatedfilesharing/l10n/lt_LT.json

@@ -32,9 +32,11 @@
     "Federated Cloud" : "Federacinė debesija",
     "Your Federated Cloud ID:" : "Jūsų federacinės debesijos ID:",
     "Share it so your friends can share files with you:" : "Pasidalinkite juo, kad jūsų draugai galėtų bendrinti failus kartu su jumis:",
+    "Facebook" : "„Facebook“",
     "Twitter" : "Twitter",
     "HTML Code:" : "HTML kodas:",
     "Copy to clipboard" : "Kopijuoti į iškarpinę",
+    "Clipboard is not available" : "Iškarpinė neprieinama",
     "Copy" : "Kopijuoti",
     "Copied!" : "Nukopijuota!",
     "Not supported!" : "Nepalaikoma!",

apps/files/js/app.js

@@ -321,7 +321,7 @@
 					dir: e.dir ? e.dir : '/'
 				};
 				this._changeUrl(params.view, params.dir);
-				OC.Apps.hideAppSidebar($('.detailsView'));
+				OCA.Files.Sidebar.close();
 				this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
 				window._nc_event_bus.emit('files:navigation:changed')
 			}
@@ -352,7 +352,7 @@
 		_onChangeViewerMode: function(e) {
 			var state = !!e.viewerModeEnabled;
 			if (e.viewerModeEnabled) {
-				OC.Apps.hideAppSidebar($('.detailsView'));
+				OCA.Files.Sidebar.close();
 			}
 			$('#app-navigation').toggleClass('hidden', state);
 			$('.app-files').toggleClass('viewer-mode no-sidebar', state);

apps/files/js/gotoplugin.js

@@ -45,7 +45,7 @@
 				type: OCA.Files.FileActions.TYPE_DROPDOWN,
 				actionHandler: function (fileName, context) {
 					var fileModel = context.fileInfoModel;
-					OC.Apps.hideAppSidebar($('.detailsView'));
+					OCA.Files.Sidebar.close();
 					OCA.Files.App.setActiveView('files', { silent: true });
 					OCA.Files.App.fileList.changeDirectory(fileModel.get('path'), true, true).then(function() {
 						OCA.Files.App.fileList.scrollTo(fileModel.get('name'));

apps/files/l10n/hu.js

@@ -36,6 +36,7 @@ OC.L10N.register(
     "Move" : "Áthelyezés",
     "Copy" : "Másolás",
     "Choose target folder" : "Válasszon célmappát",
+    "Edit locally" : "Szerkesztés helyileg",
     "Open" : "Megnyitás",
     "Delete file" : "Fájl törlése",
     "Delete folder" : "Mappa törlése",
@@ -59,6 +60,7 @@ OC.L10N.register(
     "Could not copy \"{file}\"" : "A(z) „{file}” másolása sikertelen",
     "Copied {origin} inside {destination}" : "A(z) {origin} átmásolva ide: {destination}",
     "Copied {origin} and {nbfiles} other files inside {destination}" : "A(z) {origin} és {nbfiles} egyéb fájl átmásolva ide: {destination}",
+    "Failed to redirect to client" : "Nem sikerült az átirányítás a klienshez",
     "{newName} already exists" : "A(z) {newName} már létezik",
     "Could not rename \"{fileName}\", it does not exist any more" : "A(z) „{fileName}” átnevetése sikertelen, mert már nem létezik",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "A(z) „{targetName}” név már használatban van a(z) „{dir}” mappában. Válasszon másik nevet.",

apps/files/l10n/hu.json

@@ -34,6 +34,7 @@
     "Move" : "Áthelyezés",
     "Copy" : "Másolás",
     "Choose target folder" : "Válasszon célmappát",
+    "Edit locally" : "Szerkesztés helyileg",
     "Open" : "Megnyitás",
     "Delete file" : "Fájl törlése",
     "Delete folder" : "Mappa törlése",
@@ -57,6 +58,7 @@
     "Could not copy \"{file}\"" : "A(z) „{file}” másolása sikertelen",
     "Copied {origin} inside {destination}" : "A(z) {origin} átmásolva ide: {destination}",
     "Copied {origin} and {nbfiles} other files inside {destination}" : "A(z) {origin} és {nbfiles} egyéb fájl átmásolva ide: {destination}",
+    "Failed to redirect to client" : "Nem sikerült az átirányítás a klienshez",
     "{newName} already exists" : "A(z) {newName} már létezik",
     "Could not rename \"{fileName}\", it does not exist any more" : "A(z) „{fileName}” átnevetése sikertelen, mert már nem létezik",
     "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "A(z) „{targetName}” név már használatban van a(z) „{dir}” mappában. Válasszon másik nevet.",

apps/files/l10n/lv.js

@@ -113,6 +113,7 @@ OC.L10N.register(
     "Create" : "Izveidot",
     "%s used" : "%s izmantoti",
     "%1$s of %2$s used" : "%1$s no %2$s lietoti",
+    "Files settings" : "Failu iestatījumi",
     "Show hidden files" : "Rādīt slēptās datnes",
     "Crop image previews" : "Apgriezt attēlu priekšskatījumus",
     "WebDAV" : "WebDAV",

apps/files/l10n/lv.json

@@ -111,6 +111,7 @@
     "Create" : "Izveidot",
     "%s used" : "%s izmantoti",
     "%1$s of %2$s used" : "%1$s no %2$s lietoti",
+    "Files settings" : "Failu iestatījumi",
     "Show hidden files" : "Rādīt slēptās datnes",
     "Crop image previews" : "Apgriezt attēlu priekšskatījumus",
     "WebDAV" : "WebDAV",

apps/files/lib/Command/Scan.php

@@ -306,7 +306,7 @@ protected function showSummary($headers, $rows, OutputInterface $output) {
 	 * @return string
 	 */
 	protected function formatExecTime() {
-		$secs = round($this->execTime);
+		$secs = (int)round($this->execTime);
 		# convert seconds into HH:MM:SS form
 		return sprintf('%02d:%02d:%02d', (int)($secs / 3600), ((int)($secs / 60) % 60), $secs % 60);
 	}