Renamed getInstance() to getSelfInstance(), conflicts BaseRegistry versus several...

[shipsimu.git] / application / selector / init.php

diff --git a/application/selector/init.php b/application/selector/init.php
index 71893f0d51b84dcae7c86ed88e2cf9ff36a68f2f..a77ca0d763da10d8b28100dca7310e618e01cfa7 100644 (file)
--- a/application/selector/init.php
+++ b/application/selector/init.php
@@ -7,7 +7,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @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
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -26,33 +26,10 @@
  */
 
 // Get config instance
  */
 
 // Get config instance

-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();

 
 // Initialize output system
 
 // Initialize output system

-require($cfg->readConfig('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->readConfig('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->readConfig('base_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);
+require($cfg->getConfigEntry('base_path') . 'inc/output.php');

 
 // [EOF]
 ?>
 
 // [EOF]
 ?>