]> git.mxchange.org Git - install.git/commitdiff
Updated to latest core revision, a lot debug constants removed
authorRoland Häder <roland@mxchange.org>
Sat, 14 Mar 2009 03:41:16 +0000 (03:41 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 14 Mar 2009 03:41:16 +0000 (03:41 +0000)
application/install/class_ApplicationHelper.php
application/install/debug.php
index.php

index e1af8620c08f25dd4b28a221c31183e4d66d18b4..53d3fc3e6e8947782c21ffd1374f109cb7c38650 100644 (file)
@@ -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
index f5da828ae95e14a248d7ebbd9afa39305e088b7a..b8b414597c5c1a18eb6f6d55fe0d7cc201777aa0 100644 (file)
  * 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]
 ?>
index fd15966d8240a7631b3be95b49fdedbccdcefa40..ec9080300da8eefcb9fe4549224ff9e68c907cad 100644 (file)
--- a/index.php
+++ b/index.php
@@ -12,9 +12,9 @@ define('DEVELOPER', true);
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright          Copyright (c) 2007, 2008 Roland Haeder
+ * @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
+ * @link               http://www.ship-simu.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
@@ -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()