From 1d37e81adeea9b2a1bc1028f2bf45b47ac045ec4 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sat, 3 Aug 2013 00:22:28 -0400
Subject: Better error handling/displaying with $config['debug'] and
 $config['verbose_errors']

---
 inc/display.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'inc/display.php')

diff --git a/inc/display.php b/inc/display.php
index 7c2665e1..4972d563 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -57,7 +57,7 @@ function createBoardlist($mod=false) {
 	);
 }
 
-function error($message, $priority = true) {
+function error($message, $priority = true, $debug_stuff = false) {
 	global $board, $mod, $config;
 	
 	if ($config['syslog'] && $priority !== false) {
@@ -71,16 +71,16 @@ function error($message, $priority = true) {
 	}
 	
 	die(Element('page.html', array(
-		'config'=>$config,
-		'title'=>_('Error'),
-		'subtitle'=>_('An error has occured.'),
-		'body'=>'<center>' .
-		        '<h2>' . _($message) . '</h2>' .
-			(isset($board) ? 
-				"<p><a href=\"" . $config['root'] .
-					($mod ? $config['file_mod'] . '?/' : '') .
-					$board['dir'] . $config['file_index'] . "\">"._("Go back")."</a>.</p>" : '') .
-		        '</center>'
+		'config' => $config,
+		'title' => _('Error'),
+		'subtitle' => _('An error has occured.'),
+		'body' => Element('error.html', array(
+			'config' => $config,
+			'message' => $message,
+			'mod' => $mod,
+			'board' => isset($board) ? $board : false,
+			'debug' => is_array($debug_stuff) ? str_replace("\n", '&#10;', utf8tohtml(print_r($debug_stuff, true))) : utf8tohtml($debug_stuff)
+		))
 	)));
 }
 
-- 
cgit v1.3