From: Roland Häder <roland@mxchange.org>
Date: Fri, 3 Apr 2009 12:22:26 +0000 (+0000)
Subject: Static method detectCorePath() must be added to ApplicationEntryPoint
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6c146922841b33299c66b9f3b5eef10989d36e22;p=hub.git

Static method detectCorePath() must be added to ApplicationEntryPoint
---

diff --git a/Doxyfile b/Doxyfile
index 5d5b89373..1b46c4f17 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = 0.0.0
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = /var/www/ship-simu/docs/
+OUTPUT_DIRECTORY       = /home/quix0r/MyProjects/hub/trunk/docs/html/
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 2cd1081dc..4a3992720 100644
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -180,13 +180,13 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 			// Set the app instance
 			$nodeInstance->setApplicationInstance($this);
 		} catch (ClassNotFoundException $e) {
-			// This means, the node mode is invalid!
+			// This exception means, the node mode is invalid.
 			// @TODO Can we rewrite this to app_die() ?
 			die('Node mode ' . $nodeMode . ' is invalid.' . "\n");
 		}
 
 		// --------------------- Hub-id acquirement phase ---------------------
-		// Aquire a hub-id. This step generates on first launch anew one and
+		// Acquire a hub-id. This step generates on first launch anew one and
 		// on any later launches it will restore the hub-id from the database.
 		// A passed 'nickname=xxx' argument will be used to add some
 		// 'personality' to the hub.
diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php
index 69426d924..fe58930c2 100644
--- a/application/hub/main/nodes/class_BaseHubNode.php
+++ b/application/hub/main/nodes/class_BaseHubNode.php
@@ -153,7 +153,7 @@ class BaseHubNode extends BaseFrameworkSystem implements Updateable {
 				// Now, does the mode match (should be 'boot'!)
 				if ($this->getRequestInstance()->getRequestElement('mode') == 'boot') {
 					// Output debug message
-					$this->getDebugInstance()->output(__FUNCTION__.': Our node is a valid boot-strapping node.');
+					$this->getDebugInstance()->output(__FUNCTION__.': Our node is a valid bootstrapping node.');
 				} else {
 					// Output warning
 					$this->getDebugInstance()->output(__FUNCTION__.': WARNING! Mismatching mode ' . $this->getRequestInstance()->getRequestElement('mode') . '!=boot detected.');
diff --git a/index.php b/index.php
index fd15966d8..3945af962 100644
--- a/index.php
+++ b/index.php
@@ -12,9 +12,9 @@ define('DEVELOPER', true);
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright		Copyright (c) 2007, 2008 Roland Haeder
+ * @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
@@ -29,7 +29,12 @@ define('DEVELOPER', true);
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationEntryPoint {
+final class ApplicationEntryPoint {
+	/**
+	 * Core path
+	 */
+	private static $corePath = '';
+
 	/**
 	 * The instances we want to remove after all is done
 	 *
@@ -83,17 +88,16 @@ class ApplicationEntryPoint {
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
 		$lang = LanguageSystem::getInstance();
-		$io = FileIoHandler::getInstance();
 
 		// Get response instance
 		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
 		// Is the template engine loaded?
-		if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
+		if ((class_exists($tpl)) && (is_object($lang))) {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
-				$templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+				$templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
 			} catch (FrameworkException $e) {
 				die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
 					$e->getMessage()
@@ -156,6 +160,22 @@ class ApplicationEntryPoint {
 		}
 	}
 
+	/**
+	 * Determines the correct absolute path for all include
+	 *
+	 * @return	$basePath	Base path (core) for all includes
+	 */
+	protected static function detectCorePath () {
+		// Is it not set?
+		if (empty(self::$corePath)) {
+			// Auto-detect our core path
+			self::$corePath = str_replace("\\", '/', dirname(__FILE__));
+		} // END - if
+
+		// Return it
+		return self::$corePath;
+	}
+
 	/**
 	 * The application's main entry point. This class isolates some local
 	 * variables which shall not become visible to outside because of security
@@ -166,7 +186,7 @@ class ApplicationEntryPoint {
 	 */
 	public static function main () {
 		// Load config file
-		require(dirname(__FILE__) . '/inc/config.php');
+		require(self::detectCorePath() . '/inc/config.php');
 
 		// Load all include files
 		require($cfg->readConfig('base_path') . 'inc/includes.php');