X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fstarter.php;h=dd07fb6a53e3987893087c44c8405a4975e19236;hb=6dc1ac62cab3d23f017d2dcf4250838ab5e6df51;hp=223ccc01c22c5810f430b5758f3ecaa85c0f7678;hpb=2a157996efd680b87b0a84cc95b91619ea6e81d9;p=shipsimu.git

diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php
index 223ccc0..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
@@ -19,43 +19,41 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 // 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 <strong>%s</strong> kann nicht gestartet werden, da die Hilfsklasse <strong>%s</strong> nicht geladen ist!",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <strong>%s</strong> could not be launched because the helper class <strong>%s</strong> 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 <strong>%s</strong> kann nicht gestartet werden, da die &#39;app&#39; kein Objekt ist!",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <strong>%s</strong> could not be launched because &#39;app&#39; 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 <strong>%s</strong> kann nicht gestartet werden, da die Methode <strong>%s</strong> fehlt!",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <strong>%s</strong> could not be launched because the method <strong>%s</strong> 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 <strong>%s</strong> kann nicht gestartet werden. Grund: <u>%s</u>",
+	ApplicationEntryPoint::app_die(sprintf("[Main:] The application <strong>%s</strong> has been terminated due to a thrown exception: <strong>%s - %s</strong>",
 		$application,
+		$e->__toString(),
 		$e->getMessage()
 	));
 }