diff --git a/src/ajax.php b/src/ajax.php index 3a8d3ad..18eb4a6 100644 --- a/src/ajax.php +++ b/src/ajax.php @@ -803,16 +803,12 @@ function myExceptionHandler($e) { if(-1 == $e->getCode()) { //thrown in myErrorHandler - error_log($e->getMessage()); - echo $e->getMessage()."\n". $e->getTraceAsString(); - exit; + die2($e->getMessage()."\n". $e->getTraceAsString(), $e->getMessage()); } - error_log('Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine()); - echo 'Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine(); //."\n". $e->getTraceAsString(); + die2('Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine()); } catch(Exception $e) { - error_log('Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine()); - echo 'Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine(); + die2('Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine()); } exit; } diff --git a/src/init.php b/src/init.php index 0b0346d..550f46a 100644 --- a/src/init.php +++ b/src/init.php @@ -27,7 +27,7 @@ if(Config::get('db') == 'mysql') $db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db')); } catch(Exception $e) { - die("Failed to connect to mysql database: ". $e->getMessage()); + die2("Failed to connect to mysql database: ". $e->getMessage()); } $db->dq("SET NAMES utf8"); } @@ -163,4 +163,11 @@ function jsonExit($data) exit; } +function die2($userText, $errText = null) +{ + $errText === null ? error_log($userText) : error_log($errText); + echo $userText; + exit(1); +} + ?> \ No newline at end of file