Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e907d9 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/nc-28' into 'main'

nc 28 Upgrade

See merge request !245
parents 7127f34f 0c5672bd
Loading
Loading
Loading
Loading
Loading
+119 −112
Original line number Diff line number Diff line
FROM nextcloud:27.1.8-fpm AS nextcloud
FROM nextcloud:28.0.9-fpm AS nextcloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_HELPER_JOB_ID="881917"
ARG NOTES_VERSION="4.9.4"
ARG THEME_HELPER_JOB_ID="998222"
ARG NOTES_VERSION="4.10.1"
ARG CONTACTS_JOB_ID="881946"
ARG CALENDAR_JOB_ID="872766"
ARG EMAIL_RECOVERY_JOB_ID="940904"
ARG EA_JOB_ID="953602"
ARG LAUNCHER_JOB_ID="881954"
ARG CALENDAR_JOB_ID="991372"
ARG EMAIL_RECOVERY_JOB_ID="997842"
ARG EA_JOB_ID="991394"
ARG LAUNCHER_JOB_ID="991418"
ARG GOOGLE_INTEGRATION_VERSION="2.2.0"
ARG DASHBOARD_JOB_ID="881962"
ARG SNAPPY_VERSION="2.36.0"
ARG DASHBOARD_JOB_ID="991426"
ARG SNAPPY_VERSION="2.37.2"
ARG SNAPPY_THEME_VERSION="4.0.0"
ARG USER_MIGRATION_JOB_ID="881933"
ARG MEMORIES_VERSION="6.2.2"
ARG DROP_ACCOUNT_VERSION="2.3.2"
ARG USER_MIGRATION_JOB_ID="991454"
ARG MEMORIES_VERSION="7.3.1"
ARG DROP_ACCOUNT_VERSION="2.5.0"

RUN sed -i 's/27,1,8,2/27,1,8,4/' ${BASE_DIR}/version.php
RUN sed -i 's/28,0,9,1/28,0,9,3/' ${BASE_DIR}/version.php
COPY custom_entrypoint.sh /
RUN chmod +x /custom_entrypoint.sh
RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -24,7 +24,7 @@ RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
RUN apt-get update && apt-get install -y unzip ffmpeg

RUN curl -fsSL -o notes.tar.gz \
    "https://github.com/nextcloud/notes/releases/download/v${NOTES_VERSION}/notes.tar.gz" && \
  "https://github.com/nextcloud-releases/notes/releases/download/v${NOTES_VERSION}/notes-v${NOTES_VERSION}.tar.gz" && \
  tar -xf notes.tar.gz -C ${BASE_DIR}/custom_apps/ && \
  rm notes.tar.gz;

@@ -120,7 +120,7 @@ RUN apt-get -y remove unzip
RUN sed -i "s/\$systemConfig->setValue('theme', '');/\$systemConfig->setValue('theme', 'eCloud');/g" ${BASE_DIR}/lib/base.php

# Disable editor feature of media viewer
RUN sed -i 's/!this.isMobile/!this.isMobile\&\&false/' ${BASE_DIR}/apps/viewer/js/viewer-main.js
RUN sed -i 's/canEdit(){var e,t;return!this.isMobile/canEdit(){var e,t;return!this.isMobile\&\&false/' ${BASE_DIR}/apps/viewer/js/viewer-main.js

ENTRYPOINT ["/custom_entrypoint.sh"]
CMD ["php-fpm"]
@@ -129,7 +129,7 @@ From nextcloud as selfhost
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="26.0.2"
ARG USER_BACKEND_RAW_SQL_VERSION="1.3.0"
ARG USER_BACKEND_RAW_SQL_VERSION="2.0.1"
ARG SELFHOST_THEME_VERSION="2.0.0"
ARG IS_SELFHOST=true

@@ -147,7 +147,7 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/015-email-mail-template.patch
RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch
RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch
RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/026-primary-color-fix.patch
RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch
RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch
# UserConfigChangedEvent Ref: https://github.com/nextcloud/server/pull/42039
@@ -198,12 +198,17 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co
# Fix API call in files script
RUN sed -i "s/ajax\/getstoragestats/api\/v1\/stats/g" ${BASE_DIR}/apps/files/js/files.js

#fix for who can access data- its needed with 011-privacy-settings.patch
RUN sed -i 's|Your home storage is encrypted using {linkopen}server-side-encryption ↗{linkclose} with a master key\. It means that administrators can access your files, but not read their content\.|Like in most cloud services, a reduced number of administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.<br>{linkopen1}Learn more about this topic here.  ↗{linkclose1}|g' ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's/t((0,n\.Iu)("privacy","Your files on external storages may be encrypted using {linkopen}server-side-encryption ↗{linkclose} with a master key based on their configuration\."))/t("{linkopen}"+(0,n\.Iu)("privacy","To protect your data, we have implemented server-side-encryption on our servers which hides by default the content of your files and notes even to these administrators")+"↗{linkclose}")/g' ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's|t=t=>e.push(t.replace("{linkopen}",'"'"'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose}","</a>"))|t=t=>e.push(t.replace("{linkopen}",'"'"'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose}","</a>"))|g'  ${BASE_DIR}/apps/privacy/js/privacy-main.js
RUN sed -i 's|.replace("{linkclose}","</a>")|.replace("{linkclose}","</a>").replace("{linkopen1}",'"'"'<a href="https://doc.e.foundation/support-topics/services#can-the-ecloud-admin-access-my-data" target="_blank" rel="noreferrer noopener" class="encryption__link">'"'"').replace("{linkclose1}","</a>")|g' ${BASE_DIR}/apps/privacy/js/privacy-main.js

From selfhost as ecloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_VERSION="26.0.2"
ARG LDAP_WRITE_SUPPORT_VERSION="1.9.0"
ARG OIDC_LOGIN_VERSION="3.0.2"
ARG THEME_VERSION="28.0.1"
ARG LDAP_WRITE_SUPPORT_VERSION="1.10.0"
ARG IS_SELFHOST=false

RUN curl -fsSL -o ldap_write_support.tar.gz \
@@ -211,11 +216,6 @@ RUN curl -fsSL -o ldap_write_support.tar.gz \
  tar -xf ldap_write_support.tar.gz -C ${BASE_DIR}/custom_apps && \
  rm ldap_write_support.tar.gz

RUN curl -fsSL -o oidc_login.tar.gz \
    "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v${OIDC_LOGIN_VERSION}/oidc_login.tar.gz" && \
    tar -xf oidc_login.tar.gz -C ${BASE_DIR}/custom_apps && \
    rm oidc_login.tar.gz

# Patches
COPY patches/ ${TMP_PATCH_DIR}/
RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-contact-search-removal.patch
@@ -236,19 +236,13 @@ RUN rm -rf ${TMP_PATCH_DIR}
# Remove user avatar generation for system addressbook card
RUN sed -i 's/$this->getAvatarImage($user)/null/' ${BASE_DIR}/apps/dav/lib/CardDAV/Converter.php

# Replace "Get your own free account" NC link with /e/ Account link in public pages
RUN sed -i 's/https:\/\/nextcloud.com\/signup\//https:\/\/e\.foundation\/<?php p(\$_\[\x27language\x27\]); ?>\/e-email-invite\//' ${BASE_DIR}/core/templates/layout.public.php

# show reset pwd page with a query param
# RUN cd ${BASE_DIR}/dist && sed -i 's/resetPassword:!1/resetPassword:!1||Z.showResetPassword==="1"/' core-login.js

# hide oidc login button
RUN sed -i 's/$context->registerAlternativeLogin(OIDCLoginOption::class);/\/\/$context->registerAlternativeLogin(OIDCLoginOption::class);/' ${BASE_DIR}/custom_apps/oidc_login/lib/AppInfo/Application.php

# add attr about how many notifications to notif icon
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js
RUN sed -i 's/attrs:{id:"notifications",/attrs:{id:"notifications","data-has-notifications":0!==t.notifications.length,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue-data_image_svg_xml_base64-ab95a3.js
# Add data-object-type to notification
RUN sed -i 's/"data-id":t.notificationId,/"data-id":t.notificationId,"data-object-type":t.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue.js
RUN sed -i 's/"data-id":t.notificationId,/"data-id":t.notificationId,"data-object-type":t.objectType,/' ${BASE_DIR}/apps/notifications/js/notifications-node_modules_moment_locale_sync_recursive_-src_NotificationsApp_vue-data_image_svg_xml_base64-ab95a3.js

# Rename Memories to Gallery
RUN sed -i 's/<name>Memories<\/name>/<name>Gallery<\/name>/g' ${BASE_DIR}/custom_apps/memories/appinfo/info.xml
@@ -276,6 +270,13 @@ RUN sed -i 's/$this->changeAvatar/\/\/ $this->changeAvatar/' ${BASE_DIR}/custom_
# Remove 'fix broken values of calendar objects' repair step
RUN sed -i '/<step>OCA\\DAV\\Migration\\CalDAVRemoveEmptyValue<\/step>/d' ${BASE_DIR}/apps/dav/appinfo/info.xml

# Hide `Play sound when a call started (requires Nextcloud Talk)` checkbox from notification setting
RUN sed -i 's/attrs:{checked:e\.config\.sound_talk}/staticClass:"notification_talk",attrs:{checked:e\.config\.sound_talk}/g' ${BASE_DIR}/apps/notifications/js/notifications-settings.js

# Hide `Navigation bar settings` from theming
RUN sed -i 's/{attrs:{name:t.t("theming","Navigation bar settings")}}/{staticClass:"navigation-bar-settings",attrs:{name:t.t("theming","Navigation bar settings")}}/g' ${BASE_DIR}/dist/theming-personal-theming.js


# Custom theme
RUN rm -rf ${BASE_DIR}/themes/eCloud && \
  curl -fsSL -o eCloud-theme.tar.gz \
@@ -299,3 +300,9 @@ RUN sed -i "s/return in_array(\$user->getBackendClassName(), \['Database', 'Gues

# Seds to remove share option from notes
RUN sed -i ':a;N;$!ba;s/t("NcActionButton",{on:{click:e.onToggleSharing},scopedSlots:e._u(\[{key:"icon",fn:function(){return\[t("ShareVariantIcon",{attrs:{size:20}})\]},proxy:!0}\])},\[e._v("\\n\\t\\t\\t"+e._s(e.t("notes","Share"))+"\\n\\t\\t")\]),e._v(" "),/''/g' ${BASE_DIR}/custom_apps/notes/js/notes-main.js

# Add id to delete account settings section and hide it by default
Run sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.js

# Fix of https://github.com/nextcloud/server/commit/e727a3b00bd9b574279d25c006a0bc6b8fa4eec3 for availability setting
RUN sed -i 's/n.data/await n.text()/' ${BASE_DIR}/dist/dav-settings-personal-availability.js
 No newline at end of file
+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ if version_greater "$image_version" "$installed_version"; then
    rsync $rsync_options --include "/murena_launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/ldap_write_support/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/
    rsync $rsync_options --include "/oidc_login/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
    rsync $rsync_options --include "/murena-dashboard/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
    rsync $rsync_options --include "/snappymail/" --exclude '/*' $SRC_DIR/custom_apps/ /$DST_DIR/custom_apps/
    rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
+54 −62
Original line number Diff line number Diff line
@@ -33,31 +33,23 @@ diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Co
+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2023-02-01 21:51:00.382603635 +0530
@@ -39,6 +39,7 @@
 use OCP\IUserSession;
 use OCP\Share\IShare;
 use OCP\Mail\IMailer;
 use OCP\Share\IShare;
+use OCP\IUserManager;
 
 class MailPlugin implements ISearchPlugin {
 	/* @var bool */
@@ -76,7 +77,8 @@
 								IGroupManager $groupManager,
 								KnownUserService $knownUserService,
 								IUserSession $userSession,
-								IMailer $mailer) {
+								IMailer $mailer,
+								IUserManager $userManager) {
 		$this->contactsManager = $contactsManager;
 		$this->cloudIdManager = $cloudIdManager;
 		$this->config = $config;
@@ -84,6 +86,7 @@
 		$this->knownUserService = $knownUserService;
 		$this->userSession = $userSession;
 		$this->mailer = $mailer;
 	protected bool $shareWithGroupOnly;
@@ -61,7 +62,9 @@
 		private KnownUserService $knownUserService,
 		private IUserSession $userSession,
 		private IMailer $mailer,
+		private IUserManager $userManager,
 	) {
+		$this->userManager = $userManager;
 
 		$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';
@@ -230,27 +233,61 @@
 		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
@@ -207,27 +210,61 @@
 						if ($exactEmailMatch) {
 							$searchResult->markExactIdMatch($emailType);
 						}
+97 −58
Original line number Diff line number Diff line
@@ -5,25 +5,27 @@ Subject: [PATCH] Changes help links to point to the correct links
This patch adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct
help links are shown

--- ./apps/settings/lib/Controller/HelpController.php  2023-02-01 18:59:44.491700506 +0530
+++ ./apps/settings/lib/Controller/HelpController-new.php  2023-02-01 21:01:10.933837383 +0530
@@ -98,6 +98,7 @@
--- ./apps/settings/lib/Controller/HelpController.php	2024-07-25 16:11:57 +0530
+++ ./apps/settings/lib/Controller/HelpController-new.php	2024-07-25 16:12:51 +0530
@@ -114,6 +114,7 @@
 			'urlAdminDocs' => $urlAdminDocs,
 			'mode' => $mode,
 			'pageTitle' => $pageTitle,
+			'ncVersion' => \OCP\Util::getVersion()[0],
 			'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
 		]);
 		$policy = new ContentSecurityPolicy();
 		$policy->addAllowedFrameDomain('\'self\'');
--- ./apps/settings/templates/help.php	2023-02-01 20:49:47.625123858 +0530
+++ ./apps/settings/templates/help-new.php	2023-02-01 20:55:46.533199855 +0530
@@ -4,45 +4,26 @@
 		$policy = new ContentSecurityPolicy()
--- ./apps/settings/templates/help.php	2024-07-25 16:17:46 +0530
+++ ./apps/settings/templates/help-new.php	2024-07-25 17:13:16 +0530
@@ -5,72 +5,49 @@
 	<div id="app-navigation" role="navigation" tabindex="0">
 		<ul>
 			<li>
-			<a class="icon-user <?php if ($_['mode'] === 'user') {
-				<a class="help-list__link icon-user <?php if ($_['mode'] === 'user') {
-					p('active');
-} ?>" <?php if ($_['mode'] === 'user') { print_unescaped('aria-current="page"'); } ?>
-				} ?>" <?php if ($_['mode'] === 'user') {
-					print_unescaped('aria-current="page"');
-				} ?>
-					href="<?php print_unescaped($_['urlUserDocs']); ?>">
+				<a class="icon-user"
+					href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en/" target="_blank" rel="noreferrer noopener">
@@ -34,42 +36,79 @@ help links are shown
 				</a>
 			</li>
-		<?php if ($_['admin']) { ?>
+		
 			<li>
-			<a class="icon-user-admin <?php if ($_['mode'] === 'admin') {
-				<a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') {
-					p('active');
-} ?>" <?php if ($_['mode'] === 'admin') { print_unescaped('aria-current="page"'); } ?>
-				} ?>" <?php if ($_['mode'] === 'admin') {
-					print_unescaped('aria-current="page"');
-				} ?>
-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">
+			<a href="https://doc.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
 				<span class="help-list__text">
-					<span class="help-list__text">
-						<?php p($l->t('Administrator documentation')); ?>
-					</span>
+				<a href="https://doc.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">
+						<span class="help-list__text">
+								<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>
 				</span>
+						</span>
 				</a>
 			</li>
-		<?php } ?>
+	
 
 			<li>
-			<a href="https://docs.nextcloud.com" class="icon-category-office" target="_blank" rel="noreferrer noopener">
-				<a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener">
-					<span class="help-list__text">
-						<?php p($l->t('Documentation')); ?> ↗
-					</span>
-			</a>
-		</li>
-		<li>
-			<a href="https://help.nextcloud.com" class="icon-comment" target="_blank" rel="noreferrer noopener">
+				<a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">
 				<span class="help-list__text">
 					<?php p($l->t('Forum')); ?> ↗
 				</span>
+						<span class="help-list__text">
+								<?php p($l->t('Forum')); ?> ↗
+						</span>
 				</a>
 			</li>
-			<li>
-				<a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener">
-					<span class="help-list__text">
-						<?php p($l->t('Forum')); ?> ↗
-					</span>
-				</a>
-			</li>
 	</div>
-
 
-	<div id="app-content" class="help-includes">
-		<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0">
-		</iframe>
-	</div>

 <?php else: ?>
 	<div id="app-content">
 		<div class="help-wrapper">
 			<div class="help-content">
 				<h2 class="help-content__heading">
-					<?php p($l->t('Nextcloud help resources')); ?>
+					<?php p($l->t('Murena Workspace help resources')); ?>
 				</h2>
 				<div class="help-content__body">
 				<a class="button" target="_blank" rel="noreferrer noopener"
-					href="<?php print_unescaped($_['urlUserDocs']); ?>">
-					<?php p($l->t('Account documentation')); ?>  ↗
+					href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en/">
+					<?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗
 				</a>
 				<a class="button" target="_blank" rel="noreferrer noopener"
-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">
-					<?php p($l->t('Administration documentation')); ?>  ↗
+					href="https://doc.e.foundation/support-topics/e-cloud-e-email-account">
+					<?php p('/e/' . ' ' . $l->t('Documentation'));  ?> ↗
 				</a>
-				<a href="https://docs.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
-					<?php p($l->t('General documentation')); ?> ↗
-				</a>
-				<a href="https://help.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
+				<a href="https://community.e.foundation" class="button" target="_blank" rel="noreferrer noopener">
 					<?php p($l->t('Forum')); ?> ↗
 				</a>
 			</div>
--- ./apps/settings/css/help.css    2021-08-20 14:16:57.951439620 +0530
+++ ./apps/settings/css/help-new.css        2021-08-20 17:02:43.549016337 +0530
@@ -10,3 +10,12 @@
+11 −57
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 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
@@ -45,7 +45,7 @@
@@ -52,7 +52,7 @@
 			return null;
 		}
 
@@ -28,62 +28,16 @@ This patch removes certain unnecessary sections from the "privacy" section in pe
 
 	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 @@
+<?php
+script('privacy', 'privacy');
+style('privacy', 'privacy');
+?>
+
 <div id="themes" class="section">
 	<h3><?php p($l->t('Who has access to your data?')) ?></h3>
 	<h4><?php p($l->t('Administrators')); ?></h4>

--- ./apps/privacy/templates/who-has-access.php	2022-03-17 16:48:46.124670200 +0530
+++ ./apps/privacy/templates/who-has-access-new.php	2022-03-17 16:41:15.624670200 +0530
@@ -4,20 +4,27 @@
 ?>
 
 <div id="themes" class="section">
-	<h3><?php p($l->t('Who has access to your data?')) ?></h3>
-	<h4><?php p($l->t('Administrators')); ?></h4>
-	<div id="privacy_access_admins"></div>
+    <h3><?php p($l->t('Who has access to your data?')) ?></h3>
+    <h4><?php p($l->t('People you shared documents or folders with')) ?>:</h4>
+    <div id="privacy_access_shares"></div>
+    <p>&nbsp;</p>
+    <p><?php p($l->t('Like in most cloud services, a reduced number of administrators can see your files and all the information in the database as they need to make backups, perform upgrades, reset passwords, etc.')); ?>
+    </p>
+    <p><a href="https://doc.e.foundation/support-topics/services#can-the-ecloud-admin-access-my-data" target="_blank"
+            title="" rel="noreferrer noopener"><?php p($l->t('Learn more about this topic here.')); ?> ↗</a>
+    </p>
 
-	<h4><?php p($l->t('People you shared with')) ?></h4>
-	<div id="privacy_access_shares"></div>
+    <?php if (!empty($_['privacyPolicyUrl'])): ?>
+    <h4><?php p($l->t('Privacy policy')) ?></h4>
+    <p>
+        <a href="<?php print_unescaped($_['privacyPolicyUrl']) ?>"><?php p($l->t('Read the privacy policy.')) ?></a>
+    </p>
+    <?php endif; ?>
 
-	<?php if (!empty($_['privacyPolicyUrl'])): ?>
-	<h4><?php p($l->t('Privacy policy')) ?></h4>
-	<p>
-		<a href="<?php print_unescaped($_['privacyPolicyUrl']) ?>"><?php p($l->t('Read the privacy policy.')) ?></a>
-	</p>
-	<?php endif; ?>
--- ./apps/privacy/lib/Controller/PersonalController.php		2024-08-01 12:57:29 +0530
+++ ./apps/privacy/lib/Controller/PersonalController-new.php	2024-08-01 12:57:03 +0530
@@ -103,7 +103,7 @@
 				'internal' => false,
 			];
 		}
-
-	<h4><?php p($l->t('Encryption')) ?></h4>
-	<div id="privacy_access_encryption"></div>
-</div>
+    <h4><?php p($l->t('Encryption')) ?></h4>
+    <p>
+        <a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" title=""
+            rel="noreferrer noopener"><?php p($l->t('To protect your data, we have implemented server-side-encryption on our servers which hides by default the content of your files and notes even to these administrators.')); ?>
+            ↗</a>
+    </p>
+</div>
+		$uids = [];
 		return new JSONResponse($uids, Http::STATUS_OK);
 	}
 }
\ No newline at end of file
Loading