X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Finit.php;h=b21bdc56b2327deac5af28e33133717f321b1b39;hb=4c35e8280767c1e33832097060e39a32b80ffd01;hp=0674104f3f363d4c2ace48a9df5f8a7843037379;hpb=2a157996efd680b87b0a84cc95b91619ea6e81d9;p=shipsimu.git

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index 0674104..b21bdc5 100644
--- a/application/ship-simu/init.php
+++ b/application/ship-simu/init.php
@@ -8,7 +8,7 @@
  * You can prevent adding this application to the selector by uncommenting the
  * following line:
  *
- * if ((isset($this)) && (is_object($this)) && ($this->isSameClass("ApplicationSelector"))) { return; }
+ * if ((isset($this)) && (is_object($this)) && ($this->isClass("ApplicationSelector"))) { return; }
  *
  * isset() is required to prevent a warning and is_object() is highly required
  * when the application itself is requested in URL (hint: index.php?app=your_app)
@@ -17,7 +17,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
@@ -30,32 +30,39 @@
  * 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/>.
  */
 
-// Get an instance of the helper
-$eval = sprintf("\$app = %s::getInstance();",
-	FrameworkConfiguration::getInstance()->readConfig("app_helper_class")
-);
-eval($eval);
-
-// Set application name and version
-$app->setAppName("Ship-Simu Schiffsimulator");
-$app->setAppVersion("0.1");
-$app->setAppShortName("ship-simu");
-
 // 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');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
-require(PATH . "inc/database.php");
+require(PATH . 'inc/database.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("Ship-Simu Schiffsimulator");
+$app->setAppVersion("0.0.0");
+$app->setAppShortName("ship-simu");
+
+// Set instances
+$app->setFileIoInstance($io);
+$app->setLanguageInstance($lang);
+$app->setDatabaseInstance($db);
 
 // [EOF]
 ?>