From eda904975200846aa0ee2fb52b6eebab923a76af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 14 Mar 2009 03:41:04 +0000
Subject: [PATCH] Updated to latest core revision, a lot debug constants
 removed

---
 application/admin/class_ApplicationHelper.php |  6 ++--
 application/admin/debug.php                   | 35 -------------------
 index.php                                     |  5 ++-
 3 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/application/admin/class_ApplicationHelper.php b/application/admin/class_ApplicationHelper.php
index e1af862..53d3fc3 100644
--- a/application/admin/class_ApplicationHelper.php
+++ b/application/admin/class_ApplicationHelper.php
@@ -175,6 +175,9 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 		// Create a new request object
 		$requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
+		// Remember request instance here
+		$this->setRequestInstance($requestInstance);
+
 		// Default response is HTTP (HTML page) and type is "Web"
 		$response = "http";
 		$responseType = "web";
@@ -190,8 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
 		$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
diff --git a/application/admin/debug.php b/application/admin/debug.php
index f5da828..b8b4145 100644
--- a/application/admin/debug.php
+++ b/application/admin/debug.php
@@ -22,40 +22,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Reederei-Objekt debuggen
-//define('DEBUG_COMPANY_OBJ', true);
-// Hafen-Objekt debuggen
-//define('DEBUG_HARBOR_OBJ', true);
-// Schiff-Objekt debuggen
-//define('DEBUG_SHIP_OBJ', true);
-// Auftrag-Objekt debuggen
-//define('DEBUG_CONTRACT_OBJ', true);
-// Haendler-Objekt debuggen
-//define('DEBUG_MERCHANT_OBJ', true);
-// Personal-Objekt debuggen
-//define('DEBUG_PERSONELL_OBJ', true);
-// Personal debuggen
-//define('DEBUG_PERSONELL', true);
-// Reederei debuggen
-//define('DEBUG_COMPANY', true);
-// Mitarbeiter debuggen
-//define('DEBUG_COMPANY_EMPLOYEE', true);
-// Hafen debuggen
-//define('DEBUG_HARBOR', true);
-// Werft debuggen
-//define('DEBUG_SHIPYARD', true);
-// Schiff debuggen
-//define('DEBUG_SHIP', true);
-// Schiffstruktur debuggen
-//define('DEBUG_STRUCTURE', true);
-// Kabinen debuggen
-//define('DEBUG_CABIN', true);
-// Decks debuggen
-//define('DEBUG_DECK', true);
-// Bauauftraege debuggen
-//define('DEBUG_CONTRACT', true);
-// Haendler debuggen
-//define('DEBUG_MERCHANT', true);
-
 // [EOF]
 ?>
diff --git a/index.php b/index.php
index 62f3069..ec90803 100644
--- a/index.php
+++ b/index.php
@@ -83,17 +83,16 @@ class ApplicationEntryPoint {
 		// Get some instances
 		$tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
 		$lang = LanguageSystem::getInstance();
-		$io = FileIoHandler::getInstance();
 
 		// Get response instance
 		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
 		// Is the template engine loaded?
-		if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
+		if ((class_exists($tpl)) && (is_object($lang))) {
 			// Use the template engine for putting out (nicer look) the message
 			try {
 				// Get the template instance from our object factory
-				$templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+				$templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
 			} catch (FrameworkException $e) {
 				die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
 					$e->getMessage()
-- 
2.39.2