'scrypt' is better now a "feature" which needs to be tested and enabled in a pre...

[hub.git] / application / hub / init.php

diff --git a/application/hub/init.php b/application/hub/init.php
index 32d4ab3bc4e9c75cec21e43f9f6477990f3194bd..8699bacb7325fb13047c34e8bb0420bd571102fb 100644 (file)
--- a/application/hub/init.php
+++ b/application/hub/init.php
@@ -5,17 +5,9 @@
  * Please remember that this include file is being loaded *before* the class
  * loader is loading classes from "exceptions", "interfaces" and "main"!
  *
- * You can prevent adding this application to the selector by uncommenting the
- * following line:
- *
- * 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)
- *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 Hub Developer Team
+ * @copyright  Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -33,23 +25,20 @@
  */
 
 // Get config instance
-$cfg = FrameworkConfiguration::getInstance();
+$cfg = FrameworkConfiguration::getSelfInstance();
 
 // Initialize output system
-require($cfg->getConfigEntry('base_path') . 'inc/output.php');
-
-// Initialize file i/o system
-require($cfg->getConfigEntry('base_path') . 'inc/file_io.php');
-
-// Include the language sub-system
-require($cfg->getConfigEntry('base_path') . 'inc/language.php');
+ApplicationHelper::createDebugInstance('ApplicationHelper');
 
 // This application needs a database connection then we have to simply include
 // the inc/database.php script
 require($cfg->getConfigEntry('base_path') . 'inc/database.php');
 
-// Get's our IP address
-ConsoleTools::acquireSelfIPAddress();
+// Get own internal address and set it in config
+$cfg->setConfigEntry('internal_address', HubTools::determineOwnInternalAddress());
+
+// By default scrypt is assumed (and later tested) NOT being there
+$cfg->setConfigEntry('extension_scrypt_loaded', FALSE);
 
 // [EOF]
 ?>