Rewrite of initInstance(), more eval() rewritten to call_user_func_array()

[shipsimu.git] / application / ship-simu / init.php

diff --git a/application/ship-simu/init.php b/application/ship-simu/init.php
index 431e4420d37ef526e2f2966178ca76d1b2a25da0..0f9ff1d62e8e4bf4ffb70206dae118d2939ebe29 100644 (file)
--- a/application/ship-simu/init.php
+++ b/application/ship-simu/init.php
@@ -33,6 +33,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 

+// 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')
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
        FrameworkConfiguration::getInstance()->readConfig('app_helper_class')


@@ -46,20 +59,10 @@ $app->setAppName("Ship-Simu Schiffsimulator");
 $app->setAppVersion("0.0.0");
 $app->setAppShortName("ship-simu");
 
 $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);
 $app->setFileIoInstance($io);

-
-// Include the language sub-system
-require(PATH . 'inc/language.php');

 $app->setLanguageInstance($lang);
 $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]
 ?>
 
 // [EOF]
 ?>