From 6238c6d4b3dc2310eb82bd037d356d9054af0339 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 7 Aug 2012 00:56:09 +0000
Subject: [PATCH] Used exit() instead of die()
---
application/mailer/exceptions.php | 4 ++--
application/mailer/starter.php | 6 +++---
index.php | 18 +++++++++---------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/application/mailer/exceptions.php b/application/mailer/exceptions.php
index 7ba368c8a3..cac8db71b5 100644
--- a/application/mailer/exceptions.php
+++ b/application/mailer/exceptions.php
@@ -24,8 +24,8 @@
// Our own exception handler
function __exceptionHandler (FrameworkException $e) {
- // Call the app_die() method
- ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
+ // Call the app_exit() method
+ ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> (<span class=\"app_short_name\">%s</span>) has terminated due to a thrown exception: <span class=\"exception_name\">%s</span> <span class=\"exception_number\">[%s]</span>: <span class=\"debug_exception\">%s</span> Backtrace: <div class=\"debug_backtrace\">%s</div>",
ApplicationHelper::getSelfInstance()->getAppName(),
ApplicationHelper::getSelfInstance()->getAppShortName(),
$e->__toString(),
diff --git a/application/mailer/starter.php b/application/mailer/starter.php
index 597a6a32b4..c39a64858d 100644
--- a/application/mailer/starter.php
+++ b/application/mailer/starter.php
@@ -29,18 +29,18 @@ $app = call_user_func_array(array(FrameworkConfiguration::getSelfInstance()->get
// Some sanity checks
if ((empty($app)) || (is_null($app))) {
// Something went wrong!
- ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
+ ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the helper class <span class=\"class_name\">%s</span> is not loaded.",
$application,
FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class')
));
} elseif (!is_object($app)) {
// No object!
- ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because 'app' is not an object.",
+ ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because 'app' is not an object.",
$application
));
} elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) {
// Method not found!
- ApplicationEntryPoint::app_die(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
+ ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
$application,
FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')
));
diff --git a/index.php b/index.php
index 66a45e537d..a14e71b0b5 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
@@ -41,7 +41,7 @@ final class ApplicationEntryPoint {
'debug', // Debug output
'db', // Database layer
'io', // Base I/O system (local file [or network])
- 'engine', // Template engine ( for ApplicationEntryPoint::app_die() )
+ 'engine', // Template engine ( for ApplicationEntryPoint::app_exit() )
'lang', // Language sub-system
'app', // The ApplicationHelper instance
);
@@ -52,15 +52,15 @@ final class ApplicationEntryPoint {
* @param $message The optional message we shall output on exit
* @param $code Error code from exception
* @param $extraData Extra information from exceptions
- * @param $silentMode Wether not silent mode is turned on
+ * @param $silentMode Whether silent mode is turned on
* @return void
* @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper
*/
- public static final function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
+ public static final function app_exit ($message = '', $code = false, $extraData = '', $silentMode = false) {
// Is this method already called?
if (isset($GLOBALS['app_die_called'])) {
// Then output the text directly
- die($message);
+ exit($message);
} // END - if
// This method shall not be called twice
@@ -78,7 +78,7 @@ final class ApplicationEntryPoint {
// Do we have debug installation?
if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
// Abort here
- die();
+ exit();
} // END - if
// Get some instances
@@ -98,7 +98,7 @@ final class ApplicationEntryPoint {
// Get the template instance from our object factory
$templateInstance = ObjectFactory::createObjectByName($tpl);
} catch (FrameworkException $e) {
- die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
+ exit(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
$e->getMessage()
));
}
@@ -166,14 +166,14 @@ final class ApplicationEntryPoint {
$responseInstance->flushBuffer();
} catch (FileIoException $e) {
// Even the template 'emergency_exit' wasn't found so output both message
- die($message . ', exception: ' . $e->getMessage());
+ exit($message . ', exception: ' . $e->getMessage());
}
// Good bye...
exit();
} else {
// Output message and die
- die(sprintf("[Main:] Emergency exit reached: <span class=\"emergency_span\">%s</span>",
+ exit(sprintf("[Main:] Emergency exit reached: <span class=\"emergency_span\">%s</span>",
$message
));
}
--
2.39.5