X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fclass_ApplicationHelper.php;h=a44051c982105d1c5bd0491a77dc1317da22e9a5;hb=2eeb79458f7c3704f9e1919bb0b0f57e0a07cf57;hp=db3b2992185d0e6c940ed2bd8f54d846c3e9625e;hpb=db72eb7c444ddf0a503dd12248f8a5da9dcecdb5;p=hub.git

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index db3b29921..a44051c98 100644
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -20,9 +20,9 @@
  * Please remember that this include file is being loaded *before* the class
  * loader is loading classes from "exceptions", "interfaces" and "main"!
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2012 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
@@ -152,15 +152,18 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Set this application in registry
 		Registry::getRegistry()->addInstance('app', $this);
 
-		// Determine external IP
-		$this->getConfigInstance()->setConfigEntry('external_ip', ConsoleTools::determineExternalIp());
+		// Is no external address set?
+		if ($this->getConfigInstance()->getConfigEntry('external_address') == '') {
+			// Determine external address
+			$this->getConfigInstance()->setConfigEntry('external_address', HubTools::determineOwnExternalAddress());
+		} // END - if
 
 		// Default response is console
-		$response = $this->getResponseTypeFromSystem();
-		$responseType = $this->getResponseTypeFromSystem();
+		$response = self::getResponseTypeFromSystem();
+		$responseType = self::getResponseTypeFromSystem();
 
 		// Create a new request object
-		$requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request');
+		$requestInstance = ObjectFactory::createObjectByName(self::convertToClassName($response) . 'Request');
 
 		// Remember request instance here
 		$this->setRequestInstance($requestInstance);
@@ -173,7 +176,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		} // END - if
 
 		// ... and a new response object
-		$responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+		$responseClass = sprintf('%sResponse', self::convertToClassName($response));
 		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
 		// Remember response instance here
@@ -185,14 +188,14 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// If it is null then get default command
 		if (is_null($commandName)) {
 			// Get default command
-			$commandName = $responseInstance->getDefaultCommand();
+			$commandName = $responseInstance->determineDefaultCommand();
 
 			// Set it in request
 			$requestInstance->setRequestElement('command', $commandName);
 		} // END - if
 
-		// Get a resolver
-		$resolverClass = sprintf("Hub%sControllerResolver", $this->convertToClassName($responseType));
+		// Get a controller resolver
+		$resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
 		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
@@ -204,9 +207,19 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// -------------------------- Shutdown phase --------------------------
 		// Shutting down the hub by saying "good bye" to all connected peers
 		// and other hubs, flushing all queues and caches.
-		$this->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown in progress, main loop exited.');
 		$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
-		$this->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+	}
+
+	/**
+	 * Assigns extra application-depending data
+	 *
+	 * @param	$templateInstance	An instance of a CompileableTemplate
+	 * @return	void
+	 * @todo	Nothing to add?
+	 */
+	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
 	}
 
 	/**
@@ -219,7 +232,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public function handleFatalMessages (array $messageList) {
 		// Walk through all messages
 		foreach ($messageList as $message) {
-			die(__METHOD__ . ':MSG:' . $message);
+			exit(__METHOD__ . ':MSG:' . $message);
 		} // END - foreach
 	}