projects / shipsimu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f6ee2e6)
Several small fixes applied
authorRoland Häder <roland@mxchange.org>
Wed, 7 May 2008 15:45:07 +0000 (15:45 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 7 May 2008 15:45:07 +0000 (15:45 +0000)
application/ship-simu/class_ApplicationHelper.php patch | blob | history
application/ship-simu/config.php patch | blob | history
application/ship-simu/templates/de/code/header.ctp patch | blob | history
inc/classes/interfaces/response/class_Responseable.php patch | blob | history
inc/classes/main/response/class_HttpResponse.php patch | blob | history

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index 2b31ffad2bb13044bb759421a2ccaaaf571a26ab..75373862f40ca89aeb65ecd34ed0ef64a1781c05 100644 (file)
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -177,17 +177,20 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
         * @return      void
         */
        public final function entryPoint () {
-               // Get default command
-               $defaultCommand = $this->getConfigInstance()->readConfig("default_command");
-
                // Create a new request object
                $requestInstance = HttpRequest::createHttpRequest();
 
                // ... and a new response object
                $responseInstance = HttpResponse::createHttpResponse($this);
 
+               // Get default command
+               $defaultCommand = $this->getConfigInstance()->readConfig("default_command");
+
+               // Get a resolver
+               $resolverInstance = WebControllerResolver::createWebControllerResolver($defaultCommand, $this);
+
                // Get a new controller instance as well
-               $controllerInstance = WebControllerResolver::createWebControllerResolver($defaultCommand, $this)->resolveDefaultController();
+               $controllerInstance = $resolverInstance->resolveDefaultController();
 
                // Handle the request
                $controllerInstance->handleRequest($requestInstance, $responseInstance);
diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index f9bff72f64d833c73ed3bf447200adf905edfc90..a1c85d66eefc03894eb75ae7c1885352ec5814b6 100644 (file)
--- a/application/ship-simu/config.php
+++ b/application/ship-simu/config.php
@@ -28,5 +28,8 @@ $cfg = FrameworkConfiguration::getInstance();
 // CFG: DEFAULT-COMMAND
 $cfg->setConfigEntry("default_command", "home");
 
+// CFG: HOME-WITH-NEWS
+$cfg->setConfigEntry("home_with_news", "Y");
+
 // [EOF]
 ?>
diff --git a/application/ship-simu/templates/de/code/header.ctp b/application/ship-simu/templates/de/code/header.ctp
index 1f811879e2b89d834fb865b11f49bf431acd2974..2306a6bffc828d8dbf3e0538e6bee23a7eae6860 100644 (file)
--- a/application/ship-simu/templates/de/code/header.ctp
+++ b/application/ship-simu/templates/de/code/header.ctp
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
 <head>
        <title>
                Ship-Simu Schiffsimulator - $content[title]
diff --git a/inc/classes/interfaces/response/class_Responseable.php b/inc/classes/interfaces/response/class_Responseable.php
index d8fdaee1f11411fcbb97b4972418bfa422e897ab..7416b948ca056b16bc0cc53dace0b811d8edb671 100644 (file)
--- a/inc/classes/interfaces/response/class_Responseable.php
+++ b/inc/classes/interfaces/response/class_Responseable.php
@@ -56,7 +56,7 @@ interface Responseable extends FrameworkInterface {
         * @throws      ResponseHeadersAlreadySentException             Thrown if headers are
         *                                                                                                      already sent
         */
-       function flushResponse($force=false);
+       function flushBuffer($force=false);
 }
 
 //
diff --git a/inc/classes/main/response/class_HttpResponse.php b/inc/classes/main/response/class_HttpResponse.php
index 3679fe96a33bae43603dd8c35154dc288c40dfa9..05e6f987cf659ca54c4639d52806628649f287cd 100644 (file)
--- a/inc/classes/main/response/class_HttpResponse.php
+++ b/inc/classes/main/response/class_HttpResponse.php
@@ -119,7 +119,7 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
         * @throws      ResponseHeadersAlreadySentException             Thrown if headers are
         *                                                                                                      already sent
         */
-       public function flushResponse ($force=false) {
+       public function flushBuffer ($force=false) {
                if ((headers_sent()) && (!$force)) {
                        // Headers are already sent!
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
Repository for a browser-based shipping company simulation.