Registry rewritten, exception added #2

[core.git] / inc / classes / main / mailer / class_BaseMailer.php

diff --git a/inc/classes/main/mailer/class_BaseMailer.php b/inc/classes/main/mailer/class_BaseMailer.php
index 895ae2b5f9d1a4bfb7d1a9b44a9a0b08f76230b3..b74488f77c416eeae5edc6b489678a20aac51e76 100644 (file)
--- a/inc/classes/main/mailer/class_BaseMailer.php
+++ b/inc/classes/main/mailer/class_BaseMailer.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -30,7 +30,7 @@ class BaseMailer extends BaseFrameworkSystem {
        /**
         * Template name
         */
        /**
         * Template name
         */

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

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


@@ -41,10 +41,6 @@ class BaseMailer extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);

-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();

        }
 
        /**
        }
 
        /**


@@ -58,10 +54,12 @@ class BaseMailer extends BaseFrameworkSystem {
                $this->setTemplateName($templateName);
 
                // Get configuration entry
                $this->setTemplateName($templateName);
 
                // Get configuration entry

-               $templatePrefix = $this->getConfigInstance()->readConfig('email_tpl_' . $templateName);
+               $templatePrefix = $this->getConfigInstance()->getConfigEntry('email_tpl_' . $templateName);

 
                // Load this email template
 
                // Load this email template

-               $this->getTemplateInstance()->loadEmailTemplate($templatePrefix . '_' . $templateName);
+               // @TODO This needs testing/fixes because the deprecated method
+               // loadEmailTemplate() has been removed from interface CompileableTemplate.
+               $this->getTemplateInstance()->loadCodeTemplate($templatePrefix . '_' . $templateName);

        }
 
        /**
        }
 
        /**