Updated to latest 'core' + convertToClassName() and convertDashesToUnderscores()...

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

diff --git a/application/mailer/class_ApplicationHelper.php b/application/mailer/class_ApplicationHelper.php
index 386ad253841e05166aa2091ddf719cd7d5809c54..8a8e0901592f8c921de4f825cf2998b822ea99ca 100644 (file)
--- a/application/mailer/class_ApplicationHelper.php
+++ b/application/mailer/class_ApplicationHelper.php
@@ -43,17 +43,17 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * The version number of this application
         */
-       private $appVersion = "";
+       private $appVersion = '';
 
        /**
         * The human-readable name for this application
         */
-       private $appName = "";
+       private $appName = '';
 
        /**
         * The short uni*-like name for this application
         */
-       private $shortName = "";
+       private $shortName = '';
 
        /**
         * An instance of a controller
@@ -63,7 +63,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * An instance of this class
         */
-       private static $thisInstance = null;
+       private static $selfInstance = null;
 
        /**
         * Protected constructor
@@ -78,16 +78,16 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * Getter for an instance of this class
         *
-        * @return      $thisInstance           An instance of this class
+        * @return      $selfInstance   An instance of this class
         */
-       public static final function getInstance () {
+       public static final function getSelfInstance () {
                // Is the instance there?
-               if (is_null(self::$thisInstance)) {
-                       self::$thisInstance = new ApplicationHelper();
-               }
+               if (is_null(self::$selfInstance)) {
+                       self::$selfInstance = new ApplicationHelper();
+               } // END - if
 
                // Return the instance
-               return self::$thisInstance;
+               return self::$selfInstance;
        }
 
        /**
@@ -160,7 +160,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         */
        public function buildMasterTemplateName () {
                // Get short name and add suffix
-               $masterTemplateName = str_replace("-", "", $this->getAppShortName()) . "_main";
+               $masterTemplateName = str_replace('-', '', $this->getAppShortName()) . '_main';
 
                // Return it
                return $masterTemplateName;
@@ -193,7 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                } // END - if
 
                // ... and a new response object
-               $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
+               $responseClass = sprintf('%sResponse', self::convertToClassName($response));
                $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
                // Remember response instance here
@@ -211,8 +211,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                        $requestInstance->setRequestElement('page', $commandName);
                } // END - if
 
-               // Get a resolver
-               $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType));
+               // Get a controller resolver
+               $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
                $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well