X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=application%2Fship-simu%2Finit.php;h=b9220e90cb5ab9bb8f14db4691abadaf005d9500;hb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9;hp=00df8b66289d074a50e990aaab2c91d15e353803;hpb=7625f0ed496dbf1bb3efbb3bd327dbd0fd747af4;p=shipsimu.git

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index 00df8b6..b9220e9 100644
--- a/application/ship-simu/init.php
+++ b/application/ship-simu/init.php
@@ -15,9 +15,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, 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
@@ -33,31 +33,36 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Get an instance of the helper
-$eval = sprintf("\$app = %s::getInstance();",
-	FrameworkConfiguration::getInstance()->readConfig("app_helper_class")
+// Initialize output system
+require(PATH . 'inc/output.php');
+
+// Initialize file i/o system
+require(PATH . 'inc/file_io.php');
+
+// Include the language sub-system
+require(PATH . 'inc/language.php');
+
+// This application needs a database connection then we have to simply include
+// the inc/database.php script
+require(PATH . 'inc/database.php');
+
+// Generate call-back function
+$callback = sprintf("%s::getInstance",
+	FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
 );
-eval($eval);
+
+// Get an instance of the helper
+$app = call_user_func_array($callback, array());
 
 // Set application name and version
 $app->setAppName("Ship-Simu Schiffsimulator");
 $app->setAppVersion("0.0.0");
 $app->setAppShortName("ship-simu");
 
-// Initialize output system
-require(PATH . "inc/output.php");
-
-// Initialize file i/o system
-require(PATH . "inc/file_io.php");
+// Set instances
 $app->setFileIoInstance($io);
-
-// Include the language sub-system
-require(PATH . "inc/language.php");
 $app->setLanguageInstance($lang);
-
-// This application needs a database connection then we have to simply include
-// the inc/database.php script
-require(PATH . "inc/database.php");
+$app->setDatabaseInstance($db);
 
 // [EOF]
 ?>