Correctly detect amount of files in /var/crash

2 files changed, 15 insertions, 5 deletions

diff --git a/usr/local/www/crash_reporter.php b/usr/local/www/crash_reporter.php
index 9ac0eaa..2dd9a50 100755
--- a/usr/local/www/crash_reporter.php
+++ b/usr/local/www/crash_reporter.php
@@ -69,11 +69,11 @@ function output_crash_reporter_html($crash_reports) {
 	echo "<strong>" . gettext("Would you like to submit the crash debug logs to the pfSense developers for inspection?") . "</strong></p>";
 	echo "<p>";
 	echo gettext("Contents of crash reports") . ":<br/>";
-	echo "<textarea rows='60' cols='65' name='crashreports'>{$crash_reports}</textarea>";
+	echo "<textarea rows='40' cols='65' name='crashreports'>{$crash_reports}</textarea>";
+	echo "<p/>";
+	echo "<input name=\"Submit\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("Yes") .  "\">";
+	echo "<input name=\"Submit\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("No") .  "\">";
 	echo "<p/>";
-	echo "<input name=\"Submit\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("Yes") .  ">";
-	echo "<input name=\"Submit\" type=\"submit\" class=\"formbtn\" value=\"" . gettext("No") .  ">";
-	echo "</p>";
 	echo "</form>";
 }
 
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 1ea8e5b..30c369d 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -43,8 +43,18 @@
 ##|-PRIV
 
 $crash = glob("/var/crash/*");
+$x = 0;
 if(is_array($crash)) {
-	if(count($crash) > 0) {
+	foreach($crash as $c) {
+		if($c == ".")
+			continue;
+		if($c == "..")
+			continue;
+		if($c == "")
+			continue;
+		$x++;
+	}
+	if($x > 0) {
 		Header("Location: /crash_reporter.php");
 		exit;
 	}