Rewrite of initInstance(), more eval() rewritten to call_user_func_array()

[shipsimu.git] / index.php

diff --git a/index.php b/index.php
index 8dd613285f43e9be1f2d36727d2c0e47c6cbf897..b133cc80204fd30628b2cbc3396061591387735d 100644 (file)
--- a/index.php
+++ b/index.php
@@ -75,27 +75,22 @@ class ApplicationEntryPoint {
                if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {

-                               $eval = sprintf("\$tplEngine = %s::create%s(\"%s%s\", \$lang, \$io);",
-                                       FrameworkConfiguration::getInstance()->readConfig('tpl_engine'),
-                                       FrameworkConfiguration::getInstance()->readConfig('tpl_engine'),
-                                       PATH,
-                                       FrameworkConfiguration::getInstance()->readConfig('tpl_base_path')
-                               );
-                               eval($eval);
+                               // Get the template instance from our object factory
+                               $tplEngine = ObjectFactory::createObjectByConfiguredName('tpl_engine', array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));

                        } catch (BasePathIsEmptyException $e) {
                        } catch (BasePathIsEmptyException $e) {

-                               die(sprintf("[Main:] Die Template-Engine konnte nicht initialisieren. Grund: <strong>%s</strong>",
+                               die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",

                                        $e->getMessage()
                                ));
                        } catch (InvalidBasePathStringException $e) {
                                        $e->getMessage()
                                ));
                        } catch (InvalidBasePathStringException $e) {

-                               die(sprintf("[Main:] Die Template-Engine konnte nicht initialisieren. Grund: <strong>%s</strong>",
+                               die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",

                                        $e->getMessage()
                                ));
                        } catch (BasePathIsNoDirectoryException $e) {
                                        $e->getMessage()
                                ));
                        } catch (BasePathIsNoDirectoryException $e) {

-                               die(sprintf("[Main:] Die Template-Engine konnte nicht initialisieren. Grund: <strong>%s</strong>",
+                               die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",

                                        $e->getMessage()
                                ));
                        } catch (BasePathReadProtectedException $e) {
                                        $e->getMessage()
                                ));
                        } catch (BasePathReadProtectedException $e) {

-                               die(sprintf("[Main:] Die Template-Engine konnte nicht initialisieren. Grund: <strong>%s</strong>",
+                               die(sprintf("[Main:] Could not initialize template engine for this reason: <strong>%s</strong>",

                                        $e->getMessage()
                                ));
                        }
                                        $e->getMessage()
                                ));
                        }


@@ -113,6 +108,7 @@ class ApplicationEntryPoint {
                        // Assign variables
                        $tplEngine->assignVariable('message', $message);
                        $tplEngine->assignVariable('backtrace', $backtrace);
                        // Assign variables
                        $tplEngine->assignVariable('message', $message);
                        $tplEngine->assignVariable('backtrace', $backtrace);

+                       $tplEngine->assignVariable('total_objects', ObjectFactory::getTotal());

 
                        // Load the template
                        $tplEngine->loadCodeTemplate('emergency_exit');
 
                        // Load the template
                        $tplEngine->loadCodeTemplate('emergency_exit');