Updated ApplicationHelper class to latest API

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

diff --git a/application/mailer/class_ApplicationHelper.php b/application/mailer/class_ApplicationHelper.php
index 7f34815da9d6b8be97b4abdd2eb684c2afea8b91..869db169ad880fb6bdaea0748516c7f533568535 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
         */
        /**
         * The version number of this application
         */

-       private $appVersion = "";
+       private $appVersion = '';

 
        /**
         * The human-readable name for this application
         */
 
        /**
         * The human-readable name for this application
         */

-       private $appName = "";
+       private $appName = '';

 
        /**
         * The short uni*-like name for this application
         */
 
        /**
         * The short uni*-like name for this application
         */

-       private $shortName = "";
+       private $shortName = '';

 
        /**
         * An instance of a controller
 
        /**
         * An instance of a controller


@@ -63,7 +63,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * An instance of this class
         */
        /**
         * An instance of this class
         */

-       private static $thisInstance = null;
+       private static $selfInstance = null;

 
        /**
         * Protected constructor
 
        /**
         * Protected constructor


@@ -78,16 +78,16 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
        /**
         * Getter for an instance of this class
         *
        /**
         * Getter for an instance of this class
         *

-        * @return      $thisInstance           An instance of this class
+        * @return      $selfInstance   An instance of this class

         */
         */

-       public final static function getInstance () {
+       public static final function getSelfInstance () {

                // Is the instance there?
                // 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 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
         */
        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;
 
                // Return it
                return $masterTemplateName;


@@ -172,6 +172,9 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         * @return      void
         */
        public final function entryPoint () {
         * @return      void
         */
        public final function entryPoint () {

+               // Set this application in registry
+               Registry::getRegistry()->addInstance('app', $this);
+

                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');