From 3568fd9dcbdc96215c760ac7850749668446fc2d Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sun, 15 Nov 2020 15:12:15 +0100
Subject: [PATCH] Added a "error info copy & paste" text box on the 500 error
 page

---
 changelog/60_UNRELEASED_2020-xx-xx.md |  1 +
 localization/strings.pot              |  3 +++
 views/errors/base.blade.php           | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/changelog/60_UNRELEASED_2020-xx-xx.md b/changelog/60_UNRELEASED_2020-xx-xx.md
index a80c6247..6297038c 100644
--- a/changelog/60_UNRELEASED_2020-xx-xx.md
+++ b/changelog/60_UNRELEASED_2020-xx-xx.md
@@ -128,6 +128,7 @@ _- (Because the stock quantity unit is now the base for everything, it cannot be
 - Replaced (again, added before in v2.7.0, then reverted in v2.7.1 due to some problems) [QuaggaJS](https://github.com/serratus/quaggaJS) (seems to be unmaintained) by [Quagga2](https://github.com/ericblade/quagga2)
 - More `config.php` settings (see the section `Component configuration for Quagga2`) to tweak Quagga2 (this is the component used for device camera for barcode scanning) (thanks @andrelam)
 - Some localization string fixes (thanks @duckfullstop)
+- Better error pages
 - Fixed that XSS / HTML injection was possible through some user input fields (low severity / not really a problem as this could not be abused unauthenticated)
 - New translations: (thanks all the translators)
   - Greek (demo available at https://el.demo.grocy.info)
diff --git a/localization/strings.pot b/localization/strings.pot
index a52519ae..f1e0c19f 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1796,6 +1796,9 @@ msgstr ""
 msgid "Stack trace"
 msgstr ""
 
+msgid "Easy error info copy & paste (for reporting)"
+msgstr ""
+
 msgid "This page does not exist"
 msgstr ""
 
diff --git a/views/errors/base.blade.php b/views/errors/base.blade.php
index 99b078df..6e551f69 100644
--- a/views/errors/base.blade.php
+++ b/views/errors/base.blade.php
@@ -15,6 +15,26 @@
 			<h4>{{ $__t('Stack trace') }}</h4>
 			<pre class="my-0"><code>{!! $exception->getTraceAsString() !!}</code></pre>
 		</div>
+		<div class="alert alert-dark py-1">
+			<h4>{{ $__t('Easy error info copy & paste (for reporting)') }}</h4>
+			<textarea class="form-control easy-link-copy-textbox text-monospace mt-1"
+				rows="20">
+Error source:
+```
+{!! $exception->getFile() !!}:{!! $exception->getLine() !!}
+```
+
+Error message:
+```
+{!! $exception->getMessage() !!}
+```
+
+Stack trace:
+```
+{!! $exception->getTraceAsString() !!}
+```
+			</textarea>
+		</div>
 	</div>
 </div>
 @stop