From 28d3cac317177d3072ba214bdfa4bd8328932a0d Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 4 Oct 2013 18:54:10 +0000
Subject: [PATCH] Die with internal server error on misconfiguration
Or internal server (database) outage
---
main.inc.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/main.inc.php b/main.inc.php
index 9dd64e4e1..ff0044d43 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -95,14 +95,16 @@
elseif(file_exists(ROOT_DIR.'setup/'))
header('Location: '.ROOT_PATH.'setup/');
- if(!$configfile || !file_exists($configfile)) die('<b>Error loading settings. Contact admin.</b>');
+ if(!$configfile || !file_exists($configfile))
+ Http::response(500, '<b>Error loading settings. Contact admin.</b>');
require($configfile);
define('CONFIG_FILE',$configfile); //used in admin.php to check perm.
//Die if root path is not defined
if(!defined('ROOT_PATH') || !ROOT_PATH)
- die("<b>Fatal Error:</b> unknown root path. Define it in your 'ost-config.php'");
+ Http::response(500, "<b>Fatal Error:</b> unknown root path. Define
+ it in your 'ost-config.php'");
//Path separator
if(!defined('PATH_SEPARATOR')){
@@ -228,8 +230,7 @@
$msg=$ferror."\n\n".THISPAGE;
Mailer::sendmail(ADMIN_EMAIL, 'osTicket Fatal Error', $msg, sprintf('"osTicket Alerts"<%s>', ADMIN_EMAIL));
//Display generic error to the user
- die("<b>Fatal Error:</b> Contact system administrator.");
- exit;
+ Http::response(500, "<b>Fatal Error:</b> Contact system administrator.");
}
//Init
--
GitLab