Browse Source

Merge pull request #44973 from nextcloud/feat/legal-privacy-links

feat: Add legal notice and privacy policy links to help page
pull/44987/head
Pytal 1 week ago
parent
commit
aa4e0bbcc9
No account linked to committer's email address

+ 11
- 0
apps/settings/lib/Controller/HelpController.php View File

@@ -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\'');

+ 11
- 1
apps/settings/templates/help.php View File

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

+ 1
- 1
lib/private/NavigationManager.php View File

@@ -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'),
]);
}

Loading…
Cancel
Save