Updated to latest core revision, a lot debug constants removed

[admin.git] / application / admin / class_ApplicationHelper.php

diff --git a/application/admin/class_ApplicationHelper.php b/application/admin/class_ApplicationHelper.php
index c041e08f8a559536a87ea372b904d13ce2d8269e..53d3fc3e6e8947782c21ffd1374f109cb7c38650 100644 (file)
--- a/application/admin/class_ApplicationHelper.php
+++ b/application/admin/class_ApplicationHelper.php
@@ -55,11 +55,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         */
        private $shortName = "";
 
-       /**
-        * The name of the master template
-        */
-       private $masterTemplate = "admin_main";
-
        /**
         * An instance of a controller
         */
@@ -159,12 +154,16 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        }
 
        /**
-        * Getter for master template name
+        * Builds the master template's name
         *
-        * @return      $masterTemplate         Name of the master template
+        * @return      $masterTemplateName             Name of the master template
         */
-       public final function getMasterTemplate () {
-               return $this->masterTemplate;
+       public function buildMasterTemplateName () {
+               // Get short name and add suffix
+               $masterTemplateName = str_replace("-", "", $this->getAppShortName()) . "_main";
+
+               // Return it
+               return $masterTemplateName;
        }
 
        /**
@@ -176,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";
@@ -188,10 +190,10 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                } // END - if
 
                // ... and a new response object
-               $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this));
+               $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
@@ -203,7 +205,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                } // END - if
 
                // Get a resolver
-               $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this));
+               $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+               $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well
                $this->controllerInstance = $resolverInstance->resolveController();