Finishes error reworking.

3 files changed, 90 insertions, 69 deletions

diff --git a/inc/display.php b/inc/display.php
index d7cb3355..ce39197c 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -71,64 +71,6 @@ function createBoardlist($mod=false) {
 	);
 }
 
-function error($message, $priority = true, $debug_stuff = false) {
-	global $board, $mod, $config, $db_error;
-
-	if ($config['syslog'] && $priority !== false) {
-		// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
-		_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
-	}
-	
-	if (defined('STDIN')) {
-		// Running from CLI
-		echo('Error: ' . $message . "\n");
-		debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		die();
-	}
-
-	if ($config['debug']) {
-		$debug_stuff=array();
-		if(isset($db_error)){
-			$debug_stuff = array_combine(array('SQLSTATE', 'Error code', 'Error message'), $db_error);
-		}
-		$debug_stuff['backtrace'] = debug_backtrace();
-		$pw = $config['db']['password'];
-		$debug_callback = function(&$item) use (&$debug_callback, $pw) {
-			if (is_array($item)) {
-				return array_map($item, $debug_callback);
-			}
-			return ($item == $pw ? 'hunter2' : $item);
-		};
-		$debug_stuff = array_map($debug_stuff, $debug_callback);
-	}
-
-	header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
-	
-	// Is there a reason to disable this?
-	if (isset($_POST['json_response'])) {
-		header('Content-Type: text/json; charset=utf-8');
-		$data=array('error'=>$message);
-		if($config['debug']){
-			$data['debug']=$debug_stuff;
-		}
-		print json_encode($data);
-		exit();
-	}
-
-
-	die(Element('page.html', array(
-		'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' => str_replace("\n", '
', utf8tohtml(print_r($debug_stuff, true)))
-		))
-	)));
-}
 
 function loginForm($error=false, $username=false, $redirect=false) {
 	global $config;
diff --git a/inc/error.php b/inc/error.php
new file mode 100644
index 00000000..9452e393
--- /dev/null
+++ b/inc/error.php
@@ -0,0 +1,83 @@
+<?PHP
+
+function error_handler($errno,$errstr,$errfile, $errline, $errcontext){
+	if(error_reporting() & $errno){
+		error($errstr . ' in ' . $errfile . ' at line ' . $errline);
+	}
+	return false;
+}
+
+set_error_handler('error_handler');
+
+function exception_handler(Exception $e){
+	error($e->getMessage());
+}
+
+set_exception_handler('exception_handler');
+
+$error_recursion=false;
+
+function error($message, $priority = true, $debug_stuff = false) {
+	global $board, $mod, $config, $db_error, $error_recursion;
+	if($error_recursion!==false){
+		die("Error recursion detected with " . $message . "<br>Original error:".$error_recursion);
+	}
+	$error_recursion=$message;
+	
+	if(!empty($config)){
+	
+		if ($config['syslog'] && $priority !== false) {
+			// Use LOG_NOTICE instead of LOG_ERR or LOG_WARNING because most error message are not significant.
+			_syslog($priority !== true ? $priority : LOG_NOTICE, $message);
+		}
+
+		if (defined('STDIN')) {
+			// Running from CLI
+			echo('Error: ' . $message . "\n");
+			debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			die();
+		}
+
+		if ($config['debug']) {
+			$debug_stuff=array();
+			if(isset($db_error)){
+				$debug_stuff = array_combine(array('SQLSTATE', 'Error code', 'Error message'), $db_error);
+			}
+			$debug_stuff['backtrace'] = debug_backtrace();
+			$pw = $config['db']['password'];
+			$debug_callback = function(&$item) use (&$debug_callback, $pw) {
+				if (is_array($item)) {
+					return array_map($item, $debug_callback);
+				}
+				return ($item == $pw ? 'hunter2' : $item);
+			};
+			$debug_stuff = array_map($debug_stuff, $debug_callback);
+		}
+	}
+
+	// Is there a reason to disable this?
+	if (isset($_POST['json_response'])) {
+		header('Content-Type: text/json; charset=utf-8');
+		$data=array('error'=>$message);
+		if(!empty($config) && $config['debug']){
+			$data['debug']=$debug_stuff;
+		}
+		print json_encode($data);
+		exit();
+	}
+
+	header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+	
+	die(Element('page.html', array(
+		'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' => str_replace("\n", '&#10;', utf8tohtml(print_r($debug_stuff, true)))
+		))
+	)));
+}
diff --git a/inc/functions.php b/inc/functions.php
index 759e6529..e8beaba2 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -12,7 +12,7 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
 define('TINYBOARD', null);
 
 $microtime_start = microtime(true);
-
+require_once 'inc/error.php';
 require_once 'inc/cache.php';
 require_once 'inc/display.php';
 require_once 'inc/template.php';
@@ -26,11 +26,10 @@ if (!extension_loaded('gettext')) {
 // the user is not currently logged in as a moderator
 $mod = false;
 
-register_shutdown_function('error');
 mb_internal_encoding('UTF-8');
 loadConfig();
 
-function init_locale($locale, $error='error') {
+function init_locale($locale) {
 	if (extension_loaded('gettext')) {
 		if (setlocale(LC_ALL, $locale) === false) {
 			//$error('The specified locale (' . $locale . ') does not exist on your platform!');
@@ -40,7 +39,7 @@ function init_locale($locale, $error='error') {
 		textdomain('tinyboard');
 	} else {
 		if (_setlocale(LC_ALL, $locale) === false) {
-			$error('The specified locale (' . $locale . ') does not exist on your platform!');
+			error('The specified locale (' . $locale . ') does not exist on your platform!');
 		}
 		_bindtextdomain('tinyboard', './inc/locale');
 		_bind_textdomain_codeset('tinyboard', 'UTF-8');
@@ -53,8 +52,6 @@ $current_locale = 'en';
 function loadConfig() {
 	global $board, $config, $__ip, $debug, $__version, $microtime_start, $current_locale, $events;
 
-	$error = function_exists('error') ? 'error' : 'error';
-
 	$boardsuffix = isset($board['uri']) ? $board['uri'] : '';
 
 	if (!isset($_SERVER['REMOTE_ADDR']))
@@ -77,7 +74,7 @@ function loadConfig() {
 
 		if ($config['locale'] != $current_locale) {
                 	$current_locale = $config['locale'];
-                	init_locale($config['locale'], $error);
+                	init_locale($config['locale']);
         	}
 	}
 	else {
@@ -118,7 +115,7 @@ function loadConfig() {
 		}
 
 		if (!file_exists('inc/instance-config.php'))
-			$error('Tinyboard is not configured! Create inc/instance-config.php.');
+			error('Tinyboard is not configured! Create inc/instance-config.php.');
 
 		// Initialize locale as early as possible
 
@@ -148,7 +145,7 @@ function loadConfig() {
 
 		if ($config['locale'] != $current_locale) {
 			$current_locale = $config['locale'];
-			init_locale($config['locale'], $error);
+			init_locale($config['locale']);
 		}
 
 		require 'inc/config.php';
@@ -161,7 +158,7 @@ function loadConfig() {
 
 		if ($config['locale'] != $current_locale) {
 			$current_locale = $config['locale'];
-			init_locale($config['locale'], $error);
+			init_locale($config['locale']);
 		}
 
 		if (!isset($config['global_message']))
@@ -271,7 +268,6 @@ function loadConfig() {
 		$_SERVER['REMOTE_ADDR'] = $m[2];
 
 	if ($config['verbose_errors']) {
-		set_error_handler('error');
 		error_reporting(E_ALL);
 		ini_set('display_errors', true);
 		ini_set('html_errors', false);