Code merge from latest ship-simu code

[mailer.git] / inc / classes / main / commands / web / class_WebHomeCommand.php

diff --git a/inc/classes/main/commands/web/class_WebHomeCommand.php b/inc/classes/main/commands/web/class_WebHomeCommand.php
index f45b0d7960f141b6f729b14d811da9b7ff9f9adf..0b7e9c41a39e5951d492abf5106bfda76a334c0f 100644 (file)
--- a/inc/classes/main/commands/web/class_WebHomeCommand.php
+++ b/inc/classes/main/commands/web/class_WebHomeCommand.php
@@ -23,7 +23,7 @@
  */
 class WebHomeCommand extends BaseCommand implements Commandable {
        /**
-        * Private constructor
+        * Protected constructor
         *
         * @return      void
         */
@@ -32,7 +32,7 @@ class WebHomeCommand extends BaseCommand implements Commandable {
                parent::__construct(__CLASS__);
 
                // Set special description
-               $this->setObjectDescription("Home-Command");
+               $this->setObjectDescription("Command for the "home" page");
 
                // Create unique ID number
                $this->createUniqueID();
@@ -90,7 +90,7 @@ class WebHomeCommand extends BaseCommand implements Commandable {
                $templateInstance->assignTemplateWithVariable("footer", "footer");
 
                // Load the home template
-               $templateInstance->loadWebTemplate("home");
+               $templateInstance->loadCodeTemplate("home");
 
                // Assign the home template with the master template as a content ... ;)
                $templateInstance->assignTemplateWithVariable("home", "content");
@@ -99,9 +99,9 @@ class WebHomeCommand extends BaseCommand implements Commandable {
                $templateInstance->loadCodeTemplate($masterTemplate);
 
                // Set title
-               $title = ucfirst($requestInstance->getRequestElement($this->getConfigInstance()->readConfig("command_parameter")));
+               $title = ucfirst($requestInstance->getRequestElement($this->getConfigInstance()->readConfig('command_parameter')));
                if (empty($title)) $title = "Home";
-               $templateInstance->assignVariable("title", $title);
+               $templateInstance->assignVariable('title', $title);
 
                // ... and all variables. This should be merged together in a pattern
                // to make things easier. A cache mechanism should be added between