X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fclass_ApplicationHelper.php;h=d85438a054db7e6a7781398cdefee154cfa0254b;hb=336231c4b4b6d5ee860a85e55c7572451a9cbf3f;hp=bd51594e8f25c0684726dd54cf9c9180881cecc8;hpb=ec3f744e23fa07132d0c5f435f1f4d75b8d5c481;p=shipsimu.git

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index bd51594..d85438a 100644
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/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
  *
@@ -55,11 +55,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 	 */
 	private $shortName = "";
 
-	/**
-	 * The name of the master template
-	 */
-	private $masterTemplate = "shipsimu_main";
-
 	/**
 	 * An instance of a controller
 	 */
@@ -159,16 +154,20 @@ 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;
 	}
 
 	/**
-	 * Launches the ship-simulator game
+	 * Launches the admin area
 	 *
 	 * @return	void
 	 */
@@ -176,9 +175,12 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 		// Create a new request object
 		$requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
-		// Default response is HTTP (HTML page) and type is "Web"
-		$response = "http";
-		$responseType = "web";
+		// Remember request instance here
+		$this->setRequestInstance($requestInstance);
+
+		// Default response is HTTP (HTML page) and type is 'Web'
+		$response = 'http';
+		$responseType = 'web';
 
 		// Do we have another response?
 		if ($requestInstance->isRequestElementSet('request')) {
@@ -188,10 +190,10 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 		} // END - if
 
 		// ... and a new response object
-		$responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
+		$responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
-		// Remember both in this application
-		$this->setRequestInstance($requestInstance);
+		// Remember response instance here
 		$this->setResponseInstance($responseInstance);
 
 		// Get the parameter from the request
@@ -199,15 +201,26 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 
 		// 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
-		$resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
+		$resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
 		// Get a controller instance as well
 		$this->controllerInstance = $resolverInstance->resolveController();
 
+		// Get a web output class
+		$outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this));
+
+		// Set it in this application
+		$this->setWebOutputInstance($outputInstance);
+
 		// Handle the request
 		$this->controllerInstance->handleRequest($requestInstance, $responseInstance);
 	}