From 620d10c842b2fb06f750e9cd2dca29b5c9227b26 Mon Sep 17 00:00:00 2001
From: "Simon L." <szaimen@e.mail.de>
Date: Fri, 26 Apr 2024 15:52:11 +0200
Subject: feat(exception-template): allow to link to specific documentation for
 how to retreive server log

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 config/config.sample.php           | 5 +++++
 core/templates/exception.php       | 3 +++
 lib/private/legacy/OC_Template.php | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 751d6a5599b..c6fab26665d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -2241,6 +2241,11 @@ $CONFIG = [
  */
 'upgrade.cli-upgrade-link' => '',
 
+/**
+ * Allows to modify the exception server logs documentation link in order to link to a different documentation
+ */
+'documentation_url.server_logs' => '',
+
 /**
  * Set this Nextcloud instance to debugging mode
  *
diff --git a/core/templates/exception.php b/core/templates/exception.php
index ee35510b26f..da64633c3c9 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -25,6 +25,9 @@ function print_exception(Throwable $e, \OCP\IL10N $l): void {
 	<p><?php p($l->t('The server was unable to complete your request.')) ?></p>
 	<p><?php p($l->t('If this happens again, please send the technical details below to the server administrator.')) ?></p>
 	<p><?php p($l->t('More details can be found in the server log.')) ?></p>
+	<?php if (isset($_['serverLogsDocumentation']) && $_['serverLogsDocumentation'] !== ''): ?>
+		<p><a href="<?php print_unescaped($_['serverLogsDocumentation']) ?>" target="_blank" rel="noopener"><?php p($l->t('See this documentation how to retreive them.')) ?></a></p>
+	<?php endif; ?>
 
 	<h3><?php p($l->t('Technical details')) ?></h3>
 	<ul>
diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php
index 545d5a73a63..ad9421913d3 100644
--- a/lib/private/legacy/OC_Template.php
+++ b/lib/private/legacy/OC_Template.php
@@ -306,6 +306,7 @@ class OC_Template extends \OC\Template\Base {
 		http_response_code($statusCode);
 		try {
 			$debug = \OC::$server->getSystemConfig()->getValue('debug', false);
+			$serverLogsDocumentation = \OC::$server->getSystemConfig()->getValue('documentation_url.server_logs', '');
 			$request = \OC::$server->getRequest();
 			$content = new \OC_Template('', 'exception', 'error', false);
 			$content->assign('errorClass', get_class($exception));
@@ -315,6 +316,7 @@ class OC_Template extends \OC\Template\Base {
 			$content->assign('line', $exception->getLine());
 			$content->assign('exception', $exception);
 			$content->assign('debugMode', $debug);
+			$content->assign('serverLogsDocumentation', $serverLogsDocumentation);
 			$content->assign('remoteAddr', $request->getRemoteAddress());
 			$content->assign('requestID', $request->getId());
 			$content->printPage();
-- 
cgit v1.2.3


From cb646b2b8b5fb17a3ae7a635dd7130397e2a7685 Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Mon, 13 May 2024 17:43:57 +0200
Subject: fix: address review

Signed-off-by: Simon L <szaimen@e.mail.de>

Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-Authored-By: Josh <josh.t.richards@gmail.com>
---
 core/templates/exception.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/exception.php b/core/templates/exception.php
index da64633c3c9..f060d475b1f 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -26,7 +26,7 @@ function print_exception(Throwable $e, \OCP\IL10N $l): void {
 	<p><?php p($l->t('If this happens again, please send the technical details below to the server administrator.')) ?></p>
 	<p><?php p($l->t('More details can be found in the server log.')) ?></p>
 	<?php if (isset($_['serverLogsDocumentation']) && $_['serverLogsDocumentation'] !== ''): ?>
-		<p><a href="<?php print_unescaped($_['serverLogsDocumentation']) ?>" target="_blank" rel="noopener"><?php p($l->t('See this documentation how to retreive them.')) ?></a></p>
+		<p><a href="<?php print_unescaped($_['serverLogsDocumentation']) ?>" target="_blank" rel="noopener"><?php p($l->t('For more details see the documentation ↗.')) ?></a></p>
 	<?php endif; ?>
 
 	<h3><?php p($l->t('Technical details')) ?></h3>
-- 
cgit v1.2.3