Updated to latest core revision, a lot debug constants removed
authorRoland Häder <roland@mxchange.org>
Sat, 14 Mar 2009 03:40:18 +0000 (03:40 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 14 Mar 2009 03:40:18 +0000 (03:40 +0000)
application/mxchange/class_ApplicationHelper.php
application/mxchange/debug.php
index.php

index 01d9f06..53d3fc3 100644 (file)
  * Please remember that this include file is being loaded *before* the class
  * loader is loading classes from "exceptions", "interfaces" and "main"!
  *
- * @author     Roland Haeder <webmaster@ship-simu.org>
- * @version    0.0.0
- * @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
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @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
  *
  * 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
@@ -37,9 +37,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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
         */
@@ -51,32 +51,28 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        private $appName = "";
 
        /**
-        * The short uni*-like name of this application
+        * The short uni*-like name for this application
         */
        private $shortName = "";
 
        /**
-        * An instance of this class
+        * An instance of a controller
         */
-       private static $thisInstance = null;
+       private $controllerInstance = null;
 
        /**
-        * Master template
+        * An instance of this class
         */
-       private $masterTemplate = "mxchange_main";
+       private static $thisInstance = null;
 
        /**
-        * Private constructor
+        * Protected constructor
         *
         * @return      void
         */
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Tidy up a little
-               $this->removeSystemArray();
-               $this->removeNumberFormaters();
        }
 
        /**
@@ -97,7 +93,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        /**
         * Getter for the version number
         *
-        * @return      $appVersion     The application's version number
+        * @return      $appVersion             The application's version number
         */
        public final function getAppVersion () {
                return $this->appVersion;
@@ -106,12 +102,13 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        /**
         * Setter for the version number
         *
-        * @param               $appVersion     The application's version number
+        * @param       $appVersion             The application's version number
         * @return      void
         */
        public final function setAppVersion ($appVersion) {
                // Cast and set it
-               $this->appVersion = (string) $appVersion;
+               $appVersion = (string) $appVersion;
+               $this->appVersion = $appVersion;
        }
 
        /**
@@ -126,12 +123,13 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        /**
         * Setter for human-readable name
         *
-        * @param               $appName        The application's human-readable name
+        * @param       $appName        The application's human-readable name
         * @return      void
         */
        public final function setAppName ($appName) {
                // Cast and set it
-               $this->appName = (string) $appName;
+               $appName = (string) $appName;
+               $this->appName = $appName;
        }
 
        /**
@@ -146,31 +144,75 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        /**
         * Setter for short uni*-like name
         *
-        * @param               $shortName      The application's short uni*-like name
+        * @param       $shortName      The application's short uni*-like name
         * @return      void
         */
        public final function setAppShortName ($shortName) {
                // Cast and set it
-               $this->shortName = (string) $shortName;
+               $shortName = (string) $shortName;
+               $this->shortName = $shortName;
        }
 
        /**
-        * Launcher for the mxchange mailexchange script
+        * Builds the master template's name
         *
-        * @return      void
+        * @return      $masterTemplateName             Name of the master template
         */
-       public final function entryPoint () {
-               // Not yet implemented
-               trigger_error(__METHOD__.": Not yet implemented!");
+       public function buildMasterTemplateName () {
+               // Get short name and add suffix
+               $masterTemplateName = str_replace("-", "", $this->getAppShortName()) . "_main";
+
+               // Return it
+               return $masterTemplateName;
        }
 
        /**
-        * Builds the master template's name
+        * Launches the admin area
         *
-        * @return      $masterTemplateName             Name of the master template
+        * @return      void
         */
-       public final function buildMasterTemplateName () {
-               return $this->masterTemplate;
+       public final function entryPoint () {
+               // 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";
+
+               // 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
+               $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+               $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
+
+               // Remember response instance here
+               $this->setResponseInstance($responseInstance);
+
+               // Get the parameter from the request
+               $commandName = $requestInstance->getRequestElement('page');
+
+               // If it is null then get default command
+               if (is_null($commandName)) {
+                       $commandName = $responseInstance->getDefaultCommand();
+               } // END - if
+
+               // Get a resolver
+               $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
+
+               // Get a controller instance as well
+               $this->controllerInstance = $resolverInstance->resolveController();
+
+               // Handle the request
+               $this->controllerInstance->handleRequest($requestInstance, $responseInstance);
        }
 
        /**
@@ -183,8 +225,19 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
        public function handleFatalMessages (array $messageList) {
                // Walk through all messages
                foreach ($messageList as $message) {
-                       die("MSG:".$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');
        }
 }
 
index bb633ca..ab086e4 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 64aa05f..ec90803 100644 (file)
--- a/index.php
+++ b/index.php
@@ -10,10 +10,10 @@ define('DEVELOPER', true);
  *
  * But good little boys and girls would always initialize their variables... ;-)
  *
- * @author     Roland Haeder <webmaster@ship-simu.org>
- * @version    0.0.0
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
- * @license    GNU GPL 3.0 or any newer version
+ * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
@@ -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()
@@ -101,7 +100,6 @@ class ApplicationEntryPoint {
                        }
 
                        // Get and prepare backtrace for output
-                       // @TODO Rewrite this to something "generic"
                        $backtraceArray = debug_backtrace();
                        $backtrace = "";
                        foreach ($backtraceArray as $key => $trace) {
@@ -124,13 +122,13 @@ class ApplicationEntryPoint {
                        } // END - if
 
                        // Assign variables
-                       $templateInstance->assignVariable('message'       , $message);
-                       $templateInstance->assignVariable('code'          , $code);
-                       $templateInstance->assignVariable('extra'         , $extraData);
-                       $templateInstance->assignVariable('backtrace'     , $backtrace);
+                       $templateInstance->assignVariable('message', $message);
+                       $templateInstance->assignVariable('code', $code);
+                       $templateInstance->assignVariable('extra', $extraData);
+                       $templateInstance->assignVariable('backtrace', $backtrace);
                        $templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
-                       $templateInstance->assignVariable('total_objects' , ObjectFactory::getTotal());
-                       $templateInstance->assignVariable('title'         , $lang->getMessage('emergency_exit_title'));
+                       $templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
+                       $templateInstance->assignVariable('title', $lang->getMessage('emergency_exit_title'));
 
                        // Load the template
                        $templateInstance->loadCodeTemplate('emergency_exit');
@@ -166,9 +164,6 @@ class ApplicationEntryPoint {
         * @return      void
         */
        public static function main () {
-               // Some non-global common arrays we need...
-               global $_SERVER;
-
                // Load config file
                require(dirname(__FILE__) . '/inc/config.php');