From bb302e1d195ef61b536d1f9c78abd4b60e4601e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 14 Mar 2009 03:40:18 +0000 Subject: [PATCH] Updated to latest core revision, a lot debug constants removed --- .../mxchange/class_ApplicationHelper.php | 123 +++++++++++++----- application/mxchange/debug.php | 35 ----- index.php | 27 ++-- 3 files changed, 99 insertions(+), 86 deletions(-) diff --git a/application/mxchange/class_ApplicationHelper.php b/application/mxchange/class_ApplicationHelper.php index 01d9f06700..53d3fc3e6e 100644 --- a/application/mxchange/class_ApplicationHelper.php +++ b/application/mxchange/class_ApplicationHelper.php @@ -20,11 +20,11 @@ * Please remember that this include file is being loaded *before* the class * loader is loading classes from "exceptions", "interfaces" and "main"! * - * @author Roland Haeder - * @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 + * @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 . + * along with this program. If not, see . */ -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."
\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'); } } diff --git a/application/mxchange/debug.php b/application/mxchange/debug.php index bb633ca068..ab086e4ce8 100644 --- a/application/mxchange/debug.php +++ b/application/mxchange/debug.php @@ -22,40 +22,5 @@ * along with this program. If not, see . */ -// 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 64aa05f895..ec9080300d 100644 --- 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 - * @version 0.0.0 + * @author Roland Haeder + * @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: %s", $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'); -- 2.30.2