X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Finit.php;h=439dccce6931fc606fc231b7bb49feb9a8d4e735;hb=55b327a3f5f2fe1d244532e07be7444e94b2a768;hp=08bd8ac29057882885b43df3516041c1c646cb43;hpb=1d128d8532290e84885d09d2d3f0060abd08e49e;p=shipsimu.git

diff --git a/application/selector/init.php b/application/selector/init.php
index 08bd8ac..439dccc 100644
--- a/application/selector/init.php
+++ b/application/selector/init.php
@@ -9,7 +9,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,27 +24,32 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-//
-//
-// Get an instance of the initializer
-$eval = sprintf("\$app = %s::getInstance();",
-	FrameworkConfiguration::getInstance()->readConfig("app_helper_class")
-);
-eval($eval);
-
-// Set application name and version
-$app->setAppName("Applikationsausw&auml;hler");
-$app->setAppVersion("0.1a");
-$app->setAppShortName(FrameworkConfiguration::getInstance()->readConfig("selector_name"));
 
 // Initialize output system
-require(PATH . "inc/output.php");
+require(PATH . 'inc/output.php');
 
 // Initialize file i/o system
-require(PATH . "inc/file_io.php");
+require(PATH . 'inc/file_io.php');
 
 // Include the language sub-system
-require(PATH . "inc/language.php");
+require(PATH . 'inc/language.php');
+
+// Generate call-back function
+$callback = sprintf("%s::getInstance",
+	FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
+);
+
+// Get an instance of the helper
+$app = call_user_func_array($callback, array());
+
+// Set application name and version
+$app->setAppName("Applikationsausw&auml;hler");
+$app->setAppVersion("0.1a");
+$app->setAppShortName(FrameworkConfiguration::getInstance()->readConfig('selector_name'));
+
+// Set instances
+$app->setFileIoInstance($io);
+$app->setLanguageInstance($lang);
 
 // [EOF]
 ?>