Merge branch 'privacy-fixes-patch-new' into 'nc-21'

ARG ECLOUD_LAUNCHER_JOB_ID="222001"

ARG GOOGLE_INTEGRATION_VERSION="1.0.6"

RUN sed -i 's/21,0,9,1/21,0,9,4/' ${BASE_DIR}/version.php

RUN sed -i 's/21,0,9,1/21,0,9,6/' ${BASE_DIR}/version.php

# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install unzip 

 	<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-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 @@

--- ./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>

-	<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; ?>

 	<h4><?php p($l->t('People you shared with')) ?></h4>

 	<div id="privacy_access_shares"></div>

+	<h4><?php p($l->t('Administrators')); ?></h4>

+	<p><?php p($l->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.')); ?></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>

-	<?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; ?>

-

-	<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>

\ No newline at end of file

 	<?php if (!empty($_['privacyPolicyUrl'])): ?>

 	<h4><?php p($l->t('Privacy policy')) ?></h4>