X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fhub%2Fclass_ApplicationHelper.php;h=299754ec2c5b37bf9aee36fd6c7db32dc43cd7e2;hb=f80c1af825e6ddde4b5dbc5109f146e1baabdbff;hp=b146c97447882f6ca3053a743dd984a0cd39083d;hpb=15585567c2714b3a3072fab8b1a8cb5d5c259f7e;p=hub.git

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index b146c9744..299754ec2 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 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
@@ -42,22 +42,22 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	/**
 	 * The version number of this application
 	 */
-	private $appVersion = "";
+	private $appVersion = '';
 
 	/**
 	 * The human-readable name for this application
 	 */
-	private $appName = "";
+	private $appName = '';
 
 	/**
 	 * The short uni*-like name for this application
 	 */
-	private $shortName = "";
+	private $shortName = '';
 
 	/**
 	 * An instance of this class
 	 */
-	private static $thisInstance = null;
+	private static $selfInstance = NULL;
 
 	/**
 	 * Private constructor
@@ -67,25 +67,21 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Tidy up a little
-		$this->removeSystemArray();
-		$this->removeNumberFormaters();
 	}
 
 	/**
 	 * Getter for an instance of this class
 	 *
-	 * @return	$thisInstance	An instance of this class
+	 * @return	$selfInstance	An instance of this class
 	 */
-	public final static function getInstance () {
+	public static final function getSelfInstance () {
 		// Is the instance there?
-		if (is_null(self::$thisInstance)) {
-			self::$thisInstance = new ApplicationHelper();
-		}
+		if (is_null(self::$selfInstance)) {
+			self::$selfInstance = new ApplicationHelper();
+		} // END - if
 
 		// Return the instance
-		return self::$thisInstance;
+		return self::$selfInstance;
 	}
 
 	/**
@@ -153,16 +149,25 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 * @return	void
 	 */
 	public final function entryPoint () {
+		// Set this application in registry
+		Registry::getRegistry()->addInstance('app', $this);
+
+		// 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 = self::getResponseTypeFromSystem();
+		$responseType = self::getResponseTypeFromSystem();
+
 		// Create a new request object
-		$requestInstance = ObjectFactory::createObjectByName('ConsoleRequest');
+		$requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request');
 
 		// Remember request instance here
 		$this->setRequestInstance($requestInstance);
 
-		// Default response is console
-		$response = 'console';
-		$responseType = 'console';
-
 		// Do we have another response?
 		if ($requestInstance->isRequestElementSet('request')) {
 			// Then use it
@@ -171,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', $this->convertToClassName($response));
 		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
 		// Remember response instance here
@@ -183,34 +188,38 @@ 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 = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
 		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
 		$this->setControllerInstance($resolverInstance->resolveController());
 
-		// Get the registry
-		$registryInstance = Registry::getRegistry();
-
-		// Set this application
-		$registryInstance->addInstance('app', $this);
-
 		// Launch the hub main routine here
 		$this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
 		// -------------------------- Shutdown phase --------------------------
-		// Shutting down the hub by saying "good bye" to all connected clients
+		// 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) {
 	}
 
 	/**
@@ -223,8 +232,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	public function handleFatalMessages (array $messageList) {
 		// Walk through all messages
 		foreach ($messageList as $message) {
-			die("MSG:" . $message);
-		}
+			exit(__METHOD__ . ':MSG:' . $message);
+		} // END - foreach
 	}
 
 	/**