From 41370350f2c4c811cf04b72c44e34318feb2bbbf Mon Sep 17 00:00:00 2001
From: Konstantin Myakshin <molodchick@gmail.com>
Date: Fri, 15 Sep 2023 18:08:12 +0300
Subject: Make logo in header clickable in the shared file view

Signed-off-by: Konstantin Myakshin <molodchick@gmail.com>
---
 core/templates/layout.public.php | 14 +++++++++++---
 lib/private/TemplateLayout.php   |  4 ++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index e5329716cc7..eef140a1cd5 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -38,14 +38,22 @@ p($theme->getTitle());
 
 	<header id="header">
 		<div class="header-left">
-			<div class="logo logo-icon svg"></div>
-			<span id="nextcloud" class="header-appname">
+			<div id="nextcloud" class="header-appname">
+				<?php if ($_['logoUrl']): ?>
+					<a href="<?php print_unescaped($_['logoUrl']); ?>"
+					   aria-label="<?php p($l->t('Go to %s', [$_['logoUrl']])); ?>">
+						<div class="logo logo-icon"></div>
+					</a>
+				<?php else: ?>
+					<div class="logo logo-icon"></div>
+				<?php endif; ?>
+
 				<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
 					<?php p($template->getHeaderTitle()); ?>
 				<?php } else { ?>
 					<?php	p($theme->getName()); ?>
 				<?php } ?>
-			</span>
+			</div>
 			<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
 				<div class="header-shared-by">
 					<?php p($template->getHeaderDetails()); ?>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index cefa1f30876..e2504363257 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -189,6 +189,10 @@ class TemplateLayout extends \OC_Template {
 			$this->assign('appid', $appId);
 			$this->assign('bodyid', 'body-public');
 
+			// Set logo link target
+			$logoUrl = $this->config->getSystemValueString('logo_url', '');
+			$this->assign('logoUrl', $logoUrl);
+
 			/** @var IRegistry $subscription */
 			$subscription = \OCP\Server::get(IRegistry::class);
 			$showSimpleSignup = $this->config->getSystemValueBool('simpleSignUpLink.shown', true);
-- 
cgit v1.2.3