aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPytal <24800714+Pytal@users.noreply.github.com>2024-04-23 01:32:31 -0700
committerGitHub <noreply@github.com>2024-04-23 01:32:31 -0700
commitaa4e0bbcc934f53b5bca9b63053fc3078775778c (patch)
treeda2e665a0ade53beb8d99587c62c276c113e2693
parent9872755711590c44d066fb73dc7f638cbf24e3e0 (diff)
parent3082bdc7886616f9e64e2a6ac56380ed3b9bd749 (diff)
downloadnextcloud-server-aa4e0bbcc934f53b5bca9b63053fc3078775778c.tar.gz
nextcloud-server-aa4e0bbcc934f53b5bca9b63053fc3078775778c.zip
Merge pull request #44973 from nextcloud/feat/legal-privacy-links
feat: Add legal notice and privacy policy links to help page
-rw-r--r--apps/settings/lib/Controller/HelpController.php11
-rw-r--r--apps/settings/templates/help.php12
-rw-r--r--lib/private/NavigationManager.php2
3 files changed, 23 insertions, 2 deletions
diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php
index 1a858306502..ff6a55a4490 100644
--- a/apps/settings/lib/Controller/HelpController.php
+++ b/apps/settings/lib/Controller/HelpController.php
@@ -34,6 +34,7 @@ use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\OpenAPI;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IAppConfig;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
@@ -59,6 +60,9 @@ class HelpController extends Controller {
/** @var IConfig */
private $config;
+ /** @var IAppConfig */
+ private $appConfig;
+
public function __construct(
string $appName,
IRequest $request,
@@ -68,6 +72,7 @@ class HelpController extends Controller {
IGroupManager $groupManager,
IL10N $l10n,
IConfig $config,
+ IAppConfig $appConfig,
) {
parent::__construct($appName, $request);
$this->navigationManager = $navigationManager;
@@ -76,6 +81,7 @@ class HelpController extends Controller {
$this->groupManager = $groupManager;
$this->l10n = $l10n;
$this->config = $config;
+ $this->appConfig = $appConfig;
}
/**
@@ -107,6 +113,9 @@ class HelpController extends Controller {
$urlAdminDocs = $this->urlGenerator->linkToDocs('admin');
}
+ $legalNoticeUrl = $this->appConfig->getValueString('theming', 'imprintUrl');
+ $privacyUrl = $this->appConfig->getValueString('theming', 'privacyUrl');
+
$response = new TemplateResponse('settings', 'help', [
'admin' => $this->groupManager->isAdmin($this->userId),
'url' => $documentationUrl,
@@ -115,6 +124,8 @@ class HelpController extends Controller {
'mode' => $mode,
'pageTitle' => $pageTitle,
'knowledgebaseEmbedded' => $knowledgebaseEmbedded,
+ 'legalNoticeUrl' => $legalNoticeUrl,
+ 'privacyUrl' => $privacyUrl,
]);
$policy = new ContentSecurityPolicy();
$policy->addAllowedFrameDomain('\'self\'');
diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php
index 1b912d3d904..68ea36bbde9 100644
--- a/apps/settings/templates/help.php
+++ b/apps/settings/templates/help.php
@@ -56,7 +56,7 @@
<div class="help-wrapper">
<div class="help-content">
<h2 class="help-content__heading">
- <?php p($l->t('Nextcloud help resources')); ?>
+ <?php p($l->t('Nextcloud help & privacy resources')); ?>
</h2>
<div class="help-content__body">
<a class="button" target="_blank" rel="noreferrer noopener"
@@ -73,6 +73,16 @@
<a href="https://help.nextcloud.com" class="button" target="_blank" rel="noreferrer noopener">
<?php p($l->t('Forum')); ?> ↗
</a>
+ <?php if ($_['legalNoticeUrl']) { ?>
+ <a href="<?php print_unescaped($_['legalNoticeUrl']); ?>" class="button" target="_blank" rel="noreferrer noopener">
+ <?php p($l->t('Legal notice')); ?> ↗
+ </a>
+ <?php } ?>
+ <?php if ($_['privacyUrl']) { ?>
+ <a href="<?php print_unescaped($_['privacyUrl']); ?>" class="button" target="_blank" rel="noreferrer noopener">
+ <?php p($l->t('Privacy policy')); ?> ↗
+ </a>
+ <?php } ?>
</div>
</div>
</div>
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index 0ce2b3124b2..7149e254330 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -232,7 +232,7 @@ class NavigationManager implements INavigationManager {
'id' => 'help',
'order' => 99998,
'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
- 'name' => $l->t('Help'),
+ 'name' => $l->t('Help & privacy'),
'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
]);
}