Used exit() (also app_die()->app_exit()) because die() is an alias of exit nowadays

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 76c890825e89be3455f2ff2b0216bc090a6bb146..da54f83abacc82a7339912022a82e635adaaf7d9 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -1316,7 +1316,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                );
 
                // Output it
-               ApplicationEntryPoint::app_die(sprintf("<div class=\"debug_header\">%s debug output:</div><div class=\"debug_content\">%s</div>\nLoaded includes: <div class=\"debug_include_list\">%s</div>",
+               ApplicationEntryPoint::app_exit(sprintf("<div class=\"debug_header\">%s debug output:</div><div class=\"debug_content\">%s</div>\nLoaded includes: <div class=\"debug_include_list\">%s</div>",
                        $this->__toString(),
                        $content,
                        ClassLoader::getSelfInstance()->getPrintableIncludeList()
@@ -1419,7 +1419,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        $debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_class'));
                } catch (NullPointerException $e) {
                        // Didn't work, no instance there
-                       die('Cannot create debugInstance! Exception=' . $e->__toString() . ', message=' . $e->getMessage());
+                       exit('Cannot create debugInstance! Exception=' . $e->__toString() . ', message=' . $e->getMessage());
                }
 
                // Empty string should be ignored and used for testing the middleware
@@ -1431,8 +1431,8 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
        /**
         * Outputs a debug message whether to debug instance (should be set!) or
-        * dies with or ptints the message. Do NEVER EVER rewrite the die() call to
-        * ApplicationEntryPoint::app_die(), this would cause an endless loop.
+        * dies with or ptints the message. Do NEVER EVER rewrite the exit() call to
+        * ApplicationEntryPoint::app_exit(), this would cause an endless loop.
         *
         * @param       $message        Message we shall send out...
         * @param       $doPrint        Whether print or die here (default: print)
@@ -1458,7 +1458,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
                        if ($doPrint === false) {
                                // Die here if not printed
-                               die();
+                               exit();
                        } // END - if
                } else {
                        // Are debug times enabled?
@@ -1473,7 +1473,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                                print($message . chr(10));
                        } else {
                                // Die here
-                               die($message);
+                               exit($message);
                        }
                }
        }

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index c41bdcb786e02b589ae780f018a20c74bf290f54..69672112211647fcb77c454f12bc82e2f81b0952 100644 (file)
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -64,7 +64,7 @@ class BaseMenu extends BaseFrameworkSystem {
 
                // Render it here
                $this->getTemplateInstance()->renderXmlContent($menuContent);
-               //die(__METHOD__ . ':!OK');
+               //exit(__METHOD__ . ':!OK');
        }
 
        /**

diff --git a/inc/classes/main/parser/xml/class_XmlParser.php b/inc/classes/main/parser/xml/class_XmlParser.php
index 3394a85ae13d75faab0acd1316edfa4ab50fb510..d8cf17a68e9309b408e7efc5757d121aa43fccb1 100644 (file)
--- a/inc/classes/main/parser/xml/class_XmlParser.php
+++ b/inc/classes/main/parser/xml/class_XmlParser.php
@@ -68,7 +68,7 @@ class XmlParser extends BaseParser implements Parseable {
                        self::createDebugInstance(__CLASS__)->debugOutput('Empty content! Backtrace: <pre>');
                        debug_print_backtrace();
                        self::createDebugInstance(__CLASS__)->debugOutput('</pre>');
-                       die();
+                       exit();
                } elseif (function_exists('recode')) {
                        // Recode found, so use it
                        $content = recode('html..utf8', $content);
@@ -102,7 +102,7 @@ class XmlParser extends BaseParser implements Parseable {
                // Now parse the XML tree
                if (!xml_parse($xmlParser, $content)) {
                        // Error found in XML!
-                       //* DEBUG: */ die(__METHOD__ . ':<pre>'.htmlentities($content).'</pre>');
+                       //* DEBUG: */ exit(__METHOD__ . ':<pre>'.htmlentities($content).'</pre>');
                        throw new XmlParserException(array($this, $xmlParser), self::EXCEPTION_XML_PARSER_ERROR);
                } // END - if
 

diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php
index 2692af52db42daf6505fcf1e8c4f264e53c98c3e..b143aebed5c3ba38e5d86954d904bf207727188b 100644 (file)
--- a/inc/classes/main/template/class_BaseTemplateEngine.php
+++ b/inc/classes/main/template/class_BaseTemplateEngine.php
@@ -1025,7 +1025,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                $this->assignVariable($var, $varMatches[3][$key]);
                        } elseif (!empty($varMatches[2][$key])) {
                                // @TODO Non-string found so we need some deeper analysis...
-                               ApplicationEntryPoint::app_die('Deeper analysis not yet implemented!');
+                               ApplicationEntryPoint::app_exit('Deeper analysis not yet implemented!');
                        }
                } // END - foreach
        }

diff --git a/inc/classes/third_party/api/wernisportal/class_WernisApi.php b/inc/classes/third_party/api/wernisportal/class_WernisApi.php
index 77f88e65a19a0ed5dcda0fd204fc12b85230d784..d2e105488c8b40ca83ce8e40e09223de992a9106 100644 (file)
--- a/inc/classes/third_party/api/wernisportal/class_WernisApi.php
+++ b/inc/classes/third_party/api/wernisportal/class_WernisApi.php
@@ -142,7 +142,7 @@ class WernisApi extends BaseFrameworkSystem {
                global $_CONFIG;
                include "templates/zurueck.html";
                include "templates/fuss.html";
-               die();
+               exit();
        }
 
        // Fehlermeldung ausgeben und beenden

diff --git a/inc/database.php b/inc/database.php
index 6f454a69cb2624730d87249525f525a1e539db44..f56baa3a4a329d08110bcc53909dadc3b80217da 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -36,7 +36,7 @@ if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
        require($fqfn);
 } else {
        // Layer is missing!
-       ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",
+       ApplicationEntryPoint::app_exit(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",
                FrameworkConfiguration::getSelfInstance()->getConfigEntry('db_type')
        ));
 }

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 4b46ffa801f5e09e629cba3453051b23dcbc0300..2de06ca2fc86abfaf9fa964aa453598b4bc84039 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -271,7 +271,7 @@ class ClassLoader {
                // If the basePath is false it is invalid
                if ($basePath2 === false) {
                        /* @todo: Do not die here. */
-                       die(__METHOD__ . ':Cannot read ' . $basePath . ' !');
+                       exit(__METHOD__ . ':Cannot read ' . $basePath . ' !');
                } else {
                        // Set base path
                        $basePath = $basePath2;