X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fclass_ApplicationHelper.php;h=ad4d8626ac19d789728f78132992f6e6ab685ba6;hb=06b93d16462a541848b8944bcfe17b70a2831c46;hp=82c3ae4712be464034fe0f757b9ff5646740cf07;hpb=b7c47cd5ca83bb9f8d5a1b46d553b5f1f2bbd80f;p=hub.git

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index 82c3ae471..ad4d8626a 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,18 +152,18 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Set this application in registry
 		Registry::getRegistry()->addInstance('app', $this);
 
-		// Is no external IP set?
-		if ($this->getConfigInstance()->getConfigEntry('external_ip') == '') {
-			// 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);
@@ -176,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
@@ -188,14 +188,23 @@ 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));
+		// Is the responseType 'html' ?
+		if ($responseType == 'html') {
+			// The language system is needed for this
+			$languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class');
+
+			// And set it here
+			$this->setLanguageInstance($languageInstance);
+		} // END - if
+
+		// 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,12 +213,25 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Launch the hub main routine here
 		$this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
-		// -------------------------- Shutdown phase --------------------------
-		// Shutting down the hub by saying "good bye" to all connected peers
-		// and other hubs, flushing all queues and caches.
-		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown in progress, main loop exited.');
-		$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
-		self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+		// Only for console requests as this is the actual daemon
+		if ($responseType == 'console') {
+			// -------------------------- Shutdown phase --------------------------
+			// Shutting down the hub by saying "good bye" to all connected peers
+			// and other hubs, flushing all queues and caches.
+			self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+			$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
+			self::createDebugInstance(__CLASS__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+		} // END - if
+	}
+
+	/**
+	 * Assigns extra application-depending data
+	 *
+	 * @param	$templateInstance	An instance of a CompileableTemplate
+	 * @return	void
+	 * @todo	Nothing to add?
+	 */
+	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
 	}
 
 	/**