From fd370c5712ca35d21b7aeda0fb2b551fa2607c47 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 3 Mar 2015 07:21:25 +0000
Subject: [PATCH] crash_reporter: tweak the error reporting

* add E_PARSE to show proper info about parse errors
* remove PHP 5.5 support, we've never shipped it
* fix textarea display width and disable send button
---
 src/etc/rc.php_ini_setup   | 5 +----
 src/www/crash_reporter.php | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index 3bbf6fa50..d6b6f61fa 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -31,9 +31,6 @@ PLATFORM=`/bin/cat /usr/local/etc/platform`
 if [ -d /usr/local/lib/php/20131226 ]; then
 	# PHP 5.6
 	EXTENSIONSDIR="/usr/local/lib/php/20131226/"
-elif [ -d /usr/local/lib/php/20121212 ]; then
-	# PHP 5.5
-	EXTENSIONSDIR="/usr/local/lib/php/20121212/"
 else
 	echo "No supported PHP version was found."
 	exit 1
@@ -135,7 +132,7 @@ zlib.output_compression = Off
 zlib.output_compression_level = 1
 include_path = ".:/usr/local/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg:/usr/local/opnsense/mvc:/usr/local/share/pear"
 display_startup_errors=on
-error_reporting = E_ERROR
+error_reporting = E_ERROR | E_PARSE
 display_errors=on
 log_errors=on
 error_log=/tmp/PHP_errors.log
diff --git a/src/www/crash_reporter.php b/src/www/crash_reporter.php
index 403a66570..1f2331c77 100644
--- a/src/www/crash_reporter.php
+++ b/src/www/crash_reporter.php
@@ -57,8 +57,8 @@ function output_crash_reporter_html($crash_reports) {
 	echo "<p>" . gettext("Would you like to submit the programming debug logs to the OPNsense developers for inspection?") . "</p>";
 	echo "<p><i>" . gettext("Please double check the contents to ensure you are comfortable sending this information before clicking Yes.") . "</i></p>";
 	echo "<p>" . gettext("Contents of crash reports") . ":<br />";
-	echo "<textarea readonly=\"readonly\" rows=\"40\" cols=\"65\" name=\"crashreports\">{$crash_reports}</textarea></p>";
-	echo "<p><input name=\"Submit\" type=\"submit\" class=\"btn btn-primary\" value=\"" . gettext("Yes") .  "\" />" . gettext(" - Submit this to the developers for inspection") . "</p>";
+	echo "<textarea readonly=\"readonly\" style=\"max-width: none;\" rows=\"24\" cols=\"80\" name=\"crashreports\">{$crash_reports}</textarea></p>";
+	echo "<p><input disabled=\"disabled\" name=\"Submit\" type=\"submit\" class=\"btn btn-primary\" value=\"" . gettext("Yes") .  "\" />" . gettext(" - Submit this to the developers for inspection") . "</p>";
 	echo "<p><input name=\"Submit\" type=\"submit\" class=\"btn btn-primary\" value=\"" . gettext("No") .  "\" />" . gettext(" - Just delete the crash report and take me back to the Dashboard") . "</p>";
 	echo "</form>";
 }