X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fresponse%2Fconsole%2Fclass_ConsoleResponse.php;h=000ecfef9102ab1af52f14f1d3629d1da587468c;hb=ae3dd106624491939ff32b159c9ae509aaf89fe3;hp=625f1944abc5a774cdd153fac34c662aad1553b1;hpb=a3fa89c7cbc54491fc74f13db0927d14acf550c8;p=core.git

diff --git a/inc/classes/main/response/console/class_ConsoleResponse.php b/inc/classes/main/response/console/class_ConsoleResponse.php
index 625f1944..000ecfef 100644
--- a/inc/classes/main/response/console/class_ConsoleResponse.php
+++ b/inc/classes/main/response/console/class_ConsoleResponse.php
@@ -2,11 +2,11 @@
 /**
  * A class for a console response aka output to console
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,23 +33,29 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
+
+		// Set response type
+		$this->setResponseType('console');
 	}
 
 	/**
 	 * Creates an object of this class
 	 *
-	 * @param	$appInstance		An instance of a manageable application
-	 * @return	$responseInstance	A prepared instance of this class
+	 * @param	$applicationInstance	An instance of a manageable application
+	 * @return	$responseInstance		A prepared instance of this class
 	 */
-	public static final function createConsoleResponse (ManageableApplication $appInstance) {
+	public static final function createConsoleResponse (ManageableApplication $applicationInstance) {
 		// Get a new instance
 		$responseInstance = new ConsoleResponse();
 
 		// Set the application instance
-		$responseInstance->setApplicationInstance($appInstance);
+		$responseInstance->setApplicationInstance($applicationInstance);
 
 		// Initialize the template engine here
-		$responseInstance->initTemplateEngine($appInstance);
+		$responseInstance->initTemplateEngine($applicationInstance);
+
+		// Init web output instance
+		$responseInstance->initWebOutputInstance();
 
 		// Return the prepared instance
 		return $responseInstance;
@@ -58,11 +64,11 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	/**
 	 * Initializes the template engine instance
 	 *
-	 * @param	$appInstance	An instance of a manageable application
+	 * @param	$applicationInstance	An instance of a manageable application
 	 * @return	void
 	 */
-	public final function initTemplateEngine (ManageableApplication $appInstance) {
-		$this->setTemplateInstance($this->prepareTemplateInstance($appInstance));
+	public final function initTemplateEngine (ManageableApplication $applicationInstance) {
+		$this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance));
 	}
 
 	/**
@@ -75,7 +81,7 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 	 * @return	void
 	 * @throws	ResponseHeadersAlreadySentException		If headers are already sent
 	 */
-	public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
+	public function addCookie ($cookieName, $cookieValue, $encrypted = FALSE, $expires = NULL) {
 		//* DEBUG: */ echo $cookieName.'='.$cookieValue."<br />\n";
 		$this->partialStub('Naturally unimplemented in console response.');
 	}
@@ -112,26 +118,16 @@ class ConsoleResponse extends BaseResponse implements Responseable {
 		$this->partialStub('Naturally unimplemented in console response.');
 	}
 
-	/**
-	 * Getter for default command
-	 *
-	 * @return	$defaultCommand		Default command for this response
-	 */
-	public function getDefaultCommand () {
-		$defaultCommand = $this->getConfigInstance()->getConfigEntry('default_console_command');
-		return $defaultCommand;
-	}
-
 	/**
 	 * Flushs the cached console response to the console
 	 *
-	 * @param	$force	Wether we shall force the output or abort if headers are
+	 * @param	$force	Whether we shall force the output or abort if headers are
 	 *					already sent with an exception
 	 * @return	void
 	 * @throws	ResponseHeadersAlreadySentException		Thrown if headers are
 	 *													already sent
 	 */
-	public function flushBuffer ($force = false) {
+	public function flushBuffer ($force = FALSE) {
 		$this->partialStub('Please implement this class.');
 	}
 }