diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 63fa12e078..5d8fff3583 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -7,3 +7,5 @@ I am running Firefly III version x.x.x
(please include if this problem also exists on the demo site)
#### Other important details (log files, system info):
+
+Please visit the /debug page to get extra debug information.
\ No newline at end of file
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 0d6b882d65..1b7d02b3b6 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -35,6 +35,7 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Route;
use Illuminate\Support\Collection;
use Log;
+use Monolog\Handler\RotatingFileHandler;
use Preferences;
use Route as RouteFacade;
use Session;
@@ -88,15 +89,36 @@ class HomeController extends Controller
Session::put('end', $end);
}
- public function displayDebug()
+ /**
+ *
+ */
+ public function displayDebug(Request $request)
{
- $phpVersion = PHP_VERSION;
- $now = Carbon::create()->format('Y-m-d H:i:s e');
- $extensions = join(', ', get_loaded_extensions());
- $drivers = join(', ', DB::availableDrivers());
+ $phpVersion = PHP_VERSION;
+ $phpOs = php_uname();
+ $interface = php_sapi_name();
+ $now = Carbon::create()->format('Y-m-d H:i:s e');
+ $extensions = join(', ', get_loaded_extensions());
+ $drivers = join(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName();
+ $userAgent = $request->header('user-agent');
- return view('debug', compact('phpVersion', 'extensions', 'carbon', 'now', 'drivers','currentDriver'));
+ // get latest log file:
+ $logger = Log::getMonolog();
+ $handlers = $logger->getHandlers();
+ $logContent = '';
+ foreach ($handlers as $handler) {
+ if ($handler instanceof RotatingFileHandler) {
+ $logFile = $handler->getUrl();
+ if (!is_null($logFile)) {
+ $logContent = file_get_contents($logFile);
+ }
+ }
+ }
+ // last few lines
+ $logContent = 'Truncated from this point <----|'.substr($logContent, -4096);
+
+ return view('debug', compact('phpVersion', 'extensions', 'carbon', 'now', 'drivers', 'currentDriver', 'userAgent', 'phpOs', 'interface', 'logContent'));
}
diff --git a/resources/views/debug.twig b/resources/views/debug.twig
index 8b548cd753..00c269af81 100644
--- a/resources/views/debug.twig
+++ b/resources/views/debug.twig
@@ -4,22 +4,40 @@
-
- Please copy and paste the content of this textbox into a (new) Github issue. Don't change anything, don't add enters or something.
+
+ If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new
+ or existing Github issue. It will generate a beautiful table that can
+ be used to quickly diagnose your problem.
-
+
+
+
+ You may also share the content of the box below. You can also copy-and-paste this into a new
+ or existing Github issue. However, the content of this
+ box may contain private information such as account names, transaction details or email addresses.
+
+
+