X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fstarter.php;h=dd07fb6a53e3987893087c44c8405a4975e19236;hb=6dc1ac62cab3d23f017d2dcf4250838ab5e6df51;hp=458ccf8fdcfaf5fe675b25b55f8342f83c2c2c90;hpb=b912eda46059527fc0475e043944c3ebff47fbcd;p=shipsimu.git
diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php
index 458ccf8..dd07fb6 100644
--- a/application/ship-simu/starter.php
+++ b/application/ship-simu/starter.php
@@ -6,7 +6,7 @@
* @version 0.0.0
* @copyright Copyright(c) 2007, 2008 Roland Haeder, this is free software
* @license GNU GPL 3.0 or any newer version
- * @link http://www.ship-simu.org
+ * @link http://www.ship-simu.org
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -24,38 +24,36 @@
// Is there an application helper instance? We need the method main() for
// maining the application
-$app = ApplicationHelper::getInstance();
+$app = call_user_func_array(array(FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), "getInstance"), array());
// Some sanity checks
if ((empty($app)) || (is_null($app))) {
// Something went wrong!
- ApplicationEntryPoint::app_die(sprintf("[Main:] Die Applikation %s kann nicht gestartet werden, da die Hilfsklasse %s nicht geladen ist!",
+ ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the helper class %s is not loaded.",
$application,
- FrameworkConfiguration::getInstance()->readConfig("app_helper_class")
+ FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
));
} elseif (!is_object($app)) {
// No object!
- ApplicationEntryPoint::app_die(sprintf("[Main:] Die Applikation %s kann nicht gestartet werden, da die 'app' kein Objekt ist!",
+ ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because 'app' is not an object.",
$application
));
-} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig("entry_method"))) {
+} elseif (!method_exists($app, FrameworkConfiguration::getInstance()->readConfig('entry_method'))) {
// Method not found!
- ApplicationEntryPoint::app_die(sprintf("[Main:] Die Applikation %s kann nicht gestartet werden, da die Methode %s fehlt!",
+ ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s could not be launched because the method %s is missing.",
$application,
- FrameworkConfiguration::getInstance()->readConfig("entry_method")
+ FrameworkConfiguration::getInstance()->readConfig('entry_method')
));
}
// Call the entry point method
try {
- $eval = sprintf("%s::getInstance()->%s();",
- FrameworkConfiguration::getInstance()->readConfig("app_helper_class"),
- FrameworkConfiguration::getInstance()->readConfig("entry_method")
- );
- eval($eval);
+ // Call user function
+ call_user_func_array(array($app, FrameworkConfiguration::getInstance()->readConfig('entry_method')), array());
} catch (FrameworkException $e) {
- ApplicationEntryPoint::app_die(sprintf("[Main:] Die Applikation %s kann nicht gestartet werden. Grund: %s",
+ ApplicationEntryPoint::app_die(sprintf("[Main:] The application %s has been terminated due to a thrown exception: %s - %s",
$application,
+ $e->__toString(),
$e->getMessage()
));
}