diff --git a/apps/settings/lib/Controller/HelpController.php b/apps/settings/lib/Controller/HelpController.php index 1a85830650204..ff6a55a449064 100644 --- a/apps/settings/lib/Controller/HelpController.php +++ b/apps/settings/lib/Controller/HelpController.php @@ -34,6 +34,7 @@ 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 @@ public function __construct( IGroupManager $groupManager, IL10N $l10n, IConfig $config, + IAppConfig $appConfig, ) { parent::__construct($appName, $request); $this->navigationManager = $navigationManager; @@ -76,6 +81,7 @@ public function __construct( $this->groupManager = $groupManager; $this->l10n = $l10n; $this->config = $config; + $this->appConfig = $appConfig; } /** @@ -107,6 +113,9 @@ public function help(string $mode = 'user'): TemplateResponse { $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 @@ public function help(string $mode = 'user'): TemplateResponse { '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 1b912d3d9044c..68ea36bbde924 100644 --- a/apps/settings/templates/help.php +++ b/apps/settings/templates/help.php @@ -56,7 +56,7 @@

- t('Nextcloud help resources')); ?> + t('Nextcloud help & privacy resources')); ?>

diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php index 0ce2b3124b29b..7149e25433067 100644 --- a/lib/private/NavigationManager.php +++ b/lib/private/NavigationManager.php @@ -232,7 +232,7 @@ private function init() { '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'), ]); }