X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Fclass_ApplicationHelper.php;h=44d77cb62972304e3c9651a7eb0a02e86fa4cdb4;hb=1079ab2b4b8ee62cb5e434b5ee3d04bd7369f954;hp=005c1e650e694d76d12ab368006fd33d800cbb57;hpb=ec3f744e23fa07132d0c5f435f1f4d75b8d5c481;p=shipsimu.git

diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php
index 005c1e6..44d77cb 100644
--- a/application/selector/class_ApplicationHelper.php
+++ b/application/selector/class_ApplicationHelper.php
@@ -22,7 +22,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -51,19 +51,19 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	private $appName = "";
 
 	/**
-	 * The short uni*-like name of this application
+	 * The short uni*-like name for this application
 	 */
 	private $shortName = "";
 
 	/**
-	 * Name of the master template
+	 * An instance of a controller
 	 */
-	private $masterTemplate = "";
+	private $controllerInstance = null;
 
 	/**
 	 * An instance of this class
 	 */
-	private static $thisInstance = null;
+	private static $selfInstance = null;
 
 	/**
 	 * Protected constructor
@@ -78,22 +78,22 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	/**
 	 * 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 final static 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;
 	}
 
 	/**
 	 * Getter for the version number
 	 *
-	 * @return	$appVersion	The application's version number
+	 * @return	$appVersion		The application's version number
 	 */
 	public final function getAppVersion () {
 		return $this->appVersion;
@@ -102,7 +102,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	/**
 	 * Setter for the version number
 	 *
-	 * @param	$appVersion	The application's version number
+	 * @param	$appVersion		The application's version number
 	 * @return	void
 	 */
 	public final function setAppVersion ($appVersion) {
@@ -154,35 +154,82 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	}
 
 	/**
-	 * Getter for master template name
+	 * Builds the master template's name
 	 *
-	 * @return	$masterTemplate		Name of the master template
+	 * @return	$masterTemplateName		Name of the master template
 	 */
-	public final function getMasterTemplate () {
-		return $this->masterTemplate;
+	public function buildMasterTemplateName () {
+		// Get short name and add suffix
+		$masterTemplateName = str_replace('-', '', $this->getAppShortName()) . '_main';
+
+		// Return it
+		return $masterTemplateName;
 	}
 
 	/**
-	 * Launcher for the application selector
+	 * Launches the admin area
 	 *
 	 * @return	void
-	 * @see		ApplicationSelector
 	 */
 	public final function entryPoint () {
-		// Get a prepared instance of ApplicationSelector
-		$selInstance = ApplicationSelector::createApplicationSelector(LanguageSystem::getInstance(), FileIoHandler::getInstance());
+		// Set this application in registry
+		Registry::getRegistry()->addInstance('app', $this);
+
+		// Analyze the environment for type of response/request
+		$type = ConsoleTools::analyzeEnvironmentForType();
+		$classType = ConsoleTools::analyzeEnvironmentForClassType();
+
+		// Create a new request object
+		$requestInstance = ObjectFactory::createObjectByName(ucfirst($type) . 'Request');
+
+		// Remember request instance here
+		$this->setRequestInstance($requestInstance);
+
+		// Default response is HTTP (HTML page) and type is 'Web'
+		$response = $type;
+		$responseType = $classType;
+
+		// Do we have another response?
+		if ($requestInstance->isRequestElementSet('request')) {
+			// Then use it
+			$response = strtolower($requestInstance->getRequestElement('request'));
+			$responseType = $response;
+		} // END - if
+
+		// ... and a new response object
+		$responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
+
+		// Remember response instance here
+		$this->setResponseInstance($responseInstance);
+
+		// Get the parameter from the request
+		$commandName = $requestInstance->getRequestElement('page');
+
+		// If it is null then get default command
+		if (is_null($commandName)) {
+			// Get the default command
+			$commandName = $responseInstance->getDefaultCommand();
+
+			// Set it in request
+			$requestInstance->setRequestElement('page', $commandName);
+		} // END - if
+
+		// Get a resolver
+		$resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
-		// Remove the ignore list from the object
-		$selInstance->removeDirIgnoreList();
+		// Get a controller instance as well
+		$this->controllerInstance = $resolverInstance->resolveController();
 
-		// Next load all templates for the respective short app names
-		$selInstance->loadApplicationTemplates();
+		// Get a web output class
+		$outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this));
 
-		// Then load the selector's own template
-		$selInstance->loadSelectorTemplate();
+		// Set it in this application
+		$this->setWebOutputInstance($outputInstance);
 
-		// Insert all application templates
-		$selInstance->insertApplicationTemplates();
+		// Handle the request
+		$this->controllerInstance->handleRequest($requestInstance, $responseInstance);
 	}
 
 	/**
@@ -193,7 +240,10 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	 * @return	void
 	 */
 	public function handleFatalMessages (array $messageList) {
-		die("<pre>".print_r($messageList, true)."</pre>");
+		// Walk through all messages
+		foreach ($messageList as $message) {
+			print("MSG:" . $message . "<br />\n");
+		} // END - if
 	}
 
 	/**