X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=application%2Fship-simu%2Fstarter.php;h=30280b533cf3be03e812b7f551c5ae18e4e9e8c2;hp=137ebbc1b6bca856be0e1ae68e680da628c21c20;hb=d3ac3088a75edd47f1b2a6f635fe2116129ecfd5;hpb=1d128d8532290e84885d09d2d3f0060abd08e49e;ds=sidebyside

diff --git a/application/ship-simu/starter.php b/application/ship-simu/starter.php
index 137ebbc..30280b5 100644
--- a/application/ship-simu/starter.php
+++ b/application/ship-simu/starter.php
@@ -4,9 +4,9 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @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,42 +24,30 @@
 
 // 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::getSelfInstance()->getConfigEntry('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 <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::getInstance()->readConfig("app_helper_class")
+		FrameworkConfiguration::getSelfInstance()->getConfigEntry('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 <span class=\"app_name\">%s</span> 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::getSelfInstance()->getConfigEntry('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 <span class=\"app_name\">%s</span> could not be launched because the method <span class=\"method_name\">%s</span> is missing.",
 		$application,
-		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);
-} catch (FrameworkException  $e) {
-	ApplicationEntryPoint::app_die(sprintf("[Main:] Die Applikation <strong>%s</strong> kann nicht gestartet werden. Grund: <u>%s</u>",
-		$application,
-		$e->getMessage()
+		FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')
 	));
 }
 
+// Call user function
+call_user_func_array(array($app, FrameworkConfiguration::getSelfInstance()->getConfigEntry('entry_method')), array());
 
 // [EOF]
 ?>