X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fship-simu%2Fclass_ApplicationHelper.php;h=bd51594e8f25c0684726dd54cf9c9180881cecc8;hb=4c853fd49e21d5d3ae7a3c0c2822c788643375c7;hp=f499c4817cacc3493d79ee967f05a18229472fe4;hpb=9327c11e14407cce78208de01b5cdd2de87e13a3;p=shipsimu.git

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index f499c48..bd51594 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, this is free software
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -39,7 +39,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication {
+class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
 	/**
 	 * The version number of this application
 	 */
@@ -69,6 +69,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 * An instance of this class
 	 */
 	private static $thisInstance = null;
+
 	/**
 	 * Protected constructor
 	 *
@@ -77,15 +78,6 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set description
-		$this->setObjectDescription("Application-Helper");
-
-		// Create an unique ID
-		$this->generateUniqueId();
-
-		// Tidy up a little
-		$this->removeSystemArray();
 	}
 
 	/**
@@ -184,26 +176,37 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Create a new request object
 		$requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
+		// Default response is HTTP (HTML page) and type is "Web"
+		$response = "http";
+		$responseType = "web";
+
+		// 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
-		$responseInstance = ObjectFactory::createObjectByName('HttpResponse', array($this));
+		$responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
 
 		// Remember both in this application
 		$this->setRequestInstance($requestInstance);
 		$this->setResponseInstance($responseInstance);
 
 		// Get the parameter from the request
-		$commandName = $requestInstance->getRequestElement("page");
+		$commandName = $requestInstance->getRequestElement('page');
 
 		// If it is null then get default command
 		if (is_null($commandName)) {
-			$commandName = $this->getConfigInstance()->readConfig('default_command');
+			$commandName = $responseInstance->getDefaultCommand();
 		} // END - if
 
 		// Get a resolver
-		$resolverInstance = WebControllerResolver::createWebControllerResolver($commandName, $this);
+		$resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
 
 		// Get a controller instance as well
-		$this->controllerInstance = $resolverInstance->resolveCommandController();
+		$this->controllerInstance = $resolverInstance->resolveController();
 
 		// Handle the request
 		$this->controllerInstance->handleRequest($requestInstance, $responseInstance);
@@ -220,7 +223,18 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		// Walk through all messages
 		foreach ($messageList as $message) {
 			print("MSG:".$message."<br />\n");
-		}
+		} // END - if
+	}
+
+	/**
+	 * Assigns application-depending data
+	 *
+	 * @param	$templateInstance	An instance of a template engine
+	 * @return	void
+	 */
+	public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
+		// Assign charset
+		$templateInstance->assignConfigVariable('header_charset');
 	}
 }