From 67a11396ad5f02158294a279d19304ea3dc85a08 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 00:54:40 +0530 Subject: [PATCH 01/11] update to 21.0.9 --- Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d8482d8..dca5fdb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM nextcloud:21.0.7-fpm AS nextcloud +FROM nextcloud:21.0.9-fpm AS nextcloud ARG BASE_DIR="/usr/src/nextcloud" ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="21.1.1" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" -ARG QUOTA_WARN_VERSION="1.13.0" -ARG NOTES_VERSION="4.2.0" -ARG CONTACTS_VERSION="4.0.6" -ARG CALENDAR_VERSION="3.0.1" +ARG QUOTA_WARN_VERSION="1.13.1" +ARG NOTES_VERSION="4.3.1" +ARG CONTACTS_VERSION="4.0.8" +ARG CALENDAR_VERSION="3.1.0" ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1" ARG EMAIL_RECOVERY_JOB_ID="199763" ARG RAINLOOP_VERSION="7.1.2" @@ -16,8 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -COPY patches/ ${TMP_PATCH_DIR}/ -RUN sed -i 's/21,0,7,0/21,0,7,18/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,0/21,0,9,0/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip @@ -39,12 +38,12 @@ RUN curl -fsSL -o notes.tar.gz \ rm notes.tar.gz; RUN curl -fsSL -o contacts.tar.gz \ - "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts.tar.gz" && \ + "https://github.com/nextcloud-releases/contacts/releases/download/v${CONTACTS_VERSION}/contacts-v${CONTACTS_VERSION}.tar.gz" && \ tar -xf contacts.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm contacts.tar.gz; RUN curl -fsSL -o calendar.tar.gz \ - "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar.tar.gz" && \ + "https://github.com/nextcloud-releases/calendar/releases/download/v${CALENDAR_VERSION}/calendar-v${CALENDAR_VERSION}.tar.gz" && \ tar -xf calendar.tar.gz -C ${BASE_DIR}/custom_apps/ && \ rm calendar.tar.gz; @@ -97,6 +96,7 @@ RUN apt-get -y remove unzip RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php # Patches +COPY patches/ ${TMP_PATCH_DIR}/ RUN patch -u ${BASE_DIR}/core/Controller/LoginController.php -i ${TMP_PATCH_DIR}/002-login-without-domain.patch RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch @@ -247,7 +247,7 @@ RUN apt-get -y install imagemagick;\ rm -rf /var/lib/apt/lists/*; VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 21.0.7 +ENV NEXTCLOUD_VERSION 21.0.9 ENTRYPOINT ["/custom_entrypoint.sh"] CMD ["php-fpm"] -- GitLab From ac8389e369037e246909362a539946473ec797bc Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 00:54:57 +0530 Subject: [PATCH 02/11] Edit patches to be compatible with 21.0.9 versions --- patches/005-autocomplete-user-leak-core.patch | 113 +++++++++--------- patches/009-help-links.patch | 46 +++---- patches/011-privacy-settings.patch | 26 ++-- 3 files changed, 94 insertions(+), 91 deletions(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 51c01edd..0a5b90f6 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -33,13 +33,13 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co +use OCP\IUserManager; use OCP\IUserSession; use OCP\Share\IShare; - -@@ -71,13 +72,15 @@ - IConfig $config, + use OCP\Mail\IMailer; +@@ -75,13 +76,15 @@ IGroupManager $groupManager, KnownUserService $knownUserService, -- IUserSession $userSession) { -+ IUserSession $userSession, + IUserSession $userSession, +- IMailer $mailer) { ++ IMailer $mailer, + IUserManager $userManager) { $this->contactsManager = $contactsManager; $this->cloudIdManager = $cloudIdManager; @@ -47,11 +47,11 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co $this->groupManager = $groupManager; $this->knownUserService = $knownUserService; $this->userSession = $userSession; -+ $this->userManager = $userManager; ++ $this->userManager = $userManager; + $this->mailer = $mailer; $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes'; - $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes'; -@@ -209,27 +212,62 @@ +@@ -218,27 +221,61 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -67,31 +67,31 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - ]; + $isUserinInstance = $this->userManager->get($emailAddress); + if ($isUserinInstance === null) { -+ // /e/ user is not in ecloud ++ // /e/ user is not in ecloud + + $result['exact'][] = [ -+ 'label' => $displayName, -+ 'uuid' => $contact['UID'], -+ 'name' => $contact['FN'], -+ 'type' => $emailAddressType ?? '', -+ 'value' => [ -+ 'shareType' => IShare::TYPE_EMAIL, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; ++ 'label' => $displayName, ++ 'uuid' => $contact['UID'], ++ 'name' => $contact['FN'], ++ 'type' => $emailAddressType ?? '', ++ 'value' => [ ++ 'shareType' => IShare::TYPE_EMAIL, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; + } else { -+ // /e/ user IS an ecloud user, convert to user share type -+ if (!$isUserinInstance->isEnabled()) { -+ // Ignore disabled users -+ continue; -+ } -+ $result['exact'][] = [ -+ 'label' => $displayName, -+ 'value' => [ -+ 'shareType' => IShare::TYPE_USER, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; ++ // /e/ user IS an ecloud user, convert to user share type ++ if (!$isUserinInstance->isEnabled()) { ++ // Ignore disabled users ++ continue; ++ } ++ $result['exact'][] = [ ++ 'label' => $displayName, ++ 'value' => [ ++ 'shareType' => IShare::TYPE_USER, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; + } } else { - $result['wide'][] = [ @@ -104,33 +104,32 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - 'shareWith' => $emailAddress, - ], - ]; -+ $isUserinInstance = $this->userManager->get($emailAddress); -+ if ($isUserinInstance === null) { -+ // /e/ user is not in ecloud -+ $result['wide'][] = [ -+ 'label' => $displayName, -+ 'uuid' => $contact['UID'], -+ 'name' => $contact['FN'], -+ 'type' => $emailAddressType ?? '', -+ 'value' => [ -+ 'shareType' => IShare::TYPE_EMAIL, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; -+ } else { -+ // /e/ user IS an ecloud user, convert to user share type -+ if (!$isUserinInstance->isEnabled()) { -+ // Ignore disabled users -+ continue; -+ } -+ $result['wide'][] = [ -+ 'label' => $displayName, -+ 'value' => [ -+ 'shareType' => IShare::TYPE_USER, -+ 'shareWith' => $emailAddress, -+ ], -+ ]; -+ } ++ if ($isUserinInstance === null) { ++ // /e/ user is not in ecloud ++ $result['wide'][] = [ ++ 'label' => $displayName, ++ 'uuid' => $contact['UID'], ++ 'name' => $contact['FN'], ++ 'type' => $emailAddressType ?? '', ++ 'value' => [ ++ 'shareType' => IShare::TYPE_EMAIL, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; ++ } else { ++ // /e/ user IS an ecloud user, convert to user share type ++ if (!$isUserinInstance->isEnabled()) { ++ // Ignore disabled users ++ continue; ++ } ++ $result['wide'][] = [ ++ 'label' => $displayName, ++ 'value' => [ ++ 'shareType' => IShare::TYPE_USER, ++ 'shareWith' => $emailAddress, ++ ], ++ ]; ++ } } } } diff --git a/patches/009-help-links.patch b/patches/009-help-links.patch index baae85b8..3c90df7c 100644 --- a/patches/009-help-links.patch +++ b/patches/009-help-links.patch @@ -19,48 +19,54 @@ help links are shown $policy->addAllowedFrameDomain('\'self\''); --- ./apps/settings/templates/help.php 2021-07-01 15:13:08.000000000 +0530 +++ ./apps/settings/templates/help-new.php 2021-08-10 17:22:42.771569854 +0530 -@@ -3,38 +3,21 @@ - ?> +@@ -4,45 +4,25 @@ - +- -
- diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 17300809..0e3b201c 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -6,30 +6,28 @@ This patch removes certain unnecessary sections from the "privacy" section in pe --- ./apps/privacy/lib/Settings/MissionSettings.php 2021-09-07 17:38:08.650902445 +0530 +++ ./apps/privacy/lib/Settings/MissionSettings-new.php 2021-09-07 17:40:30.078256502 +0530 -@@ -41,8 +41,8 @@ - /** - * @return string - */ -- public function getSection():string { +@@ -45,7 +45,7 @@ + return null; + } + - return 'privacy'; -+ public function getSection() { + return null; } - /** + public function getPriority(): int { + --- ./apps/privacy/lib/Settings/UserDataManifestoSettings.php 2021-09-07 17:38:06.284224253 +0530 +++ ./apps/privacy/lib/Settings/UserDataManifestoSettings-new.php 2021-09-07 17:40:42.288315736 +0530 -@@ -41,8 +41,8 @@ - /** - * @return string - */ -- public function getSection():string { +@@ -45,7 +45,7 @@ + return null; + } + - return 'privacy'; -+ public function getSection() { + return null; } - /** + public function getPriority(): int { + --- ./apps/privacy/templates/who-has-access.php 2021-09-07 17:40:05.704804878 +0530 +++ ./apps/privacy/templates/who-has-access-new.php 2021-09-07 17:40:02.714790363 +0530 @@ -1,3 +1,8 @@ -- GitLab From 48c065a535991a242beaeb54622eedf324311eb1 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 01:09:09 +0530 Subject: [PATCH 03/11] Fixed patch 005 --- patches/005-autocomplete-user-leak-core.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/005-autocomplete-user-leak-core.patch b/patches/005-autocomplete-user-leak-core.patch index 0a5b90f6..26cbf334 100644 --- a/patches/005-autocomplete-user-leak-core.patch +++ b/patches/005-autocomplete-user-leak-core.patch @@ -51,7 +51,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co $this->mailer = $mailer; $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes'; -@@ -218,27 +221,61 @@ +@@ -218,27 +221,62 @@ if ($exactEmailMatch) { $searchResult->markExactIdMatch($emailType); } @@ -104,6 +104,7 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co - 'shareWith' => $emailAddress, - ], - ]; ++ $isUserinInstance = $this->userManager->get($emailAddress); + if ($isUserinInstance === null) { + // /e/ user is not in ecloud + $result['wide'][] = [ -- GitLab From 26fed642350651f756f0ecd1a22a4c4fdad22783 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 01:20:24 +0530 Subject: [PATCH 04/11] Fixed version in version.php --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dca5fdb0..47533d72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,0/21,0,9,0/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,1/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From 26154074b39506b5d59fbdd0def94b4dd23cb453 Mon Sep 17 00:00:00 2001 From: akhil Date: Tue, 8 Mar 2022 12:12:25 +0530 Subject: [PATCH 05/11] Set quota warning to correct version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47533d72..e8329d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG TMP_PATCH_DIR="/tmp/build_patches" ARG THEME_VERSION="21.1.1" ARG THEME_HELPER_VERSION="1.0.2" ARG NEWS_VERSION="17.0.1" -ARG QUOTA_WARN_VERSION="1.13.1" +ARG QUOTA_WARN_VERSION="1.13.0" ARG NOTES_VERSION="4.3.1" ARG CONTACTS_VERSION="4.0.8" ARG CALENDAR_VERSION="3.1.0" @@ -16,7 +16,7 @@ ARG EA_TAG="1.0.0" ARG ECLOUD_LAUNCHER_JOB_ID="222001" ARG GOOGLE_INTEGRATION_VERSION="1.0.6" -RUN sed -i 's/21,0,9,1/21,0,9,1/' ${BASE_DIR}/version.php +RUN sed -i 's/21,0,9,1/21,0,9,2/' ${BASE_DIR}/version.php # Install unzip for unzipping artifacts RUN apt-get update && apt-get install unzip -- GitLab From dc7310780fe0fcb4e0049c580921fa15f7caffdd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Mar 2022 10:10:39 +0530 Subject: [PATCH 06/11] who-has-access section of privacy policy edits --- patches/014-patch_privacy.patch | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 patches/014-patch_privacy.patch diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch new file mode 100644 index 00000000..e4a001c8 --- /dev/null +++ b/patches/014-patch_privacy.patch @@ -0,0 +1,42 @@ +From: Avinash +Date: Tue, 08 March 2023 18:39 +0530 +Subject: [PATCH] Removes and transalate new text in WHo Can access my data + +--- ./apps/privacy/templates/who-has-access.php 2022-03-08 17:21:53.720124900 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-08 16:37:08.870124900 +0530 +@@ -6,7 +6,7 @@ +
+

t('Who has access to your data?')) ?>

+

t('Administrators')); ?>

+-
++

t('Only Ecloud Administrators can access your data.')); ?>

+ +

t('People you shared with')) ?>

+
+ +--- ./apps/privacy/l10n/es.json 2022-03-08 17:31:37.200124900 +0530 ++++ ./apps/privacy/l10n/es-new.json 2022-03-08 16:45:16.400124900 +0530 +@@ -288,6 +288,7 @@ + "Encryption" : "Cifrado", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", +- "Your data is located in: " : "Tus datos se encuentran en: " ++ "Your data is located in: " : "Tus datos se encuentran en: ", ++ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." + },"pluralForm" :"nplurals=2; plural=(n != 1);" + } +\ No newline at end of file + + +--- ./apps/privacy/l10n/es.js 2022-03-08 17:33:13.750124900 +0530 ++++ ./apps/privacy/l10n/es-new.js 2022-03-08 17:33:24.700124900 +0530 +@@ -290,6 +290,7 @@ + "Encryption" : "Cifrado", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", + "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", +- "Your data is located in: " : "Tus datos se encuentran en: " ++ "Your data is located in: " : "Tus datos se encuentran en: ", ++ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." + }, + "nplurals=2; plural=(n != 1);"); + -- GitLab From ac9afa17cde978b0852848d2c6580d25822ca4fb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 9 Mar 2022 14:45:22 +0530 Subject: [PATCH 07/11] privacy policy docker file change --- Dockerfile | 1 + patches/014-patch_privacy.patch | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index e8329d48..a47f199d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,6 +111,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch +RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-patch_privacy.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index e4a001c8..2b03e3a6 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -2,9 +2,9 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-08 17:21:53.720124900 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-08 16:37:08.870124900 +0530 -@@ -6,7 +6,7 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 14:30:07.253285800 +0530 +@@ -1,7 +1,7 @@

t('Who has access to your data?')) ?>

t('Administrators')); ?>

@@ -14,29 +14,27 @@ Subject: [PATCH] Removes and transalate new text in WHo Can access my data

t('People you shared with')) ?>

---- ./apps/privacy/l10n/es.json 2022-03-08 17:31:37.200124900 +0530 -+++ ./apps/privacy/l10n/es-new.json 2022-03-08 16:45:16.400124900 +0530 -@@ -288,6 +288,7 @@ - "Encryption" : "Cifrado", +--- ./apps/privacy/l10n/es.json 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/l10n/es-new.json 2022-03-09 14:18:50.733285800 +0530 +@@ -287,6 +287,7 @@ "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", -- "Your data is located in: " : "Tus datos se encuentran en: " -+ "Your data is located in: " : "Tus datos se encuentran en: ", + "Your data is located in: " : "Tus datos se encuentran en: ", +- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." ++ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", + "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." },"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file - ---- ./apps/privacy/l10n/es.js 2022-03-08 17:33:13.750124900 +0530 -+++ ./apps/privacy/l10n/es-new.js 2022-03-08 17:33:24.700124900 +0530 -@@ -290,6 +290,7 @@ - "Encryption" : "Cifrado", +--- ./apps/privacy/l10n/es.js 2022-01-28 14:49:15.000000000 +0530 ++++ ./apps/privacy/l10n/es-new.js 2022-03-09 14:17:24.883285800 +0530 +@@ -289,6 +289,7 @@ "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", -- "Your data is located in: " : "Tus datos se encuentran en: " -+ "Your data is located in: " : "Tus datos se encuentran en: ", + "Your data is located in: " : "Tus datos se encuentran en: ", +- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." ++ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", + "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." }, "nplurals=2; plural=(n != 1);"); - -- GitLab From f6e5cadde664c9e8f513a683b006daf8b71c971e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Mar 2022 11:21:35 +0530 Subject: [PATCH 08/11] changes in patch based in theme translation files --- patches/014-patch_privacy.patch | 43 +++++++++------------------------ 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index 2b03e3a6..4d224888 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -1,40 +1,21 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data - ---- ./apps/privacy/templates/who-has-access.php 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 14:30:07.253285800 +0530 -@@ -1,7 +1,7 @@ +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 11:10:58.448511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 21:02:36.503285800 +0530 +@@ -5,11 +5,13 @@ +

t('Who has access to your data?')) ?>

-

t('Administrators')); ?>

+-

t('Administrators')); ?>

-
-+

t('Only Ecloud Administrators can access your data.')); ?>

++

t('People you shared with')) ?>

- ---- ./apps/privacy/l10n/es.json 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/l10n/es-new.json 2022-03-09 14:18:50.733285800 +0530 -@@ -287,6 +287,7 @@ - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", - "Your data is located in: " : "Tus datos se encuentran en: ", -- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." -+ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", -+ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." - },"pluralForm" :"nplurals=2; plural=(n != 1);" - } -\ No newline at end of file - ---- ./apps/privacy/l10n/es.js 2022-01-28 14:49:15.000000000 +0530 -+++ ./apps/privacy/l10n/es-new.js 2022-03-09 14:17:24.883285800 +0530 -@@ -289,6 +289,7 @@ - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}." : "Tus archivos están encriptados con {linkopen}server-side-encryption ↗{linkclose}.", - "Your files are encrypted with {linkopen}server-side-encryption ↗{linkclose}. Additionally, this server is protected with full-disk-encryption." : "Tus archivos están encriptados por {linkopen}server-side-encryption ↗{linkclose}. Además, este servidor está protegido con cifrado de disco completo.", - "Your data is located in: " : "Tus datos se encuentran en: ", -- "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor." -+ "The admin hasn't selected the location of the server yet." : "Los administradores no han seleccionado todavía la localización del servidor.", -+ "Only Ecloud Administrators can access your data.":"Solo las Administradoras de Ecloud pueden acceder a sus datos." - }, - "nplurals=2; plural=(n != 1);"); ++

t('Administrators')); ?>

++

t('Who can access main text')); ?>

++

t('Who can access main text link')); ?> ↗

+ + +

t('Privacy policy')) ?>

-- GitLab From bbb84895c51b182cdba2bf03ec0681a540ef889d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 10 Mar 2022 18:35:08 +0530 Subject: [PATCH 09/11] key changes as per nextcloud keys convensions --- patches/014-patch_privacy.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch index 4d224888..387ea336 100644 --- a/patches/014-patch_privacy.patch +++ b/patches/014-patch_privacy.patch @@ -1,8 +1,8 @@ From: Avinash Date: Tue, 08 March 2023 18:39 +0530 Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-10 11:10:58.448511800 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-09 21:02:36.503285800 +0530 +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 @@ -5,11 +5,13 @@
@@ -14,8 +14,9 @@ Subject: [PATCH] Removes and transalate new text in WHo Can access my data

t('People you shared with')) ?>

+

t('Administrators')); ?>

-+

t('Who can access main text')); ?>

-+

t('Who can access main text link')); ?> ↗

++

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

++

t('Learn more about this topic here.')); ?> ↗

t('Privacy policy')) ?>

+ -- GitLab From 1d99e7bc022cb40eb66f8f84be3693f364f158b3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Mar 2022 22:19:27 +0530 Subject: [PATCH 10/11] privacy patch merge to patch 011 --- Dockerfile | 1 - patches/014-patch_privacy.patch | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 patches/014-patch_privacy.patch diff --git a/Dockerfile b/Dockerfile index a47f199d..e8329d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,7 +111,6 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch -RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-patch_privacy.patch RUN rm -rf ${TMP_PATCH_DIR} # autocomplete leak tweak apps frontend with sed, disable group suggestion diff --git a/patches/014-patch_privacy.patch b/patches/014-patch_privacy.patch deleted file mode 100644 index 387ea336..00000000 --- a/patches/014-patch_privacy.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Avinash -Date: Tue, 08 March 2023 18:39 +0530 -Subject: [PATCH] Removes and transalate new text in WHo Can access my data ---- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 -+++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 -@@ -5,11 +5,13 @@ - -
-

t('Who has access to your data?')) ?>

--

t('Administrators')); ?>

--
-+ - -

t('People you shared with')) ?>

-
-+

t('Administrators')); ?>

-+

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

-+

t('Learn more about this topic here.')); ?> ↗

- - -

t('Privacy policy')) ?>

- -- GitLab From 12f346f6b8f285aedff4ceb9d9573e9d043896e8 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Mon, 14 Mar 2022 22:31:31 +0530 Subject: [PATCH 11/11] patch added to patch 11 --- patches/011-privacy-settings.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/patches/011-privacy-settings.patch b/patches/011-privacy-settings.patch index 0e3b201c..dfb46a59 100644 --- a/patches/011-privacy-settings.patch +++ b/patches/011-privacy-settings.patch @@ -39,3 +39,22 @@ This patch removes certain unnecessary sections from the "privacy" section in pe

t('Who has access to your data?')) ?>

t('Administrators')); ?>

+ +--- ./apps/privacy/templates/who-has-access.php 2022-03-10 18:22:26.498511800 +0530 ++++ ./apps/privacy/templates/who-has-access-new.php 2022-03-10 18:16:10.028511800 +0530 +@@ -5,11 +5,13 @@ + +
+

t('Who has access to your data?')) ?>

+-

t('Administrators')); ?>

+-
++ + +

t('People you shared with')) ?>

+
++

t('Administrators')); ?>

++

t('Like in most cloud services, administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>

++

t('Learn more about this topic here.')); ?> ↗

+ + +

t('Privacy policy')) ?>

-- GitLab