Used exit() instead of die()

diff --git a/application/mailer/exceptions.php b/application/mailer/exceptions.php
index 7ba368c8a3cad157b71be6912cdaa337cc64ede0..cac8db71b50426aa264bd94eee651b0acf1d9ca7 100644 (file)
--- a/application/mailer/exceptions.php
+++ b/application/mailer/exceptions.php
@@ -24,8 +24,8 @@
 
 // Our own exception handler
 function __exceptionHandler (FrameworkException $e) {
 
 // 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(),
                ApplicationHelper::getSelfInstance()->getAppName(),
                ApplicationHelper::getSelfInstance()->getAppShortName(),
                $e->__toString(),

diff --git a/application/mailer/starter.php b/application/mailer/starter.php
index 597a6a32b447dce34969a936c0ff2b61c8d251c3..c39a64858d8cc4687bef8f4d0ba77fa59f2a18d0 100644 (file)
--- 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!
 // 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!
                $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 &#39;app&#39; is not an object.",
+       ApplicationEntryPoint::app_exit(sprintf("[Main:] The application <span class=\"app_name\">%s</span> could not be launched because &#39;app&#39; is not an object.",

                $application
        ));
 } elseif (!method_exists($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method'))) {
        // Method not found!
                $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')
        ));
                $application,
                FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')
        ));

diff --git a/index.php b/index.php
index 66a45e537db557b1c3bb771a5bb1828b1207d247..a14e71b0b5f8275639eb7a3ad1ef652288a9d34a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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
  *
  * @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])
                '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
        );
                '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       $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
         */
         * @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
                // 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
                } // 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
                // Do we have debug installation?
                if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
                        // Abort here

-                       die();
+                       exit();

                } // END - if
 
                // Get some instances
                } // 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) {
                                // 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()
                                ));
                        }
                                        $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
                                $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
                        }
 
                        // 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
                        ));
                }
                                $message
                        ));
                }